diff --git a/INSTALL.md b/INSTALL.md index 02cb8ca8ad..2f46920c86 100644 --- a/INSTALL.md +++ b/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 ``` diff --git a/consts/catching_show.json b/consts/catching_show.json index 7562d99103..e10c87f2ac 100644 --- a/consts/catching_show.json +++ b/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" + ] } } } diff --git a/include/constants/map_object.h b/include/constants/map_object.h index f3bcc40803..e2a1035b35 100644 --- a/include/constants/map_object.h +++ b/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) diff --git a/include/map_object.h b/include/map_object.h index 7fe12249d5..7a8d78858f 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -7,7 +7,6 @@ #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_defs/struct_02061D3C.h" #include "field/field_system_decl.h" #include "functypes/funcptr_020EDF0C.h" @@ -24,64 +23,94 @@ #include "narc.h" #include "sys_task_manager.h" -MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int param1, int param2); -void MapObjectMan_Delete(MapObjectManager *param0); -void sub_0206184C(MapObjectManager *param0, int param1, int param2, int param3, const ObjectEvent *param4); -MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *param0, const ObjectEvent *param1, int param2); -MapObject *MapObjectMan_AddMapObject(const MapObjectManager *param0, int param1, int param2, int param3, int param4, int param5, int param6); -MapObject *sub_02061A74(const MapObjectManager *param0, int param1, int param2, int param3, const ObjectEvent *param4); -void sub_02061AB4(MapObject *param0, int param1); -void sub_02061AD4(MapObject *param0, int param1); -void MapObject_Delete(MapObject *param0); -void sub_02061B28(MapObject *param0); -void sub_02061B48(MapObject *param0); -void MapObjectMan_DeleteAll(MapObjectManager *param0); -void sub_02061BF0(MapObjectManager *param0); -void sub_02061C48(MapObjectManager *param0); -void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *param1, MapObjectSave *param2, int param3); -void MapObjectMan_LoadAllObjects(const MapObjectManager *param0, MapObjectSave *param1, int param2); -void sub_02062068(const MapObjectManager *param0, int param1, int param2, const ObjectEvent *param3); -MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *param0, int param1); -MapObject *sub_02062570(const MapObjectManager *param0, int param1); -int sub_020625B0(const MapObjectManager *param0, MapObject **param1, int *param2, u32 param3); -int sub_020626B4(const MapObject *param0); -int sub_02062758(const MapObject *param0, int param1); -int sub_02062764(const MapObject *param0, int param1, int param2); -int sub_020627B4(const MapObject *param0, int param1, int param2, int param3); -void MapObjectMan_SetMaxObjects(MapObjectManager *param0, int param1); -int MapObjectMan_GetMaxObjects(const MapObjectManager *param0); -void sub_02062838(MapObjectManager *param0, u32 param1); -void sub_02062840(MapObjectManager *param0, u32 param1); -u32 sub_0206284C(const MapObjectManager *param0, u32 param1); -void sub_02062854(MapObjectManager *param0, int param1); -int sub_02062858(const MapObjectManager *param0); -UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *param0); -void sub_02062860(MapObjectManager *param0, MapObject *param1); -const MapObject *sub_02062868(const MapObjectManager *param0); -MapObject *sub_02062878(const MapObjectManager *param0); -void sub_02062880(const MapObject **param0); -void MapObjectMan_SetFieldSystem(MapObjectManager *param0, FieldSystem *fieldSystem); -FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *param0); -void sub_0206289C(MapObjectManager *param0, NARC *param1); -NARC *sub_020628A0(const MapObjectManager *param0); +typedef struct MapObjectSave { + u32 status; + u32 unk_04; + u8 localID; + u8 movementType; + s8 movementRangeX; + s8 movementRangeZ; + s8 initialDir; + s8 facingDir; + s8 movingDir; + u8 padding_0F; + u16 unk_10; + u16 graphicsID; + u16 trainerType; + u16 flag; + u16 script; + s16 unk_1A; + s16 unk_1C; + s16 unk_1E; + s16 xInitial; + s16 yInitial; + s16 zInitial; + s16 x; + s16 y; + s16 z; + fx32 unk_2C; + u8 unk_30[16]; + u8 unk_40[16]; +} MapObjectSave; + +MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int param2); +void MapObjectMan_Delete(MapObjectManager *mapObjMan); +void sub_0206184C(MapObjectManager *mapObjMan, int mapID, int param2, int objEventCount, const ObjectEvent *objectEvent); +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int mapID); +MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, int z, int initialDir, int graphicsID, int movementType, int mapID); +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int mapID, const ObjectEvent *objectEvent); +void sub_02061AB4(MapObject *mapObj, int graphicsID); +void sub_02061AD4(MapObject *mapObj, int param1); +void MapObject_Delete(MapObject *mapObj); +void sub_02061B28(MapObject *mapObj); +void sub_02061B48(MapObject *mapObj); +void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan); +void sub_02061BF0(MapObjectManager *mapObjMan); +void sub_02061C48(MapObjectManager *mapObjMan); +void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param3); +void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int size); +void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *objectEvent); +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int index); +MapObject *sub_02062570(const MapObjectManager *mapObjMan, int movementType); +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 status); +int MapObject_HasNoScript(const MapObject *mapObj); +int sub_02062758(const MapObject *mapObj, int param1); +int sub_02062764(const MapObject *mapObj, int param1, int param2); +int sub_020627B4(const MapObject *mapObj, int param1, int param2, int param3); +void MapObjectMan_SetMaxObjects(MapObjectManager *mapObjMan, int maxObjs); +int MapObjectMan_GetMaxObjects(const MapObjectManager *mapObjMan); +void MapObjectMan_SetStatusFlagOn(MapObjectManager *mapObjMan, u32 flag); +void MapObjectMan_SetStatusFlagOff(MapObjectManager *mapObjMan, u32 flag); +u32 MapObjectMan_CheckStatus(const MapObjectManager *mapObjMan, u32 flag); +void sub_02062854(MapObjectManager *mapObjMan, int param1); +int sub_02062858(const MapObjectManager *mapObjMan); +UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *mapObjMan); +void MapObjectMan_SetMapObject(MapObjectManager *mapObjMan, MapObject *mapObj); +const MapObject *MapObjectMan_GetMapObjectConst(const MapObjectManager *mapObjMan); +MapObject *MapObjectMan_GetMapObject(const MapObjectManager *mapObjMan); +void sub_02062880(const MapObject **mapObj); +void MapObjectMan_SetFieldSystem(MapObjectManager *mapObjMan, FieldSystem *fieldSystem); +FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan); +void MapObjectMan_SetNARC(MapObjectManager *mapObjMan, NARC *narc); +NARC *MapObjectMan_GetNARC(const MapObjectManager *mapObjMan); void MapObject_SetStatus(MapObject *mapObj, u32 status); u32 MapObject_GetStatus(const MapObject *mapObj); void MapObject_SetStatusFlagOn(MapObject *mapObj, u32 flag); void MapObject_SetStatusFlagOff(MapObject *mapObj, u32 flag); u32 MapObject_CheckStatus(const MapObject *mapObj, u32 flag); BOOL MapObject_CheckStatusFlag(const MapObject *mapObj, u32 flag); -void sub_020628E8(MapObject *param0, u32 param1); -u32 sub_020628EC(const MapObject *param0); -void sub_020628F0(MapObject *param0, u32 param1); -void sub_020628F8(MapObject *param0, u32 param1); -u32 sub_02062904(const MapObject *param0, u32 param1); +void sub_020628E8(MapObject *mapObj, u32 param1); +u32 sub_020628EC(const MapObject *mapObj); +void sub_020628F0(MapObject *mapObj, u32 param1); +void sub_020628F8(MapObject *mapObj, u32 param1); +u32 sub_02062904(const MapObject *mapObj, u32 param1); void MapObject_SetLocalID(MapObject *mapObj, u32 localID); u32 MapObject_GetLocalID(const MapObject *mapObj); -void sub_02062914(MapObject *param0, int param1); -int sub_02062918(const MapObject *param0); +void sub_02062914(MapObject *mapObj, int param1); +int sub_02062918(const MapObject *mapObj); void MapObject_SetGraphicsID(MapObject *mapObj, u32 graphicsID); u32 MapObject_GetGraphicsID(const MapObject *mapObj); -u32 sub_02062924(const MapObject *param0); +u32 sub_02062924(const MapObject *mapObj); void MapObject_SetMovementType(MapObject *mapObj, u32 movementType); u32 MapObject_GetMovementType(const MapObject *mapObj); void MapObject_SetTrainerType(MapObject *mapObj, u32 trainerType); @@ -98,100 +127,100 @@ int MapObject_GetFacingDir(const MapObject *mapObj); int MapObject_GetPrevFacingDir(const MapObject *mapObj); void MapObject_Turn(MapObject *mapObj, int dir); int MapObject_GetMovingDir(const MapObject *mapObj); -void MapObject_TryFaceAndTurn(MapObject *param0, int dir); +void MapObject_TryFaceAndTurn(MapObject *mapObj, int dir); void MapObject_SetDataAt(MapObject *mapObj, int value, int index); int MapObject_GetDataAt(const MapObject *mapObj, int index); void MapObject_SetMovementRangeX(MapObject *mapObj, int movementRangeX); int MapObject_GetMovementRangeX(const MapObject *mapObj); void MapObject_SetMovementRangeZ(MapObject *mapObj, int movementRangeZ); int MapObject_GetMovementRangeZ(const MapObject *mapObj); -void sub_02062A0C(MapObject *param0, u32 param1); -u32 sub_02062A14(const MapObject *param0); -void sub_02062A1C(MapObject *param0, SysTask *param1); -SysTask *sub_02062A24(const MapObject *param0); -void sub_02062A2C(const MapObject *param0); -void MapObject_SetMapObjectManager(MapObject *param0, const MapObjectManager *param1); -const MapObjectManager *MapObject_MapObjectManager(const MapObject *param0); -void *sub_02062A54(MapObject *param0, int param1); -void *sub_02062A78(MapObject *param0); -void *sub_02062A7C(MapObject *param0, int param1); -void *sub_02062AA0(MapObject *param0); +void sub_02062A0C(MapObject *mapObj, u32 param1); +u32 sub_02062A14(const MapObject *mapObj); +void sub_02062A1C(MapObject *mapObj, SysTask *task); +SysTask *sub_02062A24(const MapObject *mapObj); +void sub_02062A2C(const MapObject *mapObj); +void MapObject_SetMapObjectManager(MapObject *mapObj, const MapObjectManager *mapObjMan); +const MapObjectManager *MapObject_MapObjectManager(const MapObject *mapObj); +void *sub_02062A54(MapObject *mapObj, int size); +void *sub_02062A78(MapObject *mapObj); +void *sub_02062A7C(MapObject *mapObj, int size); +void *sub_02062AA0(MapObject *mapObj); void *MapObject_InitMovementData(MapObject *mapObj, int size); void *MapObject_GetMovementData(MapObject *mapObj); -void *sub_02062ACC(MapObject *param0, int param1); -void *sub_02062AF0(MapObject *param0); -void sub_02062AF8(MapObject *param0, UnkFuncPtr_020EDF0C param1); -void sub_02062B00(MapObject *param0); -void sub_02062B0C(MapObject *param0, UnkFuncPtr_020EDF0C_1 param1); -void sub_02062B14(MapObject *param0); -void sub_02062B20(MapObject *param0, UnkFuncPtr_020EDF0C_2 param1); -void sub_02062B28(MapObject *param0); -void sub_02062B34(MapObject *param0); -void sub_02062B4C(MapObject *param0, UnkFuncPtr_ov5_021FB0F0 param1); -void sub_02062B54(MapObject *param0); -void sub_02062B60(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_1 param1); -void sub_02062B68(MapObject *param0); -void sub_02062B74(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_2 param1); -void sub_02062B7C(MapObject *param0); -void sub_02062B88(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_3 param1); -void sub_02062B90(MapObject *param0); -void sub_02062B9C(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_4 param1); -void sub_02062BA4(MapObject *param0); +void *sub_02062ACC(MapObject *mapObj, int size); +void *sub_02062AF0(MapObject *mapObj); +void sub_02062AF8(MapObject *mapObj, UnkFuncPtr_020EDF0C param1); +void sub_02062B00(MapObject *mapObj); +void sub_02062B0C(MapObject *mapObj, UnkFuncPtr_020EDF0C_1 param1); +void sub_02062B14(MapObject *mapObj); +void sub_02062B20(MapObject *mapObj, UnkFuncPtr_020EDF0C_2 param1); +void sub_02062B28(MapObject *mapObj); +void sub_02062B34(MapObject *mapObj); +void sub_02062B4C(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0 param1); +void sub_02062B54(MapObject *mapObj); +void sub_02062B60(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_1 param1); +void sub_02062B68(MapObject *mapObj); +void sub_02062B74(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_2 param1); +void sub_02062B7C(MapObject *mapObj); +void sub_02062B88(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_3 param1); +void sub_02062B90(MapObject *mapObj); +void sub_02062B9C(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_4 param1); +void sub_02062BA4(MapObject *mapObj); void MapObject_SetMovementAction(MapObject *mapObj, int movementAction); int MapObject_GetMovementAction(const MapObject *mapObj); void MapObject_SetMovementStep(MapObject *mapObj, int movementStep); void MapObject_AdvanceMovementStep(MapObject *mapObj); int MapObject_GetMovementStep(const MapObject *mapObj); -void sub_02062BE0(MapObject *param0, u32 param1); -u32 sub_02062BE8(const MapObject *param0); -void sub_02062BF0(MapObject *param0, u32 param1); -u32 sub_02062BF8(const MapObject *param0); -FieldSystem *MapObject_FieldSystem(const MapObject *param0); -int sub_02062C0C(const MapObject *param0); -int sub_02062C18(const MapObject *param0); -void MapObjectMan_StopAllMovement(MapObjectManager *param0); -void sub_02062C3C(MapObjectManager *param0); -void MapObjectMan_PauseAllMovement(MapObjectManager *param0); -void MapObjectMan_UnpauseAllMovement(MapObjectManager *param0); -int MapObjectMan_IsDrawInitialized(const MapObjectManager *param0); -u32 sub_02062CBC(const MapObject *param0, u32 param1); -void sub_02062CCC(MapObjectManager *param0, int param1); -int sub_02062CE4(const MapObjectManager *param0); -int sub_02062CF8(const MapObject *param0); -void sub_02062D04(MapObject *param0); -void sub_02062D10(MapObject *param0); -int MapObject_IsMoving(const MapObject *param0); -void sub_02062D28(MapObject *param0); -void sub_02062D34(MapObject *param0); -void sub_02062D40(MapObject *param0); -int sub_02062D4C(const MapObject *param0); -int sub_02062D58(const MapObject *param0); -void MapObject_SetHidden(MapObject *param0, int param1); -void sub_02062D80(MapObject *param0, int param1); -int sub_02062D9C(MapObject *param0); -void sub_02062DB4(MapObject *param0, int param1); -void sub_02062DD0(MapObject *param0); -void sub_02062DDC(MapObject *param0); -int MapObject_IsMovementPaused(const MapObject *param0); -int sub_02062DFC(const MapObject *param0); -void sub_02062E28(MapObject *param0, int param1); -int sub_02062E44(const MapObject *param0); -void sub_02062E5C(MapObject *param0, int param1); -void sub_02062E78(MapObject *param0, int param1); -int sub_02062E94(const MapObject *param0); -void sub_02062EAC(MapObject *param0, int param1); -int sub_02062EC8(const MapObject *param0); -void sub_02062EE0(MapObject *param0, int param1); -int sub_02062EFC(const MapObject *param0); -void sub_02062F14(MapObject *param0, int param1); -int sub_02062F30(const MapObject *param0); -void sub_02062F48(MapObject *param0, int param1); -int sub_02062F64(const MapObject *param0); -int sub_02062F7C(const MapObject *param0); -void sub_02062F90(MapObject *param0, int param1); -int sub_02062FAC(const MapObject *param0); -void sub_02062FC4(MapObject *param0, int param1); -int sub_02062FDC(const MapObject *param0); +void MapObject_SetCurrTileBehavior(MapObject *mapObj, u32 tileBehavior); +u32 MapObject_GetCurrTileBehavior(const MapObject *mapObj); +void MapObject_SetPrevTileBehavior(MapObject *mapObj, u32 tileBehavior); +u32 MapObject_GetPrevTileBehavior(const MapObject *mapObj); +FieldSystem *MapObject_FieldSystem(const MapObject *mapObj); +int sub_02062C0C(const MapObject *mapObj); +int sub_02062C18(const MapObject *mapObj); +void MapObjectMan_StopAllMovement(MapObjectManager *mapObjMan); +void sub_02062C3C(MapObjectManager *mapObjMan); +void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan); +void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan); +int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan); +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 flag); +void MapObjectMan_SetEndMovement(MapObjectManager *mapObjMan, int param1); +int sub_02062CE4(const MapObjectManager *mapObjMan); +int sub_02062CF8(const MapObject *mapObj); +void sub_02062D04(MapObject *mapObj); +void sub_02062D10(MapObject *mapObj); +int MapObject_IsMoving(const MapObject *mapObj); +void MapObject_SetStartMovement(MapObject *mapObj); +void MapObject_SetEndMovementOff(MapObject *mapObj); +void sub_02062D40(MapObject *mapObj); +int sub_02062D4C(const MapObject *mapObj); +int MapObject_IsHidden(const MapObject *mapObj); +void MapObject_SetHidden(MapObject *mapObj, int hidden); +void sub_02062D80(MapObject *mapObj, int param1); +int sub_02062D9C(MapObject *mapObj); +void sub_02062DB4(MapObject *mapObj, int param1); +void MapObject_SetPauseMovementOn(MapObject *mapObj); +void MapObject_SetPauseMovementOff(MapObject *mapObj); +int MapObject_IsMovementPaused(const MapObject *mapObj); +int sub_02062DFC(const MapObject *mapObj); +void sub_02062E28(MapObject *mapObj, int param1); +int sub_02062E44(const MapObject *mapObj); +void sub_02062E5C(MapObject *mapObj, int param1); +void sub_02062E78(MapObject *mapObj, int param1); +int sub_02062E94(const MapObject *mapObj); +void sub_02062EAC(MapObject *mapObj, int param1); +int sub_02062EC8(const MapObject *mapObj); +void sub_02062EE0(MapObject *mapObj, int param1); +int sub_02062EFC(const MapObject *mapObj); +void sub_02062F14(MapObject *mapObj, int param1); +int sub_02062F30(const MapObject *mapObj); +void sub_02062F48(MapObject *mapObj, int param1); +int sub_02062F64(const MapObject *mapObj); +int sub_02062F7C(const MapObject *mapObj); +void sub_02062F90(MapObject *mapObj, int param1); +int sub_02062FAC(const MapObject *mapObj); +void sub_02062FC4(MapObject *mapObj, int param1); +int sub_02062FDC(const MapObject *mapObj); int MapObject_GetXInitial(const MapObject *mapObj); void MapObject_SetXInitial(MapObject *mapObj, int x); int MapObject_GetYInitial(const MapObject *mapObj); @@ -217,14 +246,14 @@ void MapObject_GetPosPtr(const MapObject *mapObj, VecFx32 *pos); void MapObject_SetPos(MapObject *mapObj, const VecFx32 *pos); const VecFx32 *MapObject_GetPos(const MapObject *mapObj); fx32 MapObject_GetPosY(const MapObject *mapObj); -void sub_02063078(const MapObject *param0, VecFx32 *param1); -void sub_02063088(MapObject *param0, const VecFx32 *param1); -VecFx32 *sub_02063098(MapObject *param0); -void sub_0206309C(const MapObject *param0, VecFx32 *param1); -void sub_020630AC(MapObject *param0, const VecFx32 *param1); -void sub_020630BC(const MapObject *param0, VecFx32 *param1); -void sub_020630CC(MapObject *param0, const VecFx32 *param1); -int sub_020630DC(const MapObject *param0); +void sub_02063078(const MapObject *mapObj, VecFx32 *vec); +void sub_02063088(MapObject *mapObj, const VecFx32 *vec); +VecFx32 *sub_02063098(MapObject *mapObj); +void sub_0206309C(const MapObject *mapObj, VecFx32 *vec); +void sub_020630AC(MapObject *mapObj, const VecFx32 *vec); +void sub_020630BC(const MapObject *mapObj, VecFx32 *vec); +void sub_020630CC(MapObject *mapObj, const VecFx32 *vec); +int sub_020630DC(const MapObject *mapObj); void ObjectEvent_SetLocalID(ObjectEvent *objectEvent, int localID); int ObjectEvent_GetLocalID(const ObjectEvent *objectEvent); void ObjectEvent_SetGraphicsID(ObjectEvent *objectEvent, int graphicsID); @@ -251,18 +280,18 @@ void ObjectEvent_SetY(ObjectEvent *objectEvent, int y); int ObjectEvent_GetY(const ObjectEvent *objectEvent); void ObjectEvent_SetZ(ObjectEvent *objectEvent, int z); int ObjectEvent_GetZ(const ObjectEvent *objectEvent); -MapObject *sub_0206326C(const MapObjectManager *param0, int param1, int param2, int param3); -void sub_020632D4(MapObject *param0, const VecFx32 *param1, int param2); -void MapObject_SetPosDir(MapObject *param0, int param1, int param2, int param3, int param4); -void MapObject_SetMoveCode(MapObject *param0, u32 param1); -void sub_020633C8(MapObject *param0, int param1); -void sub_020633E0(MapObject *param0); -void sub_020633E4(MapObject *param0); -void sub_020633E8(MapObject *param0); -void sub_020633EC(MapObject *param0); -void sub_020633F0(MapObject *param0); -void sub_020633F4(MapObject *param0); -void sub_020633F8(MapObject *param0); -void sub_020633FC(MapObject *param0); +MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3); +void MapObject_SetPosDirFromVec(MapObject *mapObj, const VecFx32 *pos, int dir); +void MapObject_SetPosDirFromCoords(MapObject *mapObj, int x, int y, int z, int dir); +void MapObject_SetMoveCode(MapObject *mapObj, u32 param1); +void sub_020633C8(MapObject *mapObj, int localID); +void sub_020633E0(MapObject *mapObj); +void sub_020633E4(MapObject *mapObj); +void sub_020633E8(MapObject *mapObj); +void sub_020633EC(MapObject *mapObj); +void sub_020633F0(MapObject *mapObj); +void sub_020633F4(MapObject *mapObj); +void sub_020633F8(MapObject *mapObj); +void sub_020633FC(MapObject *mapObj); #endif // POKEPLATINUM_UNK_02061804_H diff --git a/include/map_object_move.h b/include/map_object_move.h index f6a998c370..b746488647 100644 --- a/include/map_object_move.h +++ b/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 diff --git a/include/struct_defs/struct_02061D3C.h b/include/struct_defs/struct_02061D3C.h deleted file mode 100644 index 1fdfa949ad..0000000000 --- a/include/struct_defs/struct_02061D3C.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02061D3C_H -#define POKEPLATINUM_STRUCT_02061D3C_H - -typedef struct UnkStruct_02061D3C_t { - u32 unk_00; - u32 unk_04; - u8 unk_08; - u8 unk_09; - s8 unk_0A; - s8 unk_0B; - s8 unk_0C; - s8 unk_0D; - s8 unk_0E; - u8 padding_0F; - u16 unk_10; - u16 unk_12; - u16 unk_14; - u16 unk_16; - u16 unk_18; - s16 unk_1A; - s16 unk_1C; - s16 unk_1E; - s16 unk_20; - s16 unk_22; - s16 unk_24; - s16 unk_26; - s16 unk_28; - s16 unk_2A; - fx32 unk_2C; - u8 unk_30[16]; - u8 unk_40[16]; -} MapObjectSave; - -#endif // POKEPLATINUM_STRUCT_02061D3C_H diff --git a/meson.build b/meson.build index 00b3a4ec48..e9d13e5c39 100644 --- a/meson.build +++ b/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' diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index 0d7e5c8ea6..86d994362c 100644 --- a/platinum.us/filesys.sha1 +++ b/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 diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf index d1d17be3af..5737d8ec1b 100644 --- a/platinum.us/rom.rsf +++ b/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 diff --git a/res/pokemon/abomasnow/data.json b/res/pokemon/abomasnow/data.json index c037a5a7a7..4cc926c569 100644 --- a/res/pokemon/abomasnow/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/abra/data.json b/res/pokemon/abra/data.json index e3242551a3..1d05fc251b 100644 --- a/res/pokemon/abra/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/absol/data.json b/res/pokemon/absol/data.json index 281d597672..d22b137d4e 100644 --- a/res/pokemon/absol/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/aerodactyl/data.json b/res/pokemon/aerodactyl/data.json index 2a5d3b76c4..064e766b34 100644 --- a/res/pokemon/aerodactyl/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/aggron/data.json b/res/pokemon/aggron/data.json index b757479fca..af5a1b5d4c 100644 --- a/res/pokemon/aggron/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/aipom/data.json b/res/pokemon/aipom/data.json index eddff5258c..758357b249 100644 --- a/res/pokemon/aipom/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/alakazam/data.json b/res/pokemon/alakazam/data.json index d0c4dc5161..b84e5e0b96 100644 --- a/res/pokemon/alakazam/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/altaria/data.json b/res/pokemon/altaria/data.json index 1d3a0b25f1..6d8eedf568 100644 --- a/res/pokemon/altaria/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/ambipom/data.json b/res/pokemon/ambipom/data.json index 15f82fb129..b5ca33c90a 100644 --- a/res/pokemon/ambipom/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/ampharos/data.json b/res/pokemon/ampharos/data.json index c2482fd547..18d43e32fc 100644 --- a/res/pokemon/ampharos/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/anorith/data.json b/res/pokemon/anorith/data.json index e08905f1e1..75e52de76b 100644 --- a/res/pokemon/anorith/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/arbok/data.json b/res/pokemon/arbok/data.json index f907f56f3d..607884bd7f 100644 --- a/res/pokemon/arbok/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/arcanine/data.json b/res/pokemon/arcanine/data.json index 3f7592f1bb..e312fbd176 100644 --- a/res/pokemon/arcanine/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/arceus/data.json b/res/pokemon/arceus/data.json index ab72fc7ea8..742beb9bb8 100644 --- a/res/pokemon/arceus/data.json +++ b/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 } } \ No newline at end of file diff --git a/res/pokemon/ariados/data.json b/res/pokemon/ariados/data.json index 8e15206ae2..c10895a126 100644 --- a/res/pokemon/ariados/data.json +++ b/res/pokemon/ariados/data.json @@ -118,5 +118,12 @@ "pokemon_pos_m": 12, "entry_text": "It attaches silk to its prey and\nsets it free. Later, it tracks the\nsilk to the prey and its friends.", "category": "Long Leg 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": 1540 } } \ No newline at end of file diff --git a/res/pokemon/armaldo/data.json b/res/pokemon/armaldo/data.json index 1551838202..f3ed48ccfa 100644 --- a/res/pokemon/armaldo/data.json +++ b/res/pokemon/armaldo/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 6, "entry_text": "It went ashore after evolving.\nIts entire body is clad in a sturdy\narmor.", "category": "Plate 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": 80, + "rarity": 10, + "unused": 1035 } } \ No newline at end of file diff --git a/res/pokemon/aron/data.json b/res/pokemon/aron/data.json index d2d064b763..6c14cb1d77 100644 --- a/res/pokemon/aron/data.json +++ b/res/pokemon/aron/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 25, "entry_text": "It usually lives deep in mountains.\nHowever, hunger may drive it to\neat railroad tracks and cars.", "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": 50, + "rarity": 30, + "unused": 2830 } } \ No newline at end of file diff --git a/res/pokemon/articuno/data.json b/res/pokemon/articuno/data.json index bcdbdf3526..35c24f4d61 100644 --- a/res/pokemon/articuno/data.json +++ b/res/pokemon/articuno/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 0, "entry_text": "A legendary bird Pokémon.\nIt can create blizzards by\nfreezing moisture in the air.", "category": "Freeze 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": 90, + "rarity": 3, + "unused": 4365 } } \ No newline at end of file diff --git a/res/pokemon/azelf/data.json b/res/pokemon/azelf/data.json index a4e6bcee87..738955ba86 100644 --- a/res/pokemon/azelf/data.json +++ b/res/pokemon/azelf/data.json @@ -145,5 +145,12 @@ "pokemon_pos_m": 65526, "entry_text": "When AZELF flew, people gained the\ndetermination to do things.\nIt was the birth of willpower.", "category": "Willpower 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/azumarill/data.json b/res/pokemon/azumarill/data.json index 692033e99f..e84eb4e14d 100644 --- a/res/pokemon/azumarill/data.json +++ b/res/pokemon/azumarill/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 19, "entry_text": "It can spend all day in water,\nsince it can inhale and store\na large volume of air.", "category": "Aqua Rabbit 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": 70, + "rarity": 20, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/azurill/data.json b/res/pokemon/azurill/data.json index d31986b96b..39f7fe60ea 100644 --- a/res/pokemon/azurill/data.json +++ b/res/pokemon/azurill/data.json @@ -113,5 +113,12 @@ "pokemon_pos_m": 27, "entry_text": "Its tail bounces like a rubber ball.\nIt flings that tail around to fight\nopponents bigger than itself.", "category": "Polka Dot 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": 80, + "rarity": 10, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/bagon/data.json b/res/pokemon/bagon/data.json index bac4f63c0b..9f9e86a972 100644 --- a/res/pokemon/bagon/data.json +++ b/res/pokemon/bagon/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 23, "entry_text": "Dreaming of one day flying, it\npractices by leaping off cliffs\nevery day.", "category": "Rock Head 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": 50, + "rarity": 30, + "unused": 3855 } } \ No newline at end of file diff --git a/res/pokemon/baltoy/data.json b/res/pokemon/baltoy/data.json index 8932039ea1..73cc826827 100644 --- a/res/pokemon/baltoy/data.json +++ b/res/pokemon/baltoy/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 26, "entry_text": "It moves by spinning on its foot.\nIt is a rare Pokémon that was\ndiscovered in ancient ruins.", "category": "Clay Doll 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": 50, + "rarity": 30, + "unused": 2568 } } \ No newline at end of file diff --git a/res/pokemon/banette/data.json b/res/pokemon/banette/data.json index 45b78f7cf9..47d896f456 100644 --- a/res/pokemon/banette/data.json +++ b/res/pokemon/banette/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 13, "entry_text": "A doll that became a Pokémon over\nits grudge from being junked. It\nseeks the child that disowned it.", "category": "Marionette 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": 3084 } } \ No newline at end of file diff --git a/res/pokemon/barboach/data.json b/res/pokemon/barboach/data.json index 966fe4520b..469181a5bd 100644 --- a/res/pokemon/barboach/data.json +++ b/res/pokemon/barboach/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 65531, "entry_text": "Its slimy body is hard to grasp. In\none region, it is said to have been\nborn from hardened mud.", "category": "Whiskers 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": 2051 } } \ No newline at end of file diff --git a/res/pokemon/bastiodon/data.json b/res/pokemon/bastiodon/data.json index 96bf6cab78..8cd1cd9def 100644 --- a/res/pokemon/bastiodon/data.json +++ b/res/pokemon/bastiodon/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 9, "entry_text": "When they lined up side by side, no\nfoe could break through. They\nshielded their young in that way.", "category": "Shield 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": 2827 } } \ No newline at end of file diff --git a/res/pokemon/bayleef/data.json b/res/pokemon/bayleef/data.json index a9c9ed54e8..218402a208 100644 --- a/res/pokemon/bayleef/data.json +++ b/res/pokemon/bayleef/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 7, "entry_text": "The buds that ring its neck give\noff a spicy aroma that perks\npeople up.", "category": "Leaf 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/beautifly/data.json b/res/pokemon/beautifly/data.json index 2eff034dc4..1ba42ab766 100644 --- a/res/pokemon/beautifly/data.json +++ b/res/pokemon/beautifly/data.json @@ -118,5 +118,12 @@ "pokemon_pos_m": 65526, "entry_text": "Despite its looks, it is aggressive.\nIt jabs with its long, thin mouth if\ndisturbed while collecting pollen.", "category": "Butterfly 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/beedrill/data.json b/res/pokemon/beedrill/data.json index 01ba9696e2..ccf41a8156 100644 --- a/res/pokemon/beedrill/data.json +++ b/res/pokemon/beedrill/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 65529, "entry_text": "Its best attack involves flying\naround at high speed, striking with\npoison needles, then flying off.", "category": "Poison Bee 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": 1540 } } \ No newline at end of file diff --git a/res/pokemon/beldum/data.json b/res/pokemon/beldum/data.json index b5650478bd..4772de1284 100644 --- a/res/pokemon/beldum/data.json +++ b/res/pokemon/beldum/data.json @@ -79,5 +79,12 @@ "pokemon_pos_m": 65529, "entry_text": "It converses with others by using\nmagnetic pulses. In a swarm, they\nmove in perfect unison.", "category": "Iron Ball 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": 2574 } } \ No newline at end of file diff --git a/res/pokemon/bellossom/data.json b/res/pokemon/bellossom/data.json index d11f206a6c..36c48bf72b 100644 --- a/res/pokemon/bellossom/data.json +++ b/res/pokemon/bellossom/data.json @@ -114,5 +114,12 @@ "pokemon_pos_m": 27, "entry_text": "When the heavy rainfall season\nends, it is drawn out by warm\nsunlight to dance in the open.", "category": "Flower 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": 80, + "rarity": 10, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/bellsprout/data.json b/res/pokemon/bellsprout/data.json index 9cf08e97bc..e4cc50e284 100644 --- a/res/pokemon/bellsprout/data.json +++ b/res/pokemon/bellsprout/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 22, "entry_text": "It prefers hot and humid\nenvironments. It is quick at\ncapturing prey with its vines.", "category": "Flower 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": 30, + "rarity": 50, + "unused": 1537 } } \ No newline at end of file diff --git a/res/pokemon/bibarel/data.json b/res/pokemon/bibarel/data.json index d8b238c76d..99ebb8ef54 100644 --- a/res/pokemon/bibarel/data.json +++ b/res/pokemon/bibarel/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 15, "entry_text": "A river dammed by BIBAREL will\nnever overflow its banks, which\nis appreciated by people nearby.", "category": "Beaver 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": 773 } } \ No newline at end of file diff --git a/res/pokemon/bidoof/data.json b/res/pokemon/bidoof/data.json index 1593b0909f..a1dcc9e615 100644 --- a/res/pokemon/bidoof/data.json +++ b/res/pokemon/bidoof/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 25, "entry_text": "A comparison revealed that\nBIDOOF’s front teeth grow at\nthe same rate as RATTATA’s.", "category": "Plump Mouse 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": 30, + "rarity": 50, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/blastoise/data.json b/res/pokemon/blastoise/data.json index 02c67934a7..418733cf16 100644 --- a/res/pokemon/blastoise/data.json +++ b/res/pokemon/blastoise/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 1, "entry_text": "The jets of water it spouts from\nthe rocket cannons on its shell\ncan punch through thick steel.", "category": "Shellfish 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": 90, + "rarity": 3, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/blaziken/data.json b/res/pokemon/blaziken/data.json index 174f4a0d03..614f9f0e96 100644 --- a/res/pokemon/blaziken/data.json +++ b/res/pokemon/blaziken/data.json @@ -144,5 +144,12 @@ "pokemon_pos_m": 5, "entry_text": "Flames spout from its wrists,\nenveloping its knuckles. Its\npunches scorch its foes.", "category": "Blaze 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": 2306 } } \ No newline at end of file diff --git a/res/pokemon/blissey/data.json b/res/pokemon/blissey/data.json index 236b7e828b..0eed852761 100644 --- a/res/pokemon/blissey/data.json +++ b/res/pokemon/blissey/data.json @@ -155,5 +155,12 @@ "pokemon_pos_m": 6, "entry_text": "The eggs it lays are filled with\nhappiness. Eating even one bite\nwill bring a smile to anyone.", "category": "Happiness 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/bonsly/data.json b/res/pokemon/bonsly/data.json index 35fa87ee50..8e84a3056d 100644 --- a/res/pokemon/bonsly/data.json +++ b/res/pokemon/bonsly/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 27, "entry_text": "It prefers an arid atmosphere. It\nleaks water that looks like tears\nwhen adjusting its moisture level.", "category": "Bonsai 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/breloom/data.json b/res/pokemon/breloom/data.json index ecad4b1cec..4d1e016124 100644 --- a/res/pokemon/breloom/data.json +++ b/res/pokemon/breloom/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 8, "entry_text": "Its short arms stretch when it\nthrows punches. Its technique is\nequal to that of pro boxers.", "category": "Mushroom 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": 2305 } } \ No newline at end of file diff --git a/res/pokemon/bronzong/data.json b/res/pokemon/bronzong/data.json index 536c83b98a..381d6f0c33 100644 --- a/res/pokemon/bronzong/data.json +++ b/res/pokemon/bronzong/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 7, "entry_text": "It brought rains by opening portals\nto another world. It was revered\nas a bringer of plentiful harvests.", "category": "Bronze Bell 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": 2827 } } \ No newline at end of file diff --git a/res/pokemon/bronzor/data.json b/res/pokemon/bronzor/data.json index cc10a8abba..1cb68700fc 100644 --- a/res/pokemon/bronzor/data.json +++ b/res/pokemon/bronzor/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 65528, "entry_text": "There are researchers who believe\nthis Pokémon reflected like a mirror\nin the distant past.", "category": "Bronze 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": 2574 } } \ No newline at end of file diff --git a/res/pokemon/budew/data.json b/res/pokemon/budew/data.json index e7b5b8ad87..1206a0d940 100644 --- a/res/pokemon/budew/data.json +++ b/res/pokemon/budew/data.json @@ -116,5 +116,12 @@ "pokemon_pos_m": 29, "entry_text": "Sensitive to changing temperature,\nthe bud is said to bloom when it\nfeels the sun’s warm touch.", "category": "Bud 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/buizel/data.json b/res/pokemon/buizel/data.json index 99706e73f1..850250589a 100644 --- a/res/pokemon/buizel/data.json +++ b/res/pokemon/buizel/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 23, "entry_text": "It spins its two tails like a screw\nto propel itself through water. The\ntails also slice clinging seaweed.", "category": "Sea Weasel 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/bulbasaur/data.json b/res/pokemon/bulbasaur/data.json index ad2181b4d5..b1d88da784 100644 --- a/res/pokemon/bulbasaur/data.json +++ b/res/pokemon/bulbasaur/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 22, "entry_text": "For some time after its birth, it\ngrows by gaining nourishment from\nthe seed on its back.", "category": "Seed 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/buneary/data.json b/res/pokemon/buneary/data.json index 7701464a73..002f4546b0 100644 --- a/res/pokemon/buneary/data.json +++ b/res/pokemon/buneary/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 16, "entry_text": "Its ears are always rolled up. They\ncan be forcefully extended to\nshatter even a large boulder.", "category": "Rabbit 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/burmy/data.json b/res/pokemon/burmy/data.json index 230a0e9516..ed0c1f4e61 100644 --- a/res/pokemon/burmy/data.json +++ b/res/pokemon/burmy/data.json @@ -85,5 +85,12 @@ "pokemon_pos_m": 65530, "entry_text": "Even if it is born where there are\nno cocooning materials, it somehow\nalways ends up with a cloak.", "category": "Bagworm 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/butterfree/data.json b/res/pokemon/butterfree/data.json index 2bb4d3e3a8..0775dd9257 100644 --- a/res/pokemon/butterfree/data.json +++ b/res/pokemon/butterfree/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 65532, "entry_text": "It loves the honey of flowers and\ncan locate flower patches that\nhave even tiny amounts of pollen.", "category": "Butterfly 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/cacnea/data.json b/res/pokemon/cacnea/data.json index 95950af6ab..18fe2f80a7 100644 --- a/res/pokemon/cacnea/data.json +++ b/res/pokemon/cacnea/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 27, "entry_text": "By storing water in its body, this\ndesert dweller can survive for 30\ndays without water.", "category": "Cactus 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": 50, + "rarity": 30, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/cacturne/data.json b/res/pokemon/cacturne/data.json index 6fef745e57..4e914bb537 100644 --- a/res/pokemon/cacturne/data.json +++ b/res/pokemon/cacturne/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 10, "entry_text": "It becomes active at night,\nseeking prey that is exhausted\nfrom the day’s desert heat.", "category": "Scarecrow 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": 4097 } } \ No newline at end of file diff --git a/res/pokemon/camerupt/data.json b/res/pokemon/camerupt/data.json index ef178b5424..5f76ff4b70 100644 --- a/res/pokemon/camerupt/data.json +++ b/res/pokemon/camerupt/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 3, "entry_text": "It has volcanoes on its back. If\nmagma builds up in its body, it\nshudders, then erupts violently.", "category": "Eruption 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": 2050 } } \ No newline at end of file diff --git a/res/pokemon/carnivine/data.json b/res/pokemon/carnivine/data.json index 7a50e0e874..a05f43460d 100644 --- a/res/pokemon/carnivine/data.json +++ b/res/pokemon/carnivine/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 65533, "entry_text": "It binds itself to trees in marshes.\nIt attracts prey with its sweet-\nsmelling drool and gulps them down.", "category": "Bug Catcher 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": 3329 } } \ No newline at end of file diff --git a/res/pokemon/carvanha/data.json b/res/pokemon/carvanha/data.json index d0858d5381..119efd6977 100644 --- a/res/pokemon/carvanha/data.json +++ b/res/pokemon/carvanha/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 65524, "entry_text": "They swarm any foe that invades\ntheir territory. Their sharp fangs\ncan tear out boat hulls.", "category": "Savage 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": 50, + "rarity": 30, + "unused": 4099 } } \ No newline at end of file diff --git a/res/pokemon/cascoon/data.json b/res/pokemon/cascoon/data.json index bb521d8835..ee13edfaf0 100644 --- a/res/pokemon/cascoon/data.json +++ b/res/pokemon/cascoon/data.json @@ -78,5 +78,12 @@ "pokemon_pos_m": 22, "entry_text": "It never forgets any attack it\nendured while in the cocoon.\nAfter evolution, it seeks payback.", "category": "Cocoon 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/castform/data.json b/res/pokemon/castform/data.json index acf9dfd402..e6b930a5a4 100644 --- a/res/pokemon/castform/data.json +++ b/res/pokemon/castform/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 65523, "entry_text": "Its appearance changes with the\nweather. Recently, its molecules\nwere found to be just like water.", "category": "Weather 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/caterpie/data.json b/res/pokemon/caterpie/data.json index 3fef1cd9a6..6e5dd4e515 100644 --- a/res/pokemon/caterpie/data.json +++ b/res/pokemon/caterpie/data.json @@ -81,5 +81,12 @@ "pokemon_pos_m": 28, "entry_text": "It releases a stench from its red\nantenna to repel enemies. It\ngrows by molting repeatedly.", "category": "Worm 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": 30, + "rarity": 50, + "unused": 1028 } } \ No newline at end of file diff --git a/res/pokemon/celebi/data.json b/res/pokemon/celebi/data.json index cefaff622f..21b73a4611 100644 --- a/res/pokemon/celebi/data.json +++ b/res/pokemon/celebi/data.json @@ -144,5 +144,12 @@ "pokemon_pos_m": 65535, "entry_text": "It has the power to travel across\ntime, but it is said to appear only\nin peaceful times.", "category": "Time Travel 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": 100, + "rarity": 1, + "unused": 266 } } \ No newline at end of file diff --git a/res/pokemon/chansey/data.json b/res/pokemon/chansey/data.json index 8c3870ea5c..6352adb0e0 100644 --- a/res/pokemon/chansey/data.json +++ b/res/pokemon/chansey/data.json @@ -159,5 +159,12 @@ "pokemon_pos_m": 10, "entry_text": "A kindly Pokémon that lays highly\nnutritious eggs and shares them\nwith injured Pokémon or people.", "category": "Egg 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/charizard/data.json b/res/pokemon/charizard/data.json index a54c402f42..e516b71c79 100644 --- a/res/pokemon/charizard/data.json +++ b/res/pokemon/charizard/data.json @@ -146,5 +146,12 @@ "pokemon_pos_m": 0, "entry_text": "It is said that CHARIZARD’s fire\nburns hotter if it has\nexperienced harsh battles.", "category": "Flame 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": 4354 } } \ No newline at end of file diff --git a/res/pokemon/charmander/data.json b/res/pokemon/charmander/data.json index a1a68dcb59..6a55f5669c 100644 --- a/res/pokemon/charmander/data.json +++ b/res/pokemon/charmander/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 23, "entry_text": "The fire on the tip of its tail is a\nmeasure of its life. If healthy,\nits tail burns intensely.", "category": "Lizard 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/charmeleon/data.json b/res/pokemon/charmeleon/data.json index 6f257b647c..51942c94e3 100644 --- a/res/pokemon/charmeleon/data.json +++ b/res/pokemon/charmeleon/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 15, "entry_text": "In the rocky mountains where\nCHARMELEON live, their fiery\ntails shine at night like stars.", "category": "Flame 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 } } \ No newline at end of file diff --git a/res/pokemon/chatot/data.json b/res/pokemon/chatot/data.json index 8343b6713e..39a3a87c1a 100644 --- a/res/pokemon/chatot/data.json +++ b/res/pokemon/chatot/data.json @@ -117,5 +117,12 @@ "pokemon_pos_m": 24, "entry_text": "Its tongue is just like a human’s.\nAs a result, it can cleverly mimic\nhuman speech.", "category": "Music Note 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/cherrim/data.json b/res/pokemon/cherrim/data.json index db5b6c48b8..75ffde7d26 100644 --- a/res/pokemon/cherrim/data.json +++ b/res/pokemon/cherrim/data.json @@ -115,5 +115,12 @@ "pokemon_pos_m": 25, "entry_text": "If it senses strong sunlight, it\nopens its folded petals to absorb\nthe sun’s rays with its whole body.", "category": "Blossom 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/cherubi/data.json b/res/pokemon/cherubi/data.json index 1b2861b498..cca0d1960a 100644 --- a/res/pokemon/cherubi/data.json +++ b/res/pokemon/cherubi/data.json @@ -116,5 +116,12 @@ "pokemon_pos_m": 25, "entry_text": "The small ball is not only filled with\nnutrients, it is also tasty. STARLY\ntry to peck it off.", "category": "Cherry 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": 4364 } } \ No newline at end of file diff --git a/res/pokemon/chikorita/data.json b/res/pokemon/chikorita/data.json index df7dd5a4ca..762dc87a21 100644 --- a/res/pokemon/chikorita/data.json +++ b/res/pokemon/chikorita/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 17, "entry_text": "It uses the leaf on its head to\ndetermine the temperature and\nhumidity. It loves to sunbathe.", "category": "Leaf 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/chimchar/data.json b/res/pokemon/chimchar/data.json index 9cb443a672..a219c7be73 100644 --- a/res/pokemon/chimchar/data.json +++ b/res/pokemon/chimchar/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 25, "entry_text": "It is very agile. Before going to\nsleep, it extinguishes the flame\non its tail to prevent fires.", "category": "Chimp 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/chimecho/data.json b/res/pokemon/chimecho/data.json index 1e8411059f..9c22ee704e 100644 --- a/res/pokemon/chimecho/data.json +++ b/res/pokemon/chimecho/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 65523, "entry_text": "Its cries echo inside its hollow\nbody to emerge as beautiful notes\nfor startling and repelling foes.", "category": "Wind Chime 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/chinchou/data.json b/res/pokemon/chinchou/data.json index ddfe6cff18..fbf1714e08 100644 --- a/res/pokemon/chinchou/data.json +++ b/res/pokemon/chinchou/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 5, "entry_text": "It discharges positive and\nnegative electricity from its\nantenna tips to shock its foes.", "category": "Angler 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": 50, + "rarity": 30, + "unused": 1795 } } \ No newline at end of file diff --git a/res/pokemon/chingling/data.json b/res/pokemon/chingling/data.json index b22e8a5b76..4f07386a62 100644 --- a/res/pokemon/chingling/data.json +++ b/res/pokemon/chingling/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 65527, "entry_text": "There is an orb inside its mouth.\nWhen it hops, the orb bounces all\nover and makes a ringing sound.", "category": "Bell 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": 70, + "rarity": 20, + "unused": 1297 } } \ No newline at end of file diff --git a/res/pokemon/clamperl/data.json b/res/pokemon/clamperl/data.json index 55080ceb68..8f18bf8e79 100644 --- a/res/pokemon/clamperl/data.json +++ b/res/pokemon/clamperl/data.json @@ -115,5 +115,12 @@ "pokemon_pos_m": 25, "entry_text": "It makes a single pearl during\nits lifetime. The pearl is said\nto amplify psychic power.", "category": "Bivalve 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/claydol/data.json b/res/pokemon/claydol/data.json index a870018f93..bc462a146a 100644 --- a/res/pokemon/claydol/data.json +++ b/res/pokemon/claydol/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 0, "entry_text": "An ancient clay figurine that came\nto life as a Pokémon from exposure\nto a mysterious ray of light.", "category": "Clay Doll 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": 2568 } } \ No newline at end of file diff --git a/res/pokemon/clefable/data.json b/res/pokemon/clefable/data.json index 57bd7dbc72..2e8dd6f273 100644 --- a/res/pokemon/clefable/data.json +++ b/res/pokemon/clefable/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 9, "entry_text": "It is very wary and rarely shows\nitself to people. Its ears can hear\na pin drop over half a mile away.", "category": "Fairy 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": 90, + "rarity": 3, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/clefairy/data.json b/res/pokemon/clefairy/data.json index 24b0399186..5dfba4aa80 100644 --- a/res/pokemon/clefairy/data.json +++ b/res/pokemon/clefairy/data.json @@ -160,5 +160,12 @@ "pokemon_pos_m": 23, "entry_text": "It is said that happiness will come\nto those who see a gathering of\nCLEFAIRY dancing under a full moon.", "category": "Fairy 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/cleffa/data.json b/res/pokemon/cleffa/data.json index 1480bd10cb..1674769b46 100644 --- a/res/pokemon/cleffa/data.json +++ b/res/pokemon/cleffa/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 29, "entry_text": "It is often seen when shooting\nstars fill the night skies. It’s said\nto arrive riding on a shooting star.", "category": "Star Shape 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/cloyster/data.json b/res/pokemon/cloyster/data.json index 63ef607063..a75bd214b7 100644 --- a/res/pokemon/cloyster/data.json +++ b/res/pokemon/cloyster/data.json @@ -114,5 +114,12 @@ "pokemon_pos_m": 9, "entry_text": "It fights by keeping its shell\ntightly shut for protection and\nby shooting spikes to repel foes.", "category": "Bivalve 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": 3331 } } \ No newline at end of file diff --git a/res/pokemon/combee/data.json b/res/pokemon/combee/data.json index 91bad215ae..64a5e21186 100644 --- a/res/pokemon/combee/data.json +++ b/res/pokemon/combee/data.json @@ -86,5 +86,12 @@ "pokemon_pos_m": 65528, "entry_text": "The trio is together from birth.\nIt constantly gathers honey from\nflowers to please VESPIQUEN.", "category": "Tiny Bee 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/combusken/data.json b/res/pokemon/combusken/data.json index 90f63719f4..ef034a7a73 100644 --- a/res/pokemon/combusken/data.json +++ b/res/pokemon/combusken/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 17, "entry_text": "Its kicking mastery lets it loose\n10 kicks per second. It emits\nsharp cries to intimidate foes.", "category": "Young Fowl 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": 2306 } } \ No newline at end of file diff --git a/res/pokemon/corphish/data.json b/res/pokemon/corphish/data.json index 0a78a87801..8a6f938307 100644 --- a/res/pokemon/corphish/data.json +++ b/res/pokemon/corphish/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 23, "entry_text": "Its hardy vitality enables it to\nadapt to any environment. Its\npincers will never release prey.", "category": "Ruffian 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 } } \ No newline at end of file diff --git a/res/pokemon/corsola/data.json b/res/pokemon/corsola/data.json index 55fc4d5b15..73f86003fa 100644 --- a/res/pokemon/corsola/data.json +++ b/res/pokemon/corsola/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 23, "entry_text": "Many live in the clean seas of the\nsouth. They apparently can’t live\nin polluted waters.", "category": "Coral 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": 2819 } } \ No newline at end of file diff --git a/res/pokemon/cradily/data.json b/res/pokemon/cradily/data.json index 7521750186..9ed0edd264 100644 --- a/res/pokemon/cradily/data.json +++ b/res/pokemon/cradily/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 6, "entry_text": "It lives in the shallows of warm\nseas. When the tide goes out, it\ndigs up prey from beaches.", "category": "Barnacle 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": 80, + "rarity": 10, + "unused": 267 } } \ No newline at end of file diff --git a/res/pokemon/cranidos/data.json b/res/pokemon/cranidos/data.json index 5189c89599..6dbaa5560d 100644 --- a/res/pokemon/cranidos/data.json +++ b/res/pokemon/cranidos/data.json @@ -144,5 +144,12 @@ "pokemon_pos_m": 21, "entry_text": "A lifelong jungle dweller from 100\nmillion years ago, it would snap\nobstructing trees with head butts.", "category": "Head Butt 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": 3595 } } \ No newline at end of file diff --git a/res/pokemon/crawdaunt/data.json b/res/pokemon/crawdaunt/data.json index ced6dcd64a..f7574c49a7 100644 --- a/res/pokemon/crawdaunt/data.json +++ b/res/pokemon/crawdaunt/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 12, "entry_text": "It is a ruffian that uses its\npincers to pick up and toss out\nother Pokémon from its pond.", "category": "Rogue 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": 70, + "rarity": 20, + "unused": 4099 } } \ No newline at end of file diff --git a/res/pokemon/cresselia/data.json b/res/pokemon/cresselia/data.json index bbe2ac0747..db2a52a85d 100644 --- a/res/pokemon/cresselia/data.json +++ b/res/pokemon/cresselia/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 65533, "entry_text": "On nights around the quarter moon,\nthe aurora from its tail extends\nand undulates beautifully.", "category": "Lunar 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": 90, + "rarity": 3, + "unused": 2570 } } \ No newline at end of file diff --git a/res/pokemon/croagunk/data.json b/res/pokemon/croagunk/data.json index 0f5202bf8f..2ab6ea9ce0 100644 --- a/res/pokemon/croagunk/data.json +++ b/res/pokemon/croagunk/data.json @@ -144,5 +144,12 @@ "pokemon_pos_m": 22, "entry_text": "It rarely fights fairly, but that is\nstrictly to ensure survival. It is\npopular as a mascot.", "category": "Toxic Mouth 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": 90, + "rarity": 3, + "unused": 4108 } } \ No newline at end of file diff --git a/res/pokemon/crobat/data.json b/res/pokemon/crobat/data.json index 805134bf84..2bcb126992 100644 --- a/res/pokemon/crobat/data.json +++ b/res/pokemon/crobat/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 65533, "entry_text": "The transformation of its legs into\nwings made it better at flying, but\nmore clumsy at walking.", "category": "Bat 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": 90, + "rarity": 3, + "unused": 4358 } } \ No newline at end of file diff --git a/res/pokemon/croconaw/data.json b/res/pokemon/croconaw/data.json index 6f772c8fdf..398cede217 100644 --- a/res/pokemon/croconaw/data.json +++ b/res/pokemon/croconaw/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 13, "entry_text": "Once it bites down, it won’t let go\nuntil it loses its fangs. New fangs\nquickly grow into place.", "category": "Big Jaw 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": 80, + "rarity": 10, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/cubone/data.json b/res/pokemon/cubone/data.json index 14516d2fad..ee02d2ee81 100644 --- a/res/pokemon/cubone/data.json +++ b/res/pokemon/cubone/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 28, "entry_text": "When it thinks of its dead mother,\nit cries. Its crying makes the\nskull it wears rattle hollowly.", "category": "Lonely 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": 50, + "rarity": 30, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/cyndaquil/data.json b/res/pokemon/cyndaquil/data.json index 77befed7ba..987e8f4f02 100644 --- a/res/pokemon/cyndaquil/data.json +++ b/res/pokemon/cyndaquil/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 23, "entry_text": "It has a timid nature. If it is\nstartled, the flames on its back\nburn more vigorously.", "category": "Fire Mouse 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/darkrai/data.json b/res/pokemon/darkrai/data.json index 0a9cd7511c..3314b67bf1 100644 --- a/res/pokemon/darkrai/data.json +++ b/res/pokemon/darkrai/data.json @@ -149,5 +149,12 @@ "pokemon_pos_m": 4, "entry_text": "To protect itself, it afflicts those\naround it with nightmares. However,\nit means no harm.", "category": "Pitch-Black 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": 3600 } } \ No newline at end of file diff --git a/res/pokemon/delcatty/data.json b/res/pokemon/delcatty/data.json index 07c3194373..ca053f833f 100644 --- a/res/pokemon/delcatty/data.json +++ b/res/pokemon/delcatty/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 12, "entry_text": "It is highly popular among female\nTrainers for its sublime fur.\nIt does not keep a nest.", "category": "Prim 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/delibird/data.json b/res/pokemon/delibird/data.json index e3c0e3801c..44de8b5510 100644 --- a/res/pokemon/delibird/data.json +++ b/res/pokemon/delibird/data.json @@ -109,5 +109,12 @@ "pokemon_pos_m": 15, "entry_text": "It carries food rolled up in its\ntail. It has the habit of sharing\nfood with people lost in mountains.", "category": "Delivery 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": 4365 } } \ No newline at end of file diff --git a/res/pokemon/deoxys/data.json b/res/pokemon/deoxys/data.json index c84a92d537..a19887308e 100644 --- a/res/pokemon/deoxys/data.json +++ b/res/pokemon/deoxys/data.json @@ -154,5 +154,12 @@ "pokemon_pos_m": 2, "entry_text": "An alien virus that fell to earth\non a meteor underwent a DNA\nmutation to become this Pokémon.", "category": "DNA 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/dewgong/data.json b/res/pokemon/dewgong/data.json index 935539be2c..3b4def45ce 100644 --- a/res/pokemon/dewgong/data.json +++ b/res/pokemon/dewgong/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 1, "entry_text": "In snow, the pure white coat\ncovering its body obscures it from\npredators.", "category": "Sea Lion 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": 3331 } } \ No newline at end of file diff --git a/res/pokemon/dialga/data.json b/res/pokemon/dialga/data.json index e5a2b3c7d7..dce7c94a31 100644 --- a/res/pokemon/dialga/data.json +++ b/res/pokemon/dialga/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 2, "entry_text": "A legendary Pokémon of Sinnoh.\nIt is said that time flows when\nDIALGA’s heart beats.", "category": "Temporal 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": 90, + "rarity": 3, + "unused": 3854 } } \ No newline at end of file diff --git a/res/pokemon/diglett/data.json b/res/pokemon/diglett/data.json index 5b7b73d063..a3398f72c2 100644 --- a/res/pokemon/diglett/data.json +++ b/res/pokemon/diglett/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 32, "entry_text": "A Pokémon that lives underground.\nBecause of its dark habitat, it is\nrepelled by bright sunlight.", "category": "Mole 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": 30, + "rarity": 50, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/ditto/data.json b/res/pokemon/ditto/data.json index 042775addc..80b92946f4 100644 --- a/res/pokemon/ditto/data.json +++ b/res/pokemon/ditto/data.json @@ -68,5 +68,12 @@ "pokemon_pos_m": 30, "entry_text": "It has the ability to reconstitute\nits entire cellular structure to\ntransform into whatever it sees.", "category": "Transform 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/dodrio/data.json b/res/pokemon/dodrio/data.json index ca9a692b1a..200fc461b1 100644 --- a/res/pokemon/dodrio/data.json +++ b/res/pokemon/dodrio/data.json @@ -121,5 +121,12 @@ "pokemon_pos_m": 2, "entry_text": "When DODUO evolves into this odd\nbreed, one of its heads splits into\ntwo. It runs at nearly 40 mph.", "category": "Triple Bird 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": 70, + "rarity": 20, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/doduo/data.json b/res/pokemon/doduo/data.json index 3e79ca9ec7..2819181032 100644 --- a/res/pokemon/doduo/data.json +++ b/res/pokemon/doduo/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 12, "entry_text": "The brains in its two heads appear\nto communicate emotions to each\nother with a telepathic power.", "category": "Twin Bird 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/donphan/data.json b/res/pokemon/donphan/data.json index d4c9d97b14..cda35dea1b 100644 --- a/res/pokemon/donphan/data.json +++ b/res/pokemon/donphan/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 17, "entry_text": "It attacks by curling up, then\nrolling into its foe. It can blow\napart a house in one hit.", "category": "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": 70, + "rarity": 20, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/dragonair/data.json b/res/pokemon/dragonair/data.json index 53eb06cbe5..8e12610802 100644 --- a/res/pokemon/dragonair/data.json +++ b/res/pokemon/dragonair/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 4, "entry_text": "If its body takes on an aura, the\nweather changes instantly. It is\nsaid to live in seas and lakes.", "category": "Dragon 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": 80, + "rarity": 10, + "unused": 3855 } } \ No newline at end of file diff --git a/res/pokemon/dragonite/data.json b/res/pokemon/dragonite/data.json index 729893abfb..2b2996595e 100644 --- a/res/pokemon/dragonite/data.json +++ b/res/pokemon/dragonite/data.json @@ -161,5 +161,12 @@ "pokemon_pos_m": 5, "entry_text": "It is said to make its home\nsomewhere in the sea. It guides\ncrews of shipwrecks to shore.", "category": "Dragon 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": 90, + "rarity": 3, + "unused": 4367 } } \ No newline at end of file diff --git a/res/pokemon/drapion/data.json b/res/pokemon/drapion/data.json index 4a483a7b1c..0c7d5f5193 100644 --- a/res/pokemon/drapion/data.json +++ b/res/pokemon/drapion/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 10, "entry_text": "Possessing a sturdy build, it takes\npride in its strength, taking down\nfoes without using toxins.", "category": "Ogre Scorp 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": 771 } } \ No newline at end of file diff --git a/res/pokemon/dratini/data.json b/res/pokemon/dratini/data.json index b6dca6adc8..15653d52bc 100644 --- a/res/pokemon/dratini/data.json +++ b/res/pokemon/dratini/data.json @@ -129,7 +129,14 @@ "pokemon_pos_f": 6, "trainer_pos_m": 5, "pokemon_pos_m": 6, - "entry_text": "It is called the \u201cMirage Pokémon\u201d\nbecause so few have seen it.\nIts shed skin has been found.", + "entry_text": "It is called the “Mirage Pokémon”\nbecause so few have seen it.\nIts shed skin has been found.", "category": "Dragon 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": 70, + "rarity": 20, + "unused": 3855 } } \ No newline at end of file diff --git a/res/pokemon/drifblim/data.json b/res/pokemon/drifblim/data.json index 24c1a14d1b..a578445949 100644 --- a/res/pokemon/drifblim/data.json +++ b/res/pokemon/drifblim/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 65528, "entry_text": "At dusk, swarms of them are\ncarried aloft on winds. When\nnoticed, they suddenly vanish.", "category": "Blimp 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": 80, + "rarity": 10, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/drifloon/data.json b/res/pokemon/drifloon/data.json index 7b493e8dbc..69a650cfc5 100644 --- a/res/pokemon/drifloon/data.json +++ b/res/pokemon/drifloon/data.json @@ -142,7 +142,14 @@ "pokemon_pos_f": 65522, "trainer_pos_m": 9, "pokemon_pos_m": 65522, - "entry_text": "Because of the way it floats\naimlessly, an old folktale calls it a\n\u201cSignpost for Wandering Spirits.\u201d", + "entry_text": "Because of the way it floats\naimlessly, an old folktale calls it a\n“Signpost for Wandering Spirits.”", "category": "Balloon 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": 70, + "rarity": 20, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/drowzee/data.json b/res/pokemon/drowzee/data.json index a32c3c7566..950ace0f72 100644 --- a/res/pokemon/drowzee/data.json +++ b/res/pokemon/drowzee/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 19, "entry_text": "It can tell what people are\ndreaming by sniffing with its big\nnose. It loves fun dreams.", "category": "Hypnosis 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/dugtrio/data.json b/res/pokemon/dugtrio/data.json index 90a425796a..4fe2502eec 100644 --- a/res/pokemon/dugtrio/data.json +++ b/res/pokemon/dugtrio/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 23, "entry_text": "Its three heads move alternately,\ndriving it through tough soil to\ndepths of over 60 miles.", "category": "Mole 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": 50, + "rarity": 30, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/dunsparce/data.json b/res/pokemon/dunsparce/data.json index ae9475386a..d75a87aca9 100644 --- a/res/pokemon/dunsparce/data.json +++ b/res/pokemon/dunsparce/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 16, "entry_text": "It digs into the ground with its\ntail and makes a mazelike nest.\nIt can fly just a little.", "category": "Land Snake 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": 90, + "rarity": 3, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/dusclops/data.json b/res/pokemon/dusclops/data.json index 337fc8523c..a601e70bf2 100644 --- a/res/pokemon/dusclops/data.json +++ b/res/pokemon/dusclops/data.json @@ -155,5 +155,12 @@ "pokemon_pos_m": 2, "entry_text": "It seeks drifting will-o’-the-wisps\nand sucks them into its empty body.\nWhat happens inside is a mystery.", "category": "Beckon 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": 3084 } } \ No newline at end of file diff --git a/res/pokemon/dusknoir/data.json b/res/pokemon/dusknoir/data.json index b688cb043f..e179a2d76c 100644 --- a/res/pokemon/dusknoir/data.json +++ b/res/pokemon/dusknoir/data.json @@ -149,5 +149,12 @@ "pokemon_pos_m": 6, "entry_text": "It is said to take lost spirits\ninto its pliant body and guide\nthem home.", "category": "Gripper 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": 80, + "rarity": 10, + "unused": 3084 } } \ No newline at end of file diff --git a/res/pokemon/duskull/data.json b/res/pokemon/duskull/data.json index 39d5f84b15..ac1917213e 100644 --- a/res/pokemon/duskull/data.json +++ b/res/pokemon/duskull/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 21, "entry_text": "It loves the crying of children. It\nstartles bad kids by passing\nthrough walls and making them cry.", "category": "Requiem 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": 3084 } } \ No newline at end of file diff --git a/res/pokemon/dustox/data.json b/res/pokemon/dustox/data.json index 175b4f8a54..6128127278 100644 --- a/res/pokemon/dustox/data.json +++ b/res/pokemon/dustox/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 65527, "entry_text": "Toxic powder is scattered with each\nflap. At night, it is known to strip\nleaves off trees lining boulevards.", "category": "Poison Moth 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": 1540 } } \ No newline at end of file diff --git a/res/pokemon/eevee/data.json b/res/pokemon/eevee/data.json index 11ce0ed874..dc6d032322 100644 --- a/res/pokemon/eevee/data.json +++ b/res/pokemon/eevee/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 29, "entry_text": "Because its genetic makeup is\nirregular, it quickly changes its\nform due to a variety of causes.", "category": "Evolution 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/ekans/data.json b/res/pokemon/ekans/data.json index f2ff408d6e..997b5de794 100644 --- a/res/pokemon/ekans/data.json +++ b/res/pokemon/ekans/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 19, "entry_text": "It sneaks through grass without\nmaking a sound and strikes\nunsuspecting prey from behind.", "category": "Snake 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": 30, + "rarity": 50, + "unused": 1542 } } \ No newline at end of file diff --git a/res/pokemon/electabuzz/data.json b/res/pokemon/electabuzz/data.json index e09acbafee..0323f11731 100644 --- a/res/pokemon/electabuzz/data.json +++ b/res/pokemon/electabuzz/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 6, "entry_text": "It windmills its arms to slightly\nboost its punches. Foes have been\nknown to escape in the meantime.", "category": "Electric 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/electivire/data.json b/res/pokemon/electivire/data.json index bb44b736e4..83218ba307 100644 --- a/res/pokemon/electivire/data.json +++ b/res/pokemon/electivire/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 7, "entry_text": "Heedless of enemy attacks, it\ncloses in, shoves its tails onto the\nfoe, then looses high voltage.", "category": "Thunderbolt 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/electrike/data.json b/res/pokemon/electrike/data.json index 1d9c9d733c..0aa1f37923 100644 --- a/res/pokemon/electrike/data.json +++ b/res/pokemon/electrike/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 23, "entry_text": "Using electricity stored in its fur,\nit stimulates its muscles to\nheighten its reaction speed.", "category": "Lightning 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/electrode/data.json b/res/pokemon/electrode/data.json index 216ff2755f..e2e0e385f2 100644 --- a/res/pokemon/electrode/data.json +++ b/res/pokemon/electrode/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 11, "entry_text": "It is known to drift on winds if it\nis bloated to bursting with stored\nelectricity.", "category": "Ball 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": 70, + "rarity": 20, + "unused": 1799 } } \ No newline at end of file diff --git a/res/pokemon/elekid/data.json b/res/pokemon/elekid/data.json index 3828b24135..4658067439 100644 --- a/res/pokemon/elekid/data.json +++ b/res/pokemon/elekid/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 23, "entry_text": "A weak electric current flows\nbetween its horns. Sticking a hand\nthere shocks the unwary.", "category": "Electric 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/empoleon/data.json b/res/pokemon/empoleon/data.json index f668dc56f8..cb767e2716 100644 --- a/res/pokemon/empoleon/data.json +++ b/res/pokemon/empoleon/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 3, "entry_text": "If anyone were to hurt its pride,\nit would slash them with wings that\ncan cleave through an ice floe.", "category": "Emperor 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": 90, + "rarity": 3, + "unused": 3587 } } \ No newline at end of file diff --git a/res/pokemon/entei/data.json b/res/pokemon/entei/data.json index cfd2cdaee0..f6993fef28 100644 --- a/res/pokemon/entei/data.json +++ b/res/pokemon/entei/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 3, "entry_text": "It is said that when it roars, a\nvolcano erupts somewhere around\nthe globe.", "category": "Volcano 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": 90, + "rarity": 3, + "unused": 514 } } \ No newline at end of file diff --git a/res/pokemon/espeon/data.json b/res/pokemon/espeon/data.json index e7a57edf5e..1eb707406f 100644 --- a/res/pokemon/espeon/data.json +++ b/res/pokemon/espeon/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 12, "entry_text": "Its fur is so sensitive, it can\nsense minute shifts in the air\nand predict the weather.", "category": "Sun 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 } } \ No newline at end of file diff --git a/res/pokemon/exeggcute/data.json b/res/pokemon/exeggcute/data.json index e727ccb6c7..9fa3b8c48c 100644 --- a/res/pokemon/exeggcute/data.json +++ b/res/pokemon/exeggcute/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 28, "entry_text": "Its six eggs converse using\ntelepathy. They can quickly gather\nif they become separated.", "category": "Egg 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": 2561 } } \ No newline at end of file diff --git a/res/pokemon/exeggutor/data.json b/res/pokemon/exeggutor/data.json index 58ad219af8..5a05a174ba 100644 --- a/res/pokemon/exeggutor/data.json +++ b/res/pokemon/exeggutor/data.json @@ -121,7 +121,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 14, "pokemon_pos_m": 2, - "entry_text": "It is called \u201cThe Walking Jungle.\u201d\nIf a head grows too big, it falls\noff and becomes an EXEGGCUTE.", + "entry_text": "It is called “The Walking Jungle.”\nIf a head grows too big, it falls\noff and becomes an EXEGGCUTE.", "category": "Coconut 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": 2561 } } \ No newline at end of file diff --git a/res/pokemon/exploud/data.json b/res/pokemon/exploud/data.json index 5457192f8e..3e3b2713e5 100644 --- a/res/pokemon/exploud/data.json +++ b/res/pokemon/exploud/data.json @@ -146,5 +146,12 @@ "pokemon_pos_m": 6, "entry_text": "Its howls can be heard over six\nmiles away. It emits all sorts of\nnoises from the ports on its body.", "category": "Loud Noise 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/farfetchd/data.json b/res/pokemon/farfetchd/data.json index 630bfd48fb..859e1431de 100644 --- a/res/pokemon/farfetchd/data.json +++ b/res/pokemon/farfetchd/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 20, "entry_text": "It can’t live without the stalk it\nholds. That’s why it defends the\nstalk from attackers with its life.", "category": "Wild Duck 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": 70, + "rarity": 20, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/fearow/data.json b/res/pokemon/fearow/data.json index d54640a751..9ab92cd38d 100644 --- a/res/pokemon/fearow/data.json +++ b/res/pokemon/fearow/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 0, "entry_text": "It has the stamina to fly all\nday on its broad wings. It\nfights by using its sharp beak.", "category": "Beak 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/feebas/data.json b/res/pokemon/feebas/data.json index 3126cf64ae..d9b230fa0f 100644 --- a/res/pokemon/feebas/data.json +++ b/res/pokemon/feebas/data.json @@ -106,5 +106,12 @@ "pokemon_pos_m": 65535, "entry_text": "It is a shabby and ugly Pokémon.\nHowever, it is very hardy and\ncan survive on little water.", "category": "Fish 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": 771 } } \ No newline at end of file diff --git a/res/pokemon/feraligatr/data.json b/res/pokemon/feraligatr/data.json index 86b5fd7de0..022b5f4088 100644 --- a/res/pokemon/feraligatr/data.json +++ b/res/pokemon/feraligatr/data.json @@ -146,5 +146,12 @@ "pokemon_pos_m": 2, "entry_text": "It usually moves slowly, but it\ngoes at blinding speed when it\nattacks and bites prey.", "category": "Big Jaw 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": 90, + "rarity": 3, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/finneon/data.json b/res/pokemon/finneon/data.json index 06896c87fc..e47c84b178 100644 --- a/res/pokemon/finneon/data.json +++ b/res/pokemon/finneon/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 65534, "entry_text": "The line running down its side can\nstore sunlight. It shines vividly at\nnight.", "category": "Wing Fish 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": 3344 } } \ No newline at end of file diff --git a/res/pokemon/flaaffy/data.json b/res/pokemon/flaaffy/data.json index 8ba3dbbf72..45b7281a5a 100644 --- a/res/pokemon/flaaffy/data.json +++ b/res/pokemon/flaaffy/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 18, "entry_text": "If its coat becomes fully charged\nwith electricity, its tail lights up.\nIt fires hair that zaps on impact.", "category": "Wool 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": 70, + "rarity": 20, + "unused": 1799 } } \ No newline at end of file diff --git a/res/pokemon/flareon/data.json b/res/pokemon/flareon/data.json index df102f20e0..c012490ef5 100644 --- a/res/pokemon/flareon/data.json +++ b/res/pokemon/flareon/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 16, "entry_text": "Inhaled air is heated in the flame\nsac in its body to an intense fire\nover 3,000 degrees Fahrenheit.", "category": "Flame 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/floatzel/data.json b/res/pokemon/floatzel/data.json index 56cd7e578a..042b99eced 100644 --- a/res/pokemon/floatzel/data.json +++ b/res/pokemon/floatzel/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 10, "entry_text": "It is a common sight around\nfishing ports. It is known to\nrescue people and carry off prey.", "category": "Sea Weasel 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": 4364 } } \ No newline at end of file diff --git a/res/pokemon/flygon/data.json b/res/pokemon/flygon/data.json index f0fce4e4f2..f8092704cf 100644 --- a/res/pokemon/flygon/data.json +++ b/res/pokemon/flygon/data.json @@ -135,7 +135,14 @@ "pokemon_pos_f": 1, "trainer_pos_m": 16, "pokemon_pos_m": 1, - "entry_text": "It whips up sandstorms with\npowerful flaps of its wings. It is\nknown as \u201cThe Desert Spirit.\u201d", + "entry_text": "It whips up sandstorms with\npowerful flaps of its wings. It is\nknown as “The Desert Spirit.”", "category": "Mystic 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": 3848 } } \ No newline at end of file diff --git a/res/pokemon/forretress/data.json b/res/pokemon/forretress/data.json index 5ee6192fd0..5b16e634eb 100644 --- a/res/pokemon/forretress/data.json +++ b/res/pokemon/forretress/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 9, "entry_text": "It is encased in a steel shell. Its\npeering eyes are all that can be\nseen of its mysterious innards.", "category": "Bagworm 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": 3588 } } \ No newline at end of file diff --git a/res/pokemon/froslass/data.json b/res/pokemon/froslass/data.json index b9e69ebbd2..011b9b738a 100644 --- a/res/pokemon/froslass/data.json +++ b/res/pokemon/froslass/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 7, "entry_text": "It freezes prey by blowing its -58\ndegrees F breath. It is said to\nthen secretly display its prey.", "category": "Snow Land 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": 3085 } } \ No newline at end of file diff --git a/res/pokemon/furret/data.json b/res/pokemon/furret/data.json index 0cd8a2dd4d..ec6a3558f3 100644 --- a/res/pokemon/furret/data.json +++ b/res/pokemon/furret/data.json @@ -145,5 +145,12 @@ "pokemon_pos_m": 18, "entry_text": "The mother puts its offspring to\nsleep by curling up around them.\nIt corners foes with speed.", "category": "Long Body 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/gabite/data.json b/res/pokemon/gabite/data.json index 469e957248..babfc5e513 100644 --- a/res/pokemon/gabite/data.json +++ b/res/pokemon/gabite/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 7, "entry_text": "It loves sparkly things. It seeks\ntreasures in caves and hoards the\nloot in its nest.", "category": "Cave 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": 4102 } } \ No newline at end of file diff --git a/res/pokemon/gallade/data.json b/res/pokemon/gallade/data.json index 198ae84ca7..23520710a9 100644 --- a/res/pokemon/gallade/data.json +++ b/res/pokemon/gallade/data.json @@ -161,5 +161,12 @@ "pokemon_pos_m": 4, "entry_text": "When trying to protect someone,\nit extends its elbows as if they\nwere swords and fights savagely.", "category": "Blade 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": 2314 } } \ No newline at end of file diff --git a/res/pokemon/garchomp/data.json b/res/pokemon/garchomp/data.json index 46ab9ecc51..5853bcf7de 100644 --- a/res/pokemon/garchomp/data.json +++ b/res/pokemon/garchomp/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 1, "entry_text": "It is said that when one runs at\nhigh speed, its wings create blades\nof wind that can fell nearby trees.", "category": "Mach 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": 2310 } } \ No newline at end of file diff --git a/res/pokemon/gardevoir/data.json b/res/pokemon/gardevoir/data.json index 646f334ff4..2acd5e2244 100644 --- a/res/pokemon/gardevoir/data.json +++ b/res/pokemon/gardevoir/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 2, "entry_text": "To protect its Trainer, it will\nexpend all its psychic power\nto create a small black hole.", "category": "Embrace 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/gastly/data.json b/res/pokemon/gastly/data.json index 63c878ba9d..f4ea45f2db 100644 --- a/res/pokemon/gastly/data.json +++ b/res/pokemon/gastly/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 65534, "entry_text": "Born from gases, anyone would\nfaint if engulfed by its gaseous\nbody, which contains poison.", "category": "Gas 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": 1548 } } \ No newline at end of file diff --git a/res/pokemon/gastrodon/data.json b/res/pokemon/gastrodon/data.json index 67d953f6c5..21fe0943aa 100644 --- a/res/pokemon/gastrodon/data.json +++ b/res/pokemon/gastrodon/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 17, "entry_text": "Long ago, its entire back was\nshielded with a sturdy shell. There\nare traces of it left in its cells.", "category": "Sea Slug 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": 2051 } } \ No newline at end of file diff --git a/res/pokemon/gengar/data.json b/res/pokemon/gengar/data.json index 3a6ec24cd5..96cf8b7c2c 100644 --- a/res/pokemon/gengar/data.json +++ b/res/pokemon/gengar/data.json @@ -147,5 +147,12 @@ "pokemon_pos_m": 65535, "entry_text": "The leer that floats in darkness\nbelongs to a GENGAR delighting in\ncasting curses on people.", "category": "Shadow 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": 90, + "rarity": 3, + "unused": 1548 } } \ No newline at end of file diff --git a/res/pokemon/geodude/data.json b/res/pokemon/geodude/data.json index 105bce97d4..e34309397f 100644 --- a/res/pokemon/geodude/data.json +++ b/res/pokemon/geodude/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 23, "entry_text": "At rest, it looks just like a rock.\nCarelessly stepping on it will make\nit swing its fists angrily.", "category": "Rock 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": 30, + "rarity": 50, + "unused": 2059 } } \ No newline at end of file diff --git a/res/pokemon/gible/data.json b/res/pokemon/gible/data.json index e142a27259..e77926564c 100644 --- a/res/pokemon/gible/data.json +++ b/res/pokemon/gible/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 18, "entry_text": "It attacks using its huge mouth.\nWhile its attacks are powerful, it\nhurts itself out of clumsiness, too.", "category": "Land Shark 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": 50, + "rarity": 30, + "unused": 1030 } } \ No newline at end of file diff --git a/res/pokemon/girafarig/data.json b/res/pokemon/girafarig/data.json index 95e3e30d9b..3330cda85a 100644 --- a/res/pokemon/girafarig/data.json +++ b/res/pokemon/girafarig/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 4, "entry_text": "The head on its tail contains a\nsmall brain. It can instinctively\nfight even while facing backward.", "category": "Long Neck 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": 70, + "rarity": 20, + "unused": 2565 } } \ No newline at end of file diff --git a/res/pokemon/giratina/data.json b/res/pokemon/giratina/data.json index 591b7d4fd8..5140007b85 100644 --- a/res/pokemon/giratina/data.json +++ b/res/pokemon/giratina/data.json @@ -161,5 +161,12 @@ "pokemon_pos_m": 3, "entry_text": "It was banished for its violence.\nIt silently gazed upon the old\nworld from the Distortion World." } - ] + ], + "catching_show_data": { + "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", + "catching_points": 90, + "rarity": 3, + "unused": 3852 + } } \ No newline at end of file diff --git a/res/pokemon/glaceon/data.json b/res/pokemon/glaceon/data.json index 221b0c4c52..a058b2f143 100644 --- a/res/pokemon/glaceon/data.json +++ b/res/pokemon/glaceon/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 19, "entry_text": "By controlling its body heat, it can\nfreeze the atmosphere around it\nto make a diamond-dust flurry.", "category": "Fresh Snow 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": 3341 } } \ No newline at end of file diff --git a/res/pokemon/glalie/data.json b/res/pokemon/glalie/data.json index 06c1a6c442..55659b44b6 100644 --- a/res/pokemon/glalie/data.json +++ b/res/pokemon/glalie/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 65535, "entry_text": "It prevents prey from escaping by\ninstantaneously freezing moisture\nin the air.", "category": "Face 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": 3341 } } \ No newline at end of file diff --git a/res/pokemon/glameow/data.json b/res/pokemon/glameow/data.json index ab784697e7..5a3e76c0cb 100644 --- a/res/pokemon/glameow/data.json +++ b/res/pokemon/glameow/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 24, "entry_text": "It hides its spiteful tendency of\nhooking its claws into the nose of\nits Trainer if it isn’t fed.", "category": "Catty 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": 4102 } } \ No newline at end of file diff --git a/res/pokemon/gligar/data.json b/res/pokemon/gligar/data.json index ab5f70bea6..b03998f337 100644 --- a/res/pokemon/gligar/data.json +++ b/res/pokemon/gligar/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 65533, "entry_text": "It glides as if sliding. It startles\nfoes by clamping on to their faces,\nthen jabs with its poison stinger.", "category": "FlyScorpion 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": 50, + "rarity": 30, + "unused": 4360 } } \ No newline at end of file diff --git a/res/pokemon/gliscor/data.json b/res/pokemon/gliscor/data.json index b1fdbf372b..c6f39dcb79 100644 --- a/res/pokemon/gliscor/data.json +++ b/res/pokemon/gliscor/data.json @@ -146,5 +146,12 @@ "pokemon_pos_m": 0, "entry_text": "If it succeeds in catching even a\nfaint breeze properly, it can circle\nthe globe without flapping once.", "category": "Fang Scorp 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": 4360 } } \ No newline at end of file diff --git a/res/pokemon/gloom/data.json b/res/pokemon/gloom/data.json index 57a353387a..ed3608e3cd 100644 --- a/res/pokemon/gloom/data.json +++ b/res/pokemon/gloom/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 19, "entry_text": "The honey it drools from its mouth\nsmells so atrocious, it can curl\nnoses more than a mile away.", "category": "Weed 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/golbat/data.json b/res/pokemon/golbat/data.json index 8140204161..ab589359e6 100644 --- a/res/pokemon/golbat/data.json +++ b/res/pokemon/golbat/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 65532, "entry_text": "Its sharp fangs puncture the\ntoughest of hides and have small\nholes for greedily sucking blood.", "category": "Bat 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": 50, + "rarity": 30, + "unused": 4358 } } \ No newline at end of file diff --git a/res/pokemon/goldeen/data.json b/res/pokemon/goldeen/data.json index 858b864a71..84db95e06d 100644 --- a/res/pokemon/goldeen/data.json +++ b/res/pokemon/goldeen/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 65531, "entry_text": "Though it appears very elegant\nwhen swimming with fins unfurled, it\ncan jab powerfully with its horn.", "category": "Goldfish 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 } } \ No newline at end of file diff --git a/res/pokemon/golduck/data.json b/res/pokemon/golduck/data.json index 3a18bfd572..959b1b682f 100644 --- a/res/pokemon/golduck/data.json +++ b/res/pokemon/golduck/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 8, "entry_text": "It is seen swimming dynamically and\nelegantly using its well-developed\nlimbs and flippers.", "category": "Duck 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": 70, + "rarity": 20, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/golem/data.json b/res/pokemon/golem/data.json index 6b5c44e578..607fe15532 100644 --- a/res/pokemon/golem/data.json +++ b/res/pokemon/golem/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 7, "entry_text": "Even dynamite can’t harm its hard,\nboulderlike body. It sheds its hide\njust once a year.", "category": "Megaton 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": 2059 } } \ No newline at end of file diff --git a/res/pokemon/gorebyss/data.json b/res/pokemon/gorebyss/data.json index 66e1aea71c..68d783e44c 100644 --- a/res/pokemon/gorebyss/data.json +++ b/res/pokemon/gorebyss/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 65531, "entry_text": "It lives at the bottom of the sea.\nIn the springtime, its pink body\nturns more vivid for some reason.", "category": "South Sea 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": 80, + "rarity": 10, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/granbull/data.json b/res/pokemon/granbull/data.json index 3f5e4308e9..4374c9bdc7 100644 --- a/res/pokemon/granbull/data.json +++ b/res/pokemon/granbull/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 7, "entry_text": "It is timid in spite of its looks.\nIf it becomes enraged, however,\nit will strike with its huge fangs.", "category": "Fairy 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/graveler/data.json b/res/pokemon/graveler/data.json index 22ea39a432..23e7f4c613 100644 --- a/res/pokemon/graveler/data.json +++ b/res/pokemon/graveler/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 10, "entry_text": "It rolls on mountain paths to move.\nOnce it builds momentum, no Pokémon\ncan stop it without difficulty.", "category": "Rock 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": 50, + "rarity": 30, + "unused": 2059 } } \ No newline at end of file diff --git a/res/pokemon/grimer/data.json b/res/pokemon/grimer/data.json index bbb9266225..618d3e3f45 100644 --- a/res/pokemon/grimer/data.json +++ b/res/pokemon/grimer/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 17, "entry_text": "It was born when sludge in a dirty\nstream was exposed to the moon’s\nX-rays. It appears among filth.", "category": "Sludge 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": 1542 } } \ No newline at end of file diff --git a/res/pokemon/grotle/data.json b/res/pokemon/grotle/data.json index 518b1d47b0..d16399fd79 100644 --- a/res/pokemon/grotle/data.json +++ b/res/pokemon/grotle/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 14, "entry_text": "It knows where pure water wells\nup. It carries fellow Pokémon there\non its back.", "category": "Grove 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": 80, + "rarity": 10, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/groudon/data.json b/res/pokemon/groudon/data.json index 3d11695ea6..941e2c613d 100644 --- a/res/pokemon/groudon/data.json +++ b/res/pokemon/groudon/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 3, "entry_text": "It had been asleep in underground\nmagma ever since it fiercely\nfought KYOGRE long ago.", "category": "Continent 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": 90, + "rarity": 3, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/grovyle/data.json b/res/pokemon/grovyle/data.json index 0213b93e9e..1838d8e319 100644 --- a/res/pokemon/grovyle/data.json +++ b/res/pokemon/grovyle/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 14, "entry_text": "It lives in dense jungles. While \nclosing in on its prey, it leaps\nfrom branch to branch.", "category": "Wood Gecko 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": 80, + "rarity": 10, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/growlithe/data.json b/res/pokemon/growlithe/data.json index 4a7a1ae0b8..0444153f91 100644 --- a/res/pokemon/growlithe/data.json +++ b/res/pokemon/growlithe/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 20, "entry_text": "A Pokémon with a loyal nature.\nIt will remain motionless until it is\ngiven an order by its Trainer.", "category": "Puppy 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": 70, + "rarity": 20, + "unused": 514 } } \ No newline at end of file diff --git a/res/pokemon/grumpig/data.json b/res/pokemon/grumpig/data.json index 12cb76a1aa..9245668fb4 100644 --- a/res/pokemon/grumpig/data.json +++ b/res/pokemon/grumpig/data.json @@ -148,5 +148,12 @@ "pokemon_pos_m": 15, "entry_text": "It uses black pearls to amplify its\npsycho-power. It does an odd\ndance to gain control over foes.", "category": "Manipulate 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": 70, + "rarity": 20, + "unused": 2570 } } \ No newline at end of file diff --git a/res/pokemon/gulpin/data.json b/res/pokemon/gulpin/data.json index 1c423eef84..71ba4772b2 100644 --- a/res/pokemon/gulpin/data.json +++ b/res/pokemon/gulpin/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 27, "entry_text": "Almost all its body is its stomach.\nIts harsh digestive juices quickly\ndissolve anything it swallows.", "category": "Stomach 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 } } \ No newline at end of file diff --git a/res/pokemon/gyarados/data.json b/res/pokemon/gyarados/data.json index c406e7e119..87ac9b0c67 100644 --- a/res/pokemon/gyarados/data.json +++ b/res/pokemon/gyarados/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 0, "entry_text": "Once it begins to rampage, a\nGYARADOS will burn everything\ndown, even in a harsh storm.", "category": "Atrocious 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": 90, + "rarity": 3, + "unused": 4355 } } \ No newline at end of file diff --git a/res/pokemon/happiny/data.json b/res/pokemon/happiny/data.json index 21f6212857..6c6ad0b17c 100644 --- a/res/pokemon/happiny/data.json +++ b/res/pokemon/happiny/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 24, "entry_text": "It likes to carry around a small\nrock. It may wander around others’\nfeet and cause them to stumble.", "category": "Playhouse 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/hariyama/data.json b/res/pokemon/hariyama/data.json index af0a519ba3..b9f0a52f66 100644 --- a/res/pokemon/hariyama/data.json +++ b/res/pokemon/hariyama/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 4, "entry_text": "It loves to match power with\nbig-bodied Pokémon. It can knock a\ntruck flying with its arm thrusts.", "category": "Arm Thrust 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": 2313 } } \ No newline at end of file diff --git a/res/pokemon/haunter/data.json b/res/pokemon/haunter/data.json index 66f66061bc..e99e862787 100644 --- a/res/pokemon/haunter/data.json +++ b/res/pokemon/haunter/data.json @@ -144,5 +144,12 @@ "pokemon_pos_m": 65530, "entry_text": "It likes to lurk in the dark and tap\nshoulders with a gaseous hand. Its\ntouch causes endless shuddering.", "category": "Gas 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": 80, + "rarity": 10, + "unused": 1548 } } \ No newline at end of file diff --git a/res/pokemon/heatran/data.json b/res/pokemon/heatran/data.json index 5a64472d53..dfebf76086 100644 --- a/res/pokemon/heatran/data.json +++ b/res/pokemon/heatran/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 1, "entry_text": "Its body is made of rugged steel.\nHowever, it is partially melted in\nspots because of its own heat.", "category": "Lava Dome 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": 90, + "rarity": 3, + "unused": 514 } } \ No newline at end of file diff --git a/res/pokemon/heracross/data.json b/res/pokemon/heracross/data.json index 400cd23b2d..36b2358537 100644 --- a/res/pokemon/heracross/data.json +++ b/res/pokemon/heracross/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 7, "entry_text": "It loves sweet honey. To keep all\nthe honey to itself, it hurls rivals\naway with its prized horn.", "category": "Single Horn 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": 80, + "rarity": 10, + "unused": 2308 } } \ No newline at end of file diff --git a/res/pokemon/hippopotas/data.json b/res/pokemon/hippopotas/data.json index 96240b7210..db30b1ba8b 100644 --- a/res/pokemon/hippopotas/data.json +++ b/res/pokemon/hippopotas/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 16, "entry_text": "It shuts its nostrils tight then\ntravels through sand as if walking.\nThey form colonies of around ten.", "category": "Hippo 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": 70, + "rarity": 20, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/hippowdon/data.json b/res/pokemon/hippowdon/data.json index 9ac06fa29a..7e4fa397ac 100644 --- a/res/pokemon/hippowdon/data.json +++ b/res/pokemon/hippowdon/data.json @@ -121,5 +121,12 @@ "pokemon_pos_m": 3, "entry_text": "It is surprisingly quick to anger.\nIt holds its mouth agape as a\ndisplay of its strength.", "category": "Heavyweight 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": 80, + "rarity": 10, + "unused": 4355 } } \ No newline at end of file diff --git a/res/pokemon/hitmonchan/data.json b/res/pokemon/hitmonchan/data.json index d260ac02c4..fb66f3b8b4 100644 --- a/res/pokemon/hitmonchan/data.json +++ b/res/pokemon/hitmonchan/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 5, "entry_text": "The arm-twisting punches it throws\npulverize even concrete. It rests\nafter three minutes of fighting.", "category": "Punching 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": 2313 } } \ No newline at end of file diff --git a/res/pokemon/hitmonlee/data.json b/res/pokemon/hitmonlee/data.json index 1c1b879538..bebcf30c5f 100644 --- a/res/pokemon/hitmonlee/data.json +++ b/res/pokemon/hitmonlee/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 1, "entry_text": "Its legs can stretch double.\nFirst-time foes are startled by\nits extensible reach.", "category": "Kicking 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": 2313 } } \ No newline at end of file diff --git a/res/pokemon/hitmontop/data.json b/res/pokemon/hitmontop/data.json index cbd9770aca..a1fb7bdf06 100644 --- a/res/pokemon/hitmontop/data.json +++ b/res/pokemon/hitmontop/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 10, "entry_text": "It fights while spinning like a top.\nThe centrifugal force boosts its\ndestructive power by ten.", "category": "Handstand 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": 2313 } } \ No newline at end of file diff --git a/res/pokemon/ho_oh/data.json b/res/pokemon/ho_oh/data.json index cf3810f9f0..85c731c6f2 100644 --- a/res/pokemon/ho_oh/data.json +++ b/res/pokemon/ho_oh/data.json @@ -145,5 +145,12 @@ "pokemon_pos_m": 0, "entry_text": "Its feathers are in seven colors.\nIt is said that anyone seeing it is\npromised eternal happiness.", "category": "Rainbow 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": 90, + "rarity": 3, + "unused": 4354 } } \ No newline at end of file diff --git a/res/pokemon/honchkrow/data.json b/res/pokemon/honchkrow/data.json index 90751af125..5f6f64d702 100644 --- a/res/pokemon/honchkrow/data.json +++ b/res/pokemon/honchkrow/data.json @@ -126,7 +126,14 @@ "pokemon_pos_f": 18, "trainer_pos_m": 9, "pokemon_pos_m": 18, - "entry_text": "If one utters a deep cry, many\nMURKROW gather quickly. For this,\nit is called \u201cSummoner of Night.\u201d", + "entry_text": "If one utters a deep cry, many\nMURKROW gather quickly. For this,\nit is called “Summoner of Night.”", "category": "Big Boss 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": 80, + "rarity": 10, + "unused": 4368 } } \ No newline at end of file diff --git a/res/pokemon/hoothoot/data.json b/res/pokemon/hoothoot/data.json index c9c92d55e4..43b62a990d 100644 --- a/res/pokemon/hoothoot/data.json +++ b/res/pokemon/hoothoot/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 21, "entry_text": "It marks time precisely. Some\ncountries consider it to be a wise\nfriend, versed in the world’s ways.", "category": "Owl 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": 30, + "rarity": 50, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/hoppip/data.json b/res/pokemon/hoppip/data.json index 6767998ba9..b83c1b77ed 100644 --- a/res/pokemon/hoppip/data.json +++ b/res/pokemon/hoppip/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 65530, "entry_text": "It drifts on winds. It is said that\nwhen HOPPIP gather in fields and\nmountains, spring is on the way.", "category": "Cottonweed 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": 4353 } } \ No newline at end of file diff --git a/res/pokemon/horsea/data.json b/res/pokemon/horsea/data.json index 81f2521539..23a5be257f 100644 --- a/res/pokemon/horsea/data.json +++ b/res/pokemon/horsea/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 65530, "entry_text": "It makes its nest in the shade of\ncorals. If it senses danger, it\nspits murky ink and flees.", "category": "Dragon 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/houndoom/data.json b/res/pokemon/houndoom/data.json index 8281bd5b00..7994d8204b 100644 --- a/res/pokemon/houndoom/data.json +++ b/res/pokemon/houndoom/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 9, "entry_text": "The flames it breathes when angry\ncontain toxins. If they cause a\nburn, it will hurt forever.", "category": "Dark 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": 528 } } \ No newline at end of file diff --git a/res/pokemon/houndour/data.json b/res/pokemon/houndour/data.json index ede8674f58..fb04904621 100644 --- a/res/pokemon/houndour/data.json +++ b/res/pokemon/houndour/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 23, "entry_text": "It is smart enough to hunt in\npacks. It uses a variety of cries\nfor communicating with others.", "category": "Dark 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": 50, + "rarity": 30, + "unused": 528 } } \ No newline at end of file diff --git a/res/pokemon/huntail/data.json b/res/pokemon/huntail/data.json index 06cb83ac61..2646807fce 100644 --- a/res/pokemon/huntail/data.json +++ b/res/pokemon/huntail/data.json @@ -117,5 +117,12 @@ "pokemon_pos_m": 0, "entry_text": "It lives deep in the sea. With a\ntail shaped like a small fish, it\nattracts unsuspecting prey.", "category": "Deep Sea 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": 80, + "rarity": 10, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/hypno/data.json b/res/pokemon/hypno/data.json index e6b94ad473..51864d20d3 100644 --- a/res/pokemon/hypno/data.json +++ b/res/pokemon/hypno/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 4, "entry_text": "Seeing its swinging pendulum can\ninduce sleep in three seconds,\neven in someone who just woke up.", "category": "Hypnosis 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/igglybuff/data.json b/res/pokemon/igglybuff/data.json index c29e9f20d0..4b0fc68948 100644 --- a/res/pokemon/igglybuff/data.json +++ b/res/pokemon/igglybuff/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 29, "entry_text": "It has a soft and bouncy body.\nOnce it starts bouncing, it\nbecomes impossible to stop.", "category": "Balloon 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/illumise/data.json b/res/pokemon/illumise/data.json index 5960148b8e..1b1b3fa780 100644 --- a/res/pokemon/illumise/data.json +++ b/res/pokemon/illumise/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 23, "entry_text": "With its sweet aroma, it guides\nVOLBEAT to draw signs with light in\nthe night sky.", "category": "Firefly 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/infernape/data.json b/res/pokemon/infernape/data.json index b20fb7ab99..adbe311d59 100644 --- a/res/pokemon/infernape/data.json +++ b/res/pokemon/infernape/data.json @@ -147,5 +147,12 @@ "pokemon_pos_m": 13, "entry_text": "It uses unique fighting moves with\nfire on its hands and feet. It will\ntake on any opponent.", "category": "Flame 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": 2306 } } \ No newline at end of file diff --git a/res/pokemon/ivysaur/data.json b/res/pokemon/ivysaur/data.json index 8d3e714883..ed70ec7b57 100644 --- a/res/pokemon/ivysaur/data.json +++ b/res/pokemon/ivysaur/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 17, "entry_text": "When the bud on its back starts\nswelling, a sweet aroma wafts to\nindicate the flower’s coming bloom.", "category": "Seed 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/jigglypuff/data.json b/res/pokemon/jigglypuff/data.json index 8bea8c565d..b5edaf1b36 100644 --- a/res/pokemon/jigglypuff/data.json +++ b/res/pokemon/jigglypuff/data.json @@ -149,5 +149,12 @@ "pokemon_pos_m": 22, "entry_text": "When it wavers its big, round\neyes, it begins singing a lullaby\nthat makes everyone drowsy.", "category": "Balloon 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/jirachi/data.json b/res/pokemon/jirachi/data.json index b610a3c1d1..d0d5dc7588 100644 --- a/res/pokemon/jirachi/data.json +++ b/res/pokemon/jirachi/data.json @@ -148,5 +148,12 @@ "pokemon_pos_m": 65518, "entry_text": "It is said to have the ability to\ngrant any wish for just one week\nevery thousand years.", "category": "Wish 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": 2574 } } \ No newline at end of file diff --git a/res/pokemon/jolteon/data.json b/res/pokemon/jolteon/data.json index 695c42b6fb..aeb1dd6e99 100644 --- a/res/pokemon/jolteon/data.json +++ b/res/pokemon/jolteon/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 16, "entry_text": "If agitated, it uses electricity to\nstraighten out its fur and launch\nit in small bunches.", "category": "Lightning 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/jumpluff/data.json b/res/pokemon/jumpluff/data.json index d47e0e621c..ad9e1855f8 100644 --- a/res/pokemon/jumpluff/data.json +++ b/res/pokemon/jumpluff/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 65529, "entry_text": "Blown by seasonal winds, it\ncircles the globe, scattering\ncotton spores as it goes.", "category": "Cottonweed 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": 4353 } } \ No newline at end of file diff --git a/res/pokemon/jynx/data.json b/res/pokemon/jynx/data.json index e2a6cc4966..ccdb349477 100644 --- a/res/pokemon/jynx/data.json +++ b/res/pokemon/jynx/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 5, "entry_text": "Its cries sound like human speech.\nHowever, it is impossible to tell\nwhat it is trying to say.", "category": "Human Shape 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": 70, + "rarity": 20, + "unused": 2573 } } \ No newline at end of file diff --git a/res/pokemon/kabuto/data.json b/res/pokemon/kabuto/data.json index e9619d4921..c2ee9c9fff 100644 --- a/res/pokemon/kabuto/data.json +++ b/res/pokemon/kabuto/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 24, "entry_text": "It is thought to have inhabited\nbeaches 300 million years ago.\nIt is protected by a stiff shell.", "category": "Shellfish 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": 50, + "rarity": 30, + "unused": 779 } } \ No newline at end of file diff --git a/res/pokemon/kabutops/data.json b/res/pokemon/kabutops/data.json index 9b98663f64..8787d028a6 100644 --- a/res/pokemon/kabutops/data.json +++ b/res/pokemon/kabutops/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 9, "entry_text": "It is thought that this Pokémon\ncame onto land because its\nprey adapted to life on land.", "category": "Shellfish 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": 779 } } \ No newline at end of file diff --git a/res/pokemon/kadabra/data.json b/res/pokemon/kadabra/data.json index c7f8b42b53..51abd86992 100644 --- a/res/pokemon/kadabra/data.json +++ b/res/pokemon/kadabra/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 11, "entry_text": "It stares at its silver spoon to\nfocus its mind. It emits more alpha\nwaves while doing so.", "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": 80, + "rarity": 10, + "unused": 2570 } } \ No newline at end of file diff --git a/res/pokemon/kakuna/data.json b/res/pokemon/kakuna/data.json index b1603b3ae7..e79d3d00b6 100644 --- a/res/pokemon/kakuna/data.json +++ b/res/pokemon/kakuna/data.json @@ -78,5 +78,12 @@ "pokemon_pos_m": 23, "entry_text": "While awaiting evolution, it\nhides from predators under\nleaves and in nooks of branches.", "category": "Cocoon 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": 1540 } } \ No newline at end of file diff --git a/res/pokemon/kangaskhan/data.json b/res/pokemon/kangaskhan/data.json index b5320f862b..fed21d0de2 100644 --- a/res/pokemon/kangaskhan/data.json +++ b/res/pokemon/kangaskhan/data.json @@ -151,5 +151,12 @@ "pokemon_pos_m": 0, "entry_text": "It raises its offspring in its belly\npouch. It lets the baby out to\nplay only when it feels safe.", "category": "Parent 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/kecleon/data.json b/res/pokemon/kecleon/data.json index 6baf31d6bf..1c7f4ca08f 100644 --- a/res/pokemon/kecleon/data.json +++ b/res/pokemon/kecleon/data.json @@ -155,5 +155,12 @@ "pokemon_pos_m": 15, "entry_text": "It can freely change its body’s\ncolor. The zigzag pattern on its\nbelly doesn’t change, however.", "category": "Color Swap 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 } } \ No newline at end of file diff --git a/res/pokemon/kingdra/data.json b/res/pokemon/kingdra/data.json index 08cf45083e..4dcdf35a39 100644 --- a/res/pokemon/kingdra/data.json +++ b/res/pokemon/kingdra/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 2, "entry_text": "It lives in caves on the seafloor\nand creates giant whirlpools\nevery time it moves.", "category": "Dragon 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": 80, + "rarity": 10, + "unused": 3843 } } \ No newline at end of file diff --git a/res/pokemon/kingler/data.json b/res/pokemon/kingler/data.json index 89fc7ec60d..27b02930e8 100644 --- a/res/pokemon/kingler/data.json +++ b/res/pokemon/kingler/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 11, "entry_text": "The larger pincer has 10,000-\nhorsepower strength. However, it\nis so heavy, it is difficult to aim.", "category": "Pincer 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": 771 } } \ No newline at end of file diff --git a/res/pokemon/kirlia/data.json b/res/pokemon/kirlia/data.json index a83f731a03..f1dcd3a132 100644 --- a/res/pokemon/kirlia/data.json +++ b/res/pokemon/kirlia/data.json @@ -150,5 +150,12 @@ "pokemon_pos_m": 19, "entry_text": "If its Trainer becomes happy, it\noverflows with energy, dancing\njoyously while spinning about.", "category": "Emotion 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": 70, + "rarity": 20, + "unused": 2570 } } \ No newline at end of file diff --git a/res/pokemon/koffing/data.json b/res/pokemon/koffing/data.json index 1eb7070730..5c1b52a229 100644 --- a/res/pokemon/koffing/data.json +++ b/res/pokemon/koffing/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 65526, "entry_text": "Lighter-than-air gases in its body\nkeep it aloft. The gases not only\nsmell, they are also explosive.", "category": "Poison Gas 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": 50, + "rarity": 30, + "unused": 1542 } } \ No newline at end of file diff --git a/res/pokemon/krabby/data.json b/res/pokemon/krabby/data.json index ea044035d5..32582521a2 100644 --- a/res/pokemon/krabby/data.json +++ b/res/pokemon/krabby/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 30, "entry_text": "It lives in burrows dug on sandy\nbeaches. Its pincers fully grow\nback if they are broken in battle.", "category": "River Crab 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/kricketot/data.json b/res/pokemon/kricketot/data.json index 1292519e5c..c222b17d6b 100644 --- a/res/pokemon/kricketot/data.json +++ b/res/pokemon/kricketot/data.json @@ -84,5 +84,12 @@ "pokemon_pos_m": 28, "entry_text": "Its legs are short. Whenever it\nstumbles, its stiff antennae clack\nwith a xylophone-like sound.", "category": "Cricket 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/kricketune/data.json b/res/pokemon/kricketune/data.json index 46216a4192..4474925be2 100644 --- a/res/pokemon/kricketune/data.json +++ b/res/pokemon/kricketune/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 17, "entry_text": "There is a village that hosts a\ncontest based on the amazingly\nvariable cries of this Pokémon.", "category": "Cricket 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/kyogre/data.json b/res/pokemon/kyogre/data.json index 9f5f3435dc..ec02d1ce47 100644 --- a/res/pokemon/kyogre/data.json +++ b/res/pokemon/kyogre/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 0, "entry_text": "It is said to have widened the\nseas by causing downpours. It had\nbeen asleep in a marine trench.", "category": "Sea Basin 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": 90, + "rarity": 3, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/lairon/data.json b/res/pokemon/lairon/data.json index b742209b61..d2d6c1cbb3 100644 --- a/res/pokemon/lairon/data.json +++ b/res/pokemon/lairon/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 18, "entry_text": "For food, it digs up iron ore. It\nsmashes its steely body against\nothers to fight over territory.", "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": 70, + "rarity": 20, + "unused": 2830 } } \ No newline at end of file diff --git a/res/pokemon/lanturn/data.json b/res/pokemon/lanturn/data.json index bf9675c468..00ed779f8d 100644 --- a/res/pokemon/lanturn/data.json +++ b/res/pokemon/lanturn/data.json @@ -128,7 +128,14 @@ "pokemon_pos_f": 2, "trainer_pos_m": 9, "pokemon_pos_m": 2, - "entry_text": "LANTURN’s light can shine up from\ngreat depths. It is nicknamed\n\u201cThe Deep-Sea Star.\u201d", + "entry_text": "LANTURN’s light can shine up from\ngreat depths. It is nicknamed\n“The Deep-Sea Star.”", "category": "Light 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": 1795 } } \ No newline at end of file diff --git a/res/pokemon/lapras/data.json b/res/pokemon/lapras/data.json index b6103a4182..2d18e0e762 100644 --- a/res/pokemon/lapras/data.json +++ b/res/pokemon/lapras/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 7, "entry_text": "It loves crossing the sea with\npeople and Pokémon on its back.\nIt understands human speech.", "category": "Transport 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": 90, + "rarity": 3, + "unused": 3331 } } \ No newline at end of file diff --git a/res/pokemon/larvitar/data.json b/res/pokemon/larvitar/data.json index 5ca8d1bbe8..e798f70c96 100644 --- a/res/pokemon/larvitar/data.json +++ b/res/pokemon/larvitar/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 21, "entry_text": "A Pokémon that eats soil. Once it\nhas eaten a large mountain, it\ngoes to sleep so it can grow.", "category": "Rock Skin 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": 2059 } } \ No newline at end of file diff --git a/res/pokemon/latias/data.json b/res/pokemon/latias/data.json index 71e5099e15..ddb1172d40 100644 --- a/res/pokemon/latias/data.json +++ b/res/pokemon/latias/data.json @@ -150,5 +150,12 @@ "pokemon_pos_m": 65534, "entry_text": "Its body is covered with a down\nthat can refract light in such a\nway that it becomes invisible.", "category": "Eon 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": 2575 } } \ No newline at end of file diff --git a/res/pokemon/latios/data.json b/res/pokemon/latios/data.json index fdacf806a2..ecb51d8eea 100644 --- a/res/pokemon/latios/data.json +++ b/res/pokemon/latios/data.json @@ -149,5 +149,12 @@ "pokemon_pos_m": 0, "entry_text": "A highly intelligent Pokémon.\nBy folding back its wings in flight,\nit can overtake jet planes.", "category": "Eon 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": 2575 } } \ No newline at end of file diff --git a/res/pokemon/leafeon/data.json b/res/pokemon/leafeon/data.json index c6d423d67b..e235619b87 100644 --- a/res/pokemon/leafeon/data.json +++ b/res/pokemon/leafeon/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 14, "entry_text": "It basically does not fight. With\ncells similar to those of plants, it\ncan perform photosynthesis.", "category": "Verdant 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/ledian/data.json b/res/pokemon/ledian/data.json index bb8bb3c120..c28e212284 100644 --- a/res/pokemon/ledian/data.json +++ b/res/pokemon/ledian/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 65529, "entry_text": "It uses starlight as energy. When\nmore stars appear at night, the\npatterns on its back grow larger.", "category": "Five Star 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/ledyba/data.json b/res/pokemon/ledyba/data.json index 087817f9ae..c1b6b30b27 100644 --- a/res/pokemon/ledyba/data.json +++ b/res/pokemon/ledyba/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 65531, "entry_text": "It is so timid, it can’t move if it\nisn’t with a swarm of others. It\nconveys its feelings with scent.", "category": "Five Star 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": 30, + "rarity": 50, + "unused": 4356 } } \ No newline at end of file diff --git a/res/pokemon/lickilicky/data.json b/res/pokemon/lickilicky/data.json index 4a572212f7..10ca67dc9f 100644 --- a/res/pokemon/lickilicky/data.json +++ b/res/pokemon/lickilicky/data.json @@ -145,5 +145,12 @@ "pokemon_pos_m": 65535, "entry_text": "The long tongue is always soggy\nwith slobber. The saliva contains\na solvent that causes numbness.", "category": "Licking 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/lickitung/data.json b/res/pokemon/lickitung/data.json index a44e996762..6ad662d682 100644 --- a/res/pokemon/lickitung/data.json +++ b/res/pokemon/lickitung/data.json @@ -148,5 +148,12 @@ "pokemon_pos_m": 10, "entry_text": "When it extends its over-six-foot-\nlong tongue, its tail quivers. There\nis a possibility they are connected.", "category": "Licking 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/lileep/data.json b/res/pokemon/lileep/data.json index 05201fdc5f..75225075f4 100644 --- a/res/pokemon/lileep/data.json +++ b/res/pokemon/lileep/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 16, "entry_text": "It lived on the seafloor 100\nmillion years ago and was\nreanimated scientifically.", "category": "Sea Lily 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": 267 } } \ No newline at end of file diff --git a/res/pokemon/linoone/data.json b/res/pokemon/linoone/data.json index c53460cb0f..ad587e81c5 100644 --- a/res/pokemon/linoone/data.json +++ b/res/pokemon/linoone/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 14, "entry_text": "It charges prey at speeds over\n60 mph. However, because it can\nonly run straight, it often fails.", "category": "Rushing 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/lombre/data.json b/res/pokemon/lombre/data.json index 598fc8aaea..3ed9d3d119 100644 --- a/res/pokemon/lombre/data.json +++ b/res/pokemon/lombre/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 14, "entry_text": "It has a mischievous spirit. If it\nspots an angler, it will tug on the\nfishing line to interfere.", "category": "Jolly 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": 259 } } \ No newline at end of file diff --git a/res/pokemon/lopunny/data.json b/res/pokemon/lopunny/data.json index f4fa9dd7d4..6cded08771 100644 --- a/res/pokemon/lopunny/data.json +++ b/res/pokemon/lopunny/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 12, "entry_text": "The ears appear to be delicate. If\nthey are touched roughly, it kicks\nwith its graceful legs.", "category": "Rabbit 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/lotad/data.json b/res/pokemon/lotad/data.json index 571dbc50a3..6966722dfa 100644 --- a/res/pokemon/lotad/data.json +++ b/res/pokemon/lotad/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 24, "entry_text": "It looks like an aquatic plant and\nserves as a ferry to Pokémon\nthat can’t swim.", "category": "Water Weed 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": 30, + "rarity": 50, + "unused": 259 } } \ No newline at end of file diff --git a/res/pokemon/loudred/data.json b/res/pokemon/loudred/data.json index c3f1262245..6189c3d556 100644 --- a/res/pokemon/loudred/data.json +++ b/res/pokemon/loudred/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 13, "entry_text": "The shock waves from its cries can\ntip over trucks. It stamps its\nfeet to power up.", "category": "Big Voice 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/lucario/data.json b/res/pokemon/lucario/data.json index 10725b707b..c63e711b03 100644 --- a/res/pokemon/lucario/data.json +++ b/res/pokemon/lucario/data.json @@ -145,5 +145,12 @@ "pokemon_pos_m": 12, "entry_text": "A well-trained one can sense auras\nto identify and take in the feelings\nof creatures over half a mile away.", "category": "Aura 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": 2056 } } \ No newline at end of file diff --git a/res/pokemon/ludicolo/data.json b/res/pokemon/ludicolo/data.json index fc60427cc9..482b670b0f 100644 --- a/res/pokemon/ludicolo/data.json +++ b/res/pokemon/ludicolo/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 3, "entry_text": "If it hears festive music, all its\nmuscles fill with energy. It can’t\nhelp breaking out into a dance.", "category": "Carefree 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": 80, + "rarity": 10, + "unused": 259 } } \ No newline at end of file diff --git a/res/pokemon/lugia/data.json b/res/pokemon/lugia/data.json index 169eeed720..538ff9b977 100644 --- a/res/pokemon/lugia/data.json +++ b/res/pokemon/lugia/data.json @@ -153,5 +153,12 @@ "pokemon_pos_m": 0, "entry_text": "It sleeps in a deep-sea trench.\nIf it flaps its wings, it is said to\ncause a 40-day storm.", "category": "Diving 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": 90, + "rarity": 3, + "unused": 4362 } } \ No newline at end of file diff --git a/res/pokemon/lumineon/data.json b/res/pokemon/lumineon/data.json index 04f49e7b07..bb5e060cb4 100644 --- a/res/pokemon/lumineon/data.json +++ b/res/pokemon/lumineon/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 65531, "entry_text": "It crawls along the seafloor using\nits long front fins like legs. It\ncompetes for food with LANTURN.", "category": "Neon 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": 90, + "rarity": 3, + "unused": 2313 } } \ No newline at end of file diff --git a/res/pokemon/lunatone/data.json b/res/pokemon/lunatone/data.json index 086285de7d..1a6777fa29 100644 --- a/res/pokemon/lunatone/data.json +++ b/res/pokemon/lunatone/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 65532, "entry_text": "Because it turns active on nights\nof the full moon, it is said to have\nsome link to the lunar phases.", "category": "Meteorite 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": 2571 } } \ No newline at end of file diff --git a/res/pokemon/luvdisc/data.json b/res/pokemon/luvdisc/data.json index c541e1756f..efdb5d6568 100644 --- a/res/pokemon/luvdisc/data.json +++ b/res/pokemon/luvdisc/data.json @@ -113,5 +113,12 @@ "pokemon_pos_m": 65527, "entry_text": "It lives in warm seas. It is said\nthat a couple finding this Pokémon\nwill be blessed with eternal love.", "category": "Rendezvous 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/luxio/data.json b/res/pokemon/luxio/data.json index 7ff6a551d6..f8ee4b9dd8 100644 --- a/res/pokemon/luxio/data.json +++ b/res/pokemon/luxio/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 17, "entry_text": "Strong electricity courses through\nthe tips of its sharp claws. A light\nscratch causes fainting in foes.", "category": "Spark 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": 70, + "rarity": 20, + "unused": 1799 } } \ No newline at end of file diff --git a/res/pokemon/luxray/data.json b/res/pokemon/luxray/data.json index 4601bc50f7..596e0f2b48 100644 --- a/res/pokemon/luxray/data.json +++ b/res/pokemon/luxray/data.json @@ -121,5 +121,12 @@ "pokemon_pos_m": 8, "entry_text": "It can see clearly through walls\nto track down its prey and seek\nits lost young.", "category": "Gleam Eyes 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 } } \ No newline at end of file diff --git a/res/pokemon/machamp/data.json b/res/pokemon/machamp/data.json index bfd0f85fc9..332b87ac0a 100644 --- a/res/pokemon/machamp/data.json +++ b/res/pokemon/machamp/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 3, "entry_text": "Its four muscled arms slam foes\nwith powerful punches and chops\nat blinding speed.", "category": "Superpower 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": 90, + "rarity": 3, + "unused": 2313 } } \ No newline at end of file diff --git a/res/pokemon/machoke/data.json b/res/pokemon/machoke/data.json index 77afd0d4a6..6482cc18b0 100644 --- a/res/pokemon/machoke/data.json +++ b/res/pokemon/machoke/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 7, "entry_text": "It happily carries heavy cargo to\ntoughen up. It willingly does hard\nwork for people.", "category": "Superpower 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": 2313 } } \ No newline at end of file diff --git a/res/pokemon/machop/data.json b/res/pokemon/machop/data.json index 59a4c0d357..70ee7929c3 100644 --- a/res/pokemon/machop/data.json +++ b/res/pokemon/machop/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 19, "entry_text": "Though small in stature, it is\npowerful enough to easily heft and\nthrow a number of GEODUDE at once.", "category": "Superpower 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": 50, + "rarity": 30, + "unused": 2313 } } \ No newline at end of file diff --git a/res/pokemon/magby/data.json b/res/pokemon/magby/data.json index eebcb66da2..13a8ccd2b6 100644 --- a/res/pokemon/magby/data.json +++ b/res/pokemon/magby/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 20, "entry_text": "Its magma-like blood circulates\nthroughout its body. Its body’s\nheat can top 1,100 degrees F.", "category": "Live Coal 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/magcargo/data.json b/res/pokemon/magcargo/data.json index fa5136547b..23d27d161a 100644 --- a/res/pokemon/magcargo/data.json +++ b/res/pokemon/magcargo/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 14, "entry_text": "Its body temperature is roughly\n18,000 degrees F. Flames spout\nfrom gaps in its hardened shell.", "category": "Lava 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": 2818 } } \ No newline at end of file diff --git a/res/pokemon/magikarp/data.json b/res/pokemon/magikarp/data.json index b35137b779..13bbd79050 100644 --- a/res/pokemon/magikarp/data.json +++ b/res/pokemon/magikarp/data.json @@ -79,5 +79,12 @@ "pokemon_pos_m": 65531, "entry_text": "A MAGIKARP living for many years\ncan leap a mountain using Splash.\nThe move remains useless, though.", "category": "Fish 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": 30, + "rarity": 50, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/magmar/data.json b/res/pokemon/magmar/data.json index a5874f882f..d3ea2865b9 100644 --- a/res/pokemon/magmar/data.json +++ b/res/pokemon/magmar/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 10, "entry_text": "When it breathes deeply, heat\nwaves form around its body, making\nit hard to see clearly.", "category": "Spitfire 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/magmortar/data.json b/res/pokemon/magmortar/data.json index 6b3d6d6392..46d61d3e51 100644 --- a/res/pokemon/magmortar/data.json +++ b/res/pokemon/magmortar/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 1, "entry_text": "When launching 3,600 degrees F\nfireballs, its body takes on a\nwhitish hue from the intense heat.", "category": "Blast 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/magnemite/data.json b/res/pokemon/magnemite/data.json index 65a9655781..7684ba4878 100644 --- a/res/pokemon/magnemite/data.json +++ b/res/pokemon/magnemite/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 65522, "entry_text": "The faster the units at its sides\nrotate, the greater the magnetic\nforce they generate.", "category": "Magnet 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": 50, + "rarity": 30, + "unused": 3591 } } \ No newline at end of file diff --git a/res/pokemon/magneton/data.json b/res/pokemon/magneton/data.json index fbdbdff220..9942bf8d86 100644 --- a/res/pokemon/magneton/data.json +++ b/res/pokemon/magneton/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 0, "entry_text": "Many mysteriously appear when more\nsunspots dot the sun. They stop\nTV sets from displaying properly.", "category": "Magnet 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": 3591 } } \ No newline at end of file diff --git a/res/pokemon/magnezone/data.json b/res/pokemon/magnezone/data.json index 44cfc06403..701d17100d 100644 --- a/res/pokemon/magnezone/data.json +++ b/res/pokemon/magnezone/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 65529, "entry_text": "A group tried to use scientific\nmeans to make MAGNEZONE evolve,\nbut their efforts ended in failure.", "category": "Magnet Area 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": 3591 } } \ No newline at end of file diff --git a/res/pokemon/makuhita/data.json b/res/pokemon/makuhita/data.json index d752b509b5..5a7d8ab731 100644 --- a/res/pokemon/makuhita/data.json +++ b/res/pokemon/makuhita/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 13, "entry_text": "It toughens its body by slamming\ninto thick trees. Many snapped\ntrees can be found near its nest.", "category": "Guts 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": 50, + "rarity": 30, + "unused": 2313 } } \ No newline at end of file diff --git a/res/pokemon/mamoswine/data.json b/res/pokemon/mamoswine/data.json index 69365979c8..515f59c55e 100644 --- a/res/pokemon/mamoswine/data.json +++ b/res/pokemon/mamoswine/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 5, "entry_text": "A frozen one was dug up from\nsoil dating back 10,000 years. It\nwoke up to much amazement.", "category": "Twin Tusk 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": 2061 } } \ No newline at end of file diff --git a/res/pokemon/manaphy/data.json b/res/pokemon/manaphy/data.json index 412682b3a4..b503307a0d 100644 --- a/res/pokemon/manaphy/data.json +++ b/res/pokemon/manaphy/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 0, "entry_text": "It is born with a wondrous power\nthat lets it bond with any kind of\nPokémon.", "category": "Seafaring 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": 100, + "rarity": 1, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/manectric/data.json b/res/pokemon/manectric/data.json index c152425e5f..1c7af8a62c 100644 --- a/res/pokemon/manectric/data.json +++ b/res/pokemon/manectric/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 5, "entry_text": "It discharges electricity from its\nmane. It creates a thundercloud\noverhead to drop lightning bolts.", "category": "Discharge 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": 70, + "rarity": 20, + "unused": 1799 } } \ No newline at end of file diff --git a/res/pokemon/mankey/data.json b/res/pokemon/mankey/data.json index 883d26b96a..04a53975eb 100644 --- a/res/pokemon/mankey/data.json +++ b/res/pokemon/mankey/data.json @@ -146,5 +146,12 @@ "pokemon_pos_m": 23, "entry_text": "It lives in treetop colonies.\nIf one becomes enraged, the whole\ncolony rampages for no reason.", "category": "Pig Monkey 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": 50, + "rarity": 30, + "unused": 2313 } } \ No newline at end of file diff --git a/res/pokemon/mantine/data.json b/res/pokemon/mantine/data.json index a4dbe40587..c5bbe02a9a 100644 --- a/res/pokemon/mantine/data.json +++ b/res/pokemon/mantine/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 65535, "entry_text": "While elegantly swimming in the sea,\nit ignores REMORAID that cling to\nits fins seeking food scraps.", "category": "Kite 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": 4355 } } \ No newline at end of file diff --git a/res/pokemon/mantyke/data.json b/res/pokemon/mantyke/data.json index b38fdbf206..2d9ce52763 100644 --- a/res/pokemon/mantyke/data.json +++ b/res/pokemon/mantyke/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 65529, "entry_text": "People organize tours to see this\nPokémon frolic and skim the tops\nof waves with REMORAID.", "category": "Kite 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": 90, + "rarity": 3, + "unused": 3593 } } \ No newline at end of file diff --git a/res/pokemon/mareep/data.json b/res/pokemon/mareep/data.json index 63dc4c4969..dd7172143f 100644 --- a/res/pokemon/mareep/data.json +++ b/res/pokemon/mareep/data.json @@ -116,5 +116,12 @@ "pokemon_pos_m": 19, "entry_text": "Its fluffy coat swells to double\nwhen static electricity builds up.\nTouching it can be shocking.", "category": "Wool 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/marill/data.json b/res/pokemon/marill/data.json index 45d8d9d93e..0a56601f39 100644 --- a/res/pokemon/marill/data.json +++ b/res/pokemon/marill/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 27, "entry_text": "The oil-filled end of its tail floats\non water. It keeps MARILL from\ndrowning even in a strong current.", "category": "Aqua Mouse 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 } } \ No newline at end of file diff --git a/res/pokemon/marowak/data.json b/res/pokemon/marowak/data.json index db39fb3be6..9f9f20ec3c 100644 --- a/res/pokemon/marowak/data.json +++ b/res/pokemon/marowak/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 19, "entry_text": "From its birth, this savage Pokémon\nconstantly holds bones. It is\nskilled in using them as weapons.", "category": "Bone Keeper 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": 2056 } } \ No newline at end of file diff --git a/res/pokemon/marshtomp/data.json b/res/pokemon/marshtomp/data.json index 8b4d977747..781f72df15 100644 --- a/res/pokemon/marshtomp/data.json +++ b/res/pokemon/marshtomp/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 20, "entry_text": "Its sturdy legs give it sure\nfooting, even in mud. It\nburrows into dirt to sleep.", "category": "Mud Fish 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": 80, + "rarity": 10, + "unused": 2051 } } \ No newline at end of file diff --git a/res/pokemon/masquerain/data.json b/res/pokemon/masquerain/data.json index 47788010e7..96dee11ba6 100644 --- a/res/pokemon/masquerain/data.json +++ b/res/pokemon/masquerain/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 65533, "entry_text": "Its antennae have eye patterns\non them. Its four wings enable it\nto hover and fly in any direction.", "category": "Eyeball 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": 70, + "rarity": 20, + "unused": 4356 } } \ No newline at end of file diff --git a/res/pokemon/mawile/data.json b/res/pokemon/mawile/data.json index 20ec954f56..28f907e8bd 100644 --- a/res/pokemon/mawile/data.json +++ b/res/pokemon/mawile/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 25, "entry_text": "Attached to its head is a huge\nset of jaws formed by horns.\nIt can chew through iron beams.", "category": "Deceiver 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": 3598 } } \ No newline at end of file diff --git a/res/pokemon/medicham/data.json b/res/pokemon/medicham/data.json index 4a5cca118b..6d2552aae8 100644 --- a/res/pokemon/medicham/data.json +++ b/res/pokemon/medicham/data.json @@ -144,5 +144,12 @@ "pokemon_pos_m": 8, "entry_text": "It gains the ability to see the aura\nof its opponents by honing its mind\nthrough starvation.", "category": "Meditate 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": 2569 } } \ No newline at end of file diff --git a/res/pokemon/meditite/data.json b/res/pokemon/meditite/data.json index 22dca8a2e6..f68000a817 100644 --- a/res/pokemon/meditite/data.json +++ b/res/pokemon/meditite/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 25, "entry_text": "It always trains deep in mountains.\nIt levitates when it heightens its\nspiritual power through meditation.", "category": "Meditate 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": 50, + "rarity": 30, + "unused": 2569 } } \ No newline at end of file diff --git a/res/pokemon/meganium/data.json b/res/pokemon/meganium/data.json index cba72521ab..cfe9f5048d 100644 --- a/res/pokemon/meganium/data.json +++ b/res/pokemon/meganium/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 0, "entry_text": "Its breath has the fantastic\nability to revive dead plants and\nflowers.", "category": "Herb 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/meowth/data.json b/res/pokemon/meowth/data.json index 1e71f65d87..8770d57f8d 100644 --- a/res/pokemon/meowth/data.json +++ b/res/pokemon/meowth/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 26, "entry_text": "It is nocturnal in nature. If it\nspots something shiny, its eyes\nglitter brightly.", "category": "Scratch Cat 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build index c528cc5e02..1cef7ba074 100644 --- a/res/pokemon/meson.build +++ b/res/pokemon/meson.build @@ -838,6 +838,20 @@ gen_species_headers = custom_target('gen_species_headers', ] ) +ppark_narc = custom_target('ppark.narc', + output: 'ppark.narc', + input: personal_files, + env: json2bin_env, + depends: [ py_consts_generators ], + command: [ + catching_show_data_py, + '--narc', narc_exe, + '--source-dir', '@CURRENT_SOURCE_DIR@', + '--private-dir', '@PRIVATE_DIR@', + '--output-dir', '@OUTDIR@', + ] +) + nitrofs_files += pl_personal_narc nitrofs_files += evo_narc nitrofs_files += pl_poke_icon_narc @@ -851,3 +865,4 @@ nitrofs_files += shinzukan_narc nitrofs_files += pl_growtbl_narc nitrofs_files += pokedex_data_narc nitrofs_files += pokedex_data_giratina_altered_narc +nitrofs_files += ppark_narc diff --git a/res/pokemon/mesprit/data.json b/res/pokemon/mesprit/data.json index 94120a385f..b37405b766 100644 --- a/res/pokemon/mesprit/data.json +++ b/res/pokemon/mesprit/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 65526, "entry_text": "When MESPRIT flew, people learned\nthe joy and sadness of living.\nIt was the birth of emotions.", "category": "Emotion 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/metagross/data.json b/res/pokemon/metagross/data.json index 077de18b40..646fd544ce 100644 --- a/res/pokemon/metagross/data.json +++ b/res/pokemon/metagross/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 9, "entry_text": "METANG combined to form it.\nWith four brains, it has the\nintelligence of a supercomputer.", "category": "Iron Leg 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": 90, + "rarity": 3, + "unused": 2574 } } \ No newline at end of file diff --git a/res/pokemon/metang/data.json b/res/pokemon/metang/data.json index 0320405e54..8e1ce7b5e9 100644 --- a/res/pokemon/metang/data.json +++ b/res/pokemon/metang/data.json @@ -148,5 +148,12 @@ "pokemon_pos_m": 65534, "entry_text": "It is formed by two BELDUM joining\ntogether. Its steel body won’t be\nscratched if it collides with a jet.", "category": "Iron Claw 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": 2574 } } \ No newline at end of file diff --git a/res/pokemon/metapod/data.json b/res/pokemon/metapod/data.json index adb1b2e795..f3e88e72e5 100644 --- a/res/pokemon/metapod/data.json +++ b/res/pokemon/metapod/data.json @@ -78,5 +78,12 @@ "pokemon_pos_m": 23, "entry_text": "A steel-hard shell protects its\ntender body. It quietly endures\nhardships while awaiting evolution.", "category": "Cocoon 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/mew/data.json b/res/pokemon/mew/data.json index 3a6b2500b9..37280f7367 100644 --- a/res/pokemon/mew/data.json +++ b/res/pokemon/mew/data.json @@ -221,5 +221,12 @@ "pokemon_pos_m": 65522, "entry_text": "Because it can use all kinds of\nmoves, many scientists believe MEW\nto be the ancestor of Pokémon.", "category": "New Species 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": 100, + "rarity": 1, + "unused": 2570 } } \ No newline at end of file diff --git a/res/pokemon/mewtwo/data.json b/res/pokemon/mewtwo/data.json index 51a62068be..684b48cd1a 100644 --- a/res/pokemon/mewtwo/data.json +++ b/res/pokemon/mewtwo/data.json @@ -168,5 +168,12 @@ "pokemon_pos_m": 6, "entry_text": "A Pokémon created by recombining\nMEW’s genes. It’s said to have the\nmost savage heart among Pokémon.", "category": "Genetic 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 } } \ No newline at end of file diff --git a/res/pokemon/mightyena/data.json b/res/pokemon/mightyena/data.json index 5385f3b4bf..76daf930e6 100644 --- a/res/pokemon/mightyena/data.json +++ b/res/pokemon/mightyena/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 10, "entry_text": "It chases down prey in a pack.\nIt will never disobey the commands\nof a skilled Trainer.", "category": "Bite 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": 4112 } } \ No newline at end of file diff --git a/res/pokemon/milotic/data.json b/res/pokemon/milotic/data.json index ee1102afb7..2528acfeae 100644 --- a/res/pokemon/milotic/data.json +++ b/res/pokemon/milotic/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 3, "entry_text": "Its lovely scales are described as\nrainbow colored. They change color\ndepending on the viewing angle.", "category": "Tender 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": 90, + "rarity": 3, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/miltank/data.json b/res/pokemon/miltank/data.json index 2c2873ad2e..0d52a11cdb 100644 --- a/res/pokemon/miltank/data.json +++ b/res/pokemon/miltank/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 11, "entry_text": "It is said that kids who drink\nMILTANK’s milk grow up to become\nhearty, healthy adults.", "category": "Milk Cow 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/mime_jr/data.json b/res/pokemon/mime_jr/data.json index 7545fbb279..67380e030e 100644 --- a/res/pokemon/mime_jr/data.json +++ b/res/pokemon/mime_jr/data.json @@ -149,5 +149,12 @@ "pokemon_pos_m": 24, "entry_text": "It mimics the expressions and\nmotions of those it sees to\nunderstand the feelings of others.", "category": "Mime 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 } } \ No newline at end of file diff --git a/res/pokemon/minun/data.json b/res/pokemon/minun/data.json index 054078cf7b..722a3dd3a9 100644 --- a/res/pokemon/minun/data.json +++ b/res/pokemon/minun/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 28, "entry_text": "It cheers on friends. If its\nfriends are losing, its body lets\noff more and more sparks.", "category": "Cheering 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/misdreavus/data.json b/res/pokemon/misdreavus/data.json index 0d0dfeb935..3399bd4ffa 100644 --- a/res/pokemon/misdreavus/data.json +++ b/res/pokemon/misdreavus/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 65527, "entry_text": "A Pokémon that startles people in\nthe middle of the night. It gathers\nfear as its energy.", "category": "Screech 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": 3084 } } \ No newline at end of file diff --git a/res/pokemon/mismagius/data.json b/res/pokemon/mismagius/data.json index 64baf01a3d..ea2f1e59c2 100644 --- a/res/pokemon/mismagius/data.json +++ b/res/pokemon/mismagius/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 65529, "entry_text": "Its cry sounds like an incantation.\nIt is said the cry may rarely be\nimbued with happiness-giving power.", "category": "Magical 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": 80, + "rarity": 10, + "unused": 3084 } } \ No newline at end of file diff --git a/res/pokemon/moltres/data.json b/res/pokemon/moltres/data.json index aafdd69a2a..922c656ee8 100644 --- a/res/pokemon/moltres/data.json +++ b/res/pokemon/moltres/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 1, "entry_text": "One of the legendary bird Pokémon.\nIt is said that its appearance\nindicates the coming of spring.", "category": "Flame 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": 90, + "rarity": 3, + "unused": 4354 } } \ No newline at end of file diff --git a/res/pokemon/monferno/data.json b/res/pokemon/monferno/data.json index a3bb80c8b7..ea1547f053 100644 --- a/res/pokemon/monferno/data.json +++ b/res/pokemon/monferno/data.json @@ -146,5 +146,12 @@ "pokemon_pos_m": 17, "entry_text": "It skillfully controls the intensity\nof the fire on its tail to keep its\nfoes at an ideal distance.", "category": "Playful 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": 2306 } } \ No newline at end of file diff --git a/res/pokemon/mothim/data.json b/res/pokemon/mothim/data.json index 0f7a6bff10..cd1cca54f6 100644 --- a/res/pokemon/mothim/data.json +++ b/res/pokemon/mothim/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 65525, "entry_text": "While it loves floral honey, it won’t\ngather any itself. Instead, it\nplots to steal some from COMBEE.", "category": "Moth 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/mr_mime/data.json b/res/pokemon/mr_mime/data.json index 24b4071954..6a762c3707 100644 --- a/res/pokemon/mr_mime/data.json +++ b/res/pokemon/mr_mime/data.json @@ -154,5 +154,12 @@ "pokemon_pos_m": 9, "entry_text": "It shapes an invisible wall in midair\nby minutely vibrating its fingertips\nto stop molecules in the air.", "category": "Barrier 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": 70, + "rarity": 20, + "unused": 2570 } } \ No newline at end of file diff --git a/res/pokemon/mudkip/data.json b/res/pokemon/mudkip/data.json index da669c9e66..f217242442 100644 --- a/res/pokemon/mudkip/data.json +++ b/res/pokemon/mudkip/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 27, "entry_text": "To alert it, the fin on its head\nsenses the flow of water. It has\nthe strength to heft boulders.", "category": "Mud Fish 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 } } \ No newline at end of file diff --git a/res/pokemon/muk/data.json b/res/pokemon/muk/data.json index 968448e1f0..d2a5b4805d 100644 --- a/res/pokemon/muk/data.json +++ b/res/pokemon/muk/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 6, "entry_text": "A toxic fluid seeps from its body.\nThe fluid instantly kills plants and\ntrees on contact.", "category": "Sludge 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": 70, + "rarity": 20, + "unused": 1542 } } \ No newline at end of file diff --git a/res/pokemon/munchlax/data.json b/res/pokemon/munchlax/data.json index 7dcb0c9033..71a7de80f6 100644 --- a/res/pokemon/munchlax/data.json +++ b/res/pokemon/munchlax/data.json @@ -146,5 +146,12 @@ "pokemon_pos_m": 26, "entry_text": "In its desperation to gulp down\nfood, it forgets about the food it\nhas hidden under its fur.", "category": "Big Eater 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": 70, + "rarity": 20, + "unused": 2310 } } \ No newline at end of file diff --git a/res/pokemon/murkrow/data.json b/res/pokemon/murkrow/data.json index caa47de38a..2d69809ef9 100644 --- a/res/pokemon/murkrow/data.json +++ b/res/pokemon/murkrow/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 23, "entry_text": "If spotted, it will lure an unwary\nperson into chasing it, then lose\nthe pursuer on mountain trails.", "category": "Darkness 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": 4368 } } \ No newline at end of file diff --git a/res/pokemon/natu/data.json b/res/pokemon/natu/data.json index dec7931449..cd5ce2efc3 100644 --- a/res/pokemon/natu/data.json +++ b/res/pokemon/natu/data.json @@ -144,5 +144,12 @@ "pokemon_pos_m": 31, "entry_text": "It picks food from cactus plants,\ndeftly avoiding buds and spines.\nIt seems to skip about to move.", "category": "Tiny Bird 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": 4362 } } \ No newline at end of file diff --git a/res/pokemon/nidoking/data.json b/res/pokemon/nidoking/data.json index f58766db9c..5a7881fd42 100644 --- a/res/pokemon/nidoking/data.json +++ b/res/pokemon/nidoking/data.json @@ -147,5 +147,12 @@ "pokemon_pos_m": 9, "entry_text": "One swing of its mighty tail can\nsnap a telephone pole as if it were\na matchstick.", "category": "Drill 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": 70, + "rarity": 20, + "unused": 2054 } } \ No newline at end of file diff --git a/res/pokemon/nidoqueen/data.json b/res/pokemon/nidoqueen/data.json index ddd9c7eed4..77c7b23c16 100644 --- a/res/pokemon/nidoqueen/data.json +++ b/res/pokemon/nidoqueen/data.json @@ -147,5 +147,12 @@ "pokemon_pos_m": 9, "entry_text": "Its entire body is armored with\nhard scales. It will protect the\nyoung in its burrow with its life.", "category": "Drill 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": 70, + "rarity": 20, + "unused": 2054 } } \ No newline at end of file diff --git a/res/pokemon/nidoran_f/data.json b/res/pokemon/nidoran_f/data.json index 90b4211241..108bc375ab 100644 --- a/res/pokemon/nidoran_f/data.json +++ b/res/pokemon/nidoran_f/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 25, "entry_text": "While it does not prefer to fight,\neven one drop of the poison it\nsecretes from barbs can be fatal.", "category": "Poison Pin 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": 30, + "rarity": 50, + "unused": 1542 } } \ No newline at end of file diff --git a/res/pokemon/nidoran_m/data.json b/res/pokemon/nidoran_m/data.json index 874bce0d3b..e1d52a6609 100644 --- a/res/pokemon/nidoran_m/data.json +++ b/res/pokemon/nidoran_m/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 25, "entry_text": "It scans its surroundings by\nraising its ears out of the grass.\nIts toxic horn is for protection.", "category": "Poison Pin 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": 30, + "rarity": 50, + "unused": 1542 } } \ No newline at end of file diff --git a/res/pokemon/nidorina/data.json b/res/pokemon/nidorina/data.json index 35a31d866f..7b7e3b6765 100644 --- a/res/pokemon/nidorina/data.json +++ b/res/pokemon/nidorina/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 19, "entry_text": "When it senses danger, it raises\nall the barbs on its body. These\nbarbs grow slower than NIDORINO’s.", "category": "Poison Pin 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": 1542 } } \ No newline at end of file diff --git a/res/pokemon/nidorino/data.json b/res/pokemon/nidorino/data.json index 7cf1f6f5d7..d555d8f4bd 100644 --- a/res/pokemon/nidorino/data.json +++ b/res/pokemon/nidorino/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 16, "entry_text": "It has a violent disposition and\nstabs foes with its horn, which\noozes poison upon impact.", "category": "Poison Pin 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": 1542 } } \ No newline at end of file diff --git a/res/pokemon/nincada/data.json b/res/pokemon/nincada/data.json index c35f12fde8..fd7fa9a330 100644 --- a/res/pokemon/nincada/data.json +++ b/res/pokemon/nincada/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 25, "entry_text": "It grows underground, sensing\nits surroundings using antennae\ninstead of its virtually blind eyes.", "category": "Trainee 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": 2052 } } \ No newline at end of file diff --git a/res/pokemon/ninetales/data.json b/res/pokemon/ninetales/data.json index 300ceb3ff6..1143f1f89c 100644 --- a/res/pokemon/ninetales/data.json +++ b/res/pokemon/ninetales/data.json @@ -115,5 +115,12 @@ "pokemon_pos_m": 9, "entry_text": "Its nine tails are said to be\nimbued with a mystic power.\nIt can live for a thousand years.", "category": "Fox 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 } } \ No newline at end of file diff --git a/res/pokemon/ninjask/data.json b/res/pokemon/ninjask/data.json index 9cfdda5162..a4d633ec79 100644 --- a/res/pokemon/ninjask/data.json +++ b/res/pokemon/ninjask/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 65534, "entry_text": "Because it moves so quickly, it\nsometimes becomes unseeable. It\ncongregates around tree sap.", "category": "Ninja 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/noctowl/data.json b/res/pokemon/noctowl/data.json index 0e3f228812..943ed85ef0 100644 --- a/res/pokemon/noctowl/data.json +++ b/res/pokemon/noctowl/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 3, "entry_text": "Its eyes are specially developed\nto enable it to see clearly even in\nmurky darkness and minimal light.", "category": "Owl 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/nosepass/data.json b/res/pokemon/nosepass/data.json index 07d9ccd993..946b6402f1 100644 --- a/res/pokemon/nosepass/data.json +++ b/res/pokemon/nosepass/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 16, "entry_text": "When endangered, it may protect\nitself by raising its magnetism and\ndrawing iron objects to its body.", "category": "Compass 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": 2827 } } \ No newline at end of file diff --git a/res/pokemon/numel/data.json b/res/pokemon/numel/data.json index fc7fc903fc..45891ee9f5 100644 --- a/res/pokemon/numel/data.json +++ b/res/pokemon/numel/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 22, "entry_text": "Its humped back stores intensely\nhot magma. In rain, the magma\ncools, slowing its movement.", "category": "Numb 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": 50, + "rarity": 30, + "unused": 2050 } } \ No newline at end of file diff --git a/res/pokemon/nuzleaf/data.json b/res/pokemon/nuzleaf/data.json index a9b30802ca..4eb047ca2a 100644 --- a/res/pokemon/nuzleaf/data.json +++ b/res/pokemon/nuzleaf/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 14, "entry_text": "The sound of its grass flute makes\nits listeners uneasy. It lives deep\nin forests.", "category": "Wily 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": 4097 } } \ No newline at end of file diff --git a/res/pokemon/octillery/data.json b/res/pokemon/octillery/data.json index 002e07c395..4c69147f6a 100644 --- a/res/pokemon/octillery/data.json +++ b/res/pokemon/octillery/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 5, "entry_text": "It loves to lurk inside holes in\nrocks. It sometimes sprays ink on\nprey by sticking out only its mouth.", "category": "Jet 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": 771 } } \ No newline at end of file diff --git a/res/pokemon/oddish/data.json b/res/pokemon/oddish/data.json index 6b781d1c25..7f582faf7a 100644 --- a/res/pokemon/oddish/data.json +++ b/res/pokemon/oddish/data.json @@ -118,5 +118,12 @@ "pokemon_pos_m": 27, "entry_text": "It often plants its root feet in the\nground during the day and sows\nseeds as it walks about at night.", "category": "Weed 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": 30, + "rarity": 50, + "unused": 1537 } } \ No newline at end of file diff --git a/res/pokemon/omanyte/data.json b/res/pokemon/omanyte/data.json index 6d149e56c6..534098ef2d 100644 --- a/res/pokemon/omanyte/data.json +++ b/res/pokemon/omanyte/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 28, "entry_text": "A Pokémon that was resurrected\nfrom a fossil using modern science.\nIt swam in ancient seas.", "category": "Spiral 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": 50, + "rarity": 30, + "unused": 779 } } \ No newline at end of file diff --git a/res/pokemon/omastar/data.json b/res/pokemon/omastar/data.json index c07eaad1f6..b22584f72c 100644 --- a/res/pokemon/omastar/data.json +++ b/res/pokemon/omastar/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 14, "entry_text": "It is thought that this Pokémon\nbecame extinct because its spiral\nshell grew too large.", "category": "Spiral 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": 779 } } \ No newline at end of file diff --git a/res/pokemon/onix/data.json b/res/pokemon/onix/data.json index 5cce9df6f3..df5b8f7c96 100644 --- a/res/pokemon/onix/data.json +++ b/res/pokemon/onix/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 1, "entry_text": "It burrows through the ground\nat a speed of 50 mph while\nfeeding on large boulders.\n", "category": "Rock Snake 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": 2059 } } \ No newline at end of file diff --git a/res/pokemon/pachirisu/data.json b/res/pokemon/pachirisu/data.json index f1b3a58a6d..b411d3e4b8 100644 --- a/res/pokemon/pachirisu/data.json +++ b/res/pokemon/pachirisu/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 23, "entry_text": "A pair may be seen rubbing their\ncheek pouches together in an\neffort to share stored electricity.", "category": "EleSquirrel 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/palkia/data.json b/res/pokemon/palkia/data.json index 16206723eb..ef29817639 100644 --- a/res/pokemon/palkia/data.json +++ b/res/pokemon/palkia/data.json @@ -144,5 +144,12 @@ "pokemon_pos_m": 2, "entry_text": "A legendary Pokémon of Sinnoh.\nIt is said that space becomes more\nstable with PALKIA’s every breath.", "category": "Spatial 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": 90, + "rarity": 3, + "unused": 3843 } } \ No newline at end of file diff --git a/res/pokemon/paras/data.json b/res/pokemon/paras/data.json index 3da56df8ca..ae64fbf634 100644 --- a/res/pokemon/paras/data.json +++ b/res/pokemon/paras/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 30, "entry_text": "Mushrooms named tochukaso grow\non its back. They grow along\nwith the host PARAS.", "category": "Mushroom 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": 30, + "rarity": 50, + "unused": 260 } } \ No newline at end of file diff --git a/res/pokemon/parasect/data.json b/res/pokemon/parasect/data.json index 9eabdf9a6b..04bfdb5079 100644 --- a/res/pokemon/parasect/data.json +++ b/res/pokemon/parasect/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 18, "entry_text": "A mushroom grown larger than the\nhost’s body controls PARASECT.\nIt scatters poisonous spores.", "category": "Mushroom 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": 260 } } \ No newline at end of file diff --git a/res/pokemon/pelipper/data.json b/res/pokemon/pelipper/data.json index 4b00bdbf5a..682e8beb7f 100644 --- a/res/pokemon/pelipper/data.json +++ b/res/pokemon/pelipper/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 65531, "entry_text": "It is a messenger of the skies,\ncarrying small Pokémon and\neggs to safety in its bill.", "category": "Water Bird 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": 50, + "rarity": 30, + "unused": 4355 } } \ No newline at end of file diff --git a/res/pokemon/persian/data.json b/res/pokemon/persian/data.json index 50972ef0c3..1f98c0fbb5 100644 --- a/res/pokemon/persian/data.json +++ b/res/pokemon/persian/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 16, "entry_text": "A very haughty Pokémon. Among\nfans, the size of the jewel in its\nforehead is a topic of much talk.", "category": "Classy Cat 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/phanpy/data.json b/res/pokemon/phanpy/data.json index d2c6206733..1cb3f3d6c9 100644 --- a/res/pokemon/phanpy/data.json +++ b/res/pokemon/phanpy/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 25, "entry_text": "It is strong despite its compact\nsize. It can easily pick up and\ncarry an adult human on its back.", "category": "Long Nose 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": 50, + "rarity": 30, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/phione/data.json b/res/pokemon/phione/data.json index 17fb617012..952955fa9b 100644 --- a/res/pokemon/phione/data.json +++ b/res/pokemon/phione/data.json @@ -121,5 +121,12 @@ "pokemon_pos_m": 1, "entry_text": "It drifts in warm seas. It always\nreturns to where it was born, no\nmatter how far it may have drifted.", "category": "Sea Drifter 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": 90, + "rarity": 3, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/pichu/data.json b/res/pokemon/pichu/data.json index edf22c8374..6d805bed81 100644 --- a/res/pokemon/pichu/data.json +++ b/res/pokemon/pichu/data.json @@ -118,5 +118,12 @@ "pokemon_pos_m": 27, "entry_text": "The electric sacs in its cheeks are\nsmall. If even a little electricity\nleaks, it becomes shocked.", "category": "Tiny Mouse 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 } } \ No newline at end of file diff --git a/res/pokemon/pidgeot/data.json b/res/pokemon/pidgeot/data.json index 3134858341..3de3394b58 100644 --- a/res/pokemon/pidgeot/data.json +++ b/res/pokemon/pidgeot/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 6, "entry_text": "By flapping its wings with all its\nmight, PIDGEOT can make a gust of\nwind capable of bending tall trees.", "category": "Bird 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": 70, + "rarity": 20, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/pidgeotto/data.json b/res/pokemon/pidgeotto/data.json index 038cd3eb4b..9bd031c95c 100644 --- a/res/pokemon/pidgeotto/data.json +++ b/res/pokemon/pidgeotto/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 65529, "entry_text": "It flies over its wide territory in\nsearch of prey, downing it\nwith its highly developed claws.", "category": "Bird 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/pidgey/data.json b/res/pokemon/pidgey/data.json index 497d30891c..7d00e141be 100644 --- a/res/pokemon/pidgey/data.json +++ b/res/pokemon/pidgey/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 31, "entry_text": "It is docile and prefers to avoid\nconflict. If disturbed, however,\nit can ferociously strike back.", "category": "Tiny Bird 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": 30, + "rarity": 50, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/pikachu/data.json b/res/pokemon/pikachu/data.json index 5489fd3d35..2adb6d4ee9 100644 --- a/res/pokemon/pikachu/data.json +++ b/res/pokemon/pikachu/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 27, "entry_text": "It occasionally uses an electric\nshock to recharge a fellow PIKACHU\nthat is in a weakened state.", "category": "Mouse 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": 80, + "rarity": 10, + "unused": 1799 } } \ No newline at end of file diff --git a/res/pokemon/piloswine/data.json b/res/pokemon/piloswine/data.json index 97f95cb566..949b1f5a74 100644 --- a/res/pokemon/piloswine/data.json +++ b/res/pokemon/piloswine/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 14, "entry_text": "Covered by a shaggy coat, it is\nstrong against the cold. Its tusks\nof ice thicken when it snows.", "category": "Swine 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": 2061 } } \ No newline at end of file diff --git a/res/pokemon/pineco/data.json b/res/pokemon/pineco/data.json index 211633b6a8..7c316b0ded 100644 --- a/res/pokemon/pineco/data.json +++ b/res/pokemon/pineco/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 2, "entry_text": "It looks just like a pinecone.\nIts shell protects it from bird\nPokémon that peck it by mistake.", "category": "Bagworm 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/pinsir/data.json b/res/pokemon/pinsir/data.json index e57ca32b36..d4408cb478 100644 --- a/res/pokemon/pinsir/data.json +++ b/res/pokemon/pinsir/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 5, "entry_text": "It grips prey with its pincers\nuntil the prey is torn in half.\nWhat it can’t tear, it tosses far.", "category": "Stag Beetle 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/piplup/data.json b/res/pokemon/piplup/data.json index 67fc4e9927..c3ab93b331 100644 --- a/res/pokemon/piplup/data.json +++ b/res/pokemon/piplup/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 28, "entry_text": "A poor walker, it often falls down.\nHowever, its strong pride makes it\npuff up its chest without a care.", "category": "Penguin 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 } } \ No newline at end of file diff --git a/res/pokemon/plusle/data.json b/res/pokemon/plusle/data.json index 49651277e3..3f72d24141 100644 --- a/res/pokemon/plusle/data.json +++ b/res/pokemon/plusle/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 28, "entry_text": "It cheers on friends with pom-poms\nmade of sparks. It drains power\nfrom telephone poles.", "category": "Cheering 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/politoed/data.json b/res/pokemon/politoed/data.json index 11520c421b..315f7b228a 100644 --- a/res/pokemon/politoed/data.json +++ b/res/pokemon/politoed/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 14, "entry_text": "It gathers groups of others as\ntheir leader. Its cries make\nPOLIWAG obey.", "category": "Frog 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": 80, + "rarity": 10, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/poliwag/data.json b/res/pokemon/poliwag/data.json index ef8f436760..9eceeba8c5 100644 --- a/res/pokemon/poliwag/data.json +++ b/res/pokemon/poliwag/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 21, "entry_text": "Its skin is so thin, its internal\norgans are visible. It has trouble\nwalking on its newly grown feet.", "category": "Tadpole 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 } } \ No newline at end of file diff --git a/res/pokemon/poliwhirl/data.json b/res/pokemon/poliwhirl/data.json index eb8012d167..e440cfdf0a 100644 --- a/res/pokemon/poliwhirl/data.json +++ b/res/pokemon/poliwhirl/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 17, "entry_text": "The spiral pattern on its belly\nsubtly undulates. Staring at it\ngradually causes drowsiness.", "category": "Tadpole 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": 80, + "rarity": 10, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/poliwrath/data.json b/res/pokemon/poliwrath/data.json index f7c1597fd3..3cae001ca3 100644 --- a/res/pokemon/poliwrath/data.json +++ b/res/pokemon/poliwrath/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 4, "entry_text": "With its extremely tough muscles,\nit can keep swimming in the Pacific\nOcean without resting.", "category": "Tadpole 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": 90, + "rarity": 3, + "unused": 2307 } } \ No newline at end of file diff --git a/res/pokemon/ponyta/data.json b/res/pokemon/ponyta/data.json index 16e085d7fb..99f8651212 100644 --- a/res/pokemon/ponyta/data.json +++ b/res/pokemon/ponyta/data.json @@ -118,5 +118,12 @@ "pokemon_pos_m": 17, "entry_text": "As a newborn, it can barely stand.\nHowever, through galloping, its\nlegs are made tougher and faster.", "category": "Fire Horse 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/poochyena/data.json b/res/pokemon/poochyena/data.json index bfe012b679..9172729106 100644 --- a/res/pokemon/poochyena/data.json +++ b/res/pokemon/poochyena/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 26, "entry_text": "A Pokémon with a persistent\nnature, it chases its chosen prey\nuntil the prey becomes exhausted.", "category": "Bite 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": 30, + "rarity": 50, + "unused": 4112 } } \ No newline at end of file diff --git a/res/pokemon/porygon/data.json b/res/pokemon/porygon/data.json index c5041b9778..ed059567af 100644 --- a/res/pokemon/porygon/data.json +++ b/res/pokemon/porygon/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 0, "entry_text": "A man-made Pokémon created using\nadvanced scientific means. It can\nmove freely in cyberspace.", "category": "Virtual 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/porygon2/data.json b/res/pokemon/porygon2/data.json index f214ef5fe1..8c66afa9d2 100644 --- a/res/pokemon/porygon2/data.json +++ b/res/pokemon/porygon2/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 65529, "entry_text": "It was upgraded to enable the\nexploration of other planets.\nHowever, it failed to measure up.", "category": "Virtual 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/porygon_z/data.json b/res/pokemon/porygon_z/data.json index 4d415e195f..e182878217 100644 --- a/res/pokemon/porygon_z/data.json +++ b/res/pokemon/porygon_z/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 65531, "entry_text": "Its programming was modified to\nenable work in alien dimensions.\nIt did not work as planned.", "category": "Virtual 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/primeape/data.json b/res/pokemon/primeape/data.json index be8fce3bbe..40e7477400 100644 --- a/res/pokemon/primeape/data.json +++ b/res/pokemon/primeape/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 14, "entry_text": "It grows angry if you see its eyes\nand gets angrier if you run. If you\nbeat it, it gets even madder.", "category": "Pig Monkey 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": 2313 } } \ No newline at end of file diff --git a/res/pokemon/prinplup/data.json b/res/pokemon/prinplup/data.json index 1a26bb2e65..6e89374834 100644 --- a/res/pokemon/prinplup/data.json +++ b/res/pokemon/prinplup/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 18, "entry_text": "Because every PRINPLUP considers\nitself to be the most important,\nthey can never form a group.", "category": "Penguin 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": 80, + "rarity": 10, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/probopass/data.json b/res/pokemon/probopass/data.json index 4e57aeeb7a..d6df04fa3b 100644 --- a/res/pokemon/probopass/data.json +++ b/res/pokemon/probopass/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 4, "entry_text": "It freely controls three small\nunits called Mini-Noses using\nmagnetic force.", "category": "Compass 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": 2827 } } \ No newline at end of file diff --git a/res/pokemon/psyduck/data.json b/res/pokemon/psyduck/data.json index 2660f0bb75..4f1a41383f 100644 --- a/res/pokemon/psyduck/data.json +++ b/res/pokemon/psyduck/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 21, "entry_text": "Overwhelmed by enigmatic abilities,\nit suffers a constant headache. It\nsometimes uses mysterious powers.", "category": "Duck 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 } } \ No newline at end of file diff --git a/res/pokemon/pupitar/data.json b/res/pokemon/pupitar/data.json index 2fe8f35d2b..955883a561 100644 --- a/res/pokemon/pupitar/data.json +++ b/res/pokemon/pupitar/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 10, "entry_text": "Its body is as hard as bedrock.\nBy venting pressurized gas, it can\nlaunch itself like a rocket.", "category": "Hard Shell 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": 2059 } } \ No newline at end of file diff --git a/res/pokemon/purugly/data.json b/res/pokemon/purugly/data.json index a1e3d19d64..1088b8f627 100644 --- a/res/pokemon/purugly/data.json +++ b/res/pokemon/purugly/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 15, "entry_text": "It binds its body with its tails to\nmake itself look bigger. If it locks\neyes, it will glare ceaselessly.", "category": "Tiger Cat 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": 70, + "rarity": 20, + "unused": 4102 } } \ No newline at end of file diff --git a/res/pokemon/quagsire/data.json b/res/pokemon/quagsire/data.json index d4a92d7fc6..9d320d62bc 100644 --- a/res/pokemon/quagsire/data.json +++ b/res/pokemon/quagsire/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 6, "entry_text": "It has an easygoing nature. It\ndoesn’t care if it bumps its head on\nboats and boulders while swimming.", "category": "Water Fish 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": 70, + "rarity": 20, + "unused": 2051 } } \ No newline at end of file diff --git a/res/pokemon/quilava/data.json b/res/pokemon/quilava/data.json index 886ddef2d7..201a65353b 100644 --- a/res/pokemon/quilava/data.json +++ b/res/pokemon/quilava/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 19, "entry_text": "It intimidates foes with the heat\nof its flames. The fire burns more\nstrongly when it readies to fight.", "category": "Volcano 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 } } \ No newline at end of file diff --git a/res/pokemon/qwilfish/data.json b/res/pokemon/qwilfish/data.json index 10005b0aa2..e719bbaa29 100644 --- a/res/pokemon/qwilfish/data.json +++ b/res/pokemon/qwilfish/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 4, "entry_text": "It shoots the poison spines on its\nbody in all directions. Its round\nform makes it a poor swimmer.", "category": "Balloon 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": 80, + "rarity": 10, + "unused": 1539 } } \ No newline at end of file diff --git a/res/pokemon/raichu/data.json b/res/pokemon/raichu/data.json index 910eab780c..502ef5dce1 100644 --- a/res/pokemon/raichu/data.json +++ b/res/pokemon/raichu/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 21, "entry_text": "Its tail discharges electricity into\nthe ground, protecting it from\ngetting shocked.", "category": "Mouse 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": 90, + "rarity": 3, + "unused": 1799 } } \ No newline at end of file diff --git a/res/pokemon/raikou/data.json b/res/pokemon/raikou/data.json index 4b495320a5..63b6caf245 100644 --- a/res/pokemon/raikou/data.json +++ b/res/pokemon/raikou/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 3, "entry_text": "It is said to have fallen with\nlightning. It can fire thunderbolts\nfrom the rain clouds on its back.", "category": "Thunder 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": 90, + "rarity": 3, + "unused": 1799 } } \ No newline at end of file diff --git a/res/pokemon/ralts/data.json b/res/pokemon/ralts/data.json index 810b709113..76b0fca73d 100644 --- a/res/pokemon/ralts/data.json +++ b/res/pokemon/ralts/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 26, "entry_text": "If its horns capture the warm\nfeelings of people or Pokémon,\nits body warms up slightly.", "category": "Feeling 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 } } \ No newline at end of file diff --git a/res/pokemon/rampardos/data.json b/res/pokemon/rampardos/data.json index 5e3e20cfe0..953397e88f 100644 --- a/res/pokemon/rampardos/data.json +++ b/res/pokemon/rampardos/data.json @@ -147,5 +147,12 @@ "pokemon_pos_m": 3, "entry_text": "If two were to smash their heads\ntogether, their foot-thick skulls\nwould keep them from fainting.", "category": "Head Butt 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": 3595 } } \ No newline at end of file diff --git a/res/pokemon/rapidash/data.json b/res/pokemon/rapidash/data.json index ba356b6877..93df80277e 100644 --- a/res/pokemon/rapidash/data.json +++ b/res/pokemon/rapidash/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 4, "entry_text": "When at an all-out gallop, its\nblazing mane sparkles, enhancing\nits beautiful appearance.", "category": "Fire Horse 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": 70, + "rarity": 20, + "unused": 514 } } \ No newline at end of file diff --git a/res/pokemon/raticate/data.json b/res/pokemon/raticate/data.json index 027d70cdfb..44b1ed9579 100644 --- a/res/pokemon/raticate/data.json +++ b/res/pokemon/raticate/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 21, "entry_text": "It whittles its constantly growing\nfangs by gnawing on hard things.\nIt can chew apart cinder walls.", "category": "Mouse 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/rattata/data.json b/res/pokemon/rattata/data.json index 3ceaf33f10..55b97f7b6a 100644 --- a/res/pokemon/rattata/data.json +++ b/res/pokemon/rattata/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 23, "entry_text": "Cautious in the extreme, its\nhardy vitality lets it live in\nany kind of environment.", "category": "Mouse 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": 30, + "rarity": 50, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/rayquaza/data.json b/res/pokemon/rayquaza/data.json index 10b9a3187a..dbdc34d069 100644 --- a/res/pokemon/rayquaza/data.json +++ b/res/pokemon/rayquaza/data.json @@ -148,5 +148,12 @@ "pokemon_pos_m": 0, "entry_text": "It lives in the ozone layer far\nabove the clouds and cannot be\nseen from the ground.", "category": "Sky High 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": 4367 } } \ No newline at end of file diff --git a/res/pokemon/regice/data.json b/res/pokemon/regice/data.json index 564ffe9862..894a4af865 100644 --- a/res/pokemon/regice/data.json +++ b/res/pokemon/regice/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 2, "entry_text": "Its body is made of ice from the\nice age. It controls frigid air of\n-328 degrees Fahrenheit.", "category": "Iceberg 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": 90, + "rarity": 3, + "unused": 3341 } } \ No newline at end of file diff --git a/res/pokemon/regigigas/data.json b/res/pokemon/regigigas/data.json index e1d7de569e..810cffc2c6 100644 --- a/res/pokemon/regigigas/data.json +++ b/res/pokemon/regigigas/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 1, "entry_text": "It is said to have made Pokémon\nthat look like itself from a special\nice mountain, rocks, and magma.", "category": "Colossal 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": 90, + "rarity": 3, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/regirock/data.json b/res/pokemon/regirock/data.json index 08cac908ba..140a59bdcb 100644 --- a/res/pokemon/regirock/data.json +++ b/res/pokemon/regirock/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 1, "entry_text": "Its entire body is made of rock.\nIf any part chips off in battle, it\nattaches rocks to repair itself.", "category": "Rock Peak 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": 90, + "rarity": 3, + "unused": 2827 } } \ No newline at end of file diff --git a/res/pokemon/registeel/data.json b/res/pokemon/registeel/data.json index 3f904a97b8..3be52fbb11 100644 --- a/res/pokemon/registeel/data.json +++ b/res/pokemon/registeel/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 4, "entry_text": "Tempered by pressure underground\nover tens of thousands of years,\nits body cannot be scratched.", "category": "Iron 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": 90, + "rarity": 3, + "unused": 3598 } } \ No newline at end of file diff --git a/res/pokemon/relicanth/data.json b/res/pokemon/relicanth/data.json index ab54be30a0..517c87c1ec 100644 --- a/res/pokemon/relicanth/data.json +++ b/res/pokemon/relicanth/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 65529, "entry_text": "A rare Pokémon discovered during\na deep-sea exploration. It has not\nchanged in over 100 million years.", "category": "Longevity 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": 80, + "rarity": 10, + "unused": 2819 } } \ No newline at end of file diff --git a/res/pokemon/remoraid/data.json b/res/pokemon/remoraid/data.json index b9eabb2eab..a73984b289 100644 --- a/res/pokemon/remoraid/data.json +++ b/res/pokemon/remoraid/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 5, "entry_text": "It forcefully squirts water. The\nwater jet never misses prey even\nif the REMORAID is deep in the sea.", "category": "Jet 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/rhydon/data.json b/res/pokemon/rhydon/data.json index d5d6829dec..39c595608e 100644 --- a/res/pokemon/rhydon/data.json +++ b/res/pokemon/rhydon/data.json @@ -161,5 +161,12 @@ "pokemon_pos_m": 4, "entry_text": "Standing on its hind legs freed its\nforelegs and made it smarter. It is\nvery forgetful, however.", "category": "Drill 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": 2824 } } \ No newline at end of file diff --git a/res/pokemon/rhyhorn/data.json b/res/pokemon/rhyhorn/data.json index 2066c7afb1..8de41cf0b2 100644 --- a/res/pokemon/rhyhorn/data.json +++ b/res/pokemon/rhyhorn/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 16, "entry_text": "Its powerful tackles can destroy\nanything. However, it is too\nslow witted to help people work.", "category": "Spikes 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": 50, + "rarity": 30, + "unused": 2824 } } \ No newline at end of file diff --git a/res/pokemon/rhyperior/data.json b/res/pokemon/rhyperior/data.json index b73145c80a..b6540950ad 100644 --- a/res/pokemon/rhyperior/data.json +++ b/res/pokemon/rhyperior/data.json @@ -158,5 +158,12 @@ "pokemon_pos_m": 3, "entry_text": "It can launch a rock held in its\nhand like a missile by tightening\nthen expanding muscles instantly.", "category": "Drill 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": 2824 } } \ No newline at end of file diff --git a/res/pokemon/riolu/data.json b/res/pokemon/riolu/data.json index 50ad657a5a..f47dcb6a0e 100644 --- a/res/pokemon/riolu/data.json +++ b/res/pokemon/riolu/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 21, "entry_text": "It has the peculiar power of being\nable to see emotions such as joy\nand rage in the form of waves.", "category": "Emanation 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": 70, + "rarity": 20, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/roselia/data.json b/res/pokemon/roselia/data.json index 0b2ef24576..41b84d682c 100644 --- a/res/pokemon/roselia/data.json +++ b/res/pokemon/roselia/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 29, "entry_text": "The more healthy the ROSELIA, the\nmore pleasant its flowers’ aroma.\nIts scent deeply relaxes people.", "category": "Thorn 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": 70, + "rarity": 20, + "unused": 1537 } } \ No newline at end of file diff --git a/res/pokemon/roserade/data.json b/res/pokemon/roserade/data.json index 9f7635e9f4..d70e234e04 100644 --- a/res/pokemon/roserade/data.json +++ b/res/pokemon/roserade/data.json @@ -114,5 +114,12 @@ "pokemon_pos_m": 16, "entry_text": "Each of its hands contains\ndifferent toxins, but both hands\ncan jab with near-fatal power.", "category": "Bouquet 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/rotom/data.json b/res/pokemon/rotom/data.json index dff2db3c77..d632b3a557 100644 --- a/res/pokemon/rotom/data.json +++ b/res/pokemon/rotom/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 65528, "entry_text": "Its electric-like body can enter\nsome kinds of machines and take\ncontrol in order to make mischief.", "category": "Plasma 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": 3079 } } \ No newline at end of file diff --git a/res/pokemon/sableye/data.json b/res/pokemon/sableye/data.json index 068c24072e..fc837af255 100644 --- a/res/pokemon/sableye/data.json +++ b/res/pokemon/sableye/data.json @@ -147,5 +147,12 @@ "pokemon_pos_m": 25, "entry_text": "It hides in the darkness of caves.\nIts diet of gems has transformed\nits eyes into gemstones.", "category": "Darkness 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": 3088 } } \ No newline at end of file diff --git a/res/pokemon/salamence/data.json b/res/pokemon/salamence/data.json index 0adbb4ddac..c551ee14ac 100644 --- a/res/pokemon/salamence/data.json +++ b/res/pokemon/salamence/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 5, "entry_text": "As a result of its long-held dream\nof flying, its cellular structure\nchanged, and wings grew out.", "category": "Dragon 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": 4367 } } \ No newline at end of file diff --git a/res/pokemon/sandshrew/data.json b/res/pokemon/sandshrew/data.json index e3b2c99bdb..2bd8016063 100644 --- a/res/pokemon/sandshrew/data.json +++ b/res/pokemon/sandshrew/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 22, "entry_text": "To protect itself from attackers,\nit curls up into a ball. It lives in\narid regions with minimal rainfall.", "category": "Mouse 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": 50, + "rarity": 30, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/sandslash/data.json b/res/pokemon/sandslash/data.json index e34ed574ab..e9242638d4 100644 --- a/res/pokemon/sandslash/data.json +++ b/res/pokemon/sandslash/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 15, "entry_text": "It curls up, then rolls into foes\nwith its back. Its sharp spines\ninflict severe damage.", "category": "Mouse 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": 2056 } } \ No newline at end of file diff --git a/res/pokemon/sceptile/data.json b/res/pokemon/sceptile/data.json index 361b9d3a7d..cff77704a5 100644 --- a/res/pokemon/sceptile/data.json +++ b/res/pokemon/sceptile/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 1, "entry_text": "The leaves that grow on its arms\ncan slice down thick trees. It is\nwithout peer in jungle combat.", "category": "Forest 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": 90, + "rarity": 3, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/scizor/data.json b/res/pokemon/scizor/data.json index d7c7146866..6c9ffae20c 100644 --- a/res/pokemon/scizor/data.json +++ b/res/pokemon/scizor/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 2, "entry_text": "It raises its pincers with eyelike\nmarkings for intimidation. It also\nswings them down dangerously.", "category": "Pincer 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": 3588 } } \ No newline at end of file diff --git a/res/pokemon/scyther/data.json b/res/pokemon/scyther/data.json index 448219ec92..5c7bd385c1 100644 --- a/res/pokemon/scyther/data.json +++ b/res/pokemon/scyther/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 7, "entry_text": "The sharp scythes on its forearms\nbecome increasingly sharp by\ncutting through hard objects.", "category": "Mantis 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": 70, + "rarity": 20, + "unused": 4356 } } \ No newline at end of file diff --git a/res/pokemon/seadra/data.json b/res/pokemon/seadra/data.json index 90e77f9c63..d6c5706276 100644 --- a/res/pokemon/seadra/data.json +++ b/res/pokemon/seadra/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 65532, "entry_text": "Its spines provide protection.\nIts fins and bones are prized as\ntraditional medicine ingredients.", "category": "Dragon 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": 771 } } \ No newline at end of file diff --git a/res/pokemon/seaking/data.json b/res/pokemon/seaking/data.json index c255a238c4..9682f8b9d8 100644 --- a/res/pokemon/seaking/data.json +++ b/res/pokemon/seaking/data.json @@ -121,5 +121,12 @@ "pokemon_pos_m": 65533, "entry_text": "In autumn, its body becomes more\nfatty in preparing to propose to a\nmate. It takes on beautiful colors.", "category": "Goldfish 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": 70, + "rarity": 20, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/sealeo/data.json b/res/pokemon/sealeo/data.json index f555dd5b44..b3090f47d5 100644 --- a/res/pokemon/sealeo/data.json +++ b/res/pokemon/sealeo/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 15, "entry_text": "It habitually spins things on its\nnose. By doing so, it learns\ntextures and odors.", "category": "Ball Roll 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": 781 } } \ No newline at end of file diff --git a/res/pokemon/seedot/data.json b/res/pokemon/seedot/data.json index 265f7c5c2d..29df3f4607 100644 --- a/res/pokemon/seedot/data.json +++ b/res/pokemon/seedot/data.json @@ -116,5 +116,12 @@ "pokemon_pos_m": 24, "entry_text": "When it dangles from a tree\nbranch, it looks just like an acorn.\nIt enjoys scaring other Pokémon.", "category": "Acorn 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": 30, + "rarity": 50, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/seel/data.json b/res/pokemon/seel/data.json index 07b65b5a6a..2663ac847d 100644 --- a/res/pokemon/seel/data.json +++ b/res/pokemon/seel/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 13, "entry_text": "A Pokémon that lives on icebergs.\nIt swims in the sea using the point\non its head to break up ice.", "category": "Sea Lion 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/sentret/data.json b/res/pokemon/sentret/data.json index d5b8cf5acf..2b6d16b454 100644 --- a/res/pokemon/sentret/data.json +++ b/res/pokemon/sentret/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 18, "entry_text": "It has a very nervous nature.\nIt stands up high on its tail so it\ncan scan wide areas.", "category": "Scout 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": 30, + "rarity": 50, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/seviper/data.json b/res/pokemon/seviper/data.json index 0bb349b14e..ffa56daf4f 100644 --- a/res/pokemon/seviper/data.json +++ b/res/pokemon/seviper/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 6, "entry_text": "For many generations, it has\nfeuded with ZANGOOSE. It whets its\nbladed tail on rocks for battle.", "category": "Fang Snake 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": 1542 } } \ No newline at end of file diff --git a/res/pokemon/sharpedo/data.json b/res/pokemon/sharpedo/data.json index 7c838c4161..0dd663ddfe 100644 --- a/res/pokemon/sharpedo/data.json +++ b/res/pokemon/sharpedo/data.json @@ -137,7 +137,14 @@ "pokemon_pos_f": 65535, "trainer_pos_m": 15, "pokemon_pos_m": 65535, - "entry_text": "Its fangs rip through sheet iron.\nIt swims at 75 mph and is known as\n\u201cThe Bully of the Sea.\u201d", + "entry_text": "Its fangs rip through sheet iron.\nIt swims at 75 mph and is known as\n“The Bully of the Sea.”", "category": "Brutal 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": 4099 } } \ No newline at end of file diff --git a/res/pokemon/shaymin/data.json b/res/pokemon/shaymin/data.json index 06199facb9..25c4933f69 100644 --- a/res/pokemon/shaymin/data.json +++ b/res/pokemon/shaymin/data.json @@ -117,5 +117,12 @@ "pokemon_pos_m": 32, "entry_text": "The flowers all over its body burst\ninto bloom if it is lovingly hugged\nand senses gratitude.", "category": "Gratitude 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": 100, + "rarity": 1, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/shedinja/data.json b/res/pokemon/shedinja/data.json index 2e3c91f7d7..8f254e6378 100644 --- a/res/pokemon/shedinja/data.json +++ b/res/pokemon/shedinja/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 65533, "entry_text": "A discarded bug shell that came to\nlife. Peering into the crack on its\nback is said to steal one’s spirit.", "category": "Shed 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": 80, + "rarity": 10, + "unused": 3076 } } \ No newline at end of file diff --git a/res/pokemon/shelgon/data.json b/res/pokemon/shelgon/data.json index c4b384cae8..0238fa56f7 100644 --- a/res/pokemon/shelgon/data.json +++ b/res/pokemon/shelgon/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 14, "entry_text": "Within its rugged shell, its cells\nhave begun changing. The shell\npeels off the instant it evolves.", "category": "Endurance 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": 3855 } } \ No newline at end of file diff --git a/res/pokemon/shellder/data.json b/res/pokemon/shellder/data.json index 59395b6cfc..3a3cf4f933 100644 --- a/res/pokemon/shellder/data.json +++ b/res/pokemon/shellder/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 29, "entry_text": "It swims backward by opening and\nclosing its two shells. Its large\ntongue is always kept hanging out.", "category": "Bivalve 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/shellos/data.json b/res/pokemon/shellos/data.json index fc62c13026..003fdb369b 100644 --- a/res/pokemon/shellos/data.json +++ b/res/pokemon/shellos/data.json @@ -115,5 +115,12 @@ "pokemon_pos_m": 25, "entry_text": "Beware of pushing strongly on\nits squishy body, as it makes a\nmysterious purple fluid ooze out.", "category": "Sea Slug 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/shieldon/data.json b/res/pokemon/shieldon/data.json index 829d0ad83b..59b583eed3 100644 --- a/res/pokemon/shieldon/data.json +++ b/res/pokemon/shieldon/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 26, "entry_text": "It is outstandingly armored. As a\nresult, it can eat grass and\nberries without having to fight.", "category": "Shield 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": 2827 } } \ No newline at end of file diff --git a/res/pokemon/shiftry/data.json b/res/pokemon/shiftry/data.json index fd023b2307..9de889eff6 100644 --- a/res/pokemon/shiftry/data.json +++ b/res/pokemon/shiftry/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 8, "entry_text": "By flapping its leafy fan, it can\nwhip up gusts of 100 ft/second\nthat can level houses.", "category": "Wicked 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": 80, + "rarity": 10, + "unused": 4097 } } \ No newline at end of file diff --git a/res/pokemon/shinx/data.json b/res/pokemon/shinx/data.json index e84e4229ac..9838d1a8f9 100644 --- a/res/pokemon/shinx/data.json +++ b/res/pokemon/shinx/data.json @@ -121,5 +121,12 @@ "pokemon_pos_m": 24, "entry_text": "The extension and contraction of\nits muscles generates electricity.\nIt glows when in trouble.", "category": "Flash 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/shroomish/data.json b/res/pokemon/shroomish/data.json index ce6d148476..7f0be1685a 100644 --- a/res/pokemon/shroomish/data.json +++ b/res/pokemon/shroomish/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 27, "entry_text": "It spouts poison spores from the\ntop of its head. These spores\ncause pain all over if inhaled.", "category": "Mushroom 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/shuckle/data.json b/res/pokemon/shuckle/data.json index c93dc68f7c..1cac496428 100644 --- a/res/pokemon/shuckle/data.json +++ b/res/pokemon/shuckle/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 25, "entry_text": "It stores berries in its shell.\nThe berries eventually ferment to\nbecome delicious juices.", "category": "Mold 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": 80, + "rarity": 10, + "unused": 2820 } } \ No newline at end of file diff --git a/res/pokemon/shuppet/data.json b/res/pokemon/shuppet/data.json index 427a4252af..9539d92d8e 100644 --- a/res/pokemon/shuppet/data.json +++ b/res/pokemon/shuppet/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 65526, "entry_text": "It loves vengeful emotions and\nhangs in rows under the eaves of\nhouses where vengeful people live.", "category": "Puppet 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": 3084 } } \ No newline at end of file diff --git a/res/pokemon/silcoon/data.json b/res/pokemon/silcoon/data.json index 9629da48bb..31c8b3cfac 100644 --- a/res/pokemon/silcoon/data.json +++ b/res/pokemon/silcoon/data.json @@ -78,5 +78,12 @@ "pokemon_pos_m": 22, "entry_text": "It wraps silk around the branches\nof a tree. It drinks rainwater on\nits silk while awaiting evolution.", "category": "Cocoon 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/skarmory/data.json b/res/pokemon/skarmory/data.json index 19791015e6..a0911a76c5 100644 --- a/res/pokemon/skarmory/data.json +++ b/res/pokemon/skarmory/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 2, "entry_text": "Despite being clad entirely in\niron-hard armor, it flies at\nspeeds over 180 mph.", "category": "Armor Bird 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": 4366 } } \ No newline at end of file diff --git a/res/pokemon/skiploom/data.json b/res/pokemon/skiploom/data.json index 7eb9b4b166..d1d87cc0cd 100644 --- a/res/pokemon/skiploom/data.json +++ b/res/pokemon/skiploom/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 1, "entry_text": "It blooms when the weather warms.\nIt floats in the sky to soak up as\nmuch sunlight as possible.", "category": "Cottonweed 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": 70, + "rarity": 20, + "unused": 4353 } } \ No newline at end of file diff --git a/res/pokemon/skitty/data.json b/res/pokemon/skitty/data.json index 7fadd27801..eb475c5c9c 100644 --- a/res/pokemon/skitty/data.json +++ b/res/pokemon/skitty/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 21, "entry_text": "It can’t stop itself from chasing\nmoving things, and it runs in a\ncircle, chasing its own tail.", "category": "Kitten 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/skorupi/data.json b/res/pokemon/skorupi/data.json index a15af38816..db7680a7b9 100644 --- a/res/pokemon/skorupi/data.json +++ b/res/pokemon/skorupi/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 20, "entry_text": "As soon as the tail claws close,\nits needle tips secrete poison.\nIt can survive a year without food.", "category": "Scorpion 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/skuntank/data.json b/res/pokemon/skuntank/data.json index 6ead21a72c..9f9465fe75 100644 --- a/res/pokemon/skuntank/data.json +++ b/res/pokemon/skuntank/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 15, "entry_text": "It attacks by spraying a horribly\nsmelly fluid from the tip of its tail.\nAttacks from above confound it.", "category": "Skunk 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": 50, + "rarity": 30, + "unused": 2574 } } \ No newline at end of file diff --git a/res/pokemon/slaking/data.json b/res/pokemon/slaking/data.json index c0cfd5dab5..e8bfc791a6 100644 --- a/res/pokemon/slaking/data.json +++ b/res/pokemon/slaking/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 7, "entry_text": "The world’s laziest Pokémon. When\nit is lounging, it is actually saving\nenergy for striking back.", "category": "Lazy 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": 80, + "rarity": 10, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/slakoth/data.json b/res/pokemon/slakoth/data.json index 548cefb044..886f3afbc0 100644 --- a/res/pokemon/slakoth/data.json +++ b/res/pokemon/slakoth/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 22, "entry_text": "It spends nearly all its time in a\nday sprawled out. Just seeing it\nmakes one drowsy.", "category": "Slacker 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/slowbro/data.json b/res/pokemon/slowbro/data.json index ef7d26b125..15c4ec949b 100644 --- a/res/pokemon/slowbro/data.json +++ b/res/pokemon/slowbro/data.json @@ -152,5 +152,12 @@ "pokemon_pos_m": 8, "entry_text": "Though usually dim witted, it\nseems to become inspired if the\nSHELLDER on its tail bites down.", "category": "Hermit Crab 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": 70, + "rarity": 20, + "unused": 2563 } } \ No newline at end of file diff --git a/res/pokemon/slowking/data.json b/res/pokemon/slowking/data.json index d1d53f574d..2c5e317d82 100644 --- a/res/pokemon/slowking/data.json +++ b/res/pokemon/slowking/data.json @@ -152,5 +152,12 @@ "pokemon_pos_m": 4, "entry_text": "Being bitten by SHELLDER gave it\nintelligence comparable to that of\naward-winning scientists.", "category": "Royal 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": 80, + "rarity": 10, + "unused": 2563 } } \ No newline at end of file diff --git a/res/pokemon/slowpoke/data.json b/res/pokemon/slowpoke/data.json index 4d4692b359..8ffdb33493 100644 --- a/res/pokemon/slowpoke/data.json +++ b/res/pokemon/slowpoke/data.json @@ -150,5 +150,12 @@ "pokemon_pos_m": 19, "entry_text": "Although slow, it is skilled at\nfishing with its tail. It does not\nfeel pain if its tail is bitten.", "category": "Dopey 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": 2563 } } \ No newline at end of file diff --git a/res/pokemon/slugma/data.json b/res/pokemon/slugma/data.json index b388f200e1..86c61ac593 100644 --- a/res/pokemon/slugma/data.json +++ b/res/pokemon/slugma/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 19, "entry_text": "Its body is made of magma.\nIf it doesn’t keep moving, its\nbody will cool and harden.", "category": "Lava 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": 50, + "rarity": 30, + "unused": 514 } } \ No newline at end of file diff --git a/res/pokemon/smeargle/data.json b/res/pokemon/smeargle/data.json index 1483d546e6..a18aa85247 100644 --- a/res/pokemon/smeargle/data.json +++ b/res/pokemon/smeargle/data.json @@ -77,5 +77,12 @@ "pokemon_pos_m": 15, "entry_text": "It marks its territory by using its\ntail like a paintbrush. There are\nmore than 5,000 different marks.", "category": "Painter 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/smoochum/data.json b/res/pokemon/smoochum/data.json index 97ca486083..569677d6ba 100644 --- a/res/pokemon/smoochum/data.json +++ b/res/pokemon/smoochum/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 28, "entry_text": "It tests everything by touching\nwith its lips, which remember\nwhat it likes and dislikes.", "category": "Kiss 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": 2573 } } \ No newline at end of file diff --git a/res/pokemon/sneasel/data.json b/res/pokemon/sneasel/data.json index bef06a7792..62f2f1383c 100644 --- a/res/pokemon/sneasel/data.json +++ b/res/pokemon/sneasel/data.json @@ -147,5 +147,12 @@ "pokemon_pos_m": 12, "entry_text": "A smart and sneaky Pokémon. A pair\nmay work together to steal eggs by\nhaving one lure the parents away.", "category": "Sharp Claw 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": 50, + "rarity": 30, + "unused": 3344 } } \ No newline at end of file diff --git a/res/pokemon/snorlax/data.json b/res/pokemon/snorlax/data.json index 5ed484b9c3..0b526889f0 100644 --- a/res/pokemon/snorlax/data.json +++ b/res/pokemon/snorlax/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 7, "entry_text": "When its belly is full, it becomes\ntoo lethargic to even lift a finger,\nso it is safe to bounce on its belly.", "category": "Sleeping 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/snorunt/data.json b/res/pokemon/snorunt/data.json index 300c863c8b..c81357fc2e 100644 --- a/res/pokemon/snorunt/data.json +++ b/res/pokemon/snorunt/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 17, "entry_text": "It is said that several SNORUNT\ngather under giant leaves and\nlive together in harmony.", "category": "Snow Hat 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": 50, + "rarity": 30, + "unused": 3341 } } \ No newline at end of file diff --git a/res/pokemon/snover/data.json b/res/pokemon/snover/data.json index 32c96c6e1f..64eaccf2c0 100644 --- a/res/pokemon/snover/data.json +++ b/res/pokemon/snover/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 16, "entry_text": "Seemingly curious about people,\nthey gather around footsteps they\nfind on snowy mountains.", "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": 50, + "rarity": 30, + "unused": 2063 } } \ No newline at end of file diff --git a/res/pokemon/snubbull/data.json b/res/pokemon/snubbull/data.json index 837e896d7f..b229ac4b4e 100644 --- a/res/pokemon/snubbull/data.json +++ b/res/pokemon/snubbull/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 22, "entry_text": "Small Pokémon flee from its scary\nface. It is, however, considered\nby women to be cute.", "category": "Fairy 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/solrock/data.json b/res/pokemon/solrock/data.json index c553121425..492709847a 100644 --- a/res/pokemon/solrock/data.json +++ b/res/pokemon/solrock/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 65528, "entry_text": "A new Pokémon species, rumored\nto be from the sun. It gives off\nlight while spinning.", "category": "Meteorite 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": 2571 } } \ No newline at end of file diff --git a/res/pokemon/spearow/data.json b/res/pokemon/spearow/data.json index 5d0b909ace..d83995667e 100644 --- a/res/pokemon/spearow/data.json +++ b/res/pokemon/spearow/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 30, "entry_text": "It flaps its small wings busily to\nfly. Using its beak, it searches\nin grass for prey.", "category": "Tiny Bird 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": 30, + "rarity": 50, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/spheal/data.json b/res/pokemon/spheal/data.json index 9fe3806334..e46bbb6170 100644 --- a/res/pokemon/spheal/data.json +++ b/res/pokemon/spheal/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 20, "entry_text": "It rolls across ice floes to reach\nshore because its body is poorly\nshaped for swimming.", "category": "Clap 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": 50, + "rarity": 30, + "unused": 781 } } \ No newline at end of file diff --git a/res/pokemon/spinarak/data.json b/res/pokemon/spinarak/data.json index e168c65119..6670c70ec7 100644 --- a/res/pokemon/spinarak/data.json +++ b/res/pokemon/spinarak/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 26, "entry_text": "It sets a trap by spinning a web\nwith thin but strong silk. It waits\nmotionlessly for prey to arrive.", "category": "String Spit 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": 30, + "rarity": 50, + "unused": 1540 } } \ No newline at end of file diff --git a/res/pokemon/spinda/data.json b/res/pokemon/spinda/data.json index 45f6b4a014..36c3685bef 100644 --- a/res/pokemon/spinda/data.json +++ b/res/pokemon/spinda/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 16, "entry_text": "No two SPINDA have the same\npattern of spots. Its tottering\nstep fouls the aim of foes.", "category": "Spot Panda 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/spiritomb/data.json b/res/pokemon/spiritomb/data.json index fb16a39627..b882b9bacd 100644 --- a/res/pokemon/spiritomb/data.json +++ b/res/pokemon/spiritomb/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 14, "entry_text": "Its constant mischief and misdeeds\nresulted in it being bound to an Odd\nKeystone by a mysterious spell.", "category": "Forbidden 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/spoink/data.json b/res/pokemon/spoink/data.json index f79f1da18f..bfe6681c48 100644 --- a/res/pokemon/spoink/data.json +++ b/res/pokemon/spoink/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 20, "entry_text": "It bounces constantly, using its\ntail like a spring. The shock of\nbouncing keeps its heart beating.", "category": "Bounce 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 } } \ No newline at end of file diff --git a/res/pokemon/squirtle/data.json b/res/pokemon/squirtle/data.json index 6f98ca4154..c1dd7e9e96 100644 --- a/res/pokemon/squirtle/data.json +++ b/res/pokemon/squirtle/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 24, "entry_text": "It shelters itself in its shell,\nthen strikes back with spouts of\nwater at every opportunity.", "category": "Tiny Turtle 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 } } \ No newline at end of file diff --git a/res/pokemon/stantler/data.json b/res/pokemon/stantler/data.json index 7f97284e0c..8864997e81 100644 --- a/res/pokemon/stantler/data.json +++ b/res/pokemon/stantler/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 7, "entry_text": "Staring at its antlers creates\nan odd sensation as if one were\nbeing drawn into their centers.", "category": "Big Horn 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/staraptor/data.json b/res/pokemon/staraptor/data.json index 2961c6ac2b..65ebcfa9b8 100644 --- a/res/pokemon/staraptor/data.json +++ b/res/pokemon/staraptor/data.json @@ -121,5 +121,12 @@ "pokemon_pos_m": 12, "entry_text": "It never stops attacking even\nif it is injured. It fusses over the\nshape of its comb.", "category": "Predator 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": 70, + "rarity": 20, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/staravia/data.json b/res/pokemon/staravia/data.json index 073c0c8251..c72913f414 100644 --- a/res/pokemon/staravia/data.json +++ b/res/pokemon/staravia/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 24, "entry_text": "Recognizing their own weakness,\nthey always live in a group. When\nalone, a STARAVIA cries noisily.", "category": "Starling 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/starly/data.json b/res/pokemon/starly/data.json index 3743ddee99..740d5eaa66 100644 --- a/res/pokemon/starly/data.json +++ b/res/pokemon/starly/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 29, "entry_text": "Because they are weak individually,\nthey form groups. However, they\nbicker if the group grows too big.", "category": "Starling 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": 30, + "rarity": 50, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/starmie/data.json b/res/pokemon/starmie/data.json index e6a739ca5c..652fb9457e 100644 --- a/res/pokemon/starmie/data.json +++ b/res/pokemon/starmie/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 13, "entry_text": "At the center of its body is a red\ncore, which sends mysterious\nradio signals into the night sky.", "category": "Mysterious 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": 2563 } } \ No newline at end of file diff --git a/res/pokemon/staryu/data.json b/res/pokemon/staryu/data.json index 73b368bc50..a5dab28066 100644 --- a/res/pokemon/staryu/data.json +++ b/res/pokemon/staryu/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 19, "entry_text": "If its body is torn, it can grow\nback if the red core remains.\nThe core flashes at midnight.", "category": "Star Shape 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/steelix/data.json b/res/pokemon/steelix/data.json index 6588aa3076..c1dc279b02 100644 --- a/res/pokemon/steelix/data.json +++ b/res/pokemon/steelix/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 4, "entry_text": "It is thought its body transformed\nas a result of iron accumulating\ninternally from swallowing soil.", "category": "Iron Snake 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": 90, + "rarity": 3, + "unused": 2062 } } \ No newline at end of file diff --git a/res/pokemon/stunky/data.json b/res/pokemon/stunky/data.json index 5fb10f332e..e022010e45 100644 --- a/res/pokemon/stunky/data.json +++ b/res/pokemon/stunky/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 9, "entry_text": "It sprays a foul fluid from its\nrear. Its stench spreads over a\nmile radius, driving Pokémon away.", "category": "Skunk 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/sudowoodo/data.json b/res/pokemon/sudowoodo/data.json index c33b12ae1f..2ae11b8028 100644 --- a/res/pokemon/sudowoodo/data.json +++ b/res/pokemon/sudowoodo/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 11, "entry_text": "To avoid being attacked, it does\nnothing but mimic a tree. It hates\nwater and flees from rain.", "category": "Imitation 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": 2827 } } \ No newline at end of file diff --git a/res/pokemon/suicune/data.json b/res/pokemon/suicune/data.json index adb89ce30c..d6bc7bc086 100644 --- a/res/pokemon/suicune/data.json +++ b/res/pokemon/suicune/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 9, "entry_text": "It races around the world to\npurify fouled water. It dashes\naway with the north wind.", "category": "Aurora 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": 90, + "rarity": 3, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/sunflora/data.json b/res/pokemon/sunflora/data.json index 1f4e2d28c0..e8fbcd520b 100644 --- a/res/pokemon/sunflora/data.json +++ b/res/pokemon/sunflora/data.json @@ -121,5 +121,12 @@ "pokemon_pos_m": 18, "entry_text": "It gets energy from warm sunlight\nand is known for its habit of\nmoving in pursuit of it.", "category": "Sun 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": 70, + "rarity": 20, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/sunkern/data.json b/res/pokemon/sunkern/data.json index dee56abae5..b07779e3e6 100644 --- a/res/pokemon/sunkern/data.json +++ b/res/pokemon/sunkern/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 28, "entry_text": "It suddenly falls out of the sky in\nthe morning. A year after a cold\nsummer, their population explodes.", "category": "Seed 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/surskit/data.json b/res/pokemon/surskit/data.json index 7b51ec9f01..f67759d256 100644 --- a/res/pokemon/surskit/data.json +++ b/res/pokemon/surskit/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 27, "entry_text": "It appears as if it is skating on\nwater. It draws prey with a sweet\nscent from the tip of its head.", "category": "Pond Skater 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": 772 } } \ No newline at end of file diff --git a/res/pokemon/swablu/data.json b/res/pokemon/swablu/data.json index 1057e94988..f6b2c36528 100644 --- a/res/pokemon/swablu/data.json +++ b/res/pokemon/swablu/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 65522, "entry_text": "It can’t relax if it or its\nsurroundings are not clean.\nIt wipes off dirt with its wings.", "category": "Cotton Bird 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/swalot/data.json b/res/pokemon/swalot/data.json index f2437c79b8..bdc5dd7286 100644 --- a/res/pokemon/swalot/data.json +++ b/res/pokemon/swalot/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 3, "entry_text": "It swallows anything whole.\nIt sweats toxic fluids from its\nfollicles to douse foes.", "category": "Poison Bag 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": 1542 } } \ No newline at end of file diff --git a/res/pokemon/swampert/data.json b/res/pokemon/swampert/data.json index d0aa7f32a8..0144ba9131 100644 --- a/res/pokemon/swampert/data.json +++ b/res/pokemon/swampert/data.json @@ -140,5 +140,12 @@ "pokemon_pos_m": 4, "entry_text": "It can swim while towing a large\nship. It bashes down foes with a\nswing of its thick arms.", "category": "Mud Fish 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": 90, + "rarity": 3, + "unused": 2051 } } \ No newline at end of file diff --git a/res/pokemon/swellow/data.json b/res/pokemon/swellow/data.json index de184d7ce1..702864a023 100644 --- a/res/pokemon/swellow/data.json +++ b/res/pokemon/swellow/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 65531, "entry_text": "It circles the sky in search of\nprey. When it spots one, it dives\nsteeply to catch the prey.", "category": "Swallow 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/swinub/data.json b/res/pokemon/swinub/data.json index 90d24fee7c..0c2d15ff61 100644 --- a/res/pokemon/swinub/data.json +++ b/res/pokemon/swinub/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 26, "entry_text": "It has a very sensitive nose. It\ncan locate mushrooms, berries, and\neven hot springs buried under ice.", "category": "Pig 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": 50, + "rarity": 30, + "unused": 2061 } } \ No newline at end of file diff --git a/res/pokemon/taillow/data.json b/res/pokemon/taillow/data.json index 932918c10d..332f5eb07f 100644 --- a/res/pokemon/taillow/data.json +++ b/res/pokemon/taillow/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 65519, "entry_text": "It has a gutsy spirit that makes\nit bravely take on tough foes. It\nflies in search of warm climates.", "category": "TinySwallow 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": 30, + "rarity": 50, + "unused": 4357 } } \ No newline at end of file diff --git a/res/pokemon/tangela/data.json b/res/pokemon/tangela/data.json index 2baed9d336..076b9218c5 100644 --- a/res/pokemon/tangela/data.json +++ b/res/pokemon/tangela/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 17, "entry_text": "The blue vines shrouding its body\nare covered in a growth of fine\nhair. It is known to be ticklish.", "category": "Vine 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/tangrowth/data.json b/res/pokemon/tangrowth/data.json index ad235ca64e..00e2f59293 100644 --- a/res/pokemon/tangrowth/data.json +++ b/res/pokemon/tangrowth/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 2, "entry_text": "Its arms are made of plants that\nbind themselves to things. They\ngrow back right away if cut.", "category": "Vine 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": 80, + "rarity": 10, + "unused": 257 } } \ No newline at end of file diff --git a/res/pokemon/tauros/data.json b/res/pokemon/tauros/data.json index ae8ccda0b0..6e108cb108 100644 --- a/res/pokemon/tauros/data.json +++ b/res/pokemon/tauros/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 0, "entry_text": "Once it takes aim at its foe, it\nmakes a headlong charge. It is\nfamous for its violent nature.", "category": "Wild Bull 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/teddiursa/data.json b/res/pokemon/teddiursa/data.json index bcdd0b2348..47702e41c4 100644 --- a/res/pokemon/teddiursa/data.json +++ b/res/pokemon/teddiursa/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 23, "entry_text": "It lets honey soak into its paws\nso it can lick them all the time.\nEvery set of paws tastes unique.", "category": "Little Bear 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/tentacool/data.json b/res/pokemon/tentacool/data.json index bd6d5cfd56..6543fd36a5 100644 --- a/res/pokemon/tentacool/data.json +++ b/res/pokemon/tentacool/data.json @@ -124,5 +124,12 @@ "pokemon_pos_m": 65533, "entry_text": "Because its body is almost entirely\ncomposed of water, it shrivels up if\nit is washed ashore.", "category": "Jellyfish 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": 30, + "rarity": 50, + "unused": 1539 } } \ No newline at end of file diff --git a/res/pokemon/tentacruel/data.json b/res/pokemon/tentacruel/data.json index 23dc5aa695..74c511f615 100644 --- a/res/pokemon/tentacruel/data.json +++ b/res/pokemon/tentacruel/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 65535, "entry_text": "It extends its 80 tentacles to\nform an encircling poisonous net\nthat is difficult to escape.", "category": "Jellyfish 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": 50, + "rarity": 30, + "unused": 1539 } } \ No newline at end of file diff --git a/res/pokemon/togekiss/data.json b/res/pokemon/togekiss/data.json index 4124502bbd..3b763bf478 100644 --- a/res/pokemon/togekiss/data.json +++ b/res/pokemon/togekiss/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 65534, "entry_text": "It shares many blessings with\npeople who respect one another’s\nrights and avoid needless strife.", "category": "Jubilee 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/togepi/data.json b/res/pokemon/togepi/data.json index bd06a8b63a..6b79ef87f3 100644 --- a/res/pokemon/togepi/data.json +++ b/res/pokemon/togepi/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 29, "entry_text": "It transforms the kindness and joy\nof others into happiness, which it\nstores in its shell.", "category": "Spike Ball 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/togetic/data.json b/res/pokemon/togetic/data.json index c2241a9598..e257226ecd 100644 --- a/res/pokemon/togetic/data.json +++ b/res/pokemon/togetic/data.json @@ -154,5 +154,12 @@ "pokemon_pos_m": 25, "entry_text": "To share its happiness, it flies\naround the world seeking kind-\nhearted people.", "category": "Happiness 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": 4357 } } \ No newline at end of file diff --git a/res/pokemon/torchic/data.json b/res/pokemon/torchic/data.json index a1009651b6..8b57993521 100644 --- a/res/pokemon/torchic/data.json +++ b/res/pokemon/torchic/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 27, "entry_text": "A fire burns inside, so it feels\nvery warm to hug. It launches\nfireballs of 1,800 degrees F.", "category": "Chick 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/torkoal/data.json b/res/pokemon/torkoal/data.json index cd4aa4e624..06b2e79cec 100644 --- a/res/pokemon/torkoal/data.json +++ b/res/pokemon/torkoal/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 20, "entry_text": "It burns coal inside its shell for\nenergy. It blows out black soot if\nit is endangered.", "category": "Coal 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/torterra/data.json b/res/pokemon/torterra/data.json index 9c36c43b08..0015b1aab2 100644 --- a/res/pokemon/torterra/data.json +++ b/res/pokemon/torterra/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 0, "entry_text": "Some Pokémon are born on a\nTORTERRA’s back and spend their\nentire life there.", "category": "Continent 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": 90, + "rarity": 3, + "unused": 2049 } } \ No newline at end of file diff --git a/res/pokemon/totodile/data.json b/res/pokemon/totodile/data.json index 24ebf5dfc9..05653448fa 100644 --- a/res/pokemon/totodile/data.json +++ b/res/pokemon/totodile/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 25, "entry_text": "It has the habit of biting anything\nwith its developed jaws. Even its\nTrainer needs to be careful.", "category": "Big Jaw 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 } } \ No newline at end of file diff --git a/res/pokemon/toxicroak/data.json b/res/pokemon/toxicroak/data.json index a81c7ce782..c5fb99d5b5 100644 --- a/res/pokemon/toxicroak/data.json +++ b/res/pokemon/toxicroak/data.json @@ -146,5 +146,12 @@ "pokemon_pos_m": 11, "entry_text": "It has a poison sac at its throat.\nWhen it croaks, the stored poison\nis churned for greater potency.", "category": "Toxic Mouth 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": 50, + "rarity": 30, + "unused": 3329 } } \ No newline at end of file diff --git a/res/pokemon/trapinch/data.json b/res/pokemon/trapinch/data.json index f1fad15ee6..52b7dce178 100644 --- a/res/pokemon/trapinch/data.json +++ b/res/pokemon/trapinch/data.json @@ -119,5 +119,12 @@ "pokemon_pos_m": 21, "entry_text": "It makes a conical pit in desert\nsand and lies in wait at the bottom\nfor prey to come tumbling down.", "category": "Ant Pit 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": 50, + "rarity": 30, + "unused": 2056 } } \ No newline at end of file diff --git a/res/pokemon/treecko/data.json b/res/pokemon/treecko/data.json index 940b384630..e0d1a034c7 100644 --- a/res/pokemon/treecko/data.json +++ b/res/pokemon/treecko/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 22, "entry_text": "The soles of its feet are covered\nby countless tiny spikes, enabling\nit to walk on walls and ceilings.", "category": "Wood Gecko 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/tropius/data.json b/res/pokemon/tropius/data.json index 21e75be613..82415a6e71 100644 --- a/res/pokemon/tropius/data.json +++ b/res/pokemon/tropius/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 0, "entry_text": "Delicious fruits grew out from\naround its neck because it always\nate the same kind of fruit.", "category": "Fruit 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": 4353 } } \ No newline at end of file diff --git a/res/pokemon/turtwig/data.json b/res/pokemon/turtwig/data.json index 928c8d2f92..8efa843495 100644 --- a/res/pokemon/turtwig/data.json +++ b/res/pokemon/turtwig/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 28, "entry_text": "The shell on its back is made of\nsoil. On a very healthy TURTWIG,\nthe shell should feel moist.", "category": "Tiny Leaf 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": 257 } } \ No newline at end of file diff --git a/res/pokemon/typhlosion/data.json b/res/pokemon/typhlosion/data.json index a160ae0e08..737c000e3a 100644 --- a/res/pokemon/typhlosion/data.json +++ b/res/pokemon/typhlosion/data.json @@ -135,5 +135,12 @@ "pokemon_pos_m": 3, "entry_text": "It attacks using blasts of fire.\nIt creates heat shimmers with\nintense fire to hide itself.", "category": "Volcano 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": 514 } } \ No newline at end of file diff --git a/res/pokemon/tyranitar/data.json b/res/pokemon/tyranitar/data.json index 7d4512c3dc..fac78a398d 100644 --- a/res/pokemon/tyranitar/data.json +++ b/res/pokemon/tyranitar/data.json @@ -160,5 +160,12 @@ "pokemon_pos_m": 3, "entry_text": "If it rampages, it knocks down\nmountains and buries rivers. Maps\nmust be redrawn afterward.", "category": "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": 90, + "rarity": 3, + "unused": 4107 } } \ No newline at end of file diff --git a/res/pokemon/tyrogue/data.json b/res/pokemon/tyrogue/data.json index 1a9de296ba..4b8261044b 100644 --- a/res/pokemon/tyrogue/data.json +++ b/res/pokemon/tyrogue/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 18, "entry_text": "It is famous for its eagerness to\nfight and always nurses injuries\nfrom challenging larger foes.", "category": "Scuffle 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": 2313 } } \ No newline at end of file diff --git a/res/pokemon/umbreon/data.json b/res/pokemon/umbreon/data.json index 8e2434a214..d66f72227e 100644 --- a/res/pokemon/umbreon/data.json +++ b/res/pokemon/umbreon/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 15, "entry_text": "When exposed to the moon’s aura,\nthe rings on its body glow faintly\nand it gains a mysterious power.", "category": "Moonlight 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": 4112 } } \ No newline at end of file diff --git a/res/pokemon/unown/data.json b/res/pokemon/unown/data.json index 33ae9cc7af..43859f2643 100644 --- a/res/pokemon/unown/data.json +++ b/res/pokemon/unown/data.json @@ -68,5 +68,12 @@ "pokemon_pos_m": 1, "entry_text": "When alone, nothing happens.\nHowever, if there are two or more,\nan odd power is said to emerge.", "category": "Symbol 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/ursaring/data.json b/res/pokemon/ursaring/data.json index eb38ca3225..b22c9023e1 100644 --- a/res/pokemon/ursaring/data.json +++ b/res/pokemon/ursaring/data.json @@ -141,5 +141,12 @@ "pokemon_pos_m": 1, "entry_text": "In its territory, it leaves\nscratches on trees that bear\ndelicious berries or fruits.", "category": "Hibernator 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 } } \ No newline at end of file diff --git a/res/pokemon/uxie/data.json b/res/pokemon/uxie/data.json index cfcfef99cc..0a9541873b 100644 --- a/res/pokemon/uxie/data.json +++ b/res/pokemon/uxie/data.json @@ -139,5 +139,12 @@ "pokemon_pos_m": 65526, "entry_text": "When UXIE flew, people gained the\nability to solve problems.\nIt was the birth of knowledge.", "category": "Knowledge 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/vaporeon/data.json b/res/pokemon/vaporeon/data.json index 4f65e283d4..76e3ffd6a5 100644 --- a/res/pokemon/vaporeon/data.json +++ b/res/pokemon/vaporeon/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 10, "entry_text": "Its cell composition is similar\nto water molecules. As a result,\nit can melt away into water.", "category": "Bubble Jet 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": 771 } } \ No newline at end of file diff --git a/res/pokemon/venomoth/data.json b/res/pokemon/venomoth/data.json index 6be6cecc89..4000c2e3d8 100644 --- a/res/pokemon/venomoth/data.json +++ b/res/pokemon/venomoth/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 65530, "entry_text": "It flutters its wings to scatter\ndustlike scales. The scales leach\ntoxins if they contact skin.", "category": "Poison Moth 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": 1540 } } \ No newline at end of file diff --git a/res/pokemon/venonat/data.json b/res/pokemon/venonat/data.json index c3799b03ae..f7c080da45 100644 --- a/res/pokemon/venonat/data.json +++ b/res/pokemon/venonat/data.json @@ -120,5 +120,12 @@ "pokemon_pos_m": 20, "entry_text": "Its big eyes are actually clusters\nof tiny eyes. At night, its kind is\ndrawn by light.", "category": "Insect 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": 30, + "rarity": 50, + "unused": 1540 } } \ No newline at end of file diff --git a/res/pokemon/venusaur/data.json b/res/pokemon/venusaur/data.json index fd4e0f4e65..e2308fef52 100644 --- a/res/pokemon/venusaur/data.json +++ b/res/pokemon/venusaur/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 1, "entry_text": "After a rainy day, the flower on\nits back smells stronger. The\nscent attracts other Pokémon.", "category": "Seed 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/vespiquen/data.json b/res/pokemon/vespiquen/data.json index 6da95a7b30..7277fcc4f0 100644 --- a/res/pokemon/vespiquen/data.json +++ b/res/pokemon/vespiquen/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 65532, "entry_text": "It releases various pheromones\nto make the grubs in its body do\nits bidding while fighting foes.", "category": "Beehive 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/vibrava/data.json b/res/pokemon/vibrava/data.json index 5c70d69a6c..22711761fb 100644 --- a/res/pokemon/vibrava/data.json +++ b/res/pokemon/vibrava/data.json @@ -134,5 +134,12 @@ "pokemon_pos_m": 65532, "entry_text": "It violently shudders its wings,\ngenerating ultrasonic waves to\ninduce headaches in people.", "category": "Vibration 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": 3848 } } \ No newline at end of file diff --git a/res/pokemon/victreebel/data.json b/res/pokemon/victreebel/data.json index 217d4aeae1..0d413bacb5 100644 --- a/res/pokemon/victreebel/data.json +++ b/res/pokemon/victreebel/data.json @@ -117,5 +117,12 @@ "pokemon_pos_m": 4, "entry_text": "It pools in its mouth a fluid with\na honeylike scent, which is really\nan acid that dissolves anything.", "category": "Flycatcher 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/vigoroth/data.json b/res/pokemon/vigoroth/data.json index a80a720f4c..04e606444e 100644 --- a/res/pokemon/vigoroth/data.json +++ b/res/pokemon/vigoroth/data.json @@ -143,5 +143,12 @@ "pokemon_pos_m": 1, "entry_text": "Its heart beats at a tenfold\ntempo, so it cannot sit still for\neven a moment.", "category": "Wild Monkey 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 } } \ No newline at end of file diff --git a/res/pokemon/vileplume/data.json b/res/pokemon/vileplume/data.json index de50a12dde..ca19a74b4c 100644 --- a/res/pokemon/vileplume/data.json +++ b/res/pokemon/vileplume/data.json @@ -111,5 +111,12 @@ "pokemon_pos_m": 14, "entry_text": "Its petals are the largest in the\nworld. As it walks, it scatters\nextremely allergenic pollen.", "category": "Flower 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/volbeat/data.json b/res/pokemon/volbeat/data.json index c14edc2940..5ac014211e 100644 --- a/res/pokemon/volbeat/data.json +++ b/res/pokemon/volbeat/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 21, "entry_text": "It communicates with others by\nlighting up its rear at night. It\nloves ILLUMISE’s sweet aroma.", "category": "Firefly 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": 1028 } } \ No newline at end of file diff --git a/res/pokemon/voltorb/data.json b/res/pokemon/voltorb/data.json index 0dbc834487..b5d08b005b 100644 --- a/res/pokemon/voltorb/data.json +++ b/res/pokemon/voltorb/data.json @@ -123,5 +123,12 @@ "pokemon_pos_m": 24, "entry_text": "It looks just like a Poké Ball.\nIt is dangerous because it may\nelectrocute or explode on touch.", "category": "Ball 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": 1799 } } \ No newline at end of file diff --git a/res/pokemon/vulpix/data.json b/res/pokemon/vulpix/data.json index 1f6bc3da8d..869177c6be 100644 --- a/res/pokemon/vulpix/data.json +++ b/res/pokemon/vulpix/data.json @@ -125,5 +125,12 @@ "pokemon_pos_m": 17, "entry_text": "It controls balls of fire. As it\ngrows, its six tails split from\ntheir tips to make more tails.", "category": "Fox 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": 70, + "rarity": 20, + "unused": 514 } } \ No newline at end of file diff --git a/res/pokemon/wailmer/data.json b/res/pokemon/wailmer/data.json index 6fd266a0d1..1a91578c9a 100644 --- a/res/pokemon/wailmer/data.json +++ b/res/pokemon/wailmer/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 9, "entry_text": "On sunny days, it lands on beaches\nto bounce like a ball and play.\nIt spouts water from its nose.", "category": "Ball Whale 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": 50, + "rarity": 30, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/wailord/data.json b/res/pokemon/wailord/data.json index ef9cc04029..51ee5d0568 100644 --- a/res/pokemon/wailord/data.json +++ b/res/pokemon/wailord/data.json @@ -127,5 +127,12 @@ "pokemon_pos_m": 1, "entry_text": "The biggest of all Pokémon.\nIt can dive to a depth of almost\n10,000 feet on only one breath.", "category": "Float Whale 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": 80, + "rarity": 10, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/walrein/data.json b/res/pokemon/walrein/data.json index 153c983c17..0085a36612 100644 --- a/res/pokemon/walrein/data.json +++ b/res/pokemon/walrein/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 8, "entry_text": "It shatters ice with its big tusks.\nIts thick blubber repels not only\nthe cold, but also enemy attacks.", "category": "Ice Break 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": 80, + "rarity": 10, + "unused": 781 } } \ No newline at end of file diff --git a/res/pokemon/wartortle/data.json b/res/pokemon/wartortle/data.json index f8bb8d85b6..9da37443de 100644 --- a/res/pokemon/wartortle/data.json +++ b/res/pokemon/wartortle/data.json @@ -136,5 +136,12 @@ "pokemon_pos_m": 17, "entry_text": "It is said to live 10,000 years.\nIts furry tail is popular as a\nsymbol of longevity.", "category": "Turtle 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": 80, + "rarity": 10, + "unused": 771 } } \ No newline at end of file diff --git a/res/pokemon/weavile/data.json b/res/pokemon/weavile/data.json index 7e60b0d8de..855f9adb0f 100644 --- a/res/pokemon/weavile/data.json +++ b/res/pokemon/weavile/data.json @@ -147,5 +147,12 @@ "pokemon_pos_m": 13, "entry_text": "Evolution made it even more\ndevious. It communicates by clawing\nsigns in boulders.", "category": "Sharp Claw 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": 2063 } } \ No newline at end of file diff --git a/res/pokemon/weedle/data.json b/res/pokemon/weedle/data.json index 14b7d4bef7..a2684ba780 100644 --- a/res/pokemon/weedle/data.json +++ b/res/pokemon/weedle/data.json @@ -79,5 +79,12 @@ "pokemon_pos_m": 26, "entry_text": "It eats its weight in leaves every\nday. It fends off attackers with\nthe needle on its head.", "category": "Hairy Bug 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": 30, + "rarity": 50, + "unused": 1540 } } \ No newline at end of file diff --git a/res/pokemon/weepinbell/data.json b/res/pokemon/weepinbell/data.json index 82fb6dabc9..3903c92db1 100644 --- a/res/pokemon/weepinbell/data.json +++ b/res/pokemon/weepinbell/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 16, "entry_text": "A Pokémon that appears to be a\nplant. It captures unwary prey by\ndousing them with a toxic powder.", "category": "Flycatcher 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": 1537 } } \ No newline at end of file diff --git a/res/pokemon/weezing/data.json b/res/pokemon/weezing/data.json index 53af9c4e04..7ef5cb680e 100644 --- a/res/pokemon/weezing/data.json +++ b/res/pokemon/weezing/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 65526, "entry_text": "It grows by feeding on gases\nreleased by garbage. Though very\nrare, triplets have been found.", "category": "Poison Gas 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": 1542 } } \ No newline at end of file diff --git a/res/pokemon/whiscash/data.json b/res/pokemon/whiscash/data.json index 3f8e59117a..31a56bf2b9 100644 --- a/res/pokemon/whiscash/data.json +++ b/res/pokemon/whiscash/data.json @@ -133,5 +133,12 @@ "pokemon_pos_m": 2, "entry_text": "It is extremely protective of its\nterritory. If any foe approaches,\nit attacks using vicious tremors.", "category": "Whiskers 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": 70, + "rarity": 20, + "unused": 2051 } } \ No newline at end of file diff --git a/res/pokemon/whismur/data.json b/res/pokemon/whismur/data.json index 738e8b0a9f..afed8639a4 100644 --- a/res/pokemon/whismur/data.json +++ b/res/pokemon/whismur/data.json @@ -126,5 +126,12 @@ "pokemon_pos_m": 23, "entry_text": "Usually, its cries are like quiet\nmurmurs. If frightened, it shrieks\nat the same volume as a jet plane.", "category": "Whisper 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": 50, + "rarity": 30, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/wigglytuff/data.json b/res/pokemon/wigglytuff/data.json index d8d40fa3e3..d6c1a4ab6b 100644 --- a/res/pokemon/wigglytuff/data.json +++ b/res/pokemon/wigglytuff/data.json @@ -138,5 +138,12 @@ "pokemon_pos_m": 16, "entry_text": "Its fine fur feels sublime to the\ntouch. It can expand its body by\ninhaling air.", "category": "Balloon 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": 1285 } } \ No newline at end of file diff --git a/res/pokemon/wingull/data.json b/res/pokemon/wingull/data.json index 256f8609a9..5e72a11330 100644 --- a/res/pokemon/wingull/data.json +++ b/res/pokemon/wingull/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 65534, "entry_text": "It soars high in the sky, riding on\nupdrafts like a glider. It carries\nfood tucked in its bill.", "category": "Seagull 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": 30, + "rarity": 50, + "unused": 4355 } } \ No newline at end of file diff --git a/res/pokemon/wobbuffet/data.json b/res/pokemon/wobbuffet/data.json index d6fb897342..d8a267d97d 100644 --- a/res/pokemon/wobbuffet/data.json +++ b/res/pokemon/wobbuffet/data.json @@ -73,5 +73,12 @@ "pokemon_pos_m": 8, "entry_text": "It desperately tries to keep its\nblack tail hidden. It is said to be\nproof the tail hides a secret.", "category": "Patient 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/wooper/data.json b/res/pokemon/wooper/data.json index 12f9a01fea..82ede9789a 100644 --- a/res/pokemon/wooper/data.json +++ b/res/pokemon/wooper/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 26, "entry_text": "When walking on land, it covers its\nbody with a poisonous film that\nkeeps its skin from dehydrating.", "category": "Water Fish 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": 2051 } } \ No newline at end of file diff --git a/res/pokemon/wormadam/data.json b/res/pokemon/wormadam/data.json index a9df035b6d..9a1ea6ab2a 100644 --- a/res/pokemon/wormadam/data.json +++ b/res/pokemon/wormadam/data.json @@ -122,5 +122,12 @@ "pokemon_pos_m": 65524, "entry_text": "When evolving, its body takes in\nsurrounding materials. As a result,\nthere are many body variations.", "category": "Bagworm 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": 260 } } \ No newline at end of file diff --git a/res/pokemon/wurmple/data.json b/res/pokemon/wurmple/data.json index f76a3ace0d..94cf20d3a3 100644 --- a/res/pokemon/wurmple/data.json +++ b/res/pokemon/wurmple/data.json @@ -87,5 +87,12 @@ "pokemon_pos_m": 27, "entry_text": "Often targeted by bird Pokémon,\nit desperately resists by releasing\npoison from its tail spikes.", "category": "Worm 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": 30, + "rarity": 50, + "unused": 1028 } } \ No newline at end of file diff --git a/res/pokemon/wynaut/data.json b/res/pokemon/wynaut/data.json index 233e912ad1..2e657fef18 100644 --- a/res/pokemon/wynaut/data.json +++ b/res/pokemon/wynaut/data.json @@ -85,5 +85,12 @@ "pokemon_pos_m": 24, "entry_text": "It grows strong by pushing up\nagainst others en masse.\nIt loves eating sweet fruit.", "category": "Bright 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": 2570 } } \ No newline at end of file diff --git a/res/pokemon/xatu/data.json b/res/pokemon/xatu/data.json index baace897c1..cf3d06c366 100644 --- a/res/pokemon/xatu/data.json +++ b/res/pokemon/xatu/data.json @@ -142,5 +142,12 @@ "pokemon_pos_m": 4, "entry_text": "This odd Pokémon can see both\nthe past and the future. It eyes\nthe sun’s movement all day.", "category": "Mystic 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": 4362 } } \ No newline at end of file diff --git a/res/pokemon/yanma/data.json b/res/pokemon/yanma/data.json index b61f788950..9bb39a7049 100644 --- a/res/pokemon/yanma/data.json +++ b/res/pokemon/yanma/data.json @@ -131,5 +131,12 @@ "pokemon_pos_m": 65531, "entry_text": "It can hover in one spot by\nflapping its wings at high speed. It\nflits about to guard its territory.", "category": "Clear Wing 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/yanmega/data.json b/res/pokemon/yanmega/data.json index 2e1ae7e4e4..bd123bba16 100644 --- a/res/pokemon/yanmega/data.json +++ b/res/pokemon/yanmega/data.json @@ -132,5 +132,12 @@ "pokemon_pos_m": 65532, "entry_text": "Its jaw power is incredible. It is\nadept at biting apart foes while\nflying by at high speed.", "category": "Ogre Darner 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": 4356 } } \ No newline at end of file diff --git a/res/pokemon/zangoose/data.json b/res/pokemon/zangoose/data.json index 0735369896..6fd56b0a08 100644 --- a/res/pokemon/zangoose/data.json +++ b/res/pokemon/zangoose/data.json @@ -148,5 +148,12 @@ "pokemon_pos_m": 8, "entry_text": "It has feuded with SEVIPER for\nmany generations. Its sharp claws\nare its biggest weapons.", "category": "Cat Ferret 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": 70, + "rarity": 20, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/zapdos/data.json b/res/pokemon/zapdos/data.json index 34811857ff..a64c0a8c6c 100644 --- a/res/pokemon/zapdos/data.json +++ b/res/pokemon/zapdos/data.json @@ -129,5 +129,12 @@ "pokemon_pos_m": 0, "entry_text": "A legendary Pokémon that is said\nto live in thunderclouds. It freely\ncontrols lightning bolts.", "category": "Electric 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": 90, + "rarity": 3, + "unused": 4359 } } \ No newline at end of file diff --git a/res/pokemon/zigzagoon/data.json b/res/pokemon/zigzagoon/data.json index 4f625f7917..ca4539d55d 100644 --- a/res/pokemon/zigzagoon/data.json +++ b/res/pokemon/zigzagoon/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 27, "entry_text": "It walks in zigzag fashion. It is\ngood at finding items in the\ngrass and even in the ground.", "category": "TinyRaccoon 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": 30, + "rarity": 50, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/zubat/data.json b/res/pokemon/zubat/data.json index 73b2eb1b34..9f518a7b08 100644 --- a/res/pokemon/zubat/data.json +++ b/res/pokemon/zubat/data.json @@ -128,5 +128,12 @@ "pokemon_pos_m": 65525, "entry_text": "It checks its surroundings and\nlocation using reflections of the\nultrasonic waves from its mouth.", "category": "Bat 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": 30, + "rarity": 50, + "unused": 4358 } } \ No newline at end of file diff --git a/res/prebuilt/arc/meson.build b/res/prebuilt/arc/meson.build index 9e9d059a7d..19c4e21154 100644 --- a/res/prebuilt/arc/meson.build +++ b/res/prebuilt/arc/meson.build @@ -8,7 +8,6 @@ prebuilt_files = [ 'email_gra.narc', 'manene.narc', 'plgym_ghost.narc', - 'ppark.narc', 'ship_demo_pl.narc', 'ship_demo.narc', 'tv.narc' diff --git a/res/prebuilt/arc/ppark.narc b/res/prebuilt/arc/ppark.narc deleted file mode 100644 index 3e95554c58..0000000000 Binary files a/res/prebuilt/arc/ppark.narc and /dev/null differ diff --git a/src/catching_show.c b/src/catching_show.c index 695adee7cc..362f286577 100644 --- a/src/catching_show.c +++ b/src/catching_show.c @@ -5,6 +5,7 @@ #include "constants/battle.h" #include "constants/species.h" +#include "consts/catching_show.h" #include "consts/game_records.h" #include "struct_decls/struct_02024440_decl.h" @@ -23,25 +24,22 @@ #include "unk_0202EEC0.h" #include "unk_02054D00.h" +#define PAL_PARK_AREA_NONE 0 #define POINTS_LOST_PER_SECOND 2 #define WEIGHT_NO_ENCOUNTER 20 #define DISTINCT_TYPE_BONUS 50 #define DIFFERENT_TYPE_BONUS 200 #define MAX_TIME_SECONDS 1000 -enum PAL_PARK_AREA { - PAL_PARK_AREA_NONE = 0, - 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_WATER_NORTH_WEST, - PAL_PARK_AREA_WATER_NORTH_EAST, - PAL_PARK_AREA_WATER_SOUTH_WEST, - PAL_PARK_AREA_WATER_SOUTH_EAST, -}; - -static void InitEncounterData(FieldSystem *fieldSystem, CatchingShow *catchingShow); +typedef struct PalParkSpecies { + u8 landArea; + u8 waterArea; + u8 catchingPoints; + u8 rarity; + u8 unused[2]; +} PalParkSpecies; + +static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow); static void UpdateBattleResultInternal(FieldSystem *fieldSystem, FieldBattleDTO *dto, CatchingShow *catchingShow); static BOOL TryStartEncounter(FieldSystem *fieldSystem, CatchingShow *catchingShow, int playerX, int playerY); static FieldBattleDTO *SetupBattleDTO(FieldSystem *fieldSystem, CatchingShow *catchingShow); @@ -60,7 +58,7 @@ void CatchingShow_Start(FieldSystem *fieldSystem) MI_CpuClearFast(catchingShow, sizeof(CatchingShow)); - InitEncounterData(fieldSystem, catchingShow); + InitSpeciesData(fieldSystem, catchingShow); ResetStepCount(catchingShow); catchingShow->startTime = GetTimestamp(); @@ -121,19 +119,19 @@ int CatchingShow_GetTypePoints(FieldSystem *fieldSystem) return CalculateTypePoints(&sCatchingShow); } -static void sub_02056400(u32 species, u8 *param1) +static void BufferSpeciesData(u32 species, PalParkSpecies *speciesData) { GF_ASSERT(0 < species && species <= NATIONAL_DEX_COUNT); - int v0 = (species - 1) * 6; + int speciesOffset = (species - 1) * sizeof(PalParkSpecies); - NARC_ReadFromMemberByIndexPair(param1, NARC_INDEX_ARC__PPARK, 0, v0, sizeof(u8) * 6); + NARC_ReadFromMemberByIndexPair(speciesData, NARC_INDEX_ARC__PPARK, 0, speciesOffset, sizeof(PalParkSpecies)); } -static void InitEncounterData(FieldSystem *fieldSystem, CatchingShow *catchingShow) +static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow) { int i; - u8 v1[8]; + PalParkSpecies speciesData; u16 monSpecies; PalParkTransfer *v4 = SaveData_PalParkTransfer(fieldSystem->saveData); Pokemon *mon = Pokemon_New(HEAP_ID_FIELD); @@ -145,16 +143,16 @@ static void InitEncounterData(FieldSystem *fieldSystem, CatchingShow *catchingSh monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); catchingShow->pokemon[i].species = monSpecies; - sub_02056400(monSpecies, v1); + BufferSpeciesData(monSpecies, &speciesData); - if (v1[0] != 0) { - catchingShow->pokemon[i].area = v1[0]; + if (speciesData.landArea != 0) { + catchingShow->pokemon[i].area = speciesData.landArea; } else { - catchingShow->pokemon[i].area = PAL_PARK_AREA_WATER_NORTH_WEST - 1 + v1[1]; + catchingShow->pokemon[i].area = PAL_PARK_AREA_LAND_END - 1 + speciesData.waterArea; } - catchingShow->pokemon[i].rarity = v1[3]; - catchingShow->pokemon[i].catchingPoints = v1[2]; + catchingShow->pokemon[i].rarity = speciesData.rarity; + catchingShow->pokemon[i].catchingPoints = speciesData.catchingPoints; catchingShow->pokemon[i].type1 = Pokemon_GetValue(mon, MON_DATA_TYPE_1, NULL); catchingShow->pokemon[i].type2 = Pokemon_GetValue(mon, MON_DATA_TYPE_2, NULL); } @@ -202,7 +200,7 @@ static int GetEncounterArea(FieldSystem *fieldSystem, int playerX, int playerY) if (TileBehavior_IsTallGrass(tileBehavior)) { return PAL_PARK_AREA_LAND_NORTH_WEST + area; } else if (TileBehavior_IsSurfable(tileBehavior)) { - return PAL_PARK_AREA_WATER_NORTH_WEST + area; + return PAL_PARK_AREA_LAND_END + area; } return PAL_PARK_AREA_NONE; diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index 7fa3884742..b97c41cf7a 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -1129,7 +1129,7 @@ static BOOL CommPlayer_MoveBlow(int netId, int param1) x = CommPlayer_GetXServer(netId); z = CommPlayer_GetZServer(netId); x += MapObject_GetDxFromDir(sCommPlayerManager->unk_112[netId]); - z += MapObject_GetDyFromDir(sCommPlayerManager->unk_112[netId]); + z += MapObject_GetDzFromDir(sCommPlayerManager->unk_112[netId]); if (sCommPlayerManager->unk_10A[netId] != 0) { if (CommPlayer_CheckCollision(x, z, netId)) { @@ -1318,7 +1318,7 @@ int sub_02058DC0(int netId) return 0xffff; } - return sCommPlayerManager->playerLocation[netId].z + MapObject_GetDyFromDir(sCommPlayerManager->playerLocation[netId].dir); + return sCommPlayerManager->playerLocation[netId].z + MapObject_GetDzFromDir(sCommPlayerManager->playerLocation[netId].dir); } int CommPlayer_GetXServer(int netId) @@ -1380,7 +1380,7 @@ int CommPlayer_AddZServer(int netId) return 0xffff; } - return sCommPlayerManager->playerLocationServer[netId].z + MapObject_GetDyFromDir(sCommPlayerManager->playerLocationServer[netId].dir); + return sCommPlayerManager->playerLocationServer[netId].z + MapObject_GetDzFromDir(sCommPlayerManager->playerLocationServer[netId].dir); } int CommPlayer_Dir(int netId) @@ -1591,7 +1591,7 @@ BOOL sub_0205928C(void) dir = CommPlayer_GetOppositeDir(playerLocation->dir); playerLocation->x += MapObject_GetDxFromDir(dir); - playerLocation->z += MapObject_GetDyFromDir(dir); + playerLocation->z += MapObject_GetDzFromDir(dir); playerLocation->moveSpeed = 2; sCommPlayerManager->movementChanged[netId] = 1; @@ -1771,7 +1771,7 @@ void CommPlayerMan_ForcePos(void) MapObject_SetX(obj, x); MapObject_SetZ(obj, z); - MapObject_SetPosDir(obj, x, 0, z, dir); + MapObject_SetPosDirFromCoords(obj, x, 0, z, dir); } } diff --git a/src/field_overworld_state.c b/src/field_overworld_state.c index 2c808f524b..1e0d36b3fd 100644 --- a/src/field_overworld_state.c +++ b/src/field_overworld_state.c @@ -5,7 +5,6 @@ #include "struct_defs/struct_020556C4.h" #include "struct_defs/struct_0205EC34.h" -#include "struct_defs/struct_02061D3C.h" #include "field/field_system.h" diff --git a/src/map_object.c b/src/map_object.c index a248aac2d3..bbb3e033c6 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02061830_sub1_decl.h" -#include "struct_defs/struct_02061D3C.h" #include "struct_defs/struct_020EDF0C.h" #include "field/field_system.h" @@ -36,15 +35,15 @@ #include "unk_020EDBAC.h" typedef struct MapObjectMan { - u32 unk_00; + u32 status; int maxObjects; int objectCnt; int unk_0C; int unk_10; - NARC *unk_14; + NARC *narc; UnkStruct_ov5_021ED0A4 unk_18; UnkStruct_02061830_sub1 *unk_120; - MapObject *unk_124; + MapObject *mapObj; FieldSystem *fieldSystem; } MapObjectManager; @@ -82,9 +81,9 @@ typedef struct MapObject { u32 unk_A0; int movementAction; int movementStep; - u16 unk_AC; - u16 unk_AE; - SysTask *unk_B0; + u16 currTileBehavior; + u16 prevTileBehavior; + SysTask *task; const MapObjectManager *mapObjMan; UnkFuncPtr_020EDF0C unk_B8; UnkFuncPtr_020EDF0C_1 unk_BC; @@ -104,47 +103,47 @@ typedef struct { int unk_00; int unk_04; int unk_08; - const MapObjectManager *unk_0C; - ObjectEvent *unk_10; + const MapObjectManager *mapObjMan; + ObjectEvent *objectEvent; } UnkStruct_020620C4; static MapObjectManager *MapObjectMan_Alloc(int param0); -static void MapObject_Save(FieldSystem *fieldSystem, MapObject *param1, MapObjectSave *param2); -static void MapObject_LoadSave(MapObject *mapObj, MapObjectSave *param1); -static void sub_02061FA8(const MapObjectManager *param0, MapObject *param1); +static void MapObject_Save(FieldSystem *fieldSystem, MapObject *mapObj, MapObjectSave *mapObjSave); +static void MapObject_LoadSave(MapObject *mapObj, MapObjectSave *mapObjSave); +static void sub_02061FA8(const MapObjectManager *mapObjMan, MapObject *mapObj); static void sub_02061FF0(MapObject *mapObj); static void sub_02062010(MapObject *mapObj); static void sub_020620C4(UnkStruct_020620C4 *param0); -static MapObject *sub_02062120(const MapObjectManager *param0); -static MapObject *sub_02062154(const MapObjectManager *param0, int param1, int param2); -static void MapObjectMan_AddMoveTask(const MapObjectManager *param0, MapObject *param1); -static void sub_020621E8(MapObject *param0, const ObjectEvent *param1, FieldSystem *fieldSystem); -static void sub_020622B8(MapObject *param0, const ObjectEvent *param1); -static void sub_0206234C(MapObject *param0, const MapObjectManager *param1); -static void sub_0206239C(MapObject *param0); -static void sub_020623D4(MapObject *param0); -static void sub_0206243C(MapObject *param0); -static int sub_0206244C(const MapObject *param0, int param1, int param2, const ObjectEvent *param3); -static MapObject *sub_020624CC(const MapObjectManager *param0, int param1, int param2); -static void sub_02062604(MapObject *param0); -static void sub_02062618(MapObject *param0); -static void sub_02062628(MapObject *param0); +static MapObject *sub_02062120(const MapObjectManager *mapObjMan); +static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, int param2); +static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObject *mapObj); +static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, FieldSystem *fieldSystem); +static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent); +static void sub_0206234C(MapObject *mapObj, const MapObjectManager *mapObjMan); +static void sub_0206239C(MapObject *mapObj); +static void sub_020623D4(MapObject *mapObj); +static void sub_0206243C(MapObject *mapObj); +static int sub_0206244C(const MapObject *mapObj, int param1, int objEventCount, const ObjectEvent *objectEvent); +static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int localID, int flag); +static void sub_02062604(MapObject *mapObj); +static void sub_02062618(MapObject *mapObj); +static void sub_02062628(MapObject *mapObj); static int sub_0206262C(FieldSystem *fieldSystem, int param1); -static void sub_02062648(MapObject *param0); -static void sub_02062660(MapObject *param0); -static void sub_02062670(MapObject *param0); -static void sub_020626D0(MapObject *param0, const ObjectEvent *param1, int param2); -static void sub_02062714(MapObject *param0, int param1, const ObjectEvent *param2); -static void MapObjectTask_Move(SysTask *param0, void *param1); -static void MapObjectTask_Draw(MapObject *param0); -static MapObjectManager *MapObjectMan_Deconst(const MapObjectManager *param0); -static void MapObjectMan_IncObjectCount(MapObjectManager *param0); -static void MapObjectMan_DecObjectCount(MapObjectManager *param0); -static MapObject *sub_02062870(const MapObjectManager *param0); -static MapObjectManager *sub_02062A48(const MapObject *param0); -static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *param2); -static int sub_020631D8(const ObjectEvent *param0); -static int sub_020631F4(const ObjectEvent *param0); +static void sub_02062648(MapObject *mapObj); +static void sub_02062660(MapObject *mapObj); +static void sub_02062670(MapObject *mapObj); +static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int mapID); +static void sub_02062714(MapObject *mapObj, int mapID, const ObjectEvent *objectEvent); +static void MapObjectTask_Move(SysTask *task, void *param1); +static void MapObjectTask_Draw(MapObject *mapObj); +static MapObjectManager *MapObjectMan_Deconst(const MapObjectManager *mapObjMan); +static void MapObjectMan_IncObjectCount(MapObjectManager *mapObjMan); +static void MapObjectMan_DecObjectCount(MapObjectManager *mapObjMan); +static MapObject *MapObjectMan_GetMapObjectStatic(const MapObjectManager *mapObjMan); +static MapObjectManager *sub_02062A48(const MapObject *mapObj); +static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *objectEvent); +static int ObjectEvent_HasNoScript(const ObjectEvent *objectEvent); +static int ObjectEvent_GetFlagNoScript(const ObjectEvent *objectEvent); static const UnkStruct_020EDF0C *sub_0206320C(u32 param0); static UnkFuncPtr_020EDF0C sub_02063224(const UnkStruct_020EDF0C *param0); @@ -170,25 +169,23 @@ MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int pa void MapObjectMan_Delete(MapObjectManager *mapObjMan) { - Heap_FreeToHeapExplicit(11, sub_02062878(mapObjMan)); - Heap_FreeToHeapExplicit(11, mapObjMan); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, MapObjectMan_GetMapObject(mapObjMan)); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, mapObjMan); } -void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *param4) +void sub_0206184C(MapObjectManager *mapObjMan, int mapID, int param2, int objEventCount, const ObjectEvent *objectEvent) { - int v0, v1 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject *mapObj = sub_02062878(mapObjMan); + int v0, maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); - while (v1) { - if (sub_02062CF8(mapObj) == 1) { - v0 = sub_0206244C(mapObj, param2, param3, param4); + while (maxObjects) { + if (sub_02062CF8(mapObj) == TRUE) { + v0 = sub_0206244C(mapObj, param2, objEventCount, objectEvent); switch (v0) { case 0: - if (sub_02062918(mapObj) != param2) { - if (!MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_10)) { - MapObject_Delete(mapObj); - } + if (sub_02062918(mapObj) != param2 && !MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_10)) { + MapObject_Delete(mapObj); } break; case 2: @@ -199,7 +196,7 @@ void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param } mapObj++; - v1--; + maxObjects--; } ov5_021EDA38(mapObjMan, sub_0206285C(mapObjMan)); @@ -209,45 +206,43 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) { int size; MapObject *mapObj; - MapObjectManager *mapObjMan; - - mapObjMan = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); + MapObjectManager *mapObjMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(MapObjectManager)); GF_ASSERT(mapObjMan != NULL); - memset(mapObjMan, 0, (sizeof(MapObjectManager))); + memset(mapObjMan, 0, sizeof(MapObjectManager)); size = sizeof(MapObject) * maxObjs; - mapObj = Heap_AllocFromHeap(11, size); + mapObj = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, size); GF_ASSERT(mapObj != NULL); memset(mapObj, 0, size); - sub_02062860(mapObjMan, mapObj); + MapObjectMan_SetMapObject(mapObjMan, mapObj); return mapObjMan; } -MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *param1, int param2) +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int mapID) { MapObject *mapObj; - ObjectEvent v1 = *param1; + ObjectEvent v1 = *objectEvent; ObjectEvent *v2 = &v1; - int v3 = ObjectEvent_GetLocalID(v2); + int localID = ObjectEvent_GetLocalID(v2); - if (sub_020631D8(v2) == 0) { - mapObj = sub_02062154(mapObjMan, v3, param2); + if (ObjectEvent_HasNoScript(v2) == FALSE) { + mapObj = sub_02062154(mapObjMan, localID, mapID); if (mapObj != NULL) { - sub_020626D0(mapObj, v2, param2); + sub_020626D0(mapObj, v2, mapID); return mapObj; } } else { - mapObj = sub_020624CC(mapObjMan, v3, sub_020631F4(v2)); + mapObj = sub_020624CC(mapObjMan, localID, ObjectEvent_GetFlagNoScript(v2)); if (mapObj != NULL) { - sub_02062714(mapObj, param2, v2); + sub_02062714(mapObj, mapID, v2); return mapObj; } } @@ -260,7 +255,7 @@ MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan sub_020621E8(mapObj, v2, MapObjectMan_FieldSystem(mapObjMan)); sub_0206234C(mapObj, mapObjMan); - sub_02062914(mapObj, param2); + sub_02062914(mapObj, mapID); sub_02062660(mapObj); sub_02062670(mapObj); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); @@ -270,7 +265,7 @@ MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan return mapObj; } -MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, int z, int initialDir, int graphicsID, int movementType, int param6) +MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, int z, int initialDir, int graphicsID, int movementType, int mapID) { ObjectEvent objectEvent; MapObject *mapObj; @@ -291,22 +286,22 @@ MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, i ObjectEvent_SetZ(&objectEvent, z); ObjectEvent_SetY(&objectEvent, 0); - mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, &objectEvent, param6); + mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, &objectEvent, mapID); return mapObj; } -MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *param4) +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int mapID, const ObjectEvent *objectEvent) { MapObject *mapObj = NULL; - const ObjectEvent *v1 = sub_020631A4(param1, param2, param4); + const ObjectEvent *v1 = sub_020631A4(param1, objEventCount, objectEvent); if (v1 != NULL) { int flag = ObjectEvent_GetFlag(v1); FieldSystem *fieldSystem = MapObjectMan_FieldSystem(mapObjMan); if (!FieldSystem_CheckFlag(fieldSystem, flag)) { - mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, v1, param3); + mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, v1, mapID); } } @@ -323,7 +318,7 @@ void sub_02061AB4(MapObject *mapObj, int graphicsID) void sub_02061AD4(MapObject *mapObj, int param1) { - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { sub_02061B48(mapObj); } @@ -332,11 +327,9 @@ void sub_02061AD4(MapObject *mapObj, int param1) void MapObject_Delete(MapObject *mapObj) { - const MapObjectManager *mapObjMan; - - mapObjMan = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (MapObjectMan_IsDrawInitialized(mapObjMan) == 1) { + if (MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE) { sub_02062B7C(mapObj); } @@ -348,8 +341,8 @@ void MapObject_Delete(MapObject *mapObj) void sub_02061B28(MapObject *mapObj) { - int v0 = MapObject_GetFlag(mapObj); - FieldSystem_SetFlag(MapObject_FieldSystem(mapObj), v0); + int flag = MapObject_GetFlag(mapObj); + FieldSystem_SetFlag(MapObject_FieldSystem(mapObj), flag); MapObject_Delete(mapObj); } @@ -357,7 +350,7 @@ void sub_02061B48(MapObject *mapObj) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (MapObjectMan_IsDrawInitialized(mapObjMan) == 1) { + if (MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { sub_02062B7C(mapObj); } @@ -375,12 +368,9 @@ void sub_02061B48(MapObject *mapObj) void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan) { - int v0, v1; - MapObject *mapObj; - - v0 = 0; - v1 = MapObjectMan_GetMaxObjects(mapObjMan); - mapObj = sub_02062878(mapObjMan); + int i = 0; + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { @@ -388,45 +378,40 @@ void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan) } mapObj++; - v0++; - } while (v0 < v1); + i++; + } while (i < maxObjects); } void sub_02061BF0(MapObjectManager *mapObjMan) { - GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == 1); + GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE); - int v0, maxObjects; - MapObject *mapObj; - - v0 = 0; - maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); - mapObj = sub_02062878(mapObjMan); + int i = 0; + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { - sub_02062B90(mapObj); - sub_02062628(mapObj); - } + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0) && MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { + sub_02062B90(mapObj); + sub_02062628(mapObj); } mapObj++; - v0++; - } while (v0 < maxObjects); + i++; + } while (i < maxObjects); } void sub_02061C48(MapObjectManager *mapObjMan) { - GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == 1); + GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE); - int v0 = 0; + int i = 0; int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject *mapObj = sub_02062878(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (sub_02062CF8(mapObj) == 1) { - if (sub_02062D4C(mapObj) == 1) { + if (sub_02062CF8(mapObj) == TRUE) { + if (sub_02062D4C(mapObj) == TRUE) { sub_02062BA4(mapObj); } else { sub_02062670(mapObj); @@ -437,16 +422,16 @@ void sub_02061C48(MapObjectManager *mapObjMan) } mapObj++; - v0++; - } while (v0 < maxObjects); + i++; + } while (i < maxObjects); } -void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *param1, MapObjectSave *mapObjSave, int param3) +void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param3) { int v0 = 0; MapObject *mapObj; - while (sub_020625B0(param1, &mapObj, &v0, MAP_OBJ_STATUS_0)) { + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0)) { MapObject_Save(fieldSystem, mapObj, mapObjSave); mapObjSave++; param3--; @@ -454,7 +439,7 @@ void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *para } if (param3) { - memset(mapObjSave, 0, param3 * (sizeof(MapObjectSave))); + memset(mapObjSave, 0, param3 * sizeof(MapObjectSave)); } } @@ -464,7 +449,7 @@ void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSav MapObject *mapObj; while (size) { - if (mapObjSave->unk_00 & MAP_OBJ_STATUS_0) { + if (mapObjSave->status & MAP_OBJ_STATUS_0) { mapObj = sub_02062120(mapObjMan); GF_ASSERT(mapObj != NULL); @@ -479,34 +464,34 @@ void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSav static void MapObject_Save(FieldSystem *fieldSystem, MapObject *mapObj, MapObjectSave *mapObjSave) { - mapObjSave->unk_00 = MapObject_GetStatus(mapObj); + mapObjSave->status = MapObject_GetStatus(mapObj); mapObjSave->unk_04 = sub_020628EC(mapObj); - mapObjSave->unk_08 = MapObject_GetLocalID(mapObj); + mapObjSave->localID = MapObject_GetLocalID(mapObj); mapObjSave->unk_10 = sub_02062918(mapObj); - mapObjSave->unk_12 = MapObject_GetGraphicsID(mapObj); - mapObjSave->unk_09 = MapObject_GetMovementType(mapObj); - mapObjSave->unk_14 = MapObject_GetTrainerType(mapObj); - mapObjSave->unk_16 = MapObject_GetFlag(mapObj); - mapObjSave->unk_18 = MapObject_GetScript(mapObj); - mapObjSave->unk_0C = MapObject_GetInitialDir(mapObj); - mapObjSave->unk_0D = MapObject_GetFacingDir(mapObj); - mapObjSave->unk_0E = MapObject_GetMovingDir(mapObj); + mapObjSave->graphicsID = MapObject_GetGraphicsID(mapObj); + mapObjSave->movementType = MapObject_GetMovementType(mapObj); + mapObjSave->trainerType = MapObject_GetTrainerType(mapObj); + mapObjSave->flag = MapObject_GetFlag(mapObj); + mapObjSave->script = MapObject_GetScript(mapObj); + mapObjSave->initialDir = MapObject_GetInitialDir(mapObj); + mapObjSave->facingDir = MapObject_GetFacingDir(mapObj); + mapObjSave->movingDir = MapObject_GetMovingDir(mapObj); mapObjSave->unk_1A = MapObject_GetDataAt(mapObj, 0); mapObjSave->unk_1C = MapObject_GetDataAt(mapObj, 1); mapObjSave->unk_1E = MapObject_GetDataAt(mapObj, 2); - mapObjSave->unk_0A = MapObject_GetMovementRangeX(mapObj); - mapObjSave->unk_0B = MapObject_GetMovementRangeZ(mapObj); - mapObjSave->unk_20 = MapObject_GetXInitial(mapObj); - mapObjSave->unk_22 = MapObject_GetYInitial(mapObj); - mapObjSave->unk_24 = MapObject_GetZInitial(mapObj); - mapObjSave->unk_26 = MapObject_GetX(mapObj); - mapObjSave->unk_28 = MapObject_GetY(mapObj); - mapObjSave->unk_2A = MapObject_GetZ(mapObj); + mapObjSave->movementRangeX = MapObject_GetMovementRangeX(mapObj); + mapObjSave->movementRangeZ = MapObject_GetMovementRangeZ(mapObj); + mapObjSave->xInitial = MapObject_GetXInitial(mapObj); + mapObjSave->yInitial = MapObject_GetYInitial(mapObj); + mapObjSave->zInitial = MapObject_GetZInitial(mapObj); + mapObjSave->x = MapObject_GetX(mapObj); + mapObjSave->y = MapObject_GetY(mapObj); + mapObjSave->z = MapObject_GetZ(mapObj); VecFx32 v0; int v1, v2; - sub_02064450(mapObjSave->unk_26, mapObjSave->unk_2A, &v0); + sub_02064450(mapObjSave->x, mapObjSave->z, &v0); v0.y = MapObject_GetPosY(mapObj); v2 = sub_02062FAC(mapObj); @@ -528,29 +513,29 @@ static void MapObject_Save(FieldSystem *fieldSystem, MapObject *mapObj, MapObjec static void MapObject_LoadSave(MapObject *mapObj, MapObjectSave *mapObjSave) { - MapObject_SetStatus(mapObj, mapObjSave->unk_00); + MapObject_SetStatus(mapObj, mapObjSave->status); sub_020628E8(mapObj, mapObjSave->unk_04); - MapObject_SetLocalID(mapObj, mapObjSave->unk_08); + MapObject_SetLocalID(mapObj, mapObjSave->localID); sub_02062914(mapObj, mapObjSave->unk_10); - MapObject_SetGraphicsID(mapObj, mapObjSave->unk_12); - MapObject_SetMovementType(mapObj, mapObjSave->unk_09); - MapObject_SetTrainerType(mapObj, mapObjSave->unk_14); - MapObject_SetFlag(mapObj, mapObjSave->unk_16); - MapObject_SetScript(mapObj, mapObjSave->unk_18); - MapObject_SetInitialDir(mapObj, mapObjSave->unk_0C); - MapObject_Face(mapObj, mapObjSave->unk_0D); - MapObject_Turn(mapObj, mapObjSave->unk_0E); + MapObject_SetGraphicsID(mapObj, mapObjSave->graphicsID); + MapObject_SetMovementType(mapObj, mapObjSave->movementType); + MapObject_SetTrainerType(mapObj, mapObjSave->trainerType); + MapObject_SetFlag(mapObj, mapObjSave->flag); + MapObject_SetScript(mapObj, mapObjSave->script); + MapObject_SetInitialDir(mapObj, mapObjSave->initialDir); + MapObject_Face(mapObj, mapObjSave->facingDir); + MapObject_Turn(mapObj, mapObjSave->movingDir); MapObject_SetDataAt(mapObj, mapObjSave->unk_1A, 0); MapObject_SetDataAt(mapObj, mapObjSave->unk_1C, 1); MapObject_SetDataAt(mapObj, mapObjSave->unk_1E, 2); - MapObject_SetMovementRangeX(mapObj, mapObjSave->unk_0A); - MapObject_SetMovementRangeZ(mapObj, mapObjSave->unk_0B); - MapObject_SetXInitial(mapObj, mapObjSave->unk_20); - MapObject_SetYInitial(mapObj, mapObjSave->unk_22); - MapObject_SetZInitial(mapObj, mapObjSave->unk_24); - MapObject_SetX(mapObj, mapObjSave->unk_26); - MapObject_SetY(mapObj, mapObjSave->unk_28); - MapObject_SetZ(mapObj, mapObjSave->unk_2A); + MapObject_SetMovementRangeX(mapObj, mapObjSave->movementRangeX); + MapObject_SetMovementRangeZ(mapObj, mapObjSave->movementRangeZ); + MapObject_SetXInitial(mapObj, mapObjSave->xInitial); + MapObject_SetYInitial(mapObj, mapObjSave->yInitial); + MapObject_SetZInitial(mapObj, mapObjSave->zInitial); + MapObject_SetX(mapObj, mapObjSave->x); + MapObject_SetY(mapObj, mapObjSave->y); + MapObject_SetZ(mapObj, mapObjSave->z); VecFx32 v0 = { 0, 0, 0 }; @@ -577,7 +562,7 @@ static void sub_02061FA8(const MapObjectManager *mapObjMan, MapObject *mapObj) static void sub_02061FF0(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_0 | MAP_OBJ_STATUS_START_MOVEMENT); - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT | MAP_OBJ_STATUS_HIDE | MAP_OBJ_STATUS_14 | MAP_OBJ_STATUS_16 | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_18 | MAP_OBJ_STATUS_19 | MAP_OBJ_STATUS_21 | MAP_OBJ_STATUS_22 | MAP_OBJ_STATUS_23); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT | MAP_OBJ_STATUS_HIDE | MAP_OBJ_STATUS_14 | MAP_OBJ_STATUS_START_JUMP | MAP_OBJ_STATUS_END_JUMP | MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_18 | MAP_OBJ_STATUS_19 | MAP_OBJ_STATUS_21 | MAP_OBJ_STATUS_22 | MAP_OBJ_STATUS_23); sub_02062618(mapObj); } @@ -602,7 +587,7 @@ static void sub_02062010(MapObject *mapObj) MapObject_SetPos(mapObj, &v1); } -void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *param3) +void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *objectEvent) { int v0; ObjectEvent *v1; @@ -610,20 +595,20 @@ void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, con GF_ASSERT(param2); - v0 = (sizeof(ObjectEvent)) * param2; - v1 = Heap_AllocFromHeapAtEnd(11, v0); + v0 = sizeof(ObjectEvent) * param2; + v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, v0); GF_ASSERT(v1 != NULL); - memcpy(v1, param3, v0); + memcpy(v1, objectEvent, v0); - v2 = Heap_AllocFromHeapAtEnd(11, (sizeof(UnkStruct_020620C4))); + v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_020620C4)); GF_ASSERT(v2 != NULL); v2->unk_00 = param1; v2->unk_04 = param2; v2->unk_08 = 0; - v2->unk_0C = mapObjMan; - v2->unk_10 = v1; + v2->mapObjMan = mapObjMan; + v2->objectEvent = v1; sub_020620C4(v2); } @@ -632,33 +617,30 @@ static void sub_020620C4(UnkStruct_020620C4 *param0) { MapObject *mapObj; FieldSystem *fieldSystem; - const ObjectEvent *v2; + const ObjectEvent *objectEvent; - fieldSystem = MapObjectMan_FieldSystem(param0->unk_0C); - v2 = param0->unk_10; + fieldSystem = MapObjectMan_FieldSystem(param0->mapObjMan); + objectEvent = param0->objectEvent; do { - if ((sub_020631D8(v2) == 1) || (FieldSystem_CheckFlag(fieldSystem, v2->flag) == 0)) { - mapObj = MapObjectMan_AddMapObjectFromHeader(param0->unk_0C, v2, param0->unk_00); + if (ObjectEvent_HasNoScript(objectEvent) == TRUE || FieldSystem_CheckFlag(fieldSystem, objectEvent->flag) == FALSE) { + mapObj = MapObjectMan_AddMapObjectFromHeader(param0->mapObjMan, objectEvent, param0->unk_00); GF_ASSERT(mapObj != NULL); } - v2++; + objectEvent++; param0->unk_08++; } while (param0->unk_08 < param0->unk_04); - Heap_FreeToHeapExplicit(11, param0->unk_10); - Heap_FreeToHeapExplicit(11, param0); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, param0->objectEvent); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, param0); } static MapObject *sub_02062120(const MapObjectManager *mapObjMan) { - int v0, v1; - MapObject *mapObj; - - v0 = 0; - v1 = MapObjectMan_GetMaxObjects(mapObjMan); - mapObj = sub_02062878(mapObjMan); + int i = 0; + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { @@ -666,8 +648,8 @@ static MapObject *sub_02062120(const MapObjectManager *mapObjMan) } mapObj++; - v0++; - } while (v0 < v1); + i++; + } while (i < maxObjects); return NULL; } @@ -675,13 +657,13 @@ static MapObject *sub_02062120(const MapObjectManager *mapObjMan) static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, int param2) { int v0 = 0; - MapObject *v1; + MapObject *mapObj; - while (sub_020625B0(mapObjMan, &v1, &v0, MAP_OBJ_STATUS_0) == 1) { - if (sub_02062E94(v1) == 1 - && MapObject_GetLocalID(v1) == param1 - && sub_02062C18(v1) == param2) { - return v1; + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == TRUE) { + if (sub_02062E94(mapObj) == TRUE + && MapObject_GetLocalID(mapObj) == param1 + && sub_02062C18(mapObj) == param2) { + return mapObj; } } @@ -690,12 +672,10 @@ static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, in static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObject *mapObj) { - int v0, movementType; + int v0 = sub_02062858(mapObjMan); + int movementType = MapObject_GetMovementType(mapObj); SysTask *task; - v0 = sub_02062858(mapObjMan); - movementType = MapObject_GetMovementType(mapObj); - if (movementType == 48 || movementType == 50) { v0 += 2; } @@ -725,10 +705,9 @@ static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, Fiel static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent) { - int v0; + int v0 = ObjectEvent_GetX(objectEvent); VecFx32 v1; - v0 = ObjectEvent_GetX(objectEvent); v1.x = (((v0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetXInitial(mapObj, v0); @@ -737,7 +716,7 @@ static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent) v0 = ObjectEvent_GetY(objectEvent); v1.y = (fx32)v0; - v0 = (((v0) >> 3) / FX32_ONE); + v0 = ((v0) >> 3) / FX32_ONE; MapObject_SetYInitial(mapObj, v0); MapObject_SetYPrev(mapObj, v0); @@ -752,15 +731,15 @@ static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent) MapObject_SetPos(mapObj, &v1); } -static void sub_0206234C(MapObject *mapObj, const MapObjectManager *param1) +static void sub_0206234C(MapObject *mapObj, const MapObjectManager *mapObjMan) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_0 | MAP_OBJ_STATUS_12 | MAP_OBJ_STATUS_11); - if (sub_020626B4(mapObj) == 1) { + if (MapObject_HasNoScript(mapObj) == TRUE) { sub_02062E78(mapObj, 1); } - MapObject_SetMapObjectManager(mapObj, param1); + MapObject_SetMapObjectManager(mapObj, mapObjMan); MapObject_Face(mapObj, MapObject_GetInitialDir(mapObj)); MapObject_Turn(mapObj, MapObject_GetInitialDir(mapObj)); sub_020656DC(mapObj); @@ -768,9 +747,7 @@ static void sub_0206234C(MapObject *mapObj, const MapObjectManager *param1) static void sub_0206239C(MapObject *mapObj) { - const UnkStruct_020EDF0C *v0; - - v0 = sub_0206320C(MapObject_GetMovementType(mapObj)); + const UnkStruct_020EDF0C *v0 = sub_0206320C(MapObject_GetMovementType(mapObj)); sub_02062AF8(mapObj, sub_02063224(v0)); sub_02062B0C(mapObj, sub_02063228(v0)); @@ -797,132 +774,118 @@ static void sub_020623D4(MapObject *mapObj) static void sub_0206243C(MapObject *mapObj) { - memset(mapObj, 0, (sizeof(MapObject))); + memset(mapObj, 0, sizeof(MapObject)); } -static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const ObjectEvent *param3) +static int sub_0206244C(const MapObject *mapObj, int param1, int objEventCount, const ObjectEvent *objectEvent) { - int v0; - int v1; + int localID; + int flag; - while (param2) { - v0 = ObjectEvent_GetLocalID(param3); + while (objEventCount) { + localID = ObjectEvent_GetLocalID(objectEvent); - if (MapObject_GetLocalID(mapObj) == v0) { - if (sub_020631D8(param3) == 1) { - v1 = sub_020631F4(param3); + if (MapObject_GetLocalID(mapObj) == localID) { + if (ObjectEvent_HasNoScript(objectEvent) == TRUE) { + flag = ObjectEvent_GetFlagNoScript(objectEvent); - if (sub_02062E94(mapObj) == 1) { - if (sub_02062C18(mapObj) == v1) { + if (sub_02062E94(mapObj) == TRUE) { + if (sub_02062C18(mapObj) == flag) { return 1; } - } else if (sub_02062918(mapObj) == v1) { + } else if (sub_02062918(mapObj) == flag) { return 2; } - } else { - if (sub_02062E94(mapObj) == 1) { - if (sub_02062C18(mapObj) == param1) { - return 2; - } - } + } else if (sub_02062E94(mapObj) == TRUE && sub_02062C18(mapObj) == param1) { + return 2; } } - param2--; - param3++; + objEventCount--; + objectEvent++; } return 0; } -static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, int param2) +static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int localID, int flag) { int v0 = 0; - MapObject *v1; + MapObject *mapObj; - while (sub_020625B0(mapObjMan, &v1, &v0, MAP_OBJ_STATUS_0) == 1) { - if ((MapObject_GetLocalID(v1) == param1) && (sub_02062918(v1) == param2)) { - return v1; + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == TRUE) { + if (MapObject_GetLocalID(mapObj) == localID && sub_02062918(mapObj) == flag) { + return mapObj; } } return NULL; } -MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1) +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int index) { - int v0; - MapObject *v1; + int maxObjects; + MapObject *mapObj; GF_ASSERT(mapObjMan != NULL); - v0 = MapObjectMan_GetMaxObjects(mapObjMan); - v1 = sub_02062870(mapObjMan); + maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + mapObj = MapObjectMan_GetMapObjectStatic(mapObjMan); do { - if (MapObject_CheckStatusFlag(v1, MAP_OBJ_STATUS_0) == 1) { - if (sub_02062E94(v1) == 0) { - if (MapObject_GetLocalID(v1) == param1) { - return v1; - } - } + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && sub_02062E94(mapObj) == FALSE + && MapObject_GetLocalID(mapObj) == index) { + return mapObj; } - v1++; - v0--; - } while (v0 > 0); + mapObj++; + maxObjects--; + } while (maxObjects > 0); return NULL; } -MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1) +MapObject *sub_02062570(const MapObjectManager *mapObjMan, int movementType) { - int v0; - MapObject *v1; - - v0 = MapObjectMan_GetMaxObjects(mapObjMan); - v1 = sub_02062870(mapObjMan); + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObjectStatic(mapObjMan); do { - if (MapObject_CheckStatusFlag(v1, MAP_OBJ_STATUS_0) == 1) { - if (MapObject_GetMovementType(v1) == param1) { - return v1; - } + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && MapObject_GetMovementType(mapObj) == movementType) { + return mapObj; } - v1++; - v0--; - } while (v0 > 0); + mapObj++; + maxObjects--; + } while (maxObjects > 0); return NULL; } -int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **param1, int *param2, u32 param3) +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 status) { - int v0; + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *v1; - v0 = MapObjectMan_GetMaxObjects(mapObjMan); - - if ((*param2) >= v0) { + if ((*param2) >= maxObjects) { return 0; } - v1 = sub_02062870(mapObjMan); + v1 = MapObjectMan_GetMapObjectStatic(mapObjMan); v1 = &v1[(*param2)]; do { (*param2)++; - if (MapObject_CheckStatus(v1, param3) == param3) { - *param1 = v1; - return 1; + if (MapObject_CheckStatus(v1, status) == status) { + *mapObj = v1; + return TRUE; } v1++; - } while ((*param2) < v0); + } while ((*param2) < maxObjects); - return 0; + return FALSE; } static void sub_02062604(MapObject *mapObj) @@ -933,7 +896,7 @@ static void sub_02062604(MapObject *mapObj) static void sub_02062618(MapObject *mapObj) { - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_15 | MAP_OBJ_STATUS_HIDE_SHADOW | MAP_OBJ_STATUS_26 | MAP_OBJ_STATUS_24); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_SHOW_SHADOW | MAP_OBJ_STATUS_HIDE_SHADOW | MAP_OBJ_STATUS_26 | MAP_OBJ_STATUS_24); } static void sub_02062628(MapObject *mapObj) @@ -941,14 +904,14 @@ static void sub_02062628(MapObject *mapObj) (void)0; } -static int sub_0206262C(FieldSystem *fieldSystem, int param1) +static int sub_0206262C(FieldSystem *fieldSystem, int graphicsID) { - if ((param1 >= 0x65) && (param1 <= 0x74)) { - param1 -= 0x65; - param1 = sub_0203F164(fieldSystem, param1); + if (graphicsID >= 0x65 && graphicsID <= 0x74) { + graphicsID -= 0x65; + graphicsID = sub_0203F164(fieldSystem, graphicsID); } - return param1; + return graphicsID; } static void sub_02062648(MapObject *mapObj) @@ -966,9 +929,9 @@ static void sub_02062660(MapObject *mapObj) static void sub_02062670(MapObject *mapObj) { - const MapObjectManager *v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (MapObjectMan_IsDrawInitialized(v0) == 0) { + if (MapObjectMan_IsDrawInitialized(mapObjMan) == FALSE) { return; } @@ -976,49 +939,47 @@ static void sub_02062670(MapObject *mapObj) sub_02062A0C(mapObj, 0); ov5_021EDD78(mapObj, 0); - if (sub_02062D4C(mapObj) == 0) { + if (sub_02062D4C(mapObj) == FALSE) { sub_020623D4(mapObj); sub_02062B54(mapObj); sub_02062D40(mapObj); } } -int sub_020626B4(const MapObject *mapObj) +int MapObject_HasNoScript(const MapObject *mapObj) { - u16 v0 = (u16)MapObject_GetScript(mapObj); + u16 script = (u16)MapObject_GetScript(mapObj); - if (v0 == 0xffff) { - return 1; + if (script == 0xffff) { + return TRUE; } - return 0; + return FALSE; } -static void sub_020626D0(MapObject *mapObj, const ObjectEvent *param1, int param2) +static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int mapID) { - GF_ASSERT(sub_02062E94(mapObj) == 1); + GF_ASSERT(sub_02062E94(mapObj) == TRUE); sub_02062E78(mapObj, 0); - sub_02062914(mapObj, param2); - MapObject_SetScript(mapObj, ObjectEvent_GetScript(param1)); - MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(param1)); + sub_02062914(mapObj, mapID); + MapObject_SetScript(mapObj, ObjectEvent_GetScript(objectEvent)); + MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(objectEvent)); } -static void sub_02062714(MapObject *mapObj, int param1, const ObjectEvent *param2) +static void sub_02062714(MapObject *mapObj, int mapID, const ObjectEvent *objectEvent) { - GF_ASSERT(sub_020631D8(param2) == 1); + GF_ASSERT(ObjectEvent_HasNoScript(objectEvent) == TRUE); sub_02062E78(mapObj, 1); - MapObject_SetScript(mapObj, ObjectEvent_GetScript(param2)); - MapObject_SetFlag(mapObj, sub_020631F4(param2)); - sub_02062914(mapObj, param1); + MapObject_SetScript(mapObj, ObjectEvent_GetScript(objectEvent)); + MapObject_SetFlag(mapObj, ObjectEvent_GetFlagNoScript(objectEvent)); + sub_02062914(mapObj, mapID); } int sub_02062758(const MapObject *mapObj, int param1) { - int v0; - - v0 = sub_02062C0C(mapObj); + int v0 = sub_02062C0C(mapObj); v0 += param1; return v0; @@ -1027,24 +988,24 @@ int sub_02062758(const MapObject *mapObj, int param1) int sub_02062764(const MapObject *mapObj, int param1, int param2) { if (!MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0)) { - return 0; + return FALSE; } if (MapObject_GetLocalID(mapObj) != param1) { - return 0; + return FALSE; } if (sub_02062918(mapObj) != param2) { - if (sub_02062E94(mapObj) == 0) { - return 0; + if (sub_02062E94(mapObj) == FALSE) { + return FALSE; } if (sub_02062C18(mapObj) != param2) { - return 0; + return FALSE; } } - return 1; + return TRUE; } int sub_020627B4(const MapObject *mapObj, int param1, int param2, int param3) @@ -1053,12 +1014,10 @@ int sub_020627B4(const MapObject *mapObj, int param1, int param2, int param3) return 0; } - { - int v0 = sub_02062924(mapObj); + int v0 = sub_02062924(mapObj); - if (v0 != param1) { - return 0; - } + if (v0 != param1) { + return 0; } return sub_02062764(mapObj, param2, param3); @@ -1111,19 +1070,19 @@ static void MapObjectMan_DecObjectCount(MapObjectManager *mapObjMan) mapObjMan->objectCnt--; } -void sub_02062838(MapObjectManager *mapObjMan, u32 param1) +void MapObjectMan_SetStatusFlagOn(MapObjectManager *mapObjMan, u32 flag) { - mapObjMan->unk_00 |= param1; + mapObjMan->status |= flag; } -void sub_02062840(MapObjectManager *mapObjMan, u32 param1) +void MapObjectMan_SetStatusFlagOff(MapObjectManager *mapObjMan, u32 flag) { - mapObjMan->unk_00 &= ~param1; + mapObjMan->status &= ~flag; } -u32 sub_0206284C(const MapObjectManager *mapObjMan, u32 param1) +u32 MapObjectMan_CheckStatus(const MapObjectManager *mapObjMan, u32 flag) { - return mapObjMan->unk_00 & param1; + return mapObjMan->status & flag; } void sub_02062854(MapObjectManager *mapObjMan, int param1) @@ -1141,24 +1100,24 @@ UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *mapObjMan) return &(((MapObjectManager *)mapObjMan)->unk_18); } -void sub_02062860(MapObjectManager *mapObjMan, MapObject *param1) +void MapObjectMan_SetMapObject(MapObjectManager *mapObjMan, MapObject *mapObj) { - mapObjMan->unk_124 = param1; + mapObjMan->mapObj = mapObj; } -const MapObject *sub_02062868(const MapObjectManager *mapObjMan) +const MapObject *MapObjectMan_GetMapObjectConst(const MapObjectManager *mapObjMan) { - return mapObjMan->unk_124; + return mapObjMan->mapObj; } -static MapObject *sub_02062870(const MapObjectManager *mapObjMan) +static MapObject *MapObjectMan_GetMapObjectStatic(const MapObjectManager *mapObjMan) { - return mapObjMan->unk_124; + return mapObjMan->mapObj; } -MapObject *sub_02062878(const MapObjectManager *mapObjMan) +MapObject *MapObjectMan_GetMapObject(const MapObjectManager *mapObjMan) { - return mapObjMan->unk_124; + return mapObjMan->mapObj; } void sub_02062880(const MapObject **mapObj) @@ -1176,15 +1135,15 @@ FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan) return mapObjMan->fieldSystem; } -void sub_0206289C(MapObjectManager *mapObjMan, NARC *param1) +void MapObjectMan_SetNARC(MapObjectManager *mapObjMan, NARC *narc) { - mapObjMan->unk_14 = param1; + mapObjMan->narc = narc; } -NARC *sub_020628A0(const MapObjectManager *mapObjMan) +NARC *MapObjectMan_GetNARC(const MapObjectManager *mapObjMan) { - GF_ASSERT(mapObjMan->unk_14 != NULL); - return ((MapObjectManager *)mapObjMan)->unk_14; + GF_ASSERT(mapObjMan->narc != NULL); + return ((MapObjectManager *)mapObjMan)->narc; } void MapObject_SetStatus(MapObject *mapObj, u32 status) @@ -1276,13 +1235,13 @@ u32 MapObject_GetGraphicsID(const MapObject *mapObj) u32 sub_02062924(const MapObject *mapObj) { - u32 v0 = MapObject_GetGraphicsID(mapObj); + u32 graphicsID = MapObject_GetGraphicsID(mapObj); - if (sub_020677F4(v0) == 1) { - v0 = sub_02067800(mapObj); + if (sub_020677F4(graphicsID) == TRUE) { + graphicsID = sub_02067800(mapObj); } - return v0; + return graphicsID; } void MapObject_SetMovementType(MapObject *mapObj, u32 movementType) @@ -1405,7 +1364,7 @@ int MapObject_GetDataAt(const MapObject *mapObj, int index) } GF_ASSERT(FALSE); - return 0; + return FALSE; } void MapObject_SetMovementRangeX(MapObject *mapObj, int movementRangeX) @@ -1438,14 +1397,14 @@ u32 sub_02062A14(const MapObject *mapObj) return mapObj->unk_A0; } -void sub_02062A1C(MapObject *mapObj, SysTask *param1) +void sub_02062A1C(MapObject *mapObj, SysTask *task) { - mapObj->unk_B0 = param1; + mapObj->task = task; } SysTask *sub_02062A24(const MapObject *mapObj) { - return mapObj->unk_B0; + return mapObj->task; } void sub_02062A2C(const MapObject *mapObj) @@ -1468,14 +1427,14 @@ static MapObjectManager *sub_02062A48(const MapObject *mapObj) return MapObjectMan_Deconst(mapObj->mapObjMan); } -void *sub_02062A54(MapObject *mapObj, int param1) +void *sub_02062A54(MapObject *mapObj, int size) { void *v0; - GF_ASSERT(param1 <= 16); + GF_ASSERT(size <= 16); v0 = sub_02062A78(mapObj); - memset(v0, 0, param1); + memset(v0, 0, size); return v0; } @@ -1485,14 +1444,14 @@ void *sub_02062A78(MapObject *mapObj) return mapObj->unk_D8; } -void *sub_02062A7C(MapObject *mapObj, int param1) +void *sub_02062A7C(MapObject *mapObj, int size) { u8 *v0; - GF_ASSERT(param1 <= 16); + GF_ASSERT(size <= 16); v0 = sub_02062AA0(mapObj); - memset(v0, 0, param1); + memset(v0, 0, size); return v0; } @@ -1517,14 +1476,14 @@ void *MapObject_GetMovementData(MapObject *mapObj) return mapObj->movementData; } -void *sub_02062ACC(MapObject *mapObj, int param1) +void *sub_02062ACC(MapObject *mapObj, int size) { u8 *v0; - GF_ASSERT(param1 <= 32); + GF_ASSERT(size <= 32); v0 = sub_02062AF0(mapObj); - memset(v0, 0, param1); + memset(v0, 0, size); return v0; } @@ -1645,32 +1604,30 @@ int MapObject_GetMovementStep(const MapObject *mapObj) return mapObj->movementStep; } -void sub_02062BE0(MapObject *mapObj, u32 param1) +void MapObject_SetCurrTileBehavior(MapObject *mapObj, u32 tileBehavior) { - mapObj->unk_AC = param1; + mapObj->currTileBehavior = tileBehavior; } -u32 sub_02062BE8(const MapObject *mapObj) +u32 MapObject_GetCurrTileBehavior(const MapObject *mapObj) { - return mapObj->unk_AC; + return mapObj->currTileBehavior; } -void sub_02062BF0(MapObject *mapObj, u32 param1) +void MapObject_SetPrevTileBehavior(MapObject *mapObj, u32 tileBehavior) { - mapObj->unk_AE = param1; + mapObj->prevTileBehavior = tileBehavior; } -u32 sub_02062BF8(const MapObject *mapObj) +u32 MapObject_GetPrevTileBehavior(const MapObject *mapObj) { - return mapObj->unk_AE; + return mapObj->prevTileBehavior; } FieldSystem *MapObject_FieldSystem(const MapObject *mapObj) { - MapObjectManager *v0; - - v0 = sub_02062A48(mapObj); - return MapObjectMan_FieldSystem(v0); + MapObjectManager *mapObjMan = sub_02062A48(mapObj); + return MapObjectMan_FieldSystem(mapObjMan); } int sub_02062C0C(const MapObject *mapObj) @@ -1680,82 +1637,82 @@ int sub_02062C0C(const MapObject *mapObj) int sub_02062C18(const MapObject *mapObj) { - GF_ASSERT(sub_02062E94(mapObj) == 1); + GF_ASSERT(sub_02062E94(mapObj) == TRUE); return MapObject_GetFlag(mapObj); } void MapObjectMan_StopAllMovement(MapObjectManager *mapObjMan) { - sub_02062838(mapObjMan, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_START_MOVEMENT); + MapObjectMan_SetStatusFlagOn(mapObjMan, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_START_MOVEMENT); } void sub_02062C3C(MapObjectManager *mapObjMan) { - sub_02062840(mapObjMan, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_START_MOVEMENT); + MapObjectMan_SetStatusFlagOff(mapObjMan, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_START_MOVEMENT); } void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan) { - int v0 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject *v1 = sub_02062878(mapObjMan); + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (sub_02062CF8(v1)) { - sub_02062DD0(v1); + if (sub_02062CF8(mapObj)) { + MapObject_SetPauseMovementOn(mapObj); } - v1++; - v0--; - } while (v0); + mapObj++; + maxObjects--; + } while (maxObjects); } void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan) { - int v0 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject *v1 = sub_02062878(mapObjMan); + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (sub_02062CF8(v1)) { - sub_02062DDC(v1); + if (sub_02062CF8(mapObj)) { + MapObject_SetPauseMovementOff(mapObj); } - v1++; - v0--; - } while (v0); + mapObj++; + maxObjects--; + } while (maxObjects); } int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan) { - if (sub_0206284C(mapObjMan, MAP_OBJ_STATUS_0)) { - return 1; + if (MapObjectMan_CheckStatus(mapObjMan, MAP_OBJ_STATUS_0)) { + return TRUE; } - return 0; + return FALSE; } -u32 sub_02062CBC(const MapObject *mapObj, u32 param1) +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 flag) { - const MapObjectManager *v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - return sub_0206284C(v0, param1); + return MapObjectMan_CheckStatus(mapObjMan, flag); } -void sub_02062CCC(MapObjectManager *mapObjMan, int param1) +void MapObjectMan_SetEndMovement(MapObjectManager *mapObjMan, int param1) { - if (param1 == 0) { - sub_02062838(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); + if (param1 == FALSE) { + MapObjectMan_SetStatusFlagOn(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); } else { - sub_02062840(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); + MapObjectMan_SetStatusFlagOff(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); } } int sub_02062CE4(const MapObjectManager *mapObjMan) { - if (sub_0206284C(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT)) { - return 0; + if (MapObjectMan_CheckStatus(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT)) { + return FALSE; } - return 1; + return TRUE; } int sub_02062CF8(const MapObject *mapObj) @@ -1778,12 +1735,12 @@ int MapObject_IsMoving(const MapObject *mapObj) return MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_1); } -void sub_02062D28(MapObject *mapObj) +void MapObject_SetStartMovement(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); } -void sub_02062D34(MapObject *mapObj) +void MapObject_SetEndMovementOff(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_END_MOVEMENT); } @@ -1798,14 +1755,14 @@ int sub_02062D4C(const MapObject *mapObj) return MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_14); } -int sub_02062D58(const MapObject *mapObj) +int MapObject_IsHidden(const MapObject *mapObj) { return MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_HIDE); } -void MapObject_SetHidden(MapObject *mapObj, int param1) +void MapObject_SetHidden(MapObject *mapObj, int hidden) { - if (param1 == 1) { + if (hidden == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE); @@ -1814,7 +1771,7 @@ void MapObject_SetHidden(MapObject *mapObj, int param1) void sub_02062D80(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_18); } else { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_18); @@ -1823,61 +1780,59 @@ void sub_02062D80(MapObject *mapObj, int param1) int sub_02062D9C(MapObject *mapObj) { - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_19) == 1) { - return 0; + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_19) == TRUE) { + return FALSE; } - return 1; + return TRUE; } void sub_02062DB4(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_19); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_19); } } -void sub_02062DD0(MapObject *mapObj) +void MapObject_SetPauseMovementOn(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT); } -void sub_02062DDC(MapObject *mapObj) +void MapObject_SetPauseMovementOff(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT); } int MapObject_IsMovementPaused(const MapObject *mapObj) { - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT) == 1) { - return 1; + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT) == TRUE) { + return TRUE; } - return 0; + return FALSE; } int sub_02062DFC(const MapObject *mapObj) { - const MapObjectManager *v0; - - v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (MapObjectMan_IsDrawInitialized(v0) == 0) { - return 0; + if (MapObjectMan_IsDrawInitialized(mapObjMan) == FALSE) { + return FALSE; } if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { - return 0; + return FALSE; } - return 1; + return TRUE; } void sub_02062E28(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_23); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_23); @@ -1887,15 +1842,15 @@ void sub_02062E28(MapObject *mapObj, int param1) int sub_02062E44(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_23)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062E5C(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_10); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_10); @@ -1904,7 +1859,7 @@ void sub_02062E5C(MapObject *mapObj, int param1) void sub_02062E78(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_25); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_25); @@ -1914,15 +1869,15 @@ void sub_02062E78(MapObject *mapObj, int param1) int sub_02062E94(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_25)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062EAC(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_26); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_26); @@ -1932,15 +1887,15 @@ void sub_02062EAC(MapObject *mapObj, int param1) int sub_02062EC8(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_26)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062EE0(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_27); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_27); @@ -1950,15 +1905,15 @@ void sub_02062EE0(MapObject *mapObj, int param1) int sub_02062EFC(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_27)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062F14(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_28); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_28); @@ -1968,15 +1923,15 @@ void sub_02062F14(MapObject *mapObj, int param1) int sub_02062F30(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_28)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062F48(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_24); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_24); @@ -1986,24 +1941,24 @@ void sub_02062F48(MapObject *mapObj, int param1) int sub_02062F64(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_24)) { - return 1; + return TRUE; } - return 0; + return FALSE; } int sub_02062F7C(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_4)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062F90(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_29); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_29); @@ -2013,15 +1968,15 @@ void sub_02062F90(MapObject *mapObj, int param1) int sub_02062FAC(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_29)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062FC4(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { sub_020628F0(mapObj, (1 << 2)); } else { sub_020628F8(mapObj, (1 << 2)); @@ -2031,10 +1986,10 @@ void sub_02062FC4(MapObject *mapObj, int param1) int sub_02062FDC(const MapObject *mapObj) { if (sub_02062904(mapObj, (1 << 2))) { - return 1; + return TRUE; } - return 0; + return FALSE; } int MapObject_GetXInitial(const MapObject *mapObj) @@ -2200,7 +2155,7 @@ void sub_020630CC(MapObject *mapObj, const VecFx32 *vec) int sub_020630DC(const MapObject *mapObj) { fx32 v0 = MapObject_GetPosY(mapObj); - int v1 = (((v0) >> 3) / FX32_ONE); + int v1 = ((v0) >> 3) / FX32_ONE; return v1; } @@ -2304,7 +2259,7 @@ int ObjectEvent_GetDataAt(const ObjectEvent *objectEvent, int index) } GF_ASSERT(FALSE); - return 0; + return FALSE; } void ObjectEvent_SetMovementRangeX(ObjectEvent *objectEvent, int movementRangeX) @@ -2357,37 +2312,35 @@ int ObjectEvent_GetZ(const ObjectEvent *objectEvent) return objectEvent->z; } -static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *param2) +static const ObjectEvent *sub_020631A4(int param0, int objEventCount, const ObjectEvent *objectEvent) { - int v0 = 0; + int i = 0; do { - if (sub_020631D8(¶m2[v0]) == 0) { - if (ObjectEvent_GetLocalID(¶m2[v0]) == param0) { - return ¶m2[v0]; - } + if (ObjectEvent_HasNoScript(&objectEvent[i]) == FALSE && ObjectEvent_GetLocalID(&objectEvent[i]) == param0) { + return &objectEvent[i]; } - v0++; - } while (v0 < param1); + i++; + } while (i < objEventCount); return NULL; } -static int sub_020631D8(const ObjectEvent *objectEvent) +static int ObjectEvent_HasNoScript(const ObjectEvent *objectEvent) { - u16 v0 = (u16)ObjectEvent_GetScript(objectEvent); + u16 script = (u16)ObjectEvent_GetScript(objectEvent); - if (v0 == 0xffff) { - return 1; + if (script == 0xffff) { + return TRUE; } - return 0; + return FALSE; } -static int sub_020631F4(const ObjectEvent *objectEvent) +static int ObjectEvent_GetFlagNoScript(const ObjectEvent *objectEvent) { - GF_ASSERT(sub_020631D8(objectEvent) == 1); + GF_ASSERT(ObjectEvent_HasNoScript(objectEvent) == TRUE); return ObjectEvent_GetFlag(objectEvent); } @@ -2453,74 +2406,69 @@ static const UnkStruct_ov5_021FB0F0 *sub_02063244(u32 param0) return NULL; } -MapObject *sub_0206326C(const MapObjectManager *param0, int param1, int param2, int param3) +MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3) { - int v0; - MapObject *v1; - - v0 = MapObjectMan_GetMaxObjects(param0); - v1 = sub_02062878(param0); + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (MapObject_CheckStatus(v1, MAP_OBJ_STATUS_0)) { - if (param3) { - if (MapObject_GetXPrev(v1) == param1 && MapObject_GetZPrev(v1) == param2) { - return v1; - } + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { + if (param3 && MapObject_GetXPrev(mapObj) == x && MapObject_GetZPrev(mapObj) == z) { + return mapObj; } - if (MapObject_GetX(v1) == param1 && MapObject_GetZ(v1) == param2) { - return v1; + if (MapObject_GetX(mapObj) == x && MapObject_GetZ(mapObj) == z) { + return mapObj; } } - v1++; - v0--; - } while (v0); + mapObj++; + maxObjects--; + } while (maxObjects); return NULL; } -void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) +void MapObject_SetPosDirFromVec(MapObject *mapObj, const VecFx32 *pos, int dir) { - int v0, v1, v2; + int x, y, z; - v0 = (((param1->x) >> 4) / FX32_ONE); - MapObject_SetX(mapObj, v0); + x = ((pos->x) >> 4) / FX32_ONE; + MapObject_SetX(mapObj, x); - v1 = (((param1->y) >> 3) / FX32_ONE); - MapObject_SetY(mapObj, v1); + y = ((pos->y) >> 3) / FX32_ONE; + MapObject_SetY(mapObj, y); - v2 = (((param1->z) >> 4) / FX32_ONE); - MapObject_SetZ(mapObj, v2); + z = ((pos->z) >> 4) / FX32_ONE; + MapObject_SetZ(mapObj, z); - MapObject_SetPos(mapObj, param1); + MapObject_SetPos(mapObj, pos); MapObject_UpdateCoords(mapObj); - MapObject_Face(mapObj, param2); + MapObject_Face(mapObj, dir); sub_020656DC(mapObj); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_END_MOVEMENT); } -void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4) +void MapObject_SetPosDirFromCoords(MapObject *mapObj, int x, int y, int z, int dir) { - VecFx32 v0; + VecFx32 pos; - v0.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); - MapObject_SetX(mapObj, param1); + pos.x = ((x << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + MapObject_SetX(mapObj, x); - v0.y = (((param2) << 3) * FX32_ONE) + 0; - MapObject_SetY(mapObj, param2); + pos.y = ((y << 3) * FX32_ONE) + 0; + MapObject_SetY(mapObj, y); - v0.z = (((param3) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); - MapObject_SetZ(mapObj, param3); + pos.z = ((z << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + MapObject_SetZ(mapObj, z); - MapObject_SetPos(mapObj, &v0); + MapObject_SetPos(mapObj, &pos); MapObject_UpdateCoords(mapObj); - MapObject_Face(mapObj, param4); + MapObject_Face(mapObj, dir); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_END_MOVEMENT); @@ -2536,11 +2484,11 @@ void MapObject_SetMoveCode(MapObject *mapObj, u32 param1) MapObject_InitMove(mapObj); } -void sub_020633C8(MapObject *mapObj, int param1) +void sub_020633C8(MapObject *mapObj, int localID) { - MapObject_SetLocalID(mapObj, param1); + MapObject_SetLocalID(mapObj, localID); - sub_02062D28(mapObj); + MapObject_SetStartMovement(mapObj); sub_02062618(mapObj); } diff --git a/src/map_object_move.c b/src/map_object_move.c index df842928e0..9933f2d224 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -29,7 +29,7 @@ static int sub_02063478(const MapObject *mapObj); static void sub_020634DC(MapObject *mapObj); static void sub_020634F4(MapObject *mapObj); -static void sub_02063518(MapObject *mapObj); +static void MapObject_StartMove(MapObject *mapObj); static void sub_0206353C(MapObject *mapObj); static void MapObject_EndMove(MapObject *mapObj); static void sub_020635AC(MapObject *mapObj); @@ -37,28 +37,28 @@ static void sub_0206363C(MapObject *mapObj); static void sub_020636F0(MapObject *mapObj); static void sub_0206375C(MapObject *mapObj); static void sub_020637D4(MapObject *mapObj); -static void sub_02063864(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063964(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_0206397C(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063A30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063A64(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063A70(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063B20(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063BB4(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C00(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C18(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C48(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C60(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C94(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063CC8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063CFC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063D30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063DA8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063DDC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063E14(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063864(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063964(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_0206397C(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063994(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A64(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A70(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063BB4(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C00(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C18(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C48(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C60(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C94(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063CC8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063CFC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063D30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063DA8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063DDC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063E14(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); static BOOL (*const Unk_020EE76C[4])(u8); static BOOL (*const Unk_020EE77C[4])(u8); @@ -71,17 +71,17 @@ void MapObject_InitMove(MapObject *mapObj) void MapObject_Move(MapObject *mapObj) { - if (sub_02062CBC(mapObj, (1 << 1))) { + if (MapObject_CheckManagerStatus(mapObj, (1 << 1))) { return; } sub_020634DC(mapObj); sub_020634F4(mapObj); - sub_02063518(mapObj); + MapObject_StartMove(mapObj); if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_4)) { MapObject_DoMovementAction(mapObj); - } else if (MapObject_IsMovementPaused(mapObj) == FALSE && sub_02063478(mapObj) == 1 && sub_020673C0(mapObj) == 0) { + } else if (MapObject_IsMovementPaused(mapObj) == FALSE && sub_02063478(mapObj) == TRUE && sub_020673C0(mapObj) == FALSE) { sub_02062B14(mapObj); } @@ -91,7 +91,7 @@ void MapObject_Move(MapObject *mapObj) static BOOL sub_02063478(const MapObject *mapObj) { - if (MapObject_IsMoving(mapObj) == 1) { + if (MapObject_IsMoving(mapObj) == TRUE) { return TRUE; } @@ -101,13 +101,13 @@ static BOOL sub_02063478(const MapObject *mapObj) return TRUE; } - u32 v0 = MapObject_GetStatus(mapObj); + u32 status = MapObject_GetStatus(mapObj); - if ((v0 & (1 << 12)) && ((v0 & (1 << 23)) == 0)) { + if (status & (1 << 12) && (status & (1 << 23)) == FALSE) { return FALSE; } - if ((v0 & (1 << 11)) && (sub_02062FDC(mapObj) == 0)) { + if (status & (1 << 11) && sub_02062FDC(mapObj) == FALSE) { return FALSE; } @@ -123,175 +123,173 @@ static void sub_020634DC(MapObject *mapObj) static void sub_020634F4(MapObject *mapObj) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_11)) { - if (sub_02064390(mapObj) == 1) { - sub_02062D28(mapObj); - } + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_11) && MapObject_SetTileBehaviors(mapObj) == TRUE) { + MapObject_SetStartMovement(mapObj); } } -static void sub_02063518(MapObject *mapObj) +static void MapObject_StartMove(MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_START_MOVEMENT)) { sub_020635AC(mapObj); } - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_START_JUMP); } static void sub_0206353C(MapObject *mapObj) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_16)) { + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_START_JUMP)) { sub_020636F0(mapObj); } else if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_START_MOVEMENT)) { sub_0206363C(mapObj); } - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_START_JUMP); } static void MapObject_EndMove(MapObject *mapObj) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_17)) { + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_END_JUMP)) { sub_020637D4(mapObj); } else if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_END_MOVEMENT)) { sub_0206375C(mapObj); } - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_END_JUMP); } static void sub_020635AC(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + if (sub_02062DFC(mapObj) == TRUE) { + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063DDC(mapObj, v0, v1, v2); - sub_02063964(mapObj, v0, v1, v2); - sub_02063A30(mapObj, v0, v1, v2); - sub_02063A70(mapObj, v0, v1, v2); - sub_02063864(mapObj, v0, v1, v2); - sub_02063C00(mapObj, v0, v1, v2); - sub_02063C30(mapObj, v0, v1, v2); - sub_02063D30(mapObj, v0, v1, v2); + sub_02063DDC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063964(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A70(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063864(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C00(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063D30(mapObj, currTileBehavior, prevTileBehavior, v2); } } static void sub_0206363C(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + if (sub_02062DFC(mapObj) == TRUE) { + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063DDC(mapObj, v0, v1, v2); - sub_0206397C(mapObj, v0, v1, v2); - sub_02063994(mapObj, v0, v1, v2); - sub_02063A30(mapObj, v0, v1, v2); - sub_02063A78(mapObj, v0, v1, v2); - sub_02063C18(mapObj, v0, v1, v2); - sub_02063C48(mapObj, v0, v1, v2); - sub_02063C60(mapObj, v0, v1, v2); - sub_02063CC8(mapObj, v0, v1, v2); - sub_02063D30(mapObj, v0, v1, v2); + sub_02063DDC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_0206397C(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063994(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A78(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C18(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C48(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C60(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063CC8(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063D30(mapObj, currTileBehavior, prevTileBehavior, v2); - sub_02063E14(mapObj, v0, v1, v2); + sub_02063E14(mapObj, currTileBehavior, prevTileBehavior, v2); } } static void sub_020636F0(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + if (sub_02062DFC(mapObj) == TRUE) { + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063DDC(mapObj, v0, v1, v2); - sub_02063A78(mapObj, v0, v1, v2); - sub_02063D30(mapObj, v0, v1, v2); - sub_02063A64(mapObj, v0, v1, v2); - sub_02063E14(mapObj, v0, v1, v2); + sub_02063DDC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A78(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063D30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A64(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063E14(mapObj, currTileBehavior, prevTileBehavior, v2); } } static void sub_0206375C(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + if (sub_02062DFC(mapObj) == TRUE) { + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063864(mapObj, v0, v1, v2); - sub_02063C94(mapObj, v0, v1, v2); - sub_02063CFC(mapObj, v0, v1, v2); - sub_02063A30(mapObj, v0, v1, v2); - sub_02063DA8(mapObj, v0, v1, v2); - sub_02063B20(mapObj, v0, v1, v2); + sub_02063864(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C94(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063CFC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063DA8(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063B20(mapObj, currTileBehavior, prevTileBehavior, v2); } } static void sub_020637D4(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + if (sub_02062DFC(mapObj) == TRUE) { + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063864(mapObj, v0, v1, v2); - sub_02063C94(mapObj, v0, v1, v2); - sub_02063CFC(mapObj, v0, v1, v2); - sub_02063A30(mapObj, v0, v1, v2); - sub_02063DA8(mapObj, v0, v1, v2); - sub_02063B20(mapObj, v0, v1, v2); - sub_0206397C(mapObj, v0, v1, v2); - sub_02063BB4(mapObj, v0, v1, v2); + sub_02063864(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C94(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063CFC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063DA8(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063B20(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_0206397C(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063BB4(mapObj, currTileBehavior, prevTileBehavior, v2); } } -static void sub_02063864(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063864(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (sub_02062EFC(mapObj) == 0) { - if ((TileBehavior_IsDeepMud(param1) == 1) || (TileBehavior_IsDeepMudWithGrass(param1) == 1)) { + if (sub_02062EFC(mapObj) == FALSE) { + if (TileBehavior_IsDeepMud(currTileBehavior) == TRUE || TileBehavior_IsDeepMudWithGrass(currTileBehavior) == TRUE) { VecFx32 v0 = { 0, (FX32_ONE * -14), 0 }; sub_020630CC(mapObj, &v0); return; } - if ((TileBehavior_IsMud(param1) == 1) || (TileBehavior_IsMudWithGrass(param1) == 1)) { + if (TileBehavior_IsMud(currTileBehavior) == TRUE || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE) { VecFx32 v1 = { 0, (FX32_ONE * -12), 0 }; sub_020630CC(mapObj, &v1); return; } - if (TileBehavior_IsDeepestSnow(param1) == 1) { + if (TileBehavior_IsDeepestSnow(currTileBehavior) == TRUE) { VecFx32 v2 = { 0, (FX32_ONE * -16), 0 }; sub_020630CC(mapObj, &v2); return; } - if (TileBehavior_IsDeeperSnow(param1) == 1) { + if (TileBehavior_IsDeeperSnow(currTileBehavior) == TRUE) { VecFx32 v3 = { 0, (FX32_ONE * -14), 0 }; sub_020630CC(mapObj, &v3); return; } - if (TileBehavior_IsDeepSnow(param1) == 1) { + if (TileBehavior_IsDeepSnow(currTileBehavior) == TRUE) { VecFx32 v4 = { 0, (FX32_ONE * -12), 0 }; sub_020630CC(mapObj, &v4); @@ -303,27 +301,27 @@ static void sub_02063864(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc sub_020630CC(mapObj, &v5); } -static void sub_02063964(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063964(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsTallGrass(param1) == 1) { + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE) { ov5_021F2EA4(mapObj, 0); } } -static void sub_0206397C(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_0206397C(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsTallGrass(param1) == 1) { + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE) { ov5_021F2EA4(mapObj, 1); } } -static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063994(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { if (param3->unk_04_6 == 0) { return; } - if (TileBehavior_IsSnowWithShadows(param2) == 1) { + if (TileBehavior_IsSnowWithShadows(prevTileBehavior) == TRUE) { if (param3->unk_04_6 == 1) { ov5_021F1EBC(mapObj); } else if (param3->unk_04_6 == 2) { @@ -331,7 +329,7 @@ static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc } } - if (sub_020640A0(mapObj, param2) == 1) { + if (MapObject_IsOnSand(mapObj, prevTileBehavior) == TRUE) { if (param3->unk_04_6 == 1) { ov5_021F1E8C(mapObj); } else if (param3->unk_04_6 == 2) { @@ -340,21 +338,23 @@ static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc return; } - if ((TileBehavior_IsDeeperSnow(param2) == 1) || (TileBehavior_IsDeepestSnow(param2) == 1) || TileBehavior_IsDeepSnow(param2)) { + if (TileBehavior_IsDeeperSnow(prevTileBehavior) == TRUE + || TileBehavior_IsDeepestSnow(prevTileBehavior) == TRUE + || TileBehavior_IsDeepSnow(prevTileBehavior)) { ov5_021F1EB0(mapObj); return; } - if (sub_02064108(mapObj, param2) == 1) { + if (MapObject_IsOnShallowSnow(mapObj, prevTileBehavior) == TRUE) { ov5_021F1EA4(mapObj); return; } } -static void sub_02063A30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063A30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsShallowWater(param1) == 1) { - if (sub_02062EC8(mapObj) == 0) { + if (TileBehavior_IsShallowWater(currTileBehavior) == TRUE) { + if (sub_02062EC8(mapObj) == FALSE) { ov5_021F331C(mapObj, 1); sub_02062EAC(mapObj, 1); } @@ -363,21 +363,21 @@ static void sub_02063A30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc } } -static void sub_02063A64(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063A64(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { sub_02062EAC(mapObj, 0); } -static void sub_02063A70(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063A70(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - sub_02063A78(mapObj, param1, param2, param3); + sub_02063A78(mapObj, currTileBehavior, prevTileBehavior, param3); } -static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (sub_02062CE4(mapObjMan) == 0) { + if (sub_02062CE4(mapObjMan) == FALSE) { return; } @@ -385,21 +385,29 @@ static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc return; } - if ((TileBehavior_IsTallGrass(param1) == 1) || (TileBehavior_IsVeryTallGrass(param1) == 1) || (sub_0206406C(mapObj, param1) == 1) || (TileBehavior_IsPuddle(param1) == 1) || (TileBehavior_IsShallowWater(param1) == 1) || (MapObject_IsOnSnow(mapObj, param1) == 1) || (TileBehavior_IsMud(param1) == 1) || (TileBehavior_IsMudWithGrass(param1) == 1) || TileBehavior_IsReflective(param1)) { + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE + || TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE + || MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsPuddle(currTileBehavior) == TRUE + || TileBehavior_IsShallowWater(currTileBehavior) == TRUE + || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsMud(currTileBehavior) == TRUE + || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE + || TileBehavior_IsReflective(currTileBehavior)) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } else { - if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_15)) { + if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_SHOW_SHADOW)) { ov5_021F1570(mapObj); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_15); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_SHOW_SHADOW); } } } -static void sub_02063B20(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (sub_02062CE4(mapObjMan) == 0) { + if (sub_02062CE4(mapObjMan) == FALSE) { return; } @@ -407,105 +415,118 @@ static void sub_02063B20(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc return; } - if ((TileBehavior_IsTallGrass(param1) == 1) || (TileBehavior_IsVeryTallGrass(param1) == 1) || (sub_0206406C(mapObj, param1) == 1) || (TileBehavior_IsPuddle(param1) == 1) || (TileBehavior_IsShallowWater(param1) == 1) || (MapObject_IsOnSnow(mapObj, param1) == 1) || (TileBehavior_IsMud(param1) == 1) || (TileBehavior_IsMudWithGrass(param1) == 1) || TileBehavior_IsReflective(param1)) { + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE + || TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE + || MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsPuddle(currTileBehavior) == TRUE + || TileBehavior_IsShallowWater(currTileBehavior) == TRUE + || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsMud(currTileBehavior) == TRUE + || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE + || TileBehavior_IsReflective(currTileBehavior)) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } } -static void sub_02063BB4(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063BB4(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if ((sub_0206406C(mapObj, param1) == 1) || (TileBehavior_IsShallowWater(param1) == 1) || (TileBehavior_IsIce(param1) == 1) || (TileBehavior_IsMud(param1) == 1) || (TileBehavior_IsMudWithGrass(param1) == 1) || (MapObject_IsOnSnow(mapObj, param1) == 1)) { + if (MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsShallowWater(currTileBehavior) == TRUE + || TileBehavior_IsIce(currTileBehavior) == TRUE + || TileBehavior_IsMud(currTileBehavior) == TRUE + || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE + || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE) { return; } ov5_021F3638(mapObj); } -static void sub_02063C00(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C00(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsVeryTallGrass(param1) == 1) { + if (TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE) { ov5_021F3844(mapObj, 0); } } -static void sub_02063C18(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C18(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsVeryTallGrass(param1) == 1) { + if (TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE) { ov5_021F3844(mapObj, 1); } } -static void sub_02063C30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsMudWithGrass(param1) == 1) { + if (TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE) { ov5_021F3AEC(mapObj, 0); } } -static void sub_02063C48(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C48(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsMudWithGrass(param1) == 1) { + if (TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE) { ov5_021F3AEC(mapObj, 1); } } -static void sub_02063C60(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C60(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsPuddle(param2) == 1) { + if (TileBehavior_IsPuddle(prevTileBehavior) == TRUE) { ov5_021F2AE4(mapObj, MapObject_GetXPrev(mapObj), MapObject_GetYPrev(mapObj), MapObject_GetZPrev(mapObj)); } } -static void sub_02063C94(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C94(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsPuddle(param1) == 1) { + if (TileBehavior_IsPuddle(currTileBehavior) == TRUE) { ov5_021F2AE4(mapObj, MapObject_GetX(mapObj), MapObject_GetY(mapObj), MapObject_GetZ(mapObj)); } } -static void sub_02063CC8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063CC8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsMud(param2) == 1) { + if (TileBehavior_IsMud(prevTileBehavior) == TRUE) { ov5_021F2C38(mapObj, MapObject_GetXPrev(mapObj), MapObject_GetYPrev(mapObj), MapObject_GetZPrev(mapObj)); } } -static void sub_02063CFC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063CFC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsMud(param1) == 1) { + if (TileBehavior_IsMud(currTileBehavior) == TRUE) { ov5_021F2C38(mapObj, MapObject_GetX(mapObj), MapObject_GetY(mapObj), MapObject_GetZ(mapObj)); } } -static void sub_02063D30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063D30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { if (param3->unk_04_10 == 0) { return; } - if (sub_02062F64(mapObj) == 0) { - u8 v0 = GetNullTileBehaviorID(); + if (sub_02062F64(mapObj) == FALSE) { + u8 tileBehavior = GetNullTileBehaviorID(); - if (TileBehavior_HasReflectiveSurface(param1) == 1) { - v0 = param1; + if (TileBehavior_HasReflectiveSurface(currTileBehavior) == TRUE) { + tileBehavior = currTileBehavior; } else { - u8 v1 = sub_02064238(mapObj, 1); + u8 southTileBehavior = MapObject_GetTileBehaviorFromDir(mapObj, DIR_SOUTH); - if (TileBehavior_HasReflectiveSurface(v1) == 1) { - v0 = v1; + if (TileBehavior_HasReflectiveSurface(southTileBehavior) == TRUE) { + tileBehavior = southTileBehavior; } } - if (v0 != GetNullTileBehaviorID()) { + if (tileBehavior != GetNullTileBehaviorID()) { int v2; sub_02062F48(mapObj, 1); - if (TileBehavior_IsReflective(v0) == 1) { + if (TileBehavior_IsReflective(tileBehavior) == TRUE) { v2 = 2; - } else if (TileBehavior_IsPuddle(v0) == 1) { + } else if (TileBehavior_IsPuddle(tileBehavior) == TRUE) { v2 = 0; } else { v2 = 1; @@ -516,49 +537,45 @@ static void sub_02063D30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc } } -static void sub_02063DA8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063DA8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if ((param3->unk_04_10 == 0) || (sub_02062F64(mapObj) == 0)) { + if (param3->unk_04_10 == 0 || sub_02062F64(mapObj) == FALSE) { return; } - u8 v0 = sub_02064238(mapObj, 1); + u8 southTileBehavior = MapObject_GetTileBehaviorFromDir(mapObj, DIR_SOUTH); - if (TileBehavior_HasReflectiveSurface(v0) == 0) { + if (TileBehavior_HasReflectiveSurface(southTileBehavior) == FALSE) { sub_02062F48(mapObj, 0); } } -static void sub_02063DDC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063DDC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsBridgeStart(param1) == 1) { + if (TileBehavior_IsBridgeStart(currTileBehavior) == TRUE) { sub_02062F14(mapObj, 1); - } else if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBridge(param1) == 0) { - sub_02062F14(mapObj, 0); - } + } else if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(currTileBehavior) == FALSE) { + sub_02062F14(mapObj, 0); } } -static void sub_02063E14(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063E14(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { return; } -u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, int param5) +u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *pos, int x, int y, int z, int dir) { - u32 v0; + u32 v0 = 0; - v0 = 0; - - if (sub_02063FAC(mapObj, param2, param3, param4) == 1) { + if (MapObject_IsOutOfRange(mapObj, x, y, z) == TRUE) { v0 |= (1 << 0); } s8 v1; FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - if (sub_02055024(fieldSystem, param1, param2, param4, &v1) == 1) { + if (sub_02055024(fieldSystem, pos, x, z, &v1) == TRUE) { v0 |= (1 << 1); if (v1 != 0) { @@ -566,138 +583,134 @@ u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int } } - if (sub_02064004(mapObj, param2, param4, param5) == 1) { + if (sub_02064004(mapObj, x, z, dir) == TRUE) { v0 |= (1 << 1); } - if (sub_02063F00(mapObj, param2, param3, param4) == 1) { + if (sub_02063F00(mapObj, x, y, z) == TRUE) { v0 |= (1 << 2); } return v0; } -u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4) +u32 sub_02063E94(const MapObject *mapObj, int x, int y, int z, int dir) { - VecFx32 v0; + VecFx32 pos; - MapObject_GetPosPtr(mapObj, &v0); - return sub_02063E18(mapObj, &v0, param1, param2, param3, param4); + MapObject_GetPosPtr(mapObj, &pos); + return sub_02063E18(mapObj, &pos, x, y, z, dir); } -u32 sub_02063EBC(const MapObject *mapObj, int param1) +u32 sub_02063EBC(const MapObject *mapObj, int dir) { - int x, y, z; - - x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); - y = MapObject_GetY(mapObj); - z = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); + int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(dir); + int y = MapObject_GetY(mapObj); + int z = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(dir); - return sub_02063E94(mapObj, x, y, z, param1); + return sub_02063E94(mapObj, x, y, z, dir); } -int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) +int sub_02063F00(const MapObject *mapObj, int x, int y, int z) { - int v0, v1, v2; - const MapObjectManager *mapObjMan; - const MapObject *v4; + int maxObjects, objX, objZ; + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); + const MapObject *v4 = MapObjectMan_GetMapObjectConst(mapObjMan); - mapObjMan = MapObject_MapObjectManager(mapObj); - v4 = sub_02062868(mapObjMan); - v0 = MapObjectMan_GetMaxObjects(mapObjMan); + maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); do { if (v4 != mapObj && MapObject_CheckStatus(v4, MAP_OBJ_STATUS_0) && !MapObject_CheckStatus(v4, MAP_OBJ_STATUS_18)) { - v1 = MapObject_GetX(v4); - v2 = MapObject_GetZ(v4); + objX = MapObject_GetX(v4); + objZ = MapObject_GetZ(v4); - if ((v1 == param1) && (v2 == param3)) { - int v5 = MapObject_GetY(v4); - int v6 = v5 - param2; + if (objX == x && objZ == z) { + int objY = MapObject_GetY(v4); + int v6 = objY - y; if (v6 < 0) { v6 = -v6; } if (v6 < (1 * 2)) { - return 1; + return TRUE; } } - v1 = MapObject_GetXPrev(v4); - v2 = MapObject_GetZPrev(v4); + objX = MapObject_GetXPrev(v4); + objZ = MapObject_GetZPrev(v4); - if ((v1 == param1) && (v2 == param3)) { - int v7 = MapObject_GetY(v4); - int v8 = v7 - param2; + if (objX == x && objZ == z) { + int objY = MapObject_GetY(v4); + int v8 = objY - y; if (v8 < 0) { v8 = -v8; } if (v8 < (1 * 2)) { - return 1; + return TRUE; } } } sub_02062880(&v4); - v0--; - } while (v0); + maxObjects--; + } while (maxObjects); - return 0; + return FALSE; } -int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3) +int MapObject_IsOutOfRange(const MapObject *mapObj, int x, int y, int z) { - int v0, v1, v2, v3; + int initialPos, movementRange, minPos, maxPos; - v0 = MapObject_GetXInitial(mapObj); - v1 = MapObject_GetMovementRangeX(mapObj); + initialPos = MapObject_GetXInitial(mapObj); + movementRange = MapObject_GetMovementRangeX(mapObj); - if (v1 != -1) { - v2 = v0 - v1; - v3 = v0 + v1; + if (movementRange != -1) { + minPos = initialPos - movementRange; + maxPos = initialPos + movementRange; - if ((v2 > param1) || (v3 < param1)) { - return 1; + if (minPos > x || maxPos < x) { + return TRUE; } } - v0 = MapObject_GetZInitial(mapObj); - v1 = MapObject_GetMovementRangeZ(mapObj); + initialPos = MapObject_GetZInitial(mapObj); + movementRange = MapObject_GetMovementRangeZ(mapObj); - if (v1 != -1) { - v2 = v0 - v1; - v3 = v0 + v1; + if (movementRange != -1) { + minPos = initialPos - movementRange; + maxPos = initialPos + movementRange; - if ((v2 > param3) || (v3 < param3)) { - return 1; + if (minPos > z || maxPos < z) { + return TRUE; } } - return 0; + return FALSE; } -int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3) +int sub_02064004(const MapObject *mapObj, int x, int z, int dir) { - if (sub_02062FDC(mapObj) == 0) { + if (sub_02062FDC(mapObj) == FALSE) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - u8 v1 = sub_02062BE8(mapObj); - u8 v2 = FieldSystem_GetTileBehavior(fieldSystem, param1, param2); + u8 v1 = MapObject_GetCurrTileBehavior(mapObj); + u8 v2 = FieldSystem_GetTileBehavior(fieldSystem, x, z); if (v2 == GetNullTileBehaviorID()) { - return 1; + return TRUE; } - if ((Unk_020EE76C[param3](v1) == 1) || (Unk_020EE77C[param3](v2) == 1)) { - return 1; + if (Unk_020EE76C[dir](v1) == TRUE || Unk_020EE77C[dir](v2) == TRUE) { + return TRUE; } } - return 0; + return FALSE; } static BOOL (*const Unk_020EE76C[4])(u8) = { @@ -714,120 +727,114 @@ static BOOL (*const Unk_020EE77C[4])(u8) = { TileBehavior_BlocksMovementWestward }; -int sub_0206406C(MapObject *mapObj, u32 param1) +int MapObject_IsOnWater(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverWater(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (TileBehavior_IsBridgeOverWater(tileBehavior)) { + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } - } else if (TileBehavior_IsSurfable(param1)) { - return 1; + } else if (TileBehavior_IsSurfable(tileBehavior)) { + return TRUE; } - return 0; + return FALSE; } -int sub_020640A0(MapObject *mapObj, u32 param1) +int MapObject_IsOnSand(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSand(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (TileBehavior_IsBridgeOverSand(tileBehavior)) { + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } - } else if (TileBehavior_IsSand(param1)) { - return 1; + } else if (TileBehavior_IsSand(tileBehavior)) { + return TRUE; } - return 0; + return FALSE; } -int MapObject_IsOnSnow(MapObject *mapObj, u32 param1) +int MapObject_IsOnSnow(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSnow(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (TileBehavior_IsBridgeOverSnow(tileBehavior)) { + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } - } else if (TileBehavior_IsSnow(param1)) { - return 1; + } else if (TileBehavior_IsSnow(tileBehavior)) { + return TRUE; } - return 0; + return FALSE; } -int sub_02064108(MapObject *mapObj, u32 param1) +int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSnow(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (TileBehavior_IsBridgeOverSnow(tileBehavior)) { + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } - } else if (TileBehavior_IsShallowSnow(param1)) { - return 1; + } else if (TileBehavior_IsShallowSnow(tileBehavior)) { + return TRUE; } - return 0; + return FALSE; } -int sub_0206413C(MapObject *mapObj, u32 param1) +int MapObject_IsOnBridge(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBridge(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(tileBehavior) == TRUE) { + return TRUE; } - return 0; + return FALSE; } -int sub_0206415C(MapObject *mapObj, u32 param1) +int MapObject_IsOnBikeBridgeNorthSouth(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBikeBridgeNorthSouth(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(tileBehavior) == TRUE) { + return TRUE; } - return 0; + return FALSE; } -int sub_0206417C(MapObject *mapObj, u32 param1) +int MapObject_IsOnBikeBridgeEastWest(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBikeBridgeEastWest(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(tileBehavior) == TRUE) { + return TRUE; } - return 0; + return FALSE; } static const int sMapObjectDxDir[] = { - 0x0, - 0x0, - -1, - 0x1 + [DIR_NORTH] = 0, + [DIR_SOUTH] = 0, + [DIR_WEST] = -1, + [DIR_EAST] = 1 }; -static const int DATA_GPosY_Dir4AddTbl[] = { +static const int UNUSED_GPosY_Dir4AddTbl[] = { 0, 0, 0, 0 }; -static const int sMapObjectDyDir[] = { - -1, - 0x1, - 0x0, - 0x0 +static const int sMapObjectDzDir[] = { + [DIR_NORTH] = -1, + [DIR_SOUTH] = 1, + [DIR_WEST] = 0, + [DIR_EAST] = 0 }; -int MapObject_GetDxFromDir(int param0) +int MapObject_GetDxFromDir(int dir) { - return sMapObjectDxDir[param0]; + return sMapObjectDxDir[dir]; } -int MapObject_GetDyFromDir(int param0) +int MapObject_GetDzFromDir(int dir) { - return sMapObjectDyDir[param0]; + return sMapObjectDzDir[dir]; } void MapObject_StepDir(MapObject *mapObj, int dir) @@ -838,7 +845,7 @@ void MapObject_StepDir(MapObject *mapObj, int dir) MapObject_AddX(mapObj, MapObject_GetDxFromDir(dir)); MapObject_AddY(mapObj, 0); - MapObject_AddZ(mapObj, MapObject_GetDyFromDir(dir)); + MapObject_AddZ(mapObj, MapObject_GetDzFromDir(dir)); } void MapObject_UpdateCoords(MapObject *mapObj) @@ -848,14 +855,14 @@ void MapObject_UpdateCoords(MapObject *mapObj) MapObject_SetZPrev(mapObj, MapObject_GetZ(mapObj)); } -u32 sub_02064238(MapObject *mapObj, int param1) +u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int dir) { - int v0 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); - int v1 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); + int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(dir); + int z = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(dir); FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v0, v1); + u8 tileBehavior = FieldSystem_GetTileBehavior(fieldSystem, x, z); - return v3; + return tileBehavior; } void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *vec) @@ -911,7 +918,7 @@ int sub_020642F8(MapObject *mapObj) FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v4 = sub_020644D0(fieldSystem, &v1, v2); - if (v4 == 1) { + if (v4 == TRUE) { pos.y = v1.y; MapObject_SetPos(mapObj, &pos); MapObject_SetYPrev(mapObj, MapObject_GetY(mapObj)); @@ -924,32 +931,32 @@ int sub_020642F8(MapObject *mapObj) return v4; } -int sub_02064390(MapObject *mapObj) +int MapObject_SetTileBehaviors(MapObject *mapObj) { - u8 v0 = GetNullTileBehaviorID(); - u8 v1 = v0; + u8 prevTileBehavior = GetNullTileBehaviorID(); + u8 currTileBehavior = prevTileBehavior; - if (sub_02062FDC(mapObj) == 0) { - int v2 = MapObject_GetXPrev(mapObj); + if (sub_02062FDC(mapObj) == FALSE) { + int x = MapObject_GetXPrev(mapObj); int z = MapObject_GetZPrev(mapObj); FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - v0 = FieldSystem_GetTileBehavior(fieldSystem, v2, z); - v2 = MapObject_GetX(mapObj); + prevTileBehavior = FieldSystem_GetTileBehavior(fieldSystem, x, z); + x = MapObject_GetX(mapObj); z = MapObject_GetZ(mapObj); - v1 = FieldSystem_GetTileBehavior(fieldSystem, v2, z); + currTileBehavior = FieldSystem_GetTileBehavior(fieldSystem, x, z); } - sub_02062BF0(mapObj, v0); - sub_02062BE0(mapObj, v1); + MapObject_SetPrevTileBehavior(mapObj, prevTileBehavior); + MapObject_SetCurrTileBehavior(mapObj, currTileBehavior); - if (TileBehavior_IsNull(v1) == 1) { + if (TileBehavior_IsNull(currTileBehavior) == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_11); - return 0; + return FALSE; } MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_11); - return 1; + return TRUE; } void VecFx32_StepDirection(int dir, VecFx32 *vec, fx32 val) @@ -970,31 +977,31 @@ void VecFx32_StepDirection(int dir, VecFx32 *vec, fx32 val) } } -void sub_02064450(int param0, int param1, VecFx32 *param2) +void sub_02064450(int x, int z, VecFx32 *pos) { - param2->x = (((param0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); - param2->z = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + pos->x = ((x << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + pos->z = ((z << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); } void sub_02064464(MapObject *mapObj) { - int v0 = MapObject_GetMovementType(mapObj); + int movementType = MapObject_GetMovementType(mapObj); - if ((v0 == 0x33) || (v0 == 0x34) || (v0 == 0x35) || (v0 == 0x36)) { + if (movementType == 0x33 || movementType == 0x34 || movementType == 0x35 || movementType == 0x36) { sub_02062B14(mapObj); } } -static const int Unk_020EE79C[] = { - DIR_SOUTH, - DIR_NORTH, - DIR_EAST, - DIR_WEST +static const int sOppositeDirections[] = { + [DIR_NORTH] = DIR_SOUTH, + [DIR_SOUTH] = DIR_NORTH, + [DIR_WEST] = DIR_EAST, + [DIR_EAST] = DIR_WEST }; int Direction_GetOpposite(int dir) { - return Unk_020EE79C[dir]; + return sOppositeDirections[dir]; } int sub_02064488(int param0, int param1, int param2, int param3) @@ -1014,36 +1021,36 @@ int sub_02064488(int param0, int param1, int param2, int param3) return DIR_SOUTH; } -int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1) +int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *pos) { fx32 v0; u8 v1; - v0 = sub_02054FBC(fieldSystem, param1->y, param1->x, param1->z, &v1); + v0 = sub_02054FBC(fieldSystem, pos->y, pos->x, pos->z, &v1); if (v1 == 0) { - return 0; + return FALSE; } - param1->y = v0; - return 1; + pos->y = v0; + return TRUE; } -int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2) +int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *pos, int param2) { fx32 v0; u8 v1; - v0 = sub_02054FBC(fieldSystem, param1->y, param1->x, param1->z, &v1); + v0 = sub_02054FBC(fieldSystem, pos->y, pos->x, pos->z, &v1); if (v1 == 0) { - return 0; + return FALSE; } - if ((v1 == 2) && (param2 == 0)) { - return 0; + if (v1 == 2 && param2 == 0) { + return FALSE; } - param1->y = v0; - return 1; + pos->y = v0; + return TRUE; } diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index 35a32197d4..e59fee490a 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -2590,13 +2590,13 @@ typedef struct GymLeaderEncounterParam { u16 trainerClass; u16 unk_0A; // The rest are NARC indices - u8 unk_0C; - u8 unk_0D; - u8 unk_0E; - u8 unk_0F; - u8 unk_10; - u8 unk_11; - u8 unk_12; + u8 mugshotPlttIdx; + u8 mugshotTileIdx; + u8 mugshotCellIdx; + u8 mugshotAnimIdx; + u8 bannerPlttIdx; + u8 bannerTileIdx; + u8 bannerTilemapIdx; u8 padding; } GymLeaderEncounterParam; @@ -2608,13 +2608,13 @@ static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { .trainerID = 246, .trainerClass = TRAINER_CLASS_LEADER_ROARK, .unk_0A = 1, - .unk_0C = 55, - .unk_0D = 56, - .unk_0E = 57, - .unk_0F = 58, - .unk_10 = 15, - .unk_11 = 16, - .unk_12 = 17, + .mugshotPlttIdx = 55, + .mugshotTileIdx = 56, + .mugshotCellIdx = 57, + .mugshotAnimIdx = 58, + .bannerPlttIdx = 15, + .bannerTileIdx = 16, + .bannerTilemapIdx = 17, .padding = 0, }, { @@ -2622,13 +2622,13 @@ static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { .trainerID = 315, .trainerClass = TRAINER_CLASS_LEADER_GARDENIA, .unk_0A = 1, - .unk_0C = 59, - .unk_0D = 60, - .unk_0E = 61, - .unk_0F = 62, - .unk_10 = 18, - .unk_11 = 19, - .unk_12 = 20, + .mugshotPlttIdx = 59, + .mugshotTileIdx = 60, + .mugshotCellIdx = 61, + .mugshotAnimIdx = 62, + .bannerPlttIdx = 18, + .bannerTileIdx = 19, + .bannerTilemapIdx = 20, .padding = 0, }, { @@ -2636,13 +2636,13 @@ static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { .trainerID = 316, .trainerClass = TRAINER_CLASS_LEADER_WAKE, .unk_0A = 0, - .unk_0C = 63, - .unk_0D = 64, - .unk_0E = 65, - .unk_0F = 66, - .unk_10 = 21, - .unk_11 = 22, - .unk_12 = 23, + .mugshotPlttIdx = 63, + .mugshotTileIdx = 64, + .mugshotCellIdx = 65, + .mugshotAnimIdx = 66, + .bannerPlttIdx = 21, + .bannerTileIdx = 22, + .bannerTilemapIdx = 23, .padding = 0, }, { @@ -2650,13 +2650,13 @@ static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { .trainerID = 317, .trainerClass = TRAINER_CLASS_LEADER_MAYLENE, .unk_0A = 1, - .unk_0C = 67, - .unk_0D = 68, - .unk_0E = 69, - .unk_0F = 70, - .unk_10 = 24, - .unk_11 = 25, - .unk_12 = 26, + .mugshotPlttIdx = 67, + .mugshotTileIdx = 68, + .mugshotCellIdx = 69, + .mugshotAnimIdx = 70, + .bannerPlttIdx = 24, + .bannerTileIdx = 25, + .bannerTilemapIdx = 26, .padding = 0, }, { @@ -2664,13 +2664,13 @@ static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { .trainerID = 318, .trainerClass = TRAINER_CLASS_LEADER_FANTINA, .unk_0A = 1, - .unk_0C = 71, - .unk_0D = 72, - .unk_0E = 73, - .unk_0F = 74, - .unk_10 = 27, - .unk_11 = 28, - .unk_12 = 29, + .mugshotPlttIdx = 71, + .mugshotTileIdx = 72, + .mugshotCellIdx = 73, + .mugshotAnimIdx = 74, + .bannerPlttIdx = 27, + .bannerTileIdx = 28, + .bannerTilemapIdx = 29, .padding = 0, }, { @@ -2678,13 +2678,13 @@ static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { .trainerID = 319, .trainerClass = TRAINER_CLASS_LEADER_CANDICE, .unk_0A = 1, - .unk_0C = 75, - .unk_0D = 76, - .unk_0E = 77, - .unk_0F = 78, - .unk_10 = 30, - .unk_11 = 31, - .unk_12 = 32, + .mugshotPlttIdx = 75, + .mugshotTileIdx = 76, + .mugshotCellIdx = 77, + .mugshotAnimIdx = 78, + .bannerPlttIdx = 30, + .bannerTileIdx = 31, + .bannerTilemapIdx = 32, .padding = 0, }, { @@ -2692,13 +2692,13 @@ static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { .trainerID = 250, .trainerClass = TRAINER_CLASS_LEADER_BYRON, .unk_0A = 1, - .unk_0C = 79, - .unk_0D = 80, - .unk_0E = 81, - .unk_0F = 82, - .unk_10 = 33, - .unk_11 = 34, - .unk_12 = 35, + .mugshotPlttIdx = 79, + .mugshotTileIdx = 80, + .mugshotCellIdx = 81, + .mugshotAnimIdx = 82, + .bannerPlttIdx = 33, + .bannerTileIdx = 34, + .bannerTilemapIdx = 35, .padding = 0, }, { @@ -2706,48 +2706,48 @@ static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { .trainerID = 320, .trainerClass = TRAINER_CLASS_LEADER_VOLKNER, .unk_0A = 1, - .unk_0C = 83, - .unk_0D = 84, - .unk_0E = 85, - .unk_0F = 86, - .unk_10 = 36, - .unk_11 = 37, - .unk_12 = 38, + .mugshotPlttIdx = 83, + .mugshotTileIdx = 84, + .mugshotCellIdx = 85, + .mugshotAnimIdx = 86, + .bannerPlttIdx = 36, + .bannerTileIdx = 37, + .bannerTilemapIdx = 38, .padding = 0, }, }; typedef struct EliterFourChampionEncounterParam { - u16 unk_00; - u8 unk_02; + u16 mugshotPlttIdx; + u8 bannerPlttIdx; u8 facePanFrames; u16 trainerClass; u16 trainerID; } EliterFourChampionEncounterParam; static const EliterFourChampionEncounterParam sEliteFourChampionEncounterParams[5] = { - { .unk_00 = 87, - .unk_02 = 39, + { .mugshotPlttIdx = 87, // Narc indices of the Elite Four and Champion + .bannerPlttIdx = 39, .facePanFrames = 32, .trainerClass = TRAINER_CLASS_ELITE_FOUR_AARON, .trainerID = 261 }, - { .unk_00 = 91, - .unk_02 = 43, + { .mugshotPlttIdx = 91, + .bannerPlttIdx = 43, .facePanFrames = 32, .trainerClass = TRAINER_CLASS_ELITE_FOUR_BERTHA, .trainerID = 262 }, - { .unk_00 = 95, - .unk_02 = 44, + { .mugshotPlttIdx = 95, + .bannerPlttIdx = 44, .facePanFrames = 32, .trainerClass = TRAINER_CLASS_ELITE_FOUR_FLINT, .trainerID = 263 }, - { .unk_00 = 99, - .unk_02 = 45, + { .mugshotPlttIdx = 99, + .bannerPlttIdx = 45, .facePanFrames = 32, .trainerClass = TRAINER_CLASS_ELITE_FOUR_LUCIAN, .trainerID = 264 }, - { .unk_00 = 103, - .unk_02 = 46, + { .mugshotPlttIdx = 103, + .bannerPlttIdx = 46, .facePanFrames = 9, .trainerClass = TRAINER_CLASS_CHAMPION_CYNTHIA, .trainerID = 267 }, @@ -2909,7 +2909,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he ov5_021DE47C(&v0->unk_44, 8, 3); ov5_021DE4CC( - encEffect->narc, &v0->unk_44, &v0->unk_1E4[0], param->unk_0C, 1, param->unk_0D, param->unk_0E, param->unk_0F, 600000); + encEffect->narc, &v0->unk_44, &v0->unk_1E4[0], param->mugshotPlttIdx, 1, param->mugshotTileIdx, param->mugshotCellIdx, param->mugshotAnimIdx, 600000); ov5_021DE4CC( encEffect->narc, &v0->unk_44, &v0->unk_1E4[1], 51, 1, 52, 53, 54, 600000 + 1); @@ -2942,7 +2942,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he case 3: ov5_021DE3D0( - encEffect->narc, param->unk_12, param->unk_11, param->unk_10, 0, 1, encEffect->fieldSystem->bgConfig, 3); + encEffect->narc, param->bannerTilemapIdx, param->bannerTileIdx, param->bannerPlttIdx, 0, 1, encEffect->fieldSystem->bgConfig, 3); v0->unk_2F0 = 1; ov5_021DED20(encEffect, v0->unk_40, 6, 8, 16, (GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), (GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_OBJ)); @@ -3229,10 +3229,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H } ov5_021DE4CC( - encEffect->narc, &v0->unk_5C, &v0->unk_1FC[1], param->unk_00, 1, param->unk_00 + 1, param->unk_00 + 2, param->unk_00 + 3, 600000 + 1); + encEffect->narc, &v0->unk_5C, &v0->unk_1FC[1], param->mugshotPlttIdx, 1, param->mugshotPlttIdx + 1, param->mugshotPlttIdx + 2, param->mugshotPlttIdx + 3, 600000 + 1); ov5_021DE4CC( - encEffect->narc, &v0->unk_5C, &v0->unk_1FC[2], param->unk_02, 0xC, 40, 41, 42, 600000 + 2); + encEffect->narc, &v0->unk_5C, &v0->unk_1FC[2], param->bannerPlttIdx, 0xC, 40, 41, 42, 600000 + 2); ov5_021DE4CC( encEffect->narc, &v0->unk_5C, &v0->unk_1FC[3], 51, 1, 52, 53, 54, 600000 + 3); diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index ff07fd7560..74951a597c 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -842,7 +842,7 @@ static void ov5_021D1878(FieldSystem *fieldSystem) ov5_021DF488(fieldSystem->unk_40, 4, 32, 32, 32, 32, (0x500 * (32 / 2)), (0x80 * (32 / 2)), (0x800 * 32)); if ((fieldSystem->mapLoadType == MAP_LOAD_TYPE_UNDERGROUND) || (fieldSystem->mapLoadType == MAP_LOAD_TYPE_UNION)) { - sub_02062CCC(fieldSystem->mapObjMan, 0); + MapObjectMan_SetEndMovement(fieldSystem->mapObjMan, 0); } { diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index 5e354c6b73..b63f1c50bf 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -643,7 +643,7 @@ static BOOL ov5_021E0160(FieldTask *taskMan) case 2: { if (PlayerAvatar_MapDistortionState(v0->playerAvatar) == AVATAR_DISTORTION_STATE_NONE) { int v1 = Player_GetXPos(v0->playerAvatar) + MapObject_GetDxFromDir(v0->unk_04); - int v2 = Player_GetZPos(v0->playerAvatar) + MapObject_GetDyFromDir(v0->unk_04); + int v2 = Player_GetZPos(v0->playerAvatar) + MapObject_GetDzFromDir(v0->unk_04); v0->unk_28 = ov5_021F261C(v0->unk_24, v1, v2, v0->unk_04, 0); } else { int v3 = MapObject_GetX(v0->unk_24); @@ -824,7 +824,7 @@ static int ov5_021E04EC(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, in { MapObject *v0 = Player_MapObject(playerAvatar); - u8 v1 = sub_02062BE8(v0); + u8 v1 = MapObject_GetCurrTileBehavior(v0); if ((TileBehavior_IsDeepMud(v1) != 1) && (TileBehavior_IsDeepMudWithGrass(v1) != 1)) { return 0; @@ -883,7 +883,7 @@ static BOOL ov5_021E0560(FieldTask *param0) v0->unk_04++; { - u8 v7 = sub_02062BE8(v1); + u8 v7 = MapObject_GetCurrTileBehavior(v1); if (TileBehavior_IsDeepMudWithGrass(v7) == 1) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0); @@ -1037,7 +1037,7 @@ static int ov5_021E07E4(UnkStruct_ov5_021F9B54 *param0) static int ov5_021E07FC(UnkStruct_ov5_021F9B54 *param0) { int v0 = Player_GetXPos(param0->playerAvatar) + MapObject_GetDxFromDir(param0->unk_04); - int v1 = Player_GetZPos(param0->playerAvatar) + MapObject_GetDyFromDir(param0->unk_04); + int v1 = Player_GetZPos(param0->playerAvatar) + MapObject_GetDzFromDir(param0->unk_04); param0->unk_18 = ov5_021F28F4(param0->unk_14, v0, v1, param0->unk_04, 0); param0->unk_2C = ov6_0224892C(param0->fieldSystem); @@ -1090,7 +1090,7 @@ static int ov5_021E08C0(UnkStruct_ov5_021F9B54 *param0) { int v0 = MapObject_GetMovingDir(param0->unk_14); - u8 v1 = sub_02064238(param0->unk_14, v0); + u8 v1 = MapObject_GetTileBehaviorFromDir(param0->unk_14, v0); if (ov5_021E0760(v1, v0) == 1) { param0->unk_00 = 5; @@ -1220,7 +1220,7 @@ static int ov5_021E0A68(UnkStruct_ov5_021F9B10 *param0) VecFx32 v2, v3; v0 = MapObject_GetX(param0->unk_3C) + (MapObject_GetDxFromDir(0) << 1); - v1 = MapObject_GetZ(param0->unk_3C) + (MapObject_GetDyFromDir(0) << 1); + v1 = MapObject_GetZ(param0->unk_3C) + (MapObject_GetDzFromDir(0) << 1); sub_02064450(v0, v1, ¶m0->unk_28); sub_020644A4(param0->fieldSystem, ¶m0->unk_28); @@ -1345,7 +1345,7 @@ static int ov5_021E0C34(UnkStruct_ov5_021F9B10 *param0) VecFx32 v2, v3; v0 = MapObject_GetX(param0->unk_3C) + (MapObject_GetDxFromDir(1) << 1); - v1 = MapObject_GetZ(param0->unk_3C) + (MapObject_GetDyFromDir(1) << 1); + v1 = MapObject_GetZ(param0->unk_3C) + (MapObject_GetDzFromDir(1) << 1); sub_02064450(v0, v1, ¶m0->unk_28); sub_020644A4(param0->fieldSystem, ¶m0->unk_28); @@ -1640,7 +1640,7 @@ static SysTask *ov5_021E0F54(FieldSystem *fieldSystem, u32 param1) v4->playerAvatar = playerAvatar; v4->unk_04 = v1; - sub_02062DDC(v3); + MapObject_SetPauseMovementOff(v3); PlayerAvatar_SetRequestStateBit(playerAvatar, param1); PlayerAvatar_RequestChangeState(playerAvatar); @@ -1750,7 +1750,7 @@ static void ov5_021E10C0(void *param0, const UnkStruct_020216E0 *param1) static MapObject *ov5_021E10D4(PlayerAvatar *playerAvatar, int param1) { int v0 = Player_GetXPos(playerAvatar) + MapObject_GetDxFromDir(param1); - int v1 = Player_GetZPos(playerAvatar) + MapObject_GetDyFromDir(param1); + int v1 = Player_GetZPos(playerAvatar) + MapObject_GetDzFromDir(param1); const MapObjectManager *v2 = MapObject_MapObjectManager(Player_MapObject(playerAvatar)); MapObject *v3 = sub_0206326C(v2, v0, v1, 0); diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c index b40e055f9e..ed66677bbd 100644 --- a/src/overlay005/ov5_021E1154.c +++ b/src/overlay005/ov5_021E1154.c @@ -34,7 +34,7 @@ static void ov5_021E1350(void *param0); int ov5_021E1154(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2) { MapObject *v0 = Player_MapObject(playerAvatar); - u8 v1 = sub_02062BE8(v0); + u8 v1 = MapObject_GetCurrTileBehavior(v0); int v2; if (TileBehavior_IsSlideEastward(v1) == 1) { @@ -85,7 +85,7 @@ static BOOL ov5_021E120C(FieldTask *param0) { UnkStruct_ov5_021E11B0 *v0 = FieldTask_GetEnv(param0); MapObject *v1 = Player_MapObject(v0->playerAvatar); - u8 v2 = sub_02062BE8(v1); + u8 v2 = MapObject_GetCurrTileBehavior(v1); switch (v0->unk_08) { case 0: diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c index e9dbea711b..a212bb4510 100644 --- a/src/overlay005/ov5_021E135C.c +++ b/src/overlay005/ov5_021E135C.c @@ -87,7 +87,7 @@ static void ov5_021E1470(SysTask *param0, void *param1) switch (v0->unk_08) { case 0: { - sub_02062DDC(v1); + MapObject_SetPauseMovementOff(v1); sub_0206309C(v1, &v2); v3 = (20 - v0->unk_0C); v2.y = ((FX32_ONE * 2.2) + ((FX32_ONE / 2) * v3)) * v3; diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c index af65cb9407..5d6470c193 100644 --- a/src/overlay005/ov5_021ECC20.c +++ b/src/overlay005/ov5_021ECC20.c @@ -24,7 +24,7 @@ void ov5_021ECC20(MapObjectManager *param0, int param1, int param2, const int *p int v0, v1; UnkStruct_ov5_021ED0A4 *v2; - GF_ASSERT(sub_0206284C(param0, (1 << 0)) == 0); + GF_ASSERT(MapObjectMan_CheckStatus(param0, (1 << 0)) == 0); ov5_021ECCA4(param0); @@ -33,7 +33,7 @@ void ov5_021ECC20(MapObjectManager *param0, int param1, int param2, const int *p v2 = sub_0206285C(param0); ov5_021ECE40(v2, param0, v0, v1, param1, param2, param3, param4); - sub_02062838(param0, (1 << 0)); + MapObjectMan_SetStatusFlagOn(param0, (1 << 0)); } void ov5_021ECC78(MapObjectManager *param0) @@ -45,19 +45,19 @@ void ov5_021ECC78(MapObjectManager *param0) ov5_021ECE94(sub_0206285C(param0)); - sub_02062840(param0, (1 << 0)); + MapObjectMan_SetStatusFlagOff(param0, (1 << 0)); ov5_021ECCBC(param0); } static void ov5_021ECCA4(MapObjectManager *param0) { NARC *v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, 4); - sub_0206289C(param0, v0); + MapObjectMan_SetNARC(param0, v0); } static void ov5_021ECCBC(MapObjectManager *param0) { - NARC *v0 = sub_020628A0(param0); + NARC *v0 = MapObjectMan_GetNARC(param0); NARC_dtor(v0); } @@ -65,7 +65,7 @@ void MapObject_Draw(MapObject *param0) { const MapObjectManager *v0 = MapObject_MapObjectManager(param0); - if (sub_0206284C(v0, (1 << 2))) { + if (MapObjectMan_CheckStatus(v0, (1 << 2))) { return; } @@ -120,7 +120,7 @@ int ov5_021ECD38(const MapObject *param0) void *ov5_021ECD68(const MapObjectManager *param0, u32 param1, int param2) { void *v0; - NARC *v1 = sub_020628A0(param0); + NARC *v1 = MapObjectMan_GetNARC(param0); u32 v2 = NARC_GetMemberSize(v1, param1); if (param2 == 1) { diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index 202bd482df..d9f01b9a37 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -471,7 +471,7 @@ static int ov5_021ED1C8(const MapObjectManager *param0, const MapObject *param1, const MapObject *v2; v0 = MapObjectMan_GetMaxObjects(param0); - v2 = sub_02062868(param0); + v2 = MapObjectMan_GetMapObjectConst(param0); do { if (v2 != param1) { @@ -555,7 +555,7 @@ static int ov5_021ED2E8(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_ov5_021F06D8 * GF_ASSERT(v0 != NULL); { - NARC *v1 = sub_020628A0(param0->unk_104); + NARC *v1 = MapObjectMan_GetNARC(param0->unk_104); ov5_021F0784(param1, param2, v1, v0->unk_04, 0); } @@ -2034,7 +2034,7 @@ static UnkStruct_020216E0 *ov5_021EE454(MapObject *param0, int param1, UnkFuncPt VecFx32 v12; int v13; int v14 = sub_02062758(param0, 2); - u8 v15 = sub_02064238(param0, 1); + u8 v15 = MapObject_GetTileBehaviorFromDir(param0, 1); if (TileBehavior_IsReflective(v15) == 1) { v13 = 2; diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index 69812ef0f9..e768184251 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -192,7 +192,7 @@ static void ov5_021F0A04(SysTask *task, void *param1) static int ov5_021F0A30(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { ov5_021F0D6C(param0); - sub_02062DDC(param2); + MapObject_SetPauseMovementOff(param2); param0->unk_0C = 1; return 1; diff --git a/src/overlay005/ov5_021F134C.c b/src/overlay005/ov5_021F134C.c index d57142d568..b792d54a9c 100644 --- a/src/overlay005/ov5_021F134C.c +++ b/src/overlay005/ov5_021F134C.c @@ -258,7 +258,7 @@ static void ov5_021F1604(UnkStruct_ov101_021D5D90 *param0, void *param1) return; } - if (sub_02062CBC(v1, (1 << 3))) { + if (MapObject_CheckManagerStatus(v1, (1 << 3))) { ov5_021DF74C(param0); return; } diff --git a/src/overlay005/ov5_021F17B8.c b/src/overlay005/ov5_021F17B8.c index 926675b689..045528c1be 100644 --- a/src/overlay005/ov5_021F17B8.c +++ b/src/overlay005/ov5_021F17B8.c @@ -227,7 +227,7 @@ static void ov5_021F1978(UnkStruct_ov101_021D5D90 *param0, void *param1) return; } - if (sub_02062D58(v1) == 1) { + if (MapObject_IsHidden(v1) == 1) { sub_02021320(v0->unk_24, 0); } else { sub_02021320(v0->unk_24, 1); diff --git a/src/overlay005/ov5_021F47B0.c b/src/overlay005/ov5_021F47B0.c index 2d8d44fd0b..b060540dae 100644 --- a/src/overlay005/ov5_021F47B0.c +++ b/src/overlay005/ov5_021F47B0.c @@ -272,7 +272,7 @@ static int ov5_021F4AB4(const MapObject *param0, int param1, VecFx32 *param2) for (v2 = 0; v2 < param1; v2++) { v4 += MapObject_GetDxFromDir(v3); - v6 += MapObject_GetDyFromDir(v3); + v6 += MapObject_GetDzFromDir(v3); v0 = sub_02063E18(param0, &v1, v4, v5, v6, v3); diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c index dc6f55e21b..6e69b368be 100644 --- a/src/overlay005/ov5_021F61BC.c +++ b/src/overlay005/ov5_021F61BC.c @@ -140,7 +140,7 @@ static void ov5_021F62A0(UnkStruct_ov101_021D5D90 *param0, void *param1) v0 = v1->unk_04; - v1->unk_08 = sub_02062BE8(v3); + v1->unk_08 = MapObject_GetCurrTileBehavior(v3); v1->unk_04 = ov5_021F6414(v1->unk_08); v1->unk_00 = 0; @@ -159,7 +159,7 @@ static void ov5_021F62A0(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v4, v5; int v6 = MapObject_GetX(v3) + MapObject_GetDxFromDir(v1->unk_04); - int v7 = MapObject_GetZ(v3) + MapObject_GetDyFromDir(v1->unk_04); + int v7 = MapObject_GetZ(v3) + MapObject_GetDzFromDir(v1->unk_04); sub_02064450(v6, v7, &v5); MapObject_GetPosPtr(v3, &v4); diff --git a/src/overlay005/vs_seeker.c b/src/overlay005/vs_seeker.c index 0606370a78..d2339d0d68 100644 --- a/src/overlay005/vs_seeker.c +++ b/src/overlay005/vs_seeker.c @@ -820,10 +820,10 @@ static BOOL VsSeeker_WaitForNpcsToPause(FieldSystem *fieldSystem) } if (MapObject_IsMoving(mapObj) == TRUE) { - sub_02062DDC(mapObj); + MapObject_SetPauseMovementOff(mapObj); anyMoving = TRUE; } else { - sub_02062DD0(mapObj); + MapObject_SetPauseMovementOn(mapObj); } } diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 2efa1dc379..c007cbb8ec 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -3053,7 +3053,7 @@ static void ov6_02245F64(UnkStruct_ov6_02243FFC *param0, int param1) { MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); - sub_02062DDC(v0); + MapObject_SetPauseMovementOff(v0); MapObject_SetHidden(v0, param1); } diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c index 5eb305bb24..1c4995ab95 100644 --- a/src/overlay006/ov6_022489E4.c +++ b/src/overlay006/ov6_022489E4.c @@ -269,7 +269,7 @@ BOOL ov6_02248CE8(UnkStruct_02095C48 *param0, int param1, const Strbuf *param2) v0 = 8 * sizeof(u16); v1 = 4; - Strbuf_ToChars(param2, v4, 8); + Strbuf_ToChars(param2, v4, 8); // Possibly TRAINER_NAME_LEN + 1 v2 = Heap_AllocFromHeap(20, v0 + v1); MI_CpuCopy8(v4, &v2[v1], v0); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 892676f766..1031fd291d 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -3176,7 +3176,7 @@ static u32 ov8_0224BA0C(UnkStruct_ov8_0224B8D0 *param0, int param1, int param2, } param1 += MapObject_GetDxFromDir(param3); - param2 += MapObject_GetDyFromDir(param3); + param2 += MapObject_GetDzFromDir(param3); v2 = ov8_0224B9D8(param1, param2); @@ -3204,7 +3204,7 @@ static u32 ov8_0224BAA0(UnkStruct_ov8_0224B8D0 *param0, int param1, int param2, do { param1 += MapObject_GetDxFromDir(param3); - param2 += MapObject_GetDyFromDir(param3); + param2 += MapObject_GetDzFromDir(param3); (*param4)++; v0 = ov8_0224BA0C(param0, param1, param2, param3); } while (v0 == 0); @@ -3355,7 +3355,7 @@ static int ov8_0224BCA8(UnkStruct_ov8_0224C098 *param0) param0->unk_14 = (((param0->unk_30) >> 4) / FX32_ONE); v0->unk_08.unk_00 += MapObject_GetDxFromDir(param0->unk_08); - v0->unk_08.unk_04 += MapObject_GetDyFromDir(param0->unk_08); + v0->unk_08.unk_04 += MapObject_GetDzFromDir(param0->unk_08); v1 = ov8_0224BA0C(param0->unk_3C, v0->unk_08.unk_00, v0->unk_08.unk_04, param0->unk_08); @@ -3378,7 +3378,7 @@ static int ov8_0224BCA8(UnkStruct_ov8_0224C098 *param0) param0->unk_00 = 8; } } else { - param0->unk_38 = ov8_0224B878(param0->unk_3C, v0->unk_08.unk_00 + MapObject_GetDxFromDir(param0->unk_08), v0->unk_08.unk_04 + MapObject_GetDyFromDir(param0->unk_08)); + param0->unk_38 = ov8_0224B878(param0->unk_3C, v0->unk_08.unk_00 + MapObject_GetDxFromDir(param0->unk_08), v0->unk_08.unk_04 + MapObject_GetDzFromDir(param0->unk_08)); GF_ASSERT(param0->unk_38 != NULL); param0->unk_04 = 0; param0->unk_00 = 4; @@ -3575,7 +3575,7 @@ static void ov8_0224BFCC(FieldSystem *fieldSystem, UnkStruct_ov8_0224C098 *param GF_ASSERT(v3->unk_24); v3->unk_18 = v0 + (MapObject_GetDxFromDir(param3) * v3->unk_24); - v3->unk_1C = v1 + (MapObject_GetDyFromDir(param3) * v3->unk_24); + v3->unk_1C = v1 + (MapObject_GetDzFromDir(param3) * v3->unk_24); v0 = Player_GetXPos(fieldSystem->playerAvatar); v1 = Player_GetZPos(fieldSystem->playerAvatar); @@ -3739,7 +3739,7 @@ void ov8_0224C198(FieldSystem *fieldSystem) ov8_0224C3B4(v2); ov5_021DF4A8(fieldSystem->unk_40, 32); - sub_02062CCC(fieldSystem->mapObjMan, 0); + MapObjectMan_SetEndMovement(fieldSystem->mapObjMan, 0); { int v3 = 0xd2; diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index e2335bb253..f6ebe4cda9 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -1575,7 +1575,7 @@ static void ov9_02249F84(UnkStruct_ov9_02249B04 *param0) static void ov9_02249F88(UnkStruct_ov9_02249B04 *param0) { - sub_02062CCC(param0->fieldSystem->mapObjMan, 0); + MapObjectMan_SetEndMovement(param0->fieldSystem->mapObjMan, 0); } static void ov9_02249F98(UnkStruct_ov9_02249B04 *param0) @@ -7191,7 +7191,7 @@ static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 *param0, MapObject **param1, con if (v0 == NULL) { UnkStruct_020216E0 *v1; - MapObject_SetPosDir(*param1, param2->unk_08.x, (((param2->unk_08.y) >> 3) / FX32_ONE), param2->unk_08.z, param2->unk_08.dir); + MapObject_SetPosDirFromCoords(*param1, param2->unk_08.x, (((param2->unk_08.y) >> 3) / FX32_ONE), param2->unk_08.z, param2->unk_08.dir); v1 = ov5_021EB1A0(*param1); @@ -7380,7 +7380,7 @@ BOOL ov9_0224F240(const MapObject *param0, int param1) v0 = MapObject_GetX(param0); v1 = MapObject_GetZ(param0); v0 += MapObject_GetDxFromDir(param1); - v1 += MapObject_GetDyFromDir(param1); + v1 += MapObject_GetDzFromDir(param1); return ov9_0224F1F8(v3, v0, v1, &v2); } @@ -7455,7 +7455,7 @@ static BOOL ov9_0224F324(UnkStruct_ov9_0224F6EC *param0) Sound_PlayEffect(1571); v1.y = ((115 << 4) * FX32_ONE); - sub_020632D4(v2, &v1, MapObject_GetFacingDir(v2)); + MapObject_SetPosDirFromVec(v2, &v1, MapObject_GetFacingDir(v2)); sub_02062914(v2, 580); { @@ -7556,7 +7556,7 @@ static BOOL ov9_0224F3BC(UnkStruct_ov9_0224F6EC *param0) v8 += MapObject_GetDxFromDir(v7); v9 -= (2 * 2); - v10 += MapObject_GetDyFromDir(v7); + v10 += MapObject_GetDzFromDir(v7); MapObject_SetX(v6, v8); MapObject_SetY(v6, v9); diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c index e6fb68d539..0f1db70654 100644 --- a/src/overlay013/ov13_02227288.c +++ b/src/overlay013/ov13_02227288.c @@ -168,7 +168,7 @@ static void ov13_022273CC(UnkStruct_ov13_02227244 *param0) ov13_02227374(param0, 3, 6, FONT_SUBSCREEN, 8, TEXT_COLOR(3, 2, 1)); if (param0->unk_00->unk_20 != 0) { - Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 8); + Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 8); // Possibly TRAINER_NAME_LEN + 1 Text_AddPrinterWithParamsAndColor(¶m0->unk_2C[4], FONT_SUBSCREEN, v1, 0, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL); Strbuf_Free(v1); diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index 59ee8b8cf5..ec2a6ff8bd 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -1815,7 +1815,7 @@ static void ov23_022448FC(int param0) v0 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_00; v1 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_02; v0 = v0 + MapObject_GetDxFromDir(v2); - v1 = v1 + MapObject_GetDyFromDir(v2); + v1 = v1 + MapObject_GetDzFromDir(v2); CommPlayer_SendXZPos(0, v0, v1); } @@ -1832,7 +1832,7 @@ static BOOL ov23_0224495C(int param0, BOOL param1) if (!param1) { v2 = v2 + MapObject_GetDxFromDir(v4); - v3 = v3 + MapObject_GetDyFromDir(v4); + v3 = v3 + MapObject_GetDzFromDir(v4); } if ((v0 == v2) && (v1 == v3)) { diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c index d14b48f7d8..5de6e38a23 100644 --- a/src/overlay023/ov23_0224A1D0.c +++ b/src/overlay023/ov23_0224A1D0.c @@ -724,7 +724,7 @@ void ov23_0224ADB0(int param0, int param1, int param2, int param3) CommPlayerLocation *v1 = &v0->playerLocationServer[param0]; v1->x = param1 + MapObject_GetDxFromDir(param3); - v1->z = param2 + MapObject_GetDyFromDir(param3); + v1->z = param2 + MapObject_GetDzFromDir(param3); v1->dir = param3; } diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index 33541dc683..022022aa35 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -702,7 +702,7 @@ static void ov23_0224B844(int param0, int param1, BOOL param2) ov23_0224ADB0(param1, v2, v3, v4); v2 += MapObject_GetDxFromDir(v4); - v3 += MapObject_GetDyFromDir(v4); + v3 += MapObject_GetDzFromDir(v4); v0.unk_00 = v2; v0.unk_02 = v3; @@ -2645,7 +2645,7 @@ BOOL ov23_0224D9AC(int param0, BOOL param1) GF_ASSERT((v2 != 0) && (v3 != 0)); v2 += MapObject_GetDxFromDir(v4); - v3 += MapObject_GetDyFromDir(v4); + v3 += MapObject_GetDzFromDir(v4); Unk_ov23_022577AC->unk_13D6 = 0; diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index f116997f48..d23d664f6d 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -68,7 +68,7 @@ BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_022565 v0->unk_30 = ov25_02254664(); v0->unk_B4 = MessageLoader_Init(1, 26, 624, 8); v0->unk_B8 = MessageLoader_Init(1, 26, 456, 8); - v0->unk_BC = Strbuf_Init(128, 8); + v0->unk_BC = Strbuf_Init(128, 8); // Possibly TRAINER_NAME_LEN + 1 ov43_022565B4(v0); *param0 = v0; diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index e93bdaf3a5..66d6a2d126 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -42,7 +42,7 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int param2) v8 = Heap_AllocFromHeap(param2, sizeof(u16) * v9); for (v4 = 0; v4 < v2; v4++) { - for (v10 = 8 - 1; v10 > -1; v10--) { + for (v10 = TRAINER_NAME_LEN; v10 > -1; v10--) { if (param1->trainer[v4].name[v10] == 0xffff) { break; } @@ -50,7 +50,7 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int param2) if (v10 == -1) { ov62_0224856C(v7, param2); - Strbuf_ToChars(v7, param1->trainer[v4].name, 8); + Strbuf_ToChars(v7, param1->trainer[v4].name, TRAINER_NAME_LEN + 1); continue; } @@ -59,7 +59,7 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int param2) if (Font_AreAllCharsValid(FONT_SYSTEM, v6, v7) == 0) { ov62_0224856C(v7, param2); - Strbuf_ToChars(v7, param1->trainer[v4].name, 8); + Strbuf_ToChars(v7, param1->trainer[v4].name, TRAINER_NAME_LEN + 1); continue; } } diff --git a/src/player_avatar.c b/src/player_avatar.c index 0ec6ba3f12..5f2a13401b 100644 --- a/src/player_avatar.c +++ b/src/player_avatar.c @@ -530,7 +530,7 @@ void sub_0205ECB8(PlayerAvatar *playerAvatar, const VecFx32 *param1, int param2) { MapObject *mapObj = Player_MapObject(playerAvatar); - sub_020632D4(mapObj, param1, param2); + MapObject_SetPosDirFromVec(mapObj, param1, param2); sub_0205EB08(playerAvatar, 0); sub_0205EB10(playerAvatar, 0); } @@ -539,7 +539,7 @@ void sub_0205ECE0(PlayerAvatar *playerAvatar, int param1, int param2, int param3 { MapObject *mapObj = Player_MapObject(playerAvatar); - MapObject_SetPosDir(mapObj, param1, 0, param2, param3); + MapObject_SetPosDirFromCoords(mapObj, param1, 0, param2, param3); sub_0205EB08(playerAvatar, 0); sub_0205EB10(playerAvatar, 0); } diff --git a/src/scrcmd.c b/src/scrcmd.c index 2e9092e0e6..37e3966f08 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -3108,7 +3108,7 @@ static BOOL ScrCmd_LockAll(ScriptContext *ctx) && SystemFlag_CheckHasPartner(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1 && MapObject_IsMoving(object) != FALSE) { - sub_02062DDC(object); + MapObject_SetPauseMovementOff(object); ScriptContext_Pause(ctx, sub_020410CC); return TRUE; } @@ -3148,12 +3148,12 @@ static BOOL sub_02041004(ScriptContext *ctx) MapObject *v2 = Player_MapObject(fieldSystem->playerAvatar); if (inline_020410F4_1(1 << 0) && (LocalMapObj_CheckAnimationFinished(v2) == 1)) { - sub_02062DD0(v2); + MapObject_SetPauseMovementOn(v2); inline_020410F4_3(1 << 0); } if (inline_020410F4_1(1 << 2) && (MapObject_IsMoving(*v1) == 0)) { - sub_02062DD0(*v1); + MapObject_SetPauseMovementOn(*v1); inline_020410F4_3(1 << 2); } @@ -3161,7 +3161,7 @@ static BOOL sub_02041004(ScriptContext *ctx) MapObject *v3 = sub_02062570(fieldSystem->mapObjMan, 0x30); if (MapObject_IsMoving(v3) == 0) { - sub_02062DD0(v3); + MapObject_SetPauseMovementOn(v3); inline_020410F4_3(1 << 1); } } @@ -3170,7 +3170,7 @@ static BOOL sub_02041004(ScriptContext *ctx) MapObject *v4 = sub_02069EB8(*v1); if (MapObject_IsMoving(v4) == 0) { - sub_02062DD0(v4); + MapObject_SetPauseMovementOn(v4); inline_020410F4_3(1 << 3); } } @@ -3188,7 +3188,7 @@ static BOOL sub_020410CC(ScriptContext *ctx) MapObject *v1 = sub_02062570(fieldSystem->mapObjMan, 0x30); if (MapObject_IsMoving(v1) == 0) { - sub_02062DD0(v1); + MapObject_SetPauseMovementOn(v1); return 1; } @@ -3209,25 +3209,25 @@ static BOOL ScrCmd_LockLastTalked(ScriptContext *ctx) if (LocalMapObj_CheckAnimationFinished(player) == FALSE) { inline_020410F4_2(1 << 0); - sub_02062DDC(player); + MapObject_SetPauseMovementOff(player); } if (MapObject_IsMoving(*v1) != FALSE) { inline_020410F4_2(1 << 2); - sub_02062DDC(*v1); + MapObject_SetPauseMovementOff(*v1); } if (v3) { if (SystemFlag_CheckHasPartner(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1 && MapObject_IsMoving(v3) != FALSE) { inline_020410F4_2(1 << 1); - sub_02062DDC(v3); + MapObject_SetPauseMovementOff(v3); } } if (v4) { if (MapObject_IsMoving(v4) != FALSE) { inline_020410F4_2(1 << 3); - sub_02062DDC(v4); + MapObject_SetPauseMovementOff(v4); } } @@ -3250,9 +3250,9 @@ static BOOL ScrCmd_062(ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_ReadHalfWord(ctx)); - sub_02062DD0(mapObj); + MapObject_SetPauseMovementOn(mapObj); - return 0; + return FALSE; } static BOOL ScrCmd_063(ScriptContext *ctx) @@ -3261,9 +3261,9 @@ static BOOL ScrCmd_063(ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_ReadHalfWord(ctx)); - sub_02062DDC(mapObj); + MapObject_SetPauseMovementOff(mapObj); - return 0; + return FALSE; } static BOOL ScrCmd_064(ScriptContext *ctx) @@ -3278,7 +3278,7 @@ static BOOL ScrCmd_064(ScriptContext *ctx) GF_ASSERT(FALSE); } - return 0; + return FALSE; } static BOOL ScrCmd_065(ScriptContext *ctx) @@ -5632,7 +5632,7 @@ static BOOL ScrCmd_187(ScriptContext *ctx) v0 = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, v1); - MapObject_SetPosDir(v0, v2, v3, v4, v5); + MapObject_SetPosDirFromCoords(v0, v2, v3, v4, v5); sub_020642F8(v0); return 0; diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c index ed6aabb2ca..73431f932c 100644 --- a/src/unk_020298BC.c +++ b/src/unk_020298BC.c @@ -144,7 +144,7 @@ static void sub_02029990(UnkStruct_0202A138 *param0, Pokemon *param1, UnkStruct_ static void sub_020299C0(UnkStruct_0202A138 *param0, const Strbuf *param1, int param2) { - Strbuf_ToChars(param1, param0->unk_20, 8); + Strbuf_ToChars(param1, param0->unk_20, 8); // Possibly TRAINER_NAME_LEN + 1 param0->unk_34 = param2; } diff --git a/src/unk_0202DF8C.c b/src/unk_0202DF8C.c index 48ac9eaebe..a9237af2a3 100644 --- a/src/unk_0202DF8C.c +++ b/src/unk_0202DF8C.c @@ -44,7 +44,7 @@ void sub_0202DFA8(HallOfFame *param0, const Party *param1, const RTCDate *param2 v0 = ¶m0->unk_00[param0->unk_2AA8]; v3 = Party_GetCurrentCount(param1); - v2 = Strbuf_Init(11, 0); + v2 = Strbuf_Init(MON_NAME_LEN + 1, 0); MI_CpuClear16(v0->unk_00, sizeof(UnkStruct_0202E1F4) * 6); @@ -65,10 +65,10 @@ void sub_0202DFA8(HallOfFame *param0, const Party *param1, const RTCDate *param2 if (v2) { Pokemon_GetValue(v1, MON_DATA_NICKNAME_STRBUF, v2); - Strbuf_ToChars(v2, v0->unk_00[v5].unk_0C, 11); + Strbuf_ToChars(v2, v0->unk_00[v5].unk_0C, MON_NAME_LEN + 1); Pokemon_GetValue(v1, MON_DATA_OTNAME_STRBUF, v2); - Strbuf_ToChars(v2, v0->unk_00[v5].unk_22, 8); + Strbuf_ToChars(v2, v0->unk_00[v5].unk_22, TRAINER_NAME_LEN + 1); } else { v0->unk_00[v5].unk_0C[0] = 0xffff; v0->unk_00[v5].unk_22[0] = 0xffff; diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index 83fa77c369..5cab1de639 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -292,7 +292,7 @@ static UnkStruct_0204B184 *sub_0204B184(UnkStruct_ov104_0223A348 *param0, u16 pa v2 = MessageLoader_GetNewStrbuf(v1, param1); - Strbuf_ToChars(v2, ¶m0->unk_00.unk_08[0], 8); + Strbuf_ToChars(v2, ¶m0->unk_00.unk_08[0], 8); // Possibly TRAINER_NAME_LEN + 1 Strbuf_Free(v2); MessageLoader_Free(v1); diff --git a/src/unk_02054D00.c b/src/unk_02054D00.c index 05d92f5912..8eb34a28fd 100644 --- a/src/unk_02054D00.c +++ b/src/unk_02054D00.c @@ -341,12 +341,12 @@ static int sub_02054FD0(const FieldSystem *fieldSystem, const VecFx32 *param1, c return v0; } -BOOL sub_02055024(const FieldSystem *fieldSystem, const VecFx32 *param1, const int param2, const int param3, s8 *param4) +BOOL sub_02055024(const FieldSystem *fieldSystem, const VecFx32 *pos, const int x, const int z, s8 *param4) { int v0; u8 v1; - v0 = sub_02054FD0(fieldSystem, param1, param2, param3, &v1); + v0 = sub_02054FD0(fieldSystem, pos, x, z, &v1); if (param4 != NULL) { *param4 = v0; @@ -355,19 +355,19 @@ BOOL sub_02055024(const FieldSystem *fieldSystem, const VecFx32 *param1, const i if (v0 == 0) { BOOL v2; - v2 = FieldSystem_CheckCollision(fieldSystem, param2, param3); + v2 = FieldSystem_CheckCollision(fieldSystem, x, z); if ((!v2) && (v1 == 2)) { - u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, param2, param3); + u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, x, z); if (TileBehavior_IsPastoriaGymWater(v3)) { - return 1; + return TRUE; } } return v2; } else { - return 1; + return TRUE; } } diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c index 7e03046178..8c714fa892 100644 --- a/src/unk_02055C50.c +++ b/src/unk_02055C50.c @@ -390,7 +390,7 @@ static BOOL sub_02056124(FieldTask *taskMan) case 0: PlayerAvatar_SetRequestStateBit(v0->playerAvatar, (1 << 4)); PlayerAvatar_RequestChangeState(v0->playerAvatar); - sub_02062DDC(Player_MapObject(v0->playerAvatar)); + MapObject_SetPauseMovementOff(Player_MapObject(v0->playerAvatar)); v1->unk_00 = 1; break; case 1: @@ -453,7 +453,7 @@ static BOOL sub_02056124(FieldTask *taskMan) break; case 4: Player_SetDir(v0->playerAvatar, v1->unk_04); - sub_02062DD0(Player_MapObject(v0->playerAvatar)); + MapObject_SetPauseMovementOn(Player_MapObject(v0->playerAvatar)); Heap_FreeToHeap(v1); return 1; } diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c index 93f4f2ad8b..0c7cc90306 100644 --- a/src/unk_0205C22C.c +++ b/src/unk_0205C22C.c @@ -371,7 +371,7 @@ static void sub_0205C6E0(UnkStruct_0205C680 *param0, MapObject *param1, int para Sound_PlayEffect(1615); sub_02061AD4(param1, param0->unk_08); sub_0205C680(param0, 0); - MapObject_SetPosDir(param1, v0, v1, v2, 1); + MapObject_SetPosDirFromCoords(param1, v0, v1, v2, 1); MapObject_Face(param1, 1); LocalMapObj_SetAnimationCode(param1, 0x44); MapObject_SetHidden(param1, 0); diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c index 9679b38cd6..8b7f573459 100644 --- a/src/unk_0205CA94.c +++ b/src/unk_0205CA94.c @@ -131,7 +131,7 @@ void sub_0205CA94(SysTask *param0, void *param1) switch (v0->unk_1E4) { case 0: - sub_02062DDC(Player_MapObject(v0->fieldSystem->playerAvatar)); + MapObject_SetPauseMovementOff(Player_MapObject(v0->fieldSystem->playerAvatar)); PlayerAvatar_SetHidden(v0->fieldSystem->playerAvatar, 0); v0->unk_1E4++; break; diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index eb3e9d2159..731eadd002 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -261,7 +261,7 @@ static void PlayerAvatar_PlayWalkSE(PlayerAvatar *playerAvatar) { if (PlayerAvatar_MoveState(playerAvatar) == 1) { MapObject *mapObj = Player_MapObject(playerAvatar); - u8 v1, v2 = sub_02062BE8(mapObj); + u8 v1, v2 = MapObject_GetCurrTileBehavior(mapObj); { int animationCode = MapObject_GetMovementAction(mapObj); @@ -270,7 +270,7 @@ static void PlayerAvatar_PlayWalkSE(PlayerAvatar *playerAvatar) if (v4 == -1) { v1 = v2; } else { - v1 = sub_02064238(mapObj, v4); + v1 = MapObject_GetTileBehaviorFromDir(mapObj, v4); } } @@ -449,7 +449,7 @@ static int sub_0205F62C(PlayerAvatar *playerAvatar, int param1) static u32 sub_0205F644(PlayerAvatar *playerAvatar, int param1) { int v0 = 0; - u32 v1 = sub_02062BE8(Player_MapObject(playerAvatar)); + u32 v1 = MapObject_GetCurrTileBehavior(Player_MapObject(playerAvatar)); if (PlayerAvatar_IsUnderCyclingRoad(playerAvatar, v1, param1) == 1) { return 5; @@ -946,7 +946,7 @@ static void sub_0205FDC8(PlayerAvatar *playerAvatar, MapObject *param1, int para } } - v1 = sub_0205FC88(param1, sub_02062BE8(param1), v1); + v1 = sub_0205FC88(param1, MapObject_GetCurrTileBehavior(param1), v1); sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); @@ -955,7 +955,7 @@ static void sub_0205FDC8(PlayerAvatar *playerAvatar, MapObject *param1, int para if ((v0 == 0) || (v0 == (1 << 5))) { v2 = 5; v1 = 0x10; - v1 = sub_0205FCBC(param1, sub_02062BE8(param1), v1); + v1 = sub_0205FCBC(param1, MapObject_GetCurrTileBehavior(param1), v1); sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); @@ -1170,7 +1170,7 @@ static void PlayerAvatar_TryCyclingGearChange(PlayerAvatar *playerAvatar, u16 pa } if (pad & PAD_BUTTON_B) { - u32 v0 = sub_02062BE8(Player_MapObject(playerAvatar)); + u32 v0 = MapObject_GetCurrTileBehavior(Player_MapObject(playerAvatar)); if (TileBehavior_IsBikeRampEastward(v0) || TileBehavior_IsBikeRampWestward(v0)) { return; @@ -1732,13 +1732,13 @@ static u32 sub_02060C24(PlayerAvatar *playerAvatar, MapObject *mapObj, int param u32 v1, v2; int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); int y = MapObject_GetY(mapObj); - int z = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int z = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); MapObject_GetPosPtr(mapObj, &v0); v1 = 0; - if (sub_02063FAC(mapObj, x, y, z) == 1) { + if (MapObject_IsOutOfRange(mapObj, x, y, z) == 1) { v1 |= (1 << 0); } @@ -1771,7 +1771,7 @@ static int sub_02060CE4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); if (sub_020683D8(fieldSystem, v1, v2, 0, param2) == 1) { return 1; @@ -1815,7 +1815,7 @@ static int sub_02060D98(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v2 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v3 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v3 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v4 = FieldSystem_GetTileBehavior(fieldSystem, v2, v3); switch (param2) { @@ -1877,7 +1877,7 @@ static int sub_02060E40(PlayerAvatar *playerAvatar, MapObject *mapObj, int param } v1 += MapObject_GetDxFromDir(param2); - v2 += MapObject_GetDyFromDir(param2); + v2 += MapObject_GetDzFromDir(param2); v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if (TileBehavior_IsDoor(v3) == 1) { @@ -1893,7 +1893,7 @@ static int sub_02060EE4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if ((param2 == 3) && TileBehavior_IsBikeRampEastward(v3)) { @@ -1913,10 +1913,10 @@ static int sub_02060F4C(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); - if (sub_0206406C(mapObj, v3)) { + if (MapObject_IsOnWater(mapObj, v3)) { return 1; } } @@ -1929,11 +1929,11 @@ static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if (PlayerAvatar_GetPlayerState(playerAvatar) == PLAYER_STATE_CYCLING) { - if (sub_0206415C(mapObj, v3) == 1) { + if (MapObject_IsOnBikeBridgeNorthSouth(mapObj, v3) == 1) { if ((param2 == 0) || (param2 == 1)) { return 0; } @@ -1941,7 +1941,7 @@ static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param return 1; } - if (sub_0206417C(mapObj, v3) == 1) { + if (MapObject_IsOnBikeBridgeEastWest(mapObj, v3) == 1) { if ((param2 == 2) || (param2 == 3)) { return 0; } @@ -1949,7 +1949,7 @@ static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param return 1; } } else { - if ((sub_0206415C(mapObj, v3) == 1) || (sub_0206417C(mapObj, v3) == 1)) { + if ((MapObject_IsOnBikeBridgeNorthSouth(mapObj, v3) == 1) || (MapObject_IsOnBikeBridgeEastWest(mapObj, v3) == 1)) { return 1; } } @@ -1963,10 +1963,10 @@ static int sub_02061058(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if ((param2 != -1) && PlayerAvatar_GetPlayerState(playerAvatar) == PLAYER_STATE_CYCLING) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); - if (sub_0206406C(mapObj, v3)) { + if (MapObject_IsOnWater(mapObj, v3)) { return 1; } @@ -2337,13 +2337,13 @@ void PlayerAvatar_SetAnimationCode(PlayerAvatar *playerAvatar, u32 param1, int p u32 sub_0206156C(PlayerAvatar *playerAvatar, int param1) { MapObject *v0 = Player_MapObject(playerAvatar); - return sub_02064238(v0, param1); + return MapObject_GetTileBehaviorFromDir(v0, param1); } void sub_0206157C(PlayerAvatar *playerAvatar, int param1, int *param2, int *param3) { *param2 = Player_GetXPos(playerAvatar) + MapObject_GetDxFromDir(param1); - *param3 = Player_GetZPos(playerAvatar) + MapObject_GetDyFromDir(param1); + *param3 = Player_GetZPos(playerAvatar) + MapObject_GetDzFromDir(param1); } void sub_020615AC(PlayerAvatar *playerAvatar, int *param1, int *param2) @@ -2364,9 +2364,9 @@ static void sub_020615C8(PlayerAvatar *playerAvatar) static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { - u8 v0 = sub_02062BE8(mapObj); + u8 v0 = MapObject_GetCurrTileBehavior(mapObj); - if (sub_0206415C(mapObj, v0) == 1) { + if (MapObject_IsOnBikeBridgeNorthSouth(mapObj, v0) == 1) { if ((param2 == 0) || (param2 == 1)) { return 0; } @@ -2374,7 +2374,7 @@ static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param return 1; } - if (sub_0206417C(mapObj, v0) == 1) { + if (MapObject_IsOnBikeBridgeEastWest(mapObj, v0) == 1) { if ((param2 == 2) || (param2 == 3)) { return 0; } @@ -2402,7 +2402,7 @@ static int PlayerAvatar_IsUnderCyclingRoad(PlayerAvatar *playerAvatar, u32 param MapObject *mapObj = Player_MapObject(playerAvatar); - if (sub_0206413C(mapObj, param1) == 1) { + if (MapObject_IsOnBridge(mapObj, param1) == 1) { return TRUE; } diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c index 4e3ec0f2a5..6693ccaaa7 100644 --- a/src/unk_0206450C.c +++ b/src/unk_0206450C.c @@ -294,7 +294,7 @@ void sub_02064690(MapObject *mapObj) switch (v1->unk_00) { case 0: sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); v0 = MapObject_GetFacingDir(mapObj); v0 = sub_02065838(v0, 0x0); @@ -433,7 +433,7 @@ static int sub_0206489C(MapObject *mapObj, int param1) sub_020647A0(mapObj, &v2); v0 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); - v1 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); + v1 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param1); if ((v2.unk_00 > v0) || (v2.unk_08 < v0)) { return 0; diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c index 972192bd16..818d4446e7 100644 --- a/src/unk_020655F4.c +++ b/src/unk_020655F4.c @@ -116,18 +116,18 @@ static const fx32 Unk_020EECEC[3]; int LocalMapObj_IsAnimationSet(const MapObject *mapObj) { if (!MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0)) { - return 0; + return FALSE; } - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_1) == 1) { - return 0; + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_1) == TRUE) { + return FALSE; } - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_4) == 1 && !MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_5)) { - return 0; + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_4) == TRUE && !MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_5)) { + return FALSE; } - return 1; + return TRUE; } void LocalMapObj_SetAnimationCode(MapObject *mapObj, int param1) @@ -814,7 +814,7 @@ static void MovementAction_InitJumpCustomSound(MapObject *mapObj, int dir, fx32 MapObject_StepDir(mapObj, dir); } - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_START_JUMP); MapObject_TryFaceAndTurn(mapObj, dir); sub_02062A0C(mapObj, param4); MapObject_AdvanceMovementStep(mapObj); @@ -875,7 +875,7 @@ static int MovementAction_Jump_Step1(MapObject *mapObj) VecFx32 v5 = { 0, 0, 0 }; sub_02063088(mapObj, &v5); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_END_JUMP | MAP_OBJ_STATUS_5); MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); @@ -1418,7 +1418,7 @@ static int sub_02066710(MapObject *mapObj) ov5_021F3F10(mapObj); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_START_JUMP); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); MapObject_AdvanceMovementStep(mapObj); @@ -1443,7 +1443,7 @@ static int sub_02066764(MapObject *mapObj) v2.y = 0; sub_02063088(mapObj, &v2); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_END_JUMP | MAP_OBJ_STATUS_5); sub_0206A230(mapObj); MapObject_AdvanceMovementStep(mapObj); @@ -1491,7 +1491,7 @@ static void sub_02066824(MapObject *mapObj, const VecFx32 *param1, int param2, i MapObject_TryFace(mapObj, param2); MapObject_Turn(mapObj, param3); sub_02062A0C(mapObj, param5); - sub_02062D28(mapObj); + MapObject_SetStartMovement(mapObj); MapObject_SetXPrev(mapObj, MapObject_GetX(mapObj)); MapObject_SetYPrev(mapObj, MapObject_GetY(mapObj)); @@ -1808,7 +1808,7 @@ static void sub_02066F88(MapObject *mapObj, fx32 distance, int facingDir, int mo MapObject_TryFace(mapObj, facingDir); MapObject_Turn(mapObj, movingDir); sub_02062A0C(mapObj, param5); - sub_02062D28(mapObj); + MapObject_SetStartMovement(mapObj); MapObject_SetXPrev(mapObj, MapObject_GetX(mapObj)); MapObject_SetYPrev(mapObj, MapObject_GetY(mapObj)); @@ -1946,7 +1946,7 @@ static int sub_02067068(MapObject *mapObj) VecFx32 v7 = { 0, 0, 0 }; sub_02063088(mapObj, &v7); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_END_JUMP | MAP_OBJ_STATUS_5); MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c index e322a4e7f8..fc394741fd 100644 --- a/src/unk_02067A84.c +++ b/src/unk_02067A84.c @@ -321,7 +321,7 @@ static int sub_02067E74(const MapObject *mapObj, int param1, int param2) v2 = MapObject_GetZ(mapObj); v3 = MapObject_GetY(mapObj); v1 += MapObject_GetDxFromDir(param1); - v2 += MapObject_GetDyFromDir(param1); + v2 += MapObject_GetDzFromDir(param1); for (v0 = 0; v0 < (param2 - 1); v0++) { v4 = sub_02063E94(mapObj, v1, v3, v2, param1); @@ -332,7 +332,7 @@ static int sub_02067E74(const MapObject *mapObj, int param1, int param2) } v1 += MapObject_GetDxFromDir(param1); - v2 += MapObject_GetDyFromDir(param1); + v2 += MapObject_GetDzFromDir(param1); } v4 = sub_02063E94(mapObj, v1, v3, v2, param1); @@ -466,7 +466,7 @@ static int sub_02068088(UnkStruct_020EF6D0 *param0) MapObject *v0 = param0->unk_24; if (MapObject_IsMoving(v0) == 1) { - sub_02062DDC(v0); + MapObject_SetPauseMovementOff(v0); } param0->unk_00 = 1; diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 10065f0d13..c4aae3c9f2 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -484,7 +484,7 @@ static BOOL sub_02068884(FieldTask *task) break; case 1: if (PlayerAvatar_GetPlayerState(fieldSystem->playerAvatar) == 0x1) { - sub_02062DDC(Player_MapObject(fieldSystem->playerAvatar)); + MapObject_SetPauseMovementOff(Player_MapObject(fieldSystem->playerAvatar)); PlayerAvatar_SetRequestStateBit(fieldSystem->playerAvatar, (1 << 0)); PlayerAvatar_RequestChangeState(fieldSystem->playerAvatar); @@ -494,7 +494,7 @@ static BOOL sub_02068884(FieldTask *task) } else { Sound_SetSpecialBGM(fieldSystem, 1152); sub_02055554(fieldSystem, 1152, 1); - sub_02062DDC(Player_MapObject(fieldSystem->playerAvatar)); + MapObject_SetPauseMovementOff(Player_MapObject(fieldSystem->playerAvatar)); PlayerAvatar_SetRequestStateBit(fieldSystem->playerAvatar, (1 << 1)); PlayerAvatar_RequestChangeState(fieldSystem->playerAvatar); @@ -534,7 +534,7 @@ static u32 sub_02068948(const UnkStruct_020684D0 *param0) { MapObject *v1 = Player_MapObject(param0->playerAvatar); - if ((sub_0206415C(v1, param0->unk_0E) == 1) || (sub_0206417C(v1, param0->unk_0E) == 1)) { + if ((MapObject_IsOnBikeBridgeNorthSouth(v1, param0->unk_0E) == 1) || (MapObject_IsOnBikeBridgeEastWest(v1, param0->unk_0E) == 1)) { return 1; } } diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 2abb7bafed..e78f14af62 100644 --- a/src/unk_02069BE0.c +++ b/src/unk_02069BE0.c @@ -107,7 +107,7 @@ void sub_02069C44(MapObject *mapObj) static int sub_02069C48(MapObject *mapObj, UnkStruct_02069CA8 *param1) { sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); if (sub_02069CFC(mapObj, param1) == 1) { sub_02069D30(mapObj, param1); @@ -277,7 +277,7 @@ void sub_02069E50(MapObject *mapObj) static int sub_02069E5C(MapObject *mapObj, UnkStruct_02069F48 *param1) { sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); if (sub_02069FE8(mapObj, param1) == 1) { if (sub_0206A034(mapObj, param1) == 1) { @@ -401,7 +401,7 @@ static int sub_0206A034(MapObject *mapObj, UnkStruct_02069F48 *param1) v6 = sub_02064488(v0, v1, v4, v5); v0 += MapObject_GetDxFromDir(v6); - v1 += MapObject_GetDyFromDir(v6); + v1 += MapObject_GetDzFromDir(v6); if ((v0 != v2) || (v1 != v3)) { u32 v7 = 0xc; @@ -493,7 +493,7 @@ static int sub_0206A1AC(MapObject *mapObj, UnkStruct_0206A0BC *param1) } sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); param1->unk_00++; return 0; @@ -609,7 +609,7 @@ static int sub_0206A2E0(MapObject *mapObj, UnkStruct_0206A23C *param1) sub_02065668(mapObj, v0); sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); param1->unk_00 = 1; return 1; @@ -634,7 +634,7 @@ static int sub_0206A324(MapObject *mapObj, UnkStruct_0206A23C *param1) } sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); param1->unk_00 = 3; return 1; @@ -642,7 +642,7 @@ static int sub_0206A324(MapObject *mapObj, UnkStruct_0206A23C *param1) static u32 sub_0206A354(MapObject *mapObj, int param1) { - u32 v0 = sub_02064238(mapObj, param1); + u32 v0 = MapObject_GetTileBehaviorFromDir(mapObj, param1); if (TileBehavior_IsVeryTallGrass(v0) == 0) { v0 = (1 << 1); @@ -713,7 +713,7 @@ static int sub_0206A454(MapObject *mapObj, UnkStruct_0206A23C *param1) } sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); param1->unk_00 = 2; return 0; diff --git a/tools/json2bin/catching_show_data.py b/tools/json2bin/catching_show_data.py new file mode 100644 index 0000000000..e8633baae0 --- /dev/null +++ b/tools/json2bin/catching_show_data.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +import pathlib +import json2bin as j2b + +from consts import ( + species, + catching_show +) + +def parse_catching_show_data(cs_data: dict, _size: int, _consts: type = None) -> bytes: + binary = bytearray([]) + binary.extend(j2b.parse_int(cs_data['catching_points'], 1)) + binary.extend(j2b.parse_int(cs_data['rarity'], 1)) + binary.extend(j2b.parse_int(cs_data['unused'], 2)) + return binary + + +SCHEMA = j2b.Parser() \ + .register('catching_show_data.pal_park_land_area', 1, j2b.parse_const, catching_show.PalParkLandArea) \ + .register('catching_show_data.pal_park_water_area', 1, j2b.parse_const, catching_show.PalParkWaterArea) \ + .register('catching_show_data', 1, parse_catching_show_data) + + +def indexer(file_path: pathlib.Path) -> int: + name = file_path.parent.stem.upper() + return species.PokemonSpecies[f'SPECIES_{name}'].value + + +args = j2b.ARGPARSER.parse_args() +j2b.json2bin(args.source_dir, + SCHEMA, + args.private_dir, + args.output_dir, + indexer, + glob_pattern='**/data.json', + narc_name='ppark', + narc_packer=args.narc, + output_mode=j2b.OutputMode.SINGLE_FILE, + skip_stems=['forms', '000', 'bad_egg', 'egg']) diff --git a/tools/json2bin/meson.build b/tools/json2bin/meson.build index 50b281b832..76fad6ec9c 100644 --- a/tools/json2bin/meson.build +++ b/tools/json2bin/meson.build @@ -17,3 +17,4 @@ encdata_ex_elusive_rod_py = find_program('encdata_ex_elusive_rod.py', native: tr encdata_ex_honey_trees_py = find_program('encdata_ex_honey_trees.py', native: true) encdata_ex_trophy_garden_py = find_program('encdata_ex_trophy_garden.py', native: true) encdata_ex_great_marsh_py = find_program('encdata_ex_great_marsh.py', native: true) +catching_show_data_py = find_program('catching_show_data.py', native: true)