Merge branch 'main' of https://github.com/adrienntindall/pokeplatinum …

…into main-adrienntindall

INSTALL.md

@@ -211,7 +211,7 @@ GNU `coreutils` installed to run the build scripts:
 > convenience.
 >
 > [!IMPORTANT]
-> This project requires `meson` version `1.3.0` or higher. If the version of
+> This project requires `meson` version `1.5.0` or higher. If the version of
 > `meson` provided by your package manager is out of date, then follow
 > [these instructions](https://mesonbuild.com/Getting-meson.html) to get the
 > most recent version.
@@ -228,7 +228,7 @@ the repository](#2-downloading-the-repository).
     sudo mkdir -pm755 /etc/apt/keyrings
     sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
     sudo apt update
-    sudo apt install --install-recommends winehq-stable
+    sudo apt install --install-recommends wine-stable
     ```
 
 2. Install the following packages via `apt`:
@@ -319,10 +319,11 @@ in the lower right corner.
 
 ### Unix Systems
 
-Export the environment variable as above to your terminal profile:
+Export the environment variable as above to your terminal profile. To do so, run the
+following commands from the root of your repository:
 
 ```bash
-echo 'export LM_LICENSE_FILE="/path/to/pokeplatinum/tools/cw/license.dat"' >> ~/.bashrc
+echo "export LM_LICENSE_FILE=\"$(pwd)/tools/cw/license.dat\"" >> ~/.bashrc
 source ~/.bashrc
 ```
 

consts/catching_show.json

@@ -8,6 +8,27 @@
                 "CATCHING_SHOW_TYPE_POINTS",
                 "CATCHING_SHOW_TOTAL_POINTS"
             ]
+        },
+        "@PalParkLandArea": {
+            "type": "enum",
+            "values": [
+                "PAL_PARK_AREA_LAND_NONE",
+                "PAL_PARK_AREA_LAND_NORTH_WEST",
+                "PAL_PARK_AREA_LAND_NORTH_EAST",
+                "PAL_PARK_AREA_LAND_SOUTH_WEST",
+                "PAL_PARK_AREA_LAND_SOUTH_EAST",
+                "PAL_PARK_AREA_LAND_END"
+            ]
+        },
+        "@PalParkWaterArea": {
+            "type": "enum",
+            "values": [
+                "PAL_PARK_AREA_WATER_NONE",
+                "PAL_PARK_AREA_WATER_NORTH_WEST",
+                "PAL_PARK_AREA_WATER_NORTH_EAST",
+                "PAL_PARK_AREA_WATER_SOUTH_WEST",
+                "PAL_PARK_AREA_WATER_SOUTH_EAST"
+            ]
         }
     }
 }

include/constants/map_object.h

@@ -24,9 +24,9 @@
 #define MAP_OBJ_STATUS_12              (1 << 12)
 #define MAP_OBJ_STATUS_13              (1 << 13)
 #define MAP_OBJ_STATUS_14              (1 << 14)
-#define MAP_OBJ_STATUS_15              (1 << 15)
-#define MAP_OBJ_STATUS_16              (1 << 16)
-#define MAP_OBJ_STATUS_17              (1 << 17)
+#define MAP_OBJ_STATUS_SHOW_SHADOW     (1 << 15)
+#define MAP_OBJ_STATUS_START_JUMP      (1 << 16)
+#define MAP_OBJ_STATUS_END_JUMP        (1 << 17)
 #define MAP_OBJ_STATUS_18              (1 << 18)
 #define MAP_OBJ_STATUS_19              (1 << 19)
 #define MAP_OBJ_STATUS_HIDE_SHADOW     (1 << 20)

include/map_object_move.h

@@ -7,36 +7,36 @@
 
 #include "field/field_system_decl.h"
 
-void MapObject_InitMove(MapObject *param0);
-void MapObject_Move(MapObject *param0);
-u32 sub_02063E18(const MapObject *param0, const VecFx32 *param1, int param2, int param3, int param4, int param5);
-u32 sub_02063E94(const MapObject *param0, int param1, int param2, int param3, int param4);
-u32 sub_02063EBC(const MapObject *param0, int param1);
-int sub_02063F00(const MapObject *param0, int param1, int param2, int param3);
-int sub_02063FAC(const MapObject *param0, int param1, int param2, int param3);
-int sub_02064004(const MapObject *param0, int param1, int param2, int param3);
-int sub_0206406C(MapObject *param0, u32 param1);
-int sub_020640A0(MapObject *param0, u32 param1);
-int MapObject_IsOnSnow(MapObject *param0, u32 param1);
-int sub_02064108(MapObject *param0, u32 param1);
-int sub_0206413C(MapObject *param0, u32 param1);
-int sub_0206415C(MapObject *param0, u32 param1);
-int sub_0206417C(MapObject *param0, u32 param1);
-int MapObject_GetDxFromDir(int param0);
-int MapObject_GetDyFromDir(int param0);
+void MapObject_InitMove(MapObject *mapObj);
+void MapObject_Move(MapObject *mapObj);
+u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *pos, int x, int y, int z, int dir);
+u32 sub_02063E94(const MapObject *mapObj, int x, int y, int z, int dir);
+u32 sub_02063EBC(const MapObject *mapObj, int dir);
+int sub_02063F00(const MapObject *mapObj, int x, int y, int z);
+int MapObject_IsOutOfRange(const MapObject *mapObj, int x, int y, int z);
+int sub_02064004(const MapObject *mapObj, int x, int z, int dir);
+int MapObject_IsOnWater(MapObject *mapObj, u32 tileBehavior);
+int MapObject_IsOnSand(MapObject *mapObj, u32 tileBehavior);
+int MapObject_IsOnSnow(MapObject *mapObj, u32 tileBehavior);
+int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 tileBehavior);
+int MapObject_IsOnBridge(MapObject *mapObj, u32 tileBehavior);
+int MapObject_IsOnBikeBridgeNorthSouth(MapObject *mapObj, u32 tileBehavior);
+int MapObject_IsOnBikeBridgeEastWest(MapObject *mapObj, u32 tileBehavior);
+int MapObject_GetDxFromDir(int dir);
+int MapObject_GetDzFromDir(int dir);
 void MapObject_StepDir(MapObject *mapObj, int dir);
 void MapObject_UpdateCoords(MapObject *mapObj);
-u32 sub_02064238(MapObject *param0, int param1);
-void MapObject_AddVecToPos(MapObject *param0, const VecFx32 *param1);
+u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int dir);
+void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *vec);
 void MapObject_MovePosInDir(MapObject *mapObj, int dir, fx32 distance);
-int sub_020642F8(MapObject *param0);
-int sub_02064390(MapObject *param0);
-void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2);
-void sub_02064450(int param0, int param1, VecFx32 *param2);
-void sub_02064464(MapObject *param0);
+int sub_020642F8(MapObject *mapObj);
+int MapObject_SetTileBehaviors(MapObject *mapObj);
+void VecFx32_StepDirection(int param0, VecFx32 *vec, fx32 val);
+void sub_02064450(int x, int z, VecFx32 *pos);
+void sub_02064464(MapObject *mapObj);
 int Direction_GetOpposite(int param0);
-int sub_02064488(int param0, int param1, int param2, int param3);
-int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1);
-int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2);
+int sub_02064488(int x, int z, int xPrev, int zPrev);
+int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *pos);
+int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *pos, int param2);
 
 #endif // POKEPLATINUM_MAP_OBJECT_MOVE_H

meson.build

@@ -1,6 +1,6 @@
 project('pokeplatinum', ['c', 'cpp', 'nasm'],
     version: '1.0',
-    meson_version: '>=1.3.0',
+    meson_version: '>=1.5.0',
     default_options : [
         'buildtype=plain',
         'warning_level=0'

platinum.us/filesys.sha1

@@ -291,7 +291,7 @@ adcb9634923530fd7f217a131a3949f556f4f324 *res/prebuilt/arc/email_gra.narc
 0832d441d7e543e14d68e9df7e9118b472d67833 *res/field/encounters/encdata_ex.narc
 d534f791217a311610812b18ef674a326ecdd2ac *res/prebuilt/arc/manene.narc
 ad5fefc4758eba86f6f647e506531d6cfe9c9ce5 *res/prebuilt/arc/plgym_ghost.narc
-89b24d0c67f2cb089800613d5a0254a124d98ba6 *res/prebuilt/arc/ppark.narc
+89b24d0c67f2cb089800613d5a0254a124d98ba6 *res/pokemon/ppark.narc
 9b0b19798338e63d907a95c35be4b302778192f1 *res/prebuilt/arc/ship_demo.narc
 91559385ad608514630650e1f1e94206048bc3a8 *res/prebuilt/arc/ship_demo_pl.narc
 114d4f20de27a95ad930b246bb6f62a6d7295fe5 *res/prebuilt/arc/tv.narc

platinum.us/rom.rsf

@@ -447,7 +447,13 @@ RomSpec
 	HostRoot res/prebuilt
 	File arc/manene.narc
 	File arc/plgym_ghost.narc
-	File arc/ppark.narc
+
+	Root /arc
+	HostRoot res/pokemon
+	File ppark.narc
+
+	Root /
+	HostRoot res/prebuilt
 	File arc/ship_demo.narc
 	File arc/ship_demo_pl.narc
 	File arc/tv.narc

res/pokemon/abomasnow/data.json

@@ -138,5 +138,12 @@
         "pokemon_pos_m": 4,
         "entry_text": "They appear when the snow flowers\nbloom. When the petals fall, they\nretreat to places unknown again.",
         "category": "Frost Tree Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 70,
+        "rarity": 20,
+        "unused": 2063
     }
 }

res/pokemon/abra/data.json

@@ -129,5 +129,12 @@
         "pokemon_pos_m": 25,
         "entry_text": "Using its psychic power is such a\nstrain on its brain that it needs\nto sleep for 18 hours a day.",
         "category": "Psi Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 50,
+        "rarity": 30,
+        "unused": 2570
     }
 }

res/pokemon/absol/data.json

@@ -156,5 +156,12 @@
         "pokemon_pos_m": 14,
         "entry_text": "Rumored to sense disasters with its\nhorn, it became a target. It fled\ndeep into the mountains.",
         "category": "Disaster Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 80,
+        "rarity": 10,
+        "unused": 4112
     }
 }

res/pokemon/aerodactyl/data.json

@@ -141,5 +141,12 @@
         "pokemon_pos_m": 4,
         "entry_text": "A Pokémon that roamed the skies\nin the dinosaur era. Its teeth are\nlike saw blades.",
         "category": "Fossil Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 70,
+        "rarity": 20,
+        "unused": 4363
     }
 }

res/pokemon/aggron/data.json

@@ -165,5 +165,12 @@
         "pokemon_pos_m": 6,
         "entry_text": "While seeking iron for food, it\ndigs tunnels by breaking through\nbedrock with its steel horns.",
         "category": "Iron Armor Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 80,
+        "rarity": 10,
+        "unused": 2830
     }
 }

res/pokemon/aipom/data.json

@@ -148,5 +148,12 @@
         "pokemon_pos_m": 15,
         "entry_text": "It lives high among the treetops.\nIt can use its tail as freely and\ncleverly as its hands.",
         "category": "Long Tail Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 70,
+        "rarity": 20,
+        "unused": 1285
     }
 }

res/pokemon/alakazam/data.json

@@ -140,5 +140,12 @@
         "pokemon_pos_m": 7,
         "entry_text": "The spoons clutched in its hands\nare said to have been created by\nits psychic powers.",
         "category": "Psi Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 90,
+        "rarity": 3,
+        "unused": 2570
     }
 }

res/pokemon/altaria/data.json

@@ -137,5 +137,12 @@
         "pokemon_pos_m": 0,
         "entry_text": "If it bonds with a person, it will\ngently envelop the friend with its\nsoft wings, then hum.",
         "category": "Humming Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 80,
+        "rarity": 10,
+        "unused": 4367
     }
 }

res/pokemon/ambipom/data.json

@@ -145,5 +145,12 @@
         "pokemon_pos_m": 7,
         "entry_text": "Split into two, the tails are so\nadept at handling and doing things,\nAMBIPOM rarely uses its hands.",
         "category": "Long Tail Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST",
+        "catching_points": 50,
+        "rarity": 30,
+        "unused": 771
     }
 }

res/pokemon/ampharos/data.json

@@ -128,5 +128,12 @@
         "pokemon_pos_m": 8,
         "entry_text": "The tip of its tail shines brightly.\nIn the olden days, people sent\nsignals using the tail’s light.",
         "category": "Light Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 80,
+        "rarity": 10,
+        "unused": 1799
     }
 }

res/pokemon/anorith/data.json

@@ -128,5 +128,12 @@
         "pokemon_pos_m": 3,
         "entry_text": "A Pokémon ancestor that was\nreanimated from a fossil. It lived\nin the sea and hunted with claws.",
         "category": "Old Shrimp Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST",
+        "catching_points": 70,
+        "rarity": 20,
+        "unused": 1035
     }
 }

res/pokemon/arbok/data.json

@@ -133,5 +133,12 @@
         "pokemon_pos_m": 8,
         "entry_text": "The pattern on its belly is for\nintimidation. It constricts foes\nwhile they are frozen in fear.",
         "category": "Cobra Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 50,
+        "rarity": 30,
+        "unused": 1542
     }
 }

res/pokemon/arcanine/data.json

@@ -116,5 +116,12 @@
         "pokemon_pos_m": 6,
         "entry_text": "Its proud and regal appearance\nhas captured the hearts of\npeople since long ago.",
         "category": "Legendary Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 80,
+        "rarity": 10,
+        "unused": 514
     }
 }

res/pokemon/arceus/data.json

@@ -183,5 +183,12 @@
         "pokemon_pos_m": 0,
         "entry_text": "It is said to have emerged from an\negg in a place where there was\nnothing, then shaped the world.",
         "category": "Alpha Pokémon"
+    },
+    "catching_show_data": {
+        "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST",
+        "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE",
+        "catching_points": 100,
+        "rarity": 1,
+        "unused": 1285
     }
 }