From b97f79cb72d8ad52b5750179058b3a7e97bf81f5 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 4 Dec 2024 20:52:55 -0500 Subject: [PATCH 01/28] Update Consts, Remove "Data" notation --- docs/bugs_and_glitches.md | 2 +- include/battle/ov16_0223DF00.h | 228 ++--- include/constants/battle.h | 8 +- include/field_battle_data_transfer.h | 4 +- include/game_records.h | 2 +- include/overlay021/struct_ov21_021D0D80.h | 2 +- include/overlay021/struct_ov21_021D3208.h | 2 +- include/overlay021/struct_ov21_021D3320.h | 2 +- include/overlay088/struct_ov88_0223C370.h | 2 +- include/overlay094/ov94_022414B8.h | 2 +- include/rtc.h | 10 +- include/string_template.h | 4 +- include/struct_decls/pokedexdata_decl.h | 2 +- include/struct_defs/battle_system.h | 12 +- include/struct_defs/struct_0202FAA8.h | 2 +- include/struct_defs/struct_0203E0FC.h | 2 +- include/struct_defs/struct_0203E274.h | 2 +- include/struct_defs/struct_0207AE68_t.h | 2 +- include/struct_defs/trainer_data.h | 4 +- include/trainer_data.h | 14 +- include/unk_0202631C.h | 84 +- include/unk_0202CC64.h | 2 +- include/unk_0206AFE0.h | 138 +-- include/unk_0207A274.h | 2 +- include/unk_0207AE68.h | 2 +- include/unk_0209747C.h | 2 +- .../scripts/subscripts/subscript_pursuit.s | 4 +- .../subscripts/subscript_switch_pokemon.s | 2 +- src/battle/battle_controller.c | 16 +- src/battle/battle_display.c | 30 +- src/battle/battle_io.c | 4 +- src/battle/battle_lib.c | 12 +- src/battle/battle_script.c | 68 +- src/battle/ov16_0223B140.c | 162 ++-- src/battle/ov16_0223DF00.c | 918 +++++++++--------- src/battle/trainer_ai/trainer_ai.c | 8 +- src/enc_effects.c | 2 +- src/encounter.c | 32 +- src/field_battle_data_transfer.c | 70 +- src/field_menu.c | 2 +- src/game_records.c | 2 +- src/overlay005/ov5_021F77A8.c | 2 +- src/overlay005/save_info_window.c | 2 +- src/overlay006/ov6_02240C9C.c | 10 +- src/overlay006/ov6_02246A30.c | 4 +- src/overlay010/ov10_0221F800.c | 16 +- src/overlay013/ov13_0221FC20.c | 2 +- src/overlay021/ov21_021DC9BC.c | 4 +- src/overlay021/pokedex_sort.c | 28 +- src/overlay028/ov28_022561C0.c | 2 +- src/overlay062/ov62_02237D24.c | 4 +- src/overlay062/ov62_02241204.c | 4 +- src/overlay062/ov62_02248408.c | 8 +- src/overlay065/ov65_0222DCE0.c | 2 +- src/overlay066/ov66_0222DDF0.c | 2 +- src/overlay081/ov81_021D1610.c | 2 +- src/overlay094/ov94_022414B8.c | 6 +- src/overlay097/ov97_0222AE60.c | 2 +- src/overlay097/ov97_0222C174.c | 2 +- src/overlay104/ov104_0222DCE0.c | 8 +- src/overlay104/ov104_0223A0C4.c | 2 +- src/overlay104/ov104_0223A7F4.c | 2 +- src/overlay104/ov104_0223AF58.c | 2 +- src/overlay104/ov104_0223B6F4.c | 2 +- src/overlay104/ov104_0223BCBC.c | 2 +- src/rtc.c | 52 +- src/scrcmd.c | 24 +- src/scrcmd_system_flags.c | 4 +- src/script_manager.c | 2 +- src/string_template.c | 8 +- src/trainer_data.c | 48 +- src/unk_0202631C.c | 168 ++-- src/unk_0202CC64.c | 2 +- src/unk_0202F180.c | 2 +- src/unk_0202F1D4.c | 4 +- src/unk_020474B8.c | 4 +- src/unk_0204AEE8.c | 2 +- src/unk_0204C500.c | 2 +- src/unk_020553DC.c | 2 +- src/unk_0206AFE0.c | 4 +- src/unk_0206CCB0.c | 14 +- src/unk_0207A274.c | 4 +- src/unk_0207A6DC.c | 28 +- src/unk_0207AE68.c | 4 +- src/unk_0208BA78.c | 2 +- src/unk_020933F8.c | 4 +- src/unk_0209747C.c | 4 +- src/unk_020998EC.c | 2 +- 88 files changed, 1189 insertions(+), 1191 deletions(-) diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 84f8d63341..641f4198fd 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -73,7 +73,7 @@ or Uproar is in effect. **Fix:** Edit [`res/battle/res/scripts/subscript_pursuit.s`](https://github.com/pret/pokeplatinum/blob/main/res/battle/scripts/subscripts/subscript_pursuit.s) ```diff - UpdateVar OPCODE_ADD, BTLVAR_FAINTED_MON, BATTLER_ENEMY_SLOT_1 + UpdateVar OPCODE_ADD, BTLVAR_FAINTED_MON, BATTLER_ENEMY_1 UpdateVar OPCODE_RIGHT_SHIFT, BTLVAR_CALC_TEMP, 0x00000001 CompareVarToValue OPCODE_NEQ, BTLVAR_CALC_TEMP, 0x00000000, _208 - // BUG: Acid Rain (see docs/bugs_and_glitches.md) diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 76a7b507e2..e035a4fd5d 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -40,7 +40,7 @@ #define ENEMY_IN_SLOT_RIGHT 0 #define ENEMY_IN_SLOT_LEFT 2 -BgConfig *BattleSystem_BGL(BattleSystem *param0); +BgConfig *BattleSystem_BGL(BattleSystem *battleSys); /** * @brief Get one of the allocated windows for the battle display. @@ -50,11 +50,11 @@ BgConfig *BattleSystem_BGL(BattleSystem *param0); * @return */ Window *BattleSystem_Window(BattleSystem *battleSys, int idx); -u32 BattleSystem_BattleType(BattleSystem *param0); -BattleContext *BattleSystem_Context(BattleSystem *param0); -BattlerData *BattleSystem_BattlerData(BattleSystem *param0, int param1); -int BattleSystem_MaxBattlers(BattleSystem *param0); -Party *BattleSystem_Party(BattleSystem *param0, int param1); +u32 BattleSystem_BattleType(BattleSystem *battleSys); +BattleContext *BattleSystem_Context(BattleSystem *battleSys); +BattlerData *BattleSystem_BattlerData(BattleSystem *battleSys, int param1); +int BattleSystem_MaxBattlers(BattleSystem *battleSys); +Party *BattleSystem_Party(BattleSystem *battleSys, int param1); /** * @brief Get the party count for a particular battler. @@ -84,31 +84,31 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); * @return Pointer to the Pokemon struct in that battler's party slot. */ Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); -UnkStruct_02007768 *ov16_0223E000(BattleSystem *param0); -UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *param0); -SpriteRenderer *ov16_0223E010(BattleSystem *param0); -SpriteGfxHandler *ov16_0223E018(BattleSystem *param0); -UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *param0, int param1); -UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *param0); -PartyGauge *ov16_0223E034(BattleSystem *param0, enum PartyGaugeSide param1); -void ov16_0223E040(BattleSystem *param0, enum PartyGaugeSide param1, PartyGauge *param2); -UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *param0); -UnkStruct_0200C440 *ov16_0223E054(BattleSystem *param0); -MessageLoader *BattleSystem_MessageLoader(BattleSystem *param0); -MessageLoader *ov16_0223E060(BattleSystem *param0); -PaletteData *BattleSystem_PaletteSys(BattleSystem *param0); -PokedexData *ov16_0223E068(BattleSystem *param0); -u8 *ov16_0223E06C(BattleSystem *param0); -u8 *ov16_0223E074(BattleSystem *param0); -u16 *ov16_0223E080(BattleSystem *param0); -u16 *ov16_0223E08C(BattleSystem *param0); -u16 *ov16_0223E098(BattleSystem *param0); -u16 *ov16_0223E0A4(BattleSystem *param0); -u16 *ov16_0223E0B0(BattleSystem *param0); -u16 *ov16_0223E0BC(BattleSystem *param0); -UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *param0); -StringTemplate *BattleSystem_StringTemplate(BattleSystem *param0); -Strbuf *ov16_0223E0D4(BattleSystem *param0); +UnkStruct_02007768 *ov16_0223E000(BattleSystem *battleSys); +UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSys); +SpriteRenderer *ov16_0223E010(BattleSystem *battleSys); +SpriteGfxHandler *ov16_0223E018(BattleSystem *battleSys); +UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSys, int param1); +UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *battleSys); +PartyGauge *ov16_0223E034(BattleSystem *battleSys, enum PartyGaugeSide param1); +void ov16_0223E040(BattleSystem *battleSys, enum PartyGaugeSide param1, PartyGauge *param2); +UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *battleSys); +UnkStruct_0200C440 *ov16_0223E054(BattleSystem *battleSys); +MessageLoader *BattleSystem_MessageLoader(BattleSystem *battleSys); +MessageLoader *ov16_0223E060(BattleSystem *battleSys); +PaletteData *BattleSystem_PaletteSys(BattleSystem *battleSys); +Pokedex *BattleSystem_GetPokedex(BattleSystem *battleSys); +u8 *ov16_0223E06C(BattleSystem *battleSys); +u8 *ov16_0223E074(BattleSystem *battleSys); +u16 *ov16_0223E080(BattleSystem *battleSys); +u16 *ov16_0223E08C(BattleSystem *battleSys); +u16 *ov16_0223E098(BattleSystem *battleSys); +u16 *ov16_0223E0A4(BattleSystem *battleSys); +u16 *ov16_0223E0B0(BattleSystem *battleSys); +u16 *ov16_0223E0BC(BattleSystem *battleSys); +UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *battleSys); +StringTemplate *BattleSystem_StringTemplate(BattleSystem *battleSys); +Strbuf *ov16_0223E0D4(BattleSystem *battleSys); /** * @brief Get the trainer ID for a particular battler. @@ -118,7 +118,7 @@ Strbuf *ov16_0223E0D4(BattleSystem *param0); * @return The battler's trainer ID */ u16 Battler_TrainerID(BattleSystem *battleSys, int battler); -TrainerData *BattleSystem_TrainerData(BattleSystem *param0, int param1); +Trainer *BattleSystem_GetTrainer(BattleSystem *battleSys, int param1); /** * @brief Get the trainer info for a particular battler. @@ -128,9 +128,9 @@ TrainerData *BattleSystem_TrainerData(BattleSystem *param0, int param1); * @return The trainer info for the requested battler. */ TrainerInfo *BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler); -Bag *BattleSystem_Bag(BattleSystem *param0); -BagCursor *BattleSystem_BagCursor(BattleSystem *param0); -u32 ov16_0223E1B4(BattleSystem *param0, int param1); +Bag *BattleSystem_Bag(BattleSystem *battleSys); +BagCursor *BattleSystem_BagCursor(BattleSystem *battleSys); +u32 BattleSystem_GetTrainerGender(BattleSystem *battleSys, int param1); /** * @brief Get a battler of a particular type. @@ -140,10 +140,10 @@ u32 ov16_0223E1B4(BattleSystem *param0, int param1); * @return ID of the battler of the given type. */ int BattleSystem_BattlerOfType(BattleSystem *battleSys, int type); -u8 BattleSystem_BattlerSlot(BattleSystem *param0, int param1); -u8 Battler_Side(BattleSystem *param0, int param1); -void *ov16_0223E220(BattleSystem *param0); -PCBoxes *ov16_0223E228(BattleSystem *param0); +u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int param1); +u8 Battler_Side(BattleSystem *battleSys, int param1); +void *ov16_0223E220(BattleSystem *battleSys); +PCBoxes *ov16_0223E228(BattleSystem *battleSys); /** * @brief Get the terrain type for the battle. @@ -152,9 +152,9 @@ PCBoxes *ov16_0223E228(BattleSystem *param0); * @return The battle's terrain. */ enum Terrain BattleSystem_Terrain(BattleSystem *battleSys); -int ov16_0223E240(BattleSystem *param0); -int BattleSystem_MapHeader(BattleSystem *param0); -int BattleSystem_Partner(BattleSystem *param0, int param1); +int ov16_0223E240(BattleSystem *battleSys); +int BattleSystem_MapHeader(BattleSystem *battleSys); +int BattleSystem_Partner(BattleSystem *battleSys, int param1); /** * @brief Get the battler who is an enemy of the input attacker and occupies @@ -181,7 +181,7 @@ int BattleSystem_EnemyInSlot(BattleSystem *battleSys, int attacker, int slot); * @return TRUE if the item has an effect; FALSE otherwise */ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot, int moveSlot, int item); -u32 BattleSystem_BattleStatus(BattleSystem *param0); +u32 BattleSystem_BattleStatus(BattleSystem *battleSys); /** * @brief Get the time of day. @@ -190,14 +190,14 @@ u32 BattleSystem_BattleStatus(BattleSystem *param0); * @return The time of day (e.g., morning, day, night) */ enum Time BattleSystem_Time(BattleSystem *battleSys); -int ov16_0223EC04(BattleSystem *param0); -u8 ov16_0223EC58(BattleSystem *param0, int param1, u8 param2); +int ov16_0223EC04(BattleSystem *battleSys); +u8 ov16_0223EC58(BattleSystem *battleSys, int param1, u8 param2); u16 ov16_0223ECC4(FieldBattleDTO *param0, int *param1, int *param2); -u8 ov16_0223ED60(BattleSystem *param0); -u8 ov16_0223ED6C(BattleSystem *param0); -int BattleSystem_NumSafariBalls(BattleSystem *param0); -void BattleSystem_SetSafariBalls(BattleSystem *param0, int param1); -Options *ov16_0223EDA4(BattleSystem *param0); +u8 ov16_0223ED60(BattleSystem *battleSys); +u8 ov16_0223ED6C(BattleSystem *battleSys); +int BattleSystem_NumSafariBalls(BattleSystem *battleSys); +void BattleSystem_SetSafariBalls(BattleSystem *battleSys, int param1); +Options *ov16_0223EDA4(BattleSystem *battleSys); /** * @brief Check if battle animations are turned on. @@ -206,73 +206,73 @@ Options *ov16_0223EDA4(BattleSystem *param0); * @return TRUE if battle animations are enabled, FALSE if not. */ BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys); -int ov16_0223EDE0(BattleSystem *param0); -u8 BattleSystem_TextSpeed(BattleSystem *param0); -int BattleSystem_Ruleset(BattleSystem *param0); -PokemonAnimationSys *ov16_0223EE28(BattleSystem *param0); -ChatotCry *BattleSystem_ChatotVoice(BattleSystem *param0, int param1); -void ov16_0223EE70(BattleSystem *param0); -void ov16_0223EF2C(BattleSystem *param0, int param1, int param2); -void ov16_0223EF48(BattleSystem *param0, Pokemon *param1); -void ov16_0223EF68(BattleSystem *param0, Pokemon *param1); -void ov16_0223EF8C(BattleSystem *param0); -u8 *ov16_0223F1E8(BattleSystem *param0); -u16 *ov16_0223F1F0(BattleSystem *param0); -int ov16_0223F1F8(BattleSystem *param0); -u16 *ov16_0223F204(BattleSystem *param0); -u16 *ov16_0223F210(BattleSystem *param0); -int BattleSystem_FieldWeather(BattleSystem *param0); -u8 ov16_0223F228(BattleSystem *param0); -void ov16_0223F234(BattleSystem *param0, u8 param1); -int ov16_0223F240(BattleSystem *param0); -void ov16_0223F24C(BattleSystem *param0, int param1); -void ov16_0223F268(BattleSystem *param0); +int ov16_0223EDE0(BattleSystem *battleSys); +u8 BattleSystem_TextSpeed(BattleSystem *battleSys); +int BattleSystem_Ruleset(BattleSystem *battleSys); +PokemonAnimationSys *BattleSystem_GetPokemonAnimationSystem(BattleSystem *battleSys); +ChatotCry *BattleSystem_ChatotVoice(BattleSystem *battleSys, int param1); +void ov16_0223EE70(BattleSystem *battleSys); +void ov16_0223EF2C(BattleSystem *battleSys, int param1, int param2); +void ov16_0223EF48(BattleSystem *battleSys, Pokemon *param1); +void ov16_0223EF68(BattleSystem *battleSys, Pokemon *param1); +void ov16_0223EF8C(BattleSystem *battleSys); +u8 *ov16_0223F1E8(BattleSystem *battleSys); +u16 *ov16_0223F1F0(BattleSystem *battleSys); +int ov16_0223F1F8(BattleSystem *battleSys); +u16 *ov16_0223F204(BattleSystem *battleSys); +u16 *ov16_0223F210(BattleSystem *battleSys); +int BattleSystem_FieldWeather(BattleSystem *battleSys); +u8 ov16_0223F228(BattleSystem *battleSys); +void ov16_0223F234(BattleSystem *battleSys, u8 param1); +int ov16_0223F240(BattleSystem *battleSys); +void ov16_0223F24C(BattleSystem *battleSys, int param1); +void ov16_0223F268(BattleSystem *battleSys); void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags); -void ov16_0223F290(BattleSystem *param0, int param1); -void *Battle_WaitDial(BattleSystem *param0); -void Battle_SetWaitDial(BattleSystem *param0, void *param1); -UnkStruct_ov16_0223E0C8 *ov16_0223F2AC(BattleSystem *param0, int param1); +void ov16_0223F290(BattleSystem *battleSys, int param1); +void *Battle_WaitDial(BattleSystem *battleSys); +void Battle_SetWaitDial(BattleSystem *battleSys, void *param1); +UnkStruct_ov16_0223E0C8 *ov16_0223F2AC(BattleSystem *battleSys, int param1); u8 *ov16_0223F2B8(UnkStruct_ov16_0223E0C8 *param0, int param1); void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); void ov16_0223F2E4(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); void ov16_0223F2FC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); -void ov16_0223F314(BattleSystem *param0, int param1); -void ov16_0223F320(BattleSystem *param0, u8 *param1); -void ov16_0223F32C(BattleSystem *param0, u8 *param1); -void ov16_0223F338(BattleSystem *param0, u8 param1); -void ov16_0223F344(BattleSystem *param0, u8 param1); -void ov16_0223F350(BattleSystem *param0, u8 param1); -void *ov16_0223F35C(BattleSystem *param0, int param1); -void ov16_0223F36C(BattleSystem *param0); -void ov16_0223F3BC(BattleSystem *param0); -void ov16_0223F3EC(BattleSystem *param0); -void ov16_0223F414(BattleSystem *param0); -u8 BattleSystem_ResultMask(BattleSystem *param0); -void BattleSystem_SetResultFlag(BattleSystem *param0, u8 param1); -u8 ov16_0223F450(BattleSystem *param0); -void BattleSystem_SetRedHPSoundFlag(BattleSystem *param0, u8 param1); -u8 ov16_0223F47C(BattleSystem *param0); -void ov16_0223F48C(BattleSystem *param0, u8 param1); -void ov16_0223F4B0(BattleSystem *param0, int param1); -u16 BattleSystem_RandNext(BattleSystem *param0); -u32 ov16_0223F4E8(BattleSystem *param0); -void ov16_0223F4F4(BattleSystem *param0, u32 param1); -void BattleSystem_Record(BattleSystem *param0, int param1, u8 param2); -BOOL ov16_0223F530(BattleSystem *param0, int param1, u8 *param2); -u8 ov16_0223F58C(BattleSystem *param0, u8 *param1); -void ov16_0223F638(BattleSystem *param0, u16 param1, u8 *param2); -u16 ov16_0223F6E4(BattleSystem *param0); -int ov16_0223F6F0(BattleSystem *param0, u16 param1); -u16 BattleSystem_TrainerItems(BattleSystem *param0, int param1, int param2); -u32 BattleSystem_RecordingStopped(BattleSystem *param0); +void ov16_0223F314(BattleSystem *battleSys, int param1); +void ov16_0223F320(BattleSystem *battleSys, u8 *param1); +void ov16_0223F32C(BattleSystem *battleSys, u8 *param1); +void ov16_0223F338(BattleSystem *battleSys, u8 param1); +void ov16_0223F344(BattleSystem *battleSys, u8 param1); +void ov16_0223F350(BattleSystem *battleSys, u8 param1); +void *ov16_0223F35C(BattleSystem *battleSys, int param1); +void ov16_0223F36C(BattleSystem *battleSys); +void ov16_0223F3BC(BattleSystem *battleSys); +void ov16_0223F3EC(BattleSystem *battleSys); +void ov16_0223F414(BattleSystem *battleSys); +u8 BattleSystem_ResultMask(BattleSystem *battleSys); +void BattleSystem_SetResultFlag(BattleSystem *battleSys, u8 param1); +u8 ov16_0223F450(BattleSystem *battleSys); +void BattleSystem_SetRedHPSoundFlag(BattleSystem *battleSys, u8 param1); +u8 ov16_0223F47C(BattleSystem *battleSys); +void ov16_0223F48C(BattleSystem *battleSys, u8 param1); +void ov16_0223F4B0(BattleSystem *battleSys, int param1); +u16 BattleSystem_RandNext(BattleSystem *battleSys); +u32 ov16_0223F4E8(BattleSystem *battleSys); +void ov16_0223F4F4(BattleSystem *battleSys, u32 param1); +void BattleSystem_Record(BattleSystem *battleSys, int param1, u8 param2); +BOOL ov16_0223F530(BattleSystem *battleSys, int param1, u8 *param2); +u8 ov16_0223F58C(BattleSystem *battleSys, u8 *param1); +void ov16_0223F638(BattleSystem *battleSys, u16 param1, u8 *param2); +u16 ov16_0223F6E4(BattleSystem *battleSys); +int ov16_0223F6F0(BattleSystem *battleSys, u16 param1); +u16 BattleSystem_TrainerItems(BattleSystem *battleSys, int param1, int param2); +u32 BattleSystem_RecordingStopped(BattleSystem *battleSys); void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag); -BOOL ov16_0223F7A4(BattleSystem *param0); +BOOL ov16_0223F7A4(BattleSystem *battleSys); void BattleSystem_ShowStopPlaybackButton(BattleSystem *battleSys); -u8 BattleSystem_RecordedChatter(BattleSystem *param0, int param1); -void ov16_0223F858(BattleSystem *param0, u8 *param1); -void ov16_0223F87C(BattleSystem *param0, u8 *param1); -void ov16_0223F8AC(BattleSystem *param0, Sprite **param1); -void BattleSystem_SetGaugePriority(BattleSystem *param0, int param1); +u8 BattleSystem_RecordedChatter(BattleSystem *battleSys, int param1); +void ov16_0223F858(BattleSystem *battleSys, u8 *param1); +void ov16_0223F87C(BattleSystem *battleSys, u8 *param1); +void ov16_0223F8AC(BattleSystem *battleSys, Sprite **param1); +void BattleSystem_SetGaugePriority(BattleSystem *battleSys, int param1); /** * @brief Calculate the money penalty for losing a battle. @@ -284,8 +284,8 @@ void BattleSystem_SetGaugePriority(BattleSystem *param0, int param1); * @return The total amount of money to be deducted from the player */ u32 BattleSystem_CalcMoneyPenalty(Party *party, TrainerInfo *trainerInfo); -void BattleSystem_DexFlagSeen(BattleSystem *param0, int param1); -void ov16_0223F9A0(BattleSystem *param0, int param1); +void BattleSystem_DexFlagSeen(BattleSystem *battleSys, int param1); +void ov16_0223F9A0(BattleSystem *battleSys, int param1); /** * @brief Checks if the player has previously caught a member of this species. @@ -297,7 +297,7 @@ void ov16_0223F9A0(BattleSystem *param0, int param1); */ BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species); void Battle_SetDefaultBlend(void); -u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int param4); +u8 ov16_0223F9FC(BattleSystem *battleSys, int param1, int param2, int param3, int param4); /** * @brief Print a BattleMessage to the main text display window. @@ -309,6 +309,6 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p * @return */ u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg, int renderDelay); -u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8); +u8 BattleMessage_PrintToWindow(BattleSystem *battleSys, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8); #endif // POKEPLATINUM_OV16_0223DF00_H diff --git a/include/constants/battle.h b/include/constants/battle.h index f82f078f41..14c32faf56 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -100,10 +100,10 @@ enum BattlerBootState { * * PLAYER_SLOT_1 PLAYER_SLOT_2 */ -#define BATTLER_PLAYER_SLOT_1 0 -#define BATTLER_ENEMY_SLOT_1 1 -#define BATTLER_PLAYER_SLOT_2 2 -#define BATTLER_ENEMY_SLOT_2 3 +#define BATTLER_PLAYER_1 0 +#define BATTLER_ENEMY_1 1 +#define BATTLER_PLAYER_2 2 +#define BATTLER_ENEMY_2 3 #define BATTLER_NONE 0xFF #define BATTLER_TYPE_SOLO_PLAYER 0 diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h index 1067b76cfd..935a4a1e58 100644 --- a/include/field_battle_data_transfer.h +++ b/include/field_battle_data_transfer.h @@ -35,11 +35,11 @@ typedef struct FieldBattleDTO { Party *parties[MAX_BATTLERS]; int resultMask; int trainerIDs[MAX_BATTLERS]; - TrainerData trainerData[MAX_BATTLERS]; + Trainer trainer[MAX_BATTLERS]; TrainerInfo *trainerInfo[MAX_BATTLERS]; Bag *bag; BagCursor *bagCursor; - PokedexData *pokedex; + Pokedex *pokedex; PCBoxes *pcBoxes; ChatotCry *chatotCries[MAX_BATTLERS]; PoketchData *poketchData; diff --git a/include/game_records.h b/include/game_records.h index 7ead5bedf1..4e3c7bdc97 100644 --- a/include/game_records.h +++ b/include/game_records.h @@ -37,6 +37,6 @@ u32 GameRecords_AddToRecordValue(GameRecords *records, int id, u32 toAdd); u32 GameRecords_GetRecordValue(GameRecords *records, int id); void GameRecords_IncrementTrainerScore(GameRecords *records, int scoreID); u32 GameRecords_GetTrainerScore(GameRecords *records); -void GameRecords_IncrementTrainerScoreOnCatch(GameRecords *records, const PokedexData *pokedex, const u16 species); +void GameRecords_IncrementTrainerScoreOnCatch(GameRecords *records, const Pokedex *pokedex, const u16 species); #endif // POKEPLATINUM_GAME_RECORDS_H diff --git a/include/overlay021/struct_ov21_021D0D80.h b/include/overlay021/struct_ov21_021D0D80.h index d030460fa2..93088fe1f2 100644 --- a/include/overlay021/struct_ov21_021D0D80.h +++ b/include/overlay021/struct_ov21_021D0D80.h @@ -7,7 +7,7 @@ #include "trainer_info.h" typedef struct { - const PokedexData *unk_00; + const Pokedex *unk_00; const TrainerInfo *unk_04; int timeOfDay; BOOL fullmoonIslandVisible; diff --git a/include/overlay021/struct_ov21_021D3208.h b/include/overlay021/struct_ov21_021D3208.h index af1a3624c8..2eaaa10b6e 100644 --- a/include/overlay021/struct_ov21_021D3208.h +++ b/include/overlay021/struct_ov21_021D3208.h @@ -6,7 +6,7 @@ #include "trainer_info.h" typedef struct { - const PokedexData *dexData; + const Pokedex *dexData; const TrainerInfo *unk_04; int timeOfDay; BOOL fullmoonIslandVisible; diff --git a/include/overlay021/struct_ov21_021D3320.h b/include/overlay021/struct_ov21_021D3320.h index 73e93ba8be..cfc0adb7d6 100644 --- a/include/overlay021/struct_ov21_021D3320.h +++ b/include/overlay021/struct_ov21_021D3320.h @@ -9,7 +9,7 @@ #include "strbuf.h" typedef struct { - const PokedexData *dexData; + const Pokedex *dexData; SortedPokedex sortedPokedex; int isNationalDex; BOOL isNationalDexUnlocked; diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h index c815c1c272..9db9769533 100644 --- a/include/overlay088/struct_ov88_0223C370.h +++ b/include/overlay088/struct_ov88_0223C370.h @@ -25,7 +25,7 @@ typedef struct { Options *unk_18; Journal *unk_1C; GameRecords *records; - PokedexData *unk_24; + Pokedex *unk_24; int unk_28; int unk_2C; int unk_30; diff --git a/include/overlay094/ov94_022414B8.h b/include/overlay094/ov94_022414B8.h index 6d72f03625..2983da4e77 100644 --- a/include/overlay094/ov94_022414B8.h +++ b/include/overlay094/ov94_022414B8.h @@ -31,7 +31,7 @@ u16 *ov94_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength); u8 *ov94_02242548(int param0); void ov94_022425A8(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1); ListMenu *ov94_022426A8(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3); -ListMenu *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, PokedexData *param6); +ListMenu *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, Pokedex *param6); ListMenu *ov94_02242840(StringList **param0, Window *param1, MessageLoader *param2); ListMenu *ov94_022428B0(StringList **param0, Window *param1, MessageLoader *param2, int param3); void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 *param0, int param1, int param2); diff --git a/include/rtc.h b/include/rtc.h index 29cd3f6474..59fb437f16 100644 --- a/include/rtc.h +++ b/include/rtc.h @@ -4,11 +4,11 @@ #include enum TimeOfDay { - TOD_MORNING = 0, - TOD_DAY = 1, - TOD_TWILIGHT = 2, - TOD_NIGHT = 3, - TOD_LATE_NIGHT = 4, + TIMEOFDAY_MORNING = 0, + TIMEOFDAY_DAY = 1, + TIMEOFDAY_TWILIGHT = 2, + TIMEOFDAY_NIGHT = 3, + TIMEOFDAY_LATE_NIGHT = 4, }; void InitRTC(void); diff --git a/include/string_template.h b/include/string_template.h index 15d434943d..2a2ba7fb6f 100644 --- a/include/string_template.h +++ b/include/string_template.h @@ -65,10 +65,10 @@ void StringTemplate_SetLocationName(StringTemplate *template, u32 idx, u32 locat void StringTemplate_SetPoketchAppName(StringTemplate *template, u32 idx, u32 app); void StringTemplate_SetTrainerClassName(StringTemplate *template, u32 idx, u32 trainerClass); void StringTemplate_SetTrainerClassNameWithArticle(StringTemplate *template, u32 idx, u32 trainerClass); -void StringTemplate_SetTrainerClassNameBattle(StringTemplate *template, u32 idx, TrainerData *trainerData); +void StringTemplate_SetTrainerClassNameBattle(StringTemplate *template, u32 idx, Trainer *trainer); void StringTemplate_SetTrainerName(StringTemplate *template, u32 idx, u32 trainerID); void StringTemplate_SetFrontierTrainerName(StringTemplate *template, u32 idx, u32 trainerID); -void StringTemplate_SetTrainerNameBattle(StringTemplate *template, u32 idx, TrainerData *trainerData); +void StringTemplate_SetTrainerNameBattle(StringTemplate *template, u32 idx, Trainer *trainer); void StringTemplate_SetUndergroundItemName(StringTemplate *template, u32 idx, u32 item); void StringTemplate_SetUndergroundItemNameWithArticle(StringTemplate *template, u32 idx, u32 item); void StringTemplate_SetUndergroundTrapName(StringTemplate *template, u32 idx, u32 trap); diff --git a/include/struct_decls/pokedexdata_decl.h b/include/struct_decls/pokedexdata_decl.h index 22106827ae..a8cb4775c7 100644 --- a/include/struct_decls/pokedexdata_decl.h +++ b/include/struct_decls/pokedexdata_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_POKEDEXDATA_DECL_H #define POKEPLATINUM_POKEDEXDATA_DECL_H -typedef struct PokedexData PokedexData; +typedef struct Pokedex Pokedex; #endif // POKEPLATINUM_POKEDEXDATA_DECL_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index f29a0c0424..b788deebd3 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -57,22 +57,22 @@ struct BattleSystem { BattleContext *battleCtx; BattlerData *battlers[MAX_BATTLERS]; int maxBattlers; - TrainerInfo *trainerInfo[4]; + TrainerInfo *trainerInfo[MAX_BATTLERS]; Bag *unk_58; BagCursor *unk_5C; - PokedexData *pokedex; + Pokedex *pokedex; PCBoxes *pcBoxes; - Party *parties[4]; - ChatotCry *unk_78[4]; + Party *parties[MAX_BATTLERS]; + ChatotCry *unk_78[MAX_BATTLERS]; UnkStruct_02007768 *unk_88; UnkStruct_ov12_0221FCDC *unk_8C; SpriteRenderer *unk_90; SpriteGfxHandler *unk_94; PoketchData *poketchData; UnkStruct_0206D140 *unk_9C; - u16 trainerIDs[4]; + u16 trainerIDs[MAX_BATTLERS]; u8 unk_A8[4]; - TrainerData trainers[4]; + Trainer trainers[MAX_BATTLERS]; UnkStruct_ov16_02268520 unk_17C[2]; UnkStruct_ov16_02268A14 *unk_198; PartyGauge *unk_19C[2]; diff --git a/include/struct_defs/struct_0202FAA8.h b/include/struct_defs/struct_0202FAA8.h index cdd3d5d65a..1af308b10e 100644 --- a/include/struct_defs/struct_0202FAA8.h +++ b/include/struct_defs/struct_0202FAA8.h @@ -7,7 +7,7 @@ typedef struct { u32 unk_00; int unk_04; int unk_08[4]; - TrainerData unk_18[4]; + Trainer unk_18[4]; int unk_E8; int unk_EC; int unk_F0; diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h index c60d96fef9..307a8a0248 100644 --- a/include/struct_defs/struct_0203E0FC.h +++ b/include/struct_defs/struct_0203E0FC.h @@ -21,7 +21,7 @@ typedef struct { SystemData *unk_04; Party *unk_08; PCBoxes *unk_0C; - PokedexData *unk_10; + Pokedex *unk_10; UnkStruct_0202B370 *unk_14; UnkStruct_0202C878 *unk_18; TrainerInfo *unk_1C; diff --git a/include/struct_defs/struct_0203E274.h b/include/struct_defs/struct_0203E274.h index 9d8e44f098..8991cebd90 100644 --- a/include/struct_defs/struct_0203E274.h +++ b/include/struct_defs/struct_0203E274.h @@ -6,7 +6,7 @@ typedef struct { int unk_00; BOOL unk_04; - const PokedexData *unk_08; + const Pokedex *unk_08; } UnkStruct_0203E274; #endif // POKEPLATINUM_STRUCT_0203E274_H diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index 0d2aa9063e..e93597e072 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -42,7 +42,7 @@ struct UnkStruct_0207AE68_t { PokemonSummary *unk_3C; void *unk_40; PokemonAnimationSys *unk_44; - PokedexData *unk_48; + Pokedex *unk_48; Bag *unk_4C; GameRecords *records; PoketchData *poketchData; diff --git a/include/struct_defs/trainer_data.h b/include/struct_defs/trainer_data.h index 8987614325..bc2a7a0e07 100644 --- a/include/struct_defs/trainer_data.h +++ b/include/struct_defs/trainer_data.h @@ -17,7 +17,7 @@ enum TrainerDataType { /** * @brief Trainer data encapsulation. Contains all trainer-level data needed to instantiate a trainer battle. */ -typedef struct TrainerData { +typedef struct Trainer { u8 type; //< The data type of the trainer; controls which TrainerMon struct is used for the party. u8 class; //< The trainer's class, e.g. "Youngster" or "Gym Leader." u8 sprite; //< Which sprite ID the trainer uses. @@ -33,7 +33,7 @@ typedef struct TrainerData { Sentence winMsg; //< The message to display if the trainer wins. Sentence loseMsg; //< The message to display if the trainer loses. -} TrainerData; +} Trainer; #define MAX_DV 255 diff --git a/include/trainer_data.h b/include/trainer_data.h index 4e3876ef8e..4e4a38813d 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -23,7 +23,7 @@ enum TrainerDataParam { }; /** - * @brief Initialize the TrainerData structs within the FieldBattleDTO struct. + * @brief Initialize the Trainer structs within the FieldBattleDTO struct. * * This routine is responsible for loading the name of a trainer and building * their party from the data archives. @@ -32,7 +32,7 @@ enum TrainerDataParam { * @param save Save data; used to pull out the rival's name, if needed. * @param heapID Heap on which to allocate message bank access. */ -void TrainerData_Encounter(FieldBattleDTO *dto, const SaveData *save, int heapID); +void Trainer_Encounter(FieldBattleDTO *dto, const SaveData *save, int heapID); /** * @brief Get a parameter for the given trainer ID from the data archive. @@ -41,7 +41,7 @@ void TrainerData_Encounter(FieldBattleDTO *dto, const SaveData *save, int heapID * @param paramID ID of the data field to be retrieved. * @return Value of the trainer's data field in the archive. */ -u32 TrainerData_LoadParam(int trainerID, enum TrainerDataParam paramID); +u32 Trainer_LoadParam(int trainerID, enum TrainerDataParam paramID); /** * @brief Check if the given trainer has a message of the specified type. @@ -51,7 +51,7 @@ u32 TrainerData_LoadParam(int trainerID, enum TrainerDataParam paramID); * @param heapID Heap on which to allocate archive access. * @return TRUE if the trainer has a message of the given type; FALSE if not. */ -BOOL TrainerData_HasMessageType(int trainerID, enum TrainerMessageType msgType, int heapID); +BOOL Trainer_HasMessageType(int trainerID, enum TrainerMessageType msgType, int heapID); /** * @brief Load the trainer's message of a given type into the provided Strbuf. @@ -63,7 +63,7 @@ BOOL TrainerData_HasMessageType(int trainerID, enum TrainerMessageType msgType, * @param[out] strbuf Strbuf which will contain the result message. * @param heapID Heap on which to allocate archive access. */ -void TrainerData_LoadMessage(int trainerID, enum TrainerMessageType msgType, Strbuf *strbuf, int heapID); +void Trainer_LoadMessage(int trainerID, enum TrainerMessageType msgType, Strbuf *strbuf, int heapID); /** * @brief Load data for the requested trainer. @@ -71,7 +71,7 @@ void TrainerData_LoadMessage(int trainerID, enum TrainerMessageType msgType, Str * @param trainerID ID of the trainer to be loaded. * @param[out] trdata Struct which will contain the loaded trainer data. */ -void TrainerData_Load(int trainerID, TrainerData *trdata); +void Trainer_Load(int trainerID, Trainer *trdata); /** * @brief Load data for the requested trainer's party. @@ -83,7 +83,7 @@ void TrainerData_Load(int trainerID, TrainerData *trdata); * @param trainerID ID of the trainer whose party is to be loaded. * @param[out] trparty Struct which will contain the loaded trainer party data. */ -void TrainerData_LoadParty(int trainerID, void *trparty); +void Trainer_LoadParty(int trainerID, void *trparty); /** * @brief Get the gender for a particular trainer class. diff --git a/include/unk_0202631C.h b/include/unk_0202631C.h index 0253fcdfec..16192b811d 100644 --- a/include/unk_0202631C.h +++ b/include/unk_0202631C.h @@ -7,47 +7,47 @@ #include "savedata.h" int Pokedex_SaveSize(void); -PokedexData *sub_02026324(u32 param0); -void Pokedex_Copy(const PokedexData *src, PokedexData *dest); -void Pokedex_Init(PokedexData *param0); -u16 sub_02026DD0(const PokedexData *param0); -u16 Pokedex_CountSeenNational(const PokedexData *pokedex); -u16 Pokedex_CountSeen(const PokedexData *pokedex); -u16 sub_02026E64(const PokedexData *param0); -u16 Pokedex_CountSeenSinnoh(const PokedexData *pokedex); -BOOL sub_02026EF4(const PokedexData *param0); -BOOL sub_02026F0C(const PokedexData *param0); -u16 sub_02026F20(const PokedexData *param0); -u16 sub_02026F58(const PokedexData *param0); -BOOL Pokedex_HasCaughtSpecies(const PokedexData *pokedex, u16 species); -BOOL Pokedex_HasSeenSpecies(const PokedexData *pokedex, u16 species); -u32 sub_0202702C(const PokedexData *param0, u8 param1); -u32 sub_02027058(const PokedexData *param0, u16 param1, int param2); -u32 sub_020270AC(const PokedexData *param0, int param1); -u32 sub_020270DC(const PokedexData *param0); -u32 sub_020270F8(const PokedexData *param0, int param1); -u32 sub_02027130(const PokedexData *param0); -u32 sub_02027154(const PokedexData *param0, int param1); -u32 sub_0202718C(const PokedexData *param0); -u32 sub_020271B0(const PokedexData *param0, int param1); -u32 sub_020271E8(const PokedexData *param0); -u32 sub_02027208(const PokedexData *param0, int param1); -u32 sub_02027240(const PokedexData *param0); -u32 sub_02027264(const PokedexData *param0, int param1); -u32 sub_02027288(const PokedexData *param0); -void sub_020272A4(PokedexData *param0, Pokemon *param1); -void sub_0202736C(PokedexData *param0, Pokemon *param1); -void sub_02027454(PokedexData *param0); -BOOL Pokedex_IsNationalDexObtained(const PokedexData *pokedex); -BOOL sub_02027494(const PokedexData *param0); -void sub_020274B0(PokedexData *param0); -BOOL sub_020274D0(const PokedexData *param0, u16 param1, u32 param2); -void sub_02027508(PokedexData *param0); -BOOL sub_02027514(const PokedexData *param0); -BOOL Pokedex_IsObtained(const PokedexData *pokedex); -void Pokedex_FlagObtained(PokedexData *param0); -PokedexData *SaveData_Pokedex(SaveData *saveData); -u32 sub_0202756C(const PokedexData *param0, int param1, int param2); -u32 sub_020276C8(const PokedexData *param0, int param1); +Pokedex *Pokedex_New(u32 param0); +void Pokedex_Copy(const Pokedex *src, Pokedex *dest); +void Pokedex_Init(Pokedex *param0); +u16 sub_02026DD0(const Pokedex *param0); +u16 Pokedex_CountSeenNational(const Pokedex *pokedex); +u16 Pokedex_CountSeen(const Pokedex *pokedex); +u16 sub_02026E64(const Pokedex *param0); +u16 Pokedex_CountSeenSinnoh(const Pokedex *pokedex); +BOOL sub_02026EF4(const Pokedex *param0); +BOOL sub_02026F0C(const Pokedex *param0); +u16 sub_02026F20(const Pokedex *param0); +u16 sub_02026F58(const Pokedex *param0); +BOOL Pokedex_HasCaughtSpecies(const Pokedex *pokedex, u16 species); +BOOL Pokedex_HasSeenSpecies(const Pokedex *pokedex, u16 species); +u32 sub_0202702C(const Pokedex *param0, u8 param1); +u32 sub_02027058(const Pokedex *param0, u16 param1, int param2); +u32 sub_020270AC(const Pokedex *param0, int param1); +u32 sub_020270DC(const Pokedex *param0); +u32 sub_020270F8(const Pokedex *param0, int param1); +u32 sub_02027130(const Pokedex *param0); +u32 sub_02027154(const Pokedex *param0, int param1); +u32 sub_0202718C(const Pokedex *param0); +u32 sub_020271B0(const Pokedex *param0, int param1); +u32 sub_020271E8(const Pokedex *param0); +u32 sub_02027208(const Pokedex *param0, int param1); +u32 sub_02027240(const Pokedex *param0); +u32 sub_02027264(const Pokedex *param0, int param1); +u32 sub_02027288(const Pokedex *param0); +void sub_020272A4(Pokedex *param0, Pokemon *param1); +void sub_0202736C(Pokedex *param0, Pokemon *param1); +void sub_02027454(Pokedex *param0); +BOOL Pokedex_IsNationalDexObtained(const Pokedex *pokedex); +BOOL sub_02027494(const Pokedex *param0); +void sub_020274B0(Pokedex *param0); +BOOL sub_020274D0(const Pokedex *param0, u16 param1, u32 param2); +void sub_02027508(Pokedex *param0); +BOOL sub_02027514(const Pokedex *param0); +BOOL Pokedex_IsObtained(const Pokedex *pokedex); +void Pokedex_FlagObtained(Pokedex *param0); +Pokedex *SaveData_Pokedex(SaveData *saveData); +u32 sub_0202756C(const Pokedex *param0, int param1, int param2); +u32 sub_020276C8(const Pokedex *param0, int param1); #endif // POKEPLATINUM_UNK_0202631C_H diff --git a/include/unk_0202CC64.h b/include/unk_0202CC64.h index 29b7633b45..c3f3d41883 100644 --- a/include/unk_0202CC64.h +++ b/include/unk_0202CC64.h @@ -7,7 +7,7 @@ int ChatotCry_SaveSize(void); void ChatotCry_Init(ChatotCry *param0); -ChatotCry *AllocateAndInitializeChatotCryData(int param0); +ChatotCry *ChatotCry_New(int param0); ChatotCry *GetChatotCryDataFromSave(SaveData *param0); BOOL IsChatotCryDataValid(const ChatotCry *param0); void ResetChatotCryDataStatus(ChatotCry *param0); diff --git a/include/unk_0206AFE0.h b/include/unk_0206AFE0.h index cfd3015fed..52a93c4818 100644 --- a/include/unk_0206AFE0.h +++ b/include/unk_0206AFE0.h @@ -11,76 +11,76 @@ enum HiddenLocations { HL_SEABREAKPATH = 3, }; -BOOL sub_0206B024(VarsFlags *param0, u16 param1); -u16 sub_0206B034(VarsFlags *param0); -BOOL sub_0206B044(VarsFlags *param0, u16 param1); -u16 sub_0206B054(VarsFlags *param0); -u16 sub_0206B064(VarsFlags *param0); -u16 sub_0206B08C(VarsFlags *param0); -u16 sub_0206B0B4(VarsFlags *param0); -BOOL sub_0206B0C4(VarsFlags *param0, u16 param1); -void VsSeeker_Reset(VarsFlags *param0); -u16 VsSeeker_GetBattery(VarsFlags *param0); -BOOL VsSeeker_SetBattery(VarsFlags *param0, u16 param1); -u16 VsSeeker_GetActiveStepCount(VarsFlags *param0); -BOOL VsSeeker_SetActiveStepCount(VarsFlags *param0, u16 param1); -void sub_0206B144(VarsFlags *param0, int param1); -BOOL sub_0206B16C(VarsFlags *param0, int param1); -void sub_0206B1B0(VarsFlags *param0, int param1); -void sub_0206B1D8(VarsFlags *param0, int param1); +BOOL sub_0206B024(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B034(VarsFlags *varsFlags); +BOOL sub_0206B044(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B054(VarsFlags *varsFlags); +u16 sub_0206B064(VarsFlags *varsFlags); +u16 VarsFlags_GetProfessorAssistantStarterSpecies(VarsFlags *varsFlags); +u16 sub_0206B0B4(VarsFlags *varsFlags); +BOOL sub_0206B0C4(VarsFlags *varsFlags, u16 param1); +void VsSeeker_Reset(VarsFlags *varsFlags); +u16 VsSeeker_GetBattery(VarsFlags *varsFlags); +BOOL VsSeeker_SetBattery(VarsFlags *varsFlags, u16 param1); +u16 VsSeeker_GetActiveStepCount(VarsFlags *varsFlags); +BOOL VsSeeker_SetActiveStepCount(VarsFlags *varsFlags, u16 param1); +void sub_0206B144(VarsFlags *varsFlags, int param1); +BOOL sub_0206B16C(VarsFlags *varsFlags, int param1); +void sub_0206B1B0(VarsFlags *varsFlags, int param1); +void sub_0206B1D8(VarsFlags *varsFlags, int param1); BOOL VarFlags_HiddenLocationsUnlocked(VarsFlags *varsFlags, int hiddenLocation); -BOOL sub_0206B218(VarsFlags *param0); -u16 sub_0206B228(VarsFlags *param0); -BOOL sub_0206B238(VarsFlags *param0); -u16 sub_0206B260(VarsFlags *param0); -BOOL sub_0206B270(VarsFlags *param0, u16 param1); -void sub_0206B280(VarsFlags *param0, u32 param1); -u32 sub_0206B2A4(VarsFlags *param0); -void sub_0206B2C8(VarsFlags *param0); +BOOL sub_0206B218(VarsFlags *varsFlags); +u16 sub_0206B228(VarsFlags *varsFlags); +BOOL sub_0206B238(VarsFlags *varsFlags); +u16 sub_0206B260(VarsFlags *varsFlags); +BOOL sub_0206B270(VarsFlags *varsFlags, u16 param1); +void sub_0206B280(VarsFlags *varsFlags, u32 param1); +u32 sub_0206B2A4(VarsFlags *varsFlags); +void sub_0206B2C8(VarsFlags *varsFlags); void sub_0206B2E4(SaveData *param0, u16 param1); -u16 sub_0206B314(VarsFlags *param0); -BOOL sub_0206B324(VarsFlags *param0, u16 param1); -void sub_0206B334(SaveData *param0); -u16 sub_0206B354(VarsFlags *param0); -BOOL sub_0206B364(VarsFlags *param0, u16 param1); -u16 sub_0206B374(VarsFlags *param0); -BOOL sub_0206B384(VarsFlags *param0, u16 param1); -u16 sub_0206B394(VarsFlags *param0); -BOOL sub_0206B3A4(VarsFlags *param0, u16 param1); -BOOL sub_0206B3B4(VarsFlags *param0); -u16 sub_0206B3DC(VarsFlags *param0); -u16 sub_0206B3EC(VarsFlags *param0); -BOOL sub_0206B3FC(VarsFlags *param0, u16 param1); -u16 sub_0206B40C(VarsFlags *param0); -BOOL sub_0206B41C(VarsFlags *param0, u16 param1); -u16 sub_0206B42C(VarsFlags *param0); -BOOL sub_0206B43C(VarsFlags *param0, u16 param1); -u16 sub_0206B44C(VarsFlags *param0); -void sub_0206B45C(VarsFlags *param0, u16 param1); -void sub_0206B46C(VarsFlags *param0, u16 param1); -u16 sub_0206B47C(VarsFlags *param0); -void sub_0206B48C(VarsFlags *param0, u16 param1); -void sub_0206B514(SaveData *param0); -void sub_0206B558(VarsFlags *param0, u16 param1); -u16 sub_0206B588(VarsFlags *param0); -u16 sub_0206B598(VarsFlags *param0); -u16 sub_0206B5A8(VarsFlags *param0); -u16 sub_0206B5B8(VarsFlags *param0); -u16 sub_0206B5C8(VarsFlags *param0); -u16 sub_0206B5D8(VarsFlags *param0); -void sub_0206B5E8(VarsFlags *param0, u16 param1); -u16 sub_0206B5F8(VarsFlags *param0); -void sub_0206B608(VarsFlags *param0, u16 param1); -u16 sub_0206B618(VarsFlags *param0); -void sub_0206B628(VarsFlags *param0, u16 param1); -void sub_0206B638(VarsFlags *param0, u16 param1); -void sub_0206B648(VarsFlags *param0, u16 param1); -void sub_0206B658(VarsFlags *param0, u16 param1); -void sub_0206B668(VarsFlags *param0, u16 param1); -void sub_0206B678(VarsFlags *param0, u16 param1); -void sub_0206B688(VarsFlags *param0, u16 param1, u16 param2); -u16 sub_0206B6DC(VarsFlags *param0); -void sub_0206B6EC(VarsFlags *param0, u16 param1); -u16 sub_0206B6FC(VarsFlags *param0); +u16 sub_0206B314(VarsFlags *varsFlags); +BOOL sub_0206B324(VarsFlags *varsFlags, u16 param1); +void sub_0206B334(SaveData *varsFlags); +u16 sub_0206B354(VarsFlags *varsFlags); +BOOL sub_0206B364(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B374(VarsFlags *varsFlags); +BOOL sub_0206B384(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B394(VarsFlags *varsFlags); +BOOL sub_0206B3A4(VarsFlags *varsFlags, u16 param1); +BOOL sub_0206B3B4(VarsFlags *varsFlags); +u16 sub_0206B3DC(VarsFlags *varsFlags); +u16 sub_0206B3EC(VarsFlags *varsFlags); +BOOL sub_0206B3FC(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B40C(VarsFlags *varsFlags); +BOOL sub_0206B41C(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B42C(VarsFlags *varsFlags); +BOOL sub_0206B43C(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B44C(VarsFlags *varsFlags); +void sub_0206B45C(VarsFlags *varsFlags, u16 param1); +void sub_0206B46C(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B47C(VarsFlags *varsFlags); +void sub_0206B48C(VarsFlags *varsFlags, u16 param1); +void sub_0206B514(SaveData *varsFlags); +void sub_0206B558(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B588(VarsFlags *varsFlags); +u16 sub_0206B598(VarsFlags *varsFlags); +u16 sub_0206B5A8(VarsFlags *varsFlags); +u16 sub_0206B5B8(VarsFlags *varsFlags); +u16 sub_0206B5C8(VarsFlags *varsFlags); +u16 sub_0206B5D8(VarsFlags *varsFlags); +void sub_0206B5E8(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B5F8(VarsFlags *varsFlags); +void sub_0206B608(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B618(VarsFlags *varsFlags); +void sub_0206B628(VarsFlags *varsFlags, u16 param1); +void sub_0206B638(VarsFlags *varsFlags, u16 param1); +void sub_0206B648(VarsFlags *varsFlags, u16 param1); +void sub_0206B658(VarsFlags *varsFlags, u16 param1); +void sub_0206B668(VarsFlags *varsFlags, u16 param1); +void sub_0206B678(VarsFlags *varsFlags, u16 param1); +void sub_0206B688(VarsFlags *varsFlags, u16 param1, u16 param2); +u16 sub_0206B6DC(VarsFlags *varsFlags); +void sub_0206B6EC(VarsFlags *varsFlags, u16 param1); +u16 sub_0206B6FC(VarsFlags *varsFlags); #endif // POKEPLATINUM_UNK_0206AFE0_H diff --git a/include/unk_0207A274.h b/include/unk_0207A274.h index 014c3bd556..9fccabebbf 100644 --- a/include/unk_0207A274.h +++ b/include/unk_0207A274.h @@ -6,7 +6,7 @@ #include "savedata.h" u32 sub_0207A274(SaveData *param0); -u32 sub_0207A280(const PokedexData *param0); +u32 sub_0207A280(const Pokedex *param0); u32 sub_0207A294(u32 param0, u32 param1); #endif // POKEPLATINUM_UNK_0207A274_H diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h index 2be7d3cb0d..870f2fa888 100644 --- a/include/unk_0207AE68.h +++ b/include/unk_0207AE68.h @@ -11,7 +11,7 @@ #include "pokemon.h" #include "poketch_data.h" -UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, PokedexData *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11); +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11); BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0); void sub_0207B0E0(UnkStruct_0207AE68 *param0); diff --git a/include/unk_0209747C.h b/include/unk_0209747C.h index 419af6a73f..baf36194d4 100644 --- a/include/unk_0209747C.h +++ b/include/unk_0209747C.h @@ -23,7 +23,7 @@ void sub_02097540(const UnkStruct_0209747C *param0, Sentence *param1); u32 sub_02097550(const UnkStruct_0209747C *param0); u32 sub_02097554(const UnkStruct_0209747C *param0); int sub_02097558(const UnkStruct_0209747C *param0); -const PokedexData *sub_0209755C(const UnkStruct_0209747C *param0); +const Pokedex *sub_0209755C(const UnkStruct_0209747C *param0); const UnkStruct_02014EC4 *sub_02097560(const UnkStruct_0209747C *param0); BOOL sub_02097564(const UnkStruct_0209747C *param0); BOOL sub_02097568(const UnkStruct_0209747C *param0); diff --git a/res/battle/scripts/subscripts/subscript_pursuit.s b/res/battle/scripts/subscripts/subscript_pursuit.s index 69b7ad33a9..e0ca7bf8bf 100644 --- a/res/battle/scripts/subscripts/subscript_pursuit.s +++ b/res/battle/scripts/subscripts/subscript_pursuit.s @@ -99,7 +99,7 @@ _176: _184: UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MOVE_HIT UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_FAINTED_MON - UpdateVar OPCODE_SET, BTLVAR_FAINTED_MON, BATTLER_PLAYER_SLOT_1 + UpdateVar OPCODE_SET, BTLVAR_FAINTED_MON, BATTLER_PLAYER_1 UpdateVarFromVar OPCODE_SET, BTLVAR_CALC_TEMP, BTLVAR_BATTLE_CTX_STATUS_2 UpdateVar OPCODE_RIGHT_SHIFT, BTLVAR_CALC_TEMP, 0x0000001C UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_PAYOUT_EXP @@ -109,7 +109,7 @@ _208: Call BATTLE_SUBSCRIPT_GRANT_EXP _215: - UpdateVar OPCODE_ADD, BTLVAR_FAINTED_MON, BATTLER_ENEMY_SLOT_1 + UpdateVar OPCODE_ADD, BTLVAR_FAINTED_MON, BATTLER_ENEMY_1 UpdateVar OPCODE_RIGHT_SHIFT, BTLVAR_CALC_TEMP, 0x00000001 CompareVarToValue OPCODE_NEQ, BTLVAR_CALC_TEMP, 0x00000000, _208 // BUG: Acid Rain (see docs/bugs_and_glitches.md) diff --git a/res/battle/scripts/subscripts/subscript_switch_pokemon.s b/res/battle/scripts/subscripts/subscript_switch_pokemon.s index b8f75aab17..45270275a6 100644 --- a/res/battle/scripts/subscripts/subscript_switch_pokemon.s +++ b/res/battle/scripts/subscripts/subscript_switch_pokemon.s @@ -42,7 +42,7 @@ _045: HealthbarSlideIn BTLSCR_SWITCHED_MON Wait Call BATTLE_SUBSCRIPT_HAZARDS_CHECK - CompareVarToValue OPCODE_GT, BTLVAR_FAINTED_MON, BATTLER_ENEMY_SLOT_2, _079 + CompareVarToValue OPCODE_GT, BTLVAR_FAINTED_MON, BATTLER_ENEMY_2, _079 UpdateVarFromVar OPCODE_FLAG_INDEX, BTLVAR_SCRIPT_TEMP, BTLVAR_FAINTED_MON UpdateVar OPCODE_LEFT_SHIFT, BTLVAR_SCRIPT_TEMP, 24 CompareVarToVar OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, BTLVAR_SCRIPT_TEMP, _079 diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c index 12396e74e1..6b251d5d7a 100644 --- a/src/battle/battle_controller.c +++ b/src/battle/battle_controller.c @@ -488,10 +488,10 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt BattleIO_StopGaugeAnimation(battleSys, i); battleCtx->curCommandState[i] = BATTLE_CONTROL_GET_BATTLE_MON; battleCtx->curCommandState[BattleSystem_Partner(battleSys, i)] = BATTLE_CONTROL_GET_BATTLE_MON; - } else if ((battleType & BATTLE_TYPE_DOUBLES) && i == BATTLER_PLAYER_SLOT_2) { + } else if ((battleType & BATTLE_TYPE_DOUBLES) && i == BATTLER_PLAYER_2) { BattleIO_StopGaugeAnimation(battleSys, i); - battleCtx->curCommandState[BATTLER_PLAYER_SLOT_1] = BATTLE_CONTROL_GET_BATTLE_MON; - battleCtx->curCommandState[BATTLER_PLAYER_SLOT_2] = BATTLE_CONTROL_GET_BATTLE_MON; + battleCtx->curCommandState[BATTLER_PLAYER_1] = BATTLE_CONTROL_GET_BATTLE_MON; + battleCtx->curCommandState[BATTLER_PLAYER_2] = BATTLE_CONTROL_GET_BATTLE_MON; } break; @@ -728,13 +728,13 @@ static void BattleController_CalcTurnOrder(BattleSystem *battleSys, BattleContex } } else { // If the player decided to Run using either of their mons, process that first. - if (battleCtx->battlerActions[BATTLER_PLAYER_SLOT_1][BATTLE_ACTION_SELECTED_COMMAND] == PLAYER_INPUT_RUN) { - battler = BATTLER_PLAYER_SLOT_1; + if (battleCtx->battlerActions[BATTLER_PLAYER_1][BATTLE_ACTION_SELECTED_COMMAND] == PLAYER_INPUT_RUN) { + battler = BATTLER_PLAYER_1; order = 5; } - if (battleCtx->battlerActions[BATTLER_PLAYER_SLOT_2][BATTLE_ACTION_SELECTED_COMMAND] == PLAYER_INPUT_RUN) { - battler = BATTLER_PLAYER_SLOT_2; + if (battleCtx->battlerActions[BATTLER_PLAYER_2][BATTLE_ACTION_SELECTED_COMMAND] == PLAYER_INPUT_RUN) { + battler = BATTLER_PLAYER_2; order = 5; } } @@ -4266,7 +4266,7 @@ static BOOL BattleController_CheckBattleOver(BattleSystem *battleSys, BattleCont // a link battle. if ((battleResult == BATTLE_RESULT_WIN && (battleType & BATTLE_TYPE_TRAINER) && (battleType & BATTLE_TYPE_LINK) == FALSE) || (battleResult == BATTLE_RESULT_WIN && (battleType & BATTLE_TYPE_FRONTIER) && (battleType & BATTLE_TYPE_LINK) == FALSE)) { - TrainerData *trainer = BattleSystem_TrainerData(battleSys, 1); + Trainer *trainer = BattleSystem_GetTrainer(battleSys, BATTLER_ENEMY_1); switch (trainer->class) { case TRAINER_CLASS_LEADER_ROARK: diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 1877999348..be91e73f0c 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -553,11 +553,9 @@ void ov16_0225D360(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022 v0->unk_0C = 0; } else { { - TrainerData *v1; - - v1 = BattleSystem_TrainerData(param0, param1->battler); + Trainer *trainer = BattleSystem_GetTrainer(param0, param1->battler); v0->unk_0B = 0; - v0->unk_0C = sub_020788D0(ov16_02264768(param0, param1->battler, v1->class)); + v0->unk_0C = sub_020788D0(ov16_02264768(param0, param1->battler, trainer->class)); } } @@ -1549,7 +1547,7 @@ static void ov16_0225E4E8(SysTask *param0, void *param1) sub_02007DEC(v0->unk_08, 44, 0); sub_02007DEC(v0->unk_08, 45, 0); sub_02007DEC(v0->unk_08, 0, v0->unk_14); - PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, ov16_0223EE28(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); + PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); { u8 v4; @@ -1591,7 +1589,7 @@ static void ov16_0225E4E8(SysTask *param0, void *param1) if (sub_020080C0(v0->unk_08, 0) <= v0->unk_14) { sub_02007DEC(v0->unk_08, 0, v0->unk_14); - PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, ov16_0223EE28(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); + PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); { u8 v5; @@ -1609,7 +1607,7 @@ static void ov16_0225E4E8(SysTask *param0, void *param1) } break; case 3: - if ((sub_020160F4(ov16_0223EE28(v0->unk_00), v0->unk_11) == 1) && (sub_02007C24(v0->unk_08) == 0)) { + if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_11) == 1) && (sub_02007C24(v0->unk_08) == 0)) { if (v0->unk_28) { { UnkStruct_ov16_02265BBC v6; @@ -1675,7 +1673,7 @@ static void ov16_0225E894(SysTask *param0, void *param1) sub_02007DEC(v0->unk_08, 44, 0); sub_02007DEC(v0->unk_08, 45, 0); sub_02007DEC(v0->unk_08, 1, v0->unk_14); - PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, ov16_0223EE28(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); + PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_08, v0->unk_16, v0->unk_13, 0, v0->unk_11); { u8 v4; @@ -1691,7 +1689,7 @@ static void ov16_0225E894(SysTask *param0, void *param1) } break; case 3: - if ((sub_020160F4(ov16_0223EE28(v0->unk_00), v0->unk_11) == 1) && (sub_02007C24(v0->unk_08) == 0)) { + if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_11) == 1) && (sub_02007C24(v0->unk_08) == 0)) { if (v0->unk_28) { { UnkStruct_ov16_02265BBC v5; @@ -1854,7 +1852,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) } } - PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, ov16_0223EE28(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); + PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); sub_020086FC(v0->unk_04->unk_20, 16, 0, 0, Unk_ov16_0226F1AE[v0->unk_8E]); v0->unk_83 = 5; @@ -1883,7 +1881,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) } } - PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, ov16_0223EE28(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); + PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); sub_020086FC(v0->unk_04->unk_20, 16, 0, 1, Unk_ov16_0226F1AE[v0->unk_8E]); v0->unk_83 = 5; @@ -1899,7 +1897,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1) } break; case 6: - if ((sub_020160F4(ov16_0223EE28(v0->unk_00), v0->unk_81) == 1) && (sub_02007C24(v0->unk_04->unk_20) == 0)) { + if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_81) == 1) && (sub_02007C24(v0->unk_04->unk_20) == 0)) { ov12_0223783C(v0->unk_04->unk_84); v0->unk_04->unk_84 = NULL; ov12_02236428(v0->unk_08); @@ -2048,7 +2046,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) } } - PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, ov16_0223EE28(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); + PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); sub_020086FC(v0->unk_04->unk_20, 16, 0, 0, Unk_ov16_0226F1AE[v0->unk_8E]); v0->unk_83 = 5; } else if (sub_020080C0(v0->unk_04->unk_20, 12) >= 0x100) { @@ -2076,7 +2074,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) } } - PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, ov16_0223EE28(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); + PokeSprite_LoadAnimation(v0->unk_04->unk_1A0, BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_04->unk_20, v0->unk_86, v0->unk_84, 0, v0->unk_81); sub_020086FC(v0->unk_04->unk_20, 16, 0, 1, Unk_ov16_0226F1AE[v0->unk_8E]); v0->unk_83 = 5; } else { @@ -2091,7 +2089,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1) } break; case 6: - if ((sub_020160F4(ov16_0223EE28(v0->unk_00), v0->unk_81) == 1) && (sub_02007C24(v0->unk_04->unk_20) == 0)) { + if ((sub_020160F4(BattleSystem_GetPokemonAnimationSystem(v0->unk_00), v0->unk_81) == 1) && (sub_02007C24(v0->unk_04->unk_20) == 0)) { ov12_0223783C(v0->unk_0C); ov12_02236428(v0->unk_08); @@ -2925,7 +2923,7 @@ static void ov16_022604C8(SysTask *param0, void *param1) break; case 1: v10.tags = 0; - v10.id = 1226 + ov16_0223E1B4(v0->unk_00, 0); + v10.id = 1226 + BattleSystem_GetTrainerGender(v0->unk_00, 0); v0->unk_35 = BattleMessage_Print(v0->unk_00, v9, &v10, BattleSystem_TextSpeed(v0->unk_00)); v0->unk_0A = 2; break; diff --git a/src/battle/battle_io.c b/src/battle/battle_io.c index 55d80d7a6d..99d94b8c62 100644 --- a/src/battle/battle_io.c +++ b/src/battle/battle_io.c @@ -1663,8 +1663,8 @@ static void PartyGaugeData_New(BattleSystem *battleSys, BattleContext *battleCtx || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, battler)) // either of the two opponents on the enemy side || ((battleType == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER) && Battler_Side(battleSys, battler)) // either of the two opponents on the enemy side || battleType == BATTLE_TYPE_FRONTIER_WITH_AI_PARTNER) { // frontier, AI partner - if (BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_PLAYER_SLOT_2 - || BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_ENEMY_SLOT_2) { + if (BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_PLAYER_2 + || BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_ENEMY_2) { battler1 = battler; battler2 = BattleSystem_Partner(battleSys, battler); } else { diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c index d103fbe5eb..07613998d9 100644 --- a/src/battle/battle_lib.c +++ b/src/battle/battle_lib.c @@ -1890,7 +1890,7 @@ BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *ba case CHECK_TRMSG_FIRST_DAMAGE: if (battleCtx->battleMons[BATTLER_THEM].timesDamaged == 1 && (battleCtx->battleStatusMask2 & SYSCTL_FIRST_DAMAGE_MSG_SHOWN) == FALSE - && TrainerData_HasMessageType(trID, TRMSG_FIRST_DAMAGE, HEAP_ID_BATTLE)) { + && Trainer_HasMessageType(trID, TRMSG_FIRST_DAMAGE, HEAP_ID_BATTLE)) { battleCtx->battleStatusMask2 |= SYSCTL_FIRST_DAMAGE_MSG_SHOWN; battleCtx->msgTemp = TRMSG_FIRST_DAMAGE; return TRUE; @@ -1902,7 +1902,7 @@ BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *ba case CHECK_TRMSG_ACTIVE_BATTLER_HALF_HP: if ((battleCtx->battleMons[BATTLER_THEM].trainerMessageFlags & TRMSG_ACTIVE_BATTLER_HALF_HP_FLAG) == FALSE && battleCtx->battleMons[BATTLER_THEM].curHP <= battleCtx->battleMons[BATTLER_THEM].maxHP / 2 - && TrainerData_HasMessageType(trID, TRMSG_ACTIVE_BATTLER_HALF_HP, HEAP_ID_BATTLE)) { + && Trainer_HasMessageType(trID, TRMSG_ACTIVE_BATTLER_HALF_HP, HEAP_ID_BATTLE)) { battleCtx->battleMons[BATTLER_THEM].trainerMessageFlags |= TRMSG_ACTIVE_BATTLER_HALF_HP_FLAG; battleCtx->msgTemp = TRMSG_ACTIVE_BATTLER_HALF_HP; return TRUE; @@ -1924,7 +1924,7 @@ BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *ba } } - if (alive == 1 && TrainerData_HasMessageType(trID, TRMSG_LAST_BATTLER, HEAP_ID_BATTLE)) { + if (alive == 1 && Trainer_HasMessageType(trID, TRMSG_LAST_BATTLER, HEAP_ID_BATTLE)) { battleCtx->battleMons[BATTLER_THEM].trainerMessageFlags |= TRMSG_LAST_BATTLER_FLAG; battleCtx->msgTemp = TRMSG_LAST_BATTLER; return TRUE; @@ -1949,7 +1949,7 @@ BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *ba if (alive == 1 && battleCtx->battleMons[BATTLER_THEM].curHP <= battleCtx->battleMons[BATTLER_THEM].maxHP / 2 - && TrainerData_HasMessageType(trID, TRMSG_LAST_BATTLER_HALF_HP, HEAP_ID_BATTLE)) { + && Trainer_HasMessageType(trID, TRMSG_LAST_BATTLER_HALF_HP, HEAP_ID_BATTLE)) { battleCtx->battleMons[BATTLER_THEM].trainerMessageFlags |= TRMSG_LAST_BATTLER_HALF_HP_FLAG; battleCtx->msgTemp = TRMSG_LAST_BATTLER_HALF_HP; return TRUE; @@ -2025,8 +2025,8 @@ void BattleContext_InitCounters(BattleSystem *battleSys, BattleContext *battleCt int battleType = BattleSystem_BattleType(battleSys); if ((battleType & BATTLE_TYPE_DOUBLES) == FALSE) { - battleCtx->battlersSwitchingMask |= FlagIndex(BATTLER_PLAYER_SLOT_2); - battleCtx->battlersSwitchingMask |= FlagIndex(BATTLER_ENEMY_SLOT_2); + battleCtx->battlersSwitchingMask |= FlagIndex(BATTLER_PLAYER_2); + battleCtx->battlersSwitchingMask |= FlagIndex(BATTLER_ENEMY_2); } battleCtx->safariCatchStage = 6; diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index fab08a5ee7..e1280e70d6 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -693,8 +693,8 @@ static BOOL BtlCmd_PokemonSlideIn(BattleSystem *battleSys, BattleContext *battle } } - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_1); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_2); break; case BTLSCR_ENEMY: @@ -714,8 +714,8 @@ static BOOL BtlCmd_PokemonSlideIn(BattleSystem *battleSys, BattleContext *battle battlerData = BattleSystem_BattlerData(battleSys, battleCtx->attacker); if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_1); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_2); } else { BattleSystem_ClearSideExpGain(battleCtx, battleCtx->attacker); BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, battleCtx->attacker); @@ -729,8 +729,8 @@ static BOOL BtlCmd_PokemonSlideIn(BattleSystem *battleSys, BattleContext *battle battlerData = BattleSystem_BattlerData(battleSys, battleCtx->defender); if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_1); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_2); } else { BattleSystem_ClearSideExpGain(battleCtx, battleCtx->defender); BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, battleCtx->defender); @@ -744,8 +744,8 @@ static BOOL BtlCmd_PokemonSlideIn(BattleSystem *battleSys, BattleContext *battle battlerData = BattleSystem_BattlerData(battleSys, battleCtx->switchedMon); if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_1); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_2); } else { BattleSystem_ClearSideExpGain(battleCtx, battleCtx->switchedMon); BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, battleCtx->switchedMon); @@ -799,8 +799,8 @@ static BOOL BtlCmd_PokemonSendOut(BattleSystem *battleSys, BattleContext *battle } } - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_1); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_2); break; case BTLSCR_ENEMY: @@ -820,8 +820,8 @@ static BOOL BtlCmd_PokemonSendOut(BattleSystem *battleSys, BattleContext *battle battlerData = BattleSystem_BattlerData(battleSys, battleCtx->attacker); if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_1); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_2); } else { BattleSystem_ClearSideExpGain(battleCtx, battleCtx->attacker); BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, battleCtx->attacker); @@ -835,8 +835,8 @@ static BOOL BtlCmd_PokemonSendOut(BattleSystem *battleSys, BattleContext *battle battlerData = BattleSystem_BattlerData(battleSys, battleCtx->defender); if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_1); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_2); } else { BattleSystem_ClearSideExpGain(battleCtx, battleCtx->defender); BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, battleCtx->defender); @@ -850,8 +850,8 @@ static BOOL BtlCmd_PokemonSendOut(BattleSystem *battleSys, BattleContext *battle battlerData = BattleSystem_BattlerData(battleSys, battleCtx->switchedMon); if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) { - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); - BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_1); + BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, BATTLER_ENEMY_2); } else { BattleSystem_ClearSideExpGain(battleCtx, battleCtx->switchedMon); BattleSystem_FlagBattlerExpGain(battleSys, battleCtx, battleCtx->switchedMon); @@ -2748,7 +2748,7 @@ static BOOL BtlCmd_SwitchAndUpdateMon(BattleSystem *battleSys, BattleContext *ba BattleSystem_SwitchSlots(battleSys, battleCtx, battler, battleCtx->selectedPartySlot[battler]); // cache the enemy's current HP (used for force-out moves like Whirlwind?) - battleCtx->hpTemp = battleCtx->battleMons[BATTLER_ENEMY_SLOT_1].curHP; + battleCtx->hpTemp = battleCtx->battleMons[BATTLER_ENEMY_1].curHP; BattleSystem_UpdateAfterSwitch(battleSys, battleCtx, battler); @@ -3876,44 +3876,44 @@ static u32 BattleScript_CalcPrizeMoney(BattleSystem *battleSys, BattleContext *b u8 lastLevel = 0; void *rawParty = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(TrainerMonWithMovesAndItem) * MAX_PARTY_SIZE); - TrainerData trdata; - TrainerData_Load(battleSys->trainerIDs[battler], &trdata); - TrainerData_LoadParty(battleSys->trainerIDs[battler], rawParty); + Trainer trainer; + Trainer_Load(battleSys->trainerIDs[battler], &trainer); + Trainer_LoadParty(battleSys->trainerIDs[battler], rawParty); - switch (trdata.type) { + switch (trainer.type) { default: case TRDATATYPE_BASE: { TrainerMonBase *party = (TrainerMonBase *)rawParty; - lastLevel = party[trdata.partySize - 1].level; + lastLevel = party[trainer.partySize - 1].level; break; } case TRDATATYPE_WITH_MOVES: { TrainerMonWithMoves *party = (TrainerMonWithMoves *)rawParty; - lastLevel = party[trdata.partySize - 1].level; + lastLevel = party[trainer.partySize - 1].level; break; } case TRDATATYPE_WITH_ITEM: { TrainerMonWithItem *party = (TrainerMonWithItem *)rawParty; - lastLevel = party[trdata.partySize - 1].level; + lastLevel = party[trainer.partySize - 1].level; break; } case TRDATATYPE_WITH_MOVES_AND_ITEM: { TrainerMonWithMovesAndItem *party = (TrainerMonWithMovesAndItem *)rawParty; - lastLevel = party[trdata.partySize - 1].level; + lastLevel = party[trainer.partySize - 1].level; break; } } u32 prize; if ((battleSys->battleType & BATTLE_TYPE_TAG) || battleSys->battleType == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER) { - prize = lastLevel * 4 * battleCtx->prizeMoneyMul * sTrainerClassPrizeMul[trdata.class]; + prize = lastLevel * 4 * battleCtx->prizeMoneyMul * sTrainerClassPrizeMul[trainer.class]; } else if (battleSys->battleType & 0x2) { - prize = lastLevel * 4 * battleCtx->prizeMoneyMul * 2 * sTrainerClassPrizeMul[trdata.class]; + prize = lastLevel * 4 * battleCtx->prizeMoneyMul * 2 * sTrainerClassPrizeMul[trainer.class]; } else { - prize = lastLevel * 4 * battleCtx->prizeMoneyMul * sTrainerClassPrizeMul[trdata.class]; + prize = lastLevel * 4 * battleCtx->prizeMoneyMul * sTrainerClassPrizeMul[trainer.class]; } Heap_FreeToHeap(rawParty); @@ -3936,10 +3936,10 @@ static BOOL BtlCmd_PayPrizeMoney(BattleSystem *battleSys, BattleContext *battleC u32 money; if (battleSys->resultMask == BATTLE_RESULT_WIN) { - money = BattleScript_CalcPrizeMoney(battleSys, battleCtx, BATTLER_ENEMY_SLOT_1); + money = BattleScript_CalcPrizeMoney(battleSys, battleCtx, BATTLER_ENEMY_1); if ((battleSys->battleType & BATTLE_TYPE_TAG) || battleSys->battleType == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER) { - money += BattleScript_CalcPrizeMoney(battleSys, battleCtx, BATTLER_ENEMY_SLOT_2); + money += BattleScript_CalcPrizeMoney(battleSys, battleCtx, BATTLER_ENEMY_2); } TrainerInfo_GiveMoney(BattleSystem_TrainerInfo(battleSys, BATTLER_US), money); @@ -9110,7 +9110,7 @@ static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleC // first condition here does not match as an AND of NEQs, must be a NOT of an OR of EQs if (!(battleType == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER || battleType == BATTLE_TYPE_AI_PARTNER) || Battler_Side(battleSys, battler) != BATTLER_US - || BattleSystem_BattlerSlot(battleSys, battler) != BATTLER_PLAYER_SLOT_2) { + || BattleSystem_BattlerSlot(battleSys, battler) != BATTLER_PLAYER_2) { for (i = 0; i < Party_GetCurrentCount(party2); i++) { mon = Party_GetPokemonBySlotIndex(party2, i); @@ -9958,8 +9958,8 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) // Declare victory if all wild mons have been defeated if ((battleType & BATTLE_TYPE_TRAINER) == FALSE - && data->battleCtx->battleMons[BATTLER_ENEMY_SLOT_1].curHP - + data->battleCtx->battleMons[BATTLER_ENEMY_SLOT_2].curHP + && data->battleCtx->battleMons[BATTLER_ENEMY_1].curHP + + data->battleCtx->battleMons[BATTLER_ENEMY_2].curHP == 0 && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) && data->battleCtx->expJinglePlayed == FALSE) { @@ -10777,7 +10777,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1) v12.unk_08 = v5; v12.unk_0C = 5; v12.unk_10 = BattleSystem_PartyPokemon(v2->battleSys, v1, v2->battleCtx->selectedPartySlot[v1]); - v12.unk_14 = sub_0207A280(ov16_0223E068(v2->battleSys)); + v12.unk_14 = sub_0207A280(BattleSystem_GetPokedex(v2->battleSys)); v2->tmpPtr[1] = sub_0201EE9C(); v2->tmpPtr[0] = ov21_021E8D48(&v12); v2->seqNum = 13; diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 9b72a0b86c..c92ffd8078 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -342,7 +342,7 @@ void ov16_0223B430(BattleSystem *param0) v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v1 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - param0->unk_198 = ov16_022687C8(v0, v1, param0, ov16_0223E1B4(param0, ov16_0223F6E4(param0)), param0->unk_1BC); + param0->unk_198 = ov16_022687C8(v0, v1, param0, BattleSystem_GetTrainerGender(param0, ov16_0223F6E4(param0)), param0->unk_1BC); Font_InitManager(FONT_SUBSCREEN, 5); @@ -561,7 +561,7 @@ static void ov16_0223B790(OverlayManager *param0) NARC *v6 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); NARC *v7 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - v0->unk_198 = ov16_022687C8(v6, v7, v0, ov16_0223E1B4(v0, ov16_0223F6E4(v0)), v0->unk_1BC); + v0->unk_198 = ov16_022687C8(v6, v7, v0, BattleSystem_GetTrainerGender(v0, ov16_0223F6E4(v0)), v0->unk_1BC); NARC_dtor(v6); NARC_dtor(v7); @@ -698,118 +698,118 @@ static int ov16_0223BBD0(OverlayManager *param0) static void ov16_0223BCB4(OverlayManager *param0) { - BattleSystem *v0 = OverlayManager_Data(param0); + BattleSystem *battleSystem = OverlayManager_Data(param0); FieldBattleDTO *v1 = OverlayManager_Args(param0); - int v2; + int battlerId; - v1->seed = v0->unk_2448; - v1->battleStatusMask = v0->battleStatusMask; + v1->seed = battleSystem->unk_2448; + v1->battleStatusMask = battleSystem->battleStatusMask; - if ((v0->battleStatusMask & 0x10) == 0) { + if ((battleSystem->battleStatusMask & 0x10) == 0) { sub_0202F8AC(v1); } - if (v0->overlayFlags != 0) { - BattleSystem_LoadFightOverlay(v0, 0); + if (battleSystem->overlayFlags != 0) { + BattleSystem_LoadFightOverlay(battleSystem, 0); } sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - ov16_0223EE70(v0); - - if (v0->resultMask != 0x4) { - ov16_0223EF68(v0, Party_GetPokemonBySlotIndex(v0->parties[1], 0)); - } - - for (v2 = 0; v2 < 4; v2++) { - Party_cpy(v0->parties[v2], v1->parties[v2]); - Heap_FreeToHeap(v0->parties[v2]); - TrainerInfo_Copy(v0->trainerInfo[v2], v1->trainerInfo[v2]); - Heap_FreeToHeap(v0->trainerInfo[v2]); - } - - sub_02015760(v0->unk_1AC); - Bag_Copy(v0->unk_58, v1->bag); - Heap_FreeToHeap(v0->unk_58); - Pokedex_Copy(v0->pokedex, v1->pokedex); - Heap_FreeToHeap(v0->pokedex); - - v1->pcBoxes = v0->pcBoxes; - v1->bagCursor = v0->unk_5C; - v1->subscreenCursorOn = v0->unk_1BC; - v1->poketchData = v0->poketchData; - v1->unk_10C = v0->unk_9C; - v1->countSafariBalls = v0->safariBalls; - v1->resultMask = v0->resultMask & (0xc0 ^ 0xff); - v1->caughtBattlerIdx = v0->unk_2438; - v1->leveledUpMonsMask = BattleContext_Get(v0, v0->battleCtx, 4, NULL); - v1->battleRecords.totalTurns += BattleContext_Get(v0, v0->battleCtx, 3, NULL); - v1->battleRecords.totalFainted += (BattleContext_Get(v0, v0->battleCtx, 6, 0) + BattleContext_Get(v0, v0->battleCtx, 6, 2)); - v1->battleRecords.totalDamage += (BattleContext_Get(v0, v0->battleCtx, 7, 0) + BattleContext_Get(v0, v0->battleCtx, 7, 2)); - v1->totalTurnsElapsed = BattleContext_Get(v0, v0->battleCtx, 3, NULL); - v1->unk_19C = v0->unk_2474_0; - - for (v2 = 0; v2 < 4; v2++) { - Heap_FreeToHeap(v0->unk_1CC[v2].unk_00); - } - - Heap_FreeToHeap(v0->msgBuffer); - PaletteData_FreeBuffer(v0->unk_28, 0); - PaletteData_FreeBuffer(v0->unk_28, 1); - PaletteData_FreeBuffer(v0->unk_28, 2); - PaletteData_FreeBuffer(v0->unk_28, 3); - PaletteData_Free(v0->unk_28); - MessageLoader_Free(v0->unk_0C); - MessageLoader_Free(v0->unk_10); - StringTemplate_Free(v0->strFormatter); - sub_02015FB8(v0->unk_1C4); + ov16_0223EE70(battleSystem); + + if (battleSystem->resultMask != 0x4) { + ov16_0223EF68(battleSystem, Party_GetPokemonBySlotIndex(battleSystem->parties[1], 0)); + } + + for (battlerId = 0; battlerId < MAX_BATTLERS; battlerId++) { + Party_cpy(battleSystem->parties[battlerId], v1->parties[battlerId]); + Heap_FreeToHeap(battleSystem->parties[battlerId]); + TrainerInfo_Copy(battleSystem->trainerInfo[battlerId], v1->trainerInfo[battlerId]); + Heap_FreeToHeap(battleSystem->trainerInfo[battlerId]); + } + + sub_02015760(battleSystem->unk_1AC); + Bag_Copy(battleSystem->unk_58, v1->bag); + Heap_FreeToHeap(battleSystem->unk_58); + Pokedex_Copy(battleSystem->pokedex, v1->pokedex); + Heap_FreeToHeap(battleSystem->pokedex); + + v1->pcBoxes = battleSystem->pcBoxes; + v1->bagCursor = battleSystem->unk_5C; + v1->subscreenCursorOn = battleSystem->unk_1BC; + v1->poketchData = battleSystem->poketchData; + v1->unk_10C = battleSystem->unk_9C; + v1->countSafariBalls = battleSystem->safariBalls; + v1->resultMask = battleSystem->resultMask & (0xc0 ^ 0xff); + v1->caughtBattlerIdx = battleSystem->unk_2438; + v1->leveledUpMonsMask = BattleContext_Get(battleSystem, battleSystem->battleCtx, 4, NULL); + v1->battleRecords.totalTurns += BattleContext_Get(battleSystem, battleSystem->battleCtx, 3, NULL); + v1->battleRecords.totalFainted += (BattleContext_Get(battleSystem, battleSystem->battleCtx, 6, 0) + BattleContext_Get(battleSystem, battleSystem->battleCtx, 6, 2)); + v1->battleRecords.totalDamage += (BattleContext_Get(battleSystem, battleSystem->battleCtx, 7, 0) + BattleContext_Get(battleSystem, battleSystem->battleCtx, 7, 2)); + v1->totalTurnsElapsed = BattleContext_Get(battleSystem, battleSystem->battleCtx, 3, NULL); + v1->unk_19C = battleSystem->unk_2474_0; + + for (battlerId = 0; battlerId < 4; battlerId++) { + Heap_FreeToHeap(battleSystem->unk_1CC[battlerId].unk_00); + } + + Heap_FreeToHeap(battleSystem->msgBuffer); + PaletteData_FreeBuffer(battleSystem->unk_28, 0); + PaletteData_FreeBuffer(battleSystem->unk_28, 1); + PaletteData_FreeBuffer(battleSystem->unk_28, 2); + PaletteData_FreeBuffer(battleSystem->unk_28, 3); + PaletteData_Free(battleSystem->unk_28); + MessageLoader_Free(battleSystem->unk_0C); + MessageLoader_Free(battleSystem->unk_10); + StringTemplate_Free(battleSystem->strFormatter); + sub_02015FB8(battleSystem->unk_1C4); sub_020141E4(); - ov12_0221FDF4(v0->unk_8C); - BattleContext_Free(v0->battleCtx); + ov12_0221FDF4(battleSystem->unk_8C); + BattleContext_Free(battleSystem->battleCtx); - for (v2 = 0; v2 < v0->maxBattlers; v2++) { - ov16_0225C104(v0, v0->battlers[v2], v0->unk_23F9); + for (battlerId = 0; battlerId < battleSystem->maxBattlers; battlerId++) { + ov16_0225C104(battleSystem, battleSystem->battlers[battlerId], battleSystem->unk_23F9); } - sub_02007B6C(v0->unk_88); + sub_02007B6C(battleSystem->unk_88); - if (v0->unk_23F9 != 2) { - ov16_0223B3E4(v0); + if (battleSystem->unk_23F9 != 2) { + ov16_0223B3E4(battleSystem); } RenderControlFlags_SetCanABSpeedUpPrint(0); RenderControlFlags_SetAutoScrollFlags(0); RenderControlFlags_SetSpeedUpOnTouch(0); - Windows_Delete(v0->windows, 3); - Heap_FreeToHeap(v0->unk_04); - Heap_FreeToHeap(v0->unk_21C); - Heap_FreeToHeap(v0->unk_220); - sub_0200C560(v0->unk_1A4); + Windows_Delete(battleSystem->windows, 3); + Heap_FreeToHeap(battleSystem->unk_04); + Heap_FreeToHeap(battleSystem->unk_21C); + Heap_FreeToHeap(battleSystem->unk_220); + sub_0200C560(battleSystem->unk_1A4); Font_Free(FONT_SUBSCREEN); - SysTask_Done(v0->unk_1C); - SysTask_Done(v0->unk_20); + SysTask_Done(battleSystem->unk_1C); + SysTask_Done(battleSystem->unk_20); sub_0201E530(); - ov16_0223CE20(v0->unk_00); + ov16_0223CE20(battleSystem->unk_00); - LCRNG_SetSeed(v0->unk_2430); + LCRNG_SetSeed(battleSystem->unk_2430); - if (ov16_0223F450(v0)) { + if (ov16_0223F450(battleSystem)) { Sound_StopEffect(1796, 0); } - sub_0201DCF0(v0->cellTransferState); + sub_0201DCF0(battleSystem->cellTransferState); - if (BattleSystem_RecordingStopped(v0)) { + if (BattleSystem_RecordingStopped(battleSystem)) { sub_0200500C(127); } - if (v0->playbackStopButton) { - ov16_0226E174(v0->playbackStopButton); + if (battleSystem->playbackStopButton) { + ov16_0226E174(battleSystem->playbackStopButton); } - Heap_FreeToHeap(v0); + Heap_FreeToHeap(battleSystem); Overlay_UnloadByID(FS_OVERLAY_ID(overlay11)); Overlay_UnloadByID(FS_OVERLAY_ID(overlay12)); @@ -1084,7 +1084,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->unk_58 = Bag_New(5); Bag_Copy(param1->bag, param0->unk_58); - param0->pokedex = sub_02026324(5); + param0->pokedex = Pokedex_New(5); Pokedex_Copy(param1->pokedex, param0->pokedex); param0->pcBoxes = param1->pcBoxes; @@ -1110,7 +1110,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) for (v0 = 0; v0 < 4; v0++) { param0->trainerIDs[v0] = param1->trainerIDs[v0]; - param0->trainers[v0] = param1->trainerData[v0]; + param0->trainers[v0] = param1->trainer[v0]; } param0->battleCtx = BattleContext_New(param0); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 177da54b91..d8531760c3 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -73,161 +73,161 @@ #include "unk_0202F1D4.h" #include "unk_0206CCB0.h" -BgConfig *BattleSystem_BGL(BattleSystem *param0); -u32 BattleSystem_BattleType(BattleSystem *param0); -BattleContext *BattleSystem_Context(BattleSystem *param0); -BattlerData *BattleSystem_BattlerData(BattleSystem *param0, int param1); -int BattleSystem_MaxBattlers(BattleSystem *param0); -Party *BattleSystem_Party(BattleSystem *param0, int param1); +BgConfig *BattleSystem_BGL(BattleSystem *battleSystem); +u32 BattleSystem_BattleType(BattleSystem *battleSystem); +BattleContext *BattleSystem_Context(BattleSystem *battleSystem); +BattlerData *BattleSystem_BattlerData(BattleSystem *battleSystem, int param1); +int BattleSystem_MaxBattlers(BattleSystem *battleSystem); +Party *BattleSystem_Party(BattleSystem *battleSystem, int param1); int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); -UnkStruct_02007768 *ov16_0223E000(BattleSystem *param0); -UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *param0); -SpriteRenderer *ov16_0223E010(BattleSystem *param0); -SpriteGfxHandler *ov16_0223E018(BattleSystem *param0); -UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *param0, int param1); -UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *param0); -UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *param0); -UnkStruct_0200C440 *ov16_0223E054(BattleSystem *param0); -MessageLoader *BattleSystem_MessageLoader(BattleSystem *param0); -MessageLoader *ov16_0223E060(BattleSystem *param0); -PaletteData *BattleSystem_PaletteSys(BattleSystem *param0); -PokedexData *ov16_0223E068(BattleSystem *param0); -u8 *ov16_0223E06C(BattleSystem *param0); -u8 *ov16_0223E074(BattleSystem *param0); -u16 *ov16_0223E080(BattleSystem *param0); -u16 *ov16_0223E08C(BattleSystem *param0); -u16 *ov16_0223E098(BattleSystem *param0); -u16 *ov16_0223E0A4(BattleSystem *param0); -u16 *ov16_0223E0B0(BattleSystem *param0); -u16 *ov16_0223E0BC(BattleSystem *param0); -UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *param0); -StringTemplate *BattleSystem_StringTemplate(BattleSystem *param0); -Strbuf *ov16_0223E0D4(BattleSystem *param0); -u16 Battler_TrainerID(BattleSystem *param0, int param1); -TrainerData *BattleSystem_TrainerData(BattleSystem *param0, int param1); +UnkStruct_02007768 *ov16_0223E000(BattleSystem *battleSystem); +UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSystem); +SpriteRenderer *ov16_0223E010(BattleSystem *battleSystem); +SpriteGfxHandler *ov16_0223E018(BattleSystem *battleSystem); +UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSystem, int param1); +UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *battleSystem); +UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *battleSystem); +UnkStruct_0200C440 *ov16_0223E054(BattleSystem *battleSystem); +MessageLoader *BattleSystem_MessageLoader(BattleSystem *battleSystem); +MessageLoader *ov16_0223E060(BattleSystem *battleSystem); +PaletteData *BattleSystem_PaletteSys(BattleSystem *battleSystem); +Pokedex *BattleSystem_GetPokedex(BattleSystem *battleSystem); +u8 *ov16_0223E06C(BattleSystem *battleSystem); +u8 *ov16_0223E074(BattleSystem *battleSystem); +u16 *ov16_0223E080(BattleSystem *battleSystem); +u16 *ov16_0223E08C(BattleSystem *battleSystem); +u16 *ov16_0223E098(BattleSystem *battleSystem); +u16 *ov16_0223E0A4(BattleSystem *battleSystem); +u16 *ov16_0223E0B0(BattleSystem *battleSystem); +u16 *ov16_0223E0BC(BattleSystem *battleSystem); +UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *battleSystem); +StringTemplate *BattleSystem_StringTemplate(BattleSystem *battleSystem); +Strbuf *ov16_0223E0D4(BattleSystem *battleSystem); +u16 Battler_TrainerID(BattleSystem *battleSystem, int param1); +Trainer *BattleSystem_GetTrainer(BattleSystem *battleSystem, int param1); TrainerInfo *BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler); -Bag *BattleSystem_Bag(BattleSystem *param0); -BagCursor *BattleSystem_BagCursor(BattleSystem *param0); -u32 ov16_0223E1B4(BattleSystem *param0, int param1); +Bag *BattleSystem_Bag(BattleSystem *battleSystem); +BagCursor *BattleSystem_BagCursor(BattleSystem *battleSystem); +u32 BattleSystem_GetTrainerGender(BattleSystem *battleSystem, int param1); int BattleSystem_BattlerOfType(BattleSystem *battleSys, int type); u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int battler); -u8 Battler_Side(BattleSystem *param0, int param1); -void *ov16_0223E220(BattleSystem *param0); -PCBoxes *ov16_0223E228(BattleSystem *param0); +u8 Battler_Side(BattleSystem *battleSystem, int param1); +void *ov16_0223E220(BattleSystem *battleSystem); +PCBoxes *ov16_0223E228(BattleSystem *battleSystem); enum Terrain BattleSystem_Terrain(BattleSystem *battleSys); -int ov16_0223E240(BattleSystem *param0); -int BattleSystem_MapHeader(BattleSystem *param0); +int ov16_0223E240(BattleSystem *battleSystem); +int BattleSystem_MapHeader(BattleSystem *battleSystem); int BattleSystem_Partner(BattleSystem *battleSys, int battler); int BattleSystem_EnemyInSlot(BattleSystem *battleSys, int attacker, int slot); BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot, int moveSlot, int item); -u32 ov16_0223EBEC(BattleSystem *param0); +u32 ov16_0223EBEC(BattleSystem *battleSystem); enum Time BattleSystem_Time(BattleSystem *battleSys); -int ov16_0223EC04(BattleSystem *param0); -u8 ov16_0223EC58(BattleSystem *param0, int param1, u8 param2); +int ov16_0223EC04(BattleSystem *battleSystem); +u8 ov16_0223EC58(BattleSystem *battleSystem, int param1, u8 param2); u16 ov16_0223ECC4(FieldBattleDTO *param0, int *param1, int *param2); -u8 ov16_0223ED60(BattleSystem *param0); -u8 ov16_0223ED6C(BattleSystem *param0); -int BattleSystem_NumSafariBalls(BattleSystem *param0); -void BattleSystem_SetSafariBalls(BattleSystem *param0, int param1); -Options *ov16_0223EDA4(BattleSystem *param0); +u8 ov16_0223ED60(BattleSystem *battleSystem); +u8 ov16_0223ED6C(BattleSystem *battleSystem); +int BattleSystem_NumSafariBalls(BattleSystem *battleSystem); +void BattleSystem_SetSafariBalls(BattleSystem *battleSystem, int param1); +Options *ov16_0223EDA4(BattleSystem *battleSystem); BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys); -int ov16_0223EDE0(BattleSystem *param0); -u8 BattleSystem_TextSpeed(BattleSystem *param0); -int BattleSystem_Ruleset(BattleSystem *param0); -PokemonAnimationSys *ov16_0223EE28(BattleSystem *param0); -ChatotCry *BattleSystem_ChatotVoice(BattleSystem *param0, int param1); -void ov16_0223EE70(BattleSystem *param0); -void ov16_0223EF2C(BattleSystem *param0, int param1, int param2); -void ov16_0223EF48(BattleSystem *param0, Pokemon *param1); -void ov16_0223EF68(BattleSystem *param0, Pokemon *param1); -void ov16_0223EF8C(BattleSystem *param0); -u8 *ov16_0223F1E8(BattleSystem *param0); -u16 *ov16_0223F1F0(BattleSystem *param0); -int ov16_0223F1F8(BattleSystem *param0); -u16 *ov16_0223F204(BattleSystem *param0); -u16 *ov16_0223F210(BattleSystem *param0); -int BattleSystem_FieldWeather(BattleSystem *param0); -u8 ov16_0223F228(BattleSystem *param0); -void ov16_0223F234(BattleSystem *param0, u8 param1); -int ov16_0223F240(BattleSystem *param0); -void ov16_0223F24C(BattleSystem *param0, int param1); -void ov16_0223F268(BattleSystem *param0); +int ov16_0223EDE0(BattleSystem *battleSystem); +u8 BattleSystem_TextSpeed(BattleSystem *battleSystem); +int BattleSystem_Ruleset(BattleSystem *battleSystem); +PokemonAnimationSys *BattleSystem_GetPokemonAnimationSystem(BattleSystem *battleSystem); +ChatotCry *BattleSystem_ChatotVoice(BattleSystem *battleSystem, int param1); +void ov16_0223EE70(BattleSystem *battleSystem); +void ov16_0223EF2C(BattleSystem *battleSystem, int param1, int param2); +void ov16_0223EF48(BattleSystem *battleSystem, Pokemon *param1); +void ov16_0223EF68(BattleSystem *battleSystem, Pokemon *param1); +void ov16_0223EF8C(BattleSystem *battleSystem); +u8 *ov16_0223F1E8(BattleSystem *battleSystem); +u16 *ov16_0223F1F0(BattleSystem *battleSystem); +int ov16_0223F1F8(BattleSystem *battleSystem); +u16 *ov16_0223F204(BattleSystem *battleSystem); +u16 *ov16_0223F210(BattleSystem *battleSystem); +int BattleSystem_FieldWeather(BattleSystem *battleSystem); +u8 ov16_0223F228(BattleSystem *battleSystem); +void ov16_0223F234(BattleSystem *battleSystem, u8 param1); +int ov16_0223F240(BattleSystem *battleSystem); +void ov16_0223F24C(BattleSystem *battleSystem, int param1); +void ov16_0223F268(BattleSystem *battleSystem); void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags); -void ov16_0223F290(BattleSystem *param0, int param1); -void *Battle_WaitDial(BattleSystem *param0); -void Battle_SetWaitDial(BattleSystem *param0, void *param1); +void ov16_0223F290(BattleSystem *battleSystem, int param1); +void *Battle_WaitDial(BattleSystem *battleSystem); +void Battle_SetWaitDial(BattleSystem *battleSystem, void *param1); u8 *ov16_0223F2B8(UnkStruct_ov16_0223E0C8 *param0, int param1); void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); void ov16_0223F2E4(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); void ov16_0223F2FC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); -void ov16_0223F314(BattleSystem *param0, int param1); -void ov16_0223F320(BattleSystem *param0, u8 *param1); -void ov16_0223F32C(BattleSystem *param0, u8 *param1); -void ov16_0223F338(BattleSystem *param0, u8 param1); -void ov16_0223F344(BattleSystem *param0, u8 param1); -void ov16_0223F350(BattleSystem *param0, u8 param1); -void ov16_0223F36C(BattleSystem *param0); -void ov16_0223F3BC(BattleSystem *param0); -void ov16_0223F3EC(BattleSystem *param0); -void ov16_0223F414(BattleSystem *param0); -u8 BattleSystem_ResultMask(BattleSystem *param0); -void BattleSystem_SetResultFlag(BattleSystem *param0, u8 param1); -u8 ov16_0223F450(BattleSystem *param0); -void BattleSystem_SetRedHPSoundFlag(BattleSystem *param0, u8 param1); -u8 ov16_0223F47C(BattleSystem *param0); -void ov16_0223F48C(BattleSystem *param0, u8 param1); -void ov16_0223F4B0(BattleSystem *param0, int param1); -u16 BattleSystem_RandNext(BattleSystem *param0); -u32 ov16_0223F4E8(BattleSystem *param0); -void ov16_0223F4F4(BattleSystem *param0, u32 param1); -void BattleSystem_Record(BattleSystem *param0, int param1, u8 param2); -BOOL ov16_0223F530(BattleSystem *param0, int param1, u8 *param2); -u8 ov16_0223F58C(BattleSystem *param0, u8 *param1); -void ov16_0223F638(BattleSystem *param0, u16 param1, u8 *param2); -u16 ov16_0223F6E4(BattleSystem *param0); -int ov16_0223F6F0(BattleSystem *param0, u16 param1); -u16 BattleSystem_TrainerItems(BattleSystem *param0, int param1, int param2); -u32 BattleSystem_RecordingStopped(BattleSystem *param0); +void ov16_0223F314(BattleSystem *battleSystem, int param1); +void ov16_0223F320(BattleSystem *battleSystem, u8 *param1); +void ov16_0223F32C(BattleSystem *battleSystem, u8 *param1); +void ov16_0223F338(BattleSystem *battleSystem, u8 param1); +void ov16_0223F344(BattleSystem *battleSystem, u8 param1); +void ov16_0223F350(BattleSystem *battleSystem, u8 param1); +void ov16_0223F36C(BattleSystem *battleSystem); +void ov16_0223F3BC(BattleSystem *battleSystem); +void ov16_0223F3EC(BattleSystem *battleSystem); +void ov16_0223F414(BattleSystem *battleSystem); +u8 BattleSystem_ResultMask(BattleSystem *battleSystem); +void BattleSystem_SetResultFlag(BattleSystem *battleSystem, u8 param1); +u8 ov16_0223F450(BattleSystem *battleSystem); +void BattleSystem_SetRedHPSoundFlag(BattleSystem *battleSystem, u8 param1); +u8 ov16_0223F47C(BattleSystem *battleSystem); +void ov16_0223F48C(BattleSystem *battleSystem, u8 param1); +void ov16_0223F4B0(BattleSystem *battleSystem, int param1); +u16 BattleSystem_RandNext(BattleSystem *battleSystem); +u32 ov16_0223F4E8(BattleSystem *battleSystem); +void ov16_0223F4F4(BattleSystem *battleSystem, u32 param1); +void BattleSystem_Record(BattleSystem *battleSystem, int param1, u8 param2); +BOOL ov16_0223F530(BattleSystem *battleSystem, int param1, u8 *param2); +u8 ov16_0223F58C(BattleSystem *battleSystem, u8 *param1); +void ov16_0223F638(BattleSystem *battleSystem, u16 param1, u8 *param2); +u16 ov16_0223F6E4(BattleSystem *battleSystem); +int ov16_0223F6F0(BattleSystem *battleSystem, u16 param1); +u16 BattleSystem_TrainerItems(BattleSystem *battleSystem, int param1, int param2); +u32 BattleSystem_RecordingStopped(BattleSystem *battleSystem); void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag); -BOOL ov16_0223F7A4(BattleSystem *param0); -void BattleSystem_ShowStopPlaybackButton(BattleSystem *param0); -u8 BattleSystem_RecordedChatter(BattleSystem *param0, int param1); -void ov16_0223F858(BattleSystem *param0, u8 *param1); -void ov16_0223F87C(BattleSystem *param0, u8 *param1); -void ov16_0223F8AC(BattleSystem *param0, Sprite **param1); -void BattleSystem_SetGaugePriority(BattleSystem *param0, int param1); +BOOL ov16_0223F7A4(BattleSystem *battleSystem); +void BattleSystem_ShowStopPlaybackButton(BattleSystem *battleSystem); +u8 BattleSystem_RecordedChatter(BattleSystem *battleSystem, int param1); +void ov16_0223F858(BattleSystem *battleSystem, u8 *param1); +void ov16_0223F87C(BattleSystem *battleSystem, u8 *param1); +void ov16_0223F8AC(BattleSystem *battleSystem, Sprite **param1); +void BattleSystem_SetGaugePriority(BattleSystem *battleSystem, int param1); u32 BattleSystem_CalcMoneyPenalty(Party *party, TrainerInfo *trainerInfo); -void BattleSystem_DexFlagSeen(BattleSystem *param0, int param1); -void ov16_0223F9A0(BattleSystem *param0, int param1); +void BattleSystem_DexFlagSeen(BattleSystem *battleSystem, int param1); +void ov16_0223F9A0(BattleSystem *battleSystem, int param1); BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species); void Battle_SetDefaultBlend(void); -u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int param4); -u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8); +u8 ov16_0223F9FC(BattleSystem *battleSystem, int param1, int param2, int param3, int param4); +u8 BattleMessage_PrintToWindow(BattleSystem *battleSystem, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8); static void BattleMessage_CheckSide(BattleSystem *battleSys, BattleMessage *battleMsg); static void BattleMessage_FillFormatBuffers(BattleSystem *battleSys, BattleMessage *battleMsg); static void BattleMessage_Format(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg); static BOOL BattleMessage_Callback(TextPrinterTemplate *param0, u16 param1); -static void BattleMessage_Nickname(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_MoveName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_ItemName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_Number(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_NumberDigits(BattleSystem *param0, u32 param1, int param2, int param3); -static void BattleMessage_TypeName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_AbilityName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_StatName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_StatusName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_PokemonName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_PoffinName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_FlavorName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_TrainerClassName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_TrainerName(BattleSystem *param0, u32 param1, int param2); -static void BattleMessage_PCBoxName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_Nickname(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_MoveName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_ItemName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_Number(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_NumberDigits(BattleSystem *battleSystem, u32 param1, int param2, int param3); +static void BattleMessage_TypeName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_AbilityName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_StatName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_StatusName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_PokemonName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_PoffinName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_FlavorName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_TrainerClassName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_TrainerName(BattleSystem *battleSystem, u32 param1, int param2); +static void BattleMessage_PCBoxName(BattleSystem *battleSystem, u32 param1, int param2); static u8 ov16_0223F6D4(u8 *param0, u8 *param1, u16 *param2); -BgConfig *BattleSystem_BGL(BattleSystem *param0) +BgConfig *BattleSystem_BGL(BattleSystem *battleSystem) { - return param0->unk_04; + return battleSystem->unk_04; } Window *BattleSystem_Window(BattleSystem *battleSys, int idx) @@ -255,14 +255,14 @@ int BattleSystem_MaxBattlers(BattleSystem *battleSys) return battleSys->maxBattlers; } -Party *BattleSystem_Party(BattleSystem *param0, int param1) +Party *BattleSystem_Party(BattleSystem *battleSystem, int param1) { - if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { - return param0->parties[param1]; - } else if (param0->battleType & 0x2) { - return param0->parties[param1 & 1]; + if ((battleSystem->battleType & 0x8) || ((battleSystem->battleType & 0x10) && (BattleSystem_BattlerSlot(battleSystem, param1) & 0x1))) { + return battleSystem->parties[param1]; + } else if (battleSystem->battleType & 0x2) { + return battleSystem->parties[param1 & 1]; } else { - return param0->parties[param1]; + return battleSystem->parties[param1]; } } @@ -282,7 +282,7 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler) Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot) { if ((battleSys->battleType & BATTLE_TYPE_2vs2) - || ((battleSys->battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_ENEMY_SLOT_1))) { + || ((battleSys->battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_ENEMY_1))) { return Party_GetPokemonBySlotIndex(battleSys->parties[battler], slot); } @@ -293,129 +293,129 @@ Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slo return Party_GetPokemonBySlotIndex(battleSys->parties[battler], slot); } -UnkStruct_02007768 *ov16_0223E000(BattleSystem *param0) +UnkStruct_02007768 *ov16_0223E000(BattleSystem *battleSystem) { - return param0->unk_88; + return battleSystem->unk_88; } -UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *param0) +UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *battleSystem) { - return param0->unk_8C; + return battleSystem->unk_8C; } -SpriteRenderer *ov16_0223E010(BattleSystem *param0) +SpriteRenderer *ov16_0223E010(BattleSystem *battleSystem) { - return param0->unk_90; + return battleSystem->unk_90; } -SpriteGfxHandler *ov16_0223E018(BattleSystem *param0) +SpriteGfxHandler *ov16_0223E018(BattleSystem *battleSystem) { - return param0->unk_94; + return battleSystem->unk_94; } -UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *param0, int param1) +UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *battleSystem, int param1) { - return ¶m0->unk_17C[param1]; + return &battleSystem->unk_17C[param1]; } -UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *param0) +UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *battleSystem) { - return param0->unk_198; + return battleSystem->unk_198; } -PartyGauge *ov16_0223E034(BattleSystem *param0, enum PartyGaugeSide param1) +PartyGauge *ov16_0223E034(BattleSystem *battleSystem, enum PartyGaugeSide param1) { - return param0->unk_19C[param1]; + return battleSystem->unk_19C[param1]; } -void ov16_0223E040(BattleSystem *param0, enum PartyGaugeSide param1, PartyGauge *param2) +void ov16_0223E040(BattleSystem *battleSystem, enum PartyGaugeSide param1, PartyGauge *param2) { - param0->unk_19C[param1] = param2; + battleSystem->unk_19C[param1] = param2; } -UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *param0) +UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *battleSystem) { - return param0->unk_1A4; + return battleSystem->unk_1A4; } -UnkStruct_0200C440 *ov16_0223E054(BattleSystem *param0) +UnkStruct_0200C440 *ov16_0223E054(BattleSystem *battleSystem) { - return param0->unk_1A8; + return battleSystem->unk_1A8; } -MessageLoader *BattleSystem_MessageLoader(BattleSystem *param0) +MessageLoader *BattleSystem_MessageLoader(BattleSystem *battleSystem) { - return param0->unk_0C; + return battleSystem->unk_0C; } -MessageLoader *ov16_0223E060(BattleSystem *param0) +MessageLoader *ov16_0223E060(BattleSystem *battleSystem) { - return param0->unk_10; + return battleSystem->unk_10; } -PaletteData *BattleSystem_PaletteSys(BattleSystem *param0) +PaletteData *BattleSystem_PaletteSys(BattleSystem *battleSystem) { - return param0->unk_28; + return battleSystem->unk_28; } -PokedexData *ov16_0223E068(BattleSystem *param0) +Pokedex *BattleSystem_GetPokedex(BattleSystem *battleSystem) { - return param0->pokedex; + return battleSystem->pokedex; } -u8 *ov16_0223E06C(BattleSystem *param0) +u8 *ov16_0223E06C(BattleSystem *battleSystem) { - return ¶m0->unk_224[0]; + return &battleSystem->unk_224[0]; } -u8 *ov16_0223E074(BattleSystem *param0) +u8 *ov16_0223E074(BattleSystem *battleSystem) { - return ¶m0->unk_1224[0]; + return &battleSystem->unk_1224[0]; } -u16 *ov16_0223E080(BattleSystem *param0) +u16 *ov16_0223E080(BattleSystem *battleSystem) { - return ¶m0->unk_23E4; + return &battleSystem->unk_23E4; } -u16 *ov16_0223E08C(BattleSystem *param0) +u16 *ov16_0223E08C(BattleSystem *battleSystem) { - return ¶m0->unk_23E6; + return &battleSystem->unk_23E6; } -u16 *ov16_0223E098(BattleSystem *param0) +u16 *ov16_0223E098(BattleSystem *battleSystem) { - return ¶m0->unk_23E8; + return &battleSystem->unk_23E8; } -u16 *ov16_0223E0A4(BattleSystem *param0) +u16 *ov16_0223E0A4(BattleSystem *battleSystem) { - return ¶m0->unk_23EA; + return &battleSystem->unk_23EA; } -u16 *ov16_0223E0B0(BattleSystem *param0) +u16 *ov16_0223E0B0(BattleSystem *battleSystem) { - return ¶m0->unk_23EC; + return &battleSystem->unk_23EC; } -u16 *ov16_0223E0BC(BattleSystem *param0) +u16 *ov16_0223E0BC(BattleSystem *battleSystem) { - return ¶m0->unk_23EE; + return &battleSystem->unk_23EE; } -UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *param0) +UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *battleSystem) { - return ¶m0->unk_1CC[0]; + return &battleSystem->unk_1CC[0]; } -StringTemplate *BattleSystem_StringTemplate(BattleSystem *param0) +StringTemplate *BattleSystem_StringTemplate(BattleSystem *battleSystem) { - return param0->strFormatter; + return battleSystem->strFormatter; } -Strbuf *ov16_0223E0D4(BattleSystem *param0) +Strbuf *ov16_0223E0D4(BattleSystem *battleSystem) { - return param0->msgBuffer; + return battleSystem->msgBuffer; } u16 Battler_TrainerID(BattleSystem *battleSys, int battler) @@ -432,14 +432,14 @@ u16 Battler_TrainerID(BattleSystem *battleSys, int battler) return battleSys->trainerIDs[battler]; } -TrainerData *BattleSystem_TrainerData(BattleSystem *param0, int param1) +Trainer *BattleSystem_GetTrainer(BattleSystem *battleSystem, int param1) { - if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { - return ¶m0->trainers[param1]; - } else if (param0->battleType & 0x2) { - return ¶m0->trainers[param1 & 1]; + if ((battleSystem->battleType & 0x8) || ((battleSystem->battleType & 0x10) && (BattleSystem_BattlerSlot(battleSystem, param1) & 0x1))) { + return &battleSystem->trainers[param1]; + } else if (battleSystem->battleType & 0x2) { + return &battleSystem->trainers[param1 & 1]; } else { - return ¶m0->trainers[param1]; + return &battleSystem->trainers[param1]; } } @@ -458,19 +458,19 @@ TrainerInfo *BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler) return battleSys->trainerInfo[battler]; } -Bag *BattleSystem_Bag(BattleSystem *param0) +Bag *BattleSystem_Bag(BattleSystem *battleSystem) { - return param0->unk_58; + return battleSystem->unk_58; } -BagCursor *BattleSystem_BagCursor(BattleSystem *param0) +BagCursor *BattleSystem_BagCursor(BattleSystem *battleSystem) { - return param0->unk_5C; + return battleSystem->unk_5C; } -u32 ov16_0223E1B4(BattleSystem *param0, int param1) +u32 BattleSystem_GetTrainerGender(BattleSystem *battleSystem, int param1) { - return TrainerInfo_Gender(param0->trainerInfo[param1]); + return TrainerInfo_Gender(battleSystem->trainerInfo[param1]); } int BattleSystem_BattlerOfType(BattleSystem *battleSys, int type) @@ -491,19 +491,19 @@ u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int battler) return Battler_Type(battleSys->battlers[battler]); } -u8 Battler_Side(BattleSystem *param0, int param1) +u8 Battler_Side(BattleSystem *battleSystem, int param1) { - return Battler_Type(param0->battlers[param1]) & 1; + return Battler_Type(battleSystem->battlers[param1]) & 1; } -void *ov16_0223E220(BattleSystem *param0) +void *ov16_0223E220(BattleSystem *battleSystem) { - return param0->unk_1AC; + return battleSystem->unk_1AC; } -PCBoxes *ov16_0223E228(BattleSystem *param0) +PCBoxes *ov16_0223E228(BattleSystem *battleSystem) { - return param0->pcBoxes; + return battleSystem->pcBoxes; } enum Terrain BattleSystem_Terrain(BattleSystem *battleSys) @@ -515,14 +515,14 @@ enum Terrain BattleSystem_Terrain(BattleSystem *battleSys) return battleSys->terrain; } -int ov16_0223E240(BattleSystem *param0) +int ov16_0223E240(BattleSystem *battleSystem) { - return param0->unk_2400; + return battleSystem->unk_2400; } -int BattleSystem_MapHeader(BattleSystem *param0) +int BattleSystem_MapHeader(BattleSystem *battleSystem) { - return param0->unk_2404; + return battleSystem->unk_2404; } int BattleSystem_Partner(BattleSystem *battleSys, int battler) @@ -901,18 +901,18 @@ enum Time BattleSystem_Time(BattleSystem *battleSys) return battleSys->time; } -int ov16_0223EC04(BattleSystem *param0) +int ov16_0223EC04(BattleSystem *battleSystem) { int v0; - switch (param0->unk_2400) { + switch (battleSystem->unk_2400) { case 0: case 1: case 2: case 3: case 4: case 5: - switch (param0->time) { + switch (battleSystem->time) { case 0: case 1: v0 = 0; @@ -934,19 +934,19 @@ int ov16_0223EC04(BattleSystem *param0) return v0; } -u8 ov16_0223EC58(BattleSystem *param0, int param1, u8 param2) +u8 ov16_0223EC58(BattleSystem *battleSystem, int param1, u8 param2) { u16 v0; - if ((BattleSystem_BattlerSlot(param0, param1) == 4) && ((param0->battleType & 0x8) == 0)) { - if (param0->battleType & 0x4) { - if ((param2 & FlagIndex(BattleSystem_Partner(param0, param1))) == 0) { + if ((BattleSystem_BattlerSlot(battleSystem, param1) == 4) && ((battleSystem->battleType & 0x8) == 0)) { + if (battleSystem->battleType & 0x4) { + if ((param2 & FlagIndex(BattleSystem_Partner(battleSystem, param1))) == 0) { return 1; } } else { - v0 = BattleContext_Get(param0, param0->battleCtx, 12, 0) & 0xffff; + v0 = BattleContext_Get(battleSystem, battleSystem->battleCtx, 12, 0) & 0xffff; - if (((BattleContext_Get(param0, param0->battleCtx, 8, 0) == 14) && (v0 > 16)) || (param2 & FlagIndex(0))) { + if (((BattleContext_Get(battleSystem, battleSystem->battleCtx, 8, 0) == 14) && (v0 > 16)) || (param2 & FlagIndex(0))) { return 0; } else { return 1; @@ -988,30 +988,30 @@ u16 ov16_0223ECC4(FieldBattleDTO *param0, int *param1, int *param2) return v1; } -u8 ov16_0223ED60(BattleSystem *param0) +u8 ov16_0223ED60(BattleSystem *battleSystem) { - return param0->unk_23F8; + return battleSystem->unk_23F8; } -u8 ov16_0223ED6C(BattleSystem *param0) +u8 ov16_0223ED6C(BattleSystem *battleSystem) { - GF_ASSERT(param0->battleCtx != NULL); - return BattleContext_Get(param0, param0->battleCtx, 5, NULL); + GF_ASSERT(battleSystem->battleCtx != NULL); + return BattleContext_Get(battleSystem, battleSystem->battleCtx, 5, NULL); } -int BattleSystem_NumSafariBalls(BattleSystem *param0) +int BattleSystem_NumSafariBalls(BattleSystem *battleSystem) { - return param0->safariBalls; + return battleSystem->safariBalls; } -void BattleSystem_SetSafariBalls(BattleSystem *param0, int param1) +void BattleSystem_SetSafariBalls(BattleSystem *battleSystem, int param1) { - param0->safariBalls = param1; + battleSystem->safariBalls = param1; } -Options *ov16_0223EDA4(BattleSystem *param0) +Options *ov16_0223EDA4(BattleSystem *battleSystem) { - return param0->unk_1B0; + return battleSystem->unk_1B0; } BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys) @@ -1024,57 +1024,57 @@ BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys) return Options_BattleScene(battleSys->unk_1B0) == OPTIONS_BATTLE_SCENE_ON; } -int ov16_0223EDE0(BattleSystem *param0) +int ov16_0223EDE0(BattleSystem *battleSystem) { - return Options_Frame(param0->unk_1B0); + return Options_Frame(battleSystem->unk_1B0); } -u8 BattleSystem_TextSpeed(BattleSystem *param0) +u8 BattleSystem_TextSpeed(BattleSystem *battleSystem) { - if ((param0->battleType & 0x4) && ((param0->battleStatusMask & 0x10) == 0)) { + if ((battleSystem->battleType & 0x4) && ((battleSystem->battleStatusMask & 0x10) == 0)) { return 1; } - return Options_TextFrameDelay(param0->unk_1B0); + return Options_TextFrameDelay(battleSystem->unk_1B0); } -int BattleSystem_Ruleset(BattleSystem *param0) +int BattleSystem_Ruleset(BattleSystem *battleSystem) { - return Options_BattleStyle(param0->unk_1B0); + return Options_BattleStyle(battleSystem->unk_1B0); } -PokemonAnimationSys *ov16_0223EE28(BattleSystem *param0) +PokemonAnimationSys *BattleSystem_GetPokemonAnimationSystem(BattleSystem *battleSystem) { - return param0->unk_1C4; + return battleSystem->unk_1C4; } -ChatotCry *BattleSystem_ChatotVoice(BattleSystem *param0, int param1) +ChatotCry *BattleSystem_ChatotVoice(BattleSystem *battleSystem, int param1) { - if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { - return param0->unk_78[param1]; - } else if (param0->battleType & 0x2) { - return param0->unk_78[param1 & 1]; + if ((battleSystem->battleType & 0x8) || ((battleSystem->battleType & 0x10) && (BattleSystem_BattlerSlot(battleSystem, param1) & 0x1))) { + return battleSystem->unk_78[param1]; + } else if (battleSystem->battleType & 0x2) { + return battleSystem->unk_78[param1 & 1]; } else { - return param0->unk_78[param1]; + return battleSystem->unk_78[param1]; } } -void ov16_0223EE70(BattleSystem *param0) +void ov16_0223EE70(BattleSystem *battleSystem) { int v0, v1; Pokemon *v2; u16 v3; - if (param0->battleType & (0x4 | 0x80 | 0x20 | 0x200)) { + if (battleSystem->battleType & (0x4 | 0x80 | 0x20 | 0x200)) { return; } - for (v0 = 0; v0 < BattleSystem_PartyCount(param0, 0); v0++) { - v2 = BattleSystem_PartyPokemon(param0, 0, v0); + for (v0 = 0; v0 < BattleSystem_PartyCount(battleSystem, 0); v0++) { + v2 = BattleSystem_PartyPokemon(battleSystem, 0, v0); v3 = Pokemon_GetValue(v2, MON_DATA_SPECIES_EGG, NULL); - if ((v3 == SPECIES_BURMY) && (param0->unk_2414[0] & FlagIndex(v0))) { - switch (BattleSystem_Terrain(param0)) { + if ((v3 == SPECIES_BURMY) && (battleSystem->unk_2414[0] & FlagIndex(v0))) { + switch (BattleSystem_Terrain(battleSystem)) { default: case TERRAIN_GRASS: v1 = 0; @@ -1108,37 +1108,37 @@ void ov16_0223EE70(BattleSystem *param0) } } -void ov16_0223EF2C(BattleSystem *param0, int param1, int param2) +void ov16_0223EF2C(BattleSystem *battleSystem, int param1, int param2) { - param0->unk_2414[param1] |= FlagIndex(param2); + battleSystem->unk_2414[param1] |= FlagIndex(param2); } -void ov16_0223EF48(BattleSystem *param0, Pokemon *param1) +void ov16_0223EF48(BattleSystem *battleSystem, Pokemon *param1) { - if (param0->poketchData) { - PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(param1)); + if (battleSystem->poketchData) { + PoketchData_PokemonHistoryEnqueue(battleSystem->poketchData, Pokemon_GetBoxPokemon(param1)); } } -void ov16_0223EF68(BattleSystem *param0, Pokemon *param1) +void ov16_0223EF68(BattleSystem *battleSystem, Pokemon *param1) { - sub_0206D160(param0->unk_9C, param1, param0->resultMask, param0->unk_241E, 5); + sub_0206D160(battleSystem->unk_9C, param1, battleSystem->resultMask, battleSystem->unk_241E, 5); } -void ov16_0223EF8C(BattleSystem *param0) +void ov16_0223EF8C(BattleSystem *battleSystem) { NNSG2dImageProxy *v0; int v1, v2, v3, v4, v5, v6; u8 *v7; - param0->unk_21C = Heap_AllocFromHeap(5, 0x10000); - param0->unk_220 = Heap_AllocFromHeap(5, 0x200); + battleSystem->unk_21C = Heap_AllocFromHeap(5, 0x10000); + battleSystem->unk_220 = Heap_AllocFromHeap(5, 0x200); - MI_CpuCopy32((void *)(HW_BG_VRAM + 0x10000), param0->unk_21C, 0x10000); - MI_CpuCopy32(PaletteData_GetUnfadedBuffer(param0->unk_28, 0), param0->unk_220, HW_BG_PLTT_SIZE); + MI_CpuCopy32((void *)(HW_BG_VRAM + 0x10000), battleSystem->unk_21C, 0x10000); + MI_CpuCopy32(PaletteData_GetUnfadedBuffer(battleSystem->unk_28, 0), battleSystem->unk_220, HW_BG_PLTT_SIZE); v7 = G2_GetOBJCharPtr(); - v0 = SpriteActor_ImageProxy(param0->unk_17C[1].unk_00->unk_00); + v0 = SpriteActor_ImageProxy(battleSystem->unk_17C[1].unk_00->unk_00); v7 += v0->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]; for (v2 = 20; v2 < 20 + 8; v2++) { @@ -1162,14 +1162,14 @@ void ov16_0223EF8C(BattleSystem *param0) } if (v5) { - param0->unk_21C[v2 * 0x800 + v1 * 0x40 + v6] = v5 + 0x70; + battleSystem->unk_21C[v2 * 0x800 + v1 * 0x40 + v6] = v5 + 0x70; } } } } v7 = G2_GetOBJCharPtr(); - v0 = SpriteActor_ImageProxy(param0->unk_17C[0].unk_00->unk_00); + v0 = SpriteActor_ImageProxy(battleSystem->unk_17C[0].unk_00->unk_00); v7 += v0->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]; for (v6 = 0; v6 < 0x40 * 32; v6++) { @@ -1180,7 +1180,7 @@ void ov16_0223EF8C(BattleSystem *param0) } if (v5) { - param0->unk_21C[19 * 0x800 + v6] = v5 + 0x70; + battleSystem->unk_21C[19 * 0x800 + v6] = v5 + 0x70; } } @@ -1197,41 +1197,41 @@ void ov16_0223EF8C(BattleSystem *param0) } if (v5) { - param0->unk_21C[v2 * 0x800 + v1 * 0x40 + v6] = v5 + 0x70; + battleSystem->unk_21C[v2 * 0x800 + v1 * 0x40 + v6] = v5 + 0x70; } } } } - Bg_LoadTiles(param0->unk_04, 3, param0->unk_21C, 0x10000, 0); + Bg_LoadTiles(battleSystem->unk_04, 3, battleSystem->unk_21C, 0x10000, 0); - ov16_02268700(¶m0->unk_17C[0]); - ov16_02268700(¶m0->unk_17C[1]); + ov16_02268700(&battleSystem->unk_17C[0]); + ov16_02268700(&battleSystem->unk_17C[1]); } -u8 *ov16_0223F1E8(BattleSystem *param0) +u8 *ov16_0223F1E8(BattleSystem *battleSystem) { - return param0->unk_21C; + return battleSystem->unk_21C; } -u16 *ov16_0223F1F0(BattleSystem *param0) +u16 *ov16_0223F1F0(BattleSystem *battleSystem) { - return param0->unk_220; + return battleSystem->unk_220; } -int ov16_0223F1F8(BattleSystem *param0) +int ov16_0223F1F8(BattleSystem *battleSystem) { - return param0->unk_2424; + return battleSystem->unk_2424; } -u16 *ov16_0223F204(BattleSystem *param0) +u16 *ov16_0223F204(BattleSystem *battleSystem) { - return ¶m0->unk_2224[0]; + return &battleSystem->unk_2224[0]; } -u16 *ov16_0223F210(BattleSystem *param0) +u16 *ov16_0223F210(BattleSystem *battleSystem) { - return ¶m0->unk_2304[0]; + return &battleSystem->unk_2304[0]; } int BattleSystem_FieldWeather(BattleSystem *battleSys) @@ -1239,37 +1239,37 @@ int BattleSystem_FieldWeather(BattleSystem *battleSys) return battleSys->fieldWeather; } -u8 ov16_0223F228(BattleSystem *param0) +u8 ov16_0223F228(BattleSystem *battleSystem) { - return param0->unk_241D; + return battleSystem->unk_241D; } -void ov16_0223F234(BattleSystem *param0, u8 param1) +void ov16_0223F234(BattleSystem *battleSystem, u8 param1) { - param0->unk_241D = param1; + battleSystem->unk_241D = param1; } -int ov16_0223F240(BattleSystem *param0) +int ov16_0223F240(BattleSystem *battleSystem) { - return param0->unk_242C; + return battleSystem->unk_242C; } -void ov16_0223F24C(BattleSystem *param0, int param1) +void ov16_0223F24C(BattleSystem *battleSystem, int param1) { - if (param0->battleStatusMask & 0x10) { + if (battleSystem->battleStatusMask & 0x10) { return; } - GameRecords_IncrementRecordValue(param0->records, param1); + GameRecords_IncrementRecordValue(battleSystem->records, param1); } -void ov16_0223F268(BattleSystem *param0) +void ov16_0223F268(BattleSystem *battleSystem) { - if (param0->battleStatusMask & 0x10) { + if (battleSystem->battleStatusMask & 0x10) { return; } - GameRecords_IncrementTrainerScore(param0->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); + GameRecords_IncrementTrainerScore(battleSystem->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); } void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags) @@ -1277,24 +1277,24 @@ void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags) battleSys->commandSelectionFlags = flags; } -void ov16_0223F290(BattleSystem *param0, int param1) +void ov16_0223F290(BattleSystem *battleSystem, int param1) { - param0->unk_2440 = param1; + battleSystem->unk_2440 = param1; } -void *Battle_WaitDial(BattleSystem *param0) +void *Battle_WaitDial(BattleSystem *battleSystem) { - return param0->unk_1B8; + return battleSystem->unk_1B8; } -void Battle_SetWaitDial(BattleSystem *param0, void *param1) +void Battle_SetWaitDial(BattleSystem *battleSystem, void *param1) { - param0->unk_1B8 = param1; + battleSystem->unk_1B8 = param1; } -UnkStruct_ov16_0223E0C8 *ov16_0223F2AC(BattleSystem *param0, int param1) +UnkStruct_ov16_0223E0C8 *ov16_0223F2AC(BattleSystem *battleSystem, int param1) { - return ¶m0->unk_1CC[param1]; + return &battleSystem->unk_1CC[param1]; } u8 *ov16_0223F2B8(UnkStruct_ov16_0223E0C8 *param0, int param1) @@ -1321,64 +1321,64 @@ void ov16_0223F2FC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2) param0[param1].unk_0C = param2; } -void ov16_0223F314(BattleSystem *param0, int param1) +void ov16_0223F314(BattleSystem *battleSystem, int param1) { - param0->unk_23F9 = param1; + battleSystem->unk_23F9 = param1; } -void ov16_0223F320(BattleSystem *param0, u8 *param1) +void ov16_0223F320(BattleSystem *battleSystem, u8 *param1) { - param0->unk_23F0 = param1; + battleSystem->unk_23F0 = param1; } -void ov16_0223F32C(BattleSystem *param0, u8 *param1) +void ov16_0223F32C(BattleSystem *battleSystem, u8 *param1) { - param0->unk_23F4 = param1; + battleSystem->unk_23F4 = param1; } -void ov16_0223F338(BattleSystem *param0, u8 param1) +void ov16_0223F338(BattleSystem *battleSystem, u8 param1) { - param0->unk_23F0[0] = param1; + battleSystem->unk_23F0[0] = param1; } -void ov16_0223F344(BattleSystem *param0, u8 param1) +void ov16_0223F344(BattleSystem *battleSystem, u8 param1) { - param0->unk_23F4[0] = param1; + battleSystem->unk_23F4[0] = param1; } -void ov16_0223F350(BattleSystem *param0, u8 param1) +void ov16_0223F350(BattleSystem *battleSystem, u8 param1) { - param0->unk_23FA = param1; + battleSystem->unk_23FA = param1; } -void *ov16_0223F35C(BattleSystem *param0, int param1) +void *ov16_0223F35C(BattleSystem *battleSystem, int param1) { - return ov16_02263B08(param0->battlers[param1]); + return ov16_02263B08(battleSystem->battlers[param1]); } -void ov16_0223F36C(BattleSystem *param0) +void ov16_0223F36C(BattleSystem *battleSystem) { int v0; Healthbar *v1; - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - v1 = ov16_02263B08(param0->battlers[v0]); + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + v1 = ov16_02263B08(battleSystem->battlers[v0]); - v1->battleSys = param0; - v1->type = Healthbar_Type(Battler_Type(param0->battlers[v0]), BattleSystem_BattleType(param0)); + v1->battleSys = battleSystem; + v1->type = Healthbar_Type(Battler_Type(battleSystem->battlers[v0]), BattleSystem_BattleType(battleSystem)); ov16_022672C4(v1); Healthbar_Enable(v1, 0); } } -void ov16_0223F3BC(BattleSystem *param0) +void ov16_0223F3BC(BattleSystem *battleSystem) { int v0; Healthbar *v1; - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - v1 = ov16_02263B08(param0->battlers[v0]); + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + v1 = ov16_02263B08(battleSystem->battlers[v0]); if (v1->curHP) { Healthbar_Enable(v1, 1); @@ -1386,120 +1386,120 @@ void ov16_0223F3BC(BattleSystem *param0) } } -void ov16_0223F3EC(BattleSystem *param0) +void ov16_0223F3EC(BattleSystem *battleSystem) { int v0; Healthbar *v1; - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - v1 = ov16_02263B08(param0->battlers[v0]); + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + v1 = ov16_02263B08(battleSystem->battlers[v0]); Healthbar_Enable(v1, 0); } } -void ov16_0223F414(BattleSystem *param0) +void ov16_0223F414(BattleSystem *battleSystem) { int v0; Healthbar *v1; - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - v1 = ov16_02263B08(param0->battlers[v0]); + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + v1 = ov16_02263B08(battleSystem->battlers[v0]); ov16_02267360(v1); } } -u8 BattleSystem_ResultMask(BattleSystem *param0) +u8 BattleSystem_ResultMask(BattleSystem *battleSystem) { - return param0->resultMask; + return battleSystem->resultMask; } -void BattleSystem_SetResultFlag(BattleSystem *param0, u8 param1) +void BattleSystem_SetResultFlag(BattleSystem *battleSystem, u8 param1) { - param0->resultMask = param1; + battleSystem->resultMask = param1; } -u8 ov16_0223F450(BattleSystem *param0) +u8 ov16_0223F450(BattleSystem *battleSystem) { - return param0->unk_23FB_3; + return battleSystem->unk_23FB_3; } -void BattleSystem_SetRedHPSoundFlag(BattleSystem *param0, u8 param1) +void BattleSystem_SetRedHPSoundFlag(BattleSystem *battleSystem, u8 param1) { - param0->unk_23FB_3 = param1; + battleSystem->unk_23FB_3 = param1; } -u8 ov16_0223F47C(BattleSystem *param0) +u8 ov16_0223F47C(BattleSystem *battleSystem) { - return param0->unk_23FB_5; + return battleSystem->unk_23FB_5; } -void ov16_0223F48C(BattleSystem *param0, u8 param1) +void ov16_0223F48C(BattleSystem *battleSystem, u8 param1) { GF_ASSERT(param1 < 15); - param0->unk_23FB_5 = param1; + battleSystem->unk_23FB_5 = param1; } -void ov16_0223F4B0(BattleSystem *param0, int param1) +void ov16_0223F4B0(BattleSystem *battleSystem, int param1) { - param0->unk_2438 = param1; + battleSystem->unk_2438 = param1; } -u16 BattleSystem_RandNext(BattleSystem *param0) +u16 BattleSystem_RandNext(BattleSystem *battleSystem) { - param0->unk_2444 = param0->unk_2444 * 1103515245L + 24691; - return (u16)(param0->unk_2444 / 65536L); + battleSystem->unk_2444 = battleSystem->unk_2444 * 1103515245L + 24691; + return (u16)(battleSystem->unk_2444 / 65536L); } -u32 ov16_0223F4E8(BattleSystem *param0) +u32 ov16_0223F4E8(BattleSystem *battleSystem) { - return param0->unk_2448; + return battleSystem->unk_2448; } -void ov16_0223F4F4(BattleSystem *param0, u32 param1) +void ov16_0223F4F4(BattleSystem *battleSystem, u32 param1) { - param0->unk_2448 = param1; + battleSystem->unk_2448 = param1; } -void BattleSystem_Record(BattleSystem *param0, int param1, u8 param2) +void BattleSystem_Record(BattleSystem *battleSystem, int param1, u8 param2) { - if (((param0->battleStatusMask & 0x10) == 0) && (param0->unk_245C[param1] < 0x400)) { - sub_0202F868(param1, param0->unk_245C[param1], param2); - param0->unk_245C[param1]++; + if (((battleSystem->battleStatusMask & 0x10) == 0) && (battleSystem->unk_245C[param1] < 0x400)) { + sub_0202F868(param1, battleSystem->unk_245C[param1], param2); + battleSystem->unk_245C[param1]++; } } -BOOL ov16_0223F530(BattleSystem *param0, int param1, u8 *param2) +BOOL ov16_0223F530(BattleSystem *battleSystem, int param1, u8 *param2) { BOOL v0; *param2 = 0xff; - if ((param0->battleStatusMask & 0x10) && (param0->unk_245C[param1] < 0x400)) { - *param2 = sub_0202F884(param1, param0->unk_245C[param1]); - param0->unk_245C[param1]++; + if ((battleSystem->battleStatusMask & 0x10) && (battleSystem->unk_245C[param1] < 0x400)) { + *param2 = sub_0202F884(param1, battleSystem->unk_245C[param1]); + battleSystem->unk_245C[param1]++; v0 = 0; - } else if ((param0->battleStatusMask & 0x10) && (param0->unk_245C[param1] >= 0x400)) { + } else if ((battleSystem->battleStatusMask & 0x10) && (battleSystem->unk_245C[param1] >= 0x400)) { v0 = 1; } return v0; } -u8 ov16_0223F58C(BattleSystem *param0, u8 *param1) +u8 ov16_0223F58C(BattleSystem *battleSystem, u8 *param1) { u8 v0, v1; u8 v2 = 0; - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - if (param0->unk_245C[v0] != param0->unk_244C[v0]) { + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + if (battleSystem->unk_245C[v0] != battleSystem->unk_244C[v0]) { param1[v2++] = v0; - param1[v2++] = param0->unk_245C[v0] - param0->unk_244C[v0]; + param1[v2++] = battleSystem->unk_245C[v0] - battleSystem->unk_244C[v0]; - for (v1 = 0; v1 < param0->unk_245C[v0] - param0->unk_244C[v0]; v1++) { - param1[v2++] = sub_0202F884(v0, param0->unk_244C[v0] + v1); + for (v1 = 0; v1 < battleSystem->unk_245C[v0] - battleSystem->unk_244C[v0]; v1++) { + param1[v2++] = sub_0202F884(v0, battleSystem->unk_244C[v0] + v1); } - param0->unk_244C[v0] = param0->unk_245C[v0]; + battleSystem->unk_244C[v0] = battleSystem->unk_245C[v0]; } } @@ -1507,18 +1507,18 @@ u8 ov16_0223F58C(BattleSystem *param0, u8 *param1) return v2; } -void ov16_0223F638(BattleSystem *param0, u16 param1, u8 *param2) +void ov16_0223F638(BattleSystem *battleSystem, u16 param1, u8 *param2) { int v0; u8 v1; u8 v2; u8 v3 = 0; - if ((param0->battleType & 0x4) == 0) { + if ((battleSystem->battleType & 0x4) == 0) { return; } - if (param0->unk_23F8) { + if (battleSystem->unk_23F8) { return; } @@ -1527,10 +1527,10 @@ void ov16_0223F638(BattleSystem *param0, u16 param1, u8 *param2) v2 = ov16_0223F6D4(param2, &v3, ¶m1); for (v0 = 0; v0 < v2; v0++) { - sub_0202F868(v1, param0->unk_2454[v1] + v0, ov16_0223F6D4(param2, &v3, ¶m1)); + sub_0202F868(v1, battleSystem->unk_2454[v1] + v0, ov16_0223F6D4(param2, &v3, ¶m1)); } - param0->unk_2454[v1] += v2; + battleSystem->unk_2454[v1] += v2; } } @@ -1540,24 +1540,24 @@ static u8 ov16_0223F6D4(u8 *param0, u8 *param1, u16 *param2) return param0[param1[0]++]; } -u16 ov16_0223F6E4(BattleSystem *param0) +u16 ov16_0223F6E4(BattleSystem *battleSystem) { - return param0->unk_2442; + return battleSystem->unk_2442; } -int ov16_0223F6F0(BattleSystem *param0, u16 param1) +int ov16_0223F6F0(BattleSystem *battleSystem, u16 param1) { - return param0->unk_2464[param1]; + return battleSystem->unk_2464[param1]; } -u16 BattleSystem_TrainerItems(BattleSystem *param0, int param1, int param2) +u16 BattleSystem_TrainerItems(BattleSystem *battleSystem, int param1, int param2) { - return param0->trainers[param1].items[param2]; + return battleSystem->trainers[param1].items[param2]; } -u32 BattleSystem_RecordingStopped(BattleSystem *param0) +u32 BattleSystem_RecordingStopped(BattleSystem *battleSystem) { - return param0->unk_2474_0; + return battleSystem->unk_2474_0; } void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag) @@ -1577,9 +1577,9 @@ void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag) return; } -BOOL ov16_0223F7A4(BattleSystem *param0) +BOOL ov16_0223F7A4(BattleSystem *battleSystem) { - if (((param0->battleStatusMask & 0x10) == 0) || (param0->unk_2474_0) || (BattleContext_Get(param0, param0->battleCtx, 13, 0) == 43) || (BattleContext_Get(param0, param0->battleCtx, 14, 0) == 43)) { + if (((battleSystem->battleStatusMask & 0x10) == 0) || (battleSystem->unk_2474_0) || (BattleContext_Get(battleSystem, battleSystem->battleCtx, 13, 0) == 43) || (BattleContext_Get(battleSystem, battleSystem->battleCtx, 14, 0) == 43)) { return 0; } @@ -1596,27 +1596,27 @@ void BattleSystem_ShowStopPlaybackButton(BattleSystem *battleSys) battleSys->playbackStopButton = ov16_0226E148(battleSys); } -u8 BattleSystem_RecordedChatter(BattleSystem *param0, int param1) +u8 BattleSystem_RecordedChatter(BattleSystem *battleSystem, int param1) { - if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { - return param0->unk_247C[param1]; - } else if (param0->battleType & 0x2) { - return param0->unk_247C[param1 & 1]; + if ((battleSystem->battleType & 0x8) || ((battleSystem->battleType & 0x10) && (BattleSystem_BattlerSlot(battleSystem, param1) & 0x1))) { + return battleSystem->unk_247C[param1]; + } else if (battleSystem->battleType & 0x2) { + return battleSystem->unk_247C[param1 & 1]; } else { - return param0->unk_247C[param1]; + return battleSystem->unk_247C[param1]; } } -void ov16_0223F858(BattleSystem *param0, u8 *param1) +void ov16_0223F858(BattleSystem *battleSystem, u8 *param1) { int v0; - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - param1[Battler_Type(param0->battlers[v0])] = v0; + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + param1[Battler_Type(battleSystem->battlers[v0])] = v0; } } -void ov16_0223F87C(BattleSystem *param0, u8 *param1) +void ov16_0223F87C(BattleSystem *battleSystem, u8 *param1) { int v0; @@ -1624,12 +1624,12 @@ void ov16_0223F87C(BattleSystem *param0, u8 *param1) param1[v0] = 0xff; } - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - param1[v0] = Battler_Type(param0->battlers[v0]); + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + param1[v0] = Battler_Type(battleSystem->battlers[v0]); } } -void ov16_0223F8AC(BattleSystem *param0, Sprite **param1) +void ov16_0223F8AC(BattleSystem *battleSystem, Sprite **param1) { int v0; @@ -1637,18 +1637,18 @@ void ov16_0223F8AC(BattleSystem *param0, Sprite **param1) param1[v0] = NULL; } - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - param1[v0] = ov16_02263AFC(param0->battlers[v0]); + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + param1[v0] = ov16_02263AFC(battleSystem->battlers[v0]); } } -void BattleSystem_SetGaugePriority(BattleSystem *param0, int param1) +void BattleSystem_SetGaugePriority(BattleSystem *battleSystem, int param1) { int v0; Healthbar *v1; - for (v0 = 0; v0 < param0->maxBattlers; v0++) { - v1 = ov16_02263B08(param0->battlers[v0]); + for (v0 = 0; v0 < battleSystem->maxBattlers; v0++) { + v1 = ov16_02263B08(battleSystem->battlers[v0]); ov16_022675D8(v1, param1); } } @@ -1678,43 +1678,43 @@ u32 BattleSystem_CalcMoneyPenalty(Party *party, TrainerInfo *trainerInfo) return penalty; } -void BattleSystem_DexFlagSeen(BattleSystem *param0, int param1) +void BattleSystem_DexFlagSeen(BattleSystem *battleSystem, int param1) { int v0; Pokemon *v1; int v2; - v0 = Battler_Type(param0->battlers[param1]); - v2 = BattleContext_Get(param0, param0->battleCtx, 2, param1); - v1 = BattleSystem_PartyPokemon(param0, param1, v2); + v0 = Battler_Type(battleSystem->battlers[param1]); + v2 = BattleContext_Get(battleSystem, battleSystem->battleCtx, 2, param1); + v1 = BattleSystem_PartyPokemon(battleSystem, param1, v2); - if ((param0->battleType & (0x4 | 0x80)) == 0) { - if ((v0 & 0x1) || (param0->battleType == (0x2 | 0x8 | 0x40)) || (param0->battleType == ((0x2 | 0x1) | 0x8 | 0x40))) { - sub_020272A4(param0->pokedex, v1); + if ((battleSystem->battleType & (0x4 | 0x80)) == 0) { + if ((v0 & 0x1) || (battleSystem->battleType == (0x2 | 0x8 | 0x40)) || (battleSystem->battleType == ((0x2 | 0x1) | 0x8 | 0x40))) { + sub_020272A4(battleSystem->pokedex, v1); } } if (((v0 & 0x1) == 0) && (Pokemon_GetValue(v1, MON_DATA_SPECIES_EGG, NULL) == 412)) { - sub_0202736C(param0->pokedex, v1); + sub_0202736C(battleSystem->pokedex, v1); } } -void ov16_0223F9A0(BattleSystem *param0, int param1) +void ov16_0223F9A0(BattleSystem *battleSystem, int param1) { int v0; - v0 = Battler_Type(param0->battlers[param1]); + v0 = Battler_Type(battleSystem->battlers[param1]); - if ((param0->battleType & (0x4 | 0x80)) == 0) { + if ((battleSystem->battleType & (0x4 | 0x80)) == 0) { if (v0 & 0x1) { { Pokemon *v1; int v2; - v2 = BattleContext_Get(param0, param0->battleCtx, 2, param1); - v1 = BattleSystem_PartyPokemon(param0, param1, v2); + v2 = BattleContext_Get(battleSystem, battleSystem->battleCtx, 2, param1); + v1 = BattleSystem_PartyPokemon(battleSystem, param1, v2); - sub_0202736C(param0->pokedex, v1); + sub_0202736C(battleSystem->pokedex, v1); } } } @@ -1730,20 +1730,20 @@ void Battle_SetDefaultBlend(void) G2_BlendNone(); } -u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int param4) +u8 ov16_0223F9FC(BattleSystem *battleSystem, int param1, int param2, int param3, int param4) { - Window *v0 = BattleSystem_Window(param0, 0); + Window *v0 = BattleSystem_Window(battleSystem, 0); int v1; - if (param0->battleType & 0x80) { + if (battleSystem->battleType & 0x80) { if (param1 == 10000) { { Strbuf *v2; if (param3 == 100) { - v2 = sub_02014B34(¶m0->trainers[param2].winMsg, 5); + v2 = sub_02014B34(&battleSystem->trainers[param2].winMsg, 5); } else { - v2 = sub_02014B34(¶m0->trainers[param2].loseMsg, 5); + v2 = sub_02014B34(&battleSystem->trainers[param2].loseMsg, 5); } Window_FillTilemap(v0, 0xff); @@ -1765,7 +1765,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p } for (v7 = 0; v7 < 4; v7++) { - if (TrainerInfo_GameCode(param0->trainerInfo[v7]) == 0) { + if (TrainerInfo_GameCode(battleSystem->trainerInfo[v7]) == 0) { break; } } @@ -1787,9 +1787,9 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p } } } else { - TrainerData_LoadMessage(param1, param3, param0->msgBuffer, 5); + Trainer_LoadMessage(param1, param3, battleSystem->msgBuffer, 5); Window_FillTilemap(v0, 0xff); - v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, param0->msgBuffer, 0, 0, param4, BattleMessage_Callback); + v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, battleSystem->msgBuffer, 0, 0, param4, BattleMessage_Callback); } return v1; @@ -1808,25 +1808,25 @@ u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, Battle return Text_AddPrinterWithParams(textWindow, FONT_MESSAGE, battleSys->msgBuffer, 0, 0, renderDelay, BattleMessage_Callback); } -u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8) +u8 BattleMessage_PrintToWindow(BattleSystem *battleSystem, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8) { int v0; - BattleMessage_CheckSide(param0, param3); - BattleMessage_FillFormatBuffers(param0, param3); - BattleMessage_Format(param0, param2, param3); + BattleMessage_CheckSide(battleSystem, param3); + BattleMessage_FillFormatBuffers(battleSystem, param3); + BattleMessage_Format(battleSystem, param2, param3); if (param6 & 0x1) { Window_FillTilemap(param1, 0xff); } if (param6 & 0x2) { - v0 = param7 - Font_CalcStrbufWidth(FONT_SYSTEM, param0->msgBuffer, 0); + v0 = param7 - Font_CalcStrbufWidth(FONT_SYSTEM, battleSystem->msgBuffer, 0); } else { v0 = 0; } - return Text_AddPrinterWithParams(param1, FONT_SYSTEM, param0->msgBuffer, param4 + v0, param5, param8, BattleMessage_Callback); + return Text_AddPrinterWithParams(param1, FONT_SYSTEM, battleSystem->msgBuffer, param4 + v0, param5, param8, BattleMessage_Callback); } /** @@ -2336,95 +2336,95 @@ static void BattleMessage_FillFormatBuffers(BattleSystem *battleSys, BattleMessa } } -static void BattleMessage_Nickname(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_Nickname(BattleSystem *battleSystem, u32 param1, int param2) { Pokemon *v0; - v0 = BattleSystem_PartyPokemon(param0, param2 & 0xff, (param2 & 0xff00) >> 8); - StringTemplate_SetNickname(param0->strFormatter, param1, &v0->box); + v0 = BattleSystem_PartyPokemon(battleSystem, param2 & 0xff, (param2 & 0xff00) >> 8); + StringTemplate_SetNickname(battleSystem->strFormatter, param1, &v0->box); } -static void BattleMessage_MoveName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_MoveName(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetMoveName(param0->strFormatter, param1, param2); + StringTemplate_SetMoveName(battleSystem->strFormatter, param1, param2); } -static void BattleMessage_ItemName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_ItemName(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetItemName(param0->strFormatter, param1, param2); + StringTemplate_SetItemName(battleSystem->strFormatter, param1, param2); } -static void BattleMessage_Number(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_Number(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetNumber(param0->strFormatter, param1, param2, 5, 0, 1); + StringTemplate_SetNumber(battleSystem->strFormatter, param1, param2, 5, 0, 1); } -static void BattleMessage_NumberDigits(BattleSystem *param0, u32 param1, int param2, int param3) +static void BattleMessage_NumberDigits(BattleSystem *battleSystem, u32 param1, int param2, int param3) { if (param3) { - StringTemplate_SetNumber(param0->strFormatter, param1, param2, param3, 1, 1); + StringTemplate_SetNumber(battleSystem->strFormatter, param1, param2, param3, 1, 1); } else { - StringTemplate_SetNumber(param0->strFormatter, param1, param2, 5, 1, 1); + StringTemplate_SetNumber(battleSystem->strFormatter, param1, param2, 5, 1, 1); } } -static void BattleMessage_TypeName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_TypeName(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetPokemonTypeName(param0->strFormatter, param1, param2); + StringTemplate_SetPokemonTypeName(battleSystem->strFormatter, param1, param2); } -static void BattleMessage_AbilityName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_AbilityName(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetAbilityName(param0->strFormatter, param1, param2); + StringTemplate_SetAbilityName(battleSystem->strFormatter, param1, param2); } -static void BattleMessage_StatName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_StatName(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetPokemonStatName(param0->strFormatter, param1, param2); + StringTemplate_SetPokemonStatName(battleSystem->strFormatter, param1, param2); } -static void BattleMessage_StatusName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_StatusName(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetStatusConditionName(param0->strFormatter, param1, param2); + StringTemplate_SetStatusConditionName(battleSystem->strFormatter, param1, param2); } -static void BattleMessage_PokemonName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_PokemonName(BattleSystem *battleSystem, u32 param1, int param2) { Pokemon *v0; - v0 = BattleSystem_PartyPokemon(param0, param2 & 0xff, (param2 & 0xff00) >> 8); - StringTemplate_SetSpeciesName(param0->strFormatter, param1, &v0->box); + v0 = BattleSystem_PartyPokemon(battleSystem, param2 & 0xff, (param2 & 0xff00) >> 8); + StringTemplate_SetSpeciesName(battleSystem->strFormatter, param1, &v0->box); } -static void BattleMessage_PoffinName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_PoffinName(BattleSystem *battleSystem, u32 param1, int param2) { return; } -static void BattleMessage_FlavorName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_FlavorName(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetFlavorName(param0->strFormatter, param1, param2); + StringTemplate_SetFlavorName(battleSystem->strFormatter, param1, param2); } -static void BattleMessage_TrainerClassName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_TrainerClassName(BattleSystem *battleSystem, u32 param1, int param2) { - TrainerData *v0; + Trainer *v0; - v0 = BattleSystem_TrainerData(param0, param2); - StringTemplate_SetTrainerClassNameBattle(param0->strFormatter, param1, v0); + v0 = BattleSystem_GetTrainer(battleSystem, param2); + StringTemplate_SetTrainerClassNameBattle(battleSystem->strFormatter, param1, v0); } -static void BattleMessage_TrainerName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_TrainerName(BattleSystem *battleSystem, u32 param1, int param2) { - TrainerData *v0; + Trainer *v0; - v0 = BattleSystem_TrainerData(param0, param2); - StringTemplate_SetTrainerNameBattle(param0->strFormatter, param1, v0); + v0 = BattleSystem_GetTrainer(battleSystem, param2); + StringTemplate_SetTrainerNameBattle(battleSystem->strFormatter, param1, v0); } -static void BattleMessage_PCBoxName(BattleSystem *param0, u32 param1, int param2) +static void BattleMessage_PCBoxName(BattleSystem *battleSystem, u32 param1, int param2) { - StringTemplate_SetPCBoxName(param0->strFormatter, param1, param0->pcBoxes, param2); + StringTemplate_SetPCBoxName(battleSystem->strFormatter, param1, battleSystem->pcBoxes, param2); } /** diff --git a/src/battle/trainer_ai/trainer_ai.c b/src/battle/trainer_ai/trainer_ai.c index 5366c99842..ebd48686c8 100644 --- a/src/battle/trainer_ai/trainer_ai.c +++ b/src/battle/trainer_ai/trainer_ai.c @@ -3478,11 +3478,11 @@ static BOOL AI_OnlyIneffectiveMoves(BattleSystem *battleSys, BattleContext *batt // "Player" consts here refer to the AI's perspective. if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { - defender1 = BATTLER_PLAYER_SLOT_1; - defender2 = BATTLER_PLAYER_SLOT_2; + defender1 = BATTLER_PLAYER_1; + defender2 = BATTLER_PLAYER_2; } else { - defender1 = BATTLER_PLAYER_SLOT_1; - defender2 = BATTLER_PLAYER_SLOT_1; + defender1 = BATTLER_PLAYER_1; + defender2 = BATTLER_PLAYER_1; } // Check all of this mon's attacking moves for immunities. If any of our moves can deal damage to diff --git a/src/enc_effects.c b/src/enc_effects.c index 84c4bfd384..e04c921652 100644 --- a/src/enc_effects.c +++ b/src/enc_effects.c @@ -127,7 +127,7 @@ static u32 EncEffects_GetEffectPair(const FieldBattleDTO *dto) u32 battleType = dto->battleType; if (battleType & BATTLE_TYPE_TRAINER) { - u32 trainerEffect = EncEffects_TrainerClassEffect(dto->trainerData[1].class); + u32 trainerEffect = EncEffects_TrainerClassEffect(dto->trainer[1].class); if (battleType & BATTLE_TYPE_FRONTIER) { if (trainerEffect == ENCEFF_FRONTIER_BRAIN) { diff --git a/src/encounter.c b/src/encounter.c index bdb0be7235..25e1379b00 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -585,7 +585,7 @@ void Encounter_NewFatefulVsSpeciesAtLevel(FieldTask *taskMan, u16 species, u8 le ov6_022420D4(fieldSystem, species, level, dto); BOOL tmp = TRUE; - Pokemon *wildMon = Party_GetPokemonBySlotIndex(dto->parties[BATTLER_ENEMY_SLOT_1], 0); + Pokemon *wildMon = Party_GetPokemonBySlotIndex(dto->parties[BATTLER_ENEMY_1], 0); Pokemon_SetValue(wildMon, MON_DATA_FATEFUL_ENCOUNTER, &tmp); if (isLegendary) { @@ -667,11 +667,11 @@ void Encounter_NewVsFirstBattle(FieldTask *task, int trainerID, int heapID, int FieldBattleDTO_Init(dto, fieldSystem); dto->battleStatusMask = BATTLE_STATUS_FIRST_BATTLE; - dto->trainerIDs[BATTLER_ENEMY_SLOT_1] = trainerID; - dto->trainerIDs[BATTLER_ENEMY_SLOT_2] = 0; - dto->trainerIDs[BATTLER_PLAYER_SLOT_2] = 0; + dto->trainerIDs[BATTLER_ENEMY_1] = trainerID; + dto->trainerIDs[BATTLER_ENEMY_2] = 0; + dto->trainerIDs[BATTLER_PLAYER_2] = 0; - TrainerData_Encounter(dto, fieldSystem->saveData, heapID); + Trainer_Encounter(dto, fieldSystem->saveData, heapID); GameRecords_IncrementRecordValue(SaveData_GetGameRecordsPtr(fieldSystem->saveData), RECORD_TRAINER_BATTLES_FOUGHT); StartEncounter(task, dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), resultMaskPtr); } @@ -761,11 +761,11 @@ void Encounter_NewVsTrainer(FieldTask *taskMan, int enemyTrainer1ID, int enemyTr dto->battleStatusMask |= BATTLE_STATUS_DISTORTION; } - dto->trainerIDs[BATTLER_ENEMY_SLOT_1] = enemyTrainer1ID; - dto->trainerIDs[BATTLER_ENEMY_SLOT_2] = enemyTrainer2ID; - dto->trainerIDs[BATTLER_PLAYER_SLOT_2] = partnerTrainerID; + dto->trainerIDs[BATTLER_ENEMY_1] = enemyTrainer1ID; + dto->trainerIDs[BATTLER_ENEMY_2] = enemyTrainer2ID; + dto->trainerIDs[BATTLER_PLAYER_2] = partnerTrainerID; - TrainerData_Encounter(dto, fieldSystem->saveData, heapID); + Trainer_Encounter(dto, fieldSystem->saveData, heapID); GameRecords_IncrementRecordValue(SaveData_GetGameRecordsPtr(fieldSystem->saveData), RECORD_TRAINER_BATTLES_FOUGHT); StartEncounter(taskMan, dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), resultMaskPtr); } @@ -819,10 +819,10 @@ void Encounter_NewVsWiFi(FieldTask *task, int param1, int normalizedLevel, int w } else { battleType = BATTLE_TYPE_FRONTIER_DOUBLES | BATTLE_TYPE_LINK | BATTLE_TYPE_2vs2; dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, battleType); - dto->trainerIDs[BATTLER_ENEMY_SLOT_1] = 1; - dto->trainerIDs[BATTLER_ENEMY_SLOT_2] = 2; + dto->trainerIDs[BATTLER_ENEMY_1] = 1; + dto->trainerIDs[BATTLER_ENEMY_2] = 2; - TrainerData_Encounter(dto, fieldSystem->saveData, HEAP_ID_FIELDMAP); + Trainer_Encounter(dto, fieldSystem->saveData, HEAP_ID_FIELDMAP); v5 = (UnkEnum_0202F510_14); } @@ -909,7 +909,7 @@ static void UpdateGameRecords(FieldSystem *fieldSystem, FieldBattleDTO *dto) } else if (resultMask == BATTLE_RESULT_CAPTURED_MON) { // BUG: This always chooses slot 1 of a double-wild battle when the player has an AI partner, // rather than choosing the Pokemon that was actually captured. - caughtMon = Party_GetPokemonBySlotIndex(dto->parties[BATTLER_ENEMY_SLOT_1], 0); + caughtMon = Party_GetPokemonBySlotIndex(dto->parties[BATTLER_ENEMY_1], 0); if (sub_0207A294(0, Pokemon_GetValue(caughtMon, MON_DATA_SPECIES, NULL))) { GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), TRAINER_SCORE_EVENT_CAPTURED_REGIONAL_MON); @@ -923,7 +923,7 @@ static void UpdateGameRecords(FieldSystem *fieldSystem, FieldBattleDTO *dto) } } else if ((battleType & BATTLE_TYPE_SAFARI) || (battleType & BATTLE_TYPE_PAL_PARK)) { if (resultMask == BATTLE_RESULT_CAPTURED_MON) { - caughtMon = Party_GetPokemonBySlotIndex(dto->parties[BATTLER_ENEMY_SLOT_1], 0); + caughtMon = Party_GetPokemonBySlotIndex(dto->parties[BATTLER_ENEMY_1], 0); if (sub_0207A294(0, Pokemon_GetValue(caughtMon, MON_DATA_SPECIES, NULL))) { GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), TRAINER_SCORE_EVENT_CAPTURED_REGIONAL_MON); @@ -975,7 +975,7 @@ static void UpdateJournal(FieldSystem *fieldSystem, FieldBattleDTO *dto) } } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_TAG)) { if (resultMask == BATTLE_RESULT_WIN) { - sub_0202C720(fieldSystem->journal, fieldSystem->location->mapId, dto->trainerIDs[BATTLER_ENEMY_SLOT_1], HEAP_ID_FIELDMAP); + sub_0202C720(fieldSystem->journal, fieldSystem->location->mapId, dto->trainerIDs[BATTLER_ENEMY_1], HEAP_ID_FIELDMAP); } } } @@ -991,7 +991,7 @@ void Encounter_NewVsGiratinaOrigin(FieldTask *task, u16 species, u8 level, int * ov6_022420D4(fieldSystem, species, level, dto); - Pokemon *wildMon = Party_GetPokemonBySlotIndex(dto->parties[BATTLER_ENEMY_SLOT_1], 0); + Pokemon *wildMon = Party_GetPokemonBySlotIndex(dto->parties[BATTLER_ENEMY_1], 0); Pokemon_SetGiratinaOriginForm(wildMon); if (isLegendary) { diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 9e6175bc7c..072d82c67d 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -80,13 +80,13 @@ FieldBattleDTO *FieldBattleDTO_New(enum HeapId heapID, u32 battleType) for (i = 0; i < MAX_BATTLERS; i++) { dto->trainerIDs[i] = 0; - MI_CpuClear32(&dto->trainerData[i], sizeof(TrainerData)); + MI_CpuClear32(&dto->trainer[i], sizeof(Trainer)); } dto->background = BACKGROUND_PLAIN; dto->terrain = TERRAIN_MAX; dto->mapLabelTextID = pl_msg_00000433_00000; - dto->timeOfDay = TOD_MORNING; + dto->timeOfDay = TIMEOFDAY_MORNING; dto->mapEvolutionMethod = 0; dto->visitedContestHall = TRUE; dto->metBebe = TRUE; @@ -101,11 +101,11 @@ FieldBattleDTO *FieldBattleDTO_New(enum HeapId heapID, u32 battleType) } for (i = 0; i < MAX_BATTLERS; i++) { - dto->chatotCries[i] = AllocateAndInitializeChatotCryData(heapID); + dto->chatotCries[i] = ChatotCry_New(heapID); } dto->bag = Bag_New(heapID); - dto->pokedex = sub_02026324(heapID); + dto->pokedex = Pokedex_New(heapID); dto->options = Options_New(heapID); dto->unk_10C = sub_0206D140(heapID); dto->bagCursor = NULL; @@ -164,21 +164,21 @@ FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapId heapID, const Fie strbuf = Strbuf_Init(TRAINER_NAME_LEN + 1, heapID); MessageLoader_GetStrbuf(msgLoader, TrainerInfo_Gender(trainerInfo) ^ 1, strbuf); - TrainerInfo_SetName(dto->trainerInfo[BATTLER_PLAYER_SLOT_1], Strbuf_GetData(strbuf)); + TrainerInfo_SetName(dto->trainerInfo[BATTLER_PLAYER_1], Strbuf_GetData(strbuf)); Strbuf_Free(strbuf); MessageLoader_Free(msgLoader); - TrainerInfo_SetGender(dto->trainerInfo[BATTLER_PLAYER_SLOT_1], TrainerInfo_Gender(trainerInfo) ^ 1); + TrainerInfo_SetGender(dto->trainerInfo[BATTLER_PLAYER_1], TrainerInfo_Gender(trainerInfo) ^ 1); SetBackgroundAndTerrain(dto, fieldSystem); Options_Copy(options, dto->options); dto->timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem); Bag_TryAddItem(dto->bag, ITEM_POKE_BALL, 20, heapID); mon = Pokemon_New(heapID); - Pokemon_InitWith(mon, sub_0206B08C(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, 32, FALSE, 0, OTID_NOT_SHINY, 0); - Party_AddPokemon(dto->parties[BATTLER_PLAYER_SLOT_1], mon); + Pokemon_InitWith(mon, VarsFlags_GetProfessorAssistantStarterSpecies(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, 32, FALSE, 0, OTID_NOT_SHINY, 0); + Party_AddPokemon(dto->parties[BATTLER_PLAYER_1], mon); Pokemon_InitWith(mon, SPECIES_BIDOOF, 2, 32, FALSE, 0, OTID_NOT_SHINY, 0); - Party_AddPokemon(dto->parties[BATTLER_ENEMY_SLOT_1], mon); + Party_AddPokemon(dto->parties[BATTLER_ENEMY_1], mon); Heap_FreeToHeap(mon); dto->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData); @@ -247,7 +247,7 @@ void FieldBattleDTO_InitFromGameState(FieldBattleDTO *dto, const FieldSystem *fi TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(save); Party *party = Party_GetFromSavedata(save); Bag *bag = SaveData_GetBag(save); - PokedexData *pokedex = SaveData_Pokedex(save); + Pokedex *pokedex = SaveData_Pokedex(save); ChatotCry *chatotCry = GetChatotCryDataFromSave(save); Options *options = SaveData_Options(save); FieldOverworldState *fieldOverworldState = SaveData_GetFieldOverworldState(save); @@ -263,12 +263,12 @@ void FieldBattleDTO_InitFromGameState(FieldBattleDTO *dto, const FieldSystem *fi dto->timeOfDay = TimeOfDayForHour(gameTime->time.hour); } - FieldBattleDTO_CopyTrainerInfoToBattler(dto, trainerInfo, BATTLER_PLAYER_SLOT_1); - FieldBattleDTO_CopyPartyToBattler(dto, party, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_CopyTrainerInfoToBattler(dto, trainerInfo, BATTLER_PLAYER_1); + FieldBattleDTO_CopyPartyToBattler(dto, party, BATTLER_PLAYER_1); Bag_Copy(bag, dto->bag); Pokedex_Copy(pokedex, dto->pokedex); Options_Copy(options, dto->options); - FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_1); dto->pcBoxes = SaveData_PCBoxes(save); dto->mapLabelTextID = MapHeader_GetMapLabelTextID(mapHeaderID); @@ -300,17 +300,17 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); Party *party = Party_GetFromSavedata(fieldSystem->saveData); Bag *bag = SaveData_GetBag(fieldSystem->saveData); - PokedexData *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); ChatotCry *chatotCry = GetChatotCryDataFromSave(fieldSystem->saveData); Options *options = SaveData_Options(fieldSystem->saveData); dto->background = BACKGROUND_INDOORS_1; dto->terrain = TERRAIN_BUILDING; - FieldBattleDTO_CopyTrainerInfoToBattler(dto, trainerInfo, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_CopyTrainerInfoToBattler(dto, trainerInfo, BATTLER_PLAYER_1); Pokemon *mon = Pokemon_New(HEAP_ID_FIELDMAP); - Party_InitWithCapacity(dto->parties[BATTLER_PLAYER_SLOT_1], Party_GetCurrentCount(party)); + Party_InitWithCapacity(dto->parties[BATTLER_PLAYER_1], Party_GetCurrentCount(party)); for (i = 0; i < Party_GetCurrentCount(party); i++) { Pokemon_Copy(Party_GetPokemonBySlotIndex(party, i), mon); @@ -320,14 +320,14 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field Pokemon_CalcLevelAndStats(mon); } - FieldBattleDTO_AddPokemonToBattler(dto, mon, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_AddPokemonToBattler(dto, mon, BATTLER_PLAYER_1); } Heap_FreeToHeap(mon); Bag_Copy(bag, dto->bag); Pokedex_Copy(pokedex, dto->pokedex); Options_Copy(options, dto->options); - FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_1); dto->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData); dto->timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem); @@ -348,7 +348,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f { TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); Bag *bag = SaveData_GetBag(fieldSystem->saveData); - PokedexData *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); ChatotCry *chatotCry = GetChatotCryDataFromSave(fieldSystem->saveData); Options *options = SaveData_Options(fieldSystem->saveData); const BattleRegulation *regulation = fieldSystem->unk_B0; @@ -358,10 +358,10 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f dto->background = BACKGROUND_INDOORS_1; dto->terrain = TERRAIN_BUILDING; - FieldBattleDTO_CopyTrainerInfoToBattler(dto, trainerInfo, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_CopyTrainerInfoToBattler(dto, trainerInfo, BATTLER_PLAYER_1); if (partyOrder == NULL) { - FieldBattleDTO_CopyPartyToBattler(dto, party, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_CopyPartyToBattler(dto, party, BATTLER_PLAYER_1); } else { int numToCopy = 0; for (i = 0; i < MAX_PARTY_SIZE; i++) { @@ -371,13 +371,13 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f } if (numToCopy == 0) { - FieldBattleDTO_CopyPartyToBattler(dto, party, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_CopyPartyToBattler(dto, party, BATTLER_PLAYER_1); } else { mon = Pokemon_New(HEAP_ID_FIELDMAP); - Party_InitWithCapacity(dto->parties[BATTLER_PLAYER_SLOT_1], numToCopy); + Party_InitWithCapacity(dto->parties[BATTLER_PLAYER_1], numToCopy); for (i = 0; i < numToCopy; i++) { Pokemon_Copy(Party_GetPokemonBySlotIndex(party, partyOrder[i] - 1), mon); - FieldBattleDTO_AddPokemonToBattler(dto, mon, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_AddPokemonToBattler(dto, mon, BATTLER_PLAYER_1); } Heap_FreeToHeap(mon); @@ -393,7 +393,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f Bag_Copy(bag, dto->bag); Pokedex_Copy(pokedex, dto->pokedex); Options_Copy(options, dto->options); - FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_SLOT_1); + FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_1); dto->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData); dto->timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem); @@ -410,9 +410,9 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f int unionAppearance = TrainerInfo_Appearance(trainerInfo); int unionGender = TrainerInfo_Gender(trainerInfo); - dto->trainerData[BATTLER_PLAYER_SLOT_1].class = sub_0205CA14(unionGender, unionAppearance, 1); - CharCode_Copy(dto->trainerData[BATTLER_PLAYER_SLOT_1].name, TrainerInfo_Name(dto->trainerInfo[BATTLER_PLAYER_SLOT_1])); - dto->trainerData[BATTLER_PLAYER_SLOT_2] = dto->trainerData[BATTLER_PLAYER_SLOT_1]; + dto->trainer[BATTLER_PLAYER_1].class = sub_0205CA14(unionGender, unionAppearance, 1); + CharCode_Copy(dto->trainer[BATTLER_PLAYER_1].name, TrainerInfo_Name(dto->trainerInfo[BATTLER_PLAYER_1])); + dto->trainer[BATTLER_PLAYER_2] = dto->trainer[BATTLER_PLAYER_1]; } else { FieldBattleDTO_CopyPlayerInfoToTrainerData(dto); } @@ -428,11 +428,11 @@ void FieldBattleDTO_UpdateFieldSystem(const FieldBattleDTO *dto, FieldSystem *fi TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); Party *party = Party_GetFromSavedata(fieldSystem->saveData); Bag *bag = SaveData_GetBag(fieldSystem->saveData); - PokedexData *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); u16 *fieldSysSafariBalls = FieldOverworldState_GetSafariBallCount(SaveData_GetFieldOverworldState(fieldSystem->saveData)); - TrainerInfo_Copy(dto->trainerInfo[BATTLER_PLAYER_SLOT_1], trainerInfo); - Party_cpy(dto->parties[BATTLER_PLAYER_SLOT_1], party); + TrainerInfo_Copy(dto->trainerInfo[BATTLER_PLAYER_1], trainerInfo); + Party_cpy(dto->parties[BATTLER_PLAYER_1], party); Bag_Copy(dto->bag, bag); Pokedex_Copy(dto->pokedex, pokedex); @@ -444,7 +444,7 @@ void FieldBattleDTO_UpdatePokedex(const FieldBattleDTO *dto, FieldSystem *fieldS TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); Party *party = Party_GetFromSavedata(fieldSystem->saveData); Bag *bag = SaveData_GetBag(fieldSystem->saveData); - PokedexData *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); Pokedex_Copy(dto->pokedex, pokedex); } @@ -554,7 +554,7 @@ BOOL CheckPlayerDidNotCaptureWildMon(u32 battleResult) void FieldBattleDTO_CopyPlayerInfoToTrainerData(FieldBattleDTO *dto) { - dto->trainerData[BATTLER_PLAYER_SLOT_1].class = TrainerInfo_Gender(dto->trainerInfo[BATTLER_PLAYER_SLOT_1]); - CharCode_Copy(dto->trainerData[BATTLER_PLAYER_SLOT_1].name, TrainerInfo_Name(dto->trainerInfo[BATTLER_PLAYER_SLOT_1])); - dto->trainerData[BATTLER_PLAYER_SLOT_2] = dto->trainerData[BATTLER_PLAYER_SLOT_1]; + dto->trainer[BATTLER_PLAYER_1].class = TrainerInfo_Gender(dto->trainerInfo[BATTLER_PLAYER_1]); + CharCode_Copy(dto->trainer[BATTLER_PLAYER_1].name, TrainerInfo_Name(dto->trainerInfo[BATTLER_PLAYER_1])); + dto->trainer[BATTLER_PLAYER_2] = dto->trainer[BATTLER_PLAYER_1]; } diff --git a/src/field_menu.c b/src/field_menu.c index e394741610..517aca8ca4 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -941,7 +941,7 @@ static BOOL FieldMenu_Pokedex(FieldTask *taskMan) FieldSystem *fieldSystem; FieldMenu *menu; UnkStruct_ov21_021D0D80 *v2; - PokedexData *v3; + Pokedex *v3; TrainerInfo *v4; VarsFlags *v5; diff --git a/src/game_records.c b/src/game_records.c index 2b86b58cb9..940cb9b12b 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -407,7 +407,7 @@ u32 GameRecords_GetTrainerScore(GameRecords *records) return GameRecords_GetRecordValue(records, RECORD_TRAINER_SCORE); } -void GameRecords_IncrementTrainerScoreOnCatch(GameRecords *records, const PokedexData *pokedex, const u16 species) +void GameRecords_IncrementTrainerScoreOnCatch(GameRecords *records, const Pokedex *pokedex, const u16 species) { if (!Pokedex_HasCaughtSpecies(pokedex, species)) { GameRecords_IncrementTrainerScore(records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 25a233c615..bfd918e3ab 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -90,7 +90,7 @@ BOOL ScrCmd_337(ScriptContext *param0) { u16 v0 = FieldSystem_TryGetVar(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); u16 *v1 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); - PokedexData *v2 = SaveData_Pokedex(param0->fieldSystem->saveData); + Pokedex *v2 = SaveData_Pokedex(param0->fieldSystem->saveData); *v1 = Pokedex_HasSeenSpecies(v2, v0); return 0; diff --git a/src/overlay005/save_info_window.c b/src/overlay005/save_info_window.c index 5fe0abdb22..360a4876e0 100644 --- a/src/overlay005/save_info_window.c +++ b/src/overlay005/save_info_window.c @@ -51,7 +51,7 @@ static void SaveInfo_SetValues(SaveInfo *saveInfo, const FieldSystem *fieldSyste { SaveData *saveData = fieldSystem->saveData; Location *curLocation = FieldOverworldState_GetPlayerLocation(SaveData_GetFieldOverworldState(saveData)); - PokedexData *pokedex = SaveData_Pokedex(saveData); + Pokedex *pokedex = SaveData_Pokedex(saveData); saveInfo->mapLabelTextID = MapHeader_GetMapLabelTextID(curLocation->mapId); diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index 186c3890fd..2a5ad881ab 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -180,10 +180,10 @@ void WildEncounters_ReplaceTimedEncounters(const WildEncounters *encounterData, { int timeOfDay = GetTimeOfDay(); - if (timeOfDay == TOD_DAY || timeOfDay == TOD_TWILIGHT) { + if (timeOfDay == TIMEOFDAY_DAY || timeOfDay == TIMEOFDAY_TWILIGHT) { *timedSlot1 = encounterData->dayEncounters[0]; *timedSlot2 = encounterData->dayEncounters[1]; - } else if (timeOfDay == TOD_NIGHT || timeOfDay == TOD_LATE_NIGHT) { + } else if (timeOfDay == TIMEOFDAY_NIGHT || timeOfDay == TIMEOFDAY_LATE_NIGHT) { *timedSlot1 = encounterData->nightEncounters[0]; *timedSlot2 = encounterData->nightEncounters[1]; } @@ -339,7 +339,7 @@ BOOL ov6_02240D5C(FieldSystem *fieldSystem) } else { { battleParams->trainerIDs[2] = sub_0206B034(SaveData_GetVarsFlags(fieldSystem->saveData)); - TrainerData_Encounter(battleParams, fieldSystem->saveData, 11); + Trainer_Encounter(battleParams, fieldSystem->saveData, 11); } v7 = ov6_0224174C(fieldSystem, firstPartyMon, battleParams, v13, &encounterFieldParams); } @@ -526,7 +526,7 @@ BOOL ov6_022411C8(FieldSystem *fieldSystem, FieldTask *param1) v8 = ov6_02241674(fieldSystem, firstPartyMon, battleParams, encounterData, v12, &encounterFieldParams, &v9); } else { battleParams->trainerIDs[2] = sub_0206B034(SaveData_GetVarsFlags(fieldSystem->saveData)); - TrainerData_Encounter(battleParams, fieldSystem->saveData, 11); + Trainer_Encounter(battleParams, fieldSystem->saveData, 11); v8 = ov6_0224174C(fieldSystem, firstPartyMon, battleParams, v12, &encounterFieldParams); } } else if (encounterType == ENCOUNTER_TYPE_SURF) { @@ -656,7 +656,7 @@ BOOL ov6_022413E4(FieldSystem *fieldSystem, FieldBattleDTO **battleParams) } else { { (*battleParams)->trainerIDs[2] = sub_0206B034(SaveData_GetVarsFlags(fieldSystem->saveData)); - TrainerData_Encounter(*battleParams, fieldSystem->saveData, 11); + Trainer_Encounter(*battleParams, fieldSystem->saveData, 11); } v6 = ov6_0224174C(fieldSystem, firstPartyMon, *battleParams, v12, &encounterFieldParams); } diff --git a/src/overlay006/ov6_02246A30.c b/src/overlay006/ov6_02246A30.c index f22f66e322..b55dde9804 100644 --- a/src/overlay006/ov6_02246A30.c +++ b/src/overlay006/ov6_02246A30.c @@ -144,13 +144,13 @@ static BOOL ov6_02246AB0(FieldSystem *fieldSystem) static BOOL ov6_02246AC8(FieldSystem *fieldSystem) { - PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); return sub_02026F0C(v0); } static BOOL ov6_02246AD8(FieldSystem *fieldSystem) { - PokedexData *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); return Pokedex_IsObtained(pokedex); } diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index a9178422eb..1fb65d6a99 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -2407,7 +2407,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) v5 = param0->unk_2A - 1; if (MapHeader_IsUnionRoom(param0->unk_00->mapHeaderID) == 1) { - v3 = TrainerClass_Gender(param0->unk_00->trainerData[v6 ^ 1].class); + v3 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].class); v1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * 8); Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], v1, 8); @@ -2416,7 +2416,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) } else { switch (sub_0203895C()) { case 1: - v3 = TrainerClass_Gender(param0->unk_00->trainerData[v6 ^ 1].class); + v3 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].class); v1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * 8); Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], v1, 8); @@ -2425,7 +2425,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) Heap_FreeToHeap(v1); break; case 2: - v3 = TrainerClass_Gender(param0->unk_00->trainerData[v6 ^ 1].class); + v3 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].class); v1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * 8); Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], v1, 8); @@ -2434,7 +2434,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) Heap_FreeToHeap(v1); break; case 3: - v3 = TrainerClass_Gender(param0->unk_00->trainerData[v6 ^ 1].class); + v3 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].class); v1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * 8); Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], v1, 8); @@ -2447,14 +2447,14 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) v2 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * 8); if (ov10_02220AD0() == 1) { - v3 = TrainerClass_Gender(param0->unk_00->trainerData[1].class); - v4 = TrainerClass_Gender(param0->unk_00->trainerData[3].class); + v3 = TrainerClass_Gender(param0->unk_00->trainer[1].class); + v4 = TrainerClass_Gender(param0->unk_00->trainer[3].class); Strbuf_ToChars(param0->unk_14[1], v1, 8); Strbuf_ToChars(param0->unk_14[3], v2, 8); } else { - v3 = TrainerClass_Gender(param0->unk_00->trainerData[0].class); - v4 = TrainerClass_Gender(param0->unk_00->trainerData[2].class); + v3 = TrainerClass_Gender(param0->unk_00->trainer[0].class); + v4 = TrainerClass_Gender(param0->unk_00->trainer[2].class); Strbuf_ToChars(param0->unk_14[0], v1, 8); Strbuf_ToChars(param0->unk_14[2], v2, 8); diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index cc82c9dc40..5bcd8e52aa 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1601,7 +1601,7 @@ static u8 ov13_022217A4(UnkStruct_ov13_022213F0 *param0) int v2; v2 = BattleSystem_Partner(param0->unk_00->unk_08, param0->unk_00->unk_28); - StringTemplate_SetTrainerNameBattle(param0->unk_1FA8, 0, BattleSystem_TrainerData(param0->unk_00->unk_08, v2)); + StringTemplate_SetTrainerNameBattle(param0->unk_1FA8, 0, BattleSystem_GetTrainer(param0->unk_00->unk_08, v2)); } StringTemplate_Format(param0->unk_1FA8, param0->unk_1FAC, v1); Strbuf_Free(v1); diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index ce71debb09..aa27e3f873 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -296,10 +296,10 @@ static int PokedexEncounters_PopulateEncounterCollection(UnkStruct_ov21_021E6A68 param0->unk_08 = encounterCollection; - if (v0->unk_00->timeOfDay == TOD_MORNING) { + if (v0->unk_00->timeOfDay == TIMEOFDAY_MORNING) { v0->encounterTime = ENCTIME_MORNING; } else { - if ((v0->unk_00->timeOfDay == TOD_DAY) || (v0->unk_00->timeOfDay == TOD_TWILIGHT)) { + if ((v0->unk_00->timeOfDay == TIMEOFDAY_DAY) || (v0->unk_00->timeOfDay == TIMEOFDAY_TWILIGHT)) { v0->encounterTime = ENCTIME_DAY; } else { v0->encounterTime = ENCTIME_NIGHT; diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index 82731c33fa..e9aa210f8a 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -74,17 +74,17 @@ enum PokedexDataSortIndex { PDSI_NUMSORTS }; -static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, const PokedexData *dexData, const u16 *fullDex, int pokedexLength); -static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u16 *pokedex1, int dexLen1, const u16 *pokedex2, int dexLen2, BOOL keepUncaught, const PokedexData *dexData); -static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const PokedexData *dexData, const u16 *encounteredPokedex, int caughtStatusLength); +static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, const Pokedex *dexData, const u16 *fullDex, int pokedexLength); +static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u16 *pokedex1, int dexLen1, const u16 *pokedex2, int dexLen2, BOOL keepUncaught, const Pokedex *dexData); +static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const Pokedex *dexData, const u16 *encounteredPokedex, int caughtStatusLength); static void PopulateDisplayPokedex_Blanks(SortedPokedex *sortedPokedex, const u16 *fullDex, int pokedexLength); static void PopulateDisplayPokedex(SortedPokedex *sortedPokedex); static void NumEncounteredAndCaught(SortedPokedex *sortedPokedex, int *caughtStatusLength, int *numCaught); static u16 *PokedexFromNARC(int heapID, int pokedexSort, int *pokedexLength); -static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const PokedexData *dexData); -static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const PokedexData *dexData); -static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const PokedexData *dexData); -static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const PokedexData *dexData); +static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData); +static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData); +static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData); +static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData); void PokedexSort_PopulatePokedexStatus(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, int heapID) { @@ -653,7 +653,7 @@ u32 ov21_021D3998(const UnkStruct_ov21_021D3320 *param0) return param0->unk_1758; } -static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, const PokedexData *dexData, const u16 *fullDex, int pokedexLength) +static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, const Pokedex *dexData, const u16 *fullDex, int pokedexLength) { *caughtStatusLength = 0; @@ -665,7 +665,7 @@ static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, co } } -static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u16 *pokedex1, int dexLen1, const u16 *pokedex2, int dexLen2, BOOL keepUncaught, const PokedexData *dexData) +static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u16 *pokedex1, int dexLen1, const u16 *pokedex2, int dexLen2, BOOL keepUncaught, const Pokedex *dexData) { int dexIndex2; @@ -691,7 +691,7 @@ static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u } } -static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const PokedexData *dexData, const u16 *encounteredPokedex, int caughtStatusLength) +static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const Pokedex *dexData, const u16 *encounteredPokedex, int caughtStatusLength) { sortedPokedex->caughtStatusLength = 0; @@ -749,7 +749,7 @@ static u16 *PokedexFromNARC(int heapID, int pokedexSort, int *pokedexLength) return pokedexFromFile; } -static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const PokedexData *dexData) +static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData) { u16 *pokedexFromFile; int pokedexLength; @@ -789,7 +789,7 @@ static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting } } -static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const PokedexData *dexData) +static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData) { u16 *pokedexFromFile; int pokedexLength; @@ -839,7 +839,7 @@ static void FilterByName(int filterName, u16 *resultingPokedex, int *numResultin } } -static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const PokedexData *dexData) +static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData) { u16 *pokedexFromFile; int pokedexLength; @@ -913,7 +913,7 @@ static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResultin } } -static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const PokedexData *dexData) +static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData) { u16 *pokedexFromFile; int pokedexLength; diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index cba4ccbffd..105146cd92 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -632,7 +632,7 @@ static void ov28_02256914(UnkStruct_ov28_02256210 *param0, const UnkStruct_ov28_ s64 v0 = ov28_02257468(param1); if ((v0 > 0) && (v0 <= NATIONAL_DEX_COUNT)) { - PokedexData *v1; + Pokedex *v1; u16 v2; v1 = SaveData_Pokedex(PoketchSystem_GetSaveData(param0->poketchSys)); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 86a579927b..41dabf9785 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -1472,7 +1472,7 @@ static BOOL ov62_02239984(UnkStruct_0208C06C *param0, int param1) int v7; int v8 = 0; BOOL v9; - PokedexData *v10 = SaveData_Pokedex(param0->unk_830); + Pokedex *v10 = SaveData_Pokedex(param0->unk_830); for (v7 = v3; v7 < v4; v7++) { v9 = Pokedex_HasSeenSpecies(v10, v1[v7]); @@ -1516,7 +1516,7 @@ static void ov62_02239A0C(UnkStruct_0208C06C *param0, int param1) int v5; int v6 = 0; BOOL v7; - PokedexData *v8 = SaveData_Pokedex(param0->unk_830); + Pokedex *v8 = SaveData_Pokedex(param0->unk_830); v4->unk_1D4.unk_00 = 0; diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index 83db14ef1c..a42f1d39ea 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -1516,7 +1516,7 @@ static BOOL ov62_02242748 (UnkStruct_0208C06C * param0, int param1) int v7; int v8 = 0; BOOL v9; - PokedexData * v10 = SaveData_Pokedex(param0->unk_830); + Pokedex * v10 = SaveData_Pokedex(param0->unk_830); for (v7 = v3; v7 < v4; v7++) { v9 = Pokedex_HasSeenSpecies(v10, v1[v7]); @@ -1560,7 +1560,7 @@ static void ov62_022427D0 (UnkStruct_0208C06C * param0, int param1) int v5; int v6 = 0; BOOL v7; - PokedexData * v8 = SaveData_Pokedex(param0->unk_830); + Pokedex * v8 = SaveData_Pokedex(param0->unk_830); v4->unk_4C8.unk_00 = 0; diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index 000c2dadd0..e93bdaf3a5 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -43,23 +43,23 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int param2) for (v4 = 0; v4 < v2; v4++) { for (v10 = 8 - 1; v10 > -1; v10--) { - if (param1->trainerData[v4].name[v10] == 0xffff) { + if (param1->trainer[v4].name[v10] == 0xffff) { break; } } if (v10 == -1) { ov62_0224856C(v7, param2); - Strbuf_ToChars(v7, param1->trainerData[v4].name, 8); + Strbuf_ToChars(v7, param1->trainer[v4].name, 8); continue; } Strbuf_Clear(v6); - Strbuf_CopyChars(v6, param1->trainerData[v4].name); + Strbuf_CopyChars(v6, param1->trainer[v4].name); if (Font_AreAllCharsValid(FONT_SYSTEM, v6, v7) == 0) { ov62_0224856C(v7, param2); - Strbuf_ToChars(v7, param1->trainerData[v4].name, 8); + Strbuf_ToChars(v7, param1->trainer[v4].name, 8); continue; } } diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 76ee88bec3..b73ab0459c 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -1793,7 +1793,7 @@ static int ov65_0222F490 (UnkStruct_ov65_0222EBE0 * param0, int param1) static void ov65_0222F4C4 (UnkStruct_ov65_0222EBE0 * param0, int param1) { TrainerInfo * v0 = SaveData_GetTrainerInfo(param0->unk_160); - PokedexData * v1 = SaveData_Pokedex(param0->unk_160); + Pokedex * v1 = SaveData_Pokedex(param0->unk_160); Party * v2 = Party_GetFromSavedata(param0->unk_160); UnkStruct_0202C878 * v3 = sub_0202C878(param0->unk_160); int v4, v5; diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 72e8904c3b..95667184ac 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -2310,7 +2310,7 @@ static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *param1, u32 TrainerInfo *v0; Party *v1; UnkStruct_0202C878 *v2; - PokedexData *v3; + Pokedex *v3; GameTime *v4; { diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index 3d61a8616b..17ae4c571f 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -339,7 +339,7 @@ static void ov81_021D1AD4(UnkStruct_ov81_021D1610 *param0, Window *param1) v2 = Strbuf_Length(v3); Strbuf_Free(v3); - if (TrainerData_LoadParam(v0.unk_00_1, 1) == 63) { + if (Trainer_LoadParam(v0.unk_00_1, 1) == 63) { v3 = MessageLoader_GetNewStrbuf(param0->unk_50, 61); StringTemplate_SetRivalName(param0->unk_54, 1, param0->unk_4C); StringTemplate_Format(param0->unk_54, param0->unk_58, v3); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 512803b570..f5072891e2 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -78,7 +78,7 @@ static int ov94_02242040(UnkStruct_ov94_0223FD4C *param0); static int ov94_02242068(UnkStruct_ov94_0223FD4C *param0); static int ov94_0224208C(UnkStruct_ov94_0223FD4C *param0); static void ov94_02242668(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1); -static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, PokedexData *param7); +static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, Pokedex *param7); static TextColor ov94_022421E8(int param0, u32 param1); static int (*Unk_ov94_0224695C[])(UnkStruct_ov94_0223FD4C *) = { @@ -1124,7 +1124,7 @@ static u16 Unk_ov94_02246928[] = { 0x1ED }; -static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, PokedexData *param7) +static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, Pokedex *param7) { int v0, v1, v2 = 0; int v3 = Unk_ov94_02246928[param6 + 1] - Unk_ov94_02246928[param6]; @@ -1167,7 +1167,7 @@ static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoad return v2 + 1; } -ListMenu *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, PokedexData *param6) +ListMenu *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, Pokedex *param6) { ListMenuTemplate v0; int v1, v2, v3; diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index a11125d4e0..adee8d2469 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -82,7 +82,7 @@ typedef struct { typedef struct { BgConfig *unk_00; SaveData *unk_04; - PokedexData *unk_08; + Pokedex *unk_08; TrainerInfo *unk_0C; PlayTime *playTime; MysteryGift *unk_14; diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 2e7f12dd03..8a84c22448 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -349,7 +349,7 @@ typedef struct { int unk_00; BgConfig *unk_04; SaveData *unk_08; - PokedexData *unk_0C; + Pokedex *unk_0C; TrainerInfo *unk_10; Options *unk_14; Window unk_18; diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index 6859013e27..db43e60f73 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -444,15 +444,15 @@ void ov104_0222E284(FieldBattleDTO *param0, UnkStruct_ov104_0223A348_sub1 *param Pokemon *v1; param0->trainerIDs[param3] = param1->unk_00; - param0->trainerData[param3].class = param1->unk_04; + param0->trainer[param3].class = param1->unk_04; - CharCode_Copy(¶m0->trainerData[param3].name[0], ¶m1->unk_08[0]); + CharCode_Copy(¶m0->trainer[param3].name[0], ¶m1->unk_08[0]); v0 = (Sentence *)¶m1->unk_20[0]; - param0->trainerData[param3].winMsg = *v0; + param0->trainer[param3].winMsg = *v0; v0 = (Sentence *)¶m1->unk_28[0]; - param0->trainerData[param3].loseMsg = *v0; + param0->trainer[param3].loseMsg = *v0; return; } diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c index f741ba11b6..ff9461adb0 100644 --- a/src/overlay104/ov104_0223A0C4.c +++ b/src/overlay104/ov104_0223A0C4.c @@ -945,7 +945,7 @@ FieldBattleDTO *ov104_0223A580(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_02230 ov104_0223A6AC(v3, &(param0->unk_78[0]), param0->unk_0E, 1, param0->unk_04); for (v0 = 0; v0 < 4; v0++) { - v3->trainerData[v0].aiMask = (0x1 | 0x2 | 0x4); + v3->trainer[v0].aiMask = (0x1 | 0x2 | 0x4); } switch (param0->unk_0F) { diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c index ac64826735..974e054ef7 100644 --- a/src/overlay104/ov104_0223A7F4.c +++ b/src/overlay104/ov104_0223A7F4.c @@ -383,7 +383,7 @@ FieldBattleDTO *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104 Party_InitWithCapacity(v4->parties[1], ov104_0223AA74(param0->unk_04, 0)); for (v0 = 0; v0 < 4; v0++) { - v4->trainerData[v0].aiMask = ov104_0223AEE4(param0); + v4->trainer[v0].aiMask = ov104_0223AEE4(param0); } v5 = Pokemon_New(11); diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c index 345762b293..d1ac9a07f3 100644 --- a/src/overlay104/ov104_0223AF58.c +++ b/src/overlay104/ov104_0223AF58.c @@ -1622,7 +1622,7 @@ FieldBattleDTO *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104 v2 = ov104_0223B604(param0, v6, v7); for (v1 = 0; v1 < 4; v1++) { - v8->trainerData[v1].aiMask = v2; + v8->trainer[v1].aiMask = v2; } ov104_0223B518(¶m0->unk_290[v6], v7, param0->unk_18[v6], ¶m0->unk_268[v6], v5, 11, 180); diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index a4f05770f7..ab60517ac8 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -206,7 +206,7 @@ FieldBattleDTO *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104 Party_InitWithCapacity(v5->parties[1], ov104_0223B7DC(param0->unk_10, 0)); for (v0 = 0; v0 < 4; v0++) { - v5->trainerData[v0].aiMask = ov104_0223BB10(param0); + v5->trainer[v0].aiMask = ov104_0223BB10(param0); } v6 = Pokemon_New(11); diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c index eceec063cc..50dcca5677 100644 --- a/src/overlay104/ov104_0223BCBC.c +++ b/src/overlay104/ov104_0223BCBC.c @@ -217,7 +217,7 @@ FieldBattleDTO *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104 Party_InitWithCapacity(v5->parties[1], ov104_0223BDA4(param0->unk_10, 0)); for (v0 = 0; v0 < 4; v0++) { - v5->trainerData[v0].aiMask = ov104_0223C0D0(param0); + v5->trainer[v0].aiMask = ov104_0223C0D0(param0); } v6 = Pokemon_New(11); diff --git a/src/rtc.c b/src/rtc.c index 4951d2b717..b0125a9806 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -123,8 +123,8 @@ int DayNumberForDate(const RTCDate *date) BOOL IsNight(void) { switch (GetTimeOfDay()) { - case TOD_LATE_NIGHT: - case TOD_NIGHT: + case TIMEOFDAY_LATE_NIGHT: + case TIMEOFDAY_NIGHT: return 1; } @@ -142,30 +142,30 @@ enum TimeOfDay GetTimeOfDay(void) enum TimeOfDay TimeOfDayForHour(int hour) { static const u8 lookup[24] = { - TOD_LATE_NIGHT, - TOD_LATE_NIGHT, - TOD_LATE_NIGHT, - TOD_LATE_NIGHT, - TOD_MORNING, - TOD_MORNING, - TOD_MORNING, - TOD_MORNING, - TOD_MORNING, - TOD_MORNING, - TOD_DAY, - TOD_DAY, - TOD_DAY, - TOD_DAY, - TOD_DAY, - TOD_DAY, - TOD_DAY, - TOD_TWILIGHT, - TOD_TWILIGHT, - TOD_TWILIGHT, - TOD_NIGHT, - TOD_NIGHT, - TOD_NIGHT, - TOD_NIGHT, + TIMEOFDAY_LATE_NIGHT, + TIMEOFDAY_LATE_NIGHT, + TIMEOFDAY_LATE_NIGHT, + TIMEOFDAY_LATE_NIGHT, + TIMEOFDAY_MORNING, + TIMEOFDAY_MORNING, + TIMEOFDAY_MORNING, + TIMEOFDAY_MORNING, + TIMEOFDAY_MORNING, + TIMEOFDAY_MORNING, + TIMEOFDAY_DAY, + TIMEOFDAY_DAY, + TIMEOFDAY_DAY, + TIMEOFDAY_DAY, + TIMEOFDAY_DAY, + TIMEOFDAY_DAY, + TIMEOFDAY_DAY, + TIMEOFDAY_TWILIGHT, + TIMEOFDAY_TWILIGHT, + TIMEOFDAY_TWILIGHT, + TIMEOFDAY_NIGHT, + TIMEOFDAY_NIGHT, + TIMEOFDAY_NIGHT, + TIMEOFDAY_NIGHT, }; GF_ASSERT(0 <= hour && hour < 24); diff --git a/src/scrcmd.c b/src/scrcmd.c index 56f89d9a5c..e26d98cc66 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -4829,7 +4829,7 @@ static BOOL ScrCmd_0E6(ScriptContext *ctx) u16 v5 = ScriptContext_GetVar(ctx); u16 v6 = ScriptContext_GetVar(ctx); - TrainerData_LoadMessage(v5, v6, *v2, 11); + Trainer_LoadMessage(v5, v6, *v2, 11); Window_FillTilemap(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), SCRIPT_MANAGER_STR_TEMPLATE); *v4 = FieldMessage_Print(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), *v2, SaveData_Options(ctx->fieldSystem->saveData), SCRIPT_MANAGER_WINDOW); @@ -4974,7 +4974,7 @@ static BOOL ScrCmd_11D(ScriptContext *ctx) static BOOL ScrCmd_11E(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = Pokedex_CountSeenSinnoh(v0); @@ -4983,7 +4983,7 @@ static BOOL ScrCmd_11E(ScriptContext *ctx) static BOOL ScrCmd_11F(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_02026E64(v0); @@ -4992,7 +4992,7 @@ static BOOL ScrCmd_11F(ScriptContext *ctx) static BOOL ScrCmd_120(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = Pokedex_CountSeenNational(v0); @@ -5001,7 +5001,7 @@ static BOOL ScrCmd_120(ScriptContext *ctx) static BOOL ScrCmd_121(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_02026DD0(v0); @@ -5017,7 +5017,7 @@ static BOOL ScrCmd_122(ScriptContext *ctx) static BOOL ScrCmd_123(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); const TrainerInfo *v1 = SaveData_GetTrainerInfo(ctx->fieldSystem->saveData); u8 v2 = ScriptContext_ReadByte(ctx); u16 *v3 = ScriptContext_GetVarPointer(ctx); @@ -6237,7 +6237,7 @@ static BOOL ScrCmd_1D6(ScriptContext *ctx) static BOOL ScrCmd_1E8(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; @@ -6251,7 +6251,7 @@ static BOOL ScrCmd_1E8(ScriptContext *ctx) static BOOL ScrCmd_1E9(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; @@ -6467,7 +6467,7 @@ static BOOL ScrCmd_214(ScriptContext *ctx) static BOOL ScrCmd_218(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2, v3, v4, v5; @@ -6769,7 +6769,7 @@ static BOOL ScrCmd_24D(ScriptContext *ctx) static void sub_020451B4(FieldSystem *fieldSystem, u16 param1) { - PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); Pokemon *v1 = Pokemon_New(32); Pokemon_Init(v1); @@ -6888,7 +6888,7 @@ static BOOL ScrCmd_263(ScriptContext *ctx) int v3; int v4 = Party_GetCurrentCount(v1); Pokemon *v5; - PokedexData *v6 = SaveData_Pokedex(ctx->fieldSystem->saveData); + Pokedex *v6 = SaveData_Pokedex(ctx->fieldSystem->saveData); for (v2 = 0; v2 < v4; v2++) { v5 = Party_GetPokemonBySlotIndex(v1, v2); @@ -7241,7 +7241,7 @@ static BOOL ScrCmd_282(ScriptContext *ctx) static BOOL ScrCmd_284(ScriptContext *ctx) { - const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_020270DC(v0); diff --git a/src/scrcmd_system_flags.c b/src/scrcmd_system_flags.c index fe27bbfe28..e10db73b9c 100644 --- a/src/scrcmd_system_flags.c +++ b/src/scrcmd_system_flags.c @@ -18,7 +18,7 @@ BOOL ScrCmd_CheckPokedexAcquired(ScriptContext *ctx) { - const PokedexData *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *destVar = ScriptContext_GetVarPointer(ctx); *destVar = Pokedex_IsObtained(pokedex); return FALSE; @@ -26,7 +26,7 @@ BOOL ScrCmd_CheckPokedexAcquired(ScriptContext *ctx) BOOL ScrCmd_GivePokedex(ScriptContext *ctx) { - PokedexData *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData); + Pokedex *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData); Pokedex_FlagObtained(pokedex); return FALSE; } diff --git a/src/script_manager.c b/src/script_manager.c index e114a546f9..bc077399d8 100644 --- a/src/script_manager.c +++ b/src/script_manager.c @@ -552,7 +552,7 @@ int Script_GetTrainerBattlerIndex(u16 scriptID) BOOL Script_IsTrainerDoubleBattle(u16 trainerID) { - return TrainerData_LoadParam(trainerID, TRDATA_BATTLE_TYPE) != BATTLE_TYPE_SINGLES; + return Trainer_LoadParam(trainerID, TRDATA_BATTLE_TYPE) != BATTLE_TYPE_SINGLES; } BOOL Script_IsTrainerDefeated(FieldSystem *fieldSystem, u16 trainerID) diff --git a/src/string_template.c b/src/string_template.c index 6904080935..48bc2d9eae 100644 --- a/src/string_template.c +++ b/src/string_template.c @@ -318,12 +318,12 @@ void StringTemplate_SetTrainerClassNameWithArticle(StringTemplate *template, u32 SetArgFromArchive(template, idx, trainerClass, message_bank_trainer_class_names_with_articles); } -void StringTemplate_SetTrainerClassNameBattle(StringTemplate *template, u32 idx, TrainerData *trainerData) +void StringTemplate_SetTrainerClassNameBattle(StringTemplate *template, u32 idx, Trainer *trainer) { MessageLoader *loader = InitMessageLoader(message_bank_trainer_class_names, template->heapID); if (loader) { - MessageLoader_GetStrbuf(loader, trainerData->class, template->templateBuf); + MessageLoader_GetStrbuf(loader, trainer->class, template->templateBuf); SetStringTemplateArg(template, idx, template->templateBuf, NULL); MessageLoader_Free(loader); } @@ -339,9 +339,9 @@ void StringTemplate_SetFrontierTrainerName(StringTemplate *template, u32 idx, u3 SetArgFromArchive(template, idx, trainerID, message_bank_frontier_trainer_names); } -void StringTemplate_SetTrainerNameBattle(StringTemplate *template, u32 idx, TrainerData *trainerData) +void StringTemplate_SetTrainerNameBattle(StringTemplate *template, u32 idx, Trainer *trainer) { - Strbuf_CopyChars(template->templateBuf, trainerData->name); + Strbuf_CopyChars(template->templateBuf, trainer->name); SetStringTemplateArg(template, idx, template->templateBuf, NULL); } diff --git a/src/trainer_data.c b/src/trainer_data.c index e9f784703d..1f3f8bda3b 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -24,9 +24,9 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID); -void TrainerData_Encounter(FieldBattleDTO *dto, const SaveData *save, int heapID) +void Trainer_Encounter(FieldBattleDTO *dto, const SaveData *save, int heapID) { - TrainerData trdata; + Trainer trdata; MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, 618, heapID); const charcode_t *rivalName = MiscSaveBlock_RivalName(SaveData_MiscSaveBlockConst(save)); @@ -35,14 +35,14 @@ void TrainerData_Encounter(FieldBattleDTO *dto, const SaveData *save, int heapID continue; } - TrainerData_Load(dto->trainerIDs[i], &trdata); - dto->trainerData[i] = trdata; + Trainer_Load(dto->trainerIDs[i], &trdata); + dto->trainer[i] = trdata; if (trdata.class == TRAINER_CLASS_RIVAL) { - CharCode_Copy(dto->trainerData[i].name, rivalName); + CharCode_Copy(dto->trainer[i].name, rivalName); } else { Strbuf *trainerName = MessageLoader_GetNewStrbuf(msgLoader, dto->trainerIDs[i]); - Strbuf_ToChars(trainerName, dto->trainerData[i].name, TRAINER_NAME_LEN + 1); + Strbuf_ToChars(trainerName, dto->trainer[i].name, TRAINER_NAME_LEN + 1); Strbuf_Free(trainerName); } @@ -53,12 +53,12 @@ void TrainerData_Encounter(FieldBattleDTO *dto, const SaveData *save, int heapID MessageLoader_Free(msgLoader); } -u32 TrainerData_LoadParam(int trainerID, enum TrainerDataParam paramID) +u32 Trainer_LoadParam(int trainerID, enum TrainerDataParam paramID) { u32 result; - TrainerData trdata; + Trainer trdata; - TrainerData_Load(trainerID, &trdata); + Trainer_Load(trainerID, &trdata); switch (paramID) { case TRDATA_TYPE: @@ -96,7 +96,7 @@ u32 TrainerData_LoadParam(int trainerID, enum TrainerDataParam paramID) return result; } -BOOL TrainerData_HasMessageType(int trainerID, enum TrainerMessageType msgType, int heapID) +BOOL Trainer_HasMessageType(int trainerID, enum TrainerMessageType msgType, int heapID) { NARC *narc; // must declare up here to match u16 offset, data[2]; @@ -125,7 +125,7 @@ BOOL TrainerData_HasMessageType(int trainerID, enum TrainerMessageType msgType, return result; } -void TrainerData_LoadMessage(int trainerID, enum TrainerMessageType msgType, Strbuf *strbuf, int heapID) +void Trainer_LoadMessage(int trainerID, enum TrainerMessageType msgType, Strbuf *strbuf, int heapID) { NARC *narc; // must declare up here to match u16 offset, data[2]; @@ -152,12 +152,12 @@ void TrainerData_LoadMessage(int trainerID, enum TrainerMessageType msgType, Str } } -void TrainerData_Load(int trainerID, TrainerData *trdata) +void Trainer_Load(int trainerID, Trainer *trdata) { NARC_ReadWholeMemberByIndexPair(trdata, NARC_INDEX_POKETOOL__TRAINER__TRDATA, trainerID); } -void TrainerData_LoadParty(int trainerID, void *trparty) +void Trainer_LoadParty(int trainerID, void *trparty) { NARC_ReadWholeMemberByIndexPair(trparty, NARC_INDEX_POKETOOL__TRAINER__TRPOKE, trainerID); } @@ -190,24 +190,24 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) buf = Heap_AllocFromHeap(heapID, sizeof(TrainerMonWithMovesAndItem) * MAX_PARTY_SIZE); mon = Pokemon_New(heapID); - TrainerData_LoadParty(dto->trainerIDs[battler], buf); + Trainer_LoadParty(dto->trainerIDs[battler], buf); // determine which magic gender-specific modifier to use for the RNG function - genderMod = TrainerClass_Gender(dto->trainerData[battler].class) == GENDER_FEMALE + genderMod = TrainerClass_Gender(dto->trainer[battler].class) == GENDER_FEMALE ? 120 : 136; - switch (dto->trainerData[battler].type) { + switch (dto->trainer[battler].type) { case TRDATATYPE_BASE: { TrainerMonBase *trmon = (TrainerMonBase *)buf; - for (i = 0; i < dto->trainerData[battler].partySize; i++) { + for (i = 0; i < dto->trainer[battler].partySize; i++) { u16 species = trmon[i].species & 0x3FF; u8 form = (trmon[i].species & 0xFC00) >> 10; rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); - for (j = 0; j < dto->trainerData[battler].class; j++) { + for (j = 0; j < dto->trainer[battler].class; j++) { rnd = LCRNG_Next(); } @@ -225,14 +225,14 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) case TRDATATYPE_WITH_MOVES: { TrainerMonWithMoves *trmon = (TrainerMonWithMoves *)buf; - for (i = 0; i < dto->trainerData[battler].partySize; i++) { + for (i = 0; i < dto->trainer[battler].partySize; i++) { u16 species = trmon[i].species & 0x3FF; u8 form = (trmon[i].species & 0xFC00) >> 10; rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); - for (j = 0; j < dto->trainerData[battler].class; j++) { + for (j = 0; j < dto->trainer[battler].class; j++) { rnd = LCRNG_Next(); } @@ -255,14 +255,14 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) case TRDATATYPE_WITH_ITEM: { TrainerMonWithItem *trmon = (TrainerMonWithItem *)buf; - for (i = 0; i < dto->trainerData[battler].partySize; i++) { + for (i = 0; i < dto->trainer[battler].partySize; i++) { u16 species = trmon[i].species & 0x3FF; u8 form = (trmon[i].species & 0xFC00) >> 10; rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); - for (j = 0; j < dto->trainerData[battler].class; j++) { + for (j = 0; j < dto->trainer[battler].class; j++) { rnd = LCRNG_Next(); } @@ -281,14 +281,14 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) case TRDATATYPE_WITH_MOVES_AND_ITEM: { TrainerMonWithMovesAndItem *trmon = (TrainerMonWithMovesAndItem *)buf; - for (i = 0; i < dto->trainerData[battler].partySize; i++) { + for (i = 0; i < dto->trainer[battler].partySize; i++) { u16 species = trmon[i].species & 0x3FF; u8 form = (trmon[i].species & 0xFC00) >> 10; rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); - for (j = 0; j < dto->trainerData[battler].class; j++) { + for (j = 0; j < dto->trainer[battler].class; j++) { rnd = LCRNG_Next(); } diff --git a/src/unk_0202631C.c b/src/unk_0202631C.c index 699193005f..6b6480c2b0 100644 --- a/src/unk_0202631C.c +++ b/src/unk_0202631C.c @@ -18,7 +18,7 @@ #define UNOWN_COUNT 28 #define BYTE_SLOTS 16 -typedef struct PokedexData { +typedef struct Pokedex { u32 magic; u32 caughtPokemon[BYTE_SLOTS]; u32 seenPokemon[BYTE_SLOTS]; @@ -38,29 +38,29 @@ typedef struct PokedexData { u8 unk_320; u8 unk_321; u16 unk_322; -} PokedexData; +} Pokedex; int Pokedex_SaveSize(void) { - return sizeof(PokedexData); + return sizeof(Pokedex); } -PokedexData *sub_02026324(u32 param0) +Pokedex *Pokedex_New(u32 param0) { - PokedexData *v0; + Pokedex *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(PokedexData)); + v0 = Heap_AllocFromHeap(param0, sizeof(Pokedex)); Pokedex_Init(v0); return v0; } -void Pokedex_Copy(const PokedexData *src, PokedexData *dest) +void Pokedex_Copy(const Pokedex *src, Pokedex *dest) { - MI_CpuCopy8(src, dest, sizeof(PokedexData)); + MI_CpuCopy8(src, dest, sizeof(Pokedex)); } -static inline void CheckPokedexIntegrity(const PokedexData *param0) +static inline void CheckPokedexIntegrity(const Pokedex *param0) { GF_ASSERT(param0->magic == 3203386110); } @@ -110,17 +110,17 @@ static inline void inline_020267B8(u8 *param0, u8 param1, u16 param2) param0[param2 >> 2] |= param1 << ((param2 & 3) * 2); } -static inline void Write_SeenSpecies(PokedexData *param0, u16 species) +static inline void Write_SeenSpecies(Pokedex *param0, u16 species) { WriteBit((u8 *)param0->seenPokemon, species); } -static inline void Write_CaughtSpecies(PokedexData *param0, u16 species) +static inline void Write_CaughtSpecies(Pokedex *param0, u16 species) { WriteBit((u8 *)param0->caughtPokemon, species); } -static void sub_02026360(PokedexData *param0, u8 param1, u8 param2, u16 param3) +static void sub_02026360(Pokedex *param0, u8 param1, u8 param2, u16 param3) { if (param2 == 0) { inline_02026360((u8 *)param0->recordedGenders[1], param1, param3); @@ -129,7 +129,7 @@ static void sub_02026360(PokedexData *param0, u8 param1, u8 param2, u16 param3) inline_02026360((u8 *)param0->recordedGenders[param2], param1, param3); } -static void sub_020263D8(PokedexData *param0, u8 param1, u8 param2, u16 param3) +static void sub_020263D8(Pokedex *param0, u8 param1, u8 param2, u16 param3) { GF_ASSERT(param1 <= 2); @@ -140,29 +140,29 @@ static void sub_020263D8(PokedexData *param0, u8 param1, u8 param2, u16 param3) sub_02026360(param0, param1, param2, param3); } -static inline BOOL CheckSeenMask(const PokedexData *pokedex, u16 species) +static inline BOOL CheckSeenMask(const Pokedex *pokedex, u16 species) { return ReadBit((const u8 *)pokedex->seenPokemon, species); } -static inline BOOL CheckCaughtMask(const PokedexData *pokedex, u16 species) +static inline BOOL CheckCaughtMask(const Pokedex *pokedex, u16 species) { return ReadBit((const u8 *)pokedex->caughtPokemon, species); } -static inline u8 inline_02026BAC(const PokedexData *param0, u16 param1, u8 param2) +static inline u8 inline_02026BAC(const Pokedex *param0, u16 param1, u8 param2) { return ReadBit((const u8 *)param0->recordedGenders[param2], param1); } -static inline void inline_0202736C_1(PokedexData *param0, u16 param1, u32 param2) +static inline void inline_0202736C_1(Pokedex *param0, u16 param1, u32 param2) { if (param1 == SPECIES_SPINDA) { param0->unk_104 = param2; } } -static int sub_02026400(const PokedexData *param0) +static int sub_02026400(const Pokedex *param0) { int v0; @@ -175,7 +175,7 @@ static int sub_02026400(const PokedexData *param0) return v0; } -static BOOL sub_02026418(const PokedexData *param0, u8 param1) +static BOOL sub_02026418(const Pokedex *param0, u8 param1) { int v0; @@ -188,7 +188,7 @@ static BOOL sub_02026418(const PokedexData *param0, u8 param1) return 0; } -static void sub_0202643C(PokedexData *param0, int param1) +static void sub_0202643C(Pokedex *param0, int param1) { int v0; @@ -203,7 +203,7 @@ static void sub_0202643C(PokedexData *param0, int param1) } } -static int sub_02026464(const PokedexData *param0, u32 param1) +static int sub_02026464(const Pokedex *param0, u32 param1) { u32 v0; u32 v1; @@ -240,7 +240,7 @@ static int sub_02026464(const PokedexData *param0, u32 param1) return 2; } -static BOOL sub_02026514(const PokedexData *param0, u32 param1, u8 param2) +static BOOL sub_02026514(const Pokedex *param0, u32 param1, u8 param2) { u32 v0; u32 v1; @@ -281,7 +281,7 @@ static BOOL sub_02026514(const PokedexData *param0, u32 param1, u8 param2) return 0; } -static void sub_020265E8(PokedexData *param0, u32 param1, int param2) +static void sub_020265E8(Pokedex *param0, u32 param1, int param2) { int v0; u8 *v1; @@ -318,7 +318,7 @@ static void sub_020265E8(PokedexData *param0, u32 param1, int param2) } } -static int sub_020266F8(const PokedexData *param0, u32 param1) +static int sub_020266F8(const Pokedex *param0, u32 param1) { u32 v0; int v1; @@ -347,7 +347,7 @@ static int sub_020266F8(const PokedexData *param0, u32 param1) return v1; } -static BOOL sub_02026754(const PokedexData *param0, u32 param1, u8 param2) +static BOOL sub_02026754(const Pokedex *param0, u32 param1, u8 param2) { u32 v0; int v1; @@ -376,7 +376,7 @@ static BOOL sub_02026754(const PokedexData *param0, u32 param1, u8 param2) return 0; } -static void sub_020267B8(PokedexData *param0, u32 param1, int param2) +static void sub_020267B8(Pokedex *param0, u32 param1, int param2) { int v0; u8 *v1; @@ -409,7 +409,7 @@ static void sub_02026834(u32 *param0, u8 param1, u8 param2) param0[16 - 1] |= (param1 << v0); } -static void sub_02026850(PokedexData *param0, u8 param1, u8 param2) +static void sub_02026850(Pokedex *param0, u8 param1, u8 param2) { GF_ASSERT(param2 < 4); GF_ASSERT(param1 <= 15); @@ -429,7 +429,7 @@ static inline u32 inline_0202688C(const u32 *param0, u8 param1) return v1; } -static u32 sub_0202688C(const PokedexData *param0, u8 param1) +static u32 sub_0202688C(const Pokedex *param0, u8 param1) { u32 v0; @@ -442,7 +442,7 @@ static u32 sub_0202688C(const PokedexData *param0, u8 param1) return v0; } -static u32 sub_020268B8(const PokedexData *param0) +static u32 sub_020268B8(const Pokedex *param0) { int v0; @@ -455,7 +455,7 @@ static u32 sub_020268B8(const PokedexData *param0) return v0; } -static BOOL sub_020268D8(const PokedexData *param0, u32 param1) +static BOOL sub_020268D8(const Pokedex *param0, u32 param1) { int v0; @@ -468,7 +468,7 @@ static BOOL sub_020268D8(const PokedexData *param0, u32 param1) return 0; } -static void sub_020268FC(PokedexData *param0, u16 param1, Pokemon *param2) +static void sub_020268FC(Pokedex *param0, u16 param1, Pokemon *param2) { u8 v0 = Pokemon_GetValue(param2, MON_DATA_FORM, NULL); u32 v1; @@ -481,7 +481,7 @@ static void sub_020268FC(PokedexData *param0, u16 param1, Pokemon *param2) } } -static void sub_0202693C(PokedexData *param0) +static void sub_0202693C(Pokedex *param0) { int v0; @@ -503,7 +503,7 @@ static inline void inline_02026A00(u32 *param0, u32 param1, u32 param2) (*param0) |= (param2 << (param1 * 3)); } -static int sub_02026958(const PokedexData *param0, u32 param1) +static int sub_02026958(const Pokedex *param0, u32 param1) { u32 v0; int v1, v2; @@ -529,7 +529,7 @@ static int sub_02026958(const PokedexData *param0, u32 param1) return v2; } -static BOOL sub_020269A4(const PokedexData *param0, u32 param1, u8 param2) +static BOOL sub_020269A4(const Pokedex *param0, u32 param1, u8 param2) { int v0; u32 v1; @@ -554,7 +554,7 @@ static BOOL sub_020269A4(const PokedexData *param0, u32 param1, u8 param2) return 0; } -static void sub_02026A00(PokedexData *param0, u32 param1, int param2) +static void sub_02026A00(Pokedex *param0, u32 param1, int param2) { int v0; @@ -571,7 +571,7 @@ static void sub_02026A00(PokedexData *param0, u32 param1, int param2) } } -static void sub_02026A60(PokedexData *param0, u16 param1, Pokemon *param2) +static void sub_02026A60(Pokedex *param0, u16 param1, Pokemon *param2) { int v0; @@ -616,7 +616,7 @@ static void sub_02026A60(PokedexData *param0, u16 param1, Pokemon *param2) } } -static void sub_02026B88(PokedexData *param0, u16 param1, u32 param2) +static void sub_02026B88(Pokedex *param0, u16 param1, u32 param2) { int v0; int v1; @@ -631,7 +631,7 @@ static void sub_02026B88(PokedexData *param0, u16 param1, u32 param2) param0->recordedLanguages[v0] |= 1 << v1; } -static u32 sub_02026BAC(const PokedexData *param0, u16 param1, int param2) +static u32 sub_02026BAC(const Pokedex *param0, u16 param1, int param2) { u32 v0, v1; u32 v2; @@ -661,12 +661,12 @@ static u32 sub_02026BAC(const PokedexData *param0, u16 param1, int param2) return v2; } -static inline int inline_020270AC(const PokedexData *param0, int param1) +static inline int inline_020270AC(const Pokedex *param0, int param1) { return param0->unk_10C[param1]; } -static int sub_02026C24(const PokedexData *param0, u32 param1, int param2) +static int sub_02026C24(const Pokedex *param0, u32 param1, int param2) { const u8 *v0; @@ -691,7 +691,7 @@ static int sub_02026C24(const PokedexData *param0, u32 param1, int param2) return ReadBit(v0, param2 + 1); } -static int sub_02026CCC(const PokedexData *param0, u32 param1, int param2) +static int sub_02026CCC(const Pokedex *param0, u32 param1, int param2) { GF_ASSERT(param1 == 479); GF_ASSERT(param2 < 6); @@ -699,7 +699,7 @@ static int sub_02026CCC(const PokedexData *param0, u32 param1, int param2) return inline_02026958(param0->unk_31C, param2); } -static int sub_02026CFC(const PokedexData *param0, u32 param1, int param2) +static int sub_02026CFC(const Pokedex *param0, u32 param1, int param2) { const u8 *v0; @@ -749,9 +749,9 @@ static BOOL sub_02026D68(u16 param0) return 1; } -void Pokedex_Init(PokedexData *param0) +void Pokedex_Init(Pokedex *param0) { - memset(param0, 0, sizeof(PokedexData)); + memset(param0, 0, sizeof(Pokedex)); param0->magic = 3203386110; param0->nationalDexObtained = FALSE; @@ -769,7 +769,7 @@ void Pokedex_Init(PokedexData *param0) sub_0202693C(param0); } -u16 sub_02026DD0(const PokedexData *param0) +u16 sub_02026DD0(const Pokedex *param0) { int v0; int v1; @@ -786,7 +786,7 @@ u16 sub_02026DD0(const PokedexData *param0) return v1; } -u16 Pokedex_CountSeenNational(const PokedexData *pokedex) +u16 Pokedex_CountSeenNational(const Pokedex *pokedex) { int i; CheckPokedexIntegrity(pokedex); @@ -802,7 +802,7 @@ u16 Pokedex_CountSeenNational(const PokedexData *pokedex) return seenCount; } -u16 Pokedex_CountSeen(const PokedexData *pokedex) +u16 Pokedex_CountSeen(const Pokedex *pokedex) { if (Pokedex_IsNationalDexObtained(pokedex)) { return Pokedex_CountSeenNational(pokedex); @@ -811,7 +811,7 @@ u16 Pokedex_CountSeen(const PokedexData *pokedex) return Pokedex_CountSeenSinnoh(pokedex); } -u16 sub_02026E64(const PokedexData *param0) +u16 sub_02026E64(const Pokedex *param0) { int v0; int v1; @@ -830,7 +830,7 @@ u16 sub_02026E64(const PokedexData *param0) return v1; } -u16 Pokedex_CountSeenSinnoh(const PokedexData *pokedex) +u16 Pokedex_CountSeenSinnoh(const Pokedex *pokedex) { int i; @@ -846,7 +846,7 @@ u16 Pokedex_CountSeenSinnoh(const PokedexData *pokedex) return seenCount; } -BOOL sub_02026EF4(const PokedexData *param0) +BOOL sub_02026EF4(const Pokedex *param0) { u16 v0; @@ -859,7 +859,7 @@ BOOL sub_02026EF4(const PokedexData *param0) return 0; } -BOOL sub_02026F0C(const PokedexData *param0) +BOOL sub_02026F0C(const Pokedex *param0) { u16 v0; @@ -872,7 +872,7 @@ BOOL sub_02026F0C(const PokedexData *param0) return 0; } -u16 sub_02026F20(const PokedexData *param0) +u16 sub_02026F20(const Pokedex *param0) { int v0; u16 v1; @@ -890,7 +890,7 @@ u16 sub_02026F20(const PokedexData *param0) return v1; } -u16 sub_02026F58(const PokedexData *param0) +u16 sub_02026F58(const Pokedex *param0) { int v0; u16 v1; @@ -913,7 +913,7 @@ u16 sub_02026F58(const PokedexData *param0) return v1; } -BOOL Pokedex_HasCaughtSpecies(const PokedexData *pokedex, u16 species) +BOOL Pokedex_HasCaughtSpecies(const Pokedex *pokedex, u16 species) { CheckPokedexIntegrity(pokedex); @@ -928,7 +928,7 @@ BOOL Pokedex_HasCaughtSpecies(const PokedexData *pokedex, u16 species) } } -BOOL Pokedex_HasSeenSpecies(const PokedexData *pokedex, u16 species) +BOOL Pokedex_HasSeenSpecies(const Pokedex *pokedex, u16 species) { CheckPokedexIntegrity(pokedex); @@ -939,7 +939,7 @@ BOOL Pokedex_HasSeenSpecies(const PokedexData *pokedex, u16 species) return CheckSeenMask(pokedex, species); } -u32 sub_0202702C(const PokedexData *param0, u8 param1) +u32 sub_0202702C(const Pokedex *param0, u8 param1) { u32 v0; @@ -957,7 +957,7 @@ u32 sub_0202702C(const PokedexData *param0, u8 param1) return v0; } -u32 sub_02027058(const PokedexData *param0, u16 species, int param2) +u32 sub_02027058(const Pokedex *param0, u16 species, int param2) { CheckPokedexIntegrity(param0); @@ -972,7 +972,7 @@ u32 sub_02027058(const PokedexData *param0, u16 species, int param2) return sub_02026BAC(param0, species, param2); } -u32 sub_020270AC(const PokedexData *param0, int param1) +u32 sub_020270AC(const Pokedex *param0, int param1) { CheckPokedexIntegrity(param0); @@ -983,13 +983,13 @@ u32 sub_020270AC(const PokedexData *param0, int param1) return inline_020270AC(param0, param1); } -u32 sub_020270DC(const PokedexData *param0) +u32 sub_020270DC(const Pokedex *param0) { CheckPokedexIntegrity(param0); return sub_02026400(param0); } -u32 sub_020270F8(const PokedexData *param0, int param1) +u32 sub_020270F8(const Pokedex *param0, int param1) { CheckPokedexIntegrity(param0); @@ -1000,13 +1000,13 @@ u32 sub_020270F8(const PokedexData *param0, int param1) return sub_02026C24(param0, 422, param1); } -u32 sub_02027130(const PokedexData *param0) +u32 sub_02027130(const Pokedex *param0) { CheckPokedexIntegrity(param0); return sub_02026464(param0, 422); } -u32 sub_02027154(const PokedexData *param0, int param1) +u32 sub_02027154(const Pokedex *param0, int param1) { CheckPokedexIntegrity(param0); @@ -1017,13 +1017,13 @@ u32 sub_02027154(const PokedexData *param0, int param1) return sub_02026C24(param0, 423, param1); } -u32 sub_0202718C(const PokedexData *param0) +u32 sub_0202718C(const Pokedex *param0) { CheckPokedexIntegrity(param0); return sub_02026464(param0, 423); } -u32 sub_020271B0(const PokedexData *param0, int param1) +u32 sub_020271B0(const Pokedex *param0, int param1) { CheckPokedexIntegrity(param0); @@ -1034,13 +1034,13 @@ u32 sub_020271B0(const PokedexData *param0, int param1) return sub_02026CFC(param0, 412, param1); } -u32 sub_020271E8(const PokedexData *param0) +u32 sub_020271E8(const Pokedex *param0) { CheckPokedexIntegrity(param0); return sub_020266F8(param0, 412); } -u32 sub_02027208(const PokedexData *param0, int param1) +u32 sub_02027208(const Pokedex *param0, int param1) { CheckPokedexIntegrity(param0); @@ -1051,25 +1051,25 @@ u32 sub_02027208(const PokedexData *param0, int param1) return sub_02026CFC(param0, 413, param1); } -u32 sub_02027240(const PokedexData *param0) +u32 sub_02027240(const Pokedex *param0) { CheckPokedexIntegrity(param0); return sub_020266F8(param0, 413); } -u32 sub_02027264(const PokedexData *param0, int param1) +u32 sub_02027264(const Pokedex *param0, int param1) { CheckPokedexIntegrity(param0); return sub_0202688C(param0, param1); } -u32 sub_02027288(const PokedexData *param0) +u32 sub_02027288(const Pokedex *param0) { CheckPokedexIntegrity(param0); return sub_020268B8(param0); } -void sub_020272A4(PokedexData *param0, Pokemon *pokemon) +void sub_020272A4(Pokedex *param0, Pokemon *pokemon) { u16 species = Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL); u32 v1 = Pokemon_GetValue(pokemon, MON_DATA_PERSONALITY, NULL); @@ -1097,7 +1097,7 @@ void sub_020272A4(PokedexData *param0, Pokemon *pokemon) Write_SeenSpecies(param0, species); } -void sub_0202736C(PokedexData *param0, Pokemon *param1) +void sub_0202736C(Pokedex *param0, Pokemon *param1) { u16 species = Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL); u32 v1 = Pokemon_GetValue(param1, MON_DATA_LANGUAGE, NULL); @@ -1129,31 +1129,31 @@ void sub_0202736C(PokedexData *param0, Pokemon *param1) Write_SeenSpecies(param0, species); } -void sub_02027454(PokedexData *param0) +void sub_02027454(Pokedex *param0) { CheckPokedexIntegrity(param0); param0->nationalDexObtained = 1; } -BOOL Pokedex_IsNationalDexObtained(const PokedexData *pokedex) +BOOL Pokedex_IsNationalDexObtained(const Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); return pokedex->nationalDexObtained; } -BOOL Pokedex_CanDetectForms(const PokedexData *param0) +BOOL Pokedex_CanDetectForms(const Pokedex *param0) { CheckPokedexIntegrity(param0); return param0->canDetectForms; } -void Pokedex_TurnOnFormDetection(PokedexData *param0) +void Pokedex_TurnOnFormDetection(Pokedex *param0) { CheckPokedexIntegrity(param0); param0->canDetectForms = 1; } -BOOL sub_020274D0(const PokedexData *param0, u16 species, u32 param2) +BOOL sub_020274D0(const Pokedex *param0, u16 species, u32 param2) { int speciesInt; @@ -1167,35 +1167,35 @@ BOOL sub_020274D0(const PokedexData *param0, u16 species, u32 param2) return param0->recordedLanguages[speciesInt] & (1 << param2); } -void sub_02027508(PokedexData *param0) +void sub_02027508(Pokedex *param0) { param0->unk_319 = 1; } -BOOL sub_02027514(const PokedexData *param0) +BOOL sub_02027514(const Pokedex *param0) { return param0->unk_319; } -BOOL Pokedex_IsObtained(const PokedexData *pokedex) +BOOL Pokedex_IsObtained(const Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); return pokedex->pokedexObtained; } -void Pokedex_FlagObtained(PokedexData *pokedex) +void Pokedex_FlagObtained(Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); pokedex->pokedexObtained = TRUE; } -PokedexData *SaveData_Pokedex(SaveData *saveData) +Pokedex *SaveData_Pokedex(SaveData *saveData) { - PokedexData *pokedex = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_POKEDEX); + Pokedex *pokedex = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_POKEDEX); return pokedex; } -u32 sub_0202756C(const PokedexData *param0, int species, int param2) +u32 sub_0202756C(const Pokedex *param0, int species, int param2) { CheckPokedexIntegrity(param0); @@ -1252,7 +1252,7 @@ u32 sub_0202756C(const PokedexData *param0, int species, int param2) return 0; } -u32 sub_020276C8(const PokedexData *pokedex, int species) +u32 sub_020276C8(const Pokedex *pokedex, int species) { CheckPokedexIntegrity(pokedex); diff --git a/src/unk_0202CC64.c b/src/unk_0202CC64.c index 438698647e..9b0428ca68 100644 --- a/src/unk_0202CC64.c +++ b/src/unk_0202CC64.c @@ -19,7 +19,7 @@ void ChatotCry_Init(ChatotCry *param0) param0->exists = FALSE; } -ChatotCry *AllocateAndInitializeChatotCryData(int param0) +ChatotCry *ChatotCry_New(int param0) { ChatotCry *v0 = Heap_AllocFromHeap(param0, sizeof(ChatotCry)); diff --git a/src/unk_0202F180.c b/src/unk_0202F180.c index 2990a4e922..0911f612dd 100644 --- a/src/unk_0202F180.c +++ b/src/unk_0202F180.c @@ -14,7 +14,7 @@ void sub_0202F180(SaveData *param0, const Pokemon *param1) { if (Pokemon_GetValue((Pokemon *)param1, MON_DATA_IS_EGG, NULL) == 0) { - PokedexData *v0 = SaveData_Pokedex(param0); + Pokedex *v0 = SaveData_Pokedex(param0); GameRecords_IncrementTrainerScoreOnCatch(SaveData_GetGameRecordsPtr(param0), v0, Pokemon_GetValue((Pokemon *)param1, MON_DATA_SPECIES, NULL)); sub_0202736C(v0, (Pokemon *)param1); diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 2083d72766..64f8be95e6 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -478,7 +478,7 @@ void sub_0202F8AC(FieldBattleDTO *param0) for (v0 = 0; v0 < 4; v0++) { v2->unk_08[v0] = param0->trainerIDs[v0]; - v2->unk_18[v0] = param0->trainerData[v0]; + v2->unk_18[v0] = param0->trainer[v0]; if (param0->systemVersion[v0] == 0) { v2->unk_114[v0] = 0x140; @@ -565,7 +565,7 @@ void sub_0202FAFC(FieldBattleDTO *param0, SaveData *param1) for (v0 = 0; v0 < 4; v0++) { param0->trainerIDs[v0] = v1->unk_00.unk_08[v0]; - param0->trainerData[v0] = v1->unk_00.unk_18[v0]; + param0->trainer[v0] = v1->unk_00.unk_18[v0]; param0->systemVersion[v0] = v1->unk_00.unk_114[v0]; param0->unk_178[v0] = v1->unk_00.unk_134[v0]; diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index 7c38d1702d..1a1f08c2fc 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -312,7 +312,7 @@ BOOL ScrCmd_0DD(ScriptContext *param0) { StringTemplate **v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = sub_0206B08C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); + u16 v2 = VarsFlags_GetProfessorAssistantStarterSpecies(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); Strbuf *v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -546,7 +546,7 @@ BOOL ScrCmd_342(ScriptContext *param0) { StringTemplate **v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = sub_0206B08C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); + u16 v2 = VarsFlags_GetProfessorAssistantStarterSpecies(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); StringTemplate_SetSpeciesNameWithArticleByID(*v0, v1, v2); return 0; diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index a92dd87db8..5d14513ca3 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -106,7 +106,7 @@ StringTemplate *sub_0204AEE8(SaveData *param0, u16 param1, u16 param2, u8 param3 u8 v0; u16 v1; Strbuf *v2, *v3; - PokedexData *v4; + Pokedex *v4; StringTemplate *v5; MessageLoader *v6; diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index 751c348b9b..8c88dafee5 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -64,7 +64,7 @@ BOOL ScrCmd_255(ScriptContext *param0) PCBoxes *v1 = SaveData_PCBoxes(param0->fieldSystem->saveData); Pokemon *v2 = Pokemon_New(32); TrainerInfo *v3 = SaveData_GetTrainerInfo(param0->fieldSystem->saveData); - PokedexData *v4 = SaveData_Pokedex(param0->fieldSystem->saveData); + Pokedex *v4 = SaveData_Pokedex(param0->fieldSystem->saveData); BOOL v5; int v6; diff --git a/src/unk_020553DC.c b/src/unk_020553DC.c index 4f76e5c83d..0fb83bef6a 100644 --- a/src/unk_020553DC.c +++ b/src/unk_020553DC.c @@ -283,7 +283,7 @@ static void sub_020555CC(FieldSystem *fieldSystem, int param1, int *param2, int u16 sub_0205560C(int param0) { - u8 v0 = (u8)TrainerData_LoadParam(param0, 1); + u8 v0 = (u8)Trainer_LoadParam(param0, 1); u16 i, v1 = 1101; for (i = 0; i < 79; i++) { diff --git a/src/unk_0206AFE0.c b/src/unk_0206AFE0.c index 2b86eb7b78..940ff4fbfa 100644 --- a/src/unk_0206AFE0.c +++ b/src/unk_0206AFE0.c @@ -21,7 +21,7 @@ static u16 sub_0206B010(VarsFlags *param0, u16 param1); BOOL sub_0206B044(VarsFlags *param0, u16 param1); u16 sub_0206B054(VarsFlags *param0); u16 sub_0206B064(VarsFlags *param0); -u16 sub_0206B08C(VarsFlags *param0); +u16 VarsFlags_GetProfessorAssistantStarterSpecies(VarsFlags *param0); void sub_0206B558(VarsFlags *param0, u16 param1); void sub_0206B514(SaveData *param0); static u8 sub_0206B4A4(VarsFlags *param0); @@ -90,7 +90,7 @@ u16 sub_0206B064(VarsFlags *param0) return v0; } -u16 sub_0206B08C(VarsFlags *param0) +u16 VarsFlags_GetProfessorAssistantStarterSpecies(VarsFlags *param0) { u16 v0; u16 v1 = sub_0206B010(param0, (0 + (((0 + VARS_START) + 32) + 16))); diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index 05b75c4d37..456915a18e 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -770,7 +770,7 @@ static int sub_0206D2E0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206D320(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); UnkStruct_0206D140 *v1 = ov6_02246498(param1); return Pokedex_HasSeenSpecies(v0, v1->unk_06); @@ -961,7 +961,7 @@ static int sub_0206D644(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206D6A8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); UnkStruct_0206D644 *v1 = (UnkStruct_0206D644 *)ov6_02246498(param1); return Pokedex_HasSeenSpecies(v0, v1->unk_00); @@ -1022,7 +1022,7 @@ static int sub_0206D75C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206D7A4(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); UnkStruct_0206D75C *v1 = (UnkStruct_0206D75C *)ov6_02246498(param1); return Pokedex_HasSeenSpecies(v0, v1->unk_00); @@ -2754,7 +2754,7 @@ static int sub_0206F01C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr { Strbuf *v0; u16 v1, v2, v3; - const PokedexData *v4 = SaveData_Pokedex(fieldSystem->saveData); + const Pokedex *v4 = SaveData_Pokedex(fieldSystem->saveData); v1 = (LCRNG_Next() % (NATIONAL_DEX_COUNT - 1)) + 1; @@ -2803,7 +2803,7 @@ static Strbuf *sub_0206F0D8(u16 param0, u32 param1) static BOOL sub_0206F100(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - const PokedexData *pokedex = SaveData_Pokedex(fieldSystem->saveData); + const Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); if (Pokedex_IsObtained(pokedex) == TRUE) { return TRUE; @@ -2849,7 +2849,7 @@ static int sub_0206F160(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr Pokemon *v3; Party *v4; TrainerInfo *v5 = SaveData_GetTrainerInfo(fieldSystem->saveData); - PokedexData *v6 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *v6 = SaveData_Pokedex(fieldSystem->saveData); v4 = Party_GetFromSavedata(fieldSystem->saveData); v3 = Party_GetPokemonBySlotIndex(v4, sub_0205E1B4(fieldSystem->saveData)); @@ -2881,7 +2881,7 @@ static int sub_0206F160(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206F260(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - const PokedexData *pokedex = SaveData_Pokedex(fieldSystem->saveData); + const Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); if (Pokedex_IsObtained(pokedex) == TRUE) { return TRUE; diff --git a/src/unk_0207A274.c b/src/unk_0207A274.c index 1e5fd45de0..c634b13646 100644 --- a/src/unk_0207A274.c +++ b/src/unk_0207A274.c @@ -11,13 +11,13 @@ u32 sub_0207A274(SaveData *param0) { - PokedexData *v0; + Pokedex *v0; v0 = SaveData_Pokedex(param0); return sub_0207A280(v0); } -u32 sub_0207A280(const PokedexData *param0) +u32 sub_0207A280(const Pokedex *param0) { BOOL v0; diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c index b6442d07ca..0b09c5d5b1 100644 --- a/src/unk_0207A6DC.c +++ b/src/unk_0207A6DC.c @@ -151,7 +151,7 @@ static int sub_0207A76C(void) static int sub_0207A774(void) { - return sizeof(TrainerData); + return sizeof(Trainer); } static u8 *sub_0207A778(int param0, void *param1, int param2) @@ -170,9 +170,9 @@ static u8 *sub_0207A798(int param0, void *param1, int param2) UnkStruct_0207A778 *v0 = param1; if (v0->unk_00->battleType & BATTLE_TYPE_FRONTIER) { - return (u8 *)&v0->unk_00->trainerData[param0 * 2]; + return (u8 *)&v0->unk_00->trainer[param0 * 2]; } else { - return (u8 *)&v0->unk_00->trainerData[param0]; + return (u8 *)&v0->unk_00->trainer[param0]; } } @@ -201,13 +201,13 @@ static u8 *sub_0207A7D4(int param0, void *param1, int param2) static u8 *sub_0207A7F4(int param0, void *param1, int param2) { UnkStruct_0207A778 *v0 = param1; - return (u8 *)&v0->unk_00->trainerData[1]; + return (u8 *)&v0->unk_00->trainer[1]; } static u8 *sub_0207A7FC(int param0, void *param1, int param2) { UnkStruct_0207A778 *v0 = param1; - return (u8 *)&v0->unk_00->trainerData[3]; + return (u8 *)&v0->unk_00->trainer[3]; } static u8 *sub_0207A804(int param0, void *param1, int param2) @@ -347,14 +347,14 @@ static void sub_0207A9BC(int param0, int param1, void *param2, void *param3) BOOL sub_0207A9CC(UnkStruct_0207A778 *param0) { - TrainerData *v0; + Trainer *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; } - v0 = (TrainerData *)¶m0->unk_20[0]; - *v0 = param0->unk_00->trainerData[0]; + v0 = (Trainer *)¶m0->unk_20[0]; + *v0 = param0->unk_00->trainer[0]; return 1; } @@ -369,7 +369,7 @@ BOOL sub_0207A9F8(UnkStruct_0207A778 *param0) return 0; } - return CommSys_SendDataHuge(26, (void *)¶m0->unk_20[0], sizeof(TrainerData)); + return CommSys_SendDataHuge(26, (void *)¶m0->unk_20[0], sizeof(Trainer)); } static void sub_0207AA28(int param0, int param1, void *param2, void *param3) @@ -490,14 +490,14 @@ static void sub_0207AB8C(int param0, int param1, void *param2, void *param3) BOOL sub_0207AB9C(UnkStruct_0207A778 *param0, int param1) { - TrainerData *v0; + Trainer *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; } - v0 = (TrainerData *)¶m0->unk_20[0]; - *v0 = param0->unk_00->trainerData[param1]; + v0 = (Trainer *)¶m0->unk_20[0]; + *v0 = param0->unk_00->trainer[param1]; return 1; } @@ -513,9 +513,9 @@ BOOL sub_0207ABD0(UnkStruct_0207A778 *param0, int param1, int param2) } if (param1 == 1) { - return CommSys_SendDataHuge(29, (void *)¶m0->unk_20[0], sizeof(TrainerData)); + return CommSys_SendDataHuge(29, (void *)¶m0->unk_20[0], sizeof(Trainer)); } else { - return CommSys_SendDataHuge(30, (void *)¶m0->unk_20[0], sizeof(TrainerData)); + return CommSys_SendDataHuge(30, (void *)¶m0->unk_20[0], sizeof(Trainer)); } } diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 95fa2d8231..243afd717c 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -60,7 +60,7 @@ #include "constdata/const_020F410C.h" -UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, PokedexData *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11); +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11); static void sub_0207B0A0(SysTask *param0, void *param1); BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0); void sub_0207B0E0(UnkStruct_0207AE68 *param0); @@ -90,7 +90,7 @@ static const u8 Unk_020F0A2C[] = { 0x8 }; -UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, PokedexData *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11) +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11) { UnkStruct_0207AE68 *v0; ArchivedSprite v1; diff --git a/src/unk_0208BA78.c b/src/unk_0208BA78.c index 5e277bd158..f37581a4bb 100644 --- a/src/unk_0208BA78.c +++ b/src/unk_0208BA78.c @@ -288,7 +288,7 @@ static BOOL sub_0208BC8C(UnkStruct_0208BC3C *param0, int param1) sub_0200544C(1, 127); sub_02005464(1); - if (sub_0208BE80(param0->unk_10->trainerData[1].class) == 1) { + if (sub_0208BE80(param0->unk_10->trainer[1].class) == 1) { sub_02004550(5, 1202, 1); } else { sub_02004550(5, 1119, 1); diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index bdc402d9ee..58a3a0ff14 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -439,7 +439,7 @@ UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0) } for (v2 = 0; v2 < 4; v2++) { - v0->unk_14C[v2] = AllocateAndInitializeChatotCryData(20); + v0->unk_14C[v2] = ChatotCry_New(20); } CopyChatotCryData(v0->unk_14C[0], param0->unk_20); @@ -1641,7 +1641,7 @@ void sub_02094C44(UnkStruct_02095C48 *param0, SaveData *param1, u32 param2, Jour { int v6; - PokedexData *v7; + Pokedex *v7; v7 = SaveData_Pokedex(param0->unk_1970); diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index 0b4d0df9db..0943792c62 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -26,7 +26,7 @@ struct UnkStruct_0209747C_t { u8 unk_04; u8 unk_05; int unk_08; - const PokedexData *unk_0C; + const Pokedex *unk_0C; const UnkStruct_02014EC4 *unk_10; Sentence unk_14; u16 unk_1C[2]; @@ -133,7 +133,7 @@ int sub_02097558(const UnkStruct_0209747C *param0) return param0->unk_08; } -const PokedexData *sub_0209755C(const UnkStruct_0209747C *param0) +const Pokedex *sub_0209755C(const UnkStruct_0209747C *param0) { return param0->unk_0C; } diff --git a/src/unk_020998EC.c b/src/unk_020998EC.c index e3f0a36bf0..caf4654969 100644 --- a/src/unk_020998EC.c +++ b/src/unk_020998EC.c @@ -3229,7 +3229,7 @@ static inline BOOL inline_02099BF4(const UnkStruct_020998EC *param0, u32 param1) static u32 sub_02099980(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3) { - const PokedexData *v0; + const Pokedex *v0; u32 v1, v2; v2 = 0; From 03e75a046a6fb4db09d7d683737d0619f52e3d11 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Wed, 18 Dec 2024 15:07:04 +0100 Subject: [PATCH 02/28] Minor improvements to `main.c`, `map_header_data.c` and `map_header.c` --- include/map_header.h | 68 +++++++++--------- src/main.c | 18 ++--- src/map_header.c | 160 +++++++++++++++++++++--------------------- src/map_header_data.c | 64 ++++++++--------- 4 files changed, 150 insertions(+), 160 deletions(-) diff --git a/include/map_header.h b/include/map_header.h index d3b985bf4e..66e25a8e4e 100644 --- a/include/map_header.h +++ b/include/map_header.h @@ -24,40 +24,40 @@ typedef struct { u16 isFlyAllowed : 1; } MapHeader; -u32 MapHeader_IDBoundsCheck(u32 param0); -const u16 sub_0203A038(u32 param0); -const u16 sub_0203A04C(u32 param0); -const u16 MapHeader_GetMapMatrixID(u32 param0); -u32 MapHeader_GetMsgArchiveID(u32 param0); -u32 MapHeader_GetScriptsArchiveID(u32 param0); -u32 MapHeader_GetInitScriptsArchiveID(u32 param0); -u16 MapHeader_GetDayMusicID(u32 param0); -u16 MapHeader_GetNightMusicID(u32 param0); -BOOL MapHeader_HasWildEncounters(u32 param0); -u32 MapHeader_GetWildEncountersArchiveID(u32 param0); -u32 MapHeader_GetEventsArchiveID(u32 param0); -u32 MapHeader_GetMapLabelTextID(u32 param0); -u8 MapHeader_GetMapLabelWindowID(u32 param0); -u32 MapHeader_GetWeatherType(u32 param0); -u32 MapHeader_GetCameraType(u32 param0); -u32 MapHeader_GetBattleBG(u32 param0); -BOOL MapHeader_IsEscapeRopeAllowed(u32 param0); -BOOL MapHeader_IsFlyAllowed(u32 param0); -BOOL MapHeader_IsBikeAllowed(u32 param0); +u32 MapHeader_IDBoundsCheck(u32 headerID); +const u16 sub_0203A038(u32 headerID); +const u16 sub_0203A04C(u32 headerID); +const u16 MapHeader_GetMapMatrixID(u32 headerID); +u32 MapHeader_GetMsgArchiveID(u32 headerID); +u32 MapHeader_GetScriptsArchiveID(u32 headerID); +u32 MapHeader_GetInitScriptsArchiveID(u32 headerID); +u16 MapHeader_GetDayMusicID(u32 headerID); +u16 MapHeader_GetNightMusicID(u32 headerID); +BOOL MapHeader_HasWildEncounters(u32 headerID); +u32 MapHeader_GetWildEncountersArchiveID(u32 headerID); +u32 MapHeader_GetEventsArchiveID(u32 headerID); +u32 MapHeader_GetMapLabelTextID(u32 headerID); +u8 MapHeader_GetMapLabelWindowID(u32 headerID); +u32 MapHeader_GetWeatherType(u32 headerID); +u32 MapHeader_GetCameraType(u32 headerID); +u32 MapHeader_GetBattleBG(u32 headerID); +BOOL MapHeader_IsEscapeRopeAllowed(u32 headerID); +BOOL MapHeader_IsFlyAllowed(u32 headerID); +BOOL MapHeader_IsBikeAllowed(u32 headerID); u32 MapHeader_GetMapType(u32 headerID); -BOOL MapHeader_IsTeleportAllowed(u32 param0); -BOOL MapHeader_IsOnMainMatrix(u32 param0); -BOOL MapHeader_IsPokemonCenter(u32 param0); -BOOL MapHeader_IsCave(u32 param0); -BOOL MapHeader_IsBuilding(u32 param0); -BOOL MapHeader_IsOutdoors(u32 param0); -BOOL sub_0203A2C8(u32 param0); -BOOL MapHeader_IsUnionRoom(const u32 param0); -BOOL MapHeader_HasFeebasTiles(const u32 param0); -BOOL MapHeader_IsTrophyGarden(const u32 param0); -BOOL MapHeader_IsAmitySquare(const u32 param0); -BOOL MapHeader_IsAzureFluteAllowed(const u32 param0); -BOOL MapHeader_IsPokemonCenter2F(const u32 param0); -u32 MapHeader_GetMapEvolutionMethod(u32 param0); +BOOL MapHeader_IsTeleportAllowed(u32 headerID); +BOOL MapHeader_IsOnMainMatrix(u32 headerID); +BOOL MapHeader_IsPokemonCenter(u32 headerID); +BOOL MapHeader_IsCave(u32 headerID); +BOOL MapHeader_IsBuilding(u32 headerID); +BOOL MapHeader_IsOutdoors(u32 headerID); +BOOL sub_0203A2C8(u32 headerID); +BOOL MapHeader_IsUnionRoom(const u32 headerID); +BOOL MapHeader_HasFeebasTiles(const u32 headerID); +BOOL MapHeader_IsTrophyGarden(const u32 headerID); +BOOL MapHeader_IsAmitySquare(const u32 headerID); +BOOL MapHeader_IsAzureFluteAllowed(const u32 headerID); +BOOL MapHeader_IsPokemonCenter2F(const u32 headerID); +u32 MapHeader_GetMapEvolutionMethod(u32 headerID); #endif // POKEPLATINUM_UNK_0203A024_H diff --git a/src/main.c b/src/main.c index 5e55ec2f1b..90060db1df 100644 --- a/src/main.c +++ b/src/main.c @@ -55,7 +55,7 @@ static void RunApplication(void); static void WaitFrame(void); static void TrySystemReset(enum OSResetParameter resetParam); static void SoftReset(enum OSResetParameter resetParam); -static void HeapCanaryFailed(int param0, int param1); +static void HeapCanaryFailed(int resetParam, int param1); static void CheckHeapCanary(void); static Application sApplication; @@ -92,7 +92,7 @@ void NitroMain(void) sub_02039A64(3, 0); } - if (SaveData_BackupExists(sApplication.args.saveData) == 0) { + if (SaveData_BackupExists(sApplication.args.saveData) == FALSE) { sub_0209A74C(0); } else { switch (OS_GetResetParameter()) { @@ -224,10 +224,8 @@ static void WaitFrame(void) static void TrySystemReset(enum OSResetParameter resetParam) { - if (sub_02038AB8()) { - if (CARD_TryWaitBackupAsync() == TRUE) { - OS_ResetSystem(resetParam); - } + if (sub_02038AB8() && CARD_TryWaitBackupAsync() == TRUE) { + OS_ResetSystem(resetParam); } WaitFrame(); @@ -271,7 +269,7 @@ static void HeapCanaryFailed(int resetParam, int param1) if (param1 == 3) { sub_02039834(0, 3, 0); - } else if (0 == resetParam) { + } else if (resetParam == 0) { if (sub_020389B8() == TRUE) { sub_02039834(0, 6, 0); } else { @@ -295,10 +293,8 @@ static void HeapCanaryFailed(int resetParam, int param1) HandleConsoleFold(); ReadKeypadAndTouchpad(); - if (elapsed >= 30) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { - break; - } + if (elapsed >= 30 && gCoreSys.pressedKeys & PAD_BUTTON_A) { + break; } WaitFrame(); diff --git a/src/map_header.c b/src/map_header.c index 77c7d631cf..5bbbe39c65 100644 --- a/src/map_header.c +++ b/src/map_header.c @@ -3,7 +3,11 @@ #include #include +#include "consts/map.h" +#include "consts/pokemon.h" + #include "data/map_headers.h" +#include "global/pm_version.h" u32 MapHeader_IDBoundsCheck(u32 headerID) { @@ -34,10 +38,8 @@ const u16 MapHeader_GetMapMatrixID(u32 headerID) headerID = MapHeader_IDBoundsCheck(headerID); mapMatrixID = sMapHeaders[headerID].mapMatrixID; - if (mapMatrixID == 22) { - if (gGameVersion == 11) { - mapMatrixID = 23; - } + if (mapMatrixID == 22 && gGameVersion == PEARL) { + mapMatrixID = 23; } return mapMatrixID; @@ -147,7 +149,7 @@ u32 MapHeader_GetMapType(u32 headerID) BOOL MapHeader_IsTeleportAllowed(u32 headerID) { - if (MapHeader_IsFlyAllowed(headerID) == 0) { + if (MapHeader_IsFlyAllowed(headerID) == FALSE) { return FALSE; } @@ -190,27 +192,27 @@ BOOL sub_0203A2C8(u32 headerID) BOOL MapHeader_IsUnionRoom(const u32 headerID) { - return headerID == 466; + return headerID == MAP_HEADER_UNION_ROOM; } BOOL MapHeader_HasFeebasTiles(const u32 headerID) { - return headerID == 219; + return headerID == MAP_HEADER_MT_CORONET_B1F; } BOOL MapHeader_IsTrophyGarden(const u32 headerID) { - return headerID == 287; + return headerID == MAP_HEADER_TROPHY_GARDEN; } BOOL MapHeader_IsAmitySquare(const u32 headerID) { - return headerID == 253; + return headerID == MAP_HEADER_AMITY_SQUARE; } BOOL MapHeader_IsAzureFluteAllowed(const u32 headerID) { - if ((headerID == 220) || (headerID == 584) || (headerID == 585)) { + if (headerID == MAP_HEADER_SPEAR_PILLAR || headerID == MAP_HEADER_SPEAR_PILLAR_DIALGA || headerID == MAP_HEADER_SPEAR_PILLAR_PALKIA) { return TRUE; } @@ -219,88 +221,88 @@ BOOL MapHeader_IsAzureFluteAllowed(const u32 headerID) BOOL MapHeader_IsPokemonCenter2F(const u32 headerID) { - static const u16 v0[] = { - 0x1A5, - 0x1AD, - 0x1B4, - 0x1BC, - 0x1C5, - 0x1CC, - 0x7, - 0x25, - 0x31, - 0x1EF, - 0x46, - 0x66, - 0x7C, - 0x87, - 0x98, - 0xA9, - 0xAE, - 0xBE + static const u16 pokecenters2F[] = { + MAP_HEADER_SANDGEM_TOWN_POKECENTER_2F, + MAP_HEADER_FLOAROMA_TOWN_POKECENTER_2F, + MAP_HEADER_SOLACEON_TOWN_POKECENTER_2F, + MAP_HEADER_CELESTIC_TOWN_POKECENTER_2F, + MAP_HEADER_SURVIVAL_AREA_POKECENTER_2F, + MAP_HEADER_RESORT_AREA_POKECENTER_2F, + MAP_HEADER_JUBILIFE_CITY_POKECENTER_2F, + MAP_HEADER_CANALAVE_CITY_POKECENTER_2F, + MAP_HEADER_OREBURGH_CITY_POKECENTER_2F, + MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_2F, + MAP_HEADER_ETERNA_CITY_POKECENTER_2F, + MAP_HEADER_HEARTHOME_CITY_POKECENTER_2F, + MAP_HEADER_PASTORIA_CITY_POKECENTER_2F, + MAP_HEADER_VEILSTONE_CITY_POKECENTER_2F, + MAP_HEADER_SUNYSHORE_CITY_POKECENTER_2F, + MAP_HEADER_SNOWPOINT_CITY_POKECENTER_2F, + MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_2F, + MAP_HEADER_FIGHT_AREA_POKECENTER_2F }; int i; - for (i = 0; i < NELEMS(v0); i++) { - if (headerID == v0[i]) { - return 1; + for (i = 0; i < NELEMS(pokecenters2F); i++) { + if (headerID == pokecenters2F[i]) { + return TRUE; } } - return 0; + return FALSE; } u32 MapHeader_GetMapEvolutionMethod(u32 headerID) { - static const u16 v0[] = { - 0x181, - 0x1A, - 0xCB, - 0x19, - 0xCF, - 0x18, - 0xD0, - 0x18, - 0xD1, - 0x18, - 0xD2, - 0x18, - 0xD3, - 0x18, - 0xD4, - 0x18, - 0xD5, - 0x18, - 0xD6, - 0x18, - 0xD7, - 0x18, - 0xD8, - 0x18, - 0xD9, - 0x18, - 0xDA, - 0x18, - 0xDB, - 0x18, - 0xDC, - 0x18, - 0xDD, - 0x18, - 0x1FE, - 0x18, - 0x1FF, - 0x18, - 0x248, - 0x18, - 0x249, - 0x18 + static const u16 mapEvolutionMethods[] = { + MAP_HEADER_ROUTE_217, + EVO_ICY_STONE, + MAP_HEADER_ETERNA_FOREST, + EVO_MOSSY_STONE, + MAP_HEADER_MT_CORONET_1F_SOUTH, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_2F, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_3F, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_OUTSIDE_NORTH, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_OUTSIDE_SOUTH, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_4F_ROOMS_1_AND_2, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_4F_ROOM_3, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_5F, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_6F, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_1F_TUNNEL_ROOM, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_2, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_1, + EVO_ELECTRIC_FIELD, + MAP_HEADER_MT_CORONET_B1F, + EVO_ELECTRIC_FIELD, + MAP_HEADER_SPEAR_PILLAR, + EVO_ELECTRIC_FIELD, + MAP_HEADER_SPEAR_PILLAR_DISTORTED, + EVO_ELECTRIC_FIELD, + MAP_HEADER_HALL_OF_ORIGIN, + EVO_ELECTRIC_FIELD, + MAP_HEADER_UNKNOWN_511, + EVO_ELECTRIC_FIELD, + MAP_HEADER_SPEAR_PILLAR_DIALGA, + EVO_ELECTRIC_FIELD, + MAP_HEADER_SPEAR_PILLAR_PALKIA, + EVO_ELECTRIC_FIELD }; int i; - for (i = 0; i < NELEMS(v0); i += 2) { - if (v0[i] == headerID) { - return v0[i + 1]; + for (i = 0; i < NELEMS(mapEvolutionMethods); i += 2) { + if (mapEvolutionMethods[i] == headerID) { + return mapEvolutionMethods[i + 1]; } } diff --git a/src/map_header_data.c b/src/map_header_data.c index abe0e6a969..d63a715645 100644 --- a/src/map_header_data.c +++ b/src/map_header_data.c @@ -196,52 +196,44 @@ static void MapHeaderData_ParseEvents(MapHeaderData *data) const u8 *events = (const u8 *)data->tmpEventsBuf; // bgEvents - { - data->numBgEvents = *(u32 *)events; - events += sizeof(u32); - if (data->numBgEvents != 0) { - data->bgEvents = (const BgEvent *)events; - } else { - data->bgEvents = NULL; - } - events += sizeof(BgEvent) * data->numBgEvents; + data->numBgEvents = *(u32 *)events; + events += sizeof(u32); + if (data->numBgEvents != 0) { + data->bgEvents = (const BgEvent *)events; + } else { + data->bgEvents = NULL; } + events += sizeof(BgEvent) * data->numBgEvents; // objectEvents - { - data->numObjectEvents = *(u32 *)events; - events += sizeof(u32); - if (data->numObjectEvents != 0) { - data->objectEvents = (const ObjectEvent *)events; - } else { - data->objectEvents = NULL; - } - events += sizeof(ObjectEvent) * data->numObjectEvents; + data->numObjectEvents = *(u32 *)events; + events += sizeof(u32); + if (data->numObjectEvents != 0) { + data->objectEvents = (const ObjectEvent *)events; + } else { + data->objectEvents = NULL; } + events += sizeof(ObjectEvent) * data->numObjectEvents; // warpEvents - { - data->numWarpEvents = *(u32 *)events; - events += sizeof(u32); - if (data->numWarpEvents != 0) { - data->warpEvents = (const WarpEvent *)events; - } else { - data->warpEvents = NULL; - } - events += sizeof(WarpEvent) * data->numWarpEvents; + data->numWarpEvents = *(u32 *)events; + events += sizeof(u32); + if (data->numWarpEvents != 0) { + data->warpEvents = (const WarpEvent *)events; + } else { + data->warpEvents = NULL; } + events += sizeof(WarpEvent) * data->numWarpEvents; // coordEvents - { - data->numCoordEvents = *(u32 *)events; - events += sizeof(u32); - if (data->numCoordEvents != 0) { - data->coordEvents = (const CoordEvent *)events; - } else { - data->coordEvents = NULL; - } - events += sizeof(CoordEvent) * data->numCoordEvents; + data->numCoordEvents = *(u32 *)events; + events += sizeof(u32); + if (data->numCoordEvents != 0) { + data->coordEvents = (const CoordEvent *)events; + } else { + data->coordEvents = NULL; } + events += sizeof(CoordEvent) * data->numCoordEvents; } void MapHeaderData_LoadWildEncounters(WildEncounters *data, int headerID) From e1a9ee5a4f2b5eacc94ce4fd66ec8c25c5a51e86 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Thu, 19 Dec 2024 14:23:33 +0100 Subject: [PATCH 03/28] Initial round of documentation for `map_object` and `map_object_move` (naming variables/functions, removing unnecessary params, combining if statements) --- include/map_object.h | 298 +++++++++--------- include/map_object_move.h | 40 +-- src/map_object.c | 559 ++++++++++++++++------------------ src/map_object_move.c | 440 +++++++++++++------------- src/overlay005/ov5_021DFB54.c | 6 +- src/overlay005/ov5_021E1154.c | 4 +- src/overlay005/ov5_021ECC20.c | 2 +- src/overlay005/ov5_021ECE40.c | 4 +- src/overlay005/ov5_021F61BC.c | 2 +- src/unk_0205F180.c | 20 +- src/unk_02069BE0.c | 2 +- 11 files changed, 662 insertions(+), 715 deletions(-) diff --git a/include/map_object.h b/include/map_object.h index 7fe12249d5..31c3853a93 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -25,63 +25,63 @@ #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); +void MapObjectMan_Delete(MapObjectManager *mapObjMan); +void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2); +MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int param1, int param2, int param3, int param4, int param5, int param6); +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); +void sub_02061AB4(MapObject *mapObj, int param1); +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 param2); +void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *objectEvent); +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1); +MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1); +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 param3); +int sub_020626B4(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 param1); +int MapObjectMan_GetMaxObjects(const MapObjectManager *mapObjMan); +void sub_02062838(MapObjectManager *mapObjMan, u32 param1); +void sub_02062840(MapObjectManager *mapObjMan, u32 param1); +u32 sub_0206284C(const MapObjectManager *mapObjMan, u32 param1); +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_GetNARC(MapObjectManager *mapObjMan, NARC *narc); +NARC *sub_020628A0(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 +98,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 param1); +void *sub_02062A78(MapObject *mapObj); +void *sub_02062A7C(MapObject *mapObj, int param1); +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 param1); +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 param1); +u32 MapObject_GetCurrTileBehavior(const MapObject *mapObj); +void MapObject_SetPrevTileBehavior(MapObject *mapObj, u32 param1); +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 sub_02062CBC(const MapObject *mapObj, u32 param1); +void sub_02062CCC(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 sub_02062D28(MapObject *mapObj); +void sub_02062D34(MapObject *mapObj); +void sub_02062D40(MapObject *mapObj); +int sub_02062D4C(const MapObject *mapObj); +int sub_02062D58(const MapObject *mapObj); +void MapObject_SetHidden(MapObject *mapObj, int param1); +void sub_02062D80(MapObject *mapObj, int param1); +int sub_02062D9C(MapObject *mapObj); +void sub_02062DB4(MapObject *mapObj, int param1); +void sub_02062DD0(MapObject *mapObj); +void sub_02062DDC(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 +217,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 *param1); +void sub_02063088(MapObject *mapObj, const VecFx32 *param1); +VecFx32 *sub_02063098(MapObject *mapObj); +void sub_0206309C(const MapObject *mapObj, VecFx32 *param1); +void sub_020630AC(MapObject *mapObj, const VecFx32 *param1); +void sub_020630BC(const MapObject *mapObj, VecFx32 *param1); +void sub_020630CC(MapObject *mapObj, const VecFx32 *param1); +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 +251,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 param1, int param2, int param3); +void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2); +void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4); +void MapObject_SetMoveCode(MapObject *mapObj, u32 param1); +void sub_020633C8(MapObject *mapObj, int param1); +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..feba7525b5 100644 --- a/include/map_object_move.h +++ b/include/map_object_move.h @@ -7,33 +7,33 @@ #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); +void MapObject_InitMove(MapObject *mapObj); +void MapObject_Move(MapObject *mapObj); +u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, int param5); +u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4); +u32 sub_02063EBC(const MapObject *mapObj, int param1); +int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3); +int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3); +int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3); +int MapObject_IsOnWater(MapObject *mapObj, u32 param1); +int MapObject_IsOnSand(MapObject *mapObj, u32 param1); +int MapObject_IsOnSnow(MapObject *mapObj, u32 param1); +int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 param1); +int sub_0206413C(MapObject *mapObj, u32 param1); +int sub_0206415C(MapObject *mapObj, u32 param1); +int sub_0206417C(MapObject *mapObj, u32 param1); int MapObject_GetDxFromDir(int param0); int MapObject_GetDyFromDir(int param0); 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 param1); +void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *param1); void MapObject_MovePosInDir(MapObject *mapObj, int dir, fx32 distance); -int sub_020642F8(MapObject *param0); -int sub_02064390(MapObject *param0); +int sub_020642F8(MapObject *mapObj); +int MapObject_SetTileBehaviors(MapObject *mapObj); void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2); void sub_02064450(int param0, int param1, VecFx32 *param2); -void sub_02064464(MapObject *param0); +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); diff --git a/src/map_object.c b/src/map_object.c index a248aac2d3..c1746f6703 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -41,10 +41,10 @@ typedef struct MapObjectMan { 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 +82,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 +104,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 param2, const ObjectEvent *objectEvent); +static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, int param2); +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 param2); +static void sub_02062714(MapObject *mapObj, int param1, 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 sub_020631D8(const ObjectEvent *objectEvent); +static int sub_020631F4(const ObjectEvent *objectEvent); static const UnkStruct_020EDF0C *sub_0206320C(u32 param0); static UnkFuncPtr_020EDF0C sub_02063224(const UnkStruct_020EDF0C *param0); @@ -170,25 +170,23 @@ MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int pa void MapObjectMan_Delete(MapObjectManager *mapObjMan) { - Heap_FreeToHeapExplicit(11, sub_02062878(mapObjMan)); + Heap_FreeToHeapExplicit(11, MapObjectMan_GetMapObject(mapObjMan)); Heap_FreeToHeapExplicit(11, mapObjMan); } -void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *param4) +void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, 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, param3, 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 +197,7 @@ void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param } mapObj++; - v1--; + maxObjects--; } ov5_021EDA38(mapObjMan, sub_0206285C(mapObjMan)); @@ -209,9 +207,7 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) { int size; MapObject *mapObj; - MapObjectManager *mapObjMan; - - mapObjMan = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); + MapObjectManager *mapObjMan = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); GF_ASSERT(mapObjMan != NULL); memset(mapObjMan, 0, (sizeof(MapObjectManager))); @@ -222,15 +218,15 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) 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 param2) { MapObject *mapObj; - ObjectEvent v1 = *param1; + ObjectEvent v1 = *objectEvent; ObjectEvent *v2 = &v1; int v3 = ObjectEvent_GetLocalID(v2); @@ -296,10 +292,10 @@ MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, i 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 param2, int param3, const ObjectEvent *objectEvent) { MapObject *mapObj = NULL; - const ObjectEvent *v1 = sub_020631A4(param1, param2, param4); + const ObjectEvent *v1 = sub_020631A4(param1, param2, objectEvent); if (v1 != NULL) { int flag = ObjectEvent_GetFlag(v1); @@ -332,11 +328,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); } @@ -357,7 +351,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 +369,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 +379,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); - - int v0, maxObjects; - MapObject *mapObj; + GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE); - 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 +423,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--; @@ -602,7 +588,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; @@ -614,7 +600,7 @@ void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, con v1 = Heap_AllocFromHeapAtEnd(11, v0); GF_ASSERT(v1 != NULL); - memcpy(v1, param3, v0); + memcpy(v1, objectEvent, v0); v2 = Heap_AllocFromHeapAtEnd(11, (sizeof(UnkStruct_020620C4))); GF_ASSERT(v2 != NULL); @@ -622,8 +608,8 @@ void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, con 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 +618,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 (sub_020631D8(objectEvent) == 1 || FieldSystem_CheckFlag(fieldSystem, objectEvent->flag) == 0) { + 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 +649,8 @@ static MapObject *sub_02062120(const MapObjectManager *mapObjMan) } mapObj++; - v0++; - } while (v0 < v1); + i++; + } while (i < maxObjects); return NULL; } @@ -675,13 +658,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) == 1) { + if (sub_02062E94(mapObj) == 1 + && MapObject_GetLocalID(mapObj) == param1 + && sub_02062C18(mapObj) == param2) { + return mapObj; } } @@ -690,12 +673,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 +706,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); @@ -752,7 +732,7 @@ 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); @@ -760,7 +740,7 @@ static void sub_0206234C(MapObject *mapObj, const MapObjectManager *param1) 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 +748,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)); @@ -800,17 +778,17 @@ static void sub_0206243C(MapObject *mapObj) 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 param2, const ObjectEvent *objectEvent) { int v0; int v1; while (param2) { - v0 = ObjectEvent_GetLocalID(param3); + v0 = ObjectEvent_GetLocalID(objectEvent); if (MapObject_GetLocalID(mapObj) == v0) { - if (sub_020631D8(param3) == 1) { - v1 = sub_020631F4(param3); + if (sub_020631D8(objectEvent) == 1) { + v1 = sub_020631F4(objectEvent); if (sub_02062E94(mapObj) == 1) { if (sub_02062C18(mapObj) == v1) { @@ -819,17 +797,13 @@ static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const O } else if (sub_02062918(mapObj) == v1) { return 2; } - } else { - if (sub_02062E94(mapObj) == 1) { - if (sub_02062C18(mapObj) == param1) { - return 2; - } - } + } else if (sub_02062E94(mapObj) == 1 && sub_02062C18(mapObj) == param1) { + return 2; } } param2--; - param3++; + objectEvent++; } return 0; @@ -838,11 +812,11 @@ static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const O static MapObject *sub_020624CC(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 ((MapObject_GetLocalID(v1) == param1) && (sub_02062918(v1) == param2)) { - return v1; + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == 1) { + if ((MapObject_GetLocalID(mapObj) == param1) && (sub_02062918(mapObj) == param2)) { + return mapObj; } } @@ -851,76 +825,66 @@ static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, in MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1) { - 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) == 0 + && MapObject_GetLocalID(mapObj) == param1) { + return mapObj; } - v1++; - v0--; - } while (v0 > 0); + mapObj++; + maxObjects--; + } while (maxObjects > 0); return NULL; } MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1) { - 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) == param1) { + 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 param3) { - 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; + *mapObj = v1; return 1; } v1++; - } while ((*param2) < v0); + } while ((*param2) < maxObjects); return 0; } @@ -943,7 +907,7 @@ static void sub_02062628(MapObject *mapObj) static int sub_0206262C(FieldSystem *fieldSystem, int param1) { - if ((param1 >= 0x65) && (param1 <= 0x74)) { + if (param1 >= 0x65 && param1 <= 0x74) { param1 -= 0x65; param1 = sub_0203F164(fieldSystem, param1); } @@ -966,9 +930,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,7 +940,7 @@ 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); @@ -994,31 +958,29 @@ int sub_020626B4(const MapObject *mapObj) return 0; } -static void sub_020626D0(MapObject *mapObj, const ObjectEvent *param1, int param2) +static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int param2) { GF_ASSERT(sub_02062E94(mapObj) == 1); sub_02062E78(mapObj, 0); sub_02062914(mapObj, param2); - MapObject_SetScript(mapObj, ObjectEvent_GetScript(param1)); - MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(param1)); + 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 param1, const ObjectEvent *objectEvent) { - GF_ASSERT(sub_020631D8(param2) == 1); + GF_ASSERT(sub_020631D8(objectEvent) == 1); sub_02062E78(mapObj, 1); - MapObject_SetScript(mapObj, ObjectEvent_GetScript(param2)); - MapObject_SetFlag(mapObj, sub_020631F4(param2)); + MapObject_SetScript(mapObj, ObjectEvent_GetScript(objectEvent)); + MapObject_SetFlag(mapObj, sub_020631F4(objectEvent)); sub_02062914(mapObj, param1); } int sub_02062758(const MapObject *mapObj, int param1) { - int v0; - - v0 = sub_02062C0C(mapObj); + int v0 = sub_02062C0C(mapObj); v0 += param1; return v0; @@ -1053,12 +1015,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); @@ -1141,24 +1101,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 +1136,15 @@ FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan) return mapObjMan->fieldSystem; } -void sub_0206289C(MapObjectManager *mapObjMan, NARC *param1) +void MapObjectMan_GetNARC(MapObjectManager *mapObjMan, NARC *narc) { - mapObjMan->unk_14 = param1; + mapObjMan->narc = narc; } NARC *sub_020628A0(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) @@ -1438,14 +1398,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) @@ -1645,32 +1605,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) @@ -1696,48 +1654,48 @@ void sub_02062C3C(MapObjectManager *mapObjMan) 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)) { + sub_02062DD0(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)) { + sub_02062DDC(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; + return TRUE; } - return 0; + return FALSE; } u32 sub_02062CBC(const MapObject *mapObj, u32 param1) { - const MapObjectManager *v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - return sub_0206284C(v0, param1); + return sub_0206284C(mapObjMan, param1); } void sub_02062CCC(MapObjectManager *mapObjMan, int param1) @@ -1823,11 +1781,11 @@ 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) @@ -1851,20 +1809,18 @@ void sub_02062DDC(MapObject *mapObj) 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) { + if (MapObjectMan_IsDrawInitialized(mapObjMan) == FALSE) { return 0; } @@ -1887,10 +1843,10 @@ 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) @@ -1914,10 +1870,10 @@ 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) @@ -1932,10 +1888,10 @@ 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) @@ -1950,10 +1906,10 @@ 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) @@ -1968,10 +1924,10 @@ 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) @@ -1986,19 +1942,19 @@ 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) @@ -2013,10 +1969,10 @@ 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) @@ -2357,19 +2313,17 @@ 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 param1, 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 (sub_020631D8(&objectEvent[i]) == 0 && ObjectEvent_GetLocalID(&objectEvent[i]) == param0) { + return &objectEvent[i]; } - v0++; - } while (v0 < param1); + i++; + } while (i < param1); return NULL; } @@ -2453,46 +2407,43 @@ 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 param1, int param2, 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 (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { if (param3) { - if (MapObject_GetXPrev(v1) == param1 && MapObject_GetZPrev(v1) == param2) { - return v1; + if (MapObject_GetXPrev(mapObj) == param1 && MapObject_GetZPrev(mapObj) == param2) { + return mapObj; } } - if (MapObject_GetX(v1) == param1 && MapObject_GetZ(v1) == param2) { - return v1; + if (MapObject_GetX(mapObj) == param1 && MapObject_GetZ(mapObj) == param2) { + return mapObj; } } - v1++; - v0--; - } while (v0); + mapObj++; + maxObjects--; + } while (maxObjects); return NULL; } void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) { - int v0, v1, v2; + int x, y, z; - v0 = (((param1->x) >> 4) / FX32_ONE); - MapObject_SetX(mapObj, v0); + x = ((param1->x) >> 4) / FX32_ONE; + MapObject_SetX(mapObj, x); - v1 = (((param1->y) >> 3) / FX32_ONE); - MapObject_SetY(mapObj, v1); + y = ((param1->y) >> 3) / FX32_ONE; + MapObject_SetY(mapObj, y); - v2 = (((param1->z) >> 4) / FX32_ONE); - MapObject_SetZ(mapObj, v2); + z = ((param1->z) >> 4) / FX32_ONE; + MapObject_SetZ(mapObj, z); MapObject_SetPos(mapObj, param1); MapObject_UpdateCoords(mapObj); @@ -2506,18 +2457,18 @@ void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4) { - VecFx32 v0; + VecFx32 pos; - v0.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + pos.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetX(mapObj, param1); - v0.y = (((param2) << 3) * FX32_ONE) + 0; + pos.y = (((param2) << 3) * FX32_ONE) + 0; MapObject_SetY(mapObj, param2); - v0.z = (((param3) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + pos.z = (((param3) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetZ(mapObj, param3); - MapObject_SetPos(mapObj, &v0); + MapObject_SetPos(mapObj, &pos); MapObject_UpdateCoords(mapObj); MapObject_Face(mapObj, param4); diff --git a/src/map_object_move.c b/src/map_object_move.c index df842928e0..77c21a3ec2 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -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); @@ -81,7 +81,7 @@ void MapObject_Move(MapObject *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)) == 0) { return FALSE; } - if ((v0 & (1 << 11)) && (sub_02062FDC(mapObj) == 0)) { + if (status & (1 << 11) && sub_02062FDC(mapObj) == 0) { return FALSE; } @@ -123,10 +123,8 @@ 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) == 1) { + sub_02062D28(mapObj); } } @@ -163,135 +161,135 @@ static void MapObject_EndMove(MapObject *mapObj) 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); + 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); + 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); + 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); + 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); + 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 (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,20 +338,22 @@ 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 (TileBehavior_IsShallowWater(currTileBehavior) == TRUE) { if (sub_02062EC8(mapObj) == 0) { ov5_021F331C(mapObj, 1); sub_02062EAC(mapObj, 1); @@ -363,17 +363,17 @@ 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); @@ -385,7 +385,11 @@ 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)) { @@ -395,7 +399,7 @@ static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc } } -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); @@ -407,105 +411,111 @@ 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(); + 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,40 +526,36 @@ 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) == 0) { 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) == 1 && 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 v0; - - v0 = 0; + u32 v0 = 0; if (sub_02063FAC(mapObj, param2, param3, param4) == 1) { v0 |= (1 << 0); @@ -587,33 +593,29 @@ u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, in u32 sub_02063EBC(const MapObject *mapObj, int param1) { - 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(param1); + int y = MapObject_GetY(mapObj); + int z = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); return sub_02063E94(mapObj, x, y, z, param1); } int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) { - int v0, v1, v2; - const MapObjectManager *mapObjMan; - const MapObject *v4; + int maxObjects, x, z; + 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); + x = MapObject_GetX(v4); + z = MapObject_GetZ(v4); - if ((v1 == param1) && (v2 == param3)) { + if ((x == param1) && (z == param3)) { int v5 = MapObject_GetY(v4); int v6 = v5 - param2; @@ -626,10 +628,10 @@ int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) } } - v1 = MapObject_GetXPrev(v4); - v2 = MapObject_GetZPrev(v4); + x = MapObject_GetXPrev(v4); + z = MapObject_GetZPrev(v4); - if ((v1 == param1) && (v2 == param3)) { + if (x == param1 && z == param3) { int v7 = MapObject_GetY(v4); int v8 = v7 - param2; @@ -644,8 +646,8 @@ int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) } sub_02062880(&v4); - v0--; - } while (v0); + maxObjects--; + } while (maxObjects); return 0; } @@ -661,7 +663,7 @@ int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3) v2 = v0 - v1; v3 = v0 + v1; - if ((v2 > param1) || (v3 < param1)) { + if (v2 > param1 || v3 < param1) { return 1; } } @@ -673,7 +675,7 @@ int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3) v2 = v0 - v1; v3 = v0 + v1; - if ((v2 > param3) || (v3 < param3)) { + if (v2 > param3 || v3 < param3) { return 1; } } @@ -685,14 +687,14 @@ int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3) { if (sub_02062FDC(mapObj) == 0) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - u8 v1 = sub_02062BE8(mapObj); + u8 v1 = MapObject_GetCurrTileBehavior(mapObj); u8 v2 = FieldSystem_GetTileBehavior(fieldSystem, param1, param2); if (v2 == GetNullTileBehaviorID()) { return 1; } - if ((Unk_020EE76C[param3](v1) == 1) || (Unk_020EE77C[param3](v2) == 1)) { + if (Unk_020EE76C[param3](v1) == 1 || Unk_020EE77C[param3](v2) == 1) { return 1; } } @@ -714,89 +716,83 @@ static BOOL (*const Unk_020EE77C[4])(u8) = { TileBehavior_BlocksMovementWestward }; -int sub_0206406C(MapObject *mapObj, u32 param1) +int MapObject_IsOnWater(MapObject *mapObj, u32 param1) { if (TileBehavior_IsBridgeOverWater(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } } else if (TileBehavior_IsSurfable(param1)) { - return 1; + return TRUE; } - return 0; + return FALSE; } -int sub_020640A0(MapObject *mapObj, u32 param1) +int MapObject_IsOnSand(MapObject *mapObj, u32 param1) { if (TileBehavior_IsBridgeOverSand(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } } else if (TileBehavior_IsSand(param1)) { - return 1; + return TRUE; } - return 0; + return FALSE; } int MapObject_IsOnSnow(MapObject *mapObj, u32 param1) { if (TileBehavior_IsBridgeOverSnow(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } } else if (TileBehavior_IsSnow(param1)) { - return 1; + return TRUE; } - return 0; + return FALSE; } -int sub_02064108(MapObject *mapObj, u32 param1) +int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 param1) { if (TileBehavior_IsBridgeOverSnow(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } } else if (TileBehavior_IsShallowSnow(param1)) { - return 1; + return TRUE; } - return 0; + return FALSE; } int sub_0206413C(MapObject *mapObj, u32 param1) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBridge(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(param1) == TRUE) { + return TRUE; } - return 0; + return FALSE; } int sub_0206415C(MapObject *mapObj, u32 param1) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBikeBridgeNorthSouth(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(param1) == TRUE) { + return TRUE; } - return 0; + return FALSE; } int sub_0206417C(MapObject *mapObj, u32 param1) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBikeBridgeEastWest(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(param1) == TRUE) { + return TRUE; } - return 0; + return FALSE; } static const int sMapObjectDxDir[] = { @@ -848,7 +844,7 @@ void MapObject_UpdateCoords(MapObject *mapObj) MapObject_SetZPrev(mapObj, MapObject_GetZ(mapObj)); } -u32 sub_02064238(MapObject *mapObj, int param1) +u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int param1) { int v0 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); int v1 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); @@ -924,26 +920,26 @@ 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); + 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; } @@ -980,12 +976,12 @@ void sub_02064464(MapObject *mapObj) { int v0 = MapObject_GetMovementType(mapObj); - if ((v0 == 0x33) || (v0 == 0x34) || (v0 == 0x35) || (v0 == 0x36)) { + if (v0 == 0x33 || v0 == 0x34 || v0 == 0x35 || v0 == 0x36) { sub_02062B14(mapObj); } } -static const int Unk_020EE79C[] = { +static const int sOppositeDirections[] = { DIR_SOUTH, DIR_NORTH, DIR_EAST, @@ -994,7 +990,7 @@ static const int Unk_020EE79C[] = { int Direction_GetOpposite(int dir) { - return Unk_020EE79C[dir]; + return sOppositeDirections[dir]; } int sub_02064488(int param0, int param1, int param2, int param3) @@ -1040,7 +1036,7 @@ int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2) return 0; } - if ((v1 == 2) && (param2 == 0)) { + if (v1 == 2 && param2 == 0) { return 0; } diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index 5e354c6b73..5adc0372d4 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -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); @@ -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; 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_021ECC20.c b/src/overlay005/ov5_021ECC20.c index af65cb9407..595aeae4d4 100644 --- a/src/overlay005/ov5_021ECC20.c +++ b/src/overlay005/ov5_021ECC20.c @@ -52,7 +52,7 @@ void ov5_021ECC78(MapObjectManager *param0) static void ov5_021ECCA4(MapObjectManager *param0) { NARC *v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, 4); - sub_0206289C(param0, v0); + MapObjectMan_GetNARC(param0, v0); } static void ov5_021ECCBC(MapObjectManager *param0) diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index 202bd482df..4c641cfd31 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) { @@ -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_021F61BC.c b/src/overlay005/ov5_021F61BC.c index dc6f55e21b..58a91a9d88 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; diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index eb3e9d2159..dfe2123d9c 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; @@ -1916,7 +1916,7 @@ static int sub_02060F4C(PlayerAvatar *playerAvatar, MapObject *mapObj, int param int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); - if (sub_0206406C(mapObj, v3)) { + if (MapObject_IsOnWater(mapObj, v3)) { return 1; } } @@ -1966,7 +1966,7 @@ static int sub_02061058(PlayerAvatar *playerAvatar, MapObject *mapObj, int param int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); - if (sub_0206406C(mapObj, v3)) { + if (MapObject_IsOnWater(mapObj, v3)) { return 1; } @@ -2337,7 +2337,7 @@ 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) @@ -2364,7 +2364,7 @@ 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 ((param2 == 0) || (param2 == 1)) { diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 2abb7bafed..39040389df 100644 --- a/src/unk_02069BE0.c +++ b/src/unk_02069BE0.c @@ -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); From 3ede7c2facbae5ee30dd538f948ad975c3147485 Mon Sep 17 00:00:00 2001 From: DylanDoesProgramming664 Date: Wed, 25 Dec 2024 20:17:39 -0500 Subject: [PATCH 04/28] first mod doc --- docs/index.md | 4 ++++ docs/mods/fast_guage.md | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 docs/mods/fast_guage.md diff --git a/docs/index.md b/docs/index.md index f098ee72ed..c981ba9316 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,3 +11,7 @@ For more detailed information about the project as a whole, please refer to its - [2D Graphics](2d_rendering.md) - [3D Graphics](3d_rendering.md) + +## Mods + +- [Fast Guage](mods/fast_guage.md) \ No newline at end of file diff --git a/docs/mods/fast_guage.md b/docs/mods/fast_guage.md new file mode 100644 index 0000000000..1e66f2c65a --- /dev/null +++ b/docs/mods/fast_guage.md @@ -0,0 +1,18 @@ +# Fast Guage + +This is a quick tutorial on how to modify the guage of exp and health bars of Plat so that the bar visually updates in subpixels per second instead of points per second. + +This mod is a backport of the healthbar fix made by the contributors of [pret/pokeheartgold](https://github.com/pret/pokeheartgold) for the heartgold/soulsilver decomp. + +Fixes are written in the `diff` format, as mentioned in [Bugs and Glitches](../bugs_and_glitches.md). + +## Edit + +1. Go to [/src/battle/healthbar.c](/src/battle/healthbar.c) +2. Go to the ``UpdateGuage`` function. +3. Edit the function like so: +```diff +if (max < corrected) { +- ratio = max * 0x100 / corrected; ++ ratio = (max >> 8) / corrected; +``` \ No newline at end of file From 0fa801b6702742ba30d9745ae23ce993a1ea1caa Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Sun, 29 Dec 2024 16:37:02 +0100 Subject: [PATCH 05/28] More documentation centered around `map_object.c` and `map_object_move.c` --- include/constants/map_object.h | 6 +- include/map_object.h | 32 +- include/map_object_move.h | 6 +- include/struct_defs/struct_02061D3C.h | 36 +-- src/comm_player_manager.c | 8 +- src/map_object.c | 424 +++++++++++++------------- src/map_object_move.c | 262 ++++++++-------- src/overlay005/fieldmap.c | 2 +- src/overlay005/ov5_021DFB54.c | 12 +- src/overlay005/ov5_021E135C.c | 2 +- src/overlay005/ov5_021ECC20.c | 8 +- src/overlay005/ov5_021F08CC.c | 2 +- src/overlay005/ov5_021F134C.c | 2 +- src/overlay005/ov5_021F17B8.c | 2 +- src/overlay005/ov5_021F47B0.c | 2 +- src/overlay005/ov5_021F61BC.c | 2 +- src/overlay005/vs_seeker.c | 4 +- src/overlay006/ov6_02243258.c | 2 +- src/overlay008/ov8_02249960.c | 12 +- src/overlay009/ov9_02249960.c | 6 +- src/overlay023/ov23_0224340C.c | 4 +- src/overlay023/ov23_0224A1D0.c | 2 +- src/overlay023/ov23_0224B05C.c | 4 +- src/scrcmd.c | 30 +- src/unk_02054D00.c | 12 +- src/unk_02055C50.c | 4 +- src/unk_0205CA94.c | 2 +- src/unk_0205F180.c | 20 +- src/unk_0206450C.c | 4 +- src/unk_020655F4.c | 26 +- src/unk_02067A84.c | 6 +- src/unk_020683F4.c | 4 +- src/unk_02069BE0.c | 14 +- 33 files changed, 481 insertions(+), 483 deletions(-) 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 31c3853a93..213f32a559 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -29,7 +29,7 @@ void MapObjectMan_Delete(MapObjectManager *mapObjMan); void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2); MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int param1, int param2, int param3, int param4, int param5, int param6); -MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int param3, const ObjectEvent *objectEvent); void sub_02061AB4(MapObject *mapObj, int param1); void sub_02061AD4(MapObject *mapObj, int param1); void MapObject_Delete(MapObject *mapObj); @@ -41,18 +41,18 @@ 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 param2); void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *objectEvent); -MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1); -MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1); +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 param3); -int sub_020626B4(const MapObject *mapObj); +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 param1); +void MapObjectMan_SetMaxObjects(MapObjectManager *mapObjMan, int maxObjs); int MapObjectMan_GetMaxObjects(const MapObjectManager *mapObjMan); -void sub_02062838(MapObjectManager *mapObjMan, u32 param1); -void sub_02062840(MapObjectManager *mapObjMan, u32 param1); -u32 sub_0206284C(const MapObjectManager *mapObjMan, u32 param1); +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); @@ -154,24 +154,24 @@ void sub_02062C3C(MapObjectManager *mapObjMan); void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan); void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan); int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan); -u32 sub_02062CBC(const MapObject *mapObj, u32 param1); -void sub_02062CCC(MapObjectManager *mapObjMan, int param1); +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 param1); +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 sub_02062D28(MapObject *mapObj); -void sub_02062D34(MapObject *mapObj); +void MapObject_SetStartMovement(MapObject *mapObj); +void MapObject_SetEndMovementOff(MapObject *mapObj); void sub_02062D40(MapObject *mapObj); int sub_02062D4C(const MapObject *mapObj); -int sub_02062D58(const MapObject *mapObj); -void MapObject_SetHidden(MapObject *mapObj, int param1); +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 sub_02062DD0(MapObject *mapObj); -void sub_02062DDC(MapObject *mapObj); +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); diff --git a/include/map_object_move.h b/include/map_object_move.h index feba7525b5..21cde8b622 100644 --- a/include/map_object_move.h +++ b/include/map_object_move.h @@ -13,7 +13,7 @@ u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4); u32 sub_02063EBC(const MapObject *mapObj, int param1); int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3); -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 sub_02064004(const MapObject *mapObj, int param1, int param2, int param3); int MapObject_IsOnWater(MapObject *mapObj, u32 param1); int MapObject_IsOnSand(MapObject *mapObj, u32 param1); @@ -23,7 +23,7 @@ int sub_0206413C(MapObject *mapObj, u32 param1); int sub_0206415C(MapObject *mapObj, u32 param1); int sub_0206417C(MapObject *mapObj, u32 param1); int MapObject_GetDxFromDir(int param0); -int MapObject_GetDyFromDir(int param0); +int MapObject_GetDzFromDir(int param0); void MapObject_StepDir(MapObject *mapObj, int dir); void MapObject_UpdateCoords(MapObject *mapObj); u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int param1); @@ -35,7 +35,7 @@ void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2); void sub_02064450(int param0, int param1, VecFx32 *param2); void sub_02064464(MapObject *mapObj); int Direction_GetOpposite(int param0); -int sub_02064488(int param0, int param1, int param2, int param3); +int sub_02064488(int x, int z, int xPrev, int zPrev); int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1); int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2); diff --git a/include/struct_defs/struct_02061D3C.h b/include/struct_defs/struct_02061D3C.h index 1fdfa949ad..a3e74ca9c0 100644 --- a/include/struct_defs/struct_02061D3C.h +++ b/include/struct_defs/struct_02061D3C.h @@ -2,30 +2,30 @@ #define POKEPLATINUM_STRUCT_02061D3C_H typedef struct UnkStruct_02061D3C_t { - u32 unk_00; + u32 status; 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 localID; + u8 movementType; + s8 movementRangeX; + s8 movementRangeZ; + s8 initialDir; + s8 facingDir; + s8 movingDir; u8 padding_0F; u16 unk_10; - u16 unk_12; - u16 unk_14; - u16 unk_16; - u16 unk_18; + u16 graphicsID; + u16 trainerType; + u16 flag; + u16 script; 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; + s16 xInitial; + s16 yInitial; + s16 zInitial; + s16 x; + s16 y; + s16 z; fx32 unk_2C; u8 unk_30[16]; u8 unk_40[16]; diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index 7fa3884742..d8dc53893d 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; diff --git a/src/map_object.c b/src/map_object.c index c1746f6703..65c9631c47 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -36,7 +36,7 @@ #include "unk_020EDBAC.h" typedef struct MapObjectMan { - u32 unk_00; + u32 status; int maxObjects; int objectCnt; int unk_0C; @@ -124,17 +124,17 @@ 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 param2, const ObjectEvent *objectEvent); -static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, int param2); +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 int FieldSystem_GetGraphicsID(FieldSystem *fieldSystem, int param1); 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 param2); -static void sub_02062714(MapObject *mapObj, int param1, const ObjectEvent *objectEvent); +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); @@ -143,8 +143,8 @@ 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 sub_020631D8(const ObjectEvent *objectEvent); -static int sub_020631F4(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,18 +170,18 @@ MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int pa void MapObjectMan_Delete(MapObjectManager *mapObjMan) { - Heap_FreeToHeapExplicit(11, MapObjectMan_GetMapObject(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 *objectEvent) +void sub_0206184C(MapObjectManager *mapObjMan, int mapID, int param2, int objEventCount, const ObjectEvent *objectEvent) { int v0, maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); while (maxObjects) { if (sub_02062CF8(mapObj) == TRUE) { - v0 = sub_0206244C(mapObj, param2, param3, objectEvent); + v0 = sub_0206244C(mapObj, param2, objEventCount, objectEvent); switch (v0) { case 0: @@ -207,7 +207,7 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) { int size; MapObject *mapObj; - MapObjectManager *mapObjMan = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); + MapObjectManager *mapObjMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, (sizeof(MapObjectManager))); GF_ASSERT(mapObjMan != NULL); memset(mapObjMan, 0, (sizeof(MapObjectManager))); @@ -223,27 +223,27 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) return mapObjMan; } -MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2) +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int mapID) { MapObject *mapObj; 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; } } @@ -256,7 +256,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); @@ -266,7 +266,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; @@ -287,22 +287,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 *objectEvent) +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, objectEvent); + 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); } } @@ -319,7 +319,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); } @@ -342,8 +342,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); } @@ -450,7 +450,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); @@ -465,34 +465,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); @@ -514,29 +514,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 }; @@ -563,7 +563,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); } @@ -624,7 +624,7 @@ static void sub_020620C4(UnkStruct_020620C4 *param0) objectEvent = param0->objectEvent; do { - if (sub_020631D8(objectEvent) == 1 || FieldSystem_CheckFlag(fieldSystem, objectEvent->flag) == 0) { + if (ObjectEvent_HasNoScript(objectEvent) == TRUE || FieldSystem_CheckFlag(fieldSystem, objectEvent->flag) == FALSE) { mapObj = MapObjectMan_AddMapObjectFromHeader(param0->mapObjMan, objectEvent, param0->unk_00); GF_ASSERT(mapObj != NULL); } @@ -660,8 +660,8 @@ static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, in int v0 = 0; MapObject *mapObj; - while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == 1) { - if (sub_02062E94(mapObj) == 1 + 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,7 +690,7 @@ static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObjec static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, FieldSystem *fieldSystem) { MapObject_SetLocalID(mapObj, ObjectEvent_GetLocalID(objectEvent)); - MapObject_SetGraphicsID(mapObj, sub_0206262C(fieldSystem, ObjectEvent_GetGraphicsID(objectEvent))); + MapObject_SetGraphicsID(mapObj, FieldSystem_GetGraphicsID(fieldSystem, ObjectEvent_GetGraphicsID(objectEvent))); MapObject_SetMovementType(mapObj, ObjectEvent_GetMovementType(objectEvent)); MapObject_SetTrainerType(mapObj, ObjectEvent_GetTrainerType(objectEvent)); MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(objectEvent)); @@ -736,7 +736,7 @@ 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); } @@ -778,44 +778,44 @@ static void sub_0206243C(MapObject *mapObj) memset(mapObj, 0, (sizeof(MapObject))); } -static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const ObjectEvent *objectEvent) +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(objectEvent); + while (objEventCount) { + localID = ObjectEvent_GetLocalID(objectEvent); - if (MapObject_GetLocalID(mapObj) == v0) { - if (sub_020631D8(objectEvent) == 1) { - v1 = sub_020631F4(objectEvent); + 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 && sub_02062C18(mapObj) == param1) { + } else if (sub_02062E94(mapObj) == TRUE && sub_02062C18(mapObj) == param1) { return 2; } } - param2--; + 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 *mapObj; - while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == 1) { - if ((MapObject_GetLocalID(mapObj) == param1) && (sub_02062918(mapObj) == param2)) { + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == TRUE) { + if (MapObject_GetLocalID(mapObj) == localID && sub_02062918(mapObj) == flag) { return mapObj; } } @@ -823,7 +823,7 @@ static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, in return NULL; } -MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1) +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int index) { int maxObjects; MapObject *mapObj; @@ -834,8 +834,8 @@ MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int p mapObj = MapObjectMan_GetMapObjectStatic(mapObjMan); do { - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && sub_02062E94(mapObj) == 0 - && MapObject_GetLocalID(mapObj) == param1) { + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && sub_02062E94(mapObj) == FALSE + && MapObject_GetLocalID(mapObj) == index) { return mapObj; } @@ -846,13 +846,13 @@ MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int p return NULL; } -MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1) +MapObject *sub_02062570(const MapObjectManager *mapObjMan, int movementType) { int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *mapObj = MapObjectMan_GetMapObjectStatic(mapObjMan); do { - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && MapObject_GetMovementType(mapObj) == param1) { + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && MapObject_GetMovementType(mapObj) == movementType) { return mapObj; } @@ -863,7 +863,7 @@ MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1) return NULL; } -int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 param3) +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 status) { int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *v1; @@ -878,15 +878,15 @@ int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *par do { (*param2)++; - if (MapObject_CheckStatus(v1, param3) == param3) { + if (MapObject_CheckStatus(v1, status) == status) { *mapObj = v1; - return 1; + return TRUE; } v1++; } while ((*param2) < maxObjects); - return 0; + return FALSE; } static void sub_02062604(MapObject *mapObj) @@ -897,7 +897,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) @@ -905,14 +905,14 @@ static void sub_02062628(MapObject *mapObj) (void)0; } -static int sub_0206262C(FieldSystem *fieldSystem, int param1) +static int FieldSystem_GetGraphicsID(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) @@ -947,35 +947,35 @@ static void sub_02062670(MapObject *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 *objectEvent, 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); + 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 *objectEvent) +static void sub_02062714(MapObject *mapObj, int mapID, const ObjectEvent *objectEvent) { - GF_ASSERT(sub_020631D8(objectEvent) == 1); + GF_ASSERT(ObjectEvent_HasNoScript(objectEvent) == TRUE); sub_02062E78(mapObj, 1); MapObject_SetScript(mapObj, ObjectEvent_GetScript(objectEvent)); - MapObject_SetFlag(mapObj, sub_020631F4(objectEvent)); - sub_02062914(mapObj, param1); + MapObject_SetFlag(mapObj, ObjectEvent_GetFlagNoScript(objectEvent)); + sub_02062914(mapObj, mapID); } int sub_02062758(const MapObject *mapObj, int param1) @@ -989,24 +989,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) @@ -1071,19 +1071,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) @@ -1236,13 +1236,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) @@ -1365,7 +1365,7 @@ int MapObject_GetDataAt(const MapObject *mapObj, int index) } GF_ASSERT(FALSE); - return 0; + return FALSE; } void MapObject_SetMovementRangeX(MapObject *mapObj, int movementRangeX) @@ -1428,14 +1428,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; } @@ -1445,14 +1445,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; } @@ -1477,14 +1477,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; } @@ -1638,18 +1638,18 @@ 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) @@ -1659,7 +1659,7 @@ void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan) do { if (sub_02062CF8(mapObj)) { - sub_02062DD0(mapObj); + MapObject_SetPauseMovementOn(mapObj); } mapObj++; @@ -1674,7 +1674,7 @@ void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan) do { if (sub_02062CF8(mapObj)) { - sub_02062DDC(mapObj); + MapObject_SetPauseMovementOff(mapObj); } mapObj++; @@ -1684,36 +1684,36 @@ void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan) int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan) { - if (sub_0206284C(mapObjMan, MAP_OBJ_STATUS_0)) { + if (MapObjectMan_CheckStatus(mapObjMan, MAP_OBJ_STATUS_0)) { return TRUE; } return FALSE; } -u32 sub_02062CBC(const MapObject *mapObj, u32 param1) +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 param1) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - return sub_0206284C(mapObjMan, param1); + return MapObjectMan_CheckStatus(mapObjMan, param1); } -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); + 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) @@ -1736,12 +1736,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); } @@ -1756,14 +1756,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); @@ -1772,7 +1772,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); @@ -1790,19 +1790,19 @@ int sub_02062D9C(MapObject *mapObj) 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); } @@ -1821,19 +1821,19 @@ int sub_02062DFC(const MapObject *mapObj) const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); if (MapObjectMan_IsDrawInitialized(mapObjMan) == FALSE) { - return 0; + 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); @@ -1851,7 +1851,7 @@ int sub_02062E44(const MapObject *mapObj) 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); @@ -1860,7 +1860,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); @@ -1878,7 +1878,7 @@ int sub_02062E94(const MapObject *mapObj) 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); @@ -1896,7 +1896,7 @@ int sub_02062EC8(const MapObject *mapObj) 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); @@ -1914,7 +1914,7 @@ int sub_02062EFC(const MapObject *mapObj) 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); @@ -1932,7 +1932,7 @@ int sub_02062F30(const MapObject *mapObj) 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); @@ -1959,7 +1959,7 @@ int sub_02062F7C(const MapObject *mapObj) 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); @@ -1977,7 +1977,7 @@ int sub_02062FAC(const MapObject *mapObj) void sub_02062FC4(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { sub_020628F0(mapObj, (1 << 2)); } else { sub_020628F8(mapObj, (1 << 2)); @@ -1987,10 +1987,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) @@ -2156,7 +2156,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; } @@ -2260,7 +2260,7 @@ int ObjectEvent_GetDataAt(const ObjectEvent *objectEvent, int index) } GF_ASSERT(FALSE); - return 0; + return FALSE; } void ObjectEvent_SetMovementRangeX(ObjectEvent *objectEvent, int movementRangeX) @@ -2313,35 +2313,35 @@ int ObjectEvent_GetZ(const ObjectEvent *objectEvent) return objectEvent->z; } -static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *objectEvent) +static const ObjectEvent *sub_020631A4(int param0, int objEventCount, const ObjectEvent *objectEvent) { int i = 0; do { - if (sub_020631D8(&objectEvent[i]) == 0 && ObjectEvent_GetLocalID(&objectEvent[i]) == param0) { + if (ObjectEvent_HasNoScript(&objectEvent[i]) == FALSE && ObjectEvent_GetLocalID(&objectEvent[i]) == param0) { return &objectEvent[i]; } i++; - } while (i < param1); + } 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); } @@ -2407,20 +2407,18 @@ static const UnkStruct_ov5_021FB0F0 *sub_02063244(u32 param0) return NULL; } -MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int param1, int param2, int param3) +MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3) { int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { - if (param3) { - if (MapObject_GetXPrev(mapObj) == param1 && MapObject_GetZPrev(mapObj) == param2) { - return mapObj; - } + if (param3 && MapObject_GetXPrev(mapObj) == x && MapObject_GetZPrev(mapObj) == z) { + return mapObj; } - if (MapObject_GetX(mapObj) == param1 && MapObject_GetZ(mapObj) == param2) { + if (MapObject_GetX(mapObj) == x && MapObject_GetZ(mapObj) == z) { return mapObj; } } @@ -2432,20 +2430,20 @@ MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int param1, int param return NULL; } -void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) +void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2) { int x, y, z; - x = ((param1->x) >> 4) / FX32_ONE; + x = ((pos->x) >> 4) / FX32_ONE; MapObject_SetX(mapObj, x); - y = ((param1->y) >> 3) / FX32_ONE; + y = ((pos->y) >> 3) / FX32_ONE; MapObject_SetY(mapObj, y); - z = ((param1->z) >> 4) / FX32_ONE; + 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); @@ -2455,23 +2453,23 @@ void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) 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_SetPosDir(MapObject *mapObj, int x, int y, int z, int dir) { VecFx32 pos; - pos.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); - pos.y = (((param2) << 3) * FX32_ONE) + 0; - MapObject_SetY(mapObj, param2); + pos.y = ((y << 3) * FX32_ONE) + 0; + MapObject_SetY(mapObj, y); - pos.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, &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); @@ -2487,11 +2485,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 77c21a3ec2..4611f03a83 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); @@ -71,13 +71,13 @@ 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); @@ -103,11 +103,11 @@ static BOOL sub_02063478(const MapObject *mapObj) u32 status = MapObject_GetStatus(mapObj); - if (status & (1 << 12) && (status & (1 << 23)) == 0) { + if (status & (1 << 12) && (status & (1 << 23)) == FALSE) { return FALSE; } - if (status & (1 << 11) && sub_02062FDC(mapObj) == 0) { + if (status & (1 << 11) && sub_02062FDC(mapObj) == FALSE) { return FALSE; } @@ -123,47 +123,47 @@ static void sub_020634DC(MapObject *mapObj) static void sub_020634F4(MapObject *mapObj) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_11) && MapObject_SetTileBehaviors(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) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -183,7 +183,7 @@ static void sub_0206363C(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -207,7 +207,7 @@ static void sub_020636F0(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -224,7 +224,7 @@ static void sub_0206375C(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -242,7 +242,7 @@ static void sub_020637D4(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -260,7 +260,7 @@ static void sub_020637D4(MapObject *mapObj) static void sub_02063864(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (sub_02062EFC(mapObj) == 0) { + if (sub_02062EFC(mapObj) == FALSE) { if (TileBehavior_IsDeepMud(currTileBehavior) == TRUE || TileBehavior_IsDeepMudWithGrass(currTileBehavior) == TRUE) { VecFx32 v0 = { 0, (FX32_ONE * -14), 0 }; @@ -354,7 +354,7 @@ static void sub_02063994(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha static void sub_02063A30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { if (TileBehavior_IsShallowWater(currTileBehavior) == TRUE) { - if (sub_02062EC8(mapObj) == 0) { + if (sub_02062EC8(mapObj) == FALSE) { ov5_021F331C(mapObj, 1); sub_02062EAC(mapObj, 1); } @@ -377,7 +377,7 @@ static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (sub_02062CE4(mapObjMan) == 0) { + if (sub_02062CE4(mapObjMan) == FALSE) { return; } @@ -392,9 +392,9 @@ static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha || 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); } } } @@ -403,7 +403,7 @@ static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (sub_02062CE4(mapObjMan) == 0) { + if (sub_02062CE4(mapObjMan) == FALSE) { return; } @@ -495,7 +495,7 @@ static void sub_02063D30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha return; } - if (sub_02062F64(mapObj) == 0) { + if (sub_02062F64(mapObj) == FALSE) { u8 tileBehavior = GetNullTileBehaviorID(); if (TileBehavior_HasReflectiveSurface(currTileBehavior) == TRUE) { @@ -528,7 +528,7 @@ static void sub_02063D30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha 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; } @@ -543,7 +543,7 @@ static void sub_02063DDC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha { if (TileBehavior_IsBridgeStart(currTileBehavior) == TRUE) { sub_02062F14(mapObj, 1); - } else if (sub_02062F30(mapObj) == 1 && TileBehavior_IsBridge(currTileBehavior) == FALSE) { + } else if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(currTileBehavior) == FALSE) { sub_02062F14(mapObj, 0); } } @@ -553,18 +553,18 @@ static void sub_02063E14(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha 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 = 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) { @@ -572,37 +572,37 @@ 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 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); + int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(dir); int y = MapObject_GetY(mapObj); - int z = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); + 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 maxObjects, x, z; + int maxObjects, objX, objZ; const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); const MapObject *v4 = MapObjectMan_GetMapObjectConst(mapObjMan); @@ -612,35 +612,35 @@ int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) if (v4 != mapObj && MapObject_CheckStatus(v4, MAP_OBJ_STATUS_0) && !MapObject_CheckStatus(v4, MAP_OBJ_STATUS_18)) { - x = MapObject_GetX(v4); - z = MapObject_GetZ(v4); + objX = MapObject_GetX(v4); + objZ = MapObject_GetZ(v4); - if ((x == param1) && (z == 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; } } - x = MapObject_GetXPrev(v4); - z = MapObject_GetZPrev(v4); + objX = MapObject_GetXPrev(v4); + objZ = MapObject_GetZPrev(v4); - if (x == param1 && z == 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; } } } @@ -649,57 +649,57 @@ int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) 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 = MapObject_GetCurrTileBehavior(mapObj); - u8 v2 = FieldSystem_GetTileBehavior(fieldSystem, param1, param2); + 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) = { @@ -716,79 +716,79 @@ static BOOL (*const Unk_020EE77C[4])(u8) = { TileBehavior_BlocksMovementWestward }; -int MapObject_IsOnWater(MapObject *mapObj, u32 param1) +int MapObject_IsOnWater(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverWater(param1)) { + if (TileBehavior_IsBridgeOverWater(tileBehavior)) { if (sub_02062F30(mapObj) == FALSE) { return TRUE; } - } else if (TileBehavior_IsSurfable(param1)) { + } else if (TileBehavior_IsSurfable(tileBehavior)) { return TRUE; } return FALSE; } -int MapObject_IsOnSand(MapObject *mapObj, u32 param1) +int MapObject_IsOnSand(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSand(param1)) { + if (TileBehavior_IsBridgeOverSand(tileBehavior)) { if (sub_02062F30(mapObj) == FALSE) { return TRUE; } - } else if (TileBehavior_IsSand(param1)) { + } else if (TileBehavior_IsSand(tileBehavior)) { return TRUE; } return FALSE; } -int MapObject_IsOnSnow(MapObject *mapObj, u32 param1) +int MapObject_IsOnSnow(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSnow(param1)) { + if (TileBehavior_IsBridgeOverSnow(tileBehavior)) { if (sub_02062F30(mapObj) == FALSE) { return TRUE; } - } else if (TileBehavior_IsSnow(param1)) { + } else if (TileBehavior_IsSnow(tileBehavior)) { return TRUE; } return FALSE; } -int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 param1) +int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSnow(param1)) { + if (TileBehavior_IsBridgeOverSnow(tileBehavior)) { if (sub_02062F30(mapObj) == FALSE) { return TRUE; } - } else if (TileBehavior_IsShallowSnow(param1)) { + } else if (TileBehavior_IsShallowSnow(tileBehavior)) { return TRUE; } return FALSE; } -int sub_0206413C(MapObject *mapObj, u32 param1) +int sub_0206413C(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(param1) == TRUE) { + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(tileBehavior) == TRUE) { return TRUE; } return FALSE; } -int sub_0206415C(MapObject *mapObj, u32 param1) +int sub_0206415C(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(param1) == TRUE) { + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(tileBehavior) == TRUE) { return TRUE; } return FALSE; } -int sub_0206417C(MapObject *mapObj, u32 param1) +int sub_0206417C(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(param1) == TRUE) { + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(tileBehavior) == TRUE) { return TRUE; } @@ -816,14 +816,14 @@ static const int sMapObjectDyDir[] = { 0x0 }; -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 sMapObjectDyDir[dir]; } void MapObject_StepDir(MapObject *mapObj, int dir) @@ -834,7 +834,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) @@ -844,14 +844,14 @@ void MapObject_UpdateCoords(MapObject *mapObj) MapObject_SetZPrev(mapObj, MapObject_GetZ(mapObj)); } -u32 MapObject_GetTileBehaviorFromDir(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) @@ -907,7 +907,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)); @@ -925,7 +925,7 @@ int MapObject_SetTileBehaviors(MapObject *mapObj) u8 prevTileBehavior = GetNullTileBehaviorID(); u8 currTileBehavior = prevTileBehavior; - if (sub_02062FDC(mapObj) == 0) { + if (sub_02062FDC(mapObj) == FALSE) { int x = MapObject_GetXPrev(mapObj); int z = MapObject_GetZPrev(mapObj); FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); @@ -941,11 +941,11 @@ int MapObject_SetTileBehaviors(MapObject *mapObj) 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) @@ -966,17 +966,17 @@ 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); } } @@ -993,53 +993,53 @@ int Direction_GetOpposite(int dir) return sOppositeDirections[dir]; } -int sub_02064488(int param0, int param1, int param2, int param3) +int sub_02064488(int x, int z, int xPrev, int zPrev) { - if (param0 > param2) { + if (x > xPrev) { return DIR_WEST; } - if (param0 < param2) { + if (x < xPrev) { return DIR_EAST; } - if (param1 > param3) { + if (z > zPrev) { return DIR_NORTH; } 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; + return FALSE; } - param1->y = v0; - return 1; + pos->y = v0; + return TRUE; } diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index d9f99f78f7..e438ac5e54 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 5adc0372d4..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); @@ -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); @@ -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_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 595aeae4d4..1eb9f48f3e 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,7 +45,7 @@ void ov5_021ECC78(MapObjectManager *param0) ov5_021ECE94(sub_0206285C(param0)); - sub_02062840(param0, (1 << 0)); + MapObjectMan_SetStatusFlagOff(param0, (1 << 0)); ov5_021ECCBC(param0); } @@ -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; } diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index 74d1a53ed0..6893ad805c 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 58a91a9d88..6e69b368be 100644 --- a/src/overlay005/ov5_021F61BC.c +++ b/src/overlay005/ov5_021F61BC.c @@ -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 44a7057746..3891f47c35 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/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index af7cb1334a..3b36cfe4c9 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..fe0c96f456 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) @@ -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); } @@ -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/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/scrcmd.c b/src/scrcmd.c index 765ea9b49c..6dace8745a 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) 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_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 dfe2123d9c..82c534af3b 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -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,7 +1913,7 @@ 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 (MapObject_IsOnWater(mapObj, v3)) { @@ -1929,7 +1929,7 @@ 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) { @@ -1963,7 +1963,7 @@ 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 (MapObject_IsOnWater(mapObj, v3)) { @@ -2343,7 +2343,7 @@ u32 sub_0206156C(PlayerAvatar *playerAvatar, int 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) 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 29b68334d0..57a9f0ac08 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); diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 39040389df..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; @@ -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; From b6f615f95c581d58cdd7dfdf2947d9cd7058ca93 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Sun, 29 Dec 2024 23:57:28 +0100 Subject: [PATCH 06/28] Updating function definitions in header files and doing some final renaming --- include/map_object.h | 48 +++++++++++++++++++-------------------- include/map_object_move.h | 40 ++++++++++++++++---------------- src/map_object.c | 6 ++--- src/map_object_move.c | 10 ++++---- src/unk_0205F180.c | 12 +++++----- src/unk_020683F4.c | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/include/map_object.h b/include/map_object.h index 213f32a559..e63bc859c9 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -24,13 +24,13 @@ #include "narc.h" #include "sys_task_manager.h" -MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int param1, int param2); +MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int param2); void MapObjectMan_Delete(MapObjectManager *mapObjMan); -void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); -MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2); -MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int param1, int param2, int param3, int param4, int param5, int param6); -MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int param3, const ObjectEvent *objectEvent); -void sub_02061AB4(MapObject *mapObj, int param1); +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); @@ -39,11 +39,11 @@ 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 param2); +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 param3); +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); @@ -112,13 +112,13 @@ 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 param1); +void *sub_02062A54(MapObject *mapObj, int size); void *sub_02062A78(MapObject *mapObj); -void *sub_02062A7C(MapObject *mapObj, int param1); +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 *mapObj, int param1); +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); @@ -142,9 +142,9 @@ 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 MapObject_SetCurrTileBehavior(MapObject *mapObj, u32 param1); +void MapObject_SetCurrTileBehavior(MapObject *mapObj, u32 tileBehavior); u32 MapObject_GetCurrTileBehavior(const MapObject *mapObj); -void MapObject_SetPrevTileBehavior(MapObject *mapObj, u32 param1); +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); @@ -154,7 +154,7 @@ 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 param1); +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); @@ -217,13 +217,13 @@ 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 *mapObj, VecFx32 *param1); -void sub_02063088(MapObject *mapObj, const VecFx32 *param1); +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 *param1); -void sub_020630AC(MapObject *mapObj, const VecFx32 *param1); -void sub_020630BC(const MapObject *mapObj, VecFx32 *param1); -void sub_020630CC(MapObject *mapObj, const VecFx32 *param1); +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); @@ -251,11 +251,11 @@ 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 *mapObjMan, int param1, int param2, int param3); -void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2); -void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4); +MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3); +void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2); +void MapObject_SetPosDir(MapObject *mapObj, int x, int y, int z, int dir); void MapObject_SetMoveCode(MapObject *mapObj, u32 param1); -void sub_020633C8(MapObject *mapObj, int param1); +void sub_020633C8(MapObject *mapObj, int localID); void sub_020633E0(MapObject *mapObj); void sub_020633E4(MapObject *mapObj); void sub_020633E8(MapObject *mapObj); diff --git a/include/map_object_move.h b/include/map_object_move.h index 21cde8b622..b746488647 100644 --- a/include/map_object_move.h +++ b/include/map_object_move.h @@ -9,34 +9,34 @@ void MapObject_InitMove(MapObject *mapObj); void MapObject_Move(MapObject *mapObj); -u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, int param5); -u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4); -u32 sub_02063EBC(const MapObject *mapObj, int param1); -int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3); +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 param1, int param2, int param3); -int MapObject_IsOnWater(MapObject *mapObj, u32 param1); -int MapObject_IsOnSand(MapObject *mapObj, u32 param1); -int MapObject_IsOnSnow(MapObject *mapObj, u32 param1); -int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 param1); -int sub_0206413C(MapObject *mapObj, u32 param1); -int sub_0206415C(MapObject *mapObj, u32 param1); -int sub_0206417C(MapObject *mapObj, u32 param1); -int MapObject_GetDxFromDir(int param0); -int MapObject_GetDzFromDir(int param0); +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 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int param1); -void MapObject_AddVecToPos(MapObject *mapObj, 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 *mapObj); int MapObject_SetTileBehaviors(MapObject *mapObj); -void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2); -void sub_02064450(int param0, int param1, VecFx32 *param2); +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 x, int z, int xPrev, int zPrev); -int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1); -int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2); +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/src/map_object.c b/src/map_object.c index 65c9631c47..a4dec7a04a 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -1691,16 +1691,16 @@ int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan) return FALSE; } -u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 param1) +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 flag) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - return MapObjectMan_CheckStatus(mapObjMan, param1); + return MapObjectMan_CheckStatus(mapObjMan, flag); } void MapObjectMan_SetEndMovement(MapObjectManager *mapObjMan, int param1) { - if (param1 == 0) { + if (param1 == FALSE) { MapObjectMan_SetStatusFlagOn(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); } else { MapObjectMan_SetStatusFlagOff(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); diff --git a/src/map_object_move.c b/src/map_object_move.c index 4611f03a83..915784971a 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -768,7 +768,7 @@ int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 tileBehavior) return FALSE; } -int sub_0206413C(MapObject *mapObj, u32 tileBehavior) +int MapObject_IsOnBridge(MapObject *mapObj, u32 tileBehavior) { if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(tileBehavior) == TRUE) { return TRUE; @@ -777,7 +777,7 @@ int sub_0206413C(MapObject *mapObj, u32 tileBehavior) return FALSE; } -int sub_0206415C(MapObject *mapObj, u32 tileBehavior) +int MapObject_IsOnBikeBridgeNorthSouth(MapObject *mapObj, u32 tileBehavior) { if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(tileBehavior) == TRUE) { return TRUE; @@ -786,7 +786,7 @@ int sub_0206415C(MapObject *mapObj, u32 tileBehavior) return FALSE; } -int sub_0206417C(MapObject *mapObj, u32 tileBehavior) +int MapObject_IsOnBikeBridgeEastWest(MapObject *mapObj, u32 tileBehavior) { if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(tileBehavior) == TRUE) { return TRUE; @@ -809,7 +809,7 @@ static const int DATA_GPosY_Dir4AddTbl[] = { 0 }; -static const int sMapObjectDyDir[] = { +static const int sMapObjectDzDir[] = { -1, 0x1, 0x0, @@ -823,7 +823,7 @@ int MapObject_GetDxFromDir(int dir) int MapObject_GetDzFromDir(int dir) { - return sMapObjectDyDir[dir]; + return sMapObjectDzDir[dir]; } void MapObject_StepDir(MapObject *mapObj, int dir) diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index 82c534af3b..731eadd002 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -1933,7 +1933,7 @@ static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param 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; } } @@ -2366,7 +2366,7 @@ static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { 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_020683F4.c b/src/unk_020683F4.c index 57a9f0ac08..329ced50b6 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -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; } } From e1a0b56446f3cbf57768255848bd2449e39325cb Mon Sep 17 00:00:00 2001 From: leineg Date: Sun, 5 Jan 2025 04:23:44 +0000 Subject: [PATCH 07/28] Renaming .unk's Changed the struct members from GymLeaderEncounterParam and EliteFourChampionEncounterParam to readable labels. --- src/overlay005/encounter_effect_core.c | 158 ++++++++++++------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index 35a32197d4..753f053aec 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); From b9e39639990cc1a34af06597fd2852a7a57adc92 Mon Sep 17 00:00:00 2001 From: leineg Date: Sun, 5 Jan 2025 06:33:38 +0000 Subject: [PATCH 08/28] Comment placement Comment better placed in the line. --- src/overlay005/encounter_effect_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index 753f053aec..e59fee490a 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -2726,7 +2726,7 @@ typedef struct EliterFourChampionEncounterParam { } EliterFourChampionEncounterParam; static const EliterFourChampionEncounterParam sEliteFourChampionEncounterParams[5] = { - { .mugshotPlttIdx = 87, //Narc indices of the Elite Four and Champion + { .mugshotPlttIdx = 87, // Narc indices of the Elite Four and Champion .bannerPlttIdx = 39, .facePanFrames = 32, .trainerClass = TRAINER_CLASS_ELITE_FOUR_AARON, From 4a4d0c8297b4315b1e66334363b9b44da80a309e Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Tue, 7 Jan 2025 13:42:04 +0100 Subject: [PATCH 09/28] Moving `MapObjectSave` to `map_object.h` --- include/map_object.h | 31 +++++++++++++++++++++++- include/struct_defs/struct_02061D3C.h | 34 --------------------------- src/field_overworld_state.c | 1 - src/map_object.c | 1 - 4 files changed, 30 insertions(+), 37 deletions(-) delete mode 100644 include/struct_defs/struct_02061D3C.h diff --git a/include/map_object.h b/include/map_object.h index e63bc859c9..7c231a7dad 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,6 +23,36 @@ #include "narc.h" #include "sys_task_manager.h" +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); diff --git a/include/struct_defs/struct_02061D3C.h b/include/struct_defs/struct_02061D3C.h deleted file mode 100644 index a3e74ca9c0..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 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; - -#endif // POKEPLATINUM_STRUCT_02061D3C_H 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 a4dec7a04a..d295eabda8 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" From c19d32da278204b3731c168a1b8f2a3554200f26 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Tue, 7 Jan 2025 13:48:27 +0100 Subject: [PATCH 10/28] Final touchups in `map_object.c` (using constants and removing unnecessary brackets) --- src/map_object.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/map_object.c b/src/map_object.c index d295eabda8..1d4ab029d1 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -206,13 +206,13 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) { int size; MapObject *mapObj; - MapObjectManager *mapObjMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, (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); @@ -439,7 +439,7 @@ void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *mapO } if (param3) { - memset(mapObjSave, 0, param3 * (sizeof(MapObjectSave))); + memset(mapObjSave, 0, param3 * sizeof(MapObjectSave)); } } @@ -595,13 +595,13 @@ 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, 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; @@ -716,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); @@ -774,7 +774,7 @@ 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 objEventCount, const ObjectEvent *objectEvent) From c1add84e0254e5bcab10574a6b1334013fb2ba77 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Wed, 8 Jan 2025 17:26:55 +0100 Subject: [PATCH 11/28] Renaming functions and some small changes in `map_object_move.c` --- include/map_object.h | 4 ++-- src/map_object.c | 10 +++++----- src/map_object_move.c | 16 ++++++++-------- src/overlay005/ov5_021ECC20.c | 6 +++--- src/overlay005/ov5_021ECE40.c | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/map_object.h b/include/map_object.h index 7c231a7dad..eaefa7223e 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -91,8 +91,8 @@ 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_GetNARC(MapObjectManager *mapObjMan, NARC *narc); -NARC *sub_020628A0(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); diff --git a/src/map_object.c b/src/map_object.c index 1d4ab029d1..1bc5cf55fa 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -128,7 +128,7 @@ static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int localID, i static void sub_02062604(MapObject *mapObj); static void sub_02062618(MapObject *mapObj); static void sub_02062628(MapObject *mapObj); -static int FieldSystem_GetGraphicsID(FieldSystem *fieldSystem, int param1); +static int sub_0206262C(FieldSystem *fieldSystem, int param1); static void sub_02062648(MapObject *mapObj); static void sub_02062660(MapObject *mapObj); static void sub_02062670(MapObject *mapObj); @@ -689,7 +689,7 @@ static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObjec static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, FieldSystem *fieldSystem) { MapObject_SetLocalID(mapObj, ObjectEvent_GetLocalID(objectEvent)); - MapObject_SetGraphicsID(mapObj, FieldSystem_GetGraphicsID(fieldSystem, ObjectEvent_GetGraphicsID(objectEvent))); + MapObject_SetGraphicsID(mapObj, sub_0206262C(fieldSystem, ObjectEvent_GetGraphicsID(objectEvent))); MapObject_SetMovementType(mapObj, ObjectEvent_GetMovementType(objectEvent)); MapObject_SetTrainerType(mapObj, ObjectEvent_GetTrainerType(objectEvent)); MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(objectEvent)); @@ -904,7 +904,7 @@ static void sub_02062628(MapObject *mapObj) (void)0; } -static int FieldSystem_GetGraphicsID(FieldSystem *fieldSystem, int graphicsID) +static int sub_0206262C(FieldSystem *fieldSystem, int graphicsID) { if (graphicsID >= 0x65 && graphicsID <= 0x74) { graphicsID -= 0x65; @@ -1135,12 +1135,12 @@ FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan) return mapObjMan->fieldSystem; } -void MapObjectMan_GetNARC(MapObjectManager *mapObjMan, NARC *narc) +void MapObjectMan_SetNARC(MapObjectManager *mapObjMan, NARC *narc) { mapObjMan->narc = narc; } -NARC *sub_020628A0(const MapObjectManager *mapObjMan) +NARC *MapObjectMan_GetNARC(const MapObjectManager *mapObjMan) { GF_ASSERT(mapObjMan->narc != NULL); return ((MapObjectManager *)mapObjMan)->narc; diff --git a/src/map_object_move.c b/src/map_object_move.c index 915784971a..568b196017 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -982,10 +982,10 @@ void sub_02064464(MapObject *mapObj) } static const int sOppositeDirections[] = { - DIR_SOUTH, - DIR_NORTH, - DIR_EAST, - DIR_WEST + [DIR_NORTH] = DIR_SOUTH, + [DIR_SOUTH] = DIR_NORTH, + [DIR_WEST] = DIR_EAST, + [DIR_EAST] = DIR_WEST }; int Direction_GetOpposite(int dir) @@ -993,17 +993,17 @@ int Direction_GetOpposite(int dir) return sOppositeDirections[dir]; } -int sub_02064488(int x, int z, int xPrev, int zPrev) +int sub_02064488(int param0, int param1, int param2, int param3) { - if (x > xPrev) { + if (param0 > param2) { return DIR_WEST; } - if (x < xPrev) { + if (param0 < param2) { return DIR_EAST; } - if (z > zPrev) { + if (param1 > param3) { return DIR_NORTH; } diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c index 1eb9f48f3e..5d6470c193 100644 --- a/src/overlay005/ov5_021ECC20.c +++ b/src/overlay005/ov5_021ECC20.c @@ -52,12 +52,12 @@ void ov5_021ECC78(MapObjectManager *param0) static void ov5_021ECCA4(MapObjectManager *param0) { NARC *v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, 4); - MapObjectMan_GetNARC(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); } @@ -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 4c641cfd31..d9f01b9a37 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -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); } From 34a6bab7da2521e4932c8a9f3b77c26bd39e9189 Mon Sep 17 00:00:00 2001 From: iriv24 Date: Fri, 10 Jan 2025 21:55:32 -0500 Subject: [PATCH 12/28] Document more of catching show with info from ppark.narc --- src/catching_show.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/catching_show.c b/src/catching_show.c index cc254078b5..7ae811e37f 100644 --- a/src/catching_show.c +++ b/src/catching_show.c @@ -24,6 +24,7 @@ #include "unk_02054D00.h" #define POINTS_LOST_PER_SECOND 2 +#define BYTES_PER_SPECIES 6 #define WEIGHT_NO_ENCOUNTER 20 #define DISTINCT_TYPE_BONUS 50 #define DIFFERENT_TYPE_BONUS 200 @@ -41,7 +42,14 @@ enum PAL_PARK_AREA { PAL_PARK_AREA_WATER_SOUTH_EAST, }; -static void InitEncounterData(FieldSystem *fieldSystem, CatchingShow *catchingShow); +enum PAL_PARK_SPECIES_DATA_INDEXES { + SPECIES_DATA_LAND_AREA = 0, + SPECIES_DATA_WATER_AREA, + SPECIES_DATA_CATCHING_POINTS, + SPECIES_DATA_RARITY, +}; + +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 +68,7 @@ void CatchingShow_Start(FieldSystem *fieldSystem) MI_CpuClearFast(catchingShow, sizeof(CatchingShow)); - InitEncounterData(fieldSystem, catchingShow); + InitSpeciesData(fieldSystem, catchingShow); ResetStepCount(catchingShow); catchingShow->startTime = GetTimestamp(); @@ -121,19 +129,19 @@ int CatchingShow_GetTypePoints(FieldSystem *fieldSystem) return CalculateTypePoints(&sCatchingShow); } -static void sub_02056400(u32 species, u8 *param1) +static void BufferSpeciesData(u32 species, u8 *speciesDataArray) { GF_ASSERT(0 < species && species <= NATIONAL_DEX_COUNT); - int v0 = (species - 1) * 6; + int speciesOffset = (species - 1) * BYTES_PER_SPECIES; - NARC_ReadFromMemberByIndexPair(param1, NARC_INDEX_ARC__PPARK, 0, v0, sizeof(u8) * 6); + NARC_ReadFromMemberByIndexPair(speciesDataArray, NARC_INDEX_ARC__PPARK, 0, speciesOffset, sizeof(u8) * BYTES_PER_SPECIES); } -static void InitEncounterData(FieldSystem *fieldSystem, CatchingShow *catchingShow) +static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow) { int i; - u8 v1[8]; + u8 speciesData[8]; u16 monSpecies; PalParkTransfer *v4 = SaveData_PalParkTransfer(fieldSystem->saveData); Pokemon *mon = Pokemon_New(HEAP_ID_FIELD); @@ -145,16 +153,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[SPECIES_DATA_LAND_AREA] != 0) { + catchingShow->pokemon[i].area = speciesData[SPECIES_DATA_LAND_AREA]; } else { - catchingShow->pokemon[i].area = PAL_PARK_AREA_WATER_NORTH_WEST - 1 + v1[1]; + catchingShow->pokemon[i].area = PAL_PARK_AREA_WATER_NORTH_WEST - 1 + speciesData[SPECIES_DATA_WATER_AREA]; } - catchingShow->pokemon[i].rarity = v1[3]; - catchingShow->pokemon[i].catchingPoints = v1[2]; + catchingShow->pokemon[i].rarity = speciesData[SPECIES_DATA_RARITY]; + catchingShow->pokemon[i].catchingPoints = speciesData[SPECIES_DATA_CATCHING_POINTS]; catchingShow->pokemon[i].type1 = Pokemon_GetValue(mon, MON_DATA_TYPE_1, NULL); catchingShow->pokemon[i].type2 = Pokemon_GetValue(mon, MON_DATA_TYPE_2, NULL); } From 0bd790908ec72bc269ad492a39abc99ca052cf5e Mon Sep 17 00:00:00 2001 From: iriv24 Date: Fri, 10 Jan 2025 22:09:00 -0500 Subject: [PATCH 13/28] Add data from binary into species' data.json files --- res/pokemon/abomasnow/data.json | 7 +++++++ res/pokemon/abra/data.json | 7 +++++++ res/pokemon/absol/data.json | 7 +++++++ res/pokemon/aerodactyl/data.json | 7 +++++++ res/pokemon/aggron/data.json | 7 +++++++ res/pokemon/aipom/data.json | 7 +++++++ res/pokemon/alakazam/data.json | 7 +++++++ res/pokemon/altaria/data.json | 7 +++++++ res/pokemon/ambipom/data.json | 7 +++++++ res/pokemon/ampharos/data.json | 7 +++++++ res/pokemon/anorith/data.json | 7 +++++++ res/pokemon/arbok/data.json | 7 +++++++ res/pokemon/arcanine/data.json | 7 +++++++ res/pokemon/arceus/data.json | 7 +++++++ res/pokemon/ariados/data.json | 7 +++++++ res/pokemon/armaldo/data.json | 7 +++++++ res/pokemon/aron/data.json | 7 +++++++ res/pokemon/articuno/data.json | 7 +++++++ res/pokemon/azelf/data.json | 7 +++++++ res/pokemon/azumarill/data.json | 7 +++++++ res/pokemon/azurill/data.json | 7 +++++++ res/pokemon/bagon/data.json | 7 +++++++ res/pokemon/baltoy/data.json | 7 +++++++ res/pokemon/banette/data.json | 7 +++++++ res/pokemon/barboach/data.json | 7 +++++++ res/pokemon/bastiodon/data.json | 7 +++++++ res/pokemon/bayleef/data.json | 7 +++++++ res/pokemon/beautifly/data.json | 7 +++++++ res/pokemon/beedrill/data.json | 7 +++++++ res/pokemon/beldum/data.json | 7 +++++++ res/pokemon/bellossom/data.json | 7 +++++++ res/pokemon/bellsprout/data.json | 7 +++++++ res/pokemon/bibarel/data.json | 7 +++++++ res/pokemon/bidoof/data.json | 7 +++++++ res/pokemon/blastoise/data.json | 7 +++++++ res/pokemon/blaziken/data.json | 7 +++++++ res/pokemon/blissey/data.json | 7 +++++++ res/pokemon/bonsly/data.json | 7 +++++++ res/pokemon/breloom/data.json | 7 +++++++ res/pokemon/bronzong/data.json | 7 +++++++ res/pokemon/bronzor/data.json | 7 +++++++ res/pokemon/budew/data.json | 7 +++++++ res/pokemon/buizel/data.json | 7 +++++++ res/pokemon/bulbasaur/data.json | 7 +++++++ res/pokemon/buneary/data.json | 7 +++++++ res/pokemon/burmy/data.json | 7 +++++++ res/pokemon/butterfree/data.json | 7 +++++++ res/pokemon/cacnea/data.json | 7 +++++++ res/pokemon/cacturne/data.json | 7 +++++++ res/pokemon/camerupt/data.json | 7 +++++++ res/pokemon/carnivine/data.json | 7 +++++++ res/pokemon/carvanha/data.json | 7 +++++++ res/pokemon/cascoon/data.json | 7 +++++++ res/pokemon/castform/data.json | 7 +++++++ res/pokemon/caterpie/data.json | 7 +++++++ res/pokemon/celebi/data.json | 7 +++++++ res/pokemon/chansey/data.json | 7 +++++++ res/pokemon/charizard/data.json | 7 +++++++ res/pokemon/charmander/data.json | 7 +++++++ res/pokemon/charmeleon/data.json | 7 +++++++ res/pokemon/chatot/data.json | 7 +++++++ res/pokemon/cherrim/data.json | 7 +++++++ res/pokemon/cherubi/data.json | 7 +++++++ res/pokemon/chikorita/data.json | 7 +++++++ res/pokemon/chimchar/data.json | 7 +++++++ res/pokemon/chimecho/data.json | 7 +++++++ res/pokemon/chinchou/data.json | 7 +++++++ res/pokemon/chingling/data.json | 7 +++++++ res/pokemon/clamperl/data.json | 7 +++++++ res/pokemon/claydol/data.json | 7 +++++++ res/pokemon/clefable/data.json | 7 +++++++ res/pokemon/clefairy/data.json | 7 +++++++ res/pokemon/cleffa/data.json | 7 +++++++ res/pokemon/cloyster/data.json | 7 +++++++ res/pokemon/combee/data.json | 7 +++++++ res/pokemon/combusken/data.json | 7 +++++++ res/pokemon/corphish/data.json | 7 +++++++ res/pokemon/corsola/data.json | 7 +++++++ res/pokemon/cradily/data.json | 7 +++++++ res/pokemon/cranidos/data.json | 7 +++++++ res/pokemon/crawdaunt/data.json | 7 +++++++ res/pokemon/cresselia/data.json | 7 +++++++ res/pokemon/croagunk/data.json | 7 +++++++ res/pokemon/crobat/data.json | 7 +++++++ res/pokemon/croconaw/data.json | 7 +++++++ res/pokemon/cubone/data.json | 7 +++++++ res/pokemon/cyndaquil/data.json | 7 +++++++ res/pokemon/darkrai/data.json | 7 +++++++ res/pokemon/delcatty/data.json | 7 +++++++ res/pokemon/delibird/data.json | 7 +++++++ res/pokemon/deoxys/data.json | 7 +++++++ res/pokemon/dewgong/data.json | 7 +++++++ res/pokemon/dialga/data.json | 7 +++++++ res/pokemon/diglett/data.json | 7 +++++++ res/pokemon/ditto/data.json | 7 +++++++ res/pokemon/dodrio/data.json | 7 +++++++ res/pokemon/doduo/data.json | 7 +++++++ res/pokemon/donphan/data.json | 7 +++++++ res/pokemon/dragonair/data.json | 7 +++++++ res/pokemon/dragonite/data.json | 7 +++++++ res/pokemon/drapion/data.json | 7 +++++++ res/pokemon/dratini/data.json | 7 +++++++ res/pokemon/drifblim/data.json | 7 +++++++ res/pokemon/drifloon/data.json | 7 +++++++ res/pokemon/drowzee/data.json | 7 +++++++ res/pokemon/dugtrio/data.json | 7 +++++++ res/pokemon/dunsparce/data.json | 7 +++++++ res/pokemon/dusclops/data.json | 7 +++++++ res/pokemon/dusknoir/data.json | 7 +++++++ res/pokemon/duskull/data.json | 7 +++++++ res/pokemon/dustox/data.json | 7 +++++++ res/pokemon/eevee/data.json | 7 +++++++ res/pokemon/ekans/data.json | 7 +++++++ res/pokemon/electabuzz/data.json | 7 +++++++ res/pokemon/electivire/data.json | 7 +++++++ res/pokemon/electrike/data.json | 7 +++++++ res/pokemon/electrode/data.json | 7 +++++++ res/pokemon/elekid/data.json | 7 +++++++ res/pokemon/empoleon/data.json | 7 +++++++ res/pokemon/entei/data.json | 7 +++++++ res/pokemon/espeon/data.json | 7 +++++++ res/pokemon/exeggcute/data.json | 7 +++++++ res/pokemon/exeggutor/data.json | 7 +++++++ res/pokemon/exploud/data.json | 7 +++++++ res/pokemon/farfetchd/data.json | 7 +++++++ res/pokemon/fearow/data.json | 7 +++++++ res/pokemon/feebas/data.json | 7 +++++++ res/pokemon/feraligatr/data.json | 7 +++++++ res/pokemon/finneon/data.json | 7 +++++++ res/pokemon/flaaffy/data.json | 7 +++++++ res/pokemon/flareon/data.json | 7 +++++++ res/pokemon/floatzel/data.json | 7 +++++++ res/pokemon/flygon/data.json | 7 +++++++ res/pokemon/forretress/data.json | 7 +++++++ res/pokemon/froslass/data.json | 7 +++++++ res/pokemon/furret/data.json | 7 +++++++ res/pokemon/gabite/data.json | 7 +++++++ res/pokemon/gallade/data.json | 7 +++++++ res/pokemon/garchomp/data.json | 7 +++++++ res/pokemon/gardevoir/data.json | 7 +++++++ res/pokemon/gastly/data.json | 7 +++++++ res/pokemon/gastrodon/data.json | 7 +++++++ res/pokemon/gengar/data.json | 7 +++++++ res/pokemon/geodude/data.json | 7 +++++++ res/pokemon/gible/data.json | 7 +++++++ res/pokemon/girafarig/data.json | 7 +++++++ res/pokemon/giratina/data.json | 9 ++++++++- res/pokemon/glaceon/data.json | 7 +++++++ res/pokemon/glalie/data.json | 7 +++++++ res/pokemon/glameow/data.json | 7 +++++++ res/pokemon/gligar/data.json | 7 +++++++ res/pokemon/gliscor/data.json | 7 +++++++ res/pokemon/gloom/data.json | 7 +++++++ res/pokemon/golbat/data.json | 7 +++++++ res/pokemon/goldeen/data.json | 7 +++++++ res/pokemon/golduck/data.json | 7 +++++++ res/pokemon/golem/data.json | 7 +++++++ res/pokemon/gorebyss/data.json | 7 +++++++ res/pokemon/granbull/data.json | 7 +++++++ res/pokemon/graveler/data.json | 7 +++++++ res/pokemon/grimer/data.json | 7 +++++++ res/pokemon/grotle/data.json | 7 +++++++ res/pokemon/groudon/data.json | 7 +++++++ res/pokemon/grovyle/data.json | 7 +++++++ res/pokemon/growlithe/data.json | 7 +++++++ res/pokemon/grumpig/data.json | 7 +++++++ res/pokemon/gulpin/data.json | 7 +++++++ res/pokemon/gyarados/data.json | 7 +++++++ res/pokemon/happiny/data.json | 7 +++++++ res/pokemon/hariyama/data.json | 7 +++++++ res/pokemon/haunter/data.json | 7 +++++++ res/pokemon/heatran/data.json | 7 +++++++ res/pokemon/heracross/data.json | 7 +++++++ res/pokemon/hippopotas/data.json | 7 +++++++ res/pokemon/hippowdon/data.json | 7 +++++++ res/pokemon/hitmonchan/data.json | 7 +++++++ res/pokemon/hitmonlee/data.json | 7 +++++++ res/pokemon/hitmontop/data.json | 7 +++++++ res/pokemon/ho_oh/data.json | 7 +++++++ res/pokemon/honchkrow/data.json | 7 +++++++ res/pokemon/hoothoot/data.json | 7 +++++++ res/pokemon/hoppip/data.json | 7 +++++++ res/pokemon/horsea/data.json | 7 +++++++ res/pokemon/houndoom/data.json | 7 +++++++ res/pokemon/houndour/data.json | 7 +++++++ res/pokemon/huntail/data.json | 7 +++++++ res/pokemon/hypno/data.json | 7 +++++++ res/pokemon/igglybuff/data.json | 7 +++++++ res/pokemon/illumise/data.json | 7 +++++++ res/pokemon/infernape/data.json | 7 +++++++ res/pokemon/ivysaur/data.json | 7 +++++++ res/pokemon/jigglypuff/data.json | 7 +++++++ res/pokemon/jirachi/data.json | 7 +++++++ res/pokemon/jolteon/data.json | 7 +++++++ res/pokemon/jumpluff/data.json | 7 +++++++ res/pokemon/jynx/data.json | 7 +++++++ res/pokemon/kabuto/data.json | 7 +++++++ res/pokemon/kabutops/data.json | 7 +++++++ res/pokemon/kadabra/data.json | 7 +++++++ res/pokemon/kakuna/data.json | 7 +++++++ res/pokemon/kangaskhan/data.json | 7 +++++++ res/pokemon/kecleon/data.json | 7 +++++++ res/pokemon/kingdra/data.json | 7 +++++++ res/pokemon/kingler/data.json | 7 +++++++ res/pokemon/kirlia/data.json | 7 +++++++ res/pokemon/koffing/data.json | 7 +++++++ res/pokemon/krabby/data.json | 7 +++++++ res/pokemon/kricketot/data.json | 7 +++++++ res/pokemon/kricketune/data.json | 7 +++++++ res/pokemon/kyogre/data.json | 7 +++++++ res/pokemon/lairon/data.json | 7 +++++++ res/pokemon/lanturn/data.json | 7 +++++++ res/pokemon/lapras/data.json | 7 +++++++ res/pokemon/larvitar/data.json | 7 +++++++ res/pokemon/latias/data.json | 7 +++++++ res/pokemon/latios/data.json | 7 +++++++ res/pokemon/leafeon/data.json | 7 +++++++ res/pokemon/ledian/data.json | 7 +++++++ res/pokemon/ledyba/data.json | 7 +++++++ res/pokemon/lickilicky/data.json | 7 +++++++ res/pokemon/lickitung/data.json | 7 +++++++ res/pokemon/lileep/data.json | 7 +++++++ res/pokemon/linoone/data.json | 7 +++++++ res/pokemon/lombre/data.json | 7 +++++++ res/pokemon/lopunny/data.json | 7 +++++++ res/pokemon/lotad/data.json | 7 +++++++ res/pokemon/loudred/data.json | 7 +++++++ res/pokemon/lucario/data.json | 7 +++++++ res/pokemon/ludicolo/data.json | 7 +++++++ res/pokemon/lugia/data.json | 7 +++++++ res/pokemon/lumineon/data.json | 7 +++++++ res/pokemon/lunatone/data.json | 7 +++++++ res/pokemon/luvdisc/data.json | 7 +++++++ res/pokemon/luxio/data.json | 7 +++++++ res/pokemon/luxray/data.json | 7 +++++++ res/pokemon/machamp/data.json | 7 +++++++ res/pokemon/machoke/data.json | 7 +++++++ res/pokemon/machop/data.json | 7 +++++++ res/pokemon/magby/data.json | 7 +++++++ res/pokemon/magcargo/data.json | 7 +++++++ res/pokemon/magikarp/data.json | 7 +++++++ res/pokemon/magmar/data.json | 7 +++++++ res/pokemon/magmortar/data.json | 7 +++++++ res/pokemon/magnemite/data.json | 7 +++++++ res/pokemon/magneton/data.json | 7 +++++++ res/pokemon/magnezone/data.json | 7 +++++++ res/pokemon/makuhita/data.json | 7 +++++++ res/pokemon/mamoswine/data.json | 7 +++++++ res/pokemon/manaphy/data.json | 7 +++++++ res/pokemon/manectric/data.json | 7 +++++++ res/pokemon/mankey/data.json | 7 +++++++ res/pokemon/mantine/data.json | 7 +++++++ res/pokemon/mantyke/data.json | 7 +++++++ res/pokemon/mareep/data.json | 7 +++++++ res/pokemon/marill/data.json | 7 +++++++ res/pokemon/marowak/data.json | 7 +++++++ res/pokemon/marshtomp/data.json | 7 +++++++ res/pokemon/masquerain/data.json | 7 +++++++ res/pokemon/mawile/data.json | 7 +++++++ res/pokemon/medicham/data.json | 7 +++++++ res/pokemon/meditite/data.json | 7 +++++++ res/pokemon/meganium/data.json | 7 +++++++ res/pokemon/meowth/data.json | 7 +++++++ res/pokemon/mesprit/data.json | 7 +++++++ res/pokemon/metagross/data.json | 7 +++++++ res/pokemon/metang/data.json | 7 +++++++ res/pokemon/metapod/data.json | 7 +++++++ res/pokemon/mew/data.json | 7 +++++++ res/pokemon/mewtwo/data.json | 7 +++++++ res/pokemon/mightyena/data.json | 7 +++++++ res/pokemon/milotic/data.json | 7 +++++++ res/pokemon/miltank/data.json | 7 +++++++ res/pokemon/mime_jr/data.json | 7 +++++++ res/pokemon/minun/data.json | 7 +++++++ res/pokemon/misdreavus/data.json | 7 +++++++ res/pokemon/mismagius/data.json | 7 +++++++ res/pokemon/moltres/data.json | 7 +++++++ res/pokemon/monferno/data.json | 7 +++++++ res/pokemon/mothim/data.json | 7 +++++++ res/pokemon/mr_mime/data.json | 7 +++++++ res/pokemon/mudkip/data.json | 7 +++++++ res/pokemon/muk/data.json | 7 +++++++ res/pokemon/munchlax/data.json | 7 +++++++ res/pokemon/murkrow/data.json | 7 +++++++ res/pokemon/natu/data.json | 7 +++++++ res/pokemon/nidoking/data.json | 7 +++++++ res/pokemon/nidoqueen/data.json | 7 +++++++ res/pokemon/nidoran_f/data.json | 7 +++++++ res/pokemon/nidoran_m/data.json | 7 +++++++ res/pokemon/nidorina/data.json | 7 +++++++ res/pokemon/nidorino/data.json | 7 +++++++ res/pokemon/nincada/data.json | 7 +++++++ res/pokemon/ninetales/data.json | 7 +++++++ res/pokemon/ninjask/data.json | 7 +++++++ res/pokemon/noctowl/data.json | 7 +++++++ res/pokemon/nosepass/data.json | 7 +++++++ res/pokemon/numel/data.json | 7 +++++++ res/pokemon/nuzleaf/data.json | 7 +++++++ res/pokemon/octillery/data.json | 7 +++++++ res/pokemon/oddish/data.json | 7 +++++++ res/pokemon/omanyte/data.json | 7 +++++++ res/pokemon/omastar/data.json | 7 +++++++ res/pokemon/onix/data.json | 7 +++++++ res/pokemon/pachirisu/data.json | 7 +++++++ res/pokemon/palkia/data.json | 7 +++++++ res/pokemon/paras/data.json | 7 +++++++ res/pokemon/parasect/data.json | 7 +++++++ res/pokemon/pelipper/data.json | 7 +++++++ res/pokemon/persian/data.json | 7 +++++++ res/pokemon/phanpy/data.json | 7 +++++++ res/pokemon/phione/data.json | 7 +++++++ res/pokemon/pichu/data.json | 7 +++++++ res/pokemon/pidgeot/data.json | 7 +++++++ res/pokemon/pidgeotto/data.json | 7 +++++++ res/pokemon/pidgey/data.json | 7 +++++++ res/pokemon/pikachu/data.json | 7 +++++++ res/pokemon/piloswine/data.json | 7 +++++++ res/pokemon/pineco/data.json | 7 +++++++ res/pokemon/pinsir/data.json | 7 +++++++ res/pokemon/piplup/data.json | 7 +++++++ res/pokemon/plusle/data.json | 7 +++++++ res/pokemon/politoed/data.json | 7 +++++++ res/pokemon/poliwag/data.json | 7 +++++++ res/pokemon/poliwhirl/data.json | 7 +++++++ res/pokemon/poliwrath/data.json | 7 +++++++ res/pokemon/ponyta/data.json | 7 +++++++ res/pokemon/poochyena/data.json | 7 +++++++ res/pokemon/porygon/data.json | 7 +++++++ res/pokemon/porygon2/data.json | 7 +++++++ res/pokemon/porygon_z/data.json | 7 +++++++ res/pokemon/primeape/data.json | 7 +++++++ res/pokemon/prinplup/data.json | 7 +++++++ res/pokemon/probopass/data.json | 7 +++++++ res/pokemon/psyduck/data.json | 7 +++++++ res/pokemon/pupitar/data.json | 7 +++++++ res/pokemon/purugly/data.json | 7 +++++++ res/pokemon/quagsire/data.json | 7 +++++++ res/pokemon/quilava/data.json | 7 +++++++ res/pokemon/qwilfish/data.json | 7 +++++++ res/pokemon/raichu/data.json | 7 +++++++ res/pokemon/raikou/data.json | 7 +++++++ res/pokemon/ralts/data.json | 7 +++++++ res/pokemon/rampardos/data.json | 7 +++++++ res/pokemon/rapidash/data.json | 7 +++++++ res/pokemon/raticate/data.json | 7 +++++++ res/pokemon/rattata/data.json | 7 +++++++ res/pokemon/rayquaza/data.json | 7 +++++++ res/pokemon/regice/data.json | 7 +++++++ res/pokemon/regigigas/data.json | 7 +++++++ res/pokemon/regirock/data.json | 7 +++++++ res/pokemon/registeel/data.json | 7 +++++++ res/pokemon/relicanth/data.json | 7 +++++++ res/pokemon/remoraid/data.json | 7 +++++++ res/pokemon/rhydon/data.json | 7 +++++++ res/pokemon/rhyhorn/data.json | 7 +++++++ res/pokemon/rhyperior/data.json | 7 +++++++ res/pokemon/riolu/data.json | 7 +++++++ res/pokemon/roselia/data.json | 7 +++++++ res/pokemon/roserade/data.json | 7 +++++++ res/pokemon/rotom/data.json | 7 +++++++ res/pokemon/sableye/data.json | 7 +++++++ res/pokemon/salamence/data.json | 7 +++++++ res/pokemon/sandshrew/data.json | 7 +++++++ res/pokemon/sandslash/data.json | 7 +++++++ res/pokemon/sceptile/data.json | 7 +++++++ res/pokemon/scizor/data.json | 7 +++++++ res/pokemon/scyther/data.json | 7 +++++++ res/pokemon/seadra/data.json | 7 +++++++ res/pokemon/seaking/data.json | 7 +++++++ res/pokemon/sealeo/data.json | 7 +++++++ res/pokemon/seedot/data.json | 7 +++++++ res/pokemon/seel/data.json | 7 +++++++ res/pokemon/sentret/data.json | 7 +++++++ res/pokemon/seviper/data.json | 7 +++++++ res/pokemon/sharpedo/data.json | 7 +++++++ res/pokemon/shaymin/data.json | 7 +++++++ res/pokemon/shedinja/data.json | 7 +++++++ res/pokemon/shelgon/data.json | 7 +++++++ res/pokemon/shellder/data.json | 7 +++++++ res/pokemon/shellos/data.json | 7 +++++++ res/pokemon/shieldon/data.json | 7 +++++++ res/pokemon/shiftry/data.json | 7 +++++++ res/pokemon/shinx/data.json | 7 +++++++ res/pokemon/shroomish/data.json | 7 +++++++ res/pokemon/shuckle/data.json | 7 +++++++ res/pokemon/shuppet/data.json | 7 +++++++ res/pokemon/silcoon/data.json | 7 +++++++ res/pokemon/skarmory/data.json | 7 +++++++ res/pokemon/skiploom/data.json | 7 +++++++ res/pokemon/skitty/data.json | 7 +++++++ res/pokemon/skorupi/data.json | 7 +++++++ res/pokemon/skuntank/data.json | 7 +++++++ res/pokemon/slaking/data.json | 7 +++++++ res/pokemon/slakoth/data.json | 7 +++++++ res/pokemon/slowbro/data.json | 7 +++++++ res/pokemon/slowking/data.json | 7 +++++++ res/pokemon/slowpoke/data.json | 7 +++++++ res/pokemon/slugma/data.json | 7 +++++++ res/pokemon/smeargle/data.json | 7 +++++++ res/pokemon/smoochum/data.json | 7 +++++++ res/pokemon/sneasel/data.json | 7 +++++++ res/pokemon/snorlax/data.json | 7 +++++++ res/pokemon/snorunt/data.json | 7 +++++++ res/pokemon/snover/data.json | 7 +++++++ res/pokemon/snubbull/data.json | 7 +++++++ res/pokemon/solrock/data.json | 7 +++++++ res/pokemon/spearow/data.json | 7 +++++++ res/pokemon/spheal/data.json | 7 +++++++ res/pokemon/spinarak/data.json | 7 +++++++ res/pokemon/spinda/data.json | 7 +++++++ res/pokemon/spiritomb/data.json | 7 +++++++ res/pokemon/spoink/data.json | 7 +++++++ res/pokemon/squirtle/data.json | 7 +++++++ res/pokemon/stantler/data.json | 7 +++++++ res/pokemon/staraptor/data.json | 7 +++++++ res/pokemon/staravia/data.json | 7 +++++++ res/pokemon/starly/data.json | 7 +++++++ res/pokemon/starmie/data.json | 7 +++++++ res/pokemon/staryu/data.json | 7 +++++++ res/pokemon/steelix/data.json | 7 +++++++ res/pokemon/stunky/data.json | 7 +++++++ res/pokemon/sudowoodo/data.json | 7 +++++++ res/pokemon/suicune/data.json | 7 +++++++ res/pokemon/sunflora/data.json | 7 +++++++ res/pokemon/sunkern/data.json | 7 +++++++ res/pokemon/surskit/data.json | 7 +++++++ res/pokemon/swablu/data.json | 7 +++++++ res/pokemon/swalot/data.json | 7 +++++++ res/pokemon/swampert/data.json | 7 +++++++ res/pokemon/swellow/data.json | 7 +++++++ res/pokemon/swinub/data.json | 7 +++++++ res/pokemon/taillow/data.json | 7 +++++++ res/pokemon/tangela/data.json | 7 +++++++ res/pokemon/tangrowth/data.json | 7 +++++++ res/pokemon/tauros/data.json | 7 +++++++ res/pokemon/teddiursa/data.json | 7 +++++++ res/pokemon/tentacool/data.json | 7 +++++++ res/pokemon/tentacruel/data.json | 7 +++++++ res/pokemon/togekiss/data.json | 7 +++++++ res/pokemon/togepi/data.json | 7 +++++++ res/pokemon/togetic/data.json | 7 +++++++ res/pokemon/torchic/data.json | 7 +++++++ res/pokemon/torkoal/data.json | 7 +++++++ res/pokemon/torterra/data.json | 7 +++++++ res/pokemon/totodile/data.json | 7 +++++++ res/pokemon/toxicroak/data.json | 7 +++++++ res/pokemon/trapinch/data.json | 7 +++++++ res/pokemon/treecko/data.json | 7 +++++++ res/pokemon/tropius/data.json | 7 +++++++ res/pokemon/turtwig/data.json | 7 +++++++ res/pokemon/typhlosion/data.json | 7 +++++++ res/pokemon/tyranitar/data.json | 7 +++++++ res/pokemon/tyrogue/data.json | 7 +++++++ res/pokemon/umbreon/data.json | 7 +++++++ res/pokemon/unown/data.json | 7 +++++++ res/pokemon/ursaring/data.json | 7 +++++++ res/pokemon/uxie/data.json | 7 +++++++ res/pokemon/vaporeon/data.json | 7 +++++++ res/pokemon/venomoth/data.json | 7 +++++++ res/pokemon/venonat/data.json | 7 +++++++ res/pokemon/venusaur/data.json | 7 +++++++ res/pokemon/vespiquen/data.json | 7 +++++++ res/pokemon/vibrava/data.json | 7 +++++++ res/pokemon/victreebel/data.json | 7 +++++++ res/pokemon/vigoroth/data.json | 7 +++++++ res/pokemon/vileplume/data.json | 7 +++++++ res/pokemon/volbeat/data.json | 7 +++++++ res/pokemon/voltorb/data.json | 7 +++++++ res/pokemon/vulpix/data.json | 7 +++++++ res/pokemon/wailmer/data.json | 7 +++++++ res/pokemon/wailord/data.json | 7 +++++++ res/pokemon/walrein/data.json | 7 +++++++ res/pokemon/wartortle/data.json | 7 +++++++ res/pokemon/weavile/data.json | 7 +++++++ res/pokemon/weedle/data.json | 7 +++++++ res/pokemon/weepinbell/data.json | 7 +++++++ res/pokemon/weezing/data.json | 7 +++++++ res/pokemon/whiscash/data.json | 7 +++++++ res/pokemon/whismur/data.json | 7 +++++++ res/pokemon/wigglytuff/data.json | 7 +++++++ res/pokemon/wingull/data.json | 7 +++++++ res/pokemon/wobbuffet/data.json | 7 +++++++ res/pokemon/wooper/data.json | 7 +++++++ res/pokemon/wormadam/data.json | 7 +++++++ res/pokemon/wurmple/data.json | 7 +++++++ res/pokemon/wynaut/data.json | 7 +++++++ res/pokemon/xatu/data.json | 7 +++++++ res/pokemon/yanma/data.json | 7 +++++++ res/pokemon/yanmega/data.json | 7 +++++++ res/pokemon/zangoose/data.json | 7 +++++++ res/pokemon/zapdos/data.json | 7 +++++++ res/pokemon/zigzagoon/data.json | 7 +++++++ res/pokemon/zubat/data.json | 7 +++++++ 493 files changed, 3452 insertions(+), 1 deletion(-) diff --git a/res/pokemon/abomasnow/data.json b/res/pokemon/abomasnow/data.json index c037a5a7a7..9810add64f 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_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..7c5f647c4c 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_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..9cfecb603f 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_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..c64d522df2 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_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..79d2940e99 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_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..112ad41562 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_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..e6d9ce3420 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_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..f2b3426487 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_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..e5d0c501d0 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_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..0c132de005 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_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..962ac0da7b 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_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..b671e913b2 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_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..336d25c3ca 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_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..fcaf694b23 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_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..1512d6077f 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_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..75ee2bdf0e 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_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..a329f6a319 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_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..8bb24067b2 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_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..f84aee5b6f 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_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..61b7ba3b39 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_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..bc19b4c8b7 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_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..942823f96b 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_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..e6355ebfbb 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_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..3d88e51015 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_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..acba331ec2 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_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..1081662e76 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_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..056e14accf 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_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..b2301b461a 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_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..71f03efe00 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_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..d8d4b6d154 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_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..f5c4c29dc3 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_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..d86edb96a7 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_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..562fb20363 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_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..e800194335 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_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..a08a04a8cf 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_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..6bf183c8b3 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_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..e709104e05 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_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..c797e462ec 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_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..c5100e79c9 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_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..8422ef81cd 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_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..1e581b1c73 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_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..81ad304d3a 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_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..6c2df5178c 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_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..406db83801 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_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..aab849b229 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_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..ac97a3fb1a 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_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..ff60adab38 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_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..fe97212430 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_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..f284441679 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_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..5ef5cc0853 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_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..a2bf5e9826 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_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..8371d71c48 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_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..68ec0937e8 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_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..f5822814db 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_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..cf1ae8aa35 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_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..d5b9b5b8df 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_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..3e56cb4a95 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_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..dc791cb1a6 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_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..cfe6eed340 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_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..be06450651 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_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..ff9ebfc1b8 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_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..c4e382227f 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_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..f40a6f936b 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_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..bdf02bc433 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_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..588280ea36 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_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..e678742e81 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_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..8bb43cfe00 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_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..d939028301 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_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..0afcb44d80 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_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..5c8986326b 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_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..13df12961b 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_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..90ac800d94 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_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..a2d09e603b 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_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..236ddc85f8 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_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..85fdbd93a9 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_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..12ad0ae9fc 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_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..566b05b1fe 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_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..5f4a889900 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_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..e6b1040db1 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_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..a69c367f9c 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_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..2183a5707f 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_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..8b3e684997 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_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..b9985eb19d 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_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..4f5d49a7af 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_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..5dfffa4115 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_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..13473660fb 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_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..ae8f87b85d 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_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..187884fac4 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_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..1ca41ffffe 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_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..ed91ebee93 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_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..d34082e109 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_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..a32cbedb12 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_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..8de4c018f2 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_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..abf61ad688 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_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..c337b61e37 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_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..c20cccdc77 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_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..3406f0194d 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_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..b125fc71a0 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_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..e93c41dad6 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_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..7b81dd883a 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_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..bbd1366449 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_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..b02af85319 100644 --- a/res/pokemon/dratini/data.json +++ b/res/pokemon/dratini/data.json @@ -131,5 +131,12 @@ "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.", "category": "Dragon Pokémon" + }, + "catching_show_data": { + "pal_park_land_area": "PAL_PARK_AREA_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..42004ff3c3 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_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..07a356feba 100644 --- a/res/pokemon/drifloon/data.json +++ b/res/pokemon/drifloon/data.json @@ -144,5 +144,12 @@ "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", "category": "Balloon Pokémon" + }, + "catching_show_data": { + "pal_park_land_area": "PAL_PARK_AREA_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..b8149a99bd 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_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..022d231a4c 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_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..cf5651ed68 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_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..c62a6360d0 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_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..316f737184 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_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..bcde067f7f 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_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..42747040f8 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_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..9026b929ea 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_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..d594880db7 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_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..b60466c2a0 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_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..61a993bd6e 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_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..e91b2445a2 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_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..5b3c0b8b82 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_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..e4d0bf2604 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_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..394beebc46 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_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..dff7557e20 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_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..bd66116fef 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_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..0159804ae3 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_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..1319e13d91 100644 --- a/res/pokemon/exeggutor/data.json +++ b/res/pokemon/exeggutor/data.json @@ -123,5 +123,12 @@ "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.", "category": "Coconut Pokémon" + }, + "catching_show_data": { + "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", + "pal_park_water_area": "PAL_PARK_AREA_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..c8ae229680 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_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..10076970f8 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_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..87722fc2ad 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_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..f49819f3fe 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_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..e0cd7b4a38 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_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..220f1aea86 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_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..775f65a4d2 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_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..6bad7b2286 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_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..e7cf45931f 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_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..36b7737e06 100644 --- a/res/pokemon/flygon/data.json +++ b/res/pokemon/flygon/data.json @@ -137,5 +137,12 @@ "pokemon_pos_m": 1, "entry_text": "It whips up sandstorms with\npowerful flaps of its wings. It is\nknown as \u201cThe Desert Spirit.\u201d", "category": "Mystic Pokémon" + }, + "catching_show_data": { + "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", + "pal_park_water_area": "PAL_PARK_AREA_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..eba48aa0dd 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_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..8dc4255992 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_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..1f846b3313 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_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..1b00ac41bd 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_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..9d4cc3d3c1 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_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..1fe158384d 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_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..0bdcfc341b 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_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..133fb029c9 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_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..a32758f5e3 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_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..ad39fc9586 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_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..5d81a91435 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_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..cf58469700 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_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..20c4f276d6 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_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..3034d78bb3 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_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..b8187d5966 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_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..be70d6ffa1 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_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..beb68cb7f0 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_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..3c7d18b401 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_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..1695a19f6c 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_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..93b54735dc 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_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..2413e80bf9 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_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..cc413a14dc 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_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..bf5088f211 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_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..b70532d09e 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_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..9237dcea6c 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_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..691c04af96 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_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..dc84986e26 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_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..f63d331571 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_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..22521a60e8 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_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..3b178cd935 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_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..664598e2bf 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_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..358b4b1e21 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_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..a399208586 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_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..1685166752 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_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..45c03bccb9 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_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..57e1694aba 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_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..b546fe4fe1 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_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..f32e41fd39 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_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..00585c2d65 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_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..14d89923fe 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_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..70a0a5d81e 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_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..d069a282fe 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_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..4ead3574f2 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_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..07e8fa695a 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_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..eab3106e7d 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_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..294356c55f 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_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..bcf19ec11a 100644 --- a/res/pokemon/honchkrow/data.json +++ b/res/pokemon/honchkrow/data.json @@ -128,5 +128,12 @@ "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", "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_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..e9721084d3 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_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..ccdf8b5683 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_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..3cf7f83e44 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_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..f4b2c37423 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_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..ecc950a074 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_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..45c8e0d4c2 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_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..0fde03ea82 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_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..dd90f13b6f 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_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..42d5cd971d 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_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..691b22b4e4 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_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..9aeb8dbfb2 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_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..b54dcf8275 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_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..0f466fd8f3 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_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..a8491a6226 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_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..063aef3549 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_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..2af002b639 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_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..1d721bbfcd 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_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..cf16a5e321 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_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..8ca2768bbc 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_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..83835daeb5 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_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..8542bad162 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_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..f226fad92a 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_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..992634086e 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_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..b8b788cea9 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_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..e7be56fd8f 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_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..defed60261 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_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..80727f5270 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_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..d2b3432641 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_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..bfed9bede2 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_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..eb9e66bec8 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_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..ce9ae1897b 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_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..7b134057b0 100644 --- a/res/pokemon/lanturn/data.json +++ b/res/pokemon/lanturn/data.json @@ -130,5 +130,12 @@ "pokemon_pos_m": 2, "entry_text": "LANTURN’s light can shine up from\ngreat depths. It is nicknamed\n\u201cThe Deep-Sea Star.\u201d", "category": "Light Pokémon" + }, + "catching_show_data": { + "pal_park_land_area": "PAL_PARK_AREA_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..39b80eab26 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_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..588c7da6e5 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_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..b93e6cdea8 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_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..2da4519a30 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_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..bf40d696e4 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_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..7164fa4121 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_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..0cb62f5fb8 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_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..8c46dca1f0 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_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..8c6aa79d05 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_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..0954a2eaea 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_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..727ce8bf5b 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_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..d2ad07e013 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_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..eaa6668d85 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_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..937b6820c8 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_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..db6a47ae97 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_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..23f9018f26 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_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..8a35036454 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_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..63efe5ac7f 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_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..aa3f8a8c9f 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_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..8862e6dba2 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_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..23e4b45e0b 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_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..620ed58dea 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_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..b34d540e64 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_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..87f867c27c 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_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..c2f83322d8 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_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..a4976a5349 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_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..f487994e3f 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_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..1bcccb28b4 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_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..95b1aa6cb2 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_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..76e31357d7 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_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..3dfbd6d94b 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_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..d95960b0a7 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_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..f63a004f76 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_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..99dcc054a1 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_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..32d8821bde 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_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..a9ff958e52 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_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..29c15d228d 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_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..3b1112e2ee 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_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..c1ed5ba5b1 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_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..8c72619b35 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_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..19c42a171b 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_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..1d3b19253d 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_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..4121bf4bbb 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_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..2d79731e4a 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_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..439b5c19bf 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_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..4e865a352f 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_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..a968e0952c 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_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..65530a21a5 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_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..c295399dab 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_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..4cabc9df9c 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_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..a040c3a8f4 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_NONE", + "catching_points": 50, + "rarity": 30, + "unused": 1285 } } \ No newline at end of file diff --git a/res/pokemon/mesprit/data.json b/res/pokemon/mesprit/data.json index 94120a385f..8978c021c0 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_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..0890ca665f 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_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..d8591cd078 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_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..6090b3e99c 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_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..dc06d63b82 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_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..5e42099240 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_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..815cbaba1c 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_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..1a134d09eb 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_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..7a95d6ea59 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_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..c7f5892cf5 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_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..ae104fc05e 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_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..bedf015073 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_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..db11d56633 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_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..08e0fe5b00 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_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..88737ff541 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_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..b7ded2a686 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_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..28c25c56bb 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_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..eb33e6d18d 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_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..9286cfc292 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_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..64b0681195 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_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..0b3e0c4dc0 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_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..8996e7a680 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_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..2aeabe4c1e 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_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..6a92881031 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_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..a969fcdcd3 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_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..47723a3a86 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_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..c6d9d5be3e 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_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..633ec9dca3 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_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..7ed3856423 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_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..9dff2811ea 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_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..823471da29 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_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..c9008b202d 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_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..5c86e420e0 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_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..22a99c4804 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_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..5c02fbd5f7 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_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..49910f12e0 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_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..5e59e8b297 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_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..6220c3a955 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_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..de63d6dc4c 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_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..b3d3950877 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_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..2242bf0955 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_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..4b3e156319 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_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..9ed7344c51 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_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..a2302f9072 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_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..c26d4efb9b 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_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..a048ed1605 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_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..c9d2986ba7 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_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..ed155c4fb7 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_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..fc0484d30f 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_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..8975d87a81 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_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..0373581d3e 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_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..3a257255a8 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_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..af495e86ec 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_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..cba0224c2e 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_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..e4035d367d 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_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..72eeeb380c 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_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..04f1ea438a 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_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..cbdc4c54bb 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_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..e07846f907 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_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..98e3e94a5f 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_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..d90ed62eeb 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_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..d097517c57 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_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..b007e2735c 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_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..c1f0c4290e 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_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..ec586dc8bd 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_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..e1a4e08286 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_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..4bf0e87f79 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_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..06c508524c 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_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..50808585e5 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_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..a0438d3317 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_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..0f11554de2 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_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..5175116d9d 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_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..df21f1c715 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_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..a4eaa93353 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_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..266dc39643 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_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..be07c01f4c 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_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..b11ee0b13c 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_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..9f56ade9e4 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_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..4c40f87e65 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_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..46047969c8 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_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..be7c188424 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_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..4968ae2471 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_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..e6afcc320c 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_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..b0aaa6a50e 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_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..a63c263855 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_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..ebb2537e9b 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_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..b7ea1ba243 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_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..9ae5ee666c 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_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..90bbc2d663 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_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..9beabaaec6 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_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..ca01709631 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_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..161cf2fa22 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_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..7d1758d041 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_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..3506c73abc 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_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..6c22f30cb5 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_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..9ca3b70390 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_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..4c3aee18f9 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_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..9e1aa665b1 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_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..f3667d9024 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_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..88c7a2c46a 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_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..76eca65bdb 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_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..a956b34b42 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_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..81cd06dd47 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_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..d9b52c1445 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_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..bb62d3c7b5 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_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..8e413681fb 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_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..a60759a72a 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_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..3368a5edc7 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_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..ff49bc6e88 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_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..56d2f0c3b4 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_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..970bd45842 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_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..9b7239c09a 100644 --- a/res/pokemon/sharpedo/data.json +++ b/res/pokemon/sharpedo/data.json @@ -139,5 +139,12 @@ "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", "category": "Brutal Pokémon" + }, + "catching_show_data": { + "pal_park_land_area": "PAL_PARK_AREA_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..aafc9f7b0b 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_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..21ef94aec0 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_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..9d85c8e01a 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_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..3f9f419296 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_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..609e41a1f1 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_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..fd0d206284 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_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..d51589d97f 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_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..648b31d152 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_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..6f7f3e3ef5 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_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..97677c9db7 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_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..5cffab3915 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_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..893455afb5 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_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..42694e07ac 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_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..113670b185 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_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..6a643b79c3 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_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..2185041392 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_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..40b598627a 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_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..a014b56b2a 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_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..dca20b4710 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_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..e4a6a093c5 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_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..5e76cfa4a9 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_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..b5c89dcd09 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_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..a3e429a15f 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_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..1141166ea1 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_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..99b0f0d0a8 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_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..79d78ecdaa 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_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..7f287f3161 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_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..d6d4af7e4e 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_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..deec941bad 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_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..f8e42a0c68 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_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..8fee72712e 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_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..2adb847dd0 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_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..f494cb891d 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_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..78bc5480e9 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_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..6ec2edb20e 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_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..1f52642c95 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_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..f2a080e79d 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_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..02568c88e8 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_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..37eb21c6e2 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_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..4a60440707 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_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..a935065078 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_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..535bf81b34 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_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..235836e892 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_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..87a5dd1177 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_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..3f7c4a1cb1 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_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..38347cc9c3 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_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..7a53839098 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_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..fc11f504f5 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_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..d3fa27219c 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_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..b73dc65d15 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_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..3e0d6f1351 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_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..86605e32e5 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_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..5388bf7120 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_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..b2496d44c7 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_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..f5bff5540e 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_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..62e45849c2 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_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..240dd1899d 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_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..f6191293ce 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_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..31a80ff112 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_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..3031643672 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_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..d0ea669b53 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_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..468608e87a 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_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..90da54d526 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_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..8dfcff59ce 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_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..c27e00f6e5 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_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..2b35201ddc 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_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..1038f1796b 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_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..c38200fb6c 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_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..57bb0094a8 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_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..f4c0c20b92 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_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..af3e77f1af 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_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..c67c3c8fd9 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_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..df9437a48f 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_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..96a46fad9c 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_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..656f2d0b98 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_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..7272508cd5 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_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..4137244fab 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_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..93bd6b3729 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_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..ed63ec5a48 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_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..a1fcaac023 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_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..145a577e18 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_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..1dd60b5d3b 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_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..8f81eb48b4 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_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..87fc6d9409 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_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..0efce73136 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_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..5b185bf1c5 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_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..9128172da0 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_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..f86faacbb5 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_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..484d638d85 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_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..f8f88927ce 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_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..d8b991dd1b 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_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..31ecfcbc17 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_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..7ac0060ebc 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_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..66e2249a55 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_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..5e2184e278 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_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..e11ec1a153 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_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..3b589fb942 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_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..34f1a39a1b 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_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..92f8963030 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_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..762553b57d 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_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..ea305a0a34 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_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..2431222270 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_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..58a52bdc9d 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_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..88b1e225e9 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_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..d9445933f6 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_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..8da70b3e3f 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_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..6e8dfa264c 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_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..eba6b1e82f 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_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..cf151781ee 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_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..e294c63244 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_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..0fdaa50deb 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_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..91113325d1 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_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..b95aea1eca 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_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..4c75ecf0bf 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_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..2ec251f0dd 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_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..bbacb64840 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_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..a4b83983b7 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_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..68467e45ee 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_NONE", + "catching_points": 30, + "rarity": 50, + "unused": 4358 } } \ No newline at end of file From 935ea1a171e23f4e2e5d4cf60e3e06b4bb34e745 Mon Sep 17 00:00:00 2001 From: iriv24 Date: Fri, 10 Jan 2025 22:24:53 -0500 Subject: [PATCH 14/28] Replace u201c and u201d with left double quote and right double quote, respectively, in data.jsons --- res/pokemon/dratini/data.json | 2 +- res/pokemon/drifloon/data.json | 2 +- res/pokemon/exeggutor/data.json | 2 +- res/pokemon/flygon/data.json | 2 +- res/pokemon/honchkrow/data.json | 2 +- res/pokemon/lanturn/data.json | 2 +- res/pokemon/sharpedo/data.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/res/pokemon/dratini/data.json b/res/pokemon/dratini/data.json index b02af85319..144a72f4c5 100644 --- a/res/pokemon/dratini/data.json +++ b/res/pokemon/dratini/data.json @@ -129,7 +129,7 @@ "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": { diff --git a/res/pokemon/drifloon/data.json b/res/pokemon/drifloon/data.json index 07a356feba..50ea6ff3cb 100644 --- a/res/pokemon/drifloon/data.json +++ b/res/pokemon/drifloon/data.json @@ -142,7 +142,7 @@ "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": { diff --git a/res/pokemon/exeggutor/data.json b/res/pokemon/exeggutor/data.json index 1319e13d91..88eb4707c1 100644 --- a/res/pokemon/exeggutor/data.json +++ b/res/pokemon/exeggutor/data.json @@ -121,7 +121,7 @@ "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": { diff --git a/res/pokemon/flygon/data.json b/res/pokemon/flygon/data.json index 36b7737e06..7dbe5f33a2 100644 --- a/res/pokemon/flygon/data.json +++ b/res/pokemon/flygon/data.json @@ -135,7 +135,7 @@ "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": { diff --git a/res/pokemon/honchkrow/data.json b/res/pokemon/honchkrow/data.json index bcf19ec11a..e26ec27049 100644 --- a/res/pokemon/honchkrow/data.json +++ b/res/pokemon/honchkrow/data.json @@ -126,7 +126,7 @@ "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": { diff --git a/res/pokemon/lanturn/data.json b/res/pokemon/lanturn/data.json index 7b134057b0..66c76ed5a3 100644 --- a/res/pokemon/lanturn/data.json +++ b/res/pokemon/lanturn/data.json @@ -128,7 +128,7 @@ "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": { diff --git a/res/pokemon/sharpedo/data.json b/res/pokemon/sharpedo/data.json index 9b7239c09a..096b330f3b 100644 --- a/res/pokemon/sharpedo/data.json +++ b/res/pokemon/sharpedo/data.json @@ -137,7 +137,7 @@ "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": { From dfdaf4d132ca19040bc5b9ecf508aba3401cb4bc Mon Sep 17 00:00:00 2001 From: iriv24 Date: Fri, 10 Jan 2025 23:41:27 -0500 Subject: [PATCH 15/28] Move PAL_PARK_AREA enum to consts --- consts/catching_show.json | 14 ++++++++++++++ src/catching_show.c | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/consts/catching_show.json b/consts/catching_show.json index 7562d99103..bdb5cb8383 100644 --- a/consts/catching_show.json +++ b/consts/catching_show.json @@ -8,6 +8,20 @@ "CATCHING_SHOW_TYPE_POINTS", "CATCHING_SHOW_TOTAL_POINTS" ] + }, + "@PalParkArea": { + "type": "enum", + "values": [ + "PAL_PARK_AREA_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_WATER_NORTH_WEST", + "PAL_PARK_AREA_WATER_NORTH_EAST", + "PAL_PARK_AREA_WATER_SOUTH_WEST", + "PAL_PARK_AREA_WATER_SOUTH_EAST" + ] } } } diff --git a/src/catching_show.c b/src/catching_show.c index 7ae811e37f..c5bbeaa66a 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" @@ -30,18 +31,6 @@ #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, -}; - enum PAL_PARK_SPECIES_DATA_INDEXES { SPECIES_DATA_LAND_AREA = 0, SPECIES_DATA_WATER_AREA, From f4659a7cfdb01c37634b65de3b29b3bd1ae76a63 Mon Sep 17 00:00:00 2001 From: iriv24 Date: Sat, 11 Jan 2025 21:39:17 -0500 Subject: [PATCH 16/28] Rework pal park area constants --- consts/catching_show.json | 11 +++++++++-- res/pokemon/abomasnow/data.json | 2 +- res/pokemon/abra/data.json | 2 +- res/pokemon/absol/data.json | 2 +- res/pokemon/aerodactyl/data.json | 2 +- res/pokemon/aggron/data.json | 2 +- res/pokemon/aipom/data.json | 2 +- res/pokemon/alakazam/data.json | 2 +- res/pokemon/altaria/data.json | 2 +- res/pokemon/ambipom/data.json | 2 +- res/pokemon/ampharos/data.json | 2 +- res/pokemon/anorith/data.json | 2 +- res/pokemon/arbok/data.json | 2 +- res/pokemon/arcanine/data.json | 2 +- res/pokemon/arceus/data.json | 2 +- res/pokemon/ariados/data.json | 2 +- res/pokemon/armaldo/data.json | 2 +- res/pokemon/aron/data.json | 2 +- res/pokemon/articuno/data.json | 2 +- res/pokemon/azelf/data.json | 2 +- res/pokemon/azumarill/data.json | 2 +- res/pokemon/azurill/data.json | 2 +- res/pokemon/bagon/data.json | 2 +- res/pokemon/baltoy/data.json | 2 +- res/pokemon/banette/data.json | 2 +- res/pokemon/barboach/data.json | 2 +- res/pokemon/bastiodon/data.json | 2 +- res/pokemon/bayleef/data.json | 2 +- res/pokemon/beautifly/data.json | 2 +- res/pokemon/beedrill/data.json | 2 +- res/pokemon/beldum/data.json | 2 +- res/pokemon/bellossom/data.json | 2 +- res/pokemon/bellsprout/data.json | 2 +- res/pokemon/bibarel/data.json | 2 +- res/pokemon/bidoof/data.json | 2 +- res/pokemon/blastoise/data.json | 2 +- res/pokemon/blaziken/data.json | 2 +- res/pokemon/blissey/data.json | 2 +- res/pokemon/bonsly/data.json | 2 +- res/pokemon/breloom/data.json | 2 +- res/pokemon/bronzong/data.json | 2 +- res/pokemon/bronzor/data.json | 2 +- res/pokemon/budew/data.json | 2 +- res/pokemon/buizel/data.json | 2 +- res/pokemon/bulbasaur/data.json | 2 +- res/pokemon/buneary/data.json | 2 +- res/pokemon/burmy/data.json | 2 +- res/pokemon/butterfree/data.json | 2 +- res/pokemon/cacnea/data.json | 2 +- res/pokemon/cacturne/data.json | 2 +- res/pokemon/camerupt/data.json | 2 +- res/pokemon/carnivine/data.json | 2 +- res/pokemon/carvanha/data.json | 2 +- res/pokemon/cascoon/data.json | 2 +- res/pokemon/castform/data.json | 2 +- res/pokemon/caterpie/data.json | 2 +- res/pokemon/celebi/data.json | 2 +- res/pokemon/chansey/data.json | 2 +- res/pokemon/charizard/data.json | 2 +- res/pokemon/charmander/data.json | 2 +- res/pokemon/charmeleon/data.json | 2 +- res/pokemon/chatot/data.json | 2 +- res/pokemon/cherrim/data.json | 2 +- res/pokemon/cherubi/data.json | 2 +- res/pokemon/chikorita/data.json | 2 +- res/pokemon/chimchar/data.json | 2 +- res/pokemon/chimecho/data.json | 2 +- res/pokemon/chinchou/data.json | 2 +- res/pokemon/chingling/data.json | 2 +- res/pokemon/clamperl/data.json | 2 +- res/pokemon/claydol/data.json | 2 +- res/pokemon/clefable/data.json | 2 +- res/pokemon/clefairy/data.json | 2 +- res/pokemon/cleffa/data.json | 2 +- res/pokemon/cloyster/data.json | 2 +- res/pokemon/combee/data.json | 2 +- res/pokemon/combusken/data.json | 2 +- res/pokemon/corphish/data.json | 2 +- res/pokemon/corsola/data.json | 2 +- res/pokemon/cradily/data.json | 2 +- res/pokemon/cranidos/data.json | 2 +- res/pokemon/crawdaunt/data.json | 2 +- res/pokemon/cresselia/data.json | 2 +- res/pokemon/croagunk/data.json | 2 +- res/pokemon/crobat/data.json | 2 +- res/pokemon/croconaw/data.json | 2 +- res/pokemon/cubone/data.json | 2 +- res/pokemon/cyndaquil/data.json | 2 +- res/pokemon/darkrai/data.json | 2 +- res/pokemon/delcatty/data.json | 2 +- res/pokemon/delibird/data.json | 2 +- res/pokemon/deoxys/data.json | 2 +- res/pokemon/dewgong/data.json | 2 +- res/pokemon/dialga/data.json | 2 +- res/pokemon/diglett/data.json | 2 +- res/pokemon/ditto/data.json | 2 +- res/pokemon/dodrio/data.json | 2 +- res/pokemon/doduo/data.json | 2 +- res/pokemon/donphan/data.json | 2 +- res/pokemon/dragonair/data.json | 2 +- res/pokemon/dragonite/data.json | 2 +- res/pokemon/drapion/data.json | 2 +- res/pokemon/dratini/data.json | 2 +- res/pokemon/drifblim/data.json | 2 +- res/pokemon/drifloon/data.json | 2 +- res/pokemon/drowzee/data.json | 2 +- res/pokemon/dugtrio/data.json | 2 +- res/pokemon/dunsparce/data.json | 2 +- res/pokemon/dusclops/data.json | 2 +- res/pokemon/dusknoir/data.json | 2 +- res/pokemon/duskull/data.json | 2 +- res/pokemon/dustox/data.json | 2 +- res/pokemon/eevee/data.json | 2 +- res/pokemon/ekans/data.json | 2 +- res/pokemon/electabuzz/data.json | 2 +- res/pokemon/electivire/data.json | 2 +- res/pokemon/electrike/data.json | 2 +- res/pokemon/electrode/data.json | 2 +- res/pokemon/elekid/data.json | 2 +- res/pokemon/empoleon/data.json | 2 +- res/pokemon/entei/data.json | 2 +- res/pokemon/espeon/data.json | 2 +- res/pokemon/exeggcute/data.json | 2 +- res/pokemon/exeggutor/data.json | 2 +- res/pokemon/exploud/data.json | 2 +- res/pokemon/farfetchd/data.json | 2 +- res/pokemon/fearow/data.json | 2 +- res/pokemon/feebas/data.json | 2 +- res/pokemon/feraligatr/data.json | 2 +- res/pokemon/finneon/data.json | 2 +- res/pokemon/flaaffy/data.json | 2 +- res/pokemon/flareon/data.json | 2 +- res/pokemon/floatzel/data.json | 2 +- res/pokemon/flygon/data.json | 2 +- res/pokemon/forretress/data.json | 2 +- res/pokemon/froslass/data.json | 2 +- res/pokemon/furret/data.json | 2 +- res/pokemon/gabite/data.json | 2 +- res/pokemon/gallade/data.json | 2 +- res/pokemon/garchomp/data.json | 2 +- res/pokemon/gardevoir/data.json | 2 +- res/pokemon/gastly/data.json | 2 +- res/pokemon/gastrodon/data.json | 2 +- res/pokemon/gengar/data.json | 2 +- res/pokemon/geodude/data.json | 2 +- res/pokemon/gible/data.json | 2 +- res/pokemon/girafarig/data.json | 2 +- res/pokemon/giratina/data.json | 2 +- res/pokemon/glaceon/data.json | 2 +- res/pokemon/glalie/data.json | 2 +- res/pokemon/glameow/data.json | 2 +- res/pokemon/gligar/data.json | 2 +- res/pokemon/gliscor/data.json | 2 +- res/pokemon/gloom/data.json | 2 +- res/pokemon/golbat/data.json | 2 +- res/pokemon/goldeen/data.json | 2 +- res/pokemon/golduck/data.json | 2 +- res/pokemon/golem/data.json | 2 +- res/pokemon/gorebyss/data.json | 2 +- res/pokemon/granbull/data.json | 2 +- res/pokemon/graveler/data.json | 2 +- res/pokemon/grimer/data.json | 2 +- res/pokemon/grotle/data.json | 2 +- res/pokemon/groudon/data.json | 2 +- res/pokemon/grovyle/data.json | 2 +- res/pokemon/growlithe/data.json | 2 +- res/pokemon/grumpig/data.json | 2 +- res/pokemon/gulpin/data.json | 2 +- res/pokemon/gyarados/data.json | 2 +- res/pokemon/happiny/data.json | 2 +- res/pokemon/hariyama/data.json | 2 +- res/pokemon/haunter/data.json | 2 +- res/pokemon/heatran/data.json | 2 +- res/pokemon/heracross/data.json | 2 +- res/pokemon/hippopotas/data.json | 2 +- res/pokemon/hippowdon/data.json | 2 +- res/pokemon/hitmonchan/data.json | 2 +- res/pokemon/hitmonlee/data.json | 2 +- res/pokemon/hitmontop/data.json | 2 +- res/pokemon/ho_oh/data.json | 2 +- res/pokemon/honchkrow/data.json | 2 +- res/pokemon/hoothoot/data.json | 2 +- res/pokemon/hoppip/data.json | 2 +- res/pokemon/horsea/data.json | 2 +- res/pokemon/houndoom/data.json | 2 +- res/pokemon/houndour/data.json | 2 +- res/pokemon/huntail/data.json | 2 +- res/pokemon/hypno/data.json | 2 +- res/pokemon/igglybuff/data.json | 2 +- res/pokemon/illumise/data.json | 2 +- res/pokemon/infernape/data.json | 2 +- res/pokemon/ivysaur/data.json | 2 +- res/pokemon/jigglypuff/data.json | 2 +- res/pokemon/jirachi/data.json | 2 +- res/pokemon/jolteon/data.json | 2 +- res/pokemon/jumpluff/data.json | 2 +- res/pokemon/jynx/data.json | 2 +- res/pokemon/kabuto/data.json | 2 +- res/pokemon/kabutops/data.json | 2 +- res/pokemon/kadabra/data.json | 2 +- res/pokemon/kakuna/data.json | 2 +- res/pokemon/kangaskhan/data.json | 2 +- res/pokemon/kecleon/data.json | 2 +- res/pokemon/kingdra/data.json | 2 +- res/pokemon/kingler/data.json | 2 +- res/pokemon/kirlia/data.json | 2 +- res/pokemon/koffing/data.json | 2 +- res/pokemon/krabby/data.json | 2 +- res/pokemon/kricketot/data.json | 2 +- res/pokemon/kricketune/data.json | 2 +- res/pokemon/kyogre/data.json | 2 +- res/pokemon/lairon/data.json | 2 +- res/pokemon/lanturn/data.json | 2 +- res/pokemon/lapras/data.json | 2 +- res/pokemon/larvitar/data.json | 2 +- res/pokemon/latias/data.json | 2 +- res/pokemon/latios/data.json | 2 +- res/pokemon/leafeon/data.json | 2 +- res/pokemon/ledian/data.json | 2 +- res/pokemon/ledyba/data.json | 2 +- res/pokemon/lickilicky/data.json | 2 +- res/pokemon/lickitung/data.json | 2 +- res/pokemon/lileep/data.json | 2 +- res/pokemon/linoone/data.json | 2 +- res/pokemon/lombre/data.json | 2 +- res/pokemon/lopunny/data.json | 2 +- res/pokemon/lotad/data.json | 2 +- res/pokemon/loudred/data.json | 2 +- res/pokemon/lucario/data.json | 2 +- res/pokemon/ludicolo/data.json | 2 +- res/pokemon/lugia/data.json | 2 +- res/pokemon/lumineon/data.json | 2 +- res/pokemon/lunatone/data.json | 2 +- res/pokemon/luvdisc/data.json | 2 +- res/pokemon/luxio/data.json | 2 +- res/pokemon/luxray/data.json | 2 +- res/pokemon/machamp/data.json | 2 +- res/pokemon/machoke/data.json | 2 +- res/pokemon/machop/data.json | 2 +- res/pokemon/magby/data.json | 2 +- res/pokemon/magcargo/data.json | 2 +- res/pokemon/magikarp/data.json | 2 +- res/pokemon/magmar/data.json | 2 +- res/pokemon/magmortar/data.json | 2 +- res/pokemon/magnemite/data.json | 2 +- res/pokemon/magneton/data.json | 2 +- res/pokemon/magnezone/data.json | 2 +- res/pokemon/makuhita/data.json | 2 +- res/pokemon/mamoswine/data.json | 2 +- res/pokemon/manaphy/data.json | 2 +- res/pokemon/manectric/data.json | 2 +- res/pokemon/mankey/data.json | 2 +- res/pokemon/mantine/data.json | 2 +- res/pokemon/mantyke/data.json | 2 +- res/pokemon/mareep/data.json | 2 +- res/pokemon/marill/data.json | 2 +- res/pokemon/marowak/data.json | 2 +- res/pokemon/marshtomp/data.json | 2 +- res/pokemon/masquerain/data.json | 2 +- res/pokemon/mawile/data.json | 2 +- res/pokemon/medicham/data.json | 2 +- res/pokemon/meditite/data.json | 2 +- res/pokemon/meganium/data.json | 2 +- res/pokemon/meowth/data.json | 2 +- res/pokemon/mesprit/data.json | 2 +- res/pokemon/metagross/data.json | 2 +- res/pokemon/metang/data.json | 2 +- res/pokemon/metapod/data.json | 2 +- res/pokemon/mew/data.json | 2 +- res/pokemon/mewtwo/data.json | 2 +- res/pokemon/mightyena/data.json | 2 +- res/pokemon/milotic/data.json | 2 +- res/pokemon/miltank/data.json | 2 +- res/pokemon/mime_jr/data.json | 2 +- res/pokemon/minun/data.json | 2 +- res/pokemon/misdreavus/data.json | 2 +- res/pokemon/mismagius/data.json | 2 +- res/pokemon/moltres/data.json | 2 +- res/pokemon/monferno/data.json | 2 +- res/pokemon/mothim/data.json | 2 +- res/pokemon/mr_mime/data.json | 2 +- res/pokemon/mudkip/data.json | 2 +- res/pokemon/muk/data.json | 2 +- res/pokemon/munchlax/data.json | 2 +- res/pokemon/murkrow/data.json | 2 +- res/pokemon/natu/data.json | 2 +- res/pokemon/nidoking/data.json | 2 +- res/pokemon/nidoqueen/data.json | 2 +- res/pokemon/nidoran_f/data.json | 2 +- res/pokemon/nidoran_m/data.json | 2 +- res/pokemon/nidorina/data.json | 2 +- res/pokemon/nidorino/data.json | 2 +- res/pokemon/nincada/data.json | 2 +- res/pokemon/ninetales/data.json | 2 +- res/pokemon/ninjask/data.json | 2 +- res/pokemon/noctowl/data.json | 2 +- res/pokemon/nosepass/data.json | 2 +- res/pokemon/numel/data.json | 2 +- res/pokemon/nuzleaf/data.json | 2 +- res/pokemon/octillery/data.json | 2 +- res/pokemon/oddish/data.json | 2 +- res/pokemon/omanyte/data.json | 2 +- res/pokemon/omastar/data.json | 2 +- res/pokemon/onix/data.json | 2 +- res/pokemon/pachirisu/data.json | 2 +- res/pokemon/palkia/data.json | 2 +- res/pokemon/paras/data.json | 2 +- res/pokemon/parasect/data.json | 2 +- res/pokemon/pelipper/data.json | 2 +- res/pokemon/persian/data.json | 2 +- res/pokemon/phanpy/data.json | 2 +- res/pokemon/phione/data.json | 2 +- res/pokemon/pichu/data.json | 2 +- res/pokemon/pidgeot/data.json | 2 +- res/pokemon/pidgeotto/data.json | 2 +- res/pokemon/pidgey/data.json | 2 +- res/pokemon/pikachu/data.json | 2 +- res/pokemon/piloswine/data.json | 2 +- res/pokemon/pineco/data.json | 2 +- res/pokemon/pinsir/data.json | 2 +- res/pokemon/piplup/data.json | 2 +- res/pokemon/plusle/data.json | 2 +- res/pokemon/politoed/data.json | 2 +- res/pokemon/poliwag/data.json | 2 +- res/pokemon/poliwhirl/data.json | 2 +- res/pokemon/poliwrath/data.json | 2 +- res/pokemon/ponyta/data.json | 2 +- res/pokemon/poochyena/data.json | 2 +- res/pokemon/porygon/data.json | 2 +- res/pokemon/porygon2/data.json | 2 +- res/pokemon/porygon_z/data.json | 2 +- res/pokemon/primeape/data.json | 2 +- res/pokemon/prinplup/data.json | 2 +- res/pokemon/probopass/data.json | 2 +- res/pokemon/psyduck/data.json | 2 +- res/pokemon/pupitar/data.json | 2 +- res/pokemon/purugly/data.json | 2 +- res/pokemon/quagsire/data.json | 2 +- res/pokemon/quilava/data.json | 2 +- res/pokemon/qwilfish/data.json | 2 +- res/pokemon/raichu/data.json | 2 +- res/pokemon/raikou/data.json | 2 +- res/pokemon/ralts/data.json | 2 +- res/pokemon/rampardos/data.json | 2 +- res/pokemon/rapidash/data.json | 2 +- res/pokemon/raticate/data.json | 2 +- res/pokemon/rattata/data.json | 2 +- res/pokemon/rayquaza/data.json | 2 +- res/pokemon/regice/data.json | 2 +- res/pokemon/regigigas/data.json | 2 +- res/pokemon/regirock/data.json | 2 +- res/pokemon/registeel/data.json | 2 +- res/pokemon/relicanth/data.json | 2 +- res/pokemon/remoraid/data.json | 2 +- res/pokemon/rhydon/data.json | 2 +- res/pokemon/rhyhorn/data.json | 2 +- res/pokemon/rhyperior/data.json | 2 +- res/pokemon/riolu/data.json | 2 +- res/pokemon/roselia/data.json | 2 +- res/pokemon/roserade/data.json | 2 +- res/pokemon/rotom/data.json | 2 +- res/pokemon/sableye/data.json | 2 +- res/pokemon/salamence/data.json | 2 +- res/pokemon/sandshrew/data.json | 2 +- res/pokemon/sandslash/data.json | 2 +- res/pokemon/sceptile/data.json | 2 +- res/pokemon/scizor/data.json | 2 +- res/pokemon/scyther/data.json | 2 +- res/pokemon/seadra/data.json | 2 +- res/pokemon/seaking/data.json | 2 +- res/pokemon/sealeo/data.json | 2 +- res/pokemon/seedot/data.json | 2 +- res/pokemon/seel/data.json | 2 +- res/pokemon/sentret/data.json | 2 +- res/pokemon/seviper/data.json | 2 +- res/pokemon/sharpedo/data.json | 2 +- res/pokemon/shaymin/data.json | 2 +- res/pokemon/shedinja/data.json | 2 +- res/pokemon/shelgon/data.json | 2 +- res/pokemon/shellder/data.json | 2 +- res/pokemon/shellos/data.json | 2 +- res/pokemon/shieldon/data.json | 2 +- res/pokemon/shiftry/data.json | 2 +- res/pokemon/shinx/data.json | 2 +- res/pokemon/shroomish/data.json | 2 +- res/pokemon/shuckle/data.json | 2 +- res/pokemon/shuppet/data.json | 2 +- res/pokemon/silcoon/data.json | 2 +- res/pokemon/skarmory/data.json | 2 +- res/pokemon/skiploom/data.json | 2 +- res/pokemon/skitty/data.json | 2 +- res/pokemon/skorupi/data.json | 2 +- res/pokemon/skuntank/data.json | 2 +- res/pokemon/slaking/data.json | 2 +- res/pokemon/slakoth/data.json | 2 +- res/pokemon/slowbro/data.json | 2 +- res/pokemon/slowking/data.json | 2 +- res/pokemon/slowpoke/data.json | 2 +- res/pokemon/slugma/data.json | 2 +- res/pokemon/smeargle/data.json | 2 +- res/pokemon/smoochum/data.json | 2 +- res/pokemon/sneasel/data.json | 2 +- res/pokemon/snorlax/data.json | 2 +- res/pokemon/snorunt/data.json | 2 +- res/pokemon/snover/data.json | 2 +- res/pokemon/snubbull/data.json | 2 +- res/pokemon/solrock/data.json | 2 +- res/pokemon/spearow/data.json | 2 +- res/pokemon/spheal/data.json | 2 +- res/pokemon/spinarak/data.json | 2 +- res/pokemon/spinda/data.json | 2 +- res/pokemon/spiritomb/data.json | 2 +- res/pokemon/spoink/data.json | 2 +- res/pokemon/squirtle/data.json | 2 +- res/pokemon/stantler/data.json | 2 +- res/pokemon/staraptor/data.json | 2 +- res/pokemon/staravia/data.json | 2 +- res/pokemon/starly/data.json | 2 +- res/pokemon/starmie/data.json | 2 +- res/pokemon/staryu/data.json | 2 +- res/pokemon/steelix/data.json | 2 +- res/pokemon/stunky/data.json | 2 +- res/pokemon/sudowoodo/data.json | 2 +- res/pokemon/suicune/data.json | 2 +- res/pokemon/sunflora/data.json | 2 +- res/pokemon/sunkern/data.json | 2 +- res/pokemon/surskit/data.json | 2 +- res/pokemon/swablu/data.json | 2 +- res/pokemon/swalot/data.json | 2 +- res/pokemon/swampert/data.json | 2 +- res/pokemon/swellow/data.json | 2 +- res/pokemon/swinub/data.json | 2 +- res/pokemon/taillow/data.json | 2 +- res/pokemon/tangela/data.json | 2 +- res/pokemon/tangrowth/data.json | 2 +- res/pokemon/tauros/data.json | 2 +- res/pokemon/teddiursa/data.json | 2 +- res/pokemon/tentacool/data.json | 2 +- res/pokemon/tentacruel/data.json | 2 +- res/pokemon/togekiss/data.json | 2 +- res/pokemon/togepi/data.json | 2 +- res/pokemon/togetic/data.json | 2 +- res/pokemon/torchic/data.json | 2 +- res/pokemon/torkoal/data.json | 2 +- res/pokemon/torterra/data.json | 2 +- res/pokemon/totodile/data.json | 2 +- res/pokemon/toxicroak/data.json | 2 +- res/pokemon/trapinch/data.json | 2 +- res/pokemon/treecko/data.json | 2 +- res/pokemon/tropius/data.json | 2 +- res/pokemon/turtwig/data.json | 2 +- res/pokemon/typhlosion/data.json | 2 +- res/pokemon/tyranitar/data.json | 2 +- res/pokemon/tyrogue/data.json | 2 +- res/pokemon/umbreon/data.json | 2 +- res/pokemon/unown/data.json | 2 +- res/pokemon/ursaring/data.json | 2 +- res/pokemon/uxie/data.json | 2 +- res/pokemon/vaporeon/data.json | 2 +- res/pokemon/venomoth/data.json | 2 +- res/pokemon/venonat/data.json | 2 +- res/pokemon/venusaur/data.json | 2 +- res/pokemon/vespiquen/data.json | 2 +- res/pokemon/vibrava/data.json | 2 +- res/pokemon/victreebel/data.json | 2 +- res/pokemon/vigoroth/data.json | 2 +- res/pokemon/vileplume/data.json | 2 +- res/pokemon/volbeat/data.json | 2 +- res/pokemon/voltorb/data.json | 2 +- res/pokemon/vulpix/data.json | 2 +- res/pokemon/wailmer/data.json | 2 +- res/pokemon/wailord/data.json | 2 +- res/pokemon/walrein/data.json | 2 +- res/pokemon/wartortle/data.json | 2 +- res/pokemon/weavile/data.json | 2 +- res/pokemon/weedle/data.json | 2 +- res/pokemon/weepinbell/data.json | 2 +- res/pokemon/weezing/data.json | 2 +- res/pokemon/whiscash/data.json | 2 +- res/pokemon/whismur/data.json | 2 +- res/pokemon/wigglytuff/data.json | 2 +- res/pokemon/wingull/data.json | 2 +- res/pokemon/wobbuffet/data.json | 2 +- res/pokemon/wooper/data.json | 2 +- res/pokemon/wormadam/data.json | 2 +- res/pokemon/wurmple/data.json | 2 +- res/pokemon/wynaut/data.json | 2 +- res/pokemon/xatu/data.json | 2 +- res/pokemon/yanma/data.json | 2 +- res/pokemon/yanmega/data.json | 2 +- res/pokemon/zangoose/data.json | 2 +- res/pokemon/zapdos/data.json | 2 +- res/pokemon/zigzagoon/data.json | 2 +- res/pokemon/zubat/data.json | 2 +- src/catching_show.c | 9 +++++---- 495 files changed, 507 insertions(+), 499 deletions(-) diff --git a/consts/catching_show.json b/consts/catching_show.json index bdb5cb8383..e10c87f2ac 100644 --- a/consts/catching_show.json +++ b/consts/catching_show.json @@ -9,14 +9,21 @@ "CATCHING_SHOW_TOTAL_POINTS" ] }, - "@PalParkArea": { + "@PalParkLandArea": { "type": "enum", "values": [ - "PAL_PARK_AREA_NONE", + "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", diff --git a/res/pokemon/abomasnow/data.json b/res/pokemon/abomasnow/data.json index 9810add64f..4cc926c569 100644 --- a/res/pokemon/abomasnow/data.json +++ b/res/pokemon/abomasnow/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2063 diff --git a/res/pokemon/abra/data.json b/res/pokemon/abra/data.json index 7c5f647c4c..1d05fc251b 100644 --- a/res/pokemon/abra/data.json +++ b/res/pokemon/abra/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2570 diff --git a/res/pokemon/absol/data.json b/res/pokemon/absol/data.json index 9cfecb603f..d22b137d4e 100644 --- a/res/pokemon/absol/data.json +++ b/res/pokemon/absol/data.json @@ -159,7 +159,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4112 diff --git a/res/pokemon/aerodactyl/data.json b/res/pokemon/aerodactyl/data.json index c64d522df2..064e766b34 100644 --- a/res/pokemon/aerodactyl/data.json +++ b/res/pokemon/aerodactyl/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4363 diff --git a/res/pokemon/aggron/data.json b/res/pokemon/aggron/data.json index 79d2940e99..af5a1b5d4c 100644 --- a/res/pokemon/aggron/data.json +++ b/res/pokemon/aggron/data.json @@ -168,7 +168,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2830 diff --git a/res/pokemon/aipom/data.json b/res/pokemon/aipom/data.json index 112ad41562..758357b249 100644 --- a/res/pokemon/aipom/data.json +++ b/res/pokemon/aipom/data.json @@ -151,7 +151,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/alakazam/data.json b/res/pokemon/alakazam/data.json index e6d9ce3420..b84e5e0b96 100644 --- a/res/pokemon/alakazam/data.json +++ b/res/pokemon/alakazam/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 diff --git a/res/pokemon/altaria/data.json b/res/pokemon/altaria/data.json index f2b3426487..6d8eedf568 100644 --- a/res/pokemon/altaria/data.json +++ b/res/pokemon/altaria/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4367 diff --git a/res/pokemon/ambipom/data.json b/res/pokemon/ambipom/data.json index e5d0c501d0..b5ca33c90a 100644 --- a/res/pokemon/ambipom/data.json +++ b/res/pokemon/ambipom/data.json @@ -147,7 +147,7 @@ "category": "Long Tail Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/ampharos/data.json b/res/pokemon/ampharos/data.json index 0c132de005..18d43e32fc 100644 --- a/res/pokemon/ampharos/data.json +++ b/res/pokemon/ampharos/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 diff --git a/res/pokemon/anorith/data.json b/res/pokemon/anorith/data.json index 962ac0da7b..75e52de76b 100644 --- a/res/pokemon/anorith/data.json +++ b/res/pokemon/anorith/data.json @@ -130,7 +130,7 @@ "category": "Old Shrimp Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/arbok/data.json b/res/pokemon/arbok/data.json index b671e913b2..607884bd7f 100644 --- a/res/pokemon/arbok/data.json +++ b/res/pokemon/arbok/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 diff --git a/res/pokemon/arcanine/data.json b/res/pokemon/arcanine/data.json index 336d25c3ca..e312fbd176 100644 --- a/res/pokemon/arcanine/data.json +++ b/res/pokemon/arcanine/data.json @@ -119,7 +119,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 diff --git a/res/pokemon/arceus/data.json b/res/pokemon/arceus/data.json index fcaf694b23..742beb9bb8 100644 --- a/res/pokemon/arceus/data.json +++ b/res/pokemon/arceus/data.json @@ -186,7 +186,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 1285 diff --git a/res/pokemon/ariados/data.json b/res/pokemon/ariados/data.json index 1512d6077f..c10895a126 100644 --- a/res/pokemon/ariados/data.json +++ b/res/pokemon/ariados/data.json @@ -121,7 +121,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1540 diff --git a/res/pokemon/armaldo/data.json b/res/pokemon/armaldo/data.json index 75ee2bdf0e..f3ed48ccfa 100644 --- a/res/pokemon/armaldo/data.json +++ b/res/pokemon/armaldo/data.json @@ -134,7 +134,7 @@ "category": "Plate Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/aron/data.json b/res/pokemon/aron/data.json index a329f6a319..6c14cb1d77 100644 --- a/res/pokemon/aron/data.json +++ b/res/pokemon/aron/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2830 diff --git a/res/pokemon/articuno/data.json b/res/pokemon/articuno/data.json index 8bb24067b2..35c24f4d61 100644 --- a/res/pokemon/articuno/data.json +++ b/res/pokemon/articuno/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4365 diff --git a/res/pokemon/azelf/data.json b/res/pokemon/azelf/data.json index f84aee5b6f..738955ba86 100644 --- a/res/pokemon/azelf/data.json +++ b/res/pokemon/azelf/data.json @@ -148,7 +148,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/azumarill/data.json b/res/pokemon/azumarill/data.json index 61b7ba3b39..e84eb4e14d 100644 --- a/res/pokemon/azumarill/data.json +++ b/res/pokemon/azumarill/data.json @@ -132,7 +132,7 @@ "category": "Aqua Rabbit Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/azurill/data.json b/res/pokemon/azurill/data.json index bc19b4c8b7..39f7fe60ea 100644 --- a/res/pokemon/azurill/data.json +++ b/res/pokemon/azurill/data.json @@ -115,7 +115,7 @@ "category": "Polka Dot Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/bagon/data.json b/res/pokemon/bagon/data.json index 942823f96b..9f9e86a972 100644 --- a/res/pokemon/bagon/data.json +++ b/res/pokemon/bagon/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3855 diff --git a/res/pokemon/baltoy/data.json b/res/pokemon/baltoy/data.json index e6355ebfbb..73cc826827 100644 --- a/res/pokemon/baltoy/data.json +++ b/res/pokemon/baltoy/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2568 diff --git a/res/pokemon/banette/data.json b/res/pokemon/banette/data.json index 3d88e51015..47d896f456 100644 --- a/res/pokemon/banette/data.json +++ b/res/pokemon/banette/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3084 diff --git a/res/pokemon/barboach/data.json b/res/pokemon/barboach/data.json index acba331ec2..469181a5bd 100644 --- a/res/pokemon/barboach/data.json +++ b/res/pokemon/barboach/data.json @@ -129,7 +129,7 @@ "category": "Whiskers Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/bastiodon/data.json b/res/pokemon/bastiodon/data.json index 1081662e76..8cd1cd9def 100644 --- a/res/pokemon/bastiodon/data.json +++ b/res/pokemon/bastiodon/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2827 diff --git a/res/pokemon/bayleef/data.json b/res/pokemon/bayleef/data.json index 056e14accf..218402a208 100644 --- a/res/pokemon/bayleef/data.json +++ b/res/pokemon/bayleef/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 diff --git a/res/pokemon/beautifly/data.json b/res/pokemon/beautifly/data.json index b2301b461a..1ba42ab766 100644 --- a/res/pokemon/beautifly/data.json +++ b/res/pokemon/beautifly/data.json @@ -121,7 +121,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 diff --git a/res/pokemon/beedrill/data.json b/res/pokemon/beedrill/data.json index 71f03efe00..ccf41a8156 100644 --- a/res/pokemon/beedrill/data.json +++ b/res/pokemon/beedrill/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1540 diff --git a/res/pokemon/beldum/data.json b/res/pokemon/beldum/data.json index d8d4b6d154..4772de1284 100644 --- a/res/pokemon/beldum/data.json +++ b/res/pokemon/beldum/data.json @@ -82,7 +82,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2574 diff --git a/res/pokemon/bellossom/data.json b/res/pokemon/bellossom/data.json index f5c4c29dc3..36c48bf72b 100644 --- a/res/pokemon/bellossom/data.json +++ b/res/pokemon/bellossom/data.json @@ -117,7 +117,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 diff --git a/res/pokemon/bellsprout/data.json b/res/pokemon/bellsprout/data.json index d86edb96a7..e4cc50e284 100644 --- a/res/pokemon/bellsprout/data.json +++ b/res/pokemon/bellsprout/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1537 diff --git a/res/pokemon/bibarel/data.json b/res/pokemon/bibarel/data.json index 562fb20363..99ebb8ef54 100644 --- a/res/pokemon/bibarel/data.json +++ b/res/pokemon/bibarel/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 773 diff --git a/res/pokemon/bidoof/data.json b/res/pokemon/bidoof/data.json index e800194335..a1dcc9e615 100644 --- a/res/pokemon/bidoof/data.json +++ b/res/pokemon/bidoof/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1285 diff --git a/res/pokemon/blastoise/data.json b/res/pokemon/blastoise/data.json index a08a04a8cf..418733cf16 100644 --- a/res/pokemon/blastoise/data.json +++ b/res/pokemon/blastoise/data.json @@ -144,7 +144,7 @@ "category": "Shellfish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/blaziken/data.json b/res/pokemon/blaziken/data.json index 6bf183c8b3..614f9f0e96 100644 --- a/res/pokemon/blaziken/data.json +++ b/res/pokemon/blaziken/data.json @@ -147,7 +147,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2306 diff --git a/res/pokemon/blissey/data.json b/res/pokemon/blissey/data.json index e709104e05..0eed852761 100644 --- a/res/pokemon/blissey/data.json +++ b/res/pokemon/blissey/data.json @@ -158,7 +158,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/bonsly/data.json b/res/pokemon/bonsly/data.json index c797e462ec..8e84a3056d 100644 --- a/res/pokemon/bonsly/data.json +++ b/res/pokemon/bonsly/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/breloom/data.json b/res/pokemon/breloom/data.json index c5100e79c9..4d1e016124 100644 --- a/res/pokemon/breloom/data.json +++ b/res/pokemon/breloom/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2305 diff --git a/res/pokemon/bronzong/data.json b/res/pokemon/bronzong/data.json index 8422ef81cd..381d6f0c33 100644 --- a/res/pokemon/bronzong/data.json +++ b/res/pokemon/bronzong/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2827 diff --git a/res/pokemon/bronzor/data.json b/res/pokemon/bronzor/data.json index 1e581b1c73..1cb68700fc 100644 --- a/res/pokemon/bronzor/data.json +++ b/res/pokemon/bronzor/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2574 diff --git a/res/pokemon/budew/data.json b/res/pokemon/budew/data.json index 81ad304d3a..1206a0d940 100644 --- a/res/pokemon/budew/data.json +++ b/res/pokemon/budew/data.json @@ -119,7 +119,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1537 diff --git a/res/pokemon/buizel/data.json b/res/pokemon/buizel/data.json index 6c2df5178c..850250589a 100644 --- a/res/pokemon/buizel/data.json +++ b/res/pokemon/buizel/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 257 diff --git a/res/pokemon/bulbasaur/data.json b/res/pokemon/bulbasaur/data.json index 406db83801..b1d88da784 100644 --- a/res/pokemon/bulbasaur/data.json +++ b/res/pokemon/bulbasaur/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1537 diff --git a/res/pokemon/buneary/data.json b/res/pokemon/buneary/data.json index aab849b229..002f4546b0 100644 --- a/res/pokemon/buneary/data.json +++ b/res/pokemon/buneary/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/burmy/data.json b/res/pokemon/burmy/data.json index ac97a3fb1a..ed0c1f4e61 100644 --- a/res/pokemon/burmy/data.json +++ b/res/pokemon/burmy/data.json @@ -88,7 +88,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 diff --git a/res/pokemon/butterfree/data.json b/res/pokemon/butterfree/data.json index ff60adab38..0775dd9257 100644 --- a/res/pokemon/butterfree/data.json +++ b/res/pokemon/butterfree/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 diff --git a/res/pokemon/cacnea/data.json b/res/pokemon/cacnea/data.json index fe97212430..18fe2f80a7 100644 --- a/res/pokemon/cacnea/data.json +++ b/res/pokemon/cacnea/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 diff --git a/res/pokemon/cacturne/data.json b/res/pokemon/cacturne/data.json index f284441679..4e914bb537 100644 --- a/res/pokemon/cacturne/data.json +++ b/res/pokemon/cacturne/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4097 diff --git a/res/pokemon/camerupt/data.json b/res/pokemon/camerupt/data.json index 5ef5cc0853..5f76ff4b70 100644 --- a/res/pokemon/camerupt/data.json +++ b/res/pokemon/camerupt/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2050 diff --git a/res/pokemon/carnivine/data.json b/res/pokemon/carnivine/data.json index a2bf5e9826..a05f43460d 100644 --- a/res/pokemon/carnivine/data.json +++ b/res/pokemon/carnivine/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3329 diff --git a/res/pokemon/carvanha/data.json b/res/pokemon/carvanha/data.json index 8371d71c48..119efd6977 100644 --- a/res/pokemon/carvanha/data.json +++ b/res/pokemon/carvanha/data.json @@ -133,7 +133,7 @@ "category": "Savage Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/cascoon/data.json b/res/pokemon/cascoon/data.json index 68ec0937e8..ee13edfaf0 100644 --- a/res/pokemon/cascoon/data.json +++ b/res/pokemon/cascoon/data.json @@ -81,7 +81,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 diff --git a/res/pokemon/castform/data.json b/res/pokemon/castform/data.json index f5822814db..e6b930a5a4 100644 --- a/res/pokemon/castform/data.json +++ b/res/pokemon/castform/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/caterpie/data.json b/res/pokemon/caterpie/data.json index cf1ae8aa35..6e5dd4e515 100644 --- a/res/pokemon/caterpie/data.json +++ b/res/pokemon/caterpie/data.json @@ -84,7 +84,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1028 diff --git a/res/pokemon/celebi/data.json b/res/pokemon/celebi/data.json index d5b9b5b8df..21b73a4611 100644 --- a/res/pokemon/celebi/data.json +++ b/res/pokemon/celebi/data.json @@ -147,7 +147,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 266 diff --git a/res/pokemon/chansey/data.json b/res/pokemon/chansey/data.json index 3e56cb4a95..6352adb0e0 100644 --- a/res/pokemon/chansey/data.json +++ b/res/pokemon/chansey/data.json @@ -162,7 +162,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/charizard/data.json b/res/pokemon/charizard/data.json index dc791cb1a6..e516b71c79 100644 --- a/res/pokemon/charizard/data.json +++ b/res/pokemon/charizard/data.json @@ -149,7 +149,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4354 diff --git a/res/pokemon/charmander/data.json b/res/pokemon/charmander/data.json index cfe6eed340..6a55f5669c 100644 --- a/res/pokemon/charmander/data.json +++ b/res/pokemon/charmander/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 diff --git a/res/pokemon/charmeleon/data.json b/res/pokemon/charmeleon/data.json index be06450651..51942c94e3 100644 --- a/res/pokemon/charmeleon/data.json +++ b/res/pokemon/charmeleon/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 diff --git a/res/pokemon/chatot/data.json b/res/pokemon/chatot/data.json index ff9ebfc1b8..39a3a87c1a 100644 --- a/res/pokemon/chatot/data.json +++ b/res/pokemon/chatot/data.json @@ -120,7 +120,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/cherrim/data.json b/res/pokemon/cherrim/data.json index c4e382227f..75ffde7d26 100644 --- a/res/pokemon/cherrim/data.json +++ b/res/pokemon/cherrim/data.json @@ -118,7 +118,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 diff --git a/res/pokemon/cherubi/data.json b/res/pokemon/cherubi/data.json index f40a6f936b..cca0d1960a 100644 --- a/res/pokemon/cherubi/data.json +++ b/res/pokemon/cherubi/data.json @@ -119,7 +119,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4364 diff --git a/res/pokemon/chikorita/data.json b/res/pokemon/chikorita/data.json index bdf02bc433..762dc87a21 100644 --- a/res/pokemon/chikorita/data.json +++ b/res/pokemon/chikorita/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 diff --git a/res/pokemon/chimchar/data.json b/res/pokemon/chimchar/data.json index 588280ea36..a219c7be73 100644 --- a/res/pokemon/chimchar/data.json +++ b/res/pokemon/chimchar/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 diff --git a/res/pokemon/chimecho/data.json b/res/pokemon/chimecho/data.json index e678742e81..9c22ee704e 100644 --- a/res/pokemon/chimecho/data.json +++ b/res/pokemon/chimecho/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 diff --git a/res/pokemon/chinchou/data.json b/res/pokemon/chinchou/data.json index 8bb43cfe00..fbf1714e08 100644 --- a/res/pokemon/chinchou/data.json +++ b/res/pokemon/chinchou/data.json @@ -130,7 +130,7 @@ "category": "Angler Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/chingling/data.json b/res/pokemon/chingling/data.json index d939028301..4f07386a62 100644 --- a/res/pokemon/chingling/data.json +++ b/res/pokemon/chingling/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1297 diff --git a/res/pokemon/clamperl/data.json b/res/pokemon/clamperl/data.json index 0afcb44d80..8f18bf8e79 100644 --- a/res/pokemon/clamperl/data.json +++ b/res/pokemon/clamperl/data.json @@ -117,7 +117,7 @@ "category": "Bivalve Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/claydol/data.json b/res/pokemon/claydol/data.json index 5c8986326b..bc462a146a 100644 --- a/res/pokemon/claydol/data.json +++ b/res/pokemon/claydol/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2568 diff --git a/res/pokemon/clefable/data.json b/res/pokemon/clefable/data.json index 13df12961b..2e8dd6f273 100644 --- a/res/pokemon/clefable/data.json +++ b/res/pokemon/clefable/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/clefairy/data.json b/res/pokemon/clefairy/data.json index 90ac800d94..5dfba4aa80 100644 --- a/res/pokemon/clefairy/data.json +++ b/res/pokemon/clefairy/data.json @@ -163,7 +163,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/cleffa/data.json b/res/pokemon/cleffa/data.json index a2d09e603b..1674769b46 100644 --- a/res/pokemon/cleffa/data.json +++ b/res/pokemon/cleffa/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/cloyster/data.json b/res/pokemon/cloyster/data.json index 236ddc85f8..a75bd214b7 100644 --- a/res/pokemon/cloyster/data.json +++ b/res/pokemon/cloyster/data.json @@ -116,7 +116,7 @@ "category": "Bivalve Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/combee/data.json b/res/pokemon/combee/data.json index 85fdbd93a9..64a5e21186 100644 --- a/res/pokemon/combee/data.json +++ b/res/pokemon/combee/data.json @@ -89,7 +89,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4356 diff --git a/res/pokemon/combusken/data.json b/res/pokemon/combusken/data.json index 12ad0ae9fc..ef034a7a73 100644 --- a/res/pokemon/combusken/data.json +++ b/res/pokemon/combusken/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2306 diff --git a/res/pokemon/corphish/data.json b/res/pokemon/corphish/data.json index 566b05b1fe..8a6f938307 100644 --- a/res/pokemon/corphish/data.json +++ b/res/pokemon/corphish/data.json @@ -139,7 +139,7 @@ "category": "Ruffian Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/corsola/data.json b/res/pokemon/corsola/data.json index 5f4a889900..73f86003fa 100644 --- a/res/pokemon/corsola/data.json +++ b/res/pokemon/corsola/data.json @@ -134,7 +134,7 @@ "category": "Coral Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/cradily/data.json b/res/pokemon/cradily/data.json index e6b1040db1..9ed0edd264 100644 --- a/res/pokemon/cradily/data.json +++ b/res/pokemon/cradily/data.json @@ -133,7 +133,7 @@ "category": "Barnacle Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/cranidos/data.json b/res/pokemon/cranidos/data.json index a69c367f9c..6dbaa5560d 100644 --- a/res/pokemon/cranidos/data.json +++ b/res/pokemon/cranidos/data.json @@ -147,7 +147,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3595 diff --git a/res/pokemon/crawdaunt/data.json b/res/pokemon/crawdaunt/data.json index 2183a5707f..f7574c49a7 100644 --- a/res/pokemon/crawdaunt/data.json +++ b/res/pokemon/crawdaunt/data.json @@ -144,7 +144,7 @@ "category": "Rogue Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/cresselia/data.json b/res/pokemon/cresselia/data.json index 8b3e684997..db2a52a85d 100644 --- a/res/pokemon/cresselia/data.json +++ b/res/pokemon/cresselia/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 diff --git a/res/pokemon/croagunk/data.json b/res/pokemon/croagunk/data.json index b9985eb19d..2ab6ea9ce0 100644 --- a/res/pokemon/croagunk/data.json +++ b/res/pokemon/croagunk/data.json @@ -147,7 +147,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4108 diff --git a/res/pokemon/crobat/data.json b/res/pokemon/crobat/data.json index 4f5d49a7af..2bcb126992 100644 --- a/res/pokemon/crobat/data.json +++ b/res/pokemon/crobat/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4358 diff --git a/res/pokemon/croconaw/data.json b/res/pokemon/croconaw/data.json index 5dfffa4115..398cede217 100644 --- a/res/pokemon/croconaw/data.json +++ b/res/pokemon/croconaw/data.json @@ -143,7 +143,7 @@ "category": "Big Jaw Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/cubone/data.json b/res/pokemon/cubone/data.json index 13473660fb..ee02d2ee81 100644 --- a/res/pokemon/cubone/data.json +++ b/res/pokemon/cubone/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 diff --git a/res/pokemon/cyndaquil/data.json b/res/pokemon/cyndaquil/data.json index ae8f87b85d..987e8f4f02 100644 --- a/res/pokemon/cyndaquil/data.json +++ b/res/pokemon/cyndaquil/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 diff --git a/res/pokemon/darkrai/data.json b/res/pokemon/darkrai/data.json index 187884fac4..3314b67bf1 100644 --- a/res/pokemon/darkrai/data.json +++ b/res/pokemon/darkrai/data.json @@ -152,7 +152,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 3600 diff --git a/res/pokemon/delcatty/data.json b/res/pokemon/delcatty/data.json index 1ca41ffffe..ca053f833f 100644 --- a/res/pokemon/delcatty/data.json +++ b/res/pokemon/delcatty/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/delibird/data.json b/res/pokemon/delibird/data.json index ed91ebee93..44de8b5510 100644 --- a/res/pokemon/delibird/data.json +++ b/res/pokemon/delibird/data.json @@ -112,7 +112,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4365 diff --git a/res/pokemon/deoxys/data.json b/res/pokemon/deoxys/data.json index d34082e109..a19887308e 100644 --- a/res/pokemon/deoxys/data.json +++ b/res/pokemon/deoxys/data.json @@ -157,7 +157,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 2570 diff --git a/res/pokemon/dewgong/data.json b/res/pokemon/dewgong/data.json index a32cbedb12..3b4def45ce 100644 --- a/res/pokemon/dewgong/data.json +++ b/res/pokemon/dewgong/data.json @@ -128,7 +128,7 @@ "category": "Sea Lion Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/dialga/data.json b/res/pokemon/dialga/data.json index 8de4c018f2..dce7c94a31 100644 --- a/res/pokemon/dialga/data.json +++ b/res/pokemon/dialga/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3854 diff --git a/res/pokemon/diglett/data.json b/res/pokemon/diglett/data.json index abf61ad688..a3398f72c2 100644 --- a/res/pokemon/diglett/data.json +++ b/res/pokemon/diglett/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 2056 diff --git a/res/pokemon/ditto/data.json b/res/pokemon/ditto/data.json index c337b61e37..80b92946f4 100644 --- a/res/pokemon/ditto/data.json +++ b/res/pokemon/ditto/data.json @@ -71,7 +71,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/dodrio/data.json b/res/pokemon/dodrio/data.json index c20cccdc77..200fc461b1 100644 --- a/res/pokemon/dodrio/data.json +++ b/res/pokemon/dodrio/data.json @@ -124,7 +124,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4357 diff --git a/res/pokemon/doduo/data.json b/res/pokemon/doduo/data.json index 3406f0194d..2819181032 100644 --- a/res/pokemon/doduo/data.json +++ b/res/pokemon/doduo/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 diff --git a/res/pokemon/donphan/data.json b/res/pokemon/donphan/data.json index b125fc71a0..cda35dea1b 100644 --- a/res/pokemon/donphan/data.json +++ b/res/pokemon/donphan/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2056 diff --git a/res/pokemon/dragonair/data.json b/res/pokemon/dragonair/data.json index e93c41dad6..8e12610802 100644 --- a/res/pokemon/dragonair/data.json +++ b/res/pokemon/dragonair/data.json @@ -135,7 +135,7 @@ "category": "Dragon Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/dragonite/data.json b/res/pokemon/dragonite/data.json index 7b81dd883a..2b2996595e 100644 --- a/res/pokemon/dragonite/data.json +++ b/res/pokemon/dragonite/data.json @@ -164,7 +164,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4367 diff --git a/res/pokemon/drapion/data.json b/res/pokemon/drapion/data.json index bbd1366449..0c7d5f5193 100644 --- a/res/pokemon/drapion/data.json +++ b/res/pokemon/drapion/data.json @@ -139,7 +139,7 @@ "category": "Ogre Scorp Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/dratini/data.json b/res/pokemon/dratini/data.json index 144a72f4c5..15653d52bc 100644 --- a/res/pokemon/dratini/data.json +++ b/res/pokemon/dratini/data.json @@ -133,7 +133,7 @@ "category": "Dragon Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/drifblim/data.json b/res/pokemon/drifblim/data.json index 42004ff3c3..a578445949 100644 --- a/res/pokemon/drifblim/data.json +++ b/res/pokemon/drifblim/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/drifloon/data.json b/res/pokemon/drifloon/data.json index 50ea6ff3cb..69a650cfc5 100644 --- a/res/pokemon/drifloon/data.json +++ b/res/pokemon/drifloon/data.json @@ -146,7 +146,7 @@ "category": "Balloon Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/drowzee/data.json b/res/pokemon/drowzee/data.json index b8149a99bd..950ace0f72 100644 --- a/res/pokemon/drowzee/data.json +++ b/res/pokemon/drowzee/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2570 diff --git a/res/pokemon/dugtrio/data.json b/res/pokemon/dugtrio/data.json index 022d231a4c..4fe2502eec 100644 --- a/res/pokemon/dugtrio/data.json +++ b/res/pokemon/dugtrio/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 diff --git a/res/pokemon/dunsparce/data.json b/res/pokemon/dunsparce/data.json index cf5651ed68..d75a87aca9 100644 --- a/res/pokemon/dunsparce/data.json +++ b/res/pokemon/dunsparce/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/dusclops/data.json b/res/pokemon/dusclops/data.json index c62a6360d0..a601e70bf2 100644 --- a/res/pokemon/dusclops/data.json +++ b/res/pokemon/dusclops/data.json @@ -158,7 +158,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3084 diff --git a/res/pokemon/dusknoir/data.json b/res/pokemon/dusknoir/data.json index 316f737184..e179a2d76c 100644 --- a/res/pokemon/dusknoir/data.json +++ b/res/pokemon/dusknoir/data.json @@ -152,7 +152,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3084 diff --git a/res/pokemon/duskull/data.json b/res/pokemon/duskull/data.json index bcde067f7f..ac1917213e 100644 --- a/res/pokemon/duskull/data.json +++ b/res/pokemon/duskull/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3084 diff --git a/res/pokemon/dustox/data.json b/res/pokemon/dustox/data.json index 42747040f8..6128127278 100644 --- a/res/pokemon/dustox/data.json +++ b/res/pokemon/dustox/data.json @@ -122,7 +122,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1540 diff --git a/res/pokemon/eevee/data.json b/res/pokemon/eevee/data.json index 9026b929ea..dc6d032322 100644 --- a/res/pokemon/eevee/data.json +++ b/res/pokemon/eevee/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/ekans/data.json b/res/pokemon/ekans/data.json index d594880db7..997b5de794 100644 --- a/res/pokemon/ekans/data.json +++ b/res/pokemon/ekans/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1542 diff --git a/res/pokemon/electabuzz/data.json b/res/pokemon/electabuzz/data.json index b60466c2a0..0323f11731 100644 --- a/res/pokemon/electabuzz/data.json +++ b/res/pokemon/electabuzz/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 diff --git a/res/pokemon/electivire/data.json b/res/pokemon/electivire/data.json index 61a993bd6e..83218ba307 100644 --- a/res/pokemon/electivire/data.json +++ b/res/pokemon/electivire/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 diff --git a/res/pokemon/electrike/data.json b/res/pokemon/electrike/data.json index e91b2445a2..0aa1f37923 100644 --- a/res/pokemon/electrike/data.json +++ b/res/pokemon/electrike/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1799 diff --git a/res/pokemon/electrode/data.json b/res/pokemon/electrode/data.json index 5b3c0b8b82..e2e0e385f2 100644 --- a/res/pokemon/electrode/data.json +++ b/res/pokemon/electrode/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 diff --git a/res/pokemon/elekid/data.json b/res/pokemon/elekid/data.json index e4d0bf2604..4658067439 100644 --- a/res/pokemon/elekid/data.json +++ b/res/pokemon/elekid/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 diff --git a/res/pokemon/empoleon/data.json b/res/pokemon/empoleon/data.json index 394beebc46..cb767e2716 100644 --- a/res/pokemon/empoleon/data.json +++ b/res/pokemon/empoleon/data.json @@ -145,7 +145,7 @@ "category": "Emperor Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/entei/data.json b/res/pokemon/entei/data.json index dff7557e20..f6993fef28 100644 --- a/res/pokemon/entei/data.json +++ b/res/pokemon/entei/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 514 diff --git a/res/pokemon/espeon/data.json b/res/pokemon/espeon/data.json index bd66116fef..1eb707406f 100644 --- a/res/pokemon/espeon/data.json +++ b/res/pokemon/espeon/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 diff --git a/res/pokemon/exeggcute/data.json b/res/pokemon/exeggcute/data.json index 0159804ae3..9fa3b8c48c 100644 --- a/res/pokemon/exeggcute/data.json +++ b/res/pokemon/exeggcute/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2561 diff --git a/res/pokemon/exeggutor/data.json b/res/pokemon/exeggutor/data.json index 88eb4707c1..5a05a174ba 100644 --- a/res/pokemon/exeggutor/data.json +++ b/res/pokemon/exeggutor/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2561 diff --git a/res/pokemon/exploud/data.json b/res/pokemon/exploud/data.json index c8ae229680..3e3b2713e5 100644 --- a/res/pokemon/exploud/data.json +++ b/res/pokemon/exploud/data.json @@ -149,7 +149,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/farfetchd/data.json b/res/pokemon/farfetchd/data.json index 10076970f8..859e1431de 100644 --- a/res/pokemon/farfetchd/data.json +++ b/res/pokemon/farfetchd/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4357 diff --git a/res/pokemon/fearow/data.json b/res/pokemon/fearow/data.json index 87722fc2ad..9ab92cd38d 100644 --- a/res/pokemon/fearow/data.json +++ b/res/pokemon/fearow/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 diff --git a/res/pokemon/feebas/data.json b/res/pokemon/feebas/data.json index f49819f3fe..d9b230fa0f 100644 --- a/res/pokemon/feebas/data.json +++ b/res/pokemon/feebas/data.json @@ -108,7 +108,7 @@ "category": "Fish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/feraligatr/data.json b/res/pokemon/feraligatr/data.json index e0cd7b4a38..022b5f4088 100644 --- a/res/pokemon/feraligatr/data.json +++ b/res/pokemon/feraligatr/data.json @@ -149,7 +149,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 771 diff --git a/res/pokemon/finneon/data.json b/res/pokemon/finneon/data.json index 220f1aea86..e47c84b178 100644 --- a/res/pokemon/finneon/data.json +++ b/res/pokemon/finneon/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3344 diff --git a/res/pokemon/flaaffy/data.json b/res/pokemon/flaaffy/data.json index 775f65a4d2..45b7281a5a 100644 --- a/res/pokemon/flaaffy/data.json +++ b/res/pokemon/flaaffy/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 diff --git a/res/pokemon/flareon/data.json b/res/pokemon/flareon/data.json index 6bad7b2286..c012490ef5 100644 --- a/res/pokemon/flareon/data.json +++ b/res/pokemon/flareon/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 514 diff --git a/res/pokemon/floatzel/data.json b/res/pokemon/floatzel/data.json index e7cf45931f..042b99eced 100644 --- a/res/pokemon/floatzel/data.json +++ b/res/pokemon/floatzel/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4364 diff --git a/res/pokemon/flygon/data.json b/res/pokemon/flygon/data.json index 7dbe5f33a2..f8092704cf 100644 --- a/res/pokemon/flygon/data.json +++ b/res/pokemon/flygon/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3848 diff --git a/res/pokemon/forretress/data.json b/res/pokemon/forretress/data.json index eba48aa0dd..5b16e634eb 100644 --- a/res/pokemon/forretress/data.json +++ b/res/pokemon/forretress/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3588 diff --git a/res/pokemon/froslass/data.json b/res/pokemon/froslass/data.json index 8dc4255992..011b9b738a 100644 --- a/res/pokemon/froslass/data.json +++ b/res/pokemon/froslass/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3085 diff --git a/res/pokemon/furret/data.json b/res/pokemon/furret/data.json index 1f846b3313..ec6a3558f3 100644 --- a/res/pokemon/furret/data.json +++ b/res/pokemon/furret/data.json @@ -148,7 +148,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/gabite/data.json b/res/pokemon/gabite/data.json index 1b00ac41bd..babfc5e513 100644 --- a/res/pokemon/gabite/data.json +++ b/res/pokemon/gabite/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4102 diff --git a/res/pokemon/gallade/data.json b/res/pokemon/gallade/data.json index 9d4cc3d3c1..23520710a9 100644 --- a/res/pokemon/gallade/data.json +++ b/res/pokemon/gallade/data.json @@ -164,7 +164,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2314 diff --git a/res/pokemon/garchomp/data.json b/res/pokemon/garchomp/data.json index 1fe158384d..5853bcf7de 100644 --- a/res/pokemon/garchomp/data.json +++ b/res/pokemon/garchomp/data.json @@ -142,7 +142,7 @@ "category": "Mach Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/gardevoir/data.json b/res/pokemon/gardevoir/data.json index 0bdcfc341b..2acd5e2244 100644 --- a/res/pokemon/gardevoir/data.json +++ b/res/pokemon/gardevoir/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 diff --git a/res/pokemon/gastly/data.json b/res/pokemon/gastly/data.json index 133fb029c9..f4ea45f2db 100644 --- a/res/pokemon/gastly/data.json +++ b/res/pokemon/gastly/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1548 diff --git a/res/pokemon/gastrodon/data.json b/res/pokemon/gastrodon/data.json index a32758f5e3..21fe0943aa 100644 --- a/res/pokemon/gastrodon/data.json +++ b/res/pokemon/gastrodon/data.json @@ -128,7 +128,7 @@ "category": "Sea Slug Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/gengar/data.json b/res/pokemon/gengar/data.json index ad39fc9586..96cf8b7c2c 100644 --- a/res/pokemon/gengar/data.json +++ b/res/pokemon/gengar/data.json @@ -150,7 +150,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1548 diff --git a/res/pokemon/geodude/data.json b/res/pokemon/geodude/data.json index 5d81a91435..e34309397f 100644 --- a/res/pokemon/geodude/data.json +++ b/res/pokemon/geodude/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 2059 diff --git a/res/pokemon/gible/data.json b/res/pokemon/gible/data.json index cf58469700..e77926564c 100644 --- a/res/pokemon/gible/data.json +++ b/res/pokemon/gible/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1030 diff --git a/res/pokemon/girafarig/data.json b/res/pokemon/girafarig/data.json index 20c4f276d6..3330cda85a 100644 --- a/res/pokemon/girafarig/data.json +++ b/res/pokemon/girafarig/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2565 diff --git a/res/pokemon/giratina/data.json b/res/pokemon/giratina/data.json index 3034d78bb3..5140007b85 100644 --- a/res/pokemon/giratina/data.json +++ b/res/pokemon/giratina/data.json @@ -164,7 +164,7 @@ ], "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3852 diff --git a/res/pokemon/glaceon/data.json b/res/pokemon/glaceon/data.json index b8187d5966..a058b2f143 100644 --- a/res/pokemon/glaceon/data.json +++ b/res/pokemon/glaceon/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3341 diff --git a/res/pokemon/glalie/data.json b/res/pokemon/glalie/data.json index be70d6ffa1..55659b44b6 100644 --- a/res/pokemon/glalie/data.json +++ b/res/pokemon/glalie/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3341 diff --git a/res/pokemon/glameow/data.json b/res/pokemon/glameow/data.json index beb68cb7f0..5a3e76c0cb 100644 --- a/res/pokemon/glameow/data.json +++ b/res/pokemon/glameow/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4102 diff --git a/res/pokemon/gligar/data.json b/res/pokemon/gligar/data.json index 3c7d18b401..b03998f337 100644 --- a/res/pokemon/gligar/data.json +++ b/res/pokemon/gligar/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4360 diff --git a/res/pokemon/gliscor/data.json b/res/pokemon/gliscor/data.json index 1695a19f6c..c6f39dcb79 100644 --- a/res/pokemon/gliscor/data.json +++ b/res/pokemon/gliscor/data.json @@ -149,7 +149,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4360 diff --git a/res/pokemon/gloom/data.json b/res/pokemon/gloom/data.json index 93b54735dc..ed3608e3cd 100644 --- a/res/pokemon/gloom/data.json +++ b/res/pokemon/gloom/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1537 diff --git a/res/pokemon/golbat/data.json b/res/pokemon/golbat/data.json index 2413e80bf9..ab589359e6 100644 --- a/res/pokemon/golbat/data.json +++ b/res/pokemon/golbat/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4358 diff --git a/res/pokemon/goldeen/data.json b/res/pokemon/goldeen/data.json index cc413a14dc..84db95e06d 100644 --- a/res/pokemon/goldeen/data.json +++ b/res/pokemon/goldeen/data.json @@ -126,7 +126,7 @@ "category": "Goldfish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/golduck/data.json b/res/pokemon/golduck/data.json index bf5088f211..959b1b682f 100644 --- a/res/pokemon/golduck/data.json +++ b/res/pokemon/golduck/data.json @@ -140,7 +140,7 @@ "category": "Duck Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/golem/data.json b/res/pokemon/golem/data.json index b70532d09e..607fe15532 100644 --- a/res/pokemon/golem/data.json +++ b/res/pokemon/golem/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2059 diff --git a/res/pokemon/gorebyss/data.json b/res/pokemon/gorebyss/data.json index 9237dcea6c..68d783e44c 100644 --- a/res/pokemon/gorebyss/data.json +++ b/res/pokemon/gorebyss/data.json @@ -121,7 +121,7 @@ "category": "South Sea Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/granbull/data.json b/res/pokemon/granbull/data.json index 691c04af96..4374c9bdc7 100644 --- a/res/pokemon/granbull/data.json +++ b/res/pokemon/granbull/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/graveler/data.json b/res/pokemon/graveler/data.json index dc84986e26..23e7f4c613 100644 --- a/res/pokemon/graveler/data.json +++ b/res/pokemon/graveler/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2059 diff --git a/res/pokemon/grimer/data.json b/res/pokemon/grimer/data.json index f63d331571..618d3e3f45 100644 --- a/res/pokemon/grimer/data.json +++ b/res/pokemon/grimer/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 diff --git a/res/pokemon/grotle/data.json b/res/pokemon/grotle/data.json index 22521a60e8..d16399fd79 100644 --- a/res/pokemon/grotle/data.json +++ b/res/pokemon/grotle/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 diff --git a/res/pokemon/groudon/data.json b/res/pokemon/groudon/data.json index 3b178cd935..941e2c613d 100644 --- a/res/pokemon/groudon/data.json +++ b/res/pokemon/groudon/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2056 diff --git a/res/pokemon/grovyle/data.json b/res/pokemon/grovyle/data.json index 664598e2bf..1838d8e319 100644 --- a/res/pokemon/grovyle/data.json +++ b/res/pokemon/grovyle/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 diff --git a/res/pokemon/growlithe/data.json b/res/pokemon/growlithe/data.json index 358b4b1e21..0444153f91 100644 --- a/res/pokemon/growlithe/data.json +++ b/res/pokemon/growlithe/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 diff --git a/res/pokemon/grumpig/data.json b/res/pokemon/grumpig/data.json index a399208586..9245668fb4 100644 --- a/res/pokemon/grumpig/data.json +++ b/res/pokemon/grumpig/data.json @@ -151,7 +151,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 diff --git a/res/pokemon/gulpin/data.json b/res/pokemon/gulpin/data.json index 1685166752..71ba4772b2 100644 --- a/res/pokemon/gulpin/data.json +++ b/res/pokemon/gulpin/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 diff --git a/res/pokemon/gyarados/data.json b/res/pokemon/gyarados/data.json index 45c03bccb9..87ac9b0c67 100644 --- a/res/pokemon/gyarados/data.json +++ b/res/pokemon/gyarados/data.json @@ -135,7 +135,7 @@ "category": "Atrocious Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/happiny/data.json b/res/pokemon/happiny/data.json index 57e1694aba..6c6ad0b17c 100644 --- a/res/pokemon/happiny/data.json +++ b/res/pokemon/happiny/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/hariyama/data.json b/res/pokemon/hariyama/data.json index b546fe4fe1..b9f0a52f66 100644 --- a/res/pokemon/hariyama/data.json +++ b/res/pokemon/hariyama/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2313 diff --git a/res/pokemon/haunter/data.json b/res/pokemon/haunter/data.json index f32e41fd39..e99e862787 100644 --- a/res/pokemon/haunter/data.json +++ b/res/pokemon/haunter/data.json @@ -147,7 +147,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1548 diff --git a/res/pokemon/heatran/data.json b/res/pokemon/heatran/data.json index 00585c2d65..dfebf76086 100644 --- a/res/pokemon/heatran/data.json +++ b/res/pokemon/heatran/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 514 diff --git a/res/pokemon/heracross/data.json b/res/pokemon/heracross/data.json index 14d89923fe..36b2358537 100644 --- a/res/pokemon/heracross/data.json +++ b/res/pokemon/heracross/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2308 diff --git a/res/pokemon/hippopotas/data.json b/res/pokemon/hippopotas/data.json index 70a0a5d81e..db30b1ba8b 100644 --- a/res/pokemon/hippopotas/data.json +++ b/res/pokemon/hippopotas/data.json @@ -122,7 +122,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2056 diff --git a/res/pokemon/hippowdon/data.json b/res/pokemon/hippowdon/data.json index d069a282fe..7e4fa397ac 100644 --- a/res/pokemon/hippowdon/data.json +++ b/res/pokemon/hippowdon/data.json @@ -123,7 +123,7 @@ "category": "Heavyweight Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/hitmonchan/data.json b/res/pokemon/hitmonchan/data.json index 4ead3574f2..fb66f3b8b4 100644 --- a/res/pokemon/hitmonchan/data.json +++ b/res/pokemon/hitmonchan/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 diff --git a/res/pokemon/hitmonlee/data.json b/res/pokemon/hitmonlee/data.json index 07e8fa695a..bebcf30c5f 100644 --- a/res/pokemon/hitmonlee/data.json +++ b/res/pokemon/hitmonlee/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 diff --git a/res/pokemon/hitmontop/data.json b/res/pokemon/hitmontop/data.json index eab3106e7d..a1fb7bdf06 100644 --- a/res/pokemon/hitmontop/data.json +++ b/res/pokemon/hitmontop/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 diff --git a/res/pokemon/ho_oh/data.json b/res/pokemon/ho_oh/data.json index 294356c55f..85c731c6f2 100644 --- a/res/pokemon/ho_oh/data.json +++ b/res/pokemon/ho_oh/data.json @@ -148,7 +148,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4354 diff --git a/res/pokemon/honchkrow/data.json b/res/pokemon/honchkrow/data.json index e26ec27049..5f6f64d702 100644 --- a/res/pokemon/honchkrow/data.json +++ b/res/pokemon/honchkrow/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4368 diff --git a/res/pokemon/hoothoot/data.json b/res/pokemon/hoothoot/data.json index e9721084d3..43b62a990d 100644 --- a/res/pokemon/hoothoot/data.json +++ b/res/pokemon/hoothoot/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 diff --git a/res/pokemon/hoppip/data.json b/res/pokemon/hoppip/data.json index ccdf8b5683..b83c1b77ed 100644 --- a/res/pokemon/hoppip/data.json +++ b/res/pokemon/hoppip/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4353 diff --git a/res/pokemon/horsea/data.json b/res/pokemon/horsea/data.json index 3cf7f83e44..23a5be257f 100644 --- a/res/pokemon/horsea/data.json +++ b/res/pokemon/horsea/data.json @@ -124,7 +124,7 @@ "category": "Dragon Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/houndoom/data.json b/res/pokemon/houndoom/data.json index f4b2c37423..7994d8204b 100644 --- a/res/pokemon/houndoom/data.json +++ b/res/pokemon/houndoom/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 528 diff --git a/res/pokemon/houndour/data.json b/res/pokemon/houndour/data.json index ecc950a074..fb04904621 100644 --- a/res/pokemon/houndour/data.json +++ b/res/pokemon/houndour/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 528 diff --git a/res/pokemon/huntail/data.json b/res/pokemon/huntail/data.json index 45c8e0d4c2..2646807fce 100644 --- a/res/pokemon/huntail/data.json +++ b/res/pokemon/huntail/data.json @@ -119,7 +119,7 @@ "category": "Deep Sea Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/hypno/data.json b/res/pokemon/hypno/data.json index 0fde03ea82..51864d20d3 100644 --- a/res/pokemon/hypno/data.json +++ b/res/pokemon/hypno/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 diff --git a/res/pokemon/igglybuff/data.json b/res/pokemon/igglybuff/data.json index dd90f13b6f..4b0fc68948 100644 --- a/res/pokemon/igglybuff/data.json +++ b/res/pokemon/igglybuff/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/illumise/data.json b/res/pokemon/illumise/data.json index 42d5cd971d..1b1b3fa780 100644 --- a/res/pokemon/illumise/data.json +++ b/res/pokemon/illumise/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1028 diff --git a/res/pokemon/infernape/data.json b/res/pokemon/infernape/data.json index 691b22b4e4..adbe311d59 100644 --- a/res/pokemon/infernape/data.json +++ b/res/pokemon/infernape/data.json @@ -150,7 +150,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2306 diff --git a/res/pokemon/ivysaur/data.json b/res/pokemon/ivysaur/data.json index 9aeb8dbfb2..ed70ec7b57 100644 --- a/res/pokemon/ivysaur/data.json +++ b/res/pokemon/ivysaur/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1537 diff --git a/res/pokemon/jigglypuff/data.json b/res/pokemon/jigglypuff/data.json index b54dcf8275..b5edaf1b36 100644 --- a/res/pokemon/jigglypuff/data.json +++ b/res/pokemon/jigglypuff/data.json @@ -152,7 +152,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/jirachi/data.json b/res/pokemon/jirachi/data.json index 0f466fd8f3..d0d5dc7588 100644 --- a/res/pokemon/jirachi/data.json +++ b/res/pokemon/jirachi/data.json @@ -151,7 +151,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 2574 diff --git a/res/pokemon/jolteon/data.json b/res/pokemon/jolteon/data.json index a8491a6226..aeb1dd6e99 100644 --- a/res/pokemon/jolteon/data.json +++ b/res/pokemon/jolteon/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 diff --git a/res/pokemon/jumpluff/data.json b/res/pokemon/jumpluff/data.json index 063aef3549..ad9e1855f8 100644 --- a/res/pokemon/jumpluff/data.json +++ b/res/pokemon/jumpluff/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4353 diff --git a/res/pokemon/jynx/data.json b/res/pokemon/jynx/data.json index 2af002b639..ccdb349477 100644 --- a/res/pokemon/jynx/data.json +++ b/res/pokemon/jynx/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2573 diff --git a/res/pokemon/kabuto/data.json b/res/pokemon/kabuto/data.json index 1d721bbfcd..c2ee9c9fff 100644 --- a/res/pokemon/kabuto/data.json +++ b/res/pokemon/kabuto/data.json @@ -133,7 +133,7 @@ "category": "Shellfish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/kabutops/data.json b/res/pokemon/kabutops/data.json index cf16a5e321..8787d028a6 100644 --- a/res/pokemon/kabutops/data.json +++ b/res/pokemon/kabutops/data.json @@ -144,7 +144,7 @@ "category": "Shellfish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/kadabra/data.json b/res/pokemon/kadabra/data.json index 8ca2768bbc..51abd86992 100644 --- a/res/pokemon/kadabra/data.json +++ b/res/pokemon/kadabra/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 diff --git a/res/pokemon/kakuna/data.json b/res/pokemon/kakuna/data.json index 83835daeb5..e79d3d00b6 100644 --- a/res/pokemon/kakuna/data.json +++ b/res/pokemon/kakuna/data.json @@ -81,7 +81,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1540 diff --git a/res/pokemon/kangaskhan/data.json b/res/pokemon/kangaskhan/data.json index 8542bad162..fed21d0de2 100644 --- a/res/pokemon/kangaskhan/data.json +++ b/res/pokemon/kangaskhan/data.json @@ -154,7 +154,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/kecleon/data.json b/res/pokemon/kecleon/data.json index f226fad92a..1c7f4ca08f 100644 --- a/res/pokemon/kecleon/data.json +++ b/res/pokemon/kecleon/data.json @@ -158,7 +158,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/kingdra/data.json b/res/pokemon/kingdra/data.json index 992634086e..4dcdf35a39 100644 --- a/res/pokemon/kingdra/data.json +++ b/res/pokemon/kingdra/data.json @@ -126,7 +126,7 @@ "category": "Dragon Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/kingler/data.json b/res/pokemon/kingler/data.json index b8b788cea9..27b02930e8 100644 --- a/res/pokemon/kingler/data.json +++ b/res/pokemon/kingler/data.json @@ -135,7 +135,7 @@ "category": "Pincer Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/kirlia/data.json b/res/pokemon/kirlia/data.json index e7be56fd8f..f1dcd3a132 100644 --- a/res/pokemon/kirlia/data.json +++ b/res/pokemon/kirlia/data.json @@ -153,7 +153,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 diff --git a/res/pokemon/koffing/data.json b/res/pokemon/koffing/data.json index defed60261..5c1b52a229 100644 --- a/res/pokemon/koffing/data.json +++ b/res/pokemon/koffing/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 diff --git a/res/pokemon/krabby/data.json b/res/pokemon/krabby/data.json index 80727f5270..32582521a2 100644 --- a/res/pokemon/krabby/data.json +++ b/res/pokemon/krabby/data.json @@ -139,7 +139,7 @@ "category": "River Crab Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/kricketot/data.json b/res/pokemon/kricketot/data.json index d2b3432641..c222b17d6b 100644 --- a/res/pokemon/kricketot/data.json +++ b/res/pokemon/kricketot/data.json @@ -87,7 +87,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 diff --git a/res/pokemon/kricketune/data.json b/res/pokemon/kricketune/data.json index bfed9bede2..4474925be2 100644 --- a/res/pokemon/kricketune/data.json +++ b/res/pokemon/kricketune/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1028 diff --git a/res/pokemon/kyogre/data.json b/res/pokemon/kyogre/data.json index eb9e66bec8..ec02d1ce47 100644 --- a/res/pokemon/kyogre/data.json +++ b/res/pokemon/kyogre/data.json @@ -132,7 +132,7 @@ "category": "Sea Basin Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/lairon/data.json b/res/pokemon/lairon/data.json index ce9ae1897b..d2d6c1cbb3 100644 --- a/res/pokemon/lairon/data.json +++ b/res/pokemon/lairon/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2830 diff --git a/res/pokemon/lanturn/data.json b/res/pokemon/lanturn/data.json index 66c76ed5a3..00ed779f8d 100644 --- a/res/pokemon/lanturn/data.json +++ b/res/pokemon/lanturn/data.json @@ -132,7 +132,7 @@ "category": "Light Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/lapras/data.json b/res/pokemon/lapras/data.json index 39b80eab26..2d18e0e762 100644 --- a/res/pokemon/lapras/data.json +++ b/res/pokemon/lapras/data.json @@ -135,7 +135,7 @@ "category": "Transport Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/larvitar/data.json b/res/pokemon/larvitar/data.json index 588c7da6e5..e798f70c96 100644 --- a/res/pokemon/larvitar/data.json +++ b/res/pokemon/larvitar/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2059 diff --git a/res/pokemon/latias/data.json b/res/pokemon/latias/data.json index b93e6cdea8..ddb1172d40 100644 --- a/res/pokemon/latias/data.json +++ b/res/pokemon/latias/data.json @@ -153,7 +153,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2575 diff --git a/res/pokemon/latios/data.json b/res/pokemon/latios/data.json index 2da4519a30..ecb51d8eea 100644 --- a/res/pokemon/latios/data.json +++ b/res/pokemon/latios/data.json @@ -152,7 +152,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2575 diff --git a/res/pokemon/leafeon/data.json b/res/pokemon/leafeon/data.json index bf40d696e4..e235619b87 100644 --- a/res/pokemon/leafeon/data.json +++ b/res/pokemon/leafeon/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 257 diff --git a/res/pokemon/ledian/data.json b/res/pokemon/ledian/data.json index 7164fa4121..c28e212284 100644 --- a/res/pokemon/ledian/data.json +++ b/res/pokemon/ledian/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4356 diff --git a/res/pokemon/ledyba/data.json b/res/pokemon/ledyba/data.json index 0cb62f5fb8..c1b6b30b27 100644 --- a/res/pokemon/ledyba/data.json +++ b/res/pokemon/ledyba/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4356 diff --git a/res/pokemon/lickilicky/data.json b/res/pokemon/lickilicky/data.json index 8c46dca1f0..10ca67dc9f 100644 --- a/res/pokemon/lickilicky/data.json +++ b/res/pokemon/lickilicky/data.json @@ -148,7 +148,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/lickitung/data.json b/res/pokemon/lickitung/data.json index 8c6aa79d05..6ad662d682 100644 --- a/res/pokemon/lickitung/data.json +++ b/res/pokemon/lickitung/data.json @@ -151,7 +151,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/lileep/data.json b/res/pokemon/lileep/data.json index 0954a2eaea..75225075f4 100644 --- a/res/pokemon/lileep/data.json +++ b/res/pokemon/lileep/data.json @@ -132,7 +132,7 @@ "category": "Sea Lily Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/linoone/data.json b/res/pokemon/linoone/data.json index 727ce8bf5b..ad587e81c5 100644 --- a/res/pokemon/linoone/data.json +++ b/res/pokemon/linoone/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/lombre/data.json b/res/pokemon/lombre/data.json index d2ad07e013..3ed9d3d119 100644 --- a/res/pokemon/lombre/data.json +++ b/res/pokemon/lombre/data.json @@ -137,7 +137,7 @@ "category": "Jolly Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/lopunny/data.json b/res/pokemon/lopunny/data.json index eaa6668d85..6cded08771 100644 --- a/res/pokemon/lopunny/data.json +++ b/res/pokemon/lopunny/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/lotad/data.json b/res/pokemon/lotad/data.json index 937b6820c8..6966722dfa 100644 --- a/res/pokemon/lotad/data.json +++ b/res/pokemon/lotad/data.json @@ -126,7 +126,7 @@ "category": "Water Weed Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 30, "rarity": 50, diff --git a/res/pokemon/loudred/data.json b/res/pokemon/loudred/data.json index db6a47ae97..6189c3d556 100644 --- a/res/pokemon/loudred/data.json +++ b/res/pokemon/loudred/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/lucario/data.json b/res/pokemon/lucario/data.json index 23f9018f26..c63e711b03 100644 --- a/res/pokemon/lucario/data.json +++ b/res/pokemon/lucario/data.json @@ -148,7 +148,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 diff --git a/res/pokemon/ludicolo/data.json b/res/pokemon/ludicolo/data.json index 8a35036454..482b670b0f 100644 --- a/res/pokemon/ludicolo/data.json +++ b/res/pokemon/ludicolo/data.json @@ -130,7 +130,7 @@ "category": "Carefree Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/lugia/data.json b/res/pokemon/lugia/data.json index 63efe5ac7f..538ff9b977 100644 --- a/res/pokemon/lugia/data.json +++ b/res/pokemon/lugia/data.json @@ -156,7 +156,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4362 diff --git a/res/pokemon/lumineon/data.json b/res/pokemon/lumineon/data.json index aa3f8a8c9f..bb5e060cb4 100644 --- a/res/pokemon/lumineon/data.json +++ b/res/pokemon/lumineon/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2313 diff --git a/res/pokemon/lunatone/data.json b/res/pokemon/lunatone/data.json index 8862e6dba2..1a6777fa29 100644 --- a/res/pokemon/lunatone/data.json +++ b/res/pokemon/lunatone/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2571 diff --git a/res/pokemon/luvdisc/data.json b/res/pokemon/luvdisc/data.json index 23e4b45e0b..efdb5d6568 100644 --- a/res/pokemon/luvdisc/data.json +++ b/res/pokemon/luvdisc/data.json @@ -115,7 +115,7 @@ "category": "Rendezvous Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/luxio/data.json b/res/pokemon/luxio/data.json index 620ed58dea..f8ee4b9dd8 100644 --- a/res/pokemon/luxio/data.json +++ b/res/pokemon/luxio/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 diff --git a/res/pokemon/luxray/data.json b/res/pokemon/luxray/data.json index b34d540e64..596e0f2b48 100644 --- a/res/pokemon/luxray/data.json +++ b/res/pokemon/luxray/data.json @@ -124,7 +124,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 diff --git a/res/pokemon/machamp/data.json b/res/pokemon/machamp/data.json index 87f867c27c..332b87ac0a 100644 --- a/res/pokemon/machamp/data.json +++ b/res/pokemon/machamp/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2313 diff --git a/res/pokemon/machoke/data.json b/res/pokemon/machoke/data.json index c2f83322d8..6482cc18b0 100644 --- a/res/pokemon/machoke/data.json +++ b/res/pokemon/machoke/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 diff --git a/res/pokemon/machop/data.json b/res/pokemon/machop/data.json index a4976a5349..70ee7929c3 100644 --- a/res/pokemon/machop/data.json +++ b/res/pokemon/machop/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2313 diff --git a/res/pokemon/magby/data.json b/res/pokemon/magby/data.json index f487994e3f..13a8ccd2b6 100644 --- a/res/pokemon/magby/data.json +++ b/res/pokemon/magby/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 diff --git a/res/pokemon/magcargo/data.json b/res/pokemon/magcargo/data.json index 1bcccb28b4..23d27d161a 100644 --- a/res/pokemon/magcargo/data.json +++ b/res/pokemon/magcargo/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2818 diff --git a/res/pokemon/magikarp/data.json b/res/pokemon/magikarp/data.json index 95b1aa6cb2..13bbd79050 100644 --- a/res/pokemon/magikarp/data.json +++ b/res/pokemon/magikarp/data.json @@ -81,7 +81,7 @@ "category": "Fish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 30, "rarity": 50, diff --git a/res/pokemon/magmar/data.json b/res/pokemon/magmar/data.json index 76e31357d7..d3ea2865b9 100644 --- a/res/pokemon/magmar/data.json +++ b/res/pokemon/magmar/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 diff --git a/res/pokemon/magmortar/data.json b/res/pokemon/magmortar/data.json index 3dfbd6d94b..46d61d3e51 100644 --- a/res/pokemon/magmortar/data.json +++ b/res/pokemon/magmortar/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 diff --git a/res/pokemon/magnemite/data.json b/res/pokemon/magnemite/data.json index d95960b0a7..7684ba4878 100644 --- a/res/pokemon/magnemite/data.json +++ b/res/pokemon/magnemite/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3591 diff --git a/res/pokemon/magneton/data.json b/res/pokemon/magneton/data.json index f63a004f76..9942bf8d86 100644 --- a/res/pokemon/magneton/data.json +++ b/res/pokemon/magneton/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3591 diff --git a/res/pokemon/magnezone/data.json b/res/pokemon/magnezone/data.json index 99dcc054a1..701d17100d 100644 --- a/res/pokemon/magnezone/data.json +++ b/res/pokemon/magnezone/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3591 diff --git a/res/pokemon/makuhita/data.json b/res/pokemon/makuhita/data.json index 32d8821bde..5a7d8ab731 100644 --- a/res/pokemon/makuhita/data.json +++ b/res/pokemon/makuhita/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2313 diff --git a/res/pokemon/mamoswine/data.json b/res/pokemon/mamoswine/data.json index a9ff958e52..515f59c55e 100644 --- a/res/pokemon/mamoswine/data.json +++ b/res/pokemon/mamoswine/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2061 diff --git a/res/pokemon/manaphy/data.json b/res/pokemon/manaphy/data.json index 29c15d228d..b503307a0d 100644 --- a/res/pokemon/manaphy/data.json +++ b/res/pokemon/manaphy/data.json @@ -135,7 +135,7 @@ "category": "Seafaring Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 100, "rarity": 1, diff --git a/res/pokemon/manectric/data.json b/res/pokemon/manectric/data.json index 3b1112e2ee..1c7af8a62c 100644 --- a/res/pokemon/manectric/data.json +++ b/res/pokemon/manectric/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1799 diff --git a/res/pokemon/mankey/data.json b/res/pokemon/mankey/data.json index c1ed5ba5b1..04a53975eb 100644 --- a/res/pokemon/mankey/data.json +++ b/res/pokemon/mankey/data.json @@ -149,7 +149,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2313 diff --git a/res/pokemon/mantine/data.json b/res/pokemon/mantine/data.json index 8c72619b35..c5bbe02a9a 100644 --- a/res/pokemon/mantine/data.json +++ b/res/pokemon/mantine/data.json @@ -136,7 +136,7 @@ "category": "Kite Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/mantyke/data.json b/res/pokemon/mantyke/data.json index 19c42a171b..2d9ce52763 100644 --- a/res/pokemon/mantyke/data.json +++ b/res/pokemon/mantyke/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3593 diff --git a/res/pokemon/mareep/data.json b/res/pokemon/mareep/data.json index 1d3b19253d..dd7172143f 100644 --- a/res/pokemon/mareep/data.json +++ b/res/pokemon/mareep/data.json @@ -119,7 +119,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1799 diff --git a/res/pokemon/marill/data.json b/res/pokemon/marill/data.json index 4121bf4bbb..0a56601f39 100644 --- a/res/pokemon/marill/data.json +++ b/res/pokemon/marill/data.json @@ -131,7 +131,7 @@ "category": "Aqua Mouse Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/marowak/data.json b/res/pokemon/marowak/data.json index 2d79731e4a..9f9f20ec3c 100644 --- a/res/pokemon/marowak/data.json +++ b/res/pokemon/marowak/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2056 diff --git a/res/pokemon/marshtomp/data.json b/res/pokemon/marshtomp/data.json index 439b5c19bf..781f72df15 100644 --- a/res/pokemon/marshtomp/data.json +++ b/res/pokemon/marshtomp/data.json @@ -139,7 +139,7 @@ "category": "Mud Fish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/masquerain/data.json b/res/pokemon/masquerain/data.json index 4e865a352f..96dee11ba6 100644 --- a/res/pokemon/masquerain/data.json +++ b/res/pokemon/masquerain/data.json @@ -131,7 +131,7 @@ "category": "Eyeball Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/mawile/data.json b/res/pokemon/mawile/data.json index a968e0952c..28f907e8bd 100644 --- a/res/pokemon/mawile/data.json +++ b/res/pokemon/mawile/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3598 diff --git a/res/pokemon/medicham/data.json b/res/pokemon/medicham/data.json index 65530a21a5..6d2552aae8 100644 --- a/res/pokemon/medicham/data.json +++ b/res/pokemon/medicham/data.json @@ -147,7 +147,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2569 diff --git a/res/pokemon/meditite/data.json b/res/pokemon/meditite/data.json index c295399dab..f68000a817 100644 --- a/res/pokemon/meditite/data.json +++ b/res/pokemon/meditite/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2569 diff --git a/res/pokemon/meganium/data.json b/res/pokemon/meganium/data.json index 4cabc9df9c..cfe9f5048d 100644 --- a/res/pokemon/meganium/data.json +++ b/res/pokemon/meganium/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 257 diff --git a/res/pokemon/meowth/data.json b/res/pokemon/meowth/data.json index a040c3a8f4..8770d57f8d 100644 --- a/res/pokemon/meowth/data.json +++ b/res/pokemon/meowth/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/mesprit/data.json b/res/pokemon/mesprit/data.json index 8978c021c0..b37405b766 100644 --- a/res/pokemon/mesprit/data.json +++ b/res/pokemon/mesprit/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/metagross/data.json b/res/pokemon/metagross/data.json index 0890ca665f..646fd544ce 100644 --- a/res/pokemon/metagross/data.json +++ b/res/pokemon/metagross/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2574 diff --git a/res/pokemon/metang/data.json b/res/pokemon/metang/data.json index d8591cd078..8e1ce7b5e9 100644 --- a/res/pokemon/metang/data.json +++ b/res/pokemon/metang/data.json @@ -151,7 +151,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2574 diff --git a/res/pokemon/metapod/data.json b/res/pokemon/metapod/data.json index 6090b3e99c..f3e88e72e5 100644 --- a/res/pokemon/metapod/data.json +++ b/res/pokemon/metapod/data.json @@ -81,7 +81,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 diff --git a/res/pokemon/mew/data.json b/res/pokemon/mew/data.json index dc06d63b82..37280f7367 100644 --- a/res/pokemon/mew/data.json +++ b/res/pokemon/mew/data.json @@ -224,7 +224,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 2570 diff --git a/res/pokemon/mewtwo/data.json b/res/pokemon/mewtwo/data.json index 5e42099240..684b48cd1a 100644 --- a/res/pokemon/mewtwo/data.json +++ b/res/pokemon/mewtwo/data.json @@ -171,7 +171,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 diff --git a/res/pokemon/mightyena/data.json b/res/pokemon/mightyena/data.json index 815cbaba1c..76daf930e6 100644 --- a/res/pokemon/mightyena/data.json +++ b/res/pokemon/mightyena/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4112 diff --git a/res/pokemon/milotic/data.json b/res/pokemon/milotic/data.json index 1a134d09eb..2528acfeae 100644 --- a/res/pokemon/milotic/data.json +++ b/res/pokemon/milotic/data.json @@ -125,7 +125,7 @@ "category": "Tender Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/miltank/data.json b/res/pokemon/miltank/data.json index 7a95d6ea59..0d52a11cdb 100644 --- a/res/pokemon/miltank/data.json +++ b/res/pokemon/miltank/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/mime_jr/data.json b/res/pokemon/mime_jr/data.json index c7f5892cf5..67380e030e 100644 --- a/res/pokemon/mime_jr/data.json +++ b/res/pokemon/mime_jr/data.json @@ -152,7 +152,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2570 diff --git a/res/pokemon/minun/data.json b/res/pokemon/minun/data.json index ae104fc05e..722a3dd3a9 100644 --- a/res/pokemon/minun/data.json +++ b/res/pokemon/minun/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 diff --git a/res/pokemon/misdreavus/data.json b/res/pokemon/misdreavus/data.json index bedf015073..3399bd4ffa 100644 --- a/res/pokemon/misdreavus/data.json +++ b/res/pokemon/misdreavus/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3084 diff --git a/res/pokemon/mismagius/data.json b/res/pokemon/mismagius/data.json index db11d56633..ea2f1e59c2 100644 --- a/res/pokemon/mismagius/data.json +++ b/res/pokemon/mismagius/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3084 diff --git a/res/pokemon/moltres/data.json b/res/pokemon/moltres/data.json index 08e0fe5b00..922c656ee8 100644 --- a/res/pokemon/moltres/data.json +++ b/res/pokemon/moltres/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4354 diff --git a/res/pokemon/monferno/data.json b/res/pokemon/monferno/data.json index 88737ff541..ea1547f053 100644 --- a/res/pokemon/monferno/data.json +++ b/res/pokemon/monferno/data.json @@ -149,7 +149,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2306 diff --git a/res/pokemon/mothim/data.json b/res/pokemon/mothim/data.json index b7ded2a686..cd1cca54f6 100644 --- a/res/pokemon/mothim/data.json +++ b/res/pokemon/mothim/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 diff --git a/res/pokemon/mr_mime/data.json b/res/pokemon/mr_mime/data.json index 28c25c56bb..6a762c3707 100644 --- a/res/pokemon/mr_mime/data.json +++ b/res/pokemon/mr_mime/data.json @@ -157,7 +157,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 diff --git a/res/pokemon/mudkip/data.json b/res/pokemon/mudkip/data.json index eb33e6d18d..f217242442 100644 --- a/res/pokemon/mudkip/data.json +++ b/res/pokemon/mudkip/data.json @@ -131,7 +131,7 @@ "category": "Mud Fish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/muk/data.json b/res/pokemon/muk/data.json index 9286cfc292..d2a5b4805d 100644 --- a/res/pokemon/muk/data.json +++ b/res/pokemon/muk/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1542 diff --git a/res/pokemon/munchlax/data.json b/res/pokemon/munchlax/data.json index 64b0681195..71a7de80f6 100644 --- a/res/pokemon/munchlax/data.json +++ b/res/pokemon/munchlax/data.json @@ -148,7 +148,7 @@ "category": "Big Eater Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/murkrow/data.json b/res/pokemon/murkrow/data.json index 0b3e0c4dc0..2d69809ef9 100644 --- a/res/pokemon/murkrow/data.json +++ b/res/pokemon/murkrow/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4368 diff --git a/res/pokemon/natu/data.json b/res/pokemon/natu/data.json index 8996e7a680..cd5ce2efc3 100644 --- a/res/pokemon/natu/data.json +++ b/res/pokemon/natu/data.json @@ -147,7 +147,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4362 diff --git a/res/pokemon/nidoking/data.json b/res/pokemon/nidoking/data.json index 2aeabe4c1e..5a7881fd42 100644 --- a/res/pokemon/nidoking/data.json +++ b/res/pokemon/nidoking/data.json @@ -150,7 +150,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2054 diff --git a/res/pokemon/nidoqueen/data.json b/res/pokemon/nidoqueen/data.json index 6a92881031..77c7b23c16 100644 --- a/res/pokemon/nidoqueen/data.json +++ b/res/pokemon/nidoqueen/data.json @@ -150,7 +150,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2054 diff --git a/res/pokemon/nidoran_f/data.json b/res/pokemon/nidoran_f/data.json index a969fcdcd3..108bc375ab 100644 --- a/res/pokemon/nidoran_f/data.json +++ b/res/pokemon/nidoran_f/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1542 diff --git a/res/pokemon/nidoran_m/data.json b/res/pokemon/nidoran_m/data.json index 47723a3a86..e1d52a6609 100644 --- a/res/pokemon/nidoran_m/data.json +++ b/res/pokemon/nidoran_m/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1542 diff --git a/res/pokemon/nidorina/data.json b/res/pokemon/nidorina/data.json index c6d9d5be3e..7b7e3b6765 100644 --- a/res/pokemon/nidorina/data.json +++ b/res/pokemon/nidorina/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 diff --git a/res/pokemon/nidorino/data.json b/res/pokemon/nidorino/data.json index 633ec9dca3..d555d8f4bd 100644 --- a/res/pokemon/nidorino/data.json +++ b/res/pokemon/nidorino/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1542 diff --git a/res/pokemon/nincada/data.json b/res/pokemon/nincada/data.json index 7ed3856423..fd7fa9a330 100644 --- a/res/pokemon/nincada/data.json +++ b/res/pokemon/nincada/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2052 diff --git a/res/pokemon/ninetales/data.json b/res/pokemon/ninetales/data.json index 9dff2811ea..1143f1f89c 100644 --- a/res/pokemon/ninetales/data.json +++ b/res/pokemon/ninetales/data.json @@ -118,7 +118,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 diff --git a/res/pokemon/ninjask/data.json b/res/pokemon/ninjask/data.json index 823471da29..a4d633ec79 100644 --- a/res/pokemon/ninjask/data.json +++ b/res/pokemon/ninjask/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 diff --git a/res/pokemon/noctowl/data.json b/res/pokemon/noctowl/data.json index c9008b202d..943ed85ef0 100644 --- a/res/pokemon/noctowl/data.json +++ b/res/pokemon/noctowl/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 diff --git a/res/pokemon/nosepass/data.json b/res/pokemon/nosepass/data.json index 5c86e420e0..946b6402f1 100644 --- a/res/pokemon/nosepass/data.json +++ b/res/pokemon/nosepass/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2827 diff --git a/res/pokemon/numel/data.json b/res/pokemon/numel/data.json index 22a99c4804..45891ee9f5 100644 --- a/res/pokemon/numel/data.json +++ b/res/pokemon/numel/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2050 diff --git a/res/pokemon/nuzleaf/data.json b/res/pokemon/nuzleaf/data.json index 5c02fbd5f7..4eb047ca2a 100644 --- a/res/pokemon/nuzleaf/data.json +++ b/res/pokemon/nuzleaf/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4097 diff --git a/res/pokemon/octillery/data.json b/res/pokemon/octillery/data.json index 49910f12e0..4c69147f6a 100644 --- a/res/pokemon/octillery/data.json +++ b/res/pokemon/octillery/data.json @@ -136,7 +136,7 @@ "category": "Jet Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/oddish/data.json b/res/pokemon/oddish/data.json index 5e59e8b297..7f582faf7a 100644 --- a/res/pokemon/oddish/data.json +++ b/res/pokemon/oddish/data.json @@ -121,7 +121,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1537 diff --git a/res/pokemon/omanyte/data.json b/res/pokemon/omanyte/data.json index 6220c3a955..534098ef2d 100644 --- a/res/pokemon/omanyte/data.json +++ b/res/pokemon/omanyte/data.json @@ -133,7 +133,7 @@ "category": "Spiral Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/omastar/data.json b/res/pokemon/omastar/data.json index de63d6dc4c..b22584f72c 100644 --- a/res/pokemon/omastar/data.json +++ b/res/pokemon/omastar/data.json @@ -132,7 +132,7 @@ "category": "Spiral Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/onix/data.json b/res/pokemon/onix/data.json index b3d3950877..df5b8f7c96 100644 --- a/res/pokemon/onix/data.json +++ b/res/pokemon/onix/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2059 diff --git a/res/pokemon/pachirisu/data.json b/res/pokemon/pachirisu/data.json index 2242bf0955..b411d3e4b8 100644 --- a/res/pokemon/pachirisu/data.json +++ b/res/pokemon/pachirisu/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 diff --git a/res/pokemon/palkia/data.json b/res/pokemon/palkia/data.json index 4b3e156319..ef29817639 100644 --- a/res/pokemon/palkia/data.json +++ b/res/pokemon/palkia/data.json @@ -147,7 +147,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3843 diff --git a/res/pokemon/paras/data.json b/res/pokemon/paras/data.json index 9ed7344c51..ae64fbf634 100644 --- a/res/pokemon/paras/data.json +++ b/res/pokemon/paras/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 260 diff --git a/res/pokemon/parasect/data.json b/res/pokemon/parasect/data.json index a2302f9072..04bfdb5079 100644 --- a/res/pokemon/parasect/data.json +++ b/res/pokemon/parasect/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 260 diff --git a/res/pokemon/pelipper/data.json b/res/pokemon/pelipper/data.json index c26d4efb9b..682e8beb7f 100644 --- a/res/pokemon/pelipper/data.json +++ b/res/pokemon/pelipper/data.json @@ -139,7 +139,7 @@ "category": "Water Bird Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/persian/data.json b/res/pokemon/persian/data.json index a048ed1605..1f98c0fbb5 100644 --- a/res/pokemon/persian/data.json +++ b/res/pokemon/persian/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/phanpy/data.json b/res/pokemon/phanpy/data.json index c9d2986ba7..1cb3f3d6c9 100644 --- a/res/pokemon/phanpy/data.json +++ b/res/pokemon/phanpy/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 diff --git a/res/pokemon/phione/data.json b/res/pokemon/phione/data.json index ed155c4fb7..952955fa9b 100644 --- a/res/pokemon/phione/data.json +++ b/res/pokemon/phione/data.json @@ -123,7 +123,7 @@ "category": "Sea Drifter Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/pichu/data.json b/res/pokemon/pichu/data.json index fc0484d30f..6d805bed81 100644 --- a/res/pokemon/pichu/data.json +++ b/res/pokemon/pichu/data.json @@ -121,7 +121,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 diff --git a/res/pokemon/pidgeot/data.json b/res/pokemon/pidgeot/data.json index 8975d87a81..3de3394b58 100644 --- a/res/pokemon/pidgeot/data.json +++ b/res/pokemon/pidgeot/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4357 diff --git a/res/pokemon/pidgeotto/data.json b/res/pokemon/pidgeotto/data.json index 0373581d3e..9bd031c95c 100644 --- a/res/pokemon/pidgeotto/data.json +++ b/res/pokemon/pidgeotto/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 diff --git a/res/pokemon/pidgey/data.json b/res/pokemon/pidgey/data.json index 3a257255a8..7d00e141be 100644 --- a/res/pokemon/pidgey/data.json +++ b/res/pokemon/pidgey/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 diff --git a/res/pokemon/pikachu/data.json b/res/pokemon/pikachu/data.json index af495e86ec..2adb6d4ee9 100644 --- a/res/pokemon/pikachu/data.json +++ b/res/pokemon/pikachu/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1799 diff --git a/res/pokemon/piloswine/data.json b/res/pokemon/piloswine/data.json index cba0224c2e..949b1f5a74 100644 --- a/res/pokemon/piloswine/data.json +++ b/res/pokemon/piloswine/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2061 diff --git a/res/pokemon/pineco/data.json b/res/pokemon/pineco/data.json index e4035d367d..7c316b0ded 100644 --- a/res/pokemon/pineco/data.json +++ b/res/pokemon/pineco/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 diff --git a/res/pokemon/pinsir/data.json b/res/pokemon/pinsir/data.json index 72eeeb380c..d4408cb478 100644 --- a/res/pokemon/pinsir/data.json +++ b/res/pokemon/pinsir/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1028 diff --git a/res/pokemon/piplup/data.json b/res/pokemon/piplup/data.json index 04f1ea438a..c3ab93b331 100644 --- a/res/pokemon/piplup/data.json +++ b/res/pokemon/piplup/data.json @@ -130,7 +130,7 @@ "category": "Penguin Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/plusle/data.json b/res/pokemon/plusle/data.json index cbdc4c54bb..3f72d24141 100644 --- a/res/pokemon/plusle/data.json +++ b/res/pokemon/plusle/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 diff --git a/res/pokemon/politoed/data.json b/res/pokemon/politoed/data.json index e07846f907..315f7b228a 100644 --- a/res/pokemon/politoed/data.json +++ b/res/pokemon/politoed/data.json @@ -122,7 +122,7 @@ "category": "Frog Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/poliwag/data.json b/res/pokemon/poliwag/data.json index 98e3e94a5f..9eceeba8c5 100644 --- a/res/pokemon/poliwag/data.json +++ b/res/pokemon/poliwag/data.json @@ -121,7 +121,7 @@ "category": "Tadpole Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/poliwhirl/data.json b/res/pokemon/poliwhirl/data.json index d90ed62eeb..e440cfdf0a 100644 --- a/res/pokemon/poliwhirl/data.json +++ b/res/pokemon/poliwhirl/data.json @@ -138,7 +138,7 @@ "category": "Tadpole Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/poliwrath/data.json b/res/pokemon/poliwrath/data.json index d097517c57..3cae001ca3 100644 --- a/res/pokemon/poliwrath/data.json +++ b/res/pokemon/poliwrath/data.json @@ -127,7 +127,7 @@ "category": "Tadpole Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/ponyta/data.json b/res/pokemon/ponyta/data.json index b007e2735c..99f8651212 100644 --- a/res/pokemon/ponyta/data.json +++ b/res/pokemon/ponyta/data.json @@ -121,7 +121,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 diff --git a/res/pokemon/poochyena/data.json b/res/pokemon/poochyena/data.json index c1f0c4290e..9172729106 100644 --- a/res/pokemon/poochyena/data.json +++ b/res/pokemon/poochyena/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4112 diff --git a/res/pokemon/porygon/data.json b/res/pokemon/porygon/data.json index ec586dc8bd..ed059567af 100644 --- a/res/pokemon/porygon/data.json +++ b/res/pokemon/porygon/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/porygon2/data.json b/res/pokemon/porygon2/data.json index e1a4e08286..8c66afa9d2 100644 --- a/res/pokemon/porygon2/data.json +++ b/res/pokemon/porygon2/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/porygon_z/data.json b/res/pokemon/porygon_z/data.json index 4bf0e87f79..e182878217 100644 --- a/res/pokemon/porygon_z/data.json +++ b/res/pokemon/porygon_z/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/primeape/data.json b/res/pokemon/primeape/data.json index 06c508524c..40e7477400 100644 --- a/res/pokemon/primeape/data.json +++ b/res/pokemon/primeape/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2313 diff --git a/res/pokemon/prinplup/data.json b/res/pokemon/prinplup/data.json index 50808585e5..6e89374834 100644 --- a/res/pokemon/prinplup/data.json +++ b/res/pokemon/prinplup/data.json @@ -137,7 +137,7 @@ "category": "Penguin Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/probopass/data.json b/res/pokemon/probopass/data.json index a0438d3317..d6df04fa3b 100644 --- a/res/pokemon/probopass/data.json +++ b/res/pokemon/probopass/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2827 diff --git a/res/pokemon/psyduck/data.json b/res/pokemon/psyduck/data.json index 0f11554de2..4f1a41383f 100644 --- a/res/pokemon/psyduck/data.json +++ b/res/pokemon/psyduck/data.json @@ -139,7 +139,7 @@ "category": "Duck Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/pupitar/data.json b/res/pokemon/pupitar/data.json index 5175116d9d..955883a561 100644 --- a/res/pokemon/pupitar/data.json +++ b/res/pokemon/pupitar/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2059 diff --git a/res/pokemon/purugly/data.json b/res/pokemon/purugly/data.json index df21f1c715..1088b8f627 100644 --- a/res/pokemon/purugly/data.json +++ b/res/pokemon/purugly/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4102 diff --git a/res/pokemon/quagsire/data.json b/res/pokemon/quagsire/data.json index a4eaa93353..9d320d62bc 100644 --- a/res/pokemon/quagsire/data.json +++ b/res/pokemon/quagsire/data.json @@ -138,7 +138,7 @@ "category": "Water Fish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/quilava/data.json b/res/pokemon/quilava/data.json index 266dc39643..201a65353b 100644 --- a/res/pokemon/quilava/data.json +++ b/res/pokemon/quilava/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 514 diff --git a/res/pokemon/qwilfish/data.json b/res/pokemon/qwilfish/data.json index be07c01f4c..e719bbaa29 100644 --- a/res/pokemon/qwilfish/data.json +++ b/res/pokemon/qwilfish/data.json @@ -136,7 +136,7 @@ "category": "Balloon Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/raichu/data.json b/res/pokemon/raichu/data.json index b11ee0b13c..502ef5dce1 100644 --- a/res/pokemon/raichu/data.json +++ b/res/pokemon/raichu/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 diff --git a/res/pokemon/raikou/data.json b/res/pokemon/raikou/data.json index 9f56ade9e4..63b6caf245 100644 --- a/res/pokemon/raikou/data.json +++ b/res/pokemon/raikou/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1799 diff --git a/res/pokemon/ralts/data.json b/res/pokemon/ralts/data.json index 4c40f87e65..76b0fca73d 100644 --- a/res/pokemon/ralts/data.json +++ b/res/pokemon/ralts/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2570 diff --git a/res/pokemon/rampardos/data.json b/res/pokemon/rampardos/data.json index 46047969c8..953397e88f 100644 --- a/res/pokemon/rampardos/data.json +++ b/res/pokemon/rampardos/data.json @@ -150,7 +150,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3595 diff --git a/res/pokemon/rapidash/data.json b/res/pokemon/rapidash/data.json index be7c188424..93df80277e 100644 --- a/res/pokemon/rapidash/data.json +++ b/res/pokemon/rapidash/data.json @@ -122,7 +122,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 diff --git a/res/pokemon/raticate/data.json b/res/pokemon/raticate/data.json index 4968ae2471..44b1ed9579 100644 --- a/res/pokemon/raticate/data.json +++ b/res/pokemon/raticate/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/rattata/data.json b/res/pokemon/rattata/data.json index e6afcc320c..55b97f7b6a 100644 --- a/res/pokemon/rattata/data.json +++ b/res/pokemon/rattata/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1285 diff --git a/res/pokemon/rayquaza/data.json b/res/pokemon/rayquaza/data.json index b0aaa6a50e..dbdc34d069 100644 --- a/res/pokemon/rayquaza/data.json +++ b/res/pokemon/rayquaza/data.json @@ -151,7 +151,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4367 diff --git a/res/pokemon/regice/data.json b/res/pokemon/regice/data.json index a63c263855..894a4af865 100644 --- a/res/pokemon/regice/data.json +++ b/res/pokemon/regice/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3341 diff --git a/res/pokemon/regigigas/data.json b/res/pokemon/regigigas/data.json index ebb2537e9b..810cffc2c6 100644 --- a/res/pokemon/regigigas/data.json +++ b/res/pokemon/regigigas/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/regirock/data.json b/res/pokemon/regirock/data.json index b7ea1ba243..140a59bdcb 100644 --- a/res/pokemon/regirock/data.json +++ b/res/pokemon/regirock/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2827 diff --git a/res/pokemon/registeel/data.json b/res/pokemon/registeel/data.json index 9ae5ee666c..3be52fbb11 100644 --- a/res/pokemon/registeel/data.json +++ b/res/pokemon/registeel/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3598 diff --git a/res/pokemon/relicanth/data.json b/res/pokemon/relicanth/data.json index 90bbc2d663..517c87c1ec 100644 --- a/res/pokemon/relicanth/data.json +++ b/res/pokemon/relicanth/data.json @@ -131,7 +131,7 @@ "category": "Longevity Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/remoraid/data.json b/res/pokemon/remoraid/data.json index 9beabaaec6..a73984b289 100644 --- a/res/pokemon/remoraid/data.json +++ b/res/pokemon/remoraid/data.json @@ -130,7 +130,7 @@ "category": "Jet Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/rhydon/data.json b/res/pokemon/rhydon/data.json index ca01709631..39c595608e 100644 --- a/res/pokemon/rhydon/data.json +++ b/res/pokemon/rhydon/data.json @@ -164,7 +164,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2824 diff --git a/res/pokemon/rhyhorn/data.json b/res/pokemon/rhyhorn/data.json index 161cf2fa22..8de41cf0b2 100644 --- a/res/pokemon/rhyhorn/data.json +++ b/res/pokemon/rhyhorn/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2824 diff --git a/res/pokemon/rhyperior/data.json b/res/pokemon/rhyperior/data.json index 7d1758d041..b6540950ad 100644 --- a/res/pokemon/rhyperior/data.json +++ b/res/pokemon/rhyperior/data.json @@ -161,7 +161,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2824 diff --git a/res/pokemon/riolu/data.json b/res/pokemon/riolu/data.json index 3506c73abc..f47dcb6a0e 100644 --- a/res/pokemon/riolu/data.json +++ b/res/pokemon/riolu/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 257 diff --git a/res/pokemon/roselia/data.json b/res/pokemon/roselia/data.json index 6c22f30cb5..41b84d682c 100644 --- a/res/pokemon/roselia/data.json +++ b/res/pokemon/roselia/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1537 diff --git a/res/pokemon/roserade/data.json b/res/pokemon/roserade/data.json index 9ca3b70390..d70e234e04 100644 --- a/res/pokemon/roserade/data.json +++ b/res/pokemon/roserade/data.json @@ -117,7 +117,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1537 diff --git a/res/pokemon/rotom/data.json b/res/pokemon/rotom/data.json index 4c3aee18f9..d632b3a557 100644 --- a/res/pokemon/rotom/data.json +++ b/res/pokemon/rotom/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3079 diff --git a/res/pokemon/sableye/data.json b/res/pokemon/sableye/data.json index 9e1aa665b1..fc837af255 100644 --- a/res/pokemon/sableye/data.json +++ b/res/pokemon/sableye/data.json @@ -150,7 +150,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3088 diff --git a/res/pokemon/salamence/data.json b/res/pokemon/salamence/data.json index f3667d9024..c551ee14ac 100644 --- a/res/pokemon/salamence/data.json +++ b/res/pokemon/salamence/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4367 diff --git a/res/pokemon/sandshrew/data.json b/res/pokemon/sandshrew/data.json index 88c7a2c46a..2bd8016063 100644 --- a/res/pokemon/sandshrew/data.json +++ b/res/pokemon/sandshrew/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 diff --git a/res/pokemon/sandslash/data.json b/res/pokemon/sandslash/data.json index 76eca65bdb..e9242638d4 100644 --- a/res/pokemon/sandslash/data.json +++ b/res/pokemon/sandslash/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2056 diff --git a/res/pokemon/sceptile/data.json b/res/pokemon/sceptile/data.json index a956b34b42..cff77704a5 100644 --- a/res/pokemon/sceptile/data.json +++ b/res/pokemon/sceptile/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 257 diff --git a/res/pokemon/scizor/data.json b/res/pokemon/scizor/data.json index 81cd06dd47..6c9ffae20c 100644 --- a/res/pokemon/scizor/data.json +++ b/res/pokemon/scizor/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 3588 diff --git a/res/pokemon/scyther/data.json b/res/pokemon/scyther/data.json index d9b52c1445..5c7bd385c1 100644 --- a/res/pokemon/scyther/data.json +++ b/res/pokemon/scyther/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 diff --git a/res/pokemon/seadra/data.json b/res/pokemon/seadra/data.json index bb62d3c7b5..d6c5706276 100644 --- a/res/pokemon/seadra/data.json +++ b/res/pokemon/seadra/data.json @@ -131,7 +131,7 @@ "category": "Dragon Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/seaking/data.json b/res/pokemon/seaking/data.json index 8e413681fb..9682f8b9d8 100644 --- a/res/pokemon/seaking/data.json +++ b/res/pokemon/seaking/data.json @@ -123,7 +123,7 @@ "category": "Goldfish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/sealeo/data.json b/res/pokemon/sealeo/data.json index a60759a72a..b3090f47d5 100644 --- a/res/pokemon/sealeo/data.json +++ b/res/pokemon/sealeo/data.json @@ -134,7 +134,7 @@ "category": "Ball Roll Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/seedot/data.json b/res/pokemon/seedot/data.json index 3368a5edc7..29df3f4607 100644 --- a/res/pokemon/seedot/data.json +++ b/res/pokemon/seedot/data.json @@ -119,7 +119,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 257 diff --git a/res/pokemon/seel/data.json b/res/pokemon/seel/data.json index ff49bc6e88..2663ac847d 100644 --- a/res/pokemon/seel/data.json +++ b/res/pokemon/seel/data.json @@ -126,7 +126,7 @@ "category": "Sea Lion Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/sentret/data.json b/res/pokemon/sentret/data.json index 56d2f0c3b4..2b6d16b454 100644 --- a/res/pokemon/sentret/data.json +++ b/res/pokemon/sentret/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1285 diff --git a/res/pokemon/seviper/data.json b/res/pokemon/seviper/data.json index 970bd45842..ffa56daf4f 100644 --- a/res/pokemon/seviper/data.json +++ b/res/pokemon/seviper/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1542 diff --git a/res/pokemon/sharpedo/data.json b/res/pokemon/sharpedo/data.json index 096b330f3b..0dd663ddfe 100644 --- a/res/pokemon/sharpedo/data.json +++ b/res/pokemon/sharpedo/data.json @@ -141,7 +141,7 @@ "category": "Brutal Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/shaymin/data.json b/res/pokemon/shaymin/data.json index aafc9f7b0b..25c4933f69 100644 --- a/res/pokemon/shaymin/data.json +++ b/res/pokemon/shaymin/data.json @@ -120,7 +120,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 100, "rarity": 1, "unused": 257 diff --git a/res/pokemon/shedinja/data.json b/res/pokemon/shedinja/data.json index 21ef94aec0..8f254e6378 100644 --- a/res/pokemon/shedinja/data.json +++ b/res/pokemon/shedinja/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 3076 diff --git a/res/pokemon/shelgon/data.json b/res/pokemon/shelgon/data.json index 9d85c8e01a..0238fa56f7 100644 --- a/res/pokemon/shelgon/data.json +++ b/res/pokemon/shelgon/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3855 diff --git a/res/pokemon/shellder/data.json b/res/pokemon/shellder/data.json index 3f9f419296..3a3cf4f933 100644 --- a/res/pokemon/shellder/data.json +++ b/res/pokemon/shellder/data.json @@ -121,7 +121,7 @@ "category": "Bivalve Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/shellos/data.json b/res/pokemon/shellos/data.json index 609e41a1f1..003fdb369b 100644 --- a/res/pokemon/shellos/data.json +++ b/res/pokemon/shellos/data.json @@ -117,7 +117,7 @@ "category": "Sea Slug Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/shieldon/data.json b/res/pokemon/shieldon/data.json index fd0d206284..59b583eed3 100644 --- a/res/pokemon/shieldon/data.json +++ b/res/pokemon/shieldon/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2827 diff --git a/res/pokemon/shiftry/data.json b/res/pokemon/shiftry/data.json index d51589d97f..9de889eff6 100644 --- a/res/pokemon/shiftry/data.json +++ b/res/pokemon/shiftry/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4097 diff --git a/res/pokemon/shinx/data.json b/res/pokemon/shinx/data.json index 648b31d152..9838d1a8f9 100644 --- a/res/pokemon/shinx/data.json +++ b/res/pokemon/shinx/data.json @@ -124,7 +124,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1799 diff --git a/res/pokemon/shroomish/data.json b/res/pokemon/shroomish/data.json index 6f7f3e3ef5..7f0be1685a 100644 --- a/res/pokemon/shroomish/data.json +++ b/res/pokemon/shroomish/data.json @@ -122,7 +122,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 diff --git a/res/pokemon/shuckle/data.json b/res/pokemon/shuckle/data.json index 97677c9db7..1cac496428 100644 --- a/res/pokemon/shuckle/data.json +++ b/res/pokemon/shuckle/data.json @@ -121,7 +121,7 @@ "category": "Mold Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/shuppet/data.json b/res/pokemon/shuppet/data.json index 5cffab3915..9539d92d8e 100644 --- a/res/pokemon/shuppet/data.json +++ b/res/pokemon/shuppet/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3084 diff --git a/res/pokemon/silcoon/data.json b/res/pokemon/silcoon/data.json index 893455afb5..31c8b3cfac 100644 --- a/res/pokemon/silcoon/data.json +++ b/res/pokemon/silcoon/data.json @@ -81,7 +81,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1028 diff --git a/res/pokemon/skarmory/data.json b/res/pokemon/skarmory/data.json index 42694e07ac..a0911a76c5 100644 --- a/res/pokemon/skarmory/data.json +++ b/res/pokemon/skarmory/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4366 diff --git a/res/pokemon/skiploom/data.json b/res/pokemon/skiploom/data.json index 113670b185..d1d87cc0cd 100644 --- a/res/pokemon/skiploom/data.json +++ b/res/pokemon/skiploom/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4353 diff --git a/res/pokemon/skitty/data.json b/res/pokemon/skitty/data.json index 6a643b79c3..eb475c5c9c 100644 --- a/res/pokemon/skitty/data.json +++ b/res/pokemon/skitty/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/skorupi/data.json b/res/pokemon/skorupi/data.json index 2185041392..db7680a7b9 100644 --- a/res/pokemon/skorupi/data.json +++ b/res/pokemon/skorupi/data.json @@ -136,7 +136,7 @@ "category": "Scorpion Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/skuntank/data.json b/res/pokemon/skuntank/data.json index 40b598627a..9f9465fe75 100644 --- a/res/pokemon/skuntank/data.json +++ b/res/pokemon/skuntank/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2574 diff --git a/res/pokemon/slaking/data.json b/res/pokemon/slaking/data.json index a014b56b2a..e8bfc791a6 100644 --- a/res/pokemon/slaking/data.json +++ b/res/pokemon/slaking/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/slakoth/data.json b/res/pokemon/slakoth/data.json index dca20b4710..886f3afbc0 100644 --- a/res/pokemon/slakoth/data.json +++ b/res/pokemon/slakoth/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/slowbro/data.json b/res/pokemon/slowbro/data.json index e4a6a093c5..15c4ec949b 100644 --- a/res/pokemon/slowbro/data.json +++ b/res/pokemon/slowbro/data.json @@ -154,7 +154,7 @@ "category": "Hermit Crab Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/slowking/data.json b/res/pokemon/slowking/data.json index 5e76cfa4a9..2c5e317d82 100644 --- a/res/pokemon/slowking/data.json +++ b/res/pokemon/slowking/data.json @@ -154,7 +154,7 @@ "category": "Royal Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/slowpoke/data.json b/res/pokemon/slowpoke/data.json index b5c89dcd09..8ffdb33493 100644 --- a/res/pokemon/slowpoke/data.json +++ b/res/pokemon/slowpoke/data.json @@ -152,7 +152,7 @@ "category": "Dopey Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/slugma/data.json b/res/pokemon/slugma/data.json index a3e429a15f..86c61ac593 100644 --- a/res/pokemon/slugma/data.json +++ b/res/pokemon/slugma/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 diff --git a/res/pokemon/smeargle/data.json b/res/pokemon/smeargle/data.json index 1141166ea1..a18aa85247 100644 --- a/res/pokemon/smeargle/data.json +++ b/res/pokemon/smeargle/data.json @@ -80,7 +80,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/smoochum/data.json b/res/pokemon/smoochum/data.json index 99b0f0d0a8..569677d6ba 100644 --- a/res/pokemon/smoochum/data.json +++ b/res/pokemon/smoochum/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2573 diff --git a/res/pokemon/sneasel/data.json b/res/pokemon/sneasel/data.json index 79d78ecdaa..62f2f1383c 100644 --- a/res/pokemon/sneasel/data.json +++ b/res/pokemon/sneasel/data.json @@ -150,7 +150,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3344 diff --git a/res/pokemon/snorlax/data.json b/res/pokemon/snorlax/data.json index 7f287f3161..0b526889f0 100644 --- a/res/pokemon/snorlax/data.json +++ b/res/pokemon/snorlax/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/snorunt/data.json b/res/pokemon/snorunt/data.json index d6d4af7e4e..c81357fc2e 100644 --- a/res/pokemon/snorunt/data.json +++ b/res/pokemon/snorunt/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3341 diff --git a/res/pokemon/snover/data.json b/res/pokemon/snover/data.json index deec941bad..64eaccf2c0 100644 --- a/res/pokemon/snover/data.json +++ b/res/pokemon/snover/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2063 diff --git a/res/pokemon/snubbull/data.json b/res/pokemon/snubbull/data.json index f8e42a0c68..b229ac4b4e 100644 --- a/res/pokemon/snubbull/data.json +++ b/res/pokemon/snubbull/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/solrock/data.json b/res/pokemon/solrock/data.json index 8fee72712e..492709847a 100644 --- a/res/pokemon/solrock/data.json +++ b/res/pokemon/solrock/data.json @@ -143,7 +143,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2571 diff --git a/res/pokemon/spearow/data.json b/res/pokemon/spearow/data.json index 2adb847dd0..d83995667e 100644 --- a/res/pokemon/spearow/data.json +++ b/res/pokemon/spearow/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 diff --git a/res/pokemon/spheal/data.json b/res/pokemon/spheal/data.json index f494cb891d..e46bbb6170 100644 --- a/res/pokemon/spheal/data.json +++ b/res/pokemon/spheal/data.json @@ -132,7 +132,7 @@ "category": "Clap Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/spinarak/data.json b/res/pokemon/spinarak/data.json index 78bc5480e9..6670c70ec7 100644 --- a/res/pokemon/spinarak/data.json +++ b/res/pokemon/spinarak/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1540 diff --git a/res/pokemon/spinda/data.json b/res/pokemon/spinda/data.json index 6ec2edb20e..36c3685bef 100644 --- a/res/pokemon/spinda/data.json +++ b/res/pokemon/spinda/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/spiritomb/data.json b/res/pokemon/spiritomb/data.json index 1f52642c95..b882b9bacd 100644 --- a/res/pokemon/spiritomb/data.json +++ b/res/pokemon/spiritomb/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/spoink/data.json b/res/pokemon/spoink/data.json index f2a080e79d..bfe6681c48 100644 --- a/res/pokemon/spoink/data.json +++ b/res/pokemon/spoink/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2570 diff --git a/res/pokemon/squirtle/data.json b/res/pokemon/squirtle/data.json index 02568c88e8..c1dd7e9e96 100644 --- a/res/pokemon/squirtle/data.json +++ b/res/pokemon/squirtle/data.json @@ -134,7 +134,7 @@ "category": "Tiny Turtle Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/stantler/data.json b/res/pokemon/stantler/data.json index 37eb21c6e2..8864997e81 100644 --- a/res/pokemon/stantler/data.json +++ b/res/pokemon/stantler/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/staraptor/data.json b/res/pokemon/staraptor/data.json index 4a60440707..65ebcfa9b8 100644 --- a/res/pokemon/staraptor/data.json +++ b/res/pokemon/staraptor/data.json @@ -124,7 +124,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4357 diff --git a/res/pokemon/staravia/data.json b/res/pokemon/staravia/data.json index a935065078..c72913f414 100644 --- a/res/pokemon/staravia/data.json +++ b/res/pokemon/staravia/data.json @@ -127,7 +127,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 diff --git a/res/pokemon/starly/data.json b/res/pokemon/starly/data.json index 535bf81b34..740d5eaa66 100644 --- a/res/pokemon/starly/data.json +++ b/res/pokemon/starly/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 diff --git a/res/pokemon/starmie/data.json b/res/pokemon/starmie/data.json index 235836e892..652fb9457e 100644 --- a/res/pokemon/starmie/data.json +++ b/res/pokemon/starmie/data.json @@ -126,7 +126,7 @@ "category": "Mysterious Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/staryu/data.json b/res/pokemon/staryu/data.json index 87a5dd1177..a5dab28066 100644 --- a/res/pokemon/staryu/data.json +++ b/res/pokemon/staryu/data.json @@ -134,7 +134,7 @@ "category": "Star Shape Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/steelix/data.json b/res/pokemon/steelix/data.json index 3f7c4a1cb1..c1dc279b02 100644 --- a/res/pokemon/steelix/data.json +++ b/res/pokemon/steelix/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2062 diff --git a/res/pokemon/stunky/data.json b/res/pokemon/stunky/data.json index 38347cc9c3..e022010e45 100644 --- a/res/pokemon/stunky/data.json +++ b/res/pokemon/stunky/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 diff --git a/res/pokemon/sudowoodo/data.json b/res/pokemon/sudowoodo/data.json index 7a53839098..2ae11b8028 100644 --- a/res/pokemon/sudowoodo/data.json +++ b/res/pokemon/sudowoodo/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2827 diff --git a/res/pokemon/suicune/data.json b/res/pokemon/suicune/data.json index fc11f504f5..d6bc7bc086 100644 --- a/res/pokemon/suicune/data.json +++ b/res/pokemon/suicune/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 771 diff --git a/res/pokemon/sunflora/data.json b/res/pokemon/sunflora/data.json index d3fa27219c..e8fbcd520b 100644 --- a/res/pokemon/sunflora/data.json +++ b/res/pokemon/sunflora/data.json @@ -124,7 +124,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 257 diff --git a/res/pokemon/sunkern/data.json b/res/pokemon/sunkern/data.json index b73dc65d15..b07779e3e6 100644 --- a/res/pokemon/sunkern/data.json +++ b/res/pokemon/sunkern/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 diff --git a/res/pokemon/surskit/data.json b/res/pokemon/surskit/data.json index 3e0d6f1351..f67759d256 100644 --- a/res/pokemon/surskit/data.json +++ b/res/pokemon/surskit/data.json @@ -121,7 +121,7 @@ "category": "Pond Skater Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/swablu/data.json b/res/pokemon/swablu/data.json index 86605e32e5..f6b2c36528 100644 --- a/res/pokemon/swablu/data.json +++ b/res/pokemon/swablu/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 diff --git a/res/pokemon/swalot/data.json b/res/pokemon/swalot/data.json index 5388bf7120..bdc5dd7286 100644 --- a/res/pokemon/swalot/data.json +++ b/res/pokemon/swalot/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1542 diff --git a/res/pokemon/swampert/data.json b/res/pokemon/swampert/data.json index b2496d44c7..0144ba9131 100644 --- a/res/pokemon/swampert/data.json +++ b/res/pokemon/swampert/data.json @@ -142,7 +142,7 @@ "category": "Mud Fish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 90, "rarity": 3, diff --git a/res/pokemon/swellow/data.json b/res/pokemon/swellow/data.json index f5bff5540e..702864a023 100644 --- a/res/pokemon/swellow/data.json +++ b/res/pokemon/swellow/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 4357 diff --git a/res/pokemon/swinub/data.json b/res/pokemon/swinub/data.json index 62e45849c2..0c2d15ff61 100644 --- a/res/pokemon/swinub/data.json +++ b/res/pokemon/swinub/data.json @@ -133,7 +133,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2061 diff --git a/res/pokemon/taillow/data.json b/res/pokemon/taillow/data.json index 240dd1899d..332f5eb07f 100644 --- a/res/pokemon/taillow/data.json +++ b/res/pokemon/taillow/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4357 diff --git a/res/pokemon/tangela/data.json b/res/pokemon/tangela/data.json index f6191293ce..076b9218c5 100644 --- a/res/pokemon/tangela/data.json +++ b/res/pokemon/tangela/data.json @@ -136,7 +136,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 diff --git a/res/pokemon/tangrowth/data.json b/res/pokemon/tangrowth/data.json index 31a80ff112..00e2f59293 100644 --- a/res/pokemon/tangrowth/data.json +++ b/res/pokemon/tangrowth/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 257 diff --git a/res/pokemon/tauros/data.json b/res/pokemon/tauros/data.json index 3031643672..6e108cb108 100644 --- a/res/pokemon/tauros/data.json +++ b/res/pokemon/tauros/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/teddiursa/data.json b/res/pokemon/teddiursa/data.json index d0ea669b53..47702e41c4 100644 --- a/res/pokemon/teddiursa/data.json +++ b/res/pokemon/teddiursa/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/tentacool/data.json b/res/pokemon/tentacool/data.json index 468608e87a..6543fd36a5 100644 --- a/res/pokemon/tentacool/data.json +++ b/res/pokemon/tentacool/data.json @@ -126,7 +126,7 @@ "category": "Jellyfish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 30, "rarity": 50, diff --git a/res/pokemon/tentacruel/data.json b/res/pokemon/tentacruel/data.json index 90da54d526..74c511f615 100644 --- a/res/pokemon/tentacruel/data.json +++ b/res/pokemon/tentacruel/data.json @@ -125,7 +125,7 @@ "category": "Jellyfish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/togekiss/data.json b/res/pokemon/togekiss/data.json index 8dfcff59ce..3b763bf478 100644 --- a/res/pokemon/togekiss/data.json +++ b/res/pokemon/togekiss/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4357 diff --git a/res/pokemon/togepi/data.json b/res/pokemon/togepi/data.json index c27e00f6e5..6b79ef87f3 100644 --- a/res/pokemon/togepi/data.json +++ b/res/pokemon/togepi/data.json @@ -139,7 +139,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 1285 diff --git a/res/pokemon/togetic/data.json b/res/pokemon/togetic/data.json index 2b35201ddc..e257226ecd 100644 --- a/res/pokemon/togetic/data.json +++ b/res/pokemon/togetic/data.json @@ -157,7 +157,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4357 diff --git a/res/pokemon/torchic/data.json b/res/pokemon/torchic/data.json index 1038f1796b..8b57993521 100644 --- a/res/pokemon/torchic/data.json +++ b/res/pokemon/torchic/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 514 diff --git a/res/pokemon/torkoal/data.json b/res/pokemon/torkoal/data.json index c38200fb6c..06b2e79cec 100644 --- a/res/pokemon/torkoal/data.json +++ b/res/pokemon/torkoal/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 diff --git a/res/pokemon/torterra/data.json b/res/pokemon/torterra/data.json index 57bb0094a8..0015b1aab2 100644 --- a/res/pokemon/torterra/data.json +++ b/res/pokemon/torterra/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 2049 diff --git a/res/pokemon/totodile/data.json b/res/pokemon/totodile/data.json index f4c0c20b92..05653448fa 100644 --- a/res/pokemon/totodile/data.json +++ b/res/pokemon/totodile/data.json @@ -139,7 +139,7 @@ "category": "Big Jaw Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/toxicroak/data.json b/res/pokemon/toxicroak/data.json index af3e77f1af..c5fb99d5b5 100644 --- a/res/pokemon/toxicroak/data.json +++ b/res/pokemon/toxicroak/data.json @@ -149,7 +149,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 3329 diff --git a/res/pokemon/trapinch/data.json b/res/pokemon/trapinch/data.json index c67c3c8fd9..52b7dce178 100644 --- a/res/pokemon/trapinch/data.json +++ b/res/pokemon/trapinch/data.json @@ -122,7 +122,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 2056 diff --git a/res/pokemon/treecko/data.json b/res/pokemon/treecko/data.json index df9437a48f..e0d1a034c7 100644 --- a/res/pokemon/treecko/data.json +++ b/res/pokemon/treecko/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 diff --git a/res/pokemon/tropius/data.json b/res/pokemon/tropius/data.json index 96a46fad9c..82415a6e71 100644 --- a/res/pokemon/tropius/data.json +++ b/res/pokemon/tropius/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4353 diff --git a/res/pokemon/turtwig/data.json b/res/pokemon/turtwig/data.json index 656f2d0b98..8efa843495 100644 --- a/res/pokemon/turtwig/data.json +++ b/res/pokemon/turtwig/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 257 diff --git a/res/pokemon/typhlosion/data.json b/res/pokemon/typhlosion/data.json index 7272508cd5..737c000e3a 100644 --- a/res/pokemon/typhlosion/data.json +++ b/res/pokemon/typhlosion/data.json @@ -138,7 +138,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 514 diff --git a/res/pokemon/tyranitar/data.json b/res/pokemon/tyranitar/data.json index 4137244fab..fac78a398d 100644 --- a/res/pokemon/tyranitar/data.json +++ b/res/pokemon/tyranitar/data.json @@ -163,7 +163,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4107 diff --git a/res/pokemon/tyrogue/data.json b/res/pokemon/tyrogue/data.json index 93bd6b3729..4b8261044b 100644 --- a/res/pokemon/tyrogue/data.json +++ b/res/pokemon/tyrogue/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2313 diff --git a/res/pokemon/umbreon/data.json b/res/pokemon/umbreon/data.json index ed63ec5a48..d66f72227e 100644 --- a/res/pokemon/umbreon/data.json +++ b/res/pokemon/umbreon/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4112 diff --git a/res/pokemon/unown/data.json b/res/pokemon/unown/data.json index a1fcaac023..43859f2643 100644 --- a/res/pokemon/unown/data.json +++ b/res/pokemon/unown/data.json @@ -71,7 +71,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 2570 diff --git a/res/pokemon/ursaring/data.json b/res/pokemon/ursaring/data.json index 145a577e18..b22c9023e1 100644 --- a/res/pokemon/ursaring/data.json +++ b/res/pokemon/ursaring/data.json @@ -144,7 +144,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/uxie/data.json b/res/pokemon/uxie/data.json index 1dd60b5d3b..0a9541873b 100644 --- a/res/pokemon/uxie/data.json +++ b/res/pokemon/uxie/data.json @@ -142,7 +142,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/vaporeon/data.json b/res/pokemon/vaporeon/data.json index 8f81eb48b4..76e3ffd6a5 100644 --- a/res/pokemon/vaporeon/data.json +++ b/res/pokemon/vaporeon/data.json @@ -130,7 +130,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 771 diff --git a/res/pokemon/venomoth/data.json b/res/pokemon/venomoth/data.json index 87fc6d9409..4000c2e3d8 100644 --- a/res/pokemon/venomoth/data.json +++ b/res/pokemon/venomoth/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1540 diff --git a/res/pokemon/venonat/data.json b/res/pokemon/venonat/data.json index 0efce73136..f7c080da45 100644 --- a/res/pokemon/venonat/data.json +++ b/res/pokemon/venonat/data.json @@ -123,7 +123,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1540 diff --git a/res/pokemon/venusaur/data.json b/res/pokemon/venusaur/data.json index 5b185bf1c5..e2308fef52 100644 --- a/res/pokemon/venusaur/data.json +++ b/res/pokemon/venusaur/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1537 diff --git a/res/pokemon/vespiquen/data.json b/res/pokemon/vespiquen/data.json index 9128172da0..7277fcc4f0 100644 --- a/res/pokemon/vespiquen/data.json +++ b/res/pokemon/vespiquen/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4356 diff --git a/res/pokemon/vibrava/data.json b/res/pokemon/vibrava/data.json index f86faacbb5..22711761fb 100644 --- a/res/pokemon/vibrava/data.json +++ b/res/pokemon/vibrava/data.json @@ -137,7 +137,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 3848 diff --git a/res/pokemon/victreebel/data.json b/res/pokemon/victreebel/data.json index 484d638d85..0d413bacb5 100644 --- a/res/pokemon/victreebel/data.json +++ b/res/pokemon/victreebel/data.json @@ -120,7 +120,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1537 diff --git a/res/pokemon/vigoroth/data.json b/res/pokemon/vigoroth/data.json index f8f88927ce..04e606444e 100644 --- a/res/pokemon/vigoroth/data.json +++ b/res/pokemon/vigoroth/data.json @@ -146,7 +146,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/vileplume/data.json b/res/pokemon/vileplume/data.json index d8b991dd1b..ca19a74b4c 100644 --- a/res/pokemon/vileplume/data.json +++ b/res/pokemon/vileplume/data.json @@ -114,7 +114,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1537 diff --git a/res/pokemon/volbeat/data.json b/res/pokemon/volbeat/data.json index 31ecfcbc17..5ac014211e 100644 --- a/res/pokemon/volbeat/data.json +++ b/res/pokemon/volbeat/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1028 diff --git a/res/pokemon/voltorb/data.json b/res/pokemon/voltorb/data.json index 7ac0060ebc..b5d08b005b 100644 --- a/res/pokemon/voltorb/data.json +++ b/res/pokemon/voltorb/data.json @@ -126,7 +126,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1799 diff --git a/res/pokemon/vulpix/data.json b/res/pokemon/vulpix/data.json index 66e2249a55..869177c6be 100644 --- a/res/pokemon/vulpix/data.json +++ b/res/pokemon/vulpix/data.json @@ -128,7 +128,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 514 diff --git a/res/pokemon/wailmer/data.json b/res/pokemon/wailmer/data.json index 5e2184e278..1a91578c9a 100644 --- a/res/pokemon/wailmer/data.json +++ b/res/pokemon/wailmer/data.json @@ -128,7 +128,7 @@ "category": "Ball Whale Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/wailord/data.json b/res/pokemon/wailord/data.json index e11ec1a153..51ee5d0568 100644 --- a/res/pokemon/wailord/data.json +++ b/res/pokemon/wailord/data.json @@ -129,7 +129,7 @@ "category": "Float Whale Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/walrein/data.json b/res/pokemon/walrein/data.json index 3b589fb942..0085a36612 100644 --- a/res/pokemon/walrein/data.json +++ b/res/pokemon/walrein/data.json @@ -134,7 +134,7 @@ "category": "Ice Break Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/wartortle/data.json b/res/pokemon/wartortle/data.json index 34f1a39a1b..9da37443de 100644 --- a/res/pokemon/wartortle/data.json +++ b/res/pokemon/wartortle/data.json @@ -138,7 +138,7 @@ "category": "Turtle Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 80, "rarity": 10, diff --git a/res/pokemon/weavile/data.json b/res/pokemon/weavile/data.json index 92f8963030..855f9adb0f 100644 --- a/res/pokemon/weavile/data.json +++ b/res/pokemon/weavile/data.json @@ -150,7 +150,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2063 diff --git a/res/pokemon/weedle/data.json b/res/pokemon/weedle/data.json index 762553b57d..a2684ba780 100644 --- a/res/pokemon/weedle/data.json +++ b/res/pokemon/weedle/data.json @@ -82,7 +82,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1540 diff --git a/res/pokemon/weepinbell/data.json b/res/pokemon/weepinbell/data.json index ea305a0a34..3903c92db1 100644 --- a/res/pokemon/weepinbell/data.json +++ b/res/pokemon/weepinbell/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1537 diff --git a/res/pokemon/weezing/data.json b/res/pokemon/weezing/data.json index 2431222270..7ef5cb680e 100644 --- a/res/pokemon/weezing/data.json +++ b/res/pokemon/weezing/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1542 diff --git a/res/pokemon/whiscash/data.json b/res/pokemon/whiscash/data.json index 58a52bdc9d..31a56bf2b9 100644 --- a/res/pokemon/whiscash/data.json +++ b/res/pokemon/whiscash/data.json @@ -135,7 +135,7 @@ "category": "Whiskers Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 70, "rarity": 20, diff --git a/res/pokemon/whismur/data.json b/res/pokemon/whismur/data.json index 88b1e225e9..afed8639a4 100644 --- a/res/pokemon/whismur/data.json +++ b/res/pokemon/whismur/data.json @@ -129,7 +129,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 50, "rarity": 30, "unused": 1285 diff --git a/res/pokemon/wigglytuff/data.json b/res/pokemon/wigglytuff/data.json index d9445933f6..d6c1a4ab6b 100644 --- a/res/pokemon/wigglytuff/data.json +++ b/res/pokemon/wigglytuff/data.json @@ -141,7 +141,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 1285 diff --git a/res/pokemon/wingull/data.json b/res/pokemon/wingull/data.json index 8da70b3e3f..5e72a11330 100644 --- a/res/pokemon/wingull/data.json +++ b/res/pokemon/wingull/data.json @@ -132,7 +132,7 @@ "category": "Seagull Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_SOUTH_EAST", "catching_points": 30, "rarity": 50, diff --git a/res/pokemon/wobbuffet/data.json b/res/pokemon/wobbuffet/data.json index 6e8dfa264c..d8a267d97d 100644 --- a/res/pokemon/wobbuffet/data.json +++ b/res/pokemon/wobbuffet/data.json @@ -76,7 +76,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 diff --git a/res/pokemon/wooper/data.json b/res/pokemon/wooper/data.json index eba6b1e82f..82ede9789a 100644 --- a/res/pokemon/wooper/data.json +++ b/res/pokemon/wooper/data.json @@ -134,7 +134,7 @@ "category": "Water Fish Pokémon" }, "catching_show_data": { - "pal_park_land_area": "PAL_PARK_AREA_NONE", + "pal_park_land_area": "PAL_PARK_AREA_LAND_NONE", "pal_park_water_area": "PAL_PARK_AREA_WATER_NORTH_EAST", "catching_points": 50, "rarity": 30, diff --git a/res/pokemon/wormadam/data.json b/res/pokemon/wormadam/data.json index cf151781ee..9a1ea6ab2a 100644 --- a/res/pokemon/wormadam/data.json +++ b/res/pokemon/wormadam/data.json @@ -125,7 +125,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 260 diff --git a/res/pokemon/wurmple/data.json b/res/pokemon/wurmple/data.json index e294c63244..94cf20d3a3 100644 --- a/res/pokemon/wurmple/data.json +++ b/res/pokemon/wurmple/data.json @@ -90,7 +90,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1028 diff --git a/res/pokemon/wynaut/data.json b/res/pokemon/wynaut/data.json index 0fdaa50deb..2e657fef18 100644 --- a/res/pokemon/wynaut/data.json +++ b/res/pokemon/wynaut/data.json @@ -88,7 +88,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 2570 diff --git a/res/pokemon/xatu/data.json b/res/pokemon/xatu/data.json index 91113325d1..cf3d06c366 100644 --- a/res/pokemon/xatu/data.json +++ b/res/pokemon/xatu/data.json @@ -145,7 +145,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 4362 diff --git a/res/pokemon/yanma/data.json b/res/pokemon/yanma/data.json index b95aea1eca..9bb39a7049 100644 --- a/res/pokemon/yanma/data.json +++ b/res/pokemon/yanma/data.json @@ -134,7 +134,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4356 diff --git a/res/pokemon/yanmega/data.json b/res/pokemon/yanmega/data.json index 4c75ecf0bf..bd123bba16 100644 --- a/res/pokemon/yanmega/data.json +++ b/res/pokemon/yanmega/data.json @@ -135,7 +135,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 80, "rarity": 10, "unused": 4356 diff --git a/res/pokemon/zangoose/data.json b/res/pokemon/zangoose/data.json index 2ec251f0dd..6fd56b0a08 100644 --- a/res/pokemon/zangoose/data.json +++ b/res/pokemon/zangoose/data.json @@ -151,7 +151,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 70, "rarity": 20, "unused": 1285 diff --git a/res/pokemon/zapdos/data.json b/res/pokemon/zapdos/data.json index bbacb64840..a64c0a8c6c 100644 --- a/res/pokemon/zapdos/data.json +++ b/res/pokemon/zapdos/data.json @@ -132,7 +132,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 90, "rarity": 3, "unused": 4359 diff --git a/res/pokemon/zigzagoon/data.json b/res/pokemon/zigzagoon/data.json index a4b83983b7..ca4539d55d 100644 --- a/res/pokemon/zigzagoon/data.json +++ b/res/pokemon/zigzagoon/data.json @@ -140,7 +140,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_SOUTH_WEST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 1285 diff --git a/res/pokemon/zubat/data.json b/res/pokemon/zubat/data.json index 68467e45ee..9f518a7b08 100644 --- a/res/pokemon/zubat/data.json +++ b/res/pokemon/zubat/data.json @@ -131,7 +131,7 @@ }, "catching_show_data": { "pal_park_land_area": "PAL_PARK_AREA_LAND_NORTH_EAST", - "pal_park_water_area": "PAL_PARK_AREA_NONE", + "pal_park_water_area": "PAL_PARK_AREA_WATER_NONE", "catching_points": 30, "rarity": 50, "unused": 4358 diff --git a/src/catching_show.c b/src/catching_show.c index c5bbeaa66a..e4ee83c7e0 100644 --- a/src/catching_show.c +++ b/src/catching_show.c @@ -24,6 +24,7 @@ #include "unk_0202EEC0.h" #include "unk_02054D00.h" +#define NO_ENCOUNTER 0 #define POINTS_LOST_PER_SECOND 2 #define BYTES_PER_SPECIES 6 #define WEIGHT_NO_ENCOUNTER 20 @@ -147,7 +148,7 @@ static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow if (speciesData[SPECIES_DATA_LAND_AREA] != 0) { catchingShow->pokemon[i].area = speciesData[SPECIES_DATA_LAND_AREA]; } else { - catchingShow->pokemon[i].area = PAL_PARK_AREA_WATER_NORTH_WEST - 1 + speciesData[SPECIES_DATA_WATER_AREA]; + catchingShow->pokemon[i].area = PAL_PARK_AREA_LAND_END - 1 + speciesData[SPECIES_DATA_WATER_AREA]; } catchingShow->pokemon[i].rarity = speciesData[SPECIES_DATA_RARITY]; @@ -199,10 +200,10 @@ 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; + return NO_ENCOUNTER; } static BOOL TryStartEncounter(FieldSystem *fieldSystem, CatchingShow *catchingShow, int playerX, int playerY) @@ -211,7 +212,7 @@ static BOOL TryStartEncounter(FieldSystem *fieldSystem, CatchingShow *catchingSh int encounterChance, totalRarity = 0; int area = GetEncounterArea(fieldSystem, playerX, playerY); - if (area == PAL_PARK_AREA_NONE) { + if (area == NO_ENCOUNTER) { return FALSE; } From c3328afd545858515517b997fe159aa895271d4b Mon Sep 17 00:00:00 2001 From: iriv24 Date: Sun, 12 Jan 2025 00:24:26 -0500 Subject: [PATCH 17/28] Add script to repack ppark.narc, delete res/prebuilt/arc/ppark.narc --- platinum.us/filesys.sha1 | 2 +- platinum.us/rom.rsf | 8 +++++- res/pokemon/meson.build | 15 +++++++++++ res/prebuilt/arc/meson.build | 1 - res/prebuilt/arc/ppark.narc | Bin 3020 -> 0 bytes tools/json2bin/catching_show_data.py | 39 +++++++++++++++++++++++++++ tools/json2bin/meson.build | 1 + 7 files changed, 63 insertions(+), 3 deletions(-) delete mode 100644 res/prebuilt/arc/ppark.narc create mode 100644 tools/json2bin/catching_show_data.py 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/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/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 3e95554c58a5d4d7a00f37166babc87e2df99561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3020 zcmZveL9VMt6hs>uunoq>5@Qy@4*risltI3%=#Ln`^<8Ps)CuqWvp%clLY!%?Z;B>dMj<1$ zN5I!xt!=zkcyAAff_)E%lC{TU$=c&l^BddphlR-{w5of(J5i|FDZQP3g-8if&D`92r_3W;Egk@=cR*z^UtcI#@sY2WE zpvuO+LVlo5gcs}!>P{6%4c>&WXT|T>anoUs(pYPhkCyRzm5;7hjbE9m>KEywP_}Tz z8F3xuTzAeT$3@QXh+iD7 z1>w`tw#vpTsRE-s`a`$?2D<1KJ`t;M7RXG;i4LICG4AtL(P55OEJ_w9!eP+918?z; zRdhaw-V`nBTQmObLKo>%9!Eds{POPBia7AF=IWAot~%vkp~HC^dh=E*encoS5^6z* z^VHjA{n3ndJEh_JW$fXTv$NweUO=LG?NDl$Os)5QEP4?&LSvzmy%+ASw5o~-!_k`> zttG~#!>GRXMsD(>Mmn~Hy@%ecD|fR3RHekvo33yl(N0?h$(AahD|nmcVNeBy?;88s z`JenZNp1=~fJ9?Q`dH*ZHOV2OSxYs%F+bGkk*KLq^;K5b6xZl}kvmkKg5D_hqEd>f zXJ*ooVkR{`i*wa6su?`L`m=J2w;cwKTEtBB##-t~&zz@=yO8kS3W?xOae{6e}F@?7~Dl)K#_`4^nWF5C`wrEvc& z*DFumZueFyif7!^E33X21GHNr3sJs%sdf=3JA61!d8%`&iz?>a*!rBjeV&&S*e114UwZBqS1@WUe{n^|ax6T|qSZ^p3jTxg$tIzP&bk&LUr6dKW>Z6bjKZ=2DKWJ=v JuItawe*s4p({TU* 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) From b57db45dec4f649c694d47fd2390fa20c5c3fe16 Mon Sep 17 00:00:00 2001 From: iriv24 Date: Sun, 12 Jan 2025 12:34:02 -0500 Subject: [PATCH 18/28] Replace NO_ENCOUNTER with PAL_PARK_AREA_NONE --- src/catching_show.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/catching_show.c b/src/catching_show.c index e4ee83c7e0..d85ecedd35 100644 --- a/src/catching_show.c +++ b/src/catching_show.c @@ -24,7 +24,7 @@ #include "unk_0202EEC0.h" #include "unk_02054D00.h" -#define NO_ENCOUNTER 0 +#define PAL_PARK_AREA_NONE 0 #define POINTS_LOST_PER_SECOND 2 #define BYTES_PER_SPECIES 6 #define WEIGHT_NO_ENCOUNTER 20 @@ -203,7 +203,7 @@ static int GetEncounterArea(FieldSystem *fieldSystem, int playerX, int playerY) return PAL_PARK_AREA_LAND_END + area; } - return NO_ENCOUNTER; + return PAL_PARK_AREA_NONE; } static BOOL TryStartEncounter(FieldSystem *fieldSystem, CatchingShow *catchingShow, int playerX, int playerY) @@ -212,7 +212,7 @@ static BOOL TryStartEncounter(FieldSystem *fieldSystem, CatchingShow *catchingSh int encounterChance, totalRarity = 0; int area = GetEncounterArea(fieldSystem, playerX, playerY); - if (area == NO_ENCOUNTER) { + if (area == PAL_PARK_AREA_NONE) { return FALSE; } From b5f552698826a36a2aba61c62af6c35a877735ca Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Tue, 14 Jan 2025 07:03:54 -0500 Subject: [PATCH 19/28] Fix Merge Errors --- include/field_battle_data_transfer.h | 2 +- include/overlay021/struct_ov21_021D0D80.h | 4 +- include/overlay025/poketch_system.h | 4 +- include/party.h | 2 +- include/pokedex_data.h | 86 +++---- include/poketch_data.h | 60 ++--- include/struct_defs/battle_system.h | 2 +- include/struct_defs/struct_0207AE68_t.h | 2 +- include/unk_0207AE68.h | 2 +- .../journal_display/journal_printer.c | 2 +- src/battle/ov16_0223B140.c | 24 +- src/battle/ov16_0223DF00.c | 14 +- src/catching_show.c | 2 +- src/encounter.c | 2 +- src/field_battle_data_transfer.c | 18 +- src/field_comm_manager.c | 2 +- src/field_menu.c | 68 +++--- src/overlay005/ov5_021DDAE4.c | 4 +- src/overlay005/ov5_021EA714.c | 24 +- src/overlay005/ov5_021F6454.c | 2 +- src/overlay005/save_info_window.c | 4 +- src/overlay006/ov6_02240C9C.c | 6 +- src/overlay006/ov6_02242984.c | 2 +- src/overlay010/ov10_0221F800.c | 16 +- src/overlay021/ov21_021D0D80.c | 16 +- src/overlay021/pokedex_sort.c | 4 +- src/overlay023/ov23_0223E140.c | 2 +- src/overlay023/ov23_022521F0.c | 2 +- src/overlay025/ov25_02254560.c | 16 +- src/overlay025/poketch_system.c | 22 +- src/overlay028/ov28_022561C0.c | 2 +- src/overlay031/ov31_022561C0.c | 18 +- src/overlay036/ov36_022561C0.c | 10 +- src/overlay045/ov45_022561C0.c | 10 +- src/overlay047/ov47_022561C0.c | 8 +- src/overlay049/ov49_022561C0.c | 8 +- src/overlay050/ov50_022561C0.c | 12 +- src/overlay054/ov54_022561C0.c | 10 +- src/overlay066/ov66_0222DDF0.c | 2 +- src/overlay097/ov97_0222AE60.c | 6 +- src/overlay097/ov97_0222C174.c | 4 +- src/overlay118/ov118_021D0D80.c | 2 +- src/party.c | 2 +- src/pokedex_data.c | 172 +++++++------- src/poketch_data.c | 218 +++++++++--------- src/savedata/save_table.c | 2 +- src/scrcmd.c | 20 +- src/scrcmd_system_flags.c | 2 +- src/unk_0202F1D4.c | 2 +- src/unk_0203D1B8.c | 6 +- src/unk_02046C7C.c | 2 +- src/unk_02048DD8.c | 4 +- src/unk_0204AEE8.c | 2 +- src/unk_0204B830.c | 8 +- src/unk_02052C6C.c | 2 +- src/unk_020683F4.c | 2 +- src/unk_0206CCB0.c | 22 +- src/unk_02071D40.c | 4 +- src/unk_0207A274.c | 2 +- src/unk_0207A6DC.c | 4 +- src/unk_0207AE68.c | 10 +- src/unk_020933F8.c | 6 +- src/unk_0209747C.c | 2 +- 63 files changed, 499 insertions(+), 503 deletions(-) diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h index 4b2c278271..81ffcf9cf1 100644 --- a/include/field_battle_data_transfer.h +++ b/include/field_battle_data_transfer.h @@ -42,7 +42,7 @@ typedef struct FieldBattleDTO { Pokedex *pokedex; PCBoxes *pcBoxes; ChatotCry *chatotCries[MAX_BATTLERS]; - PoketchData *poketchData; + Poketch *poketch; UnkStruct_0202C878 *unk_104; Options *options; UnkStruct_0206D140 *unk_10C; diff --git a/include/overlay021/struct_ov21_021D0D80.h b/include/overlay021/struct_ov21_021D0D80.h index 93088fe1f2..932ee891ad 100644 --- a/include/overlay021/struct_ov21_021D0D80.h +++ b/include/overlay021/struct_ov21_021D0D80.h @@ -7,8 +7,8 @@ #include "trainer_info.h" typedef struct { - const Pokedex *unk_00; - const TrainerInfo *unk_04; + const Pokedex *pokedex; + const TrainerInfo *trainerInfo; int timeOfDay; BOOL fullmoonIslandVisible; BOOL newmoonIslandVisible; diff --git a/include/overlay025/poketch_system.h b/include/overlay025/poketch_system.h index 05baa63223..4db20f8487 100644 --- a/include/overlay025/poketch_system.h +++ b/include/overlay025/poketch_system.h @@ -110,7 +110,7 @@ struct PoketchSystem { NNSG2dOamManagerInstance *oamManager; SaveData *saveData; - PoketchData *poketchData; + Poketch *poketch; FieldSystem *fieldSystem; enum ButtonDir buttonDir; }; @@ -135,7 +135,7 @@ void ov25_02254518(const PoketchSystem *poketchSys, PoketchButtonManager *button BOOL PoketchSystem_IsPlayerMoving(const PoketchSystem *poketchSys); BOOL PoketchSystem_PedometerUpdated(const PoketchSystem *poketchSys); FieldSystem *PoketchSystem_GetFieldSystem(const PoketchSystem *poketchSys); -PoketchData *PoketchSystem_GetPoketchData(const PoketchSystem *poketchSys); +Poketch *PoketchSystem_GetPoketchData(const PoketchSystem *poketchSys); SaveData *PoketchSystem_GetSaveData(const PoketchSystem *poketchSys); int PoketchSystem_GetBorderColor(const PoketchSystem *poketchSys); diff --git a/include/party.h b/include/party.h index b0406f5b42..74f2fcf93f 100644 --- a/include/party.h +++ b/include/party.h @@ -17,7 +17,7 @@ int Party_GetCurrentCount(const Party *party); Pokemon *Party_GetPokemonBySlotIndex(const Party *party, int slot); void sub_0207A128(Party *party, int slot, Pokemon *param2); BOOL Party_SwapSlots(Party *party, int slotA, int slotB); -void Party_cpy(const Party *src, Party *dest); +void Party_Copy(const Party *src, Party *dest); BOOL Party_HasSpecies(const Party *party, int species); Party *Party_GetFromSavedata(SaveData *party); diff --git a/include/pokedex_data.h b/include/pokedex_data.h index beedad7084..a0ec36ff88 100644 --- a/include/pokedex_data.h +++ b/include/pokedex_data.h @@ -6,48 +6,48 @@ #include "pokemon.h" #include "savedata.h" -int PokedexData_SaveSize(void); -PokedexData *PokedexData_Alloc(u32 heapID); -void PokedexData_Copy(const PokedexData *src, PokedexData *dest); -void PokedexData_Init(PokedexData *pokedexData); -u16 PokedexData_CountCaught_National(const PokedexData *pokedexData); -u16 PokedexData_CountSeen_National(const PokedexData *pokedexData); -u16 PokedexData_CountSeen(const PokedexData *pokedexData); -u16 PokedexData_CountCaught_Local(const PokedexData *pokedexData); -u16 PokedexData_CountSeen_Local(const PokedexData *pokedexData); -BOOL PokedexData_NationalDexCompleted(const PokedexData *pokedexData); -BOOL PokedexData_LocalDexCompleted(const PokedexData *pokedexData); -u16 PokedexData_NumCaught_National(const PokedexData *pokedexData); -u16 PokedexData_NumCaught_Local(const PokedexData *pokedexData); -BOOL PokedexData_HasCaughtSpecies(const PokedexData *pokedexData, u16 species); -BOOL PokedexData_HasSeenSpecies(const PokedexData *pokedexData, u16 species); -u32 PokedexData_GetForm_Spinda(const PokedexData *pokedexData, u8 formIndex); -u32 PokedexData_DisplayedGender(const PokedexData *pokedexData, u16 species, int displaySecondary); -u32 PokedexData_GetForm_Unown(const PokedexData *pokedexData, int formIndex); -u32 PokedexData_NumFormsSeen_Unown(const PokedexData *pokedexData); -u32 PokedexData_GetForm_Shellos(const PokedexData *pokedexData, int formIndex); -u32 PokedexData_NumFormsSeen_Shellos(const PokedexData *pokedexData); -u32 PokedexData_GetForm_Gastrodon(const PokedexData *pokedexData, int formIndex); -u32 PokedexData_NumFormsSeen_Gastrodon(const PokedexData *pokedexData); -u32 PokedexData_GetForm_Burmy(const PokedexData *pokedexData, int formIndex); -u32 PokedexData_NumFormsSeen_Burmy(const PokedexData *pokedexData); -u32 PokedexData_GetForm_Wormadam(const PokedexData *pokedexData, int formIndex); -u32 PokedexData_NumFormsSeen_Wormadam(const PokedexData *pokedexData); -u32 PokedexData_GetForm_Deoxys(const PokedexData *pokedexData, int formIndex); -u32 PokedexData_NumFormsSeen_Deoxys(const PokedexData *pokedexData); -void PokedexData_Encounter(PokedexData *pokedexData, Pokemon *pokemon); -void PokedexData_Capture(PokedexData *pokedexData, Pokemon *pokemon); -void PokedexData_ObtainNationalDex(PokedexData *pokedexData); -BOOL PokedexData_IsNationalDexObtained(const PokedexData *pokedexData); -BOOL PokedexData_CanDetectForms(const PokedexData *pokedexData); -void PokedexData_TurnOnFormDetection(PokedexData *pokedexData); -BOOL PokedexData_IsLanguageObtained(const PokedexData *pokedexData, u16 species, u32 languageIndex); -void PokedexData_TurnOnLanguageDetection(PokedexData *pokedexData); -BOOL PokedexData_CanDetectLanguages(const PokedexData *pokedexData); -BOOL PokedexData_IsObtained(const PokedexData *pokedexData); -void PokedexData_ObtainPokedex(PokedexData *pokedexData); -PokedexData *SaveData_PokedexData(SaveData *saveData); -u32 PokedexData_GetDisplayForm(const PokedexData *pokedexData, int species, int formIndex); -u32 PokedexData_NumFormsSeen(const PokedexData *pokedexData, int species); +int Pokedex_SaveSize(void); +Pokedex *Pokedex_New(u32 heapID); +void Pokedex_Copy(const Pokedex *src, Pokedex *dest); +void Pokedex_Init(Pokedex *pokedex); +u16 Pokedex_CountCaught_National(const Pokedex *pokedex); +u16 Pokedex_CountSeen_National(const Pokedex *pokedex); +u16 Pokedex_CountSeen(const Pokedex *pokedex); +u16 PokedexData_CountCaught_Local(const Pokedex *pokedex); +u16 PokedexData_CountSeen_Local(const Pokedex *pokedex); +BOOL PokedexData_NationalDexCompleted(const Pokedex *pokedex); +BOOL PokedexData_LocalDexCompleted(const Pokedex *pokedex); +u16 PokedexData_NumCaught_National(const Pokedex *pokedex); +u16 PokedexData_NumCaught_Local(const Pokedex *pokedex); +BOOL PokedexData_HasCaughtSpecies(const Pokedex *pokedex, u16 species); +BOOL PokedexData_HasSeenSpecies(const Pokedex *pokedex, u16 species); +u32 PokedexData_GetForm_Spinda(const Pokedex *pokedex, u8 formIndex); +u32 PokedexData_DisplayedGender(const Pokedex *pokedex, u16 species, int displaySecondary); +u32 PokedexData_GetForm_Unown(const Pokedex *pokedex, int formIndex); +u32 PokedexData_NumFormsSeen_Unown(const Pokedex *pokedex); +u32 PokedexData_GetForm_Shellos(const Pokedex *pokedex, int formIndex); +u32 PokedexData_NumFormsSeen_Shellos(const Pokedex *pokedex); +u32 PokedexData_GetForm_Gastrodon(const Pokedex *pokedex, int formIndex); +u32 PokedexData_NumFormsSeen_Gastrodon(const Pokedex *pokedex); +u32 PokedexData_GetForm_Burmy(const Pokedex *pokedex, int formIndex); +u32 PokedexData_NumFormsSeen_Burmy(const Pokedex *pokedex); +u32 PokedexData_GetForm_Wormadam(const Pokedex *pokedex, int formIndex); +u32 PokedexData_NumFormsSeen_Wormadam(const Pokedex *pokedex); +u32 PokedexData_GetForm_Deoxys(const Pokedex *pokedex, int formIndex); +u32 PokedexData_NumFormsSeen_Deoxys(const Pokedex *pokedex); +void Pokedex_Encounter(Pokedex *pokedex, Pokemon *pokemon); +void PokedexData_Capture(Pokedex *pokedex, Pokemon *pokemon); +void PokedexData_ObtainNationalDex(Pokedex *pokedex); +BOOL PokedexData_IsNationalDexObtained(const Pokedex *pokedex); +BOOL PokedexData_CanDetectForms(const Pokedex *pokedex); +void PokedexData_TurnOnFormDetection(Pokedex *pokedex); +BOOL PokedexData_IsLanguageObtained(const Pokedex *pokedex, u16 species, u32 languageIndex); +void PokedexData_TurnOnLanguageDetection(Pokedex *pokedex); +BOOL PokedexData_CanDetectLanguages(const Pokedex *pokedex); +BOOL Pokedex_IsObtained(const Pokedex *pokedex); +void PokedexData_ObtainPokedex(Pokedex *pokedex); +Pokedex *SaveData_Pokedex(SaveData *saveData); +u32 Pokedex_GetDisplayForm(const Pokedex *pokedex, int species, int formIndex); +u32 PokedexData_NumFormsSeen(const Pokedex *pokedex, int species); #endif // POKEPLATINUM_POKEDEX_DATA_H diff --git a/include/poketch_data.h b/include/poketch_data.h index e94a0c9dd5..7732f564a7 100644 --- a/include/poketch_data.h +++ b/include/poketch_data.h @@ -28,7 +28,7 @@ enum PoketchScreenColor { /** * @brief All of the Poketch's internally tracked data including settings, registered apps, and the data for some apps (eg. pedometer, alarm clock). */ -typedef struct PoketchData { +typedef struct Poketch { u8 poketchEnabled : 1; u8 pedometerEnabled : 1; //!< Whether or not the pedometer is registered and will take step count updates. u8 dotArtModifiedByPlayer : 1; //!< Whether or not the dot art data has ever been modified by the user. This flag can never be set to FALSE. @@ -67,106 +67,106 @@ typedef struct PoketchData { u16 icon; u32 form; } pokemonHistoryQueue[POKETCH_POKEMONHISTORY_MAX]; //!< The pokemon to display in the Pokemon History app -} PoketchData; +} Poketch; int Poketch_SaveSize(void); -void Poketch_Init(PoketchData *poketchData); +void Poketch_Init(Poketch *poketch); -void PoketchData_Enable(PoketchData *poketchData); +void PoketchData_Enable(Poketch *poketch); -BOOL PoketchData_IsEnabled(PoketchData *poketchData); +BOOL PoketchData_IsEnabled(Poketch *poketch); -BOOL PoketchData_IsAppRegistered(PoketchData *poketchData, enum PoketchAppID appID); +BOOL PoketchData_IsAppRegistered(Poketch *poketch, enum PoketchAppID appID); -BOOL PoketchData_RegisterApp(PoketchData *poketchData, enum PoketchAppID appID); +BOOL PoketchData_RegisterApp(Poketch *poketch, enum PoketchAppID appID); -enum PoketchAppID PoketchData_CurrentAppID(const PoketchData *poketchData); +enum PoketchAppID PoketchData_CurrentAppID(const Poketch *poketch); /** * Sets the current Poketch app to the next registered app, skipping unregistered App IDs and wrapping around if necessary. */ -int PoketchData_IncrementAppID(PoketchData *poketchData); +int PoketchData_IncrementAppID(Poketch *poketch); /** * Sets the current Poketch app to the previous registered app, skipping unregistered App IDs and wrapping around if necessary. */ -int PoketchData_DecrementAppID(PoketchData *poketchData); +int PoketchData_DecrementAppID(Poketch *poketch); -u32 PoketchData_CurrentScreenColor(const PoketchData *poketchData); +u32 PoketchData_CurrentScreenColor(const Poketch *poketch); /** * Sets the Poketch's color setting with values from the PoketchScreenColor enum above. * This function asserts that the given value is less than POKETCH_SCREEN_COLOR_MAX. */ -void PoketchData_SetScreenColor(PoketchData *poketchData, u32 screenColor); +void PoketchData_SetScreenColor(Poketch *poketch, u32 screenColor); -u32 PoketchData_StepCount(const PoketchData *poketchData); +u32 PoketchData_StepCount(const Poketch *poketch); /** * Overwrites the current step count. This function will not do anything unless the Pedometer app is registered. */ -void PoketchData_SetStepCount(PoketchData *poketchData, u32 value); +void PoketchData_SetStepCount(Poketch *poketch, u32 value); -BOOL PoketchData_IsAlarmSet(const PoketchData *poketchData); +BOOL PoketchData_IsAlarmSet(const Poketch *poketch); -void PoketchData_AlarmTime(const PoketchData *poketchData, u32 *hour, u32 *minute); +void PoketchData_AlarmTime(const Poketch *poketch, u32 *hour, u32 *minute); -void PoketchData_SetAlarm(PoketchData *poketchData, BOOL enabled, u32 hour, u32 minute); +void PoketchData_SetAlarm(Poketch *poketch, BOOL enabled, u32 hour, u32 minute); /** * Marks the given date on the Calendar app as highlighted. * Passing this function a new month will change the month on the calendar and clear all days except the given one. */ -void PoketchData_SetCalendarMark(PoketchData *poketchData, u32 month, u32 day); +void PoketchData_SetCalendarMark(Poketch *poketch, u32 month, u32 day); /** * Clears the mark on the given date on the Calendar app. * Passing this function a new month will change the month on the calendar and clear every day. */ -void PoketchData_ClearCalendarMark(PoketchData *poketchData, u32 month, u32 day); +void PoketchData_ClearCalendarMark(Poketch *poketch, u32 month, u32 day); -BOOL PoketchData_CalendarMarked(const PoketchData *poketchData, u32 month, u32 day); +BOOL PoketchData_CalendarMarked(const Poketch *poketch, u32 month, u32 day); /** * Sets the location of a map marker. Asserts that index is less than POKETCH_MAPMARKER_COUNT. */ -void PoketchData_SetMapMarker(PoketchData *poketchData, int index, u8 x, u8 y); +void PoketchData_SetMapMarker(Poketch *poketch, int index, u8 x, u8 y); /** * Gets the location of a map marker. Asserts that index is less than POKETCH_MAPMARKER_COUNT. */ -void PoketchData_MapMarkerPos(const PoketchData *poketchData, int index, u8 *x, u8 *y); +void PoketchData_MapMarkerPos(const Poketch *poketch, int index, u8 *x, u8 *y); /** * Checks whether or not the Dot Art data has been modified at any point. * This will return FALSE until PoketchData_ModifyDotArtData is called, at which point it will always return TRUE. */ -BOOL PoketchData_DotArtModified(const PoketchData *poketchData); +BOOL PoketchData_DotArtModified(const Poketch *poketch); -void PoketchData_CopyDotArtData(const PoketchData *poketchData, u8 *dst); +void PoketchData_CopyDotArtData(const Poketch *poketch, u8 *dst); -void PoketchData_ModifyDotArtData(PoketchData *poketchData, const u8 *src); +void PoketchData_ModifyDotArtData(Poketch *poketch, const u8 *src); /** * Adds a new Pokemon to the end of the Pokemon History list. */ -void PoketchData_PokemonHistoryEnqueue(PoketchData *poketchData, const BoxPokemon *boxPokemon); +void PoketchData_PokemonHistoryEnqueue(Poketch *poketch, const BoxPokemon *boxPokemon); -int PoketchData_PokemonHistorySize(const PoketchData *poketchData); +int PoketchData_PokemonHistorySize(const Poketch *poketch); /** * Gets the species and icon info of a given index in the Pokemon History. * This function asserts that index is less than POKETCH_POKEMONHISTORY_MAX. */ -void PoketchData_PokemonHistorySpeciesAndIcon(const PoketchData *poketchData, int index, int *species, int *icon); +void PoketchData_PokemonHistorySpeciesAndIcon(const Poketch *poketch, int index, int *species, int *icon); /** * Gets the form info of a given index in the pokemon history. * This function asserts that index is less than POKETCH_POKEMONHISTORY_MAX. */ -u32 PoketchData_PokemonHistoryForm(const PoketchData *poketchData, int index); +u32 PoketchData_PokemonHistoryForm(const Poketch *poketch, int index); -PoketchData *SaveData_PoketchData(SaveData *saveData); +Poketch *SaveData_PoketchData(SaveData *saveData); #endif // POKEPLATINUM_POKETCH_DATA_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index b788deebd3..732c7e52f6 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -68,7 +68,7 @@ struct BattleSystem { UnkStruct_ov12_0221FCDC *unk_8C; SpriteRenderer *unk_90; SpriteGfxHandler *unk_94; - PoketchData *poketchData; + Poketch *poketch; UnkStruct_0206D140 *unk_9C; u16 trainerIDs[MAX_BATTLERS]; u8 unk_A8[4]; diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index e93597e072..4d1fe2d840 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -45,7 +45,7 @@ struct UnkStruct_0207AE68_t { Pokedex *unk_48; Bag *unk_4C; GameRecords *records; - PoketchData *poketchData; + Poketch *poketch; void *unk_58; int unk_5C; u16 unk_60; diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h index 870f2fa888..f68be04d1e 100644 --- a/include/unk_0207AE68.h +++ b/include/unk_0207AE68.h @@ -11,7 +11,7 @@ #include "pokemon.h" #include "poketch_data.h" -UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11); +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int param11); BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0); void sub_0207B0E0(UnkStruct_0207AE68 *param0); diff --git a/src/applications/journal_display/journal_printer.c b/src/applications/journal_display/journal_printer.c index 25ec294a39..7179eea8e9 100644 --- a/src/applications/journal_display/journal_printer.c +++ b/src/applications/journal_display/journal_printer.c @@ -344,7 +344,7 @@ static void JournalPrinter_PrintTrainerEvent(JournalManager *journalManager, Win strLength = Strbuf_Length(name); Strbuf_Free(name); - if (TrainerData_LoadParam(journalEntryTrainer.trainerID, TRDATA_CLASS) == TRAINER_CLASS_RIVAL) { + if (Trainer_LoadParam(journalEntryTrainer.trainerID, TRDATA_CLASS) == TRAINER_CLASS_RIVAL) { name = MessageLoader_GetNewStrbuf(journalManager->loader, journal_entries_rival_name); StringTemplate_SetRivalName(journalManager->template, 1, journalManager->saveData); StringTemplate_Format(journalManager->template, journalManager->strbuf, name); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 963a0346cc..f7695bedbe 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -268,7 +268,7 @@ BOOL Battle_Main(OverlayManager *param0, int *param1) if (v2) { Heap_Create(3, 73, 0x30000); v4 = Party_GetPokemonBySlotIndex(v0->parties[0], v1); - v0->unk_170 = sub_0207AE68(v0->parties[0], v4, v2, v0->options, v0->visitedContestHall, v0->pokedex, v0->bag, v0->records, v0->poketchData, v3, 0x1 | 0x2, 73); + v0->unk_170 = sub_0207AE68(v0->parties[0], v4, v2, v0->options, v0->visitedContestHall, v0->pokedex, v0->bag, v0->records, v0->poketch, v3, 0x1 | 0x2, 73); *param1 = 14; } else { *param1 = 15; @@ -722,7 +722,7 @@ static void ov16_0223BCB4(OverlayManager *param0) } for (battlerId = 0; battlerId < MAX_BATTLERS; battlerId++) { - Party_cpy(battleSystem->parties[battlerId], v1->parties[battlerId]); + Party_Copy(battleSystem->parties[battlerId], v1->parties[battlerId]); Heap_FreeToHeap(battleSystem->parties[battlerId]); TrainerInfo_Copy(battleSystem->trainerInfo[battlerId], v1->trainerInfo[battlerId]); Heap_FreeToHeap(battleSystem->trainerInfo[battlerId]); @@ -736,7 +736,7 @@ static void ov16_0223BCB4(OverlayManager *param0) v1->pcBoxes = battleSystem->pcBoxes; v1->bagCursor = battleSystem->unk_5C; v1->subscreenCursorOn = battleSystem->unk_1BC; - v1->poketchData = battleSystem->poketchData; + v1->poketch = battleSystem->poketch; v1->unk_10C = battleSystem->unk_9C; v1->countSafariBalls = battleSystem->safariBalls; v1->resultMask = battleSystem->resultMask & (0xc0 ^ 0xff); @@ -1091,7 +1091,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->unk_1B4 = param1->unk_124; param0->unk_5C = param1->bagCursor; param0->unk_1BC = param1->subscreenCursorOn; - param0->poketchData = param1->poketchData; + param0->poketch = param1->poketch; param0->unk_2420 = param1->mapEvolutionMethod; param0->unk_9C = param1->unk_10C; param0->safariBalls = param1->countSafariBalls; @@ -1149,7 +1149,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) for (v0 = 0; v0 < 4; v0++) { ov16_02263730(param0, param0->battlers[v0]); - Party_cpy(param1->parties[v0], param0->parties[v0]); + Party_Copy(param1->parties[v0], param0->parties[v0]); } for (v0 = 0; v0 < param0->maxBattlers; v0++) { @@ -1176,7 +1176,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) for (v0 = 0; v0 < 4; v0++) { ov16_02263730(param0, param0->battlers[v0]); - Party_cpy(param1->parties[v0], param0->parties[v0]); + Party_Copy(param1->parties[v0], param0->parties[v0]); } for (v0 = 0; v0 < param0->maxBattlers; v0++) { @@ -1203,7 +1203,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->maxBattlers = v0; for (v0 = 0; v0 < 4; v0++) { - Party_cpy(param1->parties[v0], param0->parties[v0]); + Party_Copy(param1->parties[v0], param0->parties[v0]); } for (v0 = 0; v0 < param0->maxBattlers; v0++) { @@ -1234,7 +1234,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->maxBattlers = v0; for (v0 = 0; v0 < 4; v0++) { - Party_cpy(param1->parties[v0], param0->parties[v0]); + Party_Copy(param1->parties[v0], param0->parties[v0]); for (v1 = 0; v1 < Party_GetCurrentCount(param0->parties[v0]); v1++) { v3 = Party_GetPokemonBySlotIndex(param0->parties[v0], v1); @@ -1263,7 +1263,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->maxBattlers = v0; for (v0 = 0; v0 < 4; v0++) { - Party_cpy(param1->parties[v0], param0->parties[v0]); + Party_Copy(param1->parties[v0], param0->parties[v0]); } for (v0 = 0; v0 < param0->maxBattlers; v0++) { @@ -1301,7 +1301,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->maxBattlers = v0; for (v0 = 0; v0 < 4; v0++) { - Party_cpy(param1->parties[v0], param0->parties[v0]); + Party_Copy(param1->parties[v0], param0->parties[v0]); } for (v0 = 0; v0 < param0->maxBattlers; v0++) { @@ -1329,7 +1329,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->maxBattlers = v0; for (v0 = 0; v0 < 4; v0++) { - Party_cpy(param1->parties[v0], param0->parties[v0]); + Party_Copy(param1->parties[v0], param0->parties[v0]); } for (v0 = 0; v0 < param0->maxBattlers; v0++) { @@ -1363,7 +1363,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->maxBattlers = v0; for (v0 = 0; v0 < 4; v0++) { - Party_cpy(param1->parties[v0], param0->parties[v0]); + Party_Copy(param1->parties[v0], param0->parties[v0]); for (v1 = 0; v1 < Party_GetCurrentCount(param0->parties[v0]); v1++) { v3 = Party_GetPokemonBySlotIndex(param0->parties[v0], v1); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index a089a6a0da..389b4c4569 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1115,8 +1115,8 @@ void ov16_0223EF2C(BattleSystem *battleSystem, int param1, int param2) void ov16_0223EF48(BattleSystem *battleSystem, Pokemon *param1) { - if (battleSystem->poketchData) { - PoketchData_PokemonHistoryEnqueue(battleSystem->poketchData, Pokemon_GetBoxPokemon(param1)); + if (battleSystem->poketch) { + PoketchData_PokemonHistoryEnqueue(battleSystem->poketch, Pokemon_GetBoxPokemon(param1)); } } @@ -1688,14 +1688,14 @@ void BattleSystem_DexFlagSeen(BattleSystem *battleSystem, int param1) v2 = BattleContext_Get(battleSystem, battleSystem->battleCtx, 2, param1); v1 = BattleSystem_PartyPokemon(battleSystem, param1, v2); - if ((param0->battleType & (0x4 | 0x80)) == 0) { - if ((v0 & 0x1) || (param0->battleType == (0x2 | 0x8 | 0x40)) || (param0->battleType == ((0x2 | 0x1) | 0x8 | 0x40))) { - PokedexData_Encounter(param0->pokedex, v1); + if ((battleSystem->battleType & (0x4 | 0x80)) == 0) { + if ((v0 & 0x1) || (battleSystem->battleType == (0x2 | 0x8 | 0x40)) || (battleSystem->battleType == ((0x2 | 0x1) | 0x8 | 0x40))) { + Pokedex_Encounter(battleSystem->pokedex, v1); } } if (((v0 & 0x1) == 0) && (Pokemon_GetValue(v1, MON_DATA_SPECIES_EGG, NULL) == 412)) { - PokedexData_Capture(param0->pokedex, v1); + PokedexData_Capture(battleSystem->pokedex, v1); } } @@ -1714,7 +1714,7 @@ void ov16_0223F9A0(BattleSystem *battleSystem, int param1) v2 = BattleContext_Get(battleSystem, battleSystem->battleCtx, 2, param1); v1 = BattleSystem_PartyPokemon(battleSystem, param1, v2); - PokedexData_Capture(param0->pokedex, v1); + PokedexData_Capture(battleSystem->pokedex, v1); } } } diff --git a/src/catching_show.c b/src/catching_show.c index cc254078b5..695adee7cc 100644 --- a/src/catching_show.c +++ b/src/catching_show.c @@ -273,7 +273,7 @@ static FieldBattleDTO *SetupBattleDTO(FieldSystem *fieldSystem, CatchingShow *ca FieldBattleDTO_Init(dto, fieldSystem); sub_0202F000(v2, catchingShow->currentEncounterIndex, mon); - FieldBattleDTO_AddPokemonToBattler(dto, mon, BATTLER_ENEMY_SLOT_1); + FieldBattleDTO_AddPokemonToBattler(dto, mon, BATTLER_ENEMY_1); Heap_FreeToHeap(mon); return dto; diff --git a/src/encounter.c b/src/encounter.c index 3429f62801..04512a3d33 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -966,7 +966,7 @@ static void UpdateJournal(FieldSystem *fieldSystem, FieldBattleDTO *dto) } } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_TAG)) { if (resultMask == BATTLE_RESULT_WIN) { - JournalEntry_CreateAndSaveEventTrainer(fieldSystem->journalEntry, fieldSystem->location->mapId, dto->trainerIDs[BATTLER_ENEMY_SLOT_1], HEAP_ID_FIELDMAP); + JournalEntry_CreateAndSaveEventTrainer(fieldSystem->journalEntry, fieldSystem->location->mapId, dto->trainerIDs[BATTLER_ENEMY_1], HEAP_ID_FIELDMAP); } } } diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index ce33ad0a9a..292a862387 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -224,7 +224,7 @@ void FieldBattleDTO_AddPokemonToBattler(FieldBattleDTO *dto, Pokemon *src, int b void FieldBattleDTO_CopyPartyToBattler(FieldBattleDTO *dto, const Party *src, int battler) { GF_ASSERT(battler < MAX_BATTLERS); - Party_cpy(src, dto->parties[battler]); + Party_Copy(src, dto->parties[battler]); } void FieldBattleDTO_CopyTrainerInfoToBattler(FieldBattleDTO *dto, const TrainerInfo *src, int battler) @@ -262,7 +262,7 @@ void FieldBattleDTO_InitFromGameState(FieldBattleDTO *dto, const FieldSystem *fi FieldBattleDTO_CopyTrainerInfoToBattler(dto, trainerInfo, BATTLER_PLAYER_1); FieldBattleDTO_CopyPartyToBattler(dto, party, BATTLER_PLAYER_1); Bag_Copy(bag, dto->bag); - PokedexData_Copy(pokedex, dto->pokedex); + Pokedex_Copy(pokedex, dto->pokedex); Options_Copy(options, dto->options); FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_1); @@ -274,7 +274,7 @@ void FieldBattleDTO_InitFromGameState(FieldBattleDTO *dto, const FieldSystem *fi dto->fieldWeather = FieldOverworldState_GetWeather(fieldOverworldState); dto->bagCursor = bagCursor; dto->subscreenCursorOn = subscreenCursorOn; - dto->poketchData = SaveData_PoketchData(save); + dto->poketch = SaveData_PoketchData(save); dto->unk_104 = sub_0202C878(save); dto->records = SaveData_GetGameRecordsPtr(save); dto->journalEntry = journalEntry; @@ -321,7 +321,7 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field Heap_FreeToHeap(mon); Bag_Copy(bag, dto->bag); - PokedexData_Copy(pokedex, dto->pokedex); + Pokedex_Copy(pokedex, dto->pokedex); Options_Copy(options, dto->options); FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_1); @@ -329,7 +329,7 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field dto->timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem); dto->bagCursor = fieldSystem->unk_98; dto->subscreenCursorOn = fieldSystem->battleSubscreenCursorOn; - dto->poketchData = SaveData_PoketchData(fieldSystem->saveData); + dto->poketch = SaveData_PoketchData(fieldSystem->saveData); dto->unk_104 = sub_0202C878(fieldSystem->saveData); dto->records = SaveData_GetGameRecordsPtr(fieldSystem->saveData); dto->journalEntry = fieldSystem->journalEntry; @@ -387,7 +387,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f } Bag_Copy(bag, dto->bag); - PokedexData_Copy(pokedex, dto->pokedex); + Pokedex_Copy(pokedex, dto->pokedex); Options_Copy(options, dto->options); FieldBattleDTO_CopyChatotCryToBattler(dto, chatotCry, BATTLER_PLAYER_1); @@ -428,9 +428,9 @@ void FieldBattleDTO_UpdateFieldSystem(const FieldBattleDTO *dto, FieldSystem *fi u16 *fieldSysSafariBalls = FieldOverworldState_GetSafariBallCount(SaveData_GetFieldOverworldState(fieldSystem->saveData)); TrainerInfo_Copy(dto->trainerInfo[BATTLER_PLAYER_1], trainerInfo); - Party_cpy(dto->parties[BATTLER_PLAYER_1], party); + Party_Copy(dto->parties[BATTLER_PLAYER_1], party); Bag_Copy(dto->bag, bag); - PokedexData_Copy(dto->pokedex, pokedex); + Pokedex_Copy(dto->pokedex, pokedex); *fieldSysSafariBalls = dto->countSafariBalls; } @@ -442,7 +442,7 @@ void FieldBattleDTO_UpdatePokedex(const FieldBattleDTO *dto, FieldSystem *fieldS Bag *bag = SaveData_GetBag(fieldSystem->saveData); Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); - PokedexData_Copy(dto->pokedex, pokedex); + Pokedex_Copy(dto->pokedex, pokedex); } static const enum Terrain sTerrainForBackground[] = { diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c index 17b50517fc..93d65acebf 100644 --- a/src/field_comm_manager.c +++ b/src/field_comm_manager.c @@ -436,7 +436,7 @@ static void sub_02059C2C(BOOL param0, const Party *party) { if (party) { sFieldCommMan->party = Party_New(11); - Party_cpy(party, sFieldCommMan->party); + Party_Copy(party, sFieldCommMan->party); } if (param0) { diff --git a/src/field_menu.c b/src/field_menu.c index d9befd76c0..b5e120dbb8 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -360,7 +360,7 @@ static u32 sub_0203ABD0(FieldSystem *fieldSystem) { u32 v0 = 0; - if (PokedexData_IsObtained(SaveData_PokedexData(fieldSystem->saveData)) == FALSE) { + if (Pokedex_IsObtained(SaveData_Pokedex(fieldSystem->saveData)) == FALSE) { v0 |= 0x1; } @@ -942,24 +942,24 @@ static BOOL FieldMenu_Pokedex(FieldTask *taskMan) FieldSystem *fieldSystem; FieldMenu *menu; UnkStruct_ov21_021D0D80 *v2; - Pokedex *v3; - TrainerInfo *v4; - VarsFlags *v5; + Pokedex *pokedex; + TrainerInfo *trainerInfo; + VarsFlags *varsFlags; fieldSystem = FieldTask_GetFieldSystem(taskMan); menu = FieldTask_GetEnv(taskMan); v2 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov21_021D0D80)); - v3 = SaveData_PokedexData(fieldSystem->saveData); - v4 = SaveData_GetTrainerInfo(fieldSystem->saveData); - v5 = SaveData_GetVarsFlags(fieldSystem->saveData); + pokedex = SaveData_Pokedex(fieldSystem->saveData); + trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); + varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - v2->unk_00 = v3; - v2->unk_04 = v4; + v2->pokedex = pokedex; + v2->trainerInfo = trainerInfo; v2->timeOfDay = FieldSystem_GetTimeOfDay(fieldSystem); - v2->fullmoonIslandVisible = VarFlags_HiddenLocationsUnlocked(v5, HL_FULLMOONISLAND); - v2->newmoonIslandVisible = VarFlags_HiddenLocationsUnlocked(v5, HL_NEWMOONISLAND); - v2->springPathVisible = VarFlags_HiddenLocationsUnlocked(v5, HL_SPRINGPATH); - v2->seabreakPathVisible = VarFlags_HiddenLocationsUnlocked(v5, HL_SEABREAKPATH); + v2->fullmoonIslandVisible = VarFlags_HiddenLocationsUnlocked(varsFlags, HL_FULLMOONISLAND); + v2->newmoonIslandVisible = VarFlags_HiddenLocationsUnlocked(varsFlags, HL_NEWMOONISLAND); + v2->springPathVisible = VarFlags_HiddenLocationsUnlocked(varsFlags, HL_SPRINGPATH); + v2->seabreakPathVisible = VarFlags_HiddenLocationsUnlocked(varsFlags, HL_SEABREAKPATH); v2->unk_1C = fieldSystem->unk_B4; sub_0203E0AC(fieldSystem, v2); @@ -1032,25 +1032,25 @@ BOOL sub_0203B7C0(FieldTask *taskMan) switch (partyMan->unk_23) { case 1: { - PokemonSummary *v3 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); - - v3->monData = Party_GetFromSavedata(fieldSystem->saveData); - v3->options = SaveData_Options(fieldSystem->saveData); - v3->dataType = 1; - v3->pos = partyMan->unk_22; - v3->max = (u8)Party_GetCurrentCount(v3->monData); - v3->move = 0; - v3->mode = 0; - v3->specialRibbons = sub_0202D79C(fieldSystem->saveData); - v3->dexMode = sub_0207A274(fieldSystem->saveData); - v3->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData); - v3->chatotCry = NULL; - - PokemonSummaryScreen_FlagVisiblePages(v3, Unk_020EA02C); - PokemonSummaryScreen_SetPlayerProfile(v3, SaveData_GetTrainerInfo(fieldSystem->saveData)); - sub_0203D334(fieldSystem, v3); - - menu->unk_25C = v3; + PokemonSummary *summary = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); + + summary->monData = Party_GetFromSavedata(fieldSystem->saveData); + summary->options = SaveData_Options(fieldSystem->saveData); + summary->dataType = 1; + summary->pos = partyMan->unk_22; + summary->max = (u8)Party_GetCurrentCount(summary->monData); + summary->move = 0; + summary->mode = 0; + summary->specialRibbons = sub_0202D79C(fieldSystem->saveData); + summary->dexMode = sub_0207A274(fieldSystem->saveData); + summary->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData); + summary->chatotCry = NULL; + + PokemonSummaryScreen_FlagVisiblePages(summary, Unk_020EA02C); + PokemonSummaryScreen_SetPlayerProfile(summary, SaveData_GetTrainerInfo(fieldSystem->saveData)); + sub_0203D334(fieldSystem, summary); + + menu->unk_25C = summary; sub_0203B674(menu, sub_0203C1C8); } break; case 4: { @@ -1930,9 +1930,9 @@ static void FieldMenu_EvolveInit(FieldTask *taskMan) v4 = Party_GetPokemonBySlotIndex(v3, v2->unk_00); if (v2->unk_01 == 0) { - v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_PokedexData(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, 0x1, 73); + v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, 0x1, 73); } else { - v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_PokedexData(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, NULL, 73); + v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, NULL, 73); } { diff --git a/src/overlay005/ov5_021DDAE4.c b/src/overlay005/ov5_021DDAE4.c index cce5fa1013..d70f265615 100644 --- a/src/overlay005/ov5_021DDAE4.c +++ b/src/overlay005/ov5_021DDAE4.c @@ -40,11 +40,11 @@ static BOOL ov5_021DDAE4(FieldTask *param0) break; case 2: if (ov24_02253DB4(fieldSystem->bgConfig)) { - PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); + Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); Overlay_UnloadByID(FS_OVERLAY_ID(overlay24)); Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2); - PoketchData_Enable(poketchData); + PoketchData_Enable(poketch); PoketchSystem_Create(fieldSystem, &fieldSystem->unk_04->poketchSys, fieldSystem->saveData, fieldSystem->bgConfig, sub_0200A914(1)); v1->unk_00++; } diff --git a/src/overlay005/ov5_021EA714.c b/src/overlay005/ov5_021EA714.c index 378c67decc..c84d1fb3f3 100644 --- a/src/overlay005/ov5_021EA714.c +++ b/src/overlay005/ov5_021EA714.c @@ -25,11 +25,11 @@ void ov5_021EA714(FieldSystem *fieldSystem, enum PoketchEventID eventID, u32 dum void ov5_021EA728(FieldSystem *fieldSystem) { - PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); + VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(poketchData) - && (SystemFlag_CheckPoketchHidden(v1) == 0)) { + if (PoketchData_IsEnabled(poketch) + && (SystemFlag_CheckPoketchHidden(varsFlags) == 0)) { Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2); PoketchSystem_Create(fieldSystem, &fieldSystem->unk_04->poketchSys, fieldSystem->saveData, fieldSystem->bgConfig, sub_0200A914(1)); } else { @@ -40,11 +40,11 @@ void ov5_021EA728(FieldSystem *fieldSystem) void ov5_021EA790(FieldSystem *fieldSystem) { - PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); + VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(poketchData) - && (SystemFlag_CheckPoketchHidden(v1) == 0)) { + if (PoketchData_IsEnabled(poketch) + && (SystemFlag_CheckPoketchHidden(varsFlags) == 0)) { PoketchSystem_StartShutdown(fieldSystem->unk_04->poketchSys); } else { ov24_02253DA4(fieldSystem->bgConfig); @@ -53,11 +53,11 @@ void ov5_021EA790(FieldSystem *fieldSystem) u8 ov5_021EA7CC(FieldSystem *fieldSystem) { - PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); + VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(poketchData) - && (SystemFlag_CheckPoketchHidden(v1) == 0)) { + if (PoketchData_IsEnabled(poketch) + && (SystemFlag_CheckPoketchHidden(varsFlags) == 0)) { if (PoketchSystem_IsSystemShutdown(fieldSystem->unk_04->poketchSys)) { fieldSystem->unk_04->poketchSys = NULL; Overlay_UnloadByID(FS_OVERLAY_ID(overlay25)); diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 41d70f257e..5f6fd7fe19 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -676,7 +676,7 @@ BOOL ScrCmd_304(ScriptContext *param0) v4 = Party_GetPokemonBySlotIndex(v5, v7); Pokemon_SetRotomForm(v4, v10, v8); - PokedexData_Capture(SaveData_PokedexData(fieldSystem->saveData), v4); + PokedexData_Capture(SaveData_Pokedex(fieldSystem->saveData), v4); return 0; } diff --git a/src/overlay005/save_info_window.c b/src/overlay005/save_info_window.c index 00dd6a7da2..344350d48c 100644 --- a/src/overlay005/save_info_window.c +++ b/src/overlay005/save_info_window.c @@ -55,8 +55,8 @@ static void SaveInfo_SetValues(SaveInfo *saveInfo, const FieldSystem *fieldSyste saveInfo->mapLabelTextID = MapHeader_GetMapLabelTextID(curLocation->mapId); - if (PokedexData_IsObtained(pokedex)) { - saveInfo->pokedexCount = PokedexData_CountSeen(pokedex); + if (Pokedex_IsObtained(pokedex)) { + saveInfo->pokedexCount = Pokedex_CountSeen(pokedex); } else { saveInfo->pokedexCount = 0; } diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index d0f15a2919..70511f983b 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -325,7 +325,7 @@ BOOL ov6_02240D5C(FieldSystem *fieldSystem) v13[i].minLevel = encounterData->grassEncounters.encounters[i].level; } - BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_PokedexData(FieldSystem_GetSaveData(fieldSystem))); + BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_Pokedex(FieldSystem_GetSaveData(fieldSystem))); WildEncounters_ReplaceTimedEncounters(encounterData, &v13[2].species, &v13[3].species); WildEncounters_ReplaceRadarEncounters(fieldSystem, encounterData, &v13[0].species, &v13[1].species); @@ -513,7 +513,7 @@ BOOL ov6_022411C8(FieldSystem *fieldSystem, FieldTask *param1) v12[i].minLevel = encounterData->grassEncounters.encounters[i].level; } - BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_PokedexData(FieldSystem_GetSaveData(fieldSystem))); + BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_Pokedex(FieldSystem_GetSaveData(fieldSystem))); WildEncounters_ReplaceTimedEncounters(encounterData, &v12[2].species, &v12[3].species); WildEncounters_ReplaceRadarEncounters(fieldSystem, encounterData, &v12[0].species, &v12[1].species); @@ -642,7 +642,7 @@ BOOL ov6_022413E4(FieldSystem *fieldSystem, FieldBattleDTO **battleParams) v12[i].minLevel = encounterData->grassEncounters.encounters[i].level; } - BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_PokedexData(FieldSystem_GetSaveData(fieldSystem))); + BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_Pokedex(FieldSystem_GetSaveData(fieldSystem))); WildEncounters_ReplaceTimedEncounters(encounterData, &v12[2].species, &v12[3].species); WildEncounters_ReplaceRadarEncounters(fieldSystem, encounterData, &v12[0].species, &v12[1].species); diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c index f463b14120..9985dbcc1a 100644 --- a/src/overlay006/ov6_02242984.c +++ b/src/overlay006/ov6_02242984.c @@ -42,7 +42,7 @@ int ov6_02242984(FieldSystem *fieldSystem) v2[i] = encounterData->grassEncounters.encounters[i].species; } - BOOL v1 = PokedexData_IsNationalDexObtained(SaveData_PokedexData(FieldSystem_GetSaveData(fieldSystem))); + BOOL v1 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(FieldSystem_GetSaveData(fieldSystem))); ov6_02242F74(sub_0202D814(sub_0202D834(fieldSystem->saveData), 1), v1, fieldSystem->location->mapId, &v2[6], &v2[7]); WildEncounters_ReplaceTimedEncounters(encounterData, &v2[2], &v2[3]); diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index caf88dc69d..e802dee00b 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -2407,7 +2407,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) battleResult = param0->unk_2A - 1; if (MapHeader_IsUnionRoom(param0->unk_00->mapHeaderID) == 1) { - opponentGender1 = TrainerClass_Gender(param0->unk_00->trainerData[v6 ^ 1].class); + opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].class); opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1)); Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); @@ -2416,7 +2416,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) } else { switch (sub_0203895C()) { case 1: - opponentGender1 = TrainerClass_Gender(param0->unk_00->trainerData[v6 ^ 1].class); + opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].class); opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1)); Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); @@ -2425,7 +2425,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) Heap_FreeToHeap(opponentName1); break; case 2: - opponentGender1 = TrainerClass_Gender(param0->unk_00->trainerData[v6 ^ 1].class); + opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].class); opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1)); Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); @@ -2434,7 +2434,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) Heap_FreeToHeap(opponentName1); break; case 3: - opponentGender1 = TrainerClass_Gender(param0->unk_00->trainerData[v6 ^ 1].class); + opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].class); opponentName1 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1)); Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); @@ -2447,14 +2447,14 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) opponentName2 = Heap_AllocFromHeap(param0->unk_24, sizeof(u16) * (TRAINER_NAME_LEN + 1)); if (ov10_02220AD0() == 1) { - opponentGender1 = TrainerClass_Gender(param0->unk_00->trainerData[1].class); - opponentGender2 = TrainerClass_Gender(param0->unk_00->trainerData[3].class); + opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[1].class); + opponentGender2 = TrainerClass_Gender(param0->unk_00->trainer[3].class); Strbuf_ToChars(param0->unk_14[1], opponentName1, TRAINER_NAME_LEN + 1); Strbuf_ToChars(param0->unk_14[3], opponentName2, TRAINER_NAME_LEN + 1); } else { - opponentGender1 = TrainerClass_Gender(param0->unk_00->trainerData[0].class); - opponentGender2 = TrainerClass_Gender(param0->unk_00->trainerData[2].class); + opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[0].class); + opponentGender2 = TrainerClass_Gender(param0->unk_00->trainer[2].class); Strbuf_ToChars(param0->unk_14[0], opponentName1, TRAINER_NAME_LEN + 1); Strbuf_ToChars(param0->unk_14[2], opponentName2, TRAINER_NAME_LEN + 1); diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 8a14073fc3..019b2e0fb0 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -133,12 +133,8 @@ int ov21_021D0D80(OverlayManager *param0, int *param1) v1 = OverlayManager_Args(param0); - { - u32 v4; - - v4 = PokedexData_GetDisplayForm(v1->unk_00, 487, 0); - Pokedex_SetupGiratina(v4); - } + u32 form = Pokedex_GetDisplayForm(v1->pokedex, 487, 0); + Pokedex_SetupGiratina(form); SetMainCallback(ov21_021D0F04, v0); DisableHBlank(); @@ -149,8 +145,8 @@ int ov21_021D0D80(OverlayManager *param0, int *param1) ov21_021D12B0(37); - v2.unk_00 = v1->unk_00; - v2.unk_04 = v1->unk_04; + v2.pokedex = v1->pokedex; + v2.trainerInfo = v1->trainerInfo; v2.timeOfDay = v1->timeOfDay; v2.fullmoonIslandVisible = v1->fullmoonIslandVisible; v2.seabreakPathVisible = v1->seabreakPathVisible; @@ -317,8 +313,8 @@ UnkStruct_ov21_021D0F60 *ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80 v0->unk_1D6C = ov21_021D3FE0(param0); v0->unk_1D70 = ov21_021D3FE0(param0); - v2.dexData = param1->unk_00; - v2.unk_04 = param1->unk_04; + v2.dexData = param1->pokedex; + v2.unk_04 = param1->trainerInfo; v2.timeOfDay = param1->timeOfDay; v2.fullmoonIslandVisible = param1->fullmoonIslandVisible; v2.newmoonIslandVisible = param1->newmoonIslandVisible; diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index 4586ec3c38..eb1aad134d 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -227,7 +227,7 @@ u32 ov21_021D33BC(const UnkStruct_ov21_021D3320 *param0, int param1) u32 ov21_021D33D4(const UnkStruct_ov21_021D3320 *param0, u32 species) { - return PokedexData_GetDisplayForm(param0->dexData, species, 0); + return Pokedex_GetDisplayForm(param0->dexData, species, 0); } u32 ov21_021D33E0(const UnkStruct_ov21_021D3320 *param0, int param1) @@ -253,7 +253,7 @@ u32 ov21_021D3404(const UnkStruct_ov21_021D3320 *param0, int param1) u32 ov21_021D3410(const UnkStruct_ov21_021D3320 *param0, u32 param1, int param2) { - return PokedexData_GetDisplayForm(param0->dexData, param1, param2); + return Pokedex_GetDisplayForm(param0->dexData, param1, param2); } u32 ov21_021D341C(const UnkStruct_ov21_021D3320 *param0, u32 param1) diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index 18b8bf0a3a..9d7839ed2f 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1780,7 +1780,7 @@ static int ov23_0223F970(UnkStruct_ov23_02256EB0 *param0) SaveData *v0 = FieldSystem_GetSaveData(Unk_ov23_02257740->fieldSystem); UndergroundData *v1 = sub_020298B0(v0); BOOL v2 = TrainerInfo_ID(SaveData_GetTrainerInfo(v0)) % 2; - BOOL v3 = PokedexData_IsNationalDexObtained(SaveData_PokedexData(v0)); + BOOL v3 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(v0)); int v4 = 0; if (v3) { diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index a5e935e502..08a3797b58 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -133,7 +133,7 @@ static void ov23_022522F0(UnkStruct_ov23_02250CD4 *param0, int param1) int v1, v2, v3, v4, v5; SaveData *v6 = FieldSystem_GetSaveData(param0->fieldSystem); UndergroundData *v7 = sub_020298B0(v6); - BOOL v8 = PokedexData_IsNationalDexObtained(SaveData_PokedexData(v6)); + BOOL v8 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(v6)); MATH_InitRand16(&v0, sub_02028930(v7) + param1); diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 08ded5f2c6..e07b78f6ae 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -162,8 +162,8 @@ static void ov25_02254684(UnkStruct_ov25_02254560 *param0) void ov25_022546B8(u32 param0, u32 param1) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); - PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(poketchData); + Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); + u32 v2 = PoketchData_CurrentScreenColor(poketch); GXS_LoadBGPltt(&v0->unk_200[v2 * 32], param0 * 0x20, 0x20); GXS_LoadOBJPltt(&v0->unk_200[v2 * 32], param1, 0x20); @@ -172,8 +172,8 @@ void ov25_022546B8(u32 param0, u32 param1) void ov25_022546F0(u32 param0, u32 param1) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); - PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(poketchData); + Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); + u32 v2 = PoketchData_CurrentScreenColor(poketch); GXS_LoadBGPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20); GXS_LoadOBJPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20); @@ -182,8 +182,8 @@ void ov25_022546F0(u32 param0, u32 param1) void ov25_02254728(u16 *param0) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); - PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(poketchData); + Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); + u32 v2 = PoketchData_CurrentScreenColor(poketch); MI_CpuCopy16(&v0->unk_200[v2 * 32], param0, 0x20); } @@ -604,8 +604,8 @@ static void ov25_02254DE0(UnkStruct_ov25_02254560 *param0, UnkStruct_ov25_02254D static void ov25_02254E84(UnkStruct_ov25_02254560 *param0, u32 param1) { - PoketchData *poketchData = PoketchSystem_GetPoketchData(param0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(poketchData); + Poketch *poketch = PoketchSystem_GetPoketchData(param0->poketchSys); + u32 v2 = PoketchData_CurrentScreenColor(poketch); ov25_02254728(param0->unk_400); diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 4b1dec3440..5b47427b49 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -129,7 +129,7 @@ void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, new_system->fieldSystem = fieldSystem; new_system->saveData = saveData; - new_system->poketchData = SaveData_PoketchData(saveData); + new_system->poketch = SaveData_PoketchData(saveData); new_system->bgl = bgl; new_system->oamManager = oamManager; @@ -166,13 +166,13 @@ void PoketchSystem_SendEvent(PoketchSystem *poketchSys, enum PoketchEventID even poketchSys->playerMoving = TRUE; break; case POKETCH_EVENT_PEDOMETER: { - u32 step_count = PoketchData_StepCount(poketchSys->poketchData); + u32 step_count = PoketchData_StepCount(poketchSys->poketch); if (++step_count > POKETCH_PEDOMETER_MAX) { step_count = 0; } - PoketchData_SetStepCount(poketchSys->poketchData, step_count); + PoketchData_SetStepCount(poketchSys->poketch, step_count); poketchSys->pedometerUpdated = TRUE; } break; case POKETCH_EVENT_SAVE: @@ -278,7 +278,7 @@ static void PoketchEvent_InitApp(PoketchSystem *poketchSys) break; case 1: if (ov25_022547F4(poketchSys->unk_1C, 0)) { - u32 app_ID = PoketchData_CurrentAppID(poketchSys->poketchData); + u32 app_ID = PoketchData_CurrentAppID(poketchSys->poketch); PoketchSystem_LoadApp(poketchSys, app_ID); PoketchSystem_InitApp(poketchSys, app_ID); @@ -325,9 +325,9 @@ static void PoketchEvent_UpdateApp(PoketchSystem *poketchSys) if (ov25_02254800(poketchSys->unk_1C)) { if (poketchSys->buttonDir == BUTTON_UP) { - poketchSys->unk_20.unk_00 = PoketchData_DecrementAppID(poketchSys->poketchData); + poketchSys->unk_20.unk_00 = PoketchData_DecrementAppID(poketchSys->poketch); } else { - poketchSys->unk_20.unk_00 = PoketchData_IncrementAppID(poketchSys->poketchData); + poketchSys->unk_20.unk_00 = PoketchData_IncrementAppID(poketchSys->poketch); } if (poketchSys->skipApp) { @@ -367,9 +367,9 @@ static void PoketchEvent_UpdateApp(PoketchSystem *poketchSys) case 4: if (poketchSys->buttonState == BUTTON_MANAGER_STATE_TAP || poketchSys->buttonState == BUTTON_MANAGER_STATE_TIMER0) { if (poketchSys->buttonDir == BUTTON_UP) { - poketchSys->unk_20.unk_00 = PoketchData_DecrementAppID(poketchSys->poketchData); + poketchSys->unk_20.unk_00 = PoketchData_DecrementAppID(poketchSys->poketch); } else { - poketchSys->unk_20.unk_00 = PoketchData_IncrementAppID(poketchSys->poketchData); + poketchSys->unk_20.unk_00 = PoketchData_IncrementAppID(poketchSys->poketch); } poketchSys->appSkipTimer = 30; @@ -395,7 +395,7 @@ static void PoketchEvent_OnAppChange(PoketchSystem *poketchSys) u32 v0; poketchSys->unk_06 = 1; - v0 = PoketchData_CurrentAppID(poketchSys->poketchData); + v0 = PoketchData_CurrentAppID(poketchSys->poketch); PoketchSystem_LoadApp(poketchSys, v0); PoketchSystem_InitApp(poketchSys, v0); @@ -741,9 +741,9 @@ FieldSystem *PoketchSystem_GetFieldSystem(const PoketchSystem *poketchSys) return poketchSys->fieldSystem; } -PoketchData *PoketchSystem_GetPoketchData(const PoketchSystem *poketchSys) +Poketch *PoketchSystem_GetPoketchData(const PoketchSystem *poketchSys) { - return poketchSys->poketchData; + return poketchSys->poketch; } SaveData *PoketchSystem_GetSaveData(const PoketchSystem *poketchSys) diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index 837353a872..a845eb8565 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -635,7 +635,7 @@ static void ov28_02256914(UnkStruct_ov28_02256210 *param0, const UnkStruct_ov28_ Pokedex *v1; u16 v2; - v1 = SaveData_PokedexData(PoketchSystem_GetSaveData(param0->poketchSys)); + v1 = SaveData_Pokedex(PoketchSystem_GetSaveData(param0->poketchSys)); if (PokedexData_IsNationalDexObtained(v1)) { v2 = v0; diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c index 6bf8af7f10..3dee70e56b 100644 --- a/src/overlay031/ov31_022561C0.c +++ b/src/overlay031/ov31_022561C0.c @@ -34,8 +34,8 @@ static BOOL ov31_02256228(UnkStruct_ov31_02256228 *param0, PoketchSystem *poketc static void ov31_02256268(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1); static inline u8 inline_ov31_02256298(const u8 *param0, int param1); static inline void inline_ov31_022562EC(u8 *param0, int param1, int param2); -static void ov31_02256298(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, PoketchData *poketchData); -static void ov31_022562EC(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, PoketchData *poketchData); +static void ov31_02256298(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, Poketch *poketch); +static void ov31_022562EC(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, Poketch *poketch); static void ov31_0225635C(UnkStruct_ov31_02256554_1 *param0); static void ov31_02256384(UnkStruct_ov31_02256228 *param0); static void ov31_022563B0(void *param0); @@ -90,10 +90,10 @@ static BOOL ov31_02256228(UnkStruct_ov31_02256228 *param0, PoketchSystem *poketc static void ov31_02256268(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1) { - PoketchData *poketchData = PoketchSystem_GetPoketchData(param0->poketchSys); + Poketch *poketch = PoketchSystem_GetPoketchData(param0->poketchSys); - if (PoketchData_DotArtModified(poketchData)) { - ov31_02256298(param0, param1, poketchData); + if (PoketchData_DotArtModified(poketch)) { + ov31_02256298(param0, param1, poketch); } else { ov31_0225635C(param1); } @@ -109,11 +109,11 @@ static inline void inline_ov31_022562EC(u8 *param0, int param1, int param2) param0[(param1 / 4)] |= ((param2 & 3) << ((param1 & 3) * 2)); } -static void ov31_02256298(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, PoketchData *poketchData) +static void ov31_02256298(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, Poketch *poketch) { int v0, v1, v2; - PoketchData_CopyDotArtData(poketchData, param0->unk_1F4); + PoketchData_CopyDotArtData(poketch, param0->unk_1F4); v2 = 0; @@ -124,7 +124,7 @@ static void ov31_02256298(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_022565 } } -static void ov31_022562EC(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, PoketchData *poketchData) +static void ov31_022562EC(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, Poketch *poketch) { int v0, v1, v2; @@ -138,7 +138,7 @@ static void ov31_022562EC(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_022565 } } - PoketchData_ModifyDotArtData(poketchData, param0->unk_1F4); + PoketchData_ModifyDotArtData(poketch, param0->unk_1F4); } static void ov31_0225635C(UnkStruct_ov31_02256554_1 *param0) diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index d6e7a1aefe..ef83e3224a 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -22,7 +22,7 @@ typedef struct { PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_18; - PoketchData *poketchData; + Poketch *poketch; } UnkStruct_ov36_0225621C; static void NitroStaticInit(void); @@ -71,9 +71,9 @@ static BOOL ov36_0225621C(UnkStruct_ov36_0225621C *param0, PoketchSystem *poketc }; param0->poketchSys = poketchSys; - param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); + param0->poketch = PoketchSystem_GetPoketchData(poketchSys); param0->unk_04.unk_04 = 1; - param0->unk_04.unk_00 = PoketchData_StepCount(param0->poketchData); + param0->unk_04.unk_00 = PoketchData_StepCount(param0->poketch); if (ov36_02256404(&(param0->unk_0C), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -181,7 +181,7 @@ static BOOL ov36_02256330(UnkStruct_ov36_0225621C *param0) } if (PoketchSystem_PedometerUpdated(param0->poketchSys)) { - v0->unk_00 = PoketchData_StepCount(param0->poketchData); + v0->unk_00 = PoketchData_StepCount(param0->poketch); ov36_0225653C(param0->unk_0C, 3); break; } @@ -201,7 +201,7 @@ static BOOL ov36_02256330(UnkStruct_ov36_0225621C *param0) v0->unk_04 = 1; v0->unk_00 = 0; - PoketchData_SetStepCount(param0->poketchData, 0); + PoketchData_SetStepCount(param0->poketch, 0); ov36_0225653C(param0->unk_0C, 2); ov36_0225653C(param0->unk_0C, 3); diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index d730464e97..d020ac3c57 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -23,7 +23,7 @@ typedef struct { UnkStruct_ov45_022566EC_1 unk_03; UnkStruct_ov45_022566EC *unk_08; PoketchSystem *poketchSys; - PoketchData *poketchData; + Poketch *poketch; PoketchButtonManager *buttonManager; u32 unk_18; u32 unk_1C; @@ -117,10 +117,10 @@ static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 *param0, PoketchSystem *poketc }; u32 v1, v2; - param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_03.unk_00 = PoketchData_IsAlarmSet(param0->poketchData); + param0->poketch = PoketchSystem_GetPoketchData(poketchSys); + param0->unk_03.unk_00 = PoketchData_IsAlarmSet(param0->poketch); - PoketchData_AlarmTime(param0->poketchData, &v1, &v2); + PoketchData_AlarmTime(param0->poketch, &v1, &v2); param0->unk_03.unk_03 = v1; param0->unk_03.unk_04 = v2; @@ -258,7 +258,7 @@ static BOOL ov45_022563C0(UnkStruct_ov45_022561D4 *param0) if ((param0->unk_1C == 1) && (param0->unk_18 == 0)) { param0->unk_03.unk_00 = 1; ov45_022562C0(¶m0->unk_03); - PoketchData_SetAlarm(param0->poketchData, 1, param0->unk_03.unk_03, param0->unk_03.unk_04); + PoketchData_SetAlarm(param0->poketch, 1, param0->unk_03.unk_03, param0->unk_03.unk_04); ov45_02256918(param0->unk_08, 2); param0->unk_1C = 0; param0->unk_01++; diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c index 9ebade8bc5..640c602a10 100644 --- a/src/overlay047/ov47_022561C0.c +++ b/src/overlay047/ov47_022561C0.c @@ -27,7 +27,7 @@ typedef struct { UnkStruct_ov47_02256634_1 unk_04; UnkStruct_ov47_02256634 *unk_70; PoketchSystem *poketchSys; - PoketchData *poketchData; + Poketch *poketch; UnkStruct_0206C638 *unk_7C[6]; u8 unk_94[6]; u8 unk_9A; @@ -75,13 +75,13 @@ static BOOL ov47_0225621C(UnkStruct_ov47_0225621C *param0, PoketchSystem *poketc { int v0; - param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); + param0->poketch = PoketchSystem_GetPoketchData(poketchSys); for (v0 = 0; v0 < 6; v0++) { param0->unk_04.unk_0C[v0].unk_03 = 1; param0->unk_04.unk_0C[v0].unk_02 = v0; - PoketchData_MapMarkerPos(param0->poketchData, v0, &(param0->unk_04.unk_0C[v0].unk_00), &(param0->unk_04.unk_0C[v0].unk_01)); + PoketchData_MapMarkerPos(param0->poketch, v0, &(param0->unk_04.unk_0C[v0].unk_00), &(param0->unk_04.unk_0C[v0].unk_01)); param0->unk_04.unk_0C[v0].unk_00 += 16; param0->unk_04.unk_0C[v0].unk_01 += 16; @@ -129,7 +129,7 @@ static void ov47_0225634C(UnkStruct_ov47_0225621C *param0) int v0; for (v0 = 0; v0 < 6; v0++) { - PoketchData_SetMapMarker(param0->poketchData, v0, (param0->unk_04.unk_0C[v0].unk_00 - 16), (param0->unk_04.unk_0C[v0].unk_01 - 16)); + PoketchData_SetMapMarker(param0->poketch, v0, (param0->unk_04.unk_0C[v0].unk_00 - 16), (param0->unk_04.unk_0C[v0].unk_01 - 16)); } ov47_02256670(param0->unk_70); diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index 551acbff97..694e5c5af4 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/src/overlay049/ov49_022561C0.c @@ -22,7 +22,7 @@ typedef struct { UnkStruct_ov49_022563D4_1 unk_04; UnkStruct_ov49_022563D4 *unk_08; PoketchSystem *poketchSys; - PoketchData *poketchData; + Poketch *poketch; } UnkStruct_ov49_0225621C; static void NitroStaticInit(void); @@ -63,8 +63,8 @@ static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *pa static BOOL ov49_0225621C(UnkStruct_ov49_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { - param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_04.unk_00 = PoketchData_CurrentScreenColor(param0->poketchData); + param0->poketch = PoketchSystem_GetPoketchData(poketchSys); + param0->unk_04.unk_00 = PoketchData_CurrentScreenColor(param0->poketch); param0->unk_03 = param0->unk_04.unk_00; if (ov49_022563D4(&(param0->unk_08), &(param0->unk_04), param2)) { @@ -178,7 +178,7 @@ static BOOL ov49_02256348(UnkStruct_ov49_0225621C *param0) if (v2 != param0->unk_03) { param0->unk_04.unk_00 = v2; param0->unk_03 = v2; - PoketchData_SetScreenColor(param0->poketchData, v2); + PoketchData_SetScreenColor(param0->poketch, v2); return 1; } } diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index cb669d7c6c..c19d2fc6a8 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -23,7 +23,7 @@ typedef struct { UnkStruct_ov50_02256510_1 unk_04; UnkStruct_ov50_02256510 *unk_90; PoketchSystem *poketchSys; - PoketchData *poketchData; + Poketch *poketch; PoketchButtonManager *buttonManager; u32 unk_A0; u32 unk_A4; @@ -112,7 +112,7 @@ static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 *param0, PoketchSystem *poketc RTCDate v1; GetCurrentDate(&v1); - param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); + param0->poketch = PoketchSystem_GetPoketchData(poketchSys); ov50_022562AC(&(param0->unk_04), param0, &v1); param0->unk_A8 = param0->unk_04.unk_0C[0].unk_02; @@ -168,7 +168,7 @@ static void ov50_022562AC(UnkStruct_ov50_02256510_1 *param0, UnkStruct_ov50_0225 for (v1 = 0; v1 < (param0->unk_04); v1++) { param0->unk_0C[v1].unk_00 = v1 + 1; - param0->unk_0C[v1].unk_03 = PoketchData_CalendarMarked(param1->poketchData, param0->unk_00, v1 + 1); + param0->unk_0C[v1].unk_03 = PoketchData_CalendarMarked(param1->poketch, param0->unk_00, v1 + 1); param0->unk_0C[v1].unk_02 = v2 + v1; } } @@ -260,10 +260,10 @@ static BOOL ov50_02256418(UnkStruct_ov50_022561D4 *param0) if ((param0->unk_A4 >= param0->unk_A8) && (param0->unk_A4 <= param0->unk_AC)) { int v0 = (param0->unk_A4 - param0->unk_A8); - if (PoketchData_CalendarMarked(param0->poketchData, param0->unk_04.unk_00, v0 + 1)) { - PoketchData_ClearCalendarMark(param0->poketchData, param0->unk_04.unk_00, v0 + 1); + if (PoketchData_CalendarMarked(param0->poketch, param0->unk_04.unk_00, v0 + 1)) { + PoketchData_ClearCalendarMark(param0->poketch, param0->unk_04.unk_00, v0 + 1); } else { - PoketchData_SetCalendarMark(param0->poketchData, param0->unk_04.unk_00, v0 + 1); + PoketchData_SetCalendarMark(param0->poketch, param0->unk_04.unk_00, v0 + 1); } param0->unk_04.unk_0C[v0].unk_03 ^= 1; diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index fc053809c7..e5c20cdeed 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -115,15 +115,15 @@ static BOOL ov54_0225621C(UnkStruct_ov54_0225621C *param0, PoketchSystem *poketc ((48 + 40 * 0) - (48 / 2)), ((48 + 40 * 0) + (48 / 2)) } }; - PoketchData *poketchData; + Poketch *poketch; int v2; - poketchData = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_04.unk_90 = PoketchData_PokemonHistorySize(poketchData); + poketch = PoketchSystem_GetPoketchData(poketchSys); + param0->unk_04.unk_90 = PoketchData_PokemonHistorySize(poketch); for (v2 = 0; v2 < param0->unk_04.unk_90; v2++) { - PoketchData_PokemonHistorySpeciesAndIcon(poketchData, v2, &(param0->unk_04.unk_00[v2].unk_00), &(param0->unk_04.unk_00[v2].unk_08)); - param0->unk_04.unk_00[v2].unk_04 = PoketchData_PokemonHistoryForm(poketchData, v2); + PoketchData_PokemonHistorySpeciesAndIcon(poketch, v2, &(param0->unk_04.unk_00[v2].unk_00), &(param0->unk_04.unk_00[v2].unk_08)); + param0->unk_04.unk_00[v2].unk_04 = PoketchData_PokemonHistoryForm(poketch, v2); } if (ov54_0225642C(&(param0->unk_98), &(param0->unk_04), param2)) { diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 7c71370dad..2d7f6a9a19 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -2311,7 +2311,7 @@ static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *param1, u32 { v0 = SaveData_GetTrainerInfo(param1); v1 = Party_GetFromSavedata(param1); - v3 = SaveData_PokedexData(param1); + v3 = SaveData_Pokedex(param1); v2 = sub_0202C878(param1); v4 = SaveData_GetGameTime(param1); } diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 3dfb561205..adab601bdb 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -598,7 +598,7 @@ static BOOL ov97_0222B5C0(void *param0, int param1, UnkStruct_ov97_02237808 *par ov97_0222B53C(param2->unk_10, v5, v4, v7, 19, 16 * 3); if (v6->unk_4C) { - ov97_0222B590(v4, PokedexData_CountSeen(v6->unk_08)); + ov97_0222B590(v4, Pokedex_CountSeen(v6->unk_08)); ov97_0222B53C(param2->unk_10, v5, v4, v7, 18, 16 * 4); } @@ -987,9 +987,9 @@ static int ov97_0222BD70(OverlayManager *param0, int *param1) v0->unk_11C = FX32_ONE * 0; v0->unk_120 = FX32_ONE * 0; v0->unk_0C = SaveData_GetTrainerInfo(v0->unk_04); - v0->unk_08 = SaveData_PokedexData(v0->unk_04); + v0->unk_08 = SaveData_Pokedex(v0->unk_04); v0->playTime = SaveData_GetPlayTime(v0->unk_04); - v0->unk_4C = PokedexData_IsObtained(v0->unk_08); + v0->unk_4C = Pokedex_IsObtained(v0->unk_08); v0->unk_50 = TrainerInfo_BadgeCount(v0->unk_0C); v0->unk_12C = 15; diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 6f900df319..98d347b35a 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -681,7 +681,7 @@ static int ov97_0222C6F8(OverlayManager *param0, int *param1) v0->unk_04 = BgConfig_New(v0->unk_00); v0->unk_08 = ((ApplicationArgs *)OverlayManager_Args(param0))->saveData; v0->unk_10 = SaveData_GetTrainerInfo(v0->unk_08); - v0->unk_0C = SaveData_PokedexData(v0->unk_08); + v0->unk_0C = SaveData_Pokedex(v0->unk_08); v0->unk_14 = SaveData_Options(v0->unk_08); ov97_02237694(v0->unk_00); @@ -707,7 +707,7 @@ static int ov97_0222C78C(OverlayManager *param0, int *param1) case UnkEnum_ov97_0222C78C_00: ov97_0222C254(v0); - if (PokedexData_IsObtained(v0->unk_0C) == FALSE) { + if (Pokedex_IsObtained(v0->unk_0C) == FALSE) { ov97_02237790(1, UnkEnum_ov97_0222C78C_01, param1, UnkEnum_ov97_0222C78C_13); } else { *param1 = UnkEnum_ov97_0222C78C_02; diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index d4f73e26cd..dbd275d8a8 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -93,7 +93,7 @@ int ov118_021D0DBC(GameWindowLayout *param0) break; } - PokedexData_Capture(SaveData_PokedexData(FieldSystem_GetSaveData(param0->unk_5A4->unk_1C)), v1); + PokedexData_Capture(SaveData_Pokedex(FieldSystem_GetSaveData(param0->unk_5A4->unk_1C)), v1); } v0->unk_00++; break; diff --git a/src/party.c b/src/party.c index 158f318909..e5037b0f15 100644 --- a/src/party.c +++ b/src/party.c @@ -125,7 +125,7 @@ BOOL Party_SwapSlots(Party *party, int slotA, int slotB) return FALSE; } -void Party_cpy(const Party *src, Party *dest) +void Party_Copy(const Party *src, Party *dest) { *dest = *src; } diff --git a/src/pokedex_data.c b/src/pokedex_data.c index a28c4572b1..1716a92253 100644 --- a/src/pokedex_data.c +++ b/src/pokedex_data.c @@ -36,7 +36,7 @@ static const u16 sExcludedMonsLocal[] = {}; #define DEOXYS_COUNT 4 #define ROTOM_COUNT 6 -typedef struct PokedexData { +typedef struct Pokedex { u32 magic; u32 caughtPokemon[DEX_SIZE_U32]; u32 seenPokemon[DEX_SIZE_U32]; @@ -55,27 +55,27 @@ typedef struct PokedexData { u32 rotomFormsSeen; u8 shayminFormsSeen; u8 giratinaFormsSeen; -} PokedexData; +} Pokedex; -int PokedexData_SaveSize(void) +int Pokedex_SaveSize(void) { - return sizeof(PokedexData); + return sizeof(Pokedex); } -PokedexData *PokedexData_Alloc(u32 heapID) +Pokedex *Pokedex_New(u32 heapID) { - PokedexData *pokedexData = Heap_AllocFromHeap(heapID, sizeof(PokedexData)); - PokedexData_Init(pokedexData); + Pokedex *pokedexData = Heap_AllocFromHeap(heapID, sizeof(Pokedex)); + Pokedex_Init(pokedexData); return pokedexData; } -void PokedexData_Copy(const PokedexData *src, PokedexData *dest) +void Pokedex_Copy(const Pokedex *src, Pokedex *dest) { - MI_CpuCopy8(src, dest, sizeof(PokedexData)); + MI_CpuCopy8(src, dest, sizeof(Pokedex)); } -static inline void CheckPokedexIntegrity(const PokedexData *pokedexData) +static inline void CheckPokedexIntegrity(const Pokedex *pokedexData) { GF_ASSERT(pokedexData->magic == MAGIC_NUMBER); } @@ -125,17 +125,17 @@ static inline void SetBit_3Forms(u8 *array, u8 value, u16 bitIndex) array[bitIndex >> 2] |= value << ((bitIndex & 0x03) * 2); } -static inline void Write_SeenSpecies(PokedexData *pokedexData, u16 species) +static inline void Write_SeenSpecies(Pokedex *pokedexData, u16 species) { ActivateBit_2Forms((u8 *)pokedexData->seenPokemon, species); } -static inline void Write_CaughtSpecies(PokedexData *pokedexData, u16 species) +static inline void Write_CaughtSpecies(Pokedex *pokedexData, u16 species) { ActivateBit_2Forms((u8 *)pokedexData->caughtPokemon, species); } -static void SetBit_Gender(PokedexData *pokedexData, u8 gender, u8 isSeen, u16 bitIndex) +static void SetBit_Gender(Pokedex *pokedexData, u8 gender, u8 isSeen, u16 bitIndex) { if (isSeen == FALSE) { SetBit_2Forms((u8 *)pokedexData->recordedGenders[1], gender, bitIndex); @@ -144,7 +144,7 @@ static void SetBit_Gender(PokedexData *pokedexData, u8 gender, u8 isSeen, u16 bi SetBit_2Forms((u8 *)pokedexData->recordedGenders[isSeen], gender, bitIndex); } -static void UpdateGender(PokedexData *pokedexData, u8 gender, u8 isSeen, u16 bitIndex) +static void UpdateGender(Pokedex *pokedexData, u8 gender, u8 isSeen, u16 bitIndex) { GF_ASSERT(gender <= GENDER_NONE); @@ -155,29 +155,29 @@ static void UpdateGender(PokedexData *pokedexData, u8 gender, u8 isSeen, u16 bit SetBit_Gender(pokedexData, gender, isSeen, bitIndex); } -static inline BOOL SpeciesSeen(const PokedexData *pokedexData, u16 species) +static inline BOOL SpeciesSeen(const Pokedex *pokedexData, u16 species) { return ReadBit_2Forms((const u8 *)pokedexData->seenPokemon, species); } -static inline BOOL SpeciesCaught(const PokedexData *pokedexData, u16 species) +static inline BOOL SpeciesCaught(const Pokedex *pokedexData, u16 species) { return ReadBit_2Forms((const u8 *)pokedexData->caughtPokemon, species); } -static inline u8 GetGender(const PokedexData *pokedexData, u16 species, u8 bitIndex) +static inline u8 GetGender(const Pokedex *pokedexData, u16 species, u8 bitIndex) { return ReadBit_2Forms((const u8 *)pokedexData->recordedGenders[bitIndex], species); } -static inline void SetForm_Spinda(PokedexData *pokedexData, u16 species, u32 personality) +static inline void SetForm_Spinda(Pokedex *pokedexData, u16 species, u32 personality) { if (species == SPECIES_SPINDA) { pokedexData->spindaForm = personality; } } -static int NumFormsSeen_Unown(const PokedexData *pokedexData) +static int NumFormsSeen_Unown(const Pokedex *pokedexData) { int formIndex; @@ -190,7 +190,7 @@ static int NumFormsSeen_Unown(const PokedexData *pokedexData) return formIndex; } -static BOOL UnownFormSeen(const PokedexData *pokedexData, u8 form) +static BOOL UnownFormSeen(const Pokedex *pokedexData, u8 form) { for (int formIndex = 0; formIndex < UNOWN_COUNT; formIndex++) { if (pokedexData->unownFormsSeen[formIndex] == form) { @@ -201,7 +201,7 @@ static BOOL UnownFormSeen(const PokedexData *pokedexData, u8 form) return FALSE; } -static void SetUnownForm(PokedexData *pokedexData, int form) +static void SetUnownForm(Pokedex *pokedexData, int form) { if (UnownFormSeen(pokedexData, form)) { return; @@ -214,7 +214,7 @@ static void SetUnownForm(PokedexData *pokedexData, int form) } } -static int NumFormsSeen_TwoForms(const PokedexData *pokedexData, u32 species) +static int NumFormsSeen_TwoForms(const Pokedex *pokedexData, u32 species) { GF_ASSERT((species == SPECIES_SHELLOS) || (species == SPECIES_GASTRODON) || (species == SPECIES_SHAYMIN) || (species == SPECIES_GIRATINA)); @@ -248,7 +248,7 @@ static int NumFormsSeen_TwoForms(const PokedexData *pokedexData, u32 species) return 2; } -static BOOL FormSeen_TwoForms(const PokedexData *pokedexData, u32 species, u8 form) +static BOOL FormSeen_TwoForms(const Pokedex *pokedexData, u32 species, u8 form) { GF_ASSERT((species == SPECIES_SHELLOS) || (species == SPECIES_GASTRODON) || (species == SPECIES_SHAYMIN) || (species == SPECIES_GIRATINA)); @@ -285,7 +285,7 @@ static BOOL FormSeen_TwoForms(const PokedexData *pokedexData, u32 species, u8 fo return FALSE; } -static void UpdateForms_TwoForms(PokedexData *pokedexData, u32 species, int form) +static void UpdateForms_TwoForms(Pokedex *pokedexData, u32 species, int form) { GF_ASSERT((species == SPECIES_SHELLOS) || (species == SPECIES_GASTRODON) || (species == SPECIES_SHAYMIN) || (species == SPECIES_GIRATINA)); @@ -320,7 +320,7 @@ static void UpdateForms_TwoForms(PokedexData *pokedexData, u32 species, int form } } -static int NumFormsSeen_ThreeForms(const PokedexData *pokedexData, u32 species) +static int NumFormsSeen_ThreeForms(const Pokedex *pokedexData, u32 species) { GF_ASSERT((species == SPECIES_BURMY) || (species == SPECIES_WORMADAM)); @@ -347,7 +347,7 @@ static int NumFormsSeen_ThreeForms(const PokedexData *pokedexData, u32 species) return formIndex; } -static BOOL FormSeen_ThreeForms(const PokedexData *pokedexData, u32 species, u8 form) +static BOOL FormSeen_ThreeForms(const Pokedex *pokedexData, u32 species, u8 form) { GF_ASSERT((species == SPECIES_BURMY) || (species == SPECIES_WORMADAM)); @@ -373,7 +373,7 @@ static BOOL FormSeen_ThreeForms(const PokedexData *pokedexData, u32 species, u8 return FALSE; } -static void UpdateForms_ThreeForms(PokedexData *pokedexData, u32 species, int form) +static void UpdateForms_ThreeForms(Pokedex *pokedexData, u32 species, int form) { GF_ASSERT((species == SPECIES_BURMY) || (species == SPECIES_WORMADAM)); @@ -404,7 +404,7 @@ static void WriteBit_Deoxys(u32 *array, u8 value, u8 bitIndex) array[DEX_SIZE_U32 - 1] |= (value << bitOffset); } -static void UpdateFormArray_Deoxys(PokedexData *pokedexData, u8 form, u8 bitIndex) +static void UpdateFormArray_Deoxys(Pokedex *pokedexData, u8 form, u8 bitIndex) { // Deoxys forms are currently stored in spare bits in these arrays // This will want to be changed when modding to avoid overlapping references @@ -425,7 +425,7 @@ static inline u32 ReadBit_Deoxys(const u32 *array, u8 bitIndex) return (array[DEX_SIZE_U32 - 1] >> bitOffset) & 0x0F; } -static u32 GetForm_Deoxys(const PokedexData *pokedexData, u8 formIndex) +static u32 GetForm_Deoxys(const Pokedex *pokedexData, u8 formIndex) { // Deoxys forms are currently stored in spare bits in these arrays // This will want to be changed when modding to avoid overlapping references @@ -440,7 +440,7 @@ static u32 GetForm_Deoxys(const PokedexData *pokedexData, u8 formIndex) return form; } -static u32 NumFormsSeen_Deoxys(const PokedexData *pokedexData) +static u32 NumFormsSeen_Deoxys(const Pokedex *pokedexData) { int formIndex; @@ -453,7 +453,7 @@ static u32 NumFormsSeen_Deoxys(const PokedexData *pokedexData) return formIndex; } -static BOOL FormSeen_Deoxys(const PokedexData *pokedexData, u32 form) +static BOOL FormSeen_Deoxys(const Pokedex *pokedexData, u32 form) { for (int formIndex = 0; formIndex < DEOXYS_COUNT; formIndex++) { if (GetForm_Deoxys(pokedexData, formIndex) == form) { @@ -464,7 +464,7 @@ static BOOL FormSeen_Deoxys(const PokedexData *pokedexData, u32 form) return FALSE; } -static void UpdateForms_Deoxys(PokedexData *pokedexData, u16 species, Pokemon *pokemon) +static void UpdateForms_Deoxys(Pokedex *pokedexData, u16 species, Pokemon *pokemon) { u8 form = Pokemon_GetValue(pokemon, MON_DATA_FORM, NULL); @@ -476,7 +476,7 @@ static void UpdateForms_Deoxys(PokedexData *pokedexData, u16 species, Pokemon *p } } -static void InitDeoxys(PokedexData *pokedexData) +static void InitDeoxys(Pokedex *pokedexData) { for (int formIndex = 0; formIndex < DEOXYS_COUNT; formIndex++) { UpdateFormArray_Deoxys(pokedexData, 0x0F, formIndex); @@ -496,7 +496,7 @@ static inline void SetBit_Rotom(u32 *formArray, u32 formIndex, u32 form) (*formArray) |= (form << (formIndex * 3)); } -static int NumFormsSeen_Rotom(const PokedexData *pokedexData, u32 species) +static int NumFormsSeen_Rotom(const Pokedex *pokedexData, u32 species) { GF_ASSERT(species == SPECIES_ROTOM); @@ -521,7 +521,7 @@ static int NumFormsSeen_Rotom(const PokedexData *pokedexData, u32 species) return numFormsSeen; } -static BOOL FormSeen_Rotom(const PokedexData *pokedexData, u32 species, u8 form) +static BOOL FormSeen_Rotom(const Pokedex *pokedexData, u32 species, u8 form) { GF_ASSERT(species == SPECIES_ROTOM); @@ -543,7 +543,7 @@ static BOOL FormSeen_Rotom(const PokedexData *pokedexData, u32 species, u8 form) return FALSE; } -static void UpdateForms_Rotom(PokedexData *pokedexData, u32 species, int form) +static void UpdateForms_Rotom(Pokedex *pokedexData, u32 species, int form) { int numFormsSeen; @@ -560,7 +560,7 @@ static void UpdateForms_Rotom(PokedexData *pokedexData, u32 species, int form) } } -static void UpdateForm(PokedexData *pokedexData, u16 species, Pokemon *pokemon) +static void UpdateForm(Pokedex *pokedexData, u16 species, Pokemon *pokemon) { int form; @@ -603,7 +603,7 @@ static void UpdateForm(PokedexData *pokedexData, u16 species, Pokemon *pokemon) } } -static void UpdateLanguage(PokedexData *pokedexData, u16 species, u32 language) +static void UpdateLanguage(Pokedex *pokedexData, u16 species, u32 language) { int bitIndex = species; int languageIndex = PokedexLanguage_LanguageToIndex(language); @@ -615,7 +615,7 @@ static void UpdateLanguage(PokedexData *pokedexData, u16 species, u32 language) pokedexData->recordedLanguages[bitIndex] |= 1 << languageIndex; } -static u32 GetDisplayGender(const PokedexData *pokedexData, u16 species, int displaySecondary) +static u32 GetDisplayGender(const Pokedex *pokedexData, u16 species, int displaySecondary) { u32 defaultGender, secondaryGender; u32 displayGender; @@ -645,12 +645,12 @@ static u32 GetDisplayGender(const PokedexData *pokedexData, u16 species, int dis return displayGender; } -static inline int GetForm_Unown(const PokedexData *pokedexData, int formIndex) +static inline int GetForm_Unown(const Pokedex *pokedexData, int formIndex) { return pokedexData->unownFormsSeen[formIndex]; } -static int GetForm_TwoForms(const PokedexData *pokedexData, u32 species, int formIndex) +static int GetForm_TwoForms(const Pokedex *pokedexData, u32 species, int formIndex) { const u8 *formArray; @@ -675,7 +675,7 @@ static int GetForm_TwoForms(const PokedexData *pokedexData, u32 species, int for return ReadBit_2Forms(formArray, formIndex + 1); } -static int GetForm_Rotom(const PokedexData *pokedexData, u32 species, int formIndex) +static int GetForm_Rotom(const Pokedex *pokedexData, u32 species, int formIndex) { GF_ASSERT(species == SPECIES_ROTOM); GF_ASSERT(formIndex < ROTOM_COUNT); @@ -683,7 +683,7 @@ static int GetForm_Rotom(const PokedexData *pokedexData, u32 species, int formIn return ReadBit_Rotom(pokedexData->rotomFormsSeen, formIndex); } -static int GetForm_3Forms(const PokedexData *pokedexData, u32 species, int formIndex) +static int GetForm_3Forms(const Pokedex *pokedexData, u32 species, int formIndex) { const u8 *formArray; @@ -726,9 +726,9 @@ static BOOL CountsForDexCompletion_Local(u16 species) return included; } -void PokedexData_Init(PokedexData *pokedexData) +void Pokedex_Init(Pokedex *pokedexData) { - memset(pokedexData, 0, sizeof(PokedexData)); + memset(pokedexData, 0, sizeof(Pokedex)); pokedexData->magic = MAGIC_NUMBER; pokedexData->nationalDexObtained = FALSE; @@ -746,7 +746,7 @@ void PokedexData_Init(PokedexData *pokedexData) InitDeoxys(pokedexData); } -u16 PokedexData_CountCaught_National(const PokedexData *pokedexData) +u16 Pokedex_CountCaught_National(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); @@ -761,7 +761,7 @@ u16 PokedexData_CountCaught_National(const PokedexData *pokedexData) return caughtCount; } -u16 PokedexData_CountSeen_National(const PokedexData *pokedex) +u16 Pokedex_CountSeen_National(const Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); @@ -776,16 +776,16 @@ u16 PokedexData_CountSeen_National(const PokedexData *pokedex) return seenCount; } -u16 PokedexData_CountSeen(const PokedexData *pokedex) +u16 Pokedex_CountSeen(const Pokedex *pokedex) { if (PokedexData_IsNationalDexObtained(pokedex)) { - return PokedexData_CountSeen_National(pokedex); + return Pokedex_CountSeen_National(pokedex); } return PokedexData_CountSeen_Local(pokedex); } -u16 PokedexData_CountCaught_Local(const PokedexData *pokedexData) +u16 PokedexData_CountCaught_Local(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); @@ -802,7 +802,7 @@ u16 PokedexData_CountCaught_Local(const PokedexData *pokedexData) return caughtCount; } -u16 PokedexData_CountSeen_Local(const PokedexData *pokedex) +u16 PokedexData_CountSeen_Local(const Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); @@ -817,7 +817,7 @@ u16 PokedexData_CountSeen_Local(const PokedexData *pokedex) return seenCount; } -BOOL PokedexData_NationalDexCompleted(const PokedexData *pokedexData) +BOOL PokedexData_NationalDexCompleted(const Pokedex *pokedexData) { u16 numCaught = PokedexData_NumCaught_National(pokedexData); @@ -828,7 +828,7 @@ BOOL PokedexData_NationalDexCompleted(const PokedexData *pokedexData) return FALSE; } -BOOL PokedexData_LocalDexCompleted(const PokedexData *pokedexData) +BOOL PokedexData_LocalDexCompleted(const Pokedex *pokedexData) { u16 numCaught = PokedexData_NumCaught_Local(pokedexData); @@ -839,7 +839,7 @@ BOOL PokedexData_LocalDexCompleted(const PokedexData *pokedexData) return FALSE; } -u16 PokedexData_NumCaught_National(const PokedexData *pokedexData) +u16 PokedexData_NumCaught_National(const Pokedex *pokedexData) { int species; u16 numCaught = 0; @@ -855,7 +855,7 @@ u16 PokedexData_NumCaught_National(const PokedexData *pokedexData) return numCaught; } -u16 PokedexData_NumCaught_Local(const PokedexData *pokedexData) +u16 PokedexData_NumCaught_Local(const Pokedex *pokedexData) { int species; u16 numCaught = 0; @@ -872,7 +872,7 @@ u16 PokedexData_NumCaught_Local(const PokedexData *pokedexData) return numCaught; } -BOOL PokedexData_HasCaughtSpecies(const PokedexData *pokedex, u16 species) +BOOL PokedexData_HasCaughtSpecies(const Pokedex *pokedex, u16 species) { CheckPokedexIntegrity(pokedex); @@ -887,7 +887,7 @@ BOOL PokedexData_HasCaughtSpecies(const PokedexData *pokedex, u16 species) } } -BOOL PokedexData_HasSeenSpecies(const PokedexData *pokedex, u16 species) +BOOL PokedexData_HasSeenSpecies(const Pokedex *pokedex, u16 species) { CheckPokedexIntegrity(pokedex); @@ -898,7 +898,7 @@ BOOL PokedexData_HasSeenSpecies(const PokedexData *pokedex, u16 species) return SpeciesSeen(pokedex, species); } -u32 PokedexData_GetForm_Spinda(const PokedexData *pokedexData, u8 formIndex) +u32 PokedexData_GetForm_Spinda(const Pokedex *pokedexData, u8 formIndex) { CheckPokedexIntegrity(pokedexData); @@ -915,7 +915,7 @@ u32 PokedexData_GetForm_Spinda(const PokedexData *pokedexData, u8 formIndex) return form; } -u32 PokedexData_DisplayedGender(const PokedexData *pokedexData, u16 species, int displaySecondary) +u32 PokedexData_DisplayedGender(const Pokedex *pokedexData, u16 species, int displaySecondary) { CheckPokedexIntegrity(pokedexData); @@ -930,7 +930,7 @@ u32 PokedexData_DisplayedGender(const PokedexData *pokedexData, u16 species, int return GetDisplayGender(pokedexData, species, displaySecondary); } -u32 PokedexData_GetForm_Unown(const PokedexData *pokedexData, int formIndex) +u32 PokedexData_GetForm_Unown(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -941,13 +941,13 @@ u32 PokedexData_GetForm_Unown(const PokedexData *pokedexData, int formIndex) return GetForm_Unown(pokedexData, formIndex); } -u32 PokedexData_NumFormsSeen_Unown(const PokedexData *pokedexData) +u32 PokedexData_NumFormsSeen_Unown(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_Unown(pokedexData); } -u32 PokedexData_GetForm_Shellos(const PokedexData *pokedexData, int formIndex) +u32 PokedexData_GetForm_Shellos(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -958,13 +958,13 @@ u32 PokedexData_GetForm_Shellos(const PokedexData *pokedexData, int formIndex) return GetForm_TwoForms(pokedexData, SPECIES_SHELLOS, formIndex); } -u32 PokedexData_NumFormsSeen_Shellos(const PokedexData *pokedexData) +u32 PokedexData_NumFormsSeen_Shellos(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_TwoForms(pokedexData, SPECIES_SHELLOS); } -u32 PokedexData_GetForm_Gastrodon(const PokedexData *pokedexData, int formIndex) +u32 PokedexData_GetForm_Gastrodon(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -975,13 +975,13 @@ u32 PokedexData_GetForm_Gastrodon(const PokedexData *pokedexData, int formIndex) return GetForm_TwoForms(pokedexData, SPECIES_GASTRODON, formIndex); } -u32 PokedexData_NumFormsSeen_Gastrodon(const PokedexData *pokedexData) +u32 PokedexData_NumFormsSeen_Gastrodon(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_TwoForms(pokedexData, SPECIES_GASTRODON); } -u32 PokedexData_GetForm_Burmy(const PokedexData *pokedexData, int formIndex) +u32 PokedexData_GetForm_Burmy(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -992,13 +992,13 @@ u32 PokedexData_GetForm_Burmy(const PokedexData *pokedexData, int formIndex) return GetForm_3Forms(pokedexData, SPECIES_BURMY, formIndex); } -u32 PokedexData_NumFormsSeen_Burmy(const PokedexData *pokedexData) +u32 PokedexData_NumFormsSeen_Burmy(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_ThreeForms(pokedexData, SPECIES_BURMY); } -u32 PokedexData_GetForm_Wormadam(const PokedexData *pokedexData, int formIndex) +u32 PokedexData_GetForm_Wormadam(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -1009,25 +1009,25 @@ u32 PokedexData_GetForm_Wormadam(const PokedexData *pokedexData, int formIndex) return GetForm_3Forms(pokedexData, SPECIES_WORMADAM, formIndex); } -u32 PokedexData_NumFormsSeen_Wormadam(const PokedexData *pokedexData) +u32 PokedexData_NumFormsSeen_Wormadam(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_ThreeForms(pokedexData, SPECIES_WORMADAM); } -u32 PokedexData_GetForm_Deoxys(const PokedexData *pokedexData, int formIndex) +u32 PokedexData_GetForm_Deoxys(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); return GetForm_Deoxys(pokedexData, formIndex); } -u32 PokedexData_NumFormsSeen_Deoxys(const PokedexData *pokedexData) +u32 PokedexData_NumFormsSeen_Deoxys(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_Deoxys(pokedexData); } -void PokedexData_Encounter(PokedexData *pokedexData, Pokemon *pokemon) +void Pokedex_Encounter(Pokedex *pokedexData, Pokemon *pokemon) { u16 species = Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL); u32 personality = Pokemon_GetValue(pokemon, MON_DATA_PERSONALITY, NULL); @@ -1054,7 +1054,7 @@ void PokedexData_Encounter(PokedexData *pokedexData, Pokemon *pokemon) Write_SeenSpecies(pokedexData, species); } -void PokedexData_Capture(PokedexData *pokedexData, Pokemon *pokemon) +void PokedexData_Capture(Pokedex *pokedexData, Pokemon *pokemon) { u16 species = Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL); u32 language = Pokemon_GetValue(pokemon, MON_DATA_LANGUAGE, NULL); @@ -1085,31 +1085,31 @@ void PokedexData_Capture(PokedexData *pokedexData, Pokemon *pokemon) Write_SeenSpecies(pokedexData, species); } -void PokedexData_ObtainNationalDex(PokedexData *pokedexData) +void PokedexData_ObtainNationalDex(Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); pokedexData->nationalDexObtained = TRUE; } -BOOL PokedexData_IsNationalDexObtained(const PokedexData *pokedex) +BOOL PokedexData_IsNationalDexObtained(const Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); return pokedex->nationalDexObtained; } -BOOL PokedexData_CanDetectForms(const PokedexData *pokedexData) +BOOL PokedexData_CanDetectForms(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return pokedexData->canDetectForms; } -void PokedexData_TurnOnFormDetection(PokedexData *pokedexData) +void PokedexData_TurnOnFormDetection(Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); pokedexData->canDetectForms = TRUE; } -BOOL PokedexData_IsLanguageObtained(const PokedexData *pokedexData, u16 species, u32 languageIndex) +BOOL PokedexData_IsLanguageObtained(const Pokedex *pokedexData, u16 species, u32 languageIndex) { int bitIndex; @@ -1123,35 +1123,35 @@ BOOL PokedexData_IsLanguageObtained(const PokedexData *pokedexData, u16 species, return pokedexData->recordedLanguages[bitIndex] & (1 << languageIndex); } -void PokedexData_TurnOnLanguageDetection(PokedexData *pokedexData) +void PokedexData_TurnOnLanguageDetection(Pokedex *pokedexData) { pokedexData->canDetectLanguages = TRUE; } -BOOL PokedexData_CanDetectLanguages(const PokedexData *pokedexData) +BOOL PokedexData_CanDetectLanguages(const Pokedex *pokedexData) { return pokedexData->canDetectLanguages; } -BOOL PokedexData_IsObtained(const PokedexData *pokedex) +BOOL Pokedex_IsObtained(const Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); return pokedex->pokedexObtained; } -void PokedexData_ObtainPokedex(PokedexData *pokedex) +void PokedexData_ObtainPokedex(Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); pokedex->pokedexObtained = TRUE; } -PokedexData *SaveData_PokedexData(SaveData *saveData) +Pokedex *SaveData_Pokedex(SaveData *saveData) { - PokedexData *pokedex = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_POKEDEX); + Pokedex *pokedex = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_POKEDEX); return pokedex; } -u32 PokedexData_GetDisplayForm(const PokedexData *pokedexData, int species, int formIndex) +u32 Pokedex_GetDisplayForm(const Pokedex *pokedexData, int species, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -1208,7 +1208,7 @@ u32 PokedexData_GetDisplayForm(const PokedexData *pokedexData, int species, int return 0; } -u32 PokedexData_NumFormsSeen(const PokedexData *pokedex, int species) +u32 PokedexData_NumFormsSeen(const Pokedex *pokedex, int species) { CheckPokedexIntegrity(pokedex); diff --git a/src/poketch_data.c b/src/poketch_data.c index 05650c230e..ad40c3a565 100644 --- a/src/poketch_data.c +++ b/src/poketch_data.c @@ -11,7 +11,7 @@ int Poketch_SaveSize(void) { - return sizeof(PoketchData); + return sizeof(Poketch); } static const struct { @@ -26,68 +26,68 @@ static const struct { { 184, 152 } }; -void Poketch_Init(PoketchData *poketchData) +void Poketch_Init(Poketch *poketch) { int i; for (i = 0; i < POKETCH_REGISTRY_SIZE; i++) { - poketchData->appRegistry[i] = 0; + poketch->appRegistry[i] = 0; } - poketchData->appCount = 0; - poketchData->appIndex = 0; - poketchData->poketchEnabled = 0; - poketchData->screenColor = 0; - poketchData->pedometerEnabled = 0; - poketchData->stepCount = 0; - poketchData->alarmSet = 0; - poketchData->alarmHour = 0; - poketchData->alarmMinute = 0; - poketchData->calendarMonth = 1; - poketchData->calendarMarkBitmap = 0; + poketch->appCount = 0; + poketch->appIndex = 0; + poketch->poketchEnabled = 0; + poketch->screenColor = 0; + poketch->pedometerEnabled = 0; + poketch->stepCount = 0; + poketch->alarmSet = 0; + poketch->alarmHour = 0; + poketch->alarmMinute = 0; + poketch->calendarMonth = 1; + poketch->calendarMarkBitmap = 0; for (i = 0; i < POKETCH_MAPMARKER_COUNT; i++) { - poketchData->markMapPositions[i].x = sDefaultMapMarkers[i].x; - poketchData->markMapPositions[i].y = sDefaultMapMarkers[i].y; + poketch->markMapPositions[i].x = sDefaultMapMarkers[i].x; + poketch->markMapPositions[i].y = sDefaultMapMarkers[i].y; } for (i = 0; i < POKETCH_POKEMONHISTORY_MAX; i++) { - poketchData->pokemonHistoryQueue[i].species = 0; - poketchData->pokemonHistoryQueue[i].icon = 0; - poketchData->pokemonHistoryQueue[i].form = 0; + poketch->pokemonHistoryQueue[i].species = 0; + poketch->pokemonHistoryQueue[i].icon = 0; + poketch->pokemonHistoryQueue[i].form = 0; } - poketchData->dotArtModifiedByPlayer = 0; - PoketchData_RegisterApp(poketchData, POKETCH_APPID_DIGITALWATCH); + poketch->dotArtModifiedByPlayer = 0; + PoketchData_RegisterApp(poketch, POKETCH_APPID_DIGITALWATCH); } -void PoketchData_Enable(PoketchData *poketchData) +void PoketchData_Enable(Poketch *poketch) { - poketchData->poketchEnabled = 1; + poketch->poketchEnabled = 1; } -BOOL PoketchData_IsEnabled(PoketchData *poketchData) +BOOL PoketchData_IsEnabled(Poketch *poketch) { - return poketchData->poketchEnabled; + return poketch->poketchEnabled; } -BOOL PoketchData_IsAppRegistered(PoketchData *poketchData, enum PoketchAppID appID) +BOOL PoketchData_IsAppRegistered(Poketch *poketch, enum PoketchAppID appID) { - return poketchData->appRegistry[appID]; + return poketch->appRegistry[appID]; } -BOOL PoketchData_RegisterApp(PoketchData *poketchData, enum PoketchAppID appID) +BOOL PoketchData_RegisterApp(Poketch *poketch, enum PoketchAppID appID) { BOOL appRegistered = FALSE; GF_ASSERT(appID >= 0 && appID < POKETCH_APPID_MAX); - if (poketchData->appCount < POKETCH_APPID_MAX && poketchData->appRegistry[appID] == 0) { - poketchData->appRegistry[appID] = 1; - poketchData->appCount++; + if (poketch->appCount < POKETCH_APPID_MAX && poketch->appRegistry[appID] == 0) { + poketch->appRegistry[appID] = 1; + poketch->appCount++; if (appID == POKETCH_APPID_PEDOMETER) { - poketchData->pedometerEnabled = 1; + poketch->pedometerEnabled = 1; } appRegistered = TRUE; @@ -96,190 +96,190 @@ BOOL PoketchData_RegisterApp(PoketchData *poketchData, enum PoketchAppID appID) return appRegistered; } -enum PoketchAppID PoketchData_CurrentAppID(const PoketchData *poketchData) +enum PoketchAppID PoketchData_CurrentAppID(const Poketch *poketch) { - return poketchData->appIndex; + return poketch->appIndex; } -int PoketchData_IncrementAppID(PoketchData *poketchData) +int PoketchData_IncrementAppID(Poketch *poketch) { - int nextIndex = poketchData->appIndex; + int nextIndex = poketch->appIndex; while (TRUE) { if (++nextIndex >= POKETCH_APPID_MAX) { nextIndex = 0; } - if (nextIndex == poketchData->appIndex) { + if (nextIndex == poketch->appIndex) { break; } - if (poketchData->appRegistry[nextIndex]) { + if (poketch->appRegistry[nextIndex]) { break; } } - poketchData->appIndex = nextIndex; + poketch->appIndex = nextIndex; - return poketchData->appIndex; + return poketch->appIndex; } -int PoketchData_DecrementAppID(PoketchData *poketchData) +int PoketchData_DecrementAppID(Poketch *poketch) { - int prevIndex = poketchData->appIndex; + int prevIndex = poketch->appIndex; while (TRUE) { if (--prevIndex < 0) { prevIndex = POKETCH_APPID_MAX - 1; } - if (prevIndex == poketchData->appIndex) { + if (prevIndex == poketch->appIndex) { break; } - if (poketchData->appRegistry[prevIndex]) { + if (poketch->appRegistry[prevIndex]) { break; } } - poketchData->appIndex = prevIndex; + poketch->appIndex = prevIndex; - return poketchData->appIndex; + return poketch->appIndex; } -u32 PoketchData_CurrentScreenColor(const PoketchData *poketchData) +u32 PoketchData_CurrentScreenColor(const Poketch *poketch) { - GF_ASSERT(poketchData); - return poketchData->screenColor; + GF_ASSERT(poketch); + return poketch->screenColor; } -void PoketchData_SetScreenColor(PoketchData *poketchData, u32 screenColor) +void PoketchData_SetScreenColor(Poketch *poketch, u32 screenColor) { - GF_ASSERT(poketchData); + GF_ASSERT(poketch); GF_ASSERT(screenColor < POKETCH_SCREEN_COLOR_MAX); - poketchData->screenColor = screenColor; + poketch->screenColor = screenColor; } -u32 PoketchData_StepCount(const PoketchData *poketchData) +u32 PoketchData_StepCount(const Poketch *poketch) { - return poketchData->stepCount; + return poketch->stepCount; } -void PoketchData_SetStepCount(PoketchData *poketchData, u32 value) +void PoketchData_SetStepCount(Poketch *poketch, u32 value) { - if (poketchData->pedometerEnabled) { - poketchData->stepCount = value; + if (poketch->pedometerEnabled) { + poketch->stepCount = value; } } -BOOL PoketchData_IsAlarmSet(const PoketchData *poketchData) +BOOL PoketchData_IsAlarmSet(const Poketch *poketch) { - return poketchData->alarmSet; + return poketch->alarmSet; } -void PoketchData_AlarmTime(const PoketchData *poketchData, u32 *hour, u32 *minute) +void PoketchData_AlarmTime(const Poketch *poketch, u32 *hour, u32 *minute) { - *hour = poketchData->alarmHour; - *minute = poketchData->alarmMinute; + *hour = poketch->alarmHour; + *minute = poketch->alarmMinute; } -void PoketchData_SetAlarm(PoketchData *poketchData, BOOL enable, u32 hour, u32 minute) +void PoketchData_SetAlarm(Poketch *poketch, BOOL enable, u32 hour, u32 minute) { - poketchData->alarmSet = enable; - poketchData->alarmHour = hour; - poketchData->alarmMinute = minute; + poketch->alarmSet = enable; + poketch->alarmHour = hour; + poketch->alarmMinute = minute; } -void PoketchData_SetCalendarMark(PoketchData *poketchData, u32 month, u32 day) +void PoketchData_SetCalendarMark(Poketch *poketch, u32 month, u32 day) { - if (poketchData->calendarMonth == month) { - poketchData->calendarMarkBitmap |= (1 << (day - 1)); + if (poketch->calendarMonth == month) { + poketch->calendarMarkBitmap |= (1 << (day - 1)); } else { - poketchData->calendarMonth = month; - poketchData->calendarMarkBitmap = (1 << (day - 1)); + poketch->calendarMonth = month; + poketch->calendarMarkBitmap = (1 << (day - 1)); } } -void PoketchData_ClearCalendarMark(PoketchData *poketchData, u32 month, u32 day) +void PoketchData_ClearCalendarMark(Poketch *poketch, u32 month, u32 day) { - if (poketchData->calendarMonth == month) { - poketchData->calendarMarkBitmap &= ~(1 << (day - 1)); + if (poketch->calendarMonth == month) { + poketch->calendarMarkBitmap &= ~(1 << (day - 1)); } else { - poketchData->calendarMonth = month; - poketchData->calendarMarkBitmap = 0; + poketch->calendarMonth = month; + poketch->calendarMarkBitmap = 0; } } -BOOL PoketchData_CalendarMarked(const PoketchData *poketchData, u32 month, u32 day) +BOOL PoketchData_CalendarMarked(const Poketch *poketch, u32 month, u32 day) { - if (poketchData->calendarMonth == month) { - return (poketchData->calendarMarkBitmap >> (day - 1)) & 1; + if (poketch->calendarMonth == month) { + return (poketch->calendarMarkBitmap >> (day - 1)) & 1; } return FALSE; } -void PoketchData_SetMapMarker(PoketchData *poketchData, int index, u8 x, u8 y) +void PoketchData_SetMapMarker(Poketch *poketch, int index, u8 x, u8 y) { GF_ASSERT(index < POKETCH_MAPMARKER_COUNT); - poketchData->markMapPositions[index].x = x; - poketchData->markMapPositions[index].y = y; + poketch->markMapPositions[index].x = x; + poketch->markMapPositions[index].y = y; } -void PoketchData_MapMarkerPos(const PoketchData *poketchData, int index, u8 *x, u8 *y) +void PoketchData_MapMarkerPos(const Poketch *poketch, int index, u8 *x, u8 *y) { GF_ASSERT(index < POKETCH_MAPMARKER_COUNT); - *x = poketchData->markMapPositions[index].x; - *y = poketchData->markMapPositions[index].y; + *x = poketch->markMapPositions[index].x; + *y = poketch->markMapPositions[index].y; } -BOOL PoketchData_DotArtModified(const PoketchData *poketchData) +BOOL PoketchData_DotArtModified(const Poketch *poketch) { - return poketchData->dotArtModifiedByPlayer; + return poketch->dotArtModifiedByPlayer; } -void PoketchData_CopyDotArtData(const PoketchData *poketchData, u8 *dst) +void PoketchData_CopyDotArtData(const Poketch *poketch, u8 *dst) { - if (poketchData->dotArtModifiedByPlayer) { - MI_CpuCopy8(poketchData->dotArtData, dst, POKETCH_DOTART_SIZE_BYTES); + if (poketch->dotArtModifiedByPlayer) { + MI_CpuCopy8(poketch->dotArtData, dst, POKETCH_DOTART_SIZE_BYTES); } } -void PoketchData_ModifyDotArtData(PoketchData *poketchData, const u8 *src) +void PoketchData_ModifyDotArtData(Poketch *poketch, const u8 *src) { - MI_CpuCopy8(src, poketchData->dotArtData, POKETCH_DOTART_SIZE_BYTES); - poketchData->dotArtModifiedByPlayer = TRUE; + MI_CpuCopy8(src, poketch->dotArtData, POKETCH_DOTART_SIZE_BYTES); + poketch->dotArtModifiedByPlayer = TRUE; } -void PoketchData_PokemonHistoryEnqueue(PoketchData *poketchData, const BoxPokemon *boxPokemon) +void PoketchData_PokemonHistoryEnqueue(Poketch *poketch, const BoxPokemon *boxPokemon) { - int index = PoketchData_PokemonHistorySize(poketchData); + int index = PoketchData_PokemonHistorySize(poketch); // Shift all entries one index up if (index >= POKETCH_POKEMONHISTORY_MAX) { for (int i = 0; i < (POKETCH_POKEMONHISTORY_MAX - 1); i++) { - poketchData->pokemonHistoryQueue[i] = poketchData->pokemonHistoryQueue[i + 1]; + poketch->pokemonHistoryQueue[i] = poketch->pokemonHistoryQueue[i + 1]; } index = POKETCH_POKEMONHISTORY_MAX - 1; } // Add new entry to end of the list - poketchData->pokemonHistoryQueue[index].species = BoxPokemon_GetValue((BoxPokemon *)boxPokemon, MON_DATA_SPECIES, NULL); - poketchData->pokemonHistoryQueue[index].icon = BoxPokemon_IconFormOffset(boxPokemon); - poketchData->pokemonHistoryQueue[index].form = BoxPokemon_GetValue((BoxPokemon *)boxPokemon, MON_DATA_FORM, NULL); + poketch->pokemonHistoryQueue[index].species = BoxPokemon_GetValue((BoxPokemon *)boxPokemon, MON_DATA_SPECIES, NULL); + poketch->pokemonHistoryQueue[index].icon = BoxPokemon_IconFormOffset(boxPokemon); + poketch->pokemonHistoryQueue[index].form = BoxPokemon_GetValue((BoxPokemon *)boxPokemon, MON_DATA_FORM, NULL); } -int PoketchData_PokemonHistorySize(const PoketchData *poketchData) +int PoketchData_PokemonHistorySize(const Poketch *poketch) { int size; for (size = 0; size < POKETCH_POKEMONHISTORY_MAX; size++) { - if (poketchData->pokemonHistoryQueue[size].species == 0) { + if (poketch->pokemonHistoryQueue[size].species == 0) { return size; } } @@ -287,24 +287,24 @@ int PoketchData_PokemonHistorySize(const PoketchData *poketchData) return size; } -void PoketchData_PokemonHistorySpeciesAndIcon(const PoketchData *poketchData, int index, int *species, int *icon) +void PoketchData_PokemonHistorySpeciesAndIcon(const Poketch *poketch, int index, int *species, int *icon) { GF_ASSERT(index < POKETCH_POKEMONHISTORY_MAX); - GF_ASSERT(poketchData->pokemonHistoryQueue[index].species); + GF_ASSERT(poketch->pokemonHistoryQueue[index].species); - *species = poketchData->pokemonHistoryQueue[index].species; - *icon = poketchData->pokemonHistoryQueue[index].icon; + *species = poketch->pokemonHistoryQueue[index].species; + *icon = poketch->pokemonHistoryQueue[index].icon; } -u32 PoketchData_PokemonHistoryForm(const PoketchData *poketchData, int index) +u32 PoketchData_PokemonHistoryForm(const Poketch *poketch, int index) { GF_ASSERT(index < POKETCH_POKEMONHISTORY_MAX); - GF_ASSERT(poketchData->pokemonHistoryQueue[index].species); + GF_ASSERT(poketch->pokemonHistoryQueue[index].species); - return poketchData->pokemonHistoryQueue[index].form; + return poketch->pokemonHistoryQueue[index].form; } -PoketchData *SaveData_PoketchData(SaveData *saveData) +Poketch *SaveData_PoketchData(SaveData *saveData) { return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_POKETCH); } diff --git a/src/savedata/save_table.c b/src/savedata/save_table.c index 11f6a2ee4f..46816319c8 100644 --- a/src/savedata/save_table.c +++ b/src/savedata/save_table.c @@ -53,7 +53,7 @@ const SaveTableEntry gSaveTable[] = { { SAVE_TABLE_ENTRY_VARS_FLAGS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)VarsFlags_SaveSize, (SaveEntryInitFunc)VarsFlags_Init }, { SAVE_TABLE_ENTRY_POKETCH, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Poketch_SaveSize, (SaveEntryInitFunc)Poketch_Init }, { SAVE_TABLE_ENTRY_FIELD_PLAYER_STATE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)FieldOverworldState_Size, (SaveEntryInitFunc)FieldOverworldState_Init }, - { SAVE_TABLE_ENTRY_POKEDEX, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)PokedexData_SaveSize, (SaveEntryInitFunc)PokedexData_Init }, + { SAVE_TABLE_ENTRY_POKEDEX, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Pokedex_SaveSize, (SaveEntryInitFunc)Pokedex_Init }, { SAVE_TABLE_ENTRY_DAYCARE, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Daycare_SaveSize, (SaveEntryInitFunc)Daycare_Init }, { SAVE_TABLE_ENTRY_PAL_PAD, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)PalPad_SaveSize, (SaveEntryInitFunc)PalPad_Init }, { SAVE_TABLE_ENTRY_MISC, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)MiscSaveBlock_SaveSize, (SaveEntryInitFunc)MiscSaveBlock_Init }, diff --git a/src/scrcmd.c b/src/scrcmd.c index ffe401dbd9..7dedb81e56 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -4996,7 +4996,7 @@ static BOOL ScrCmd_120(ScriptContext *ctx) const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); - *v1 = PokedexData_CountSeen_National(v0); + *v1 = Pokedex_CountSeen_National(v0); return 0; } @@ -5005,7 +5005,7 @@ static BOOL ScrCmd_121(ScriptContext *ctx) const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); - *v1 = PokedexData_CountCaught_National(v0); + *v1 = Pokedex_CountCaught_National(v0); return 0; } @@ -5180,10 +5180,10 @@ static BOOL ScrCmd_131(ScriptContext *ctx) static BOOL ScrCmd_132(ScriptContext *ctx) { - PoketchData *poketchData = SaveData_PoketchData(ctx->fieldSystem->saveData); + Poketch *poketch = SaveData_PoketchData(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); - *v1 = PoketchData_IsEnabled(poketchData); + *v1 = PoketchData_IsEnabled(poketch); return 0; } @@ -6565,13 +6565,13 @@ static BOOL ScrCmd_22A(ScriptContext *ctx) static BOOL ScrCmd_22B(ScriptContext *ctx) { - PokedexData_TurnOnLanguageDetection(SaveData_PokedexData(ctx->fieldSystem->saveData)); + PokedexData_TurnOnLanguageDetection(SaveData_Pokedex(ctx->fieldSystem->saveData)); return 0; } static BOOL ScrCmd_22C(ScriptContext *ctx) { - PokedexData_TurnOnFormDetection(SaveData_PokedexData(ctx->fieldSystem->saveData)); + PokedexData_TurnOnFormDetection(SaveData_Pokedex(ctx->fieldSystem->saveData)); return 0; } @@ -6583,10 +6583,10 @@ static BOOL ScrCmd_22D(ScriptContext *ctx) *v1 = 0; if (v0 == 1) { - PokedexData_ObtainNationalDex(SaveData_PokedexData(ctx->fieldSystem->saveData)); + PokedexData_ObtainNationalDex(SaveData_Pokedex(ctx->fieldSystem->saveData)); TrainerInfo_GiveNationalDex(SaveData_GetTrainerInfo(ctx->fieldSystem->saveData)); } else if (v0 == 2) { - *v1 = PokedexData_IsNationalDexObtained(SaveData_PokedexData(ctx->fieldSystem->saveData)); + *v1 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(ctx->fieldSystem->saveData)); } else { GF_ASSERT(FALSE); } @@ -6773,7 +6773,7 @@ static void sub_020451B4(FieldSystem *fieldSystem, u16 param1) Pokemon_Init(v1); Pokemon_InitWith(v1, param1, 50, 32, FALSE, 0, OTID_NOT_SET, 0); - PokedexData_Encounter(v0, v1); + Pokedex_Encounter(v0, v1); Heap_FreeToHeap(v1); return; @@ -8333,7 +8333,7 @@ static BOOL ScrCmd_328(ScriptContext *ctx) v5 = Party_GetPokemonBySlotIndex(v1, v3); if ((Pokemon_GetValue(v5, MON_DATA_IS_EGG, NULL) == 0) && (Pokemon_GetValue(v5, MON_DATA_SPECIES, NULL) == SPECIES_GIRATINA)) { - PokedexData_Capture(SaveData_PokedexData(fieldSystem->saveData), v5); + PokedexData_Capture(SaveData_Pokedex(fieldSystem->saveData), v5); } } } diff --git a/src/scrcmd_system_flags.c b/src/scrcmd_system_flags.c index 69de1924d9..114155e7c0 100644 --- a/src/scrcmd_system_flags.c +++ b/src/scrcmd_system_flags.c @@ -20,7 +20,7 @@ BOOL ScrCmd_CheckPokedexAcquired(ScriptContext *ctx) { const Pokedex *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData); u16 *destVar = ScriptContext_GetVarPointer(ctx); - *destVar = PokedexData_IsObtained(pokedex); + *destVar = Pokedex_IsObtained(pokedex); return FALSE; } diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 390512e54a..42ec41a14f 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -561,7 +561,7 @@ void sub_0202FAFC(FieldBattleDTO *param0, SaveData *param1) param0->resultMask = BATTLE_IN_PROGRESS; param0->leveledUpMonsMask = 0; - PokedexData_Copy(SaveData_PokedexData(param1), param0->pokedex); + Pokedex_Copy(SaveData_Pokedex(param1), param0->pokedex); for (v0 = 0; v0 < 4; v0++) { param0->trainerIDs[v0] = v1->unk_00.unk_08[v0]; diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index b44cde924c..874cc56e95 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -979,7 +979,7 @@ static void sub_0203DB38(UnkStruct_ov88_0223C370 *param0, FieldSystem *fieldSyst param0->unk_0C = SaveData_SaveTable(fieldSystem->saveData, 9); param0->unk_14 = sub_0202C878(fieldSystem->saveData); param0->unk_18 = SaveData_Options(fieldSystem->saveData); - param0->unk_24 = SaveData_PokedexData(fieldSystem->saveData); + param0->unk_24 = SaveData_Pokedex(fieldSystem->saveData); param0->unk_30 = sub_0207A274(fieldSystem->saveData); param0->unk_10 = fieldSystem->saveData; param0->unk_1C = fieldSystem->journalEntry; @@ -1075,7 +1075,7 @@ BOOL sub_0203DBF0(FieldTask *param0) if ((v4 = sub_02076B94(NULL, v2->unk_04.unk_40, 1, v3, &v5)) != 0) { Heap_Create(3, 26, 0x30000); - v2->unk_60 = sub_0207AE68(NULL, v2->unk_04.unk_40, v4, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_PokedexData(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v5, 0x4, 26); + v2->unk_60 = sub_0207AE68(NULL, v2->unk_04.unk_40, v4, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v5, 0x4, 26); v2->unk_00 = 6; } else { v2->unk_00 = 7; @@ -1366,7 +1366,7 @@ void sub_0203E0FC(FieldSystem *fieldSystem, int param1) v0->unk_04 = SaveData_GetSystemData(fieldSystem->saveData); v0->unk_08 = SaveData_SaveTable(fieldSystem->saveData, 2); v0->unk_0C = SaveData_PCBoxes(fieldSystem->saveData); - v0->unk_10 = SaveData_PokedexData(fieldSystem->saveData); + v0->unk_10 = SaveData_Pokedex(fieldSystem->saveData); v0->unk_14 = sub_0202B370(fieldSystem->saveData); v0->unk_18 = sub_0202C878(fieldSystem->saveData); v0->unk_1C = SaveData_GetTrainerInfo(fieldSystem->saveData); diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index 0eac6b747c..d0928965be 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -107,7 +107,7 @@ BOOL ScrCmd_0FA(ScriptContext *param0) v8.unk_01 = v4; v8.unk_02 = v6; v8.unk_03 = SystemFlag_CheckGameCompleted(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); - v8.unk_04 = PokedexData_IsNationalDexObtained(SaveData_PokedexData(param0->fieldSystem->saveData)); + v8.unk_04 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(param0->fieldSystem->saveData)); v8.unk_05 = v7; v8.unk_08 = v1; v8.unk_0C = v0; diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index b34401ef9c..f5eb314c93 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -319,8 +319,8 @@ static BOOL sub_02049348(FieldSystem *fieldSystem) static BOOL sub_02049358(FieldSystem *fieldSystem) { - PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - return PoketchData_IsEnabled(poketchData); + Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); + return PoketchData_IsEnabled(poketch); } static BOOL sub_02049368(FieldSystem *fieldSystem) diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index 162d127451..d2e7c7f801 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -112,7 +112,7 @@ StringTemplate *sub_0204AEE8(SaveData *param0, u16 param1, u16 param2, u8 param3 v2 = Strbuf_Init(12 + 2, 4); v3 = Strbuf_Init(2, 4); - v4 = SaveData_PokedexData(param0); + v4 = SaveData_Pokedex(param0); v6 = MessageLoader_Init(1, 26, 412, 4); v5 = StringTemplate_New(18 + 1, 12 + 2, 4); diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index dde7bed166..675a8a9bcf 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -712,18 +712,18 @@ static void sub_0204C428(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) static BOOL sub_0204C458(FieldSystem *fieldSystem, void *param1) { - PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); + Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); - return PoketchData_IsEnabled(poketchData); + return PoketchData_IsEnabled(poketch); } static void sub_0204C474(FieldSystem *fieldSystem, void *param1) { - PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); + Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); - PoketchData_RegisterApp(poketchData, v1->val6.unk_00); + PoketchData_RegisterApp(poketch, v1->val6.unk_00); } static void sub_0204C494(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index c3383954b4..e18e336989 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -192,7 +192,7 @@ void sub_02052E58(FieldTask *param0) v5->unk_04.playTime = SaveData_GetPlayTime(fieldSystem->saveData); v5->unk_10.unk_00 = TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)); v5->unk_10.unk_04 = SystemFlag_CheckGameCompleted(v3); - v5->unk_10.unk_08 = SaveData_PokedexData(fieldSystem->saveData); + v5->unk_10.unk_08 = SaveData_Pokedex(fieldSystem->saveData); if (SystemFlag_CheckGameCompleted(v3) == 0) { sub_02055C2C(fieldSystem); diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index ccccbfd6a8..9300be8a49 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -1065,7 +1065,7 @@ static u32 sub_02069130(const UnkStruct_020684D0 *param0) return -1; } - if (PokedexData_IsNationalDexObtained(SaveData_PokedexData(param0->fieldSystem->saveData)) == FALSE) { + if (PokedexData_IsNationalDexObtained(SaveData_Pokedex(param0->fieldSystem->saveData)) == FALSE) { return -1; } diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index bfc4aeb272..c5c6555f1d 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -814,7 +814,7 @@ static BOOL sub_0206D3C0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param return 1; } - return PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_00); + return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } static void sub_0206D3E4(FieldSystem *fieldSystem, int param1) @@ -935,7 +935,7 @@ static int sub_0206D5B0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206D5F0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { UnkStruct_0206D5B0 *v0 = (UnkStruct_0206D5B0 *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_00); + return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206D60C(FieldSystem *fieldSystem, Pokemon *param1) @@ -1092,7 +1092,7 @@ static BOOL sub_0206D8F0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { UnkStruct_0206D8B0 *v0 = (UnkStruct_0206D8B0 *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_00); + return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206D90C(TVBroadcast *fieldSystem, Pokemon *param1, u16 param2) @@ -1171,7 +1171,7 @@ static BOOL sub_0206DA50(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { UnkStruct_0206D9F4 *v0 = (UnkStruct_0206D9F4 *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_00); + return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } static void sub_0206DA6C(UnkStruct_0206DA6C *param0, const TrainerInfo *param1) @@ -1304,7 +1304,7 @@ static BOOL sub_0206DC3C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { UnkStruct_0206DBE8 *v0 = (UnkStruct_0206DBE8 *)ov6_02246498(param1); - if (PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_02) == 0) { + if (PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_02) == 0) { return 0; } @@ -1341,7 +1341,7 @@ static int sub_0206DC9C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206DD1C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { UnkStruct_0206DC9C *v0 = (UnkStruct_0206DC9C *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_00); + return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206DD38(FieldSystem *fieldSystem, u32 param1, u32 param2, u32 param3) @@ -1682,7 +1682,7 @@ static BOOL sub_0206E248(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { UnkStruct_0206E1C0 *v0 = ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_00); + return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206E264(FieldSystem *fieldSystem, u16 param1) @@ -1742,7 +1742,7 @@ static int sub_0206E300(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206E37C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { UnkStruct_0206E300 *v0 = ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_00.unk_02); + return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00.unk_02); } void sub_0206E398(FieldSystem *fieldSystem, u16 param1) @@ -1776,7 +1776,7 @@ static int sub_0206E3C8(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206E3F8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { UnkStruct_0206E3C8 *v0 = ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_PokedexData(fieldSystem->saveData), v0->unk_00); + return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206E414(FieldSystem *fieldSystem, u16 param1) @@ -2805,7 +2805,7 @@ static BOOL sub_0206F100(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { const Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); - if (PokedexData_IsObtained(pokedex) == TRUE) { + if (Pokedex_IsObtained(pokedex) == TRUE) { return TRUE; } else { return FALSE; @@ -2883,7 +2883,7 @@ static BOOL sub_0206F260(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { const Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); - if (PokedexData_IsObtained(pokedex) == TRUE) { + if (Pokedex_IsObtained(pokedex) == TRUE) { return TRUE; } else { return FALSE; diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 4789f8f062..f7e7177014 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -63,7 +63,7 @@ void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 pa sub_02072014(param0, GAME_VERSION, v3, param2, TrainerInfo_RegionCode(v0), param5); } - sub_02072038(TrainerInfo_ID_LowHalf(v0), TrainerInfo_Gender(v0), TrainerInfo_Name(v0), TrainerInfo_Money(v0), PokedexData_CountSeen(SaveData_PokedexData(fieldSystem->saveData)), PokedexData_IsObtained(SaveData_PokedexData(fieldSystem->saveData)), GameRecords_GetTrainerScore(v1), param5); + sub_02072038(TrainerInfo_ID_LowHalf(v0), TrainerInfo_Gender(v0), TrainerInfo_Name(v0), TrainerInfo_Money(v0), Pokedex_CountSeen(SaveData_Pokedex(fieldSystem->saveData)), Pokedex_IsObtained(SaveData_Pokedex(fieldSystem->saveData)), GameRecords_GetTrainerScore(v1), param5); { RTCDate v4; @@ -140,7 +140,7 @@ u8 sub_02071F28(FieldSystem *fieldSystem) v0++; } - if (PokedexData_NationalDexCompleted(SaveData_PokedexData(v1))) { + if (PokedexData_NationalDexCompleted(SaveData_Pokedex(v1))) { v0++; } diff --git a/src/unk_0207A274.c b/src/unk_0207A274.c index 7bb970a9b0..64cb36777c 100644 --- a/src/unk_0207A274.c +++ b/src/unk_0207A274.c @@ -13,7 +13,7 @@ u32 sub_0207A274(SaveData *param0) { Pokedex *v0; - v0 = SaveData_PokedexData(param0); + v0 = SaveData_Pokedex(param0); return sub_0207A280(v0); } diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c index 0b09c5d5b1..13829af300 100644 --- a/src/unk_0207A6DC.c +++ b/src/unk_0207A6DC.c @@ -387,7 +387,7 @@ BOOL sub_0207AA38(UnkStruct_0207A778 *param0) } v0 = (Party *)¶m0->unk_20[0]; - Party_cpy(param0->unk_00->parties[0], v0); + Party_Copy(param0->unk_00->parties[0], v0); return 1; } @@ -534,7 +534,7 @@ BOOL sub_0207AC28(UnkStruct_0207A778 *param0, int param1) } v0 = (Party *)¶m0->unk_20[0]; - Party_cpy(param0->unk_00->parties[param1], v0); + Party_Copy(param0->unk_00->parties[param1], v0); return 1; } diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 0f64e29ba2..f091ab43de 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -60,7 +60,7 @@ #include "constdata/const_020F410C.h" -UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11); +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int param11); static void sub_0207B0A0(SysTask *param0, void *param1); BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0); void sub_0207B0E0(UnkStruct_0207AE68 *param0); @@ -90,7 +90,7 @@ static const u8 Unk_020F0A2C[] = { 0x8 }; -UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, PoketchData *poketchData, int param9, int param10, int param11) +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int param11) { UnkStruct_0207AE68 *v0; ArchivedSprite v1; @@ -149,7 +149,7 @@ UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Opt v0->unk_48 = param5; v0->unk_4C = param6; v0->records = records; - v0->poketchData = poketchData; + v0->poketch = poketch; v0->unk_78 = param9; v0->unk_7C = param10; @@ -412,7 +412,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) PokedexData_Capture(param0->unk_48, param0->unk_28); GameRecords_IncrementRecordValue(param0->records, RECORD_UNK_012); GameRecords_IncrementTrainerScore(param0->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); - PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(param0->unk_28)); + PoketchData_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(param0->unk_28)); if (Pokemon_GetValue(param0->unk_28, MON_DATA_HAS_NICKNAME, NULL) == 0) { Pokemon_SetValue(param0->unk_28, MON_DATA_SPECIES_NAME, NULL); @@ -742,7 +742,7 @@ static void sub_0207C028(UnkStruct_0207AE68 *param0) PokedexData_Capture(param0->unk_48, v1); GameRecords_IncrementRecordValue(param0->records, RECORD_UNK_012); GameRecords_IncrementTrainerScore(param0->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); - PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(v1)); + PoketchData_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(v1)); Heap_FreeToHeap(v1); Bag_TryRemoveItem(param0->unk_4C, ITEM_POKE_BALL, 1, param0->unk_5C); } diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 233b06b9c0..36cc16462b 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -1623,10 +1623,10 @@ void sub_02094C44(UnkStruct_02095C48 *param0, SaveData *param1, u32 param2, Jour } int i; - Pokedex *v7 = SaveData_PokedexData(param0->unk_1970); - + Pokedex *pokedex = SaveData_Pokedex(param0->unk_1970); + for (i = param0->unk_00.unk_117; i < 4; i++) { - PokedexData_Encounter(v7, param0->unk_00.unk_00[i]); + Pokedex_Encounter(pokedex, param0->unk_00.unk_00[i]); } } else { sub_0202F134(param0->unk_1970, param0->unk_00.unk_10F, param0->unk_00.unk_118[param0->unk_00.unk_113].unk_08); diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index 74ae4674f3..3874a15788 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -39,7 +39,7 @@ UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *param2, u32 p v0->unk_00 = param0; v0->unk_01 = param1; - v0->unk_0C = SaveData_PokedexData(param2); + v0->unk_0C = SaveData_Pokedex(param2); v0->unk_10 = sub_02014EC4(param2); v0->unk_04 = SystemFlag_CheckGameCompleted(SaveData_GetVarsFlags(param2)); v0->unk_05 = 0; From 5a7b4091dd919b7f314ed85dfd3a6deb01cbaef6 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Tue, 14 Jan 2025 07:37:32 -0500 Subject: [PATCH 20/28] More pokedex documentation --- asm/macros/scrcmd.inc | 2 +- include/overlay005/ov5_021F77A8.h | 16 +-- include/overlay021/struct_ov21_021D3208.h | 2 +- include/overlay021/struct_ov21_021D3320.h | 2 +- include/pokedex_data.h | 66 ++++----- .../scripts/scripts_pokemon_mansion_office.s | 4 +- src/battle/ov16_0223DF00.c | 6 +- src/field_battle_data_transfer.c | 10 +- src/field_menu.c | 8 +- src/game_records.c | 2 +- src/overlay005/ov5_021F6454.c | 2 +- src/overlay005/ov5_021F77A8.c | 43 +++--- src/overlay005/save_info_window.c | 2 +- src/overlay006/ov6_02240C9C.c | 6 +- src/overlay006/ov6_02242984.c | 2 +- src/overlay006/ov6_02246A30.c | 31 ++-- src/overlay021/ov21_021D0D80.c | 2 +- src/overlay021/pokedex_sort.c | 92 ++++++------ src/overlay023/ov23_0223E140.c | 8 +- src/overlay023/ov23_022521F0.c | 8 +- src/overlay028/ov28_022561C0.c | 8 +- src/overlay062/ov62_02237D24.c | 8 +- src/overlay062/ov62_02241204.c | 8 +- src/overlay065/ov65_0222DCE0.c | 4 +- src/overlay066/ov66_0222DDF0.c | 4 +- src/overlay094/ov94_022414B8.c | 8 +- src/overlay097/ov97_0222AE60.c | 4 +- src/overlay097/ov97_0222C174.c | 2 +- src/overlay118/ov118_021D0D80.c | 2 +- src/pokedex_data.c | 134 +++++++++--------- src/scrcmd.c | 54 +++---- src/scrcmd_system_flags.c | 6 +- src/unk_0202F180.c | 12 +- src/unk_0202F1D4.c | 20 +-- src/unk_0203D1B8.c | 6 +- src/unk_02046C7C.c | 2 +- src/unk_0204AEE8.c | 6 +- src/unk_0204C500.c | 2 +- src/unk_02052C6C.c | 2 +- src/unk_020683F4.c | 2 +- src/unk_0206CCB0.c | 70 ++++----- src/unk_02071D40.c | 50 +++---- src/unk_0207A274.c | 4 +- src/unk_0207AE68.c | 4 +- src/unk_020933F8.c | 2 +- src/unk_0209747C.c | 10 +- src/unk_020998EC.c | 6 +- tools/scripts/make_pokedex_data.py | 4 +- 48 files changed, 374 insertions(+), 384 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 3648bc40b3..9f52354040 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -4475,7 +4475,7 @@ .short \arg0 .endm - .macro ScrCmd_337 arg0, arg1 + .macro ScrCmd_HasSeenSpecies arg0, arg1 .short 823 .short \arg0 .short \arg1 diff --git a/include/overlay005/ov5_021F77A8.h b/include/overlay005/ov5_021F77A8.h index 178384370a..bc3f2b8dca 100644 --- a/include/overlay005/ov5_021F77A8.h +++ b/include/overlay005/ov5_021F77A8.h @@ -3,13 +3,13 @@ #include "field_script_context.h" -BOOL ScrCmd_337(ScriptContext *param0); -BOOL ScrCmd_2E5(ScriptContext *param0); -BOOL ScrCmd_2E9(ScriptContext *param0); -BOOL ScrCmd_2EA(ScriptContext *param0); -BOOL ScrCmd_2EB(ScriptContext *param0); -BOOL ScrCmd_2E6(ScriptContext *param0); -BOOL ScrCmd_2EC(ScriptContext *param0); -BOOL ScrCmd_2ED(ScriptContext *param0); +BOOL ScrCmd_HasSeenSpecies(ScriptContext *ctx); +BOOL ScrCmd_2E5(ScriptContext *ctx); +BOOL ScrCmd_2E9(ScriptContext *ctx); +BOOL ScrCmd_2EA(ScriptContext *ctx); +BOOL ScrCmd_2EB(ScriptContext *ctx); +BOOL ScrCmd_2E6(ScriptContext *ctx); +BOOL ScrCmd_2EC(ScriptContext *ctx); +BOOL ScrCmd_2ED(ScriptContext *ctx); #endif // POKEPLATINUM_OV5_021F77A8_H diff --git a/include/overlay021/struct_ov21_021D3208.h b/include/overlay021/struct_ov21_021D3208.h index 2eaaa10b6e..d907daa13a 100644 --- a/include/overlay021/struct_ov21_021D3208.h +++ b/include/overlay021/struct_ov21_021D3208.h @@ -6,7 +6,7 @@ #include "trainer_info.h" typedef struct { - const Pokedex *dexData; + const Pokedex *pokedex; const TrainerInfo *unk_04; int timeOfDay; BOOL fullmoonIslandVisible; diff --git a/include/overlay021/struct_ov21_021D3320.h b/include/overlay021/struct_ov21_021D3320.h index cfc0adb7d6..1d925172b8 100644 --- a/include/overlay021/struct_ov21_021D3320.h +++ b/include/overlay021/struct_ov21_021D3320.h @@ -9,7 +9,7 @@ #include "strbuf.h" typedef struct { - const Pokedex *dexData; + const Pokedex *pokedex; SortedPokedex sortedPokedex; int isNationalDex; BOOL isNationalDexUnlocked; diff --git a/include/pokedex_data.h b/include/pokedex_data.h index a0ec36ff88..983b556deb 100644 --- a/include/pokedex_data.h +++ b/include/pokedex_data.h @@ -13,41 +13,41 @@ void Pokedex_Init(Pokedex *pokedex); u16 Pokedex_CountCaught_National(const Pokedex *pokedex); u16 Pokedex_CountSeen_National(const Pokedex *pokedex); u16 Pokedex_CountSeen(const Pokedex *pokedex); -u16 PokedexData_CountCaught_Local(const Pokedex *pokedex); -u16 PokedexData_CountSeen_Local(const Pokedex *pokedex); -BOOL PokedexData_NationalDexCompleted(const Pokedex *pokedex); -BOOL PokedexData_LocalDexCompleted(const Pokedex *pokedex); -u16 PokedexData_NumCaught_National(const Pokedex *pokedex); -u16 PokedexData_NumCaught_Local(const Pokedex *pokedex); -BOOL PokedexData_HasCaughtSpecies(const Pokedex *pokedex, u16 species); -BOOL PokedexData_HasSeenSpecies(const Pokedex *pokedex, u16 species); -u32 PokedexData_GetForm_Spinda(const Pokedex *pokedex, u8 formIndex); -u32 PokedexData_DisplayedGender(const Pokedex *pokedex, u16 species, int displaySecondary); -u32 PokedexData_GetForm_Unown(const Pokedex *pokedex, int formIndex); -u32 PokedexData_NumFormsSeen_Unown(const Pokedex *pokedex); -u32 PokedexData_GetForm_Shellos(const Pokedex *pokedex, int formIndex); -u32 PokedexData_NumFormsSeen_Shellos(const Pokedex *pokedex); -u32 PokedexData_GetForm_Gastrodon(const Pokedex *pokedex, int formIndex); -u32 PokedexData_NumFormsSeen_Gastrodon(const Pokedex *pokedex); -u32 PokedexData_GetForm_Burmy(const Pokedex *pokedex, int formIndex); -u32 PokedexData_NumFormsSeen_Burmy(const Pokedex *pokedex); -u32 PokedexData_GetForm_Wormadam(const Pokedex *pokedex, int formIndex); -u32 PokedexData_NumFormsSeen_Wormadam(const Pokedex *pokedex); -u32 PokedexData_GetForm_Deoxys(const Pokedex *pokedex, int formIndex); -u32 PokedexData_NumFormsSeen_Deoxys(const Pokedex *pokedex); +u16 Pokedex_CountCaught_Local(const Pokedex *pokedex); +u16 Pokedex_CountSeen_Local(const Pokedex *pokedex); +BOOL Pokedex_NationalDexCompleted(const Pokedex *pokedex); +BOOL Pokedex_LocalDexCompleted(const Pokedex *pokedex); +u16 Pokedex_NumCaught_National(const Pokedex *pokedex); +u16 Pokedex_NumCaught_Local(const Pokedex *pokedex); +BOOL Pokedex_HasCaughtSpecies(const Pokedex *pokedex, u16 species); +BOOL Pokedex_HasSeenSpecies(const Pokedex *pokedex, u16 species); +u32 Pokedex_GetForm_Spinda(const Pokedex *pokedex, u8 formIndex); +u32 Pokedex_DisplayedGender(const Pokedex *pokedex, u16 species, int displaySecondary); +u32 Pokedex_GetForm_Unown(const Pokedex *pokedex, int formIndex); +u32 Pokedex_NumFormsSeen_Unown(const Pokedex *pokedex); +u32 Pokedex_GetForm_Shellos(const Pokedex *pokedex, int formIndex); +u32 Pokedex_NumFormsSeen_Shellos(const Pokedex *pokedex); +u32 Pokedex_GetForm_Gastrodon(const Pokedex *pokedex, int formIndex); +u32 Pokedex_NumFormsSeen_Gastrodon(const Pokedex *pokedex); +u32 Pokedex_GetForm_Burmy(const Pokedex *pokedex, int formIndex); +u32 Pokedex_NumFormsSeen_Burmy(const Pokedex *pokedex); +u32 Pokedex_GetForm_Wormadam(const Pokedex *pokedex, int formIndex); +u32 Pokedex_NumFormsSeen_Wormadam(const Pokedex *pokedex); +u32 Pokedex_GetForm_Deoxys(const Pokedex *pokedex, int formIndex); +u32 Pokedex_NumFormsSeen_Deoxys(const Pokedex *pokedex); void Pokedex_Encounter(Pokedex *pokedex, Pokemon *pokemon); -void PokedexData_Capture(Pokedex *pokedex, Pokemon *pokemon); -void PokedexData_ObtainNationalDex(Pokedex *pokedex); -BOOL PokedexData_IsNationalDexObtained(const Pokedex *pokedex); -BOOL PokedexData_CanDetectForms(const Pokedex *pokedex); -void PokedexData_TurnOnFormDetection(Pokedex *pokedex); -BOOL PokedexData_IsLanguageObtained(const Pokedex *pokedex, u16 species, u32 languageIndex); -void PokedexData_TurnOnLanguageDetection(Pokedex *pokedex); -BOOL PokedexData_CanDetectLanguages(const Pokedex *pokedex); +void Pokedex_Capture(Pokedex *pokedex, Pokemon *pokemon); +void Pokedex_ObtainNationalDex(Pokedex *pokedex); +BOOL Pokedex_IsNationalDexObtained(const Pokedex *pokedex); +BOOL Pokedex_CanDetectForms(const Pokedex *pokedex); +void Pokedex_TurnOnFormDetection(Pokedex *pokedex); +BOOL Pokedex_IsLanguageObtained(const Pokedex *pokedex, u16 species, u32 languageIndex); +void Pokedex_TurnOnLanguageDetection(Pokedex *pokedex); +BOOL Pokedex_CanDetectLanguages(const Pokedex *pokedex); BOOL Pokedex_IsObtained(const Pokedex *pokedex); -void PokedexData_ObtainPokedex(Pokedex *pokedex); -Pokedex *SaveData_Pokedex(SaveData *saveData); +void Pokedex_ObtainPokedex(Pokedex *pokedex); +Pokedex *SaveData_GetPokedex(SaveData *saveData); u32 Pokedex_GetDisplayForm(const Pokedex *pokedex, int species, int formIndex); -u32 PokedexData_NumFormsSeen(const Pokedex *pokedex, int species); +u32 Pokedex_NumFormsSeen(const Pokedex *pokedex, int species); #endif // POKEPLATINUM_POKEDEX_DATA_H diff --git a/res/field/scripts/scripts_pokemon_mansion_office.s b/res/field/scripts/scripts_pokemon_mansion_office.s index a35da68957..4a477656dc 100644 --- a/res/field/scripts/scripts_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_pokemon_mansion_office.s @@ -305,9 +305,9 @@ _0399: _03C2: Message 20 GoToIfSet 251, _0408 - ScrCmd_337 0x1EA, 0x800C + ScrCmd_HasSeenSpecies SPECIES_MANAPHY, 0x800C GoToIfEq 0x800C, 1, _03FC - ScrCmd_208 0x1EA, 0 + ScrCmd_208 SPECIES_MANAPHY, 0 WaitABPress ScrCmd_209 SetFlag 251 diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 389b4c4569..ee2b52a75a 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1695,7 +1695,7 @@ void BattleSystem_DexFlagSeen(BattleSystem *battleSystem, int param1) } if (((v0 & 0x1) == 0) && (Pokemon_GetValue(v1, MON_DATA_SPECIES_EGG, NULL) == 412)) { - PokedexData_Capture(battleSystem->pokedex, v1); + Pokedex_Capture(battleSystem->pokedex, v1); } } @@ -1714,7 +1714,7 @@ void ov16_0223F9A0(BattleSystem *battleSystem, int param1) v2 = BattleContext_Get(battleSystem, battleSystem->battleCtx, 2, param1); v1 = BattleSystem_PartyPokemon(battleSystem, param1, v2); - PokedexData_Capture(battleSystem->pokedex, v1); + Pokedex_Capture(battleSystem->pokedex, v1); } } } @@ -1722,7 +1722,7 @@ void ov16_0223F9A0(BattleSystem *battleSystem, int param1) BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species) { - return PokedexData_HasCaughtSpecies(battleSys->pokedex, species); + return Pokedex_HasCaughtSpecies(battleSys->pokedex, species); } void Battle_SetDefaultBlend(void) diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 292a862387..e78642fe93 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -243,7 +243,7 @@ void FieldBattleDTO_InitFromGameState(FieldBattleDTO *dto, const FieldSystem *fi TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(save); Party *party = Party_GetFromSavedata(save); Bag *bag = SaveData_GetBag(save); - Pokedex *pokedex = SaveData_Pokedex(save); + Pokedex *pokedex = SaveData_GetPokedex(save); ChatotCry *chatotCry = GetChatotCryDataFromSave(save); Options *options = SaveData_Options(save); FieldOverworldState *fieldOverworldState = SaveData_GetFieldOverworldState(save); @@ -296,7 +296,7 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); Party *party = Party_GetFromSavedata(fieldSystem->saveData); Bag *bag = SaveData_GetBag(fieldSystem->saveData); - Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); ChatotCry *chatotCry = GetChatotCryDataFromSave(fieldSystem->saveData); Options *options = SaveData_Options(fieldSystem->saveData); @@ -344,7 +344,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f { TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); Bag *bag = SaveData_GetBag(fieldSystem->saveData); - Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); ChatotCry *chatotCry = GetChatotCryDataFromSave(fieldSystem->saveData); Options *options = SaveData_Options(fieldSystem->saveData); const BattleRegulation *regulation = fieldSystem->unk_B0; @@ -424,7 +424,7 @@ void FieldBattleDTO_UpdateFieldSystem(const FieldBattleDTO *dto, FieldSystem *fi TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); Party *party = Party_GetFromSavedata(fieldSystem->saveData); Bag *bag = SaveData_GetBag(fieldSystem->saveData); - Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); u16 *fieldSysSafariBalls = FieldOverworldState_GetSafariBallCount(SaveData_GetFieldOverworldState(fieldSystem->saveData)); TrainerInfo_Copy(dto->trainerInfo[BATTLER_PLAYER_1], trainerInfo); @@ -440,7 +440,7 @@ void FieldBattleDTO_UpdatePokedex(const FieldBattleDTO *dto, FieldSystem *fieldS TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); Party *party = Party_GetFromSavedata(fieldSystem->saveData); Bag *bag = SaveData_GetBag(fieldSystem->saveData); - Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); Pokedex_Copy(dto->pokedex, pokedex); } diff --git a/src/field_menu.c b/src/field_menu.c index b5e120dbb8..454dd1a594 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -360,7 +360,7 @@ static u32 sub_0203ABD0(FieldSystem *fieldSystem) { u32 v0 = 0; - if (Pokedex_IsObtained(SaveData_Pokedex(fieldSystem->saveData)) == FALSE) { + if (Pokedex_IsObtained(SaveData_GetPokedex(fieldSystem->saveData)) == FALSE) { v0 |= 0x1; } @@ -949,7 +949,7 @@ static BOOL FieldMenu_Pokedex(FieldTask *taskMan) fieldSystem = FieldTask_GetFieldSystem(taskMan); menu = FieldTask_GetEnv(taskMan); v2 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov21_021D0D80)); - pokedex = SaveData_Pokedex(fieldSystem->saveData); + pokedex = SaveData_GetPokedex(fieldSystem->saveData); trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); @@ -1930,9 +1930,9 @@ static void FieldMenu_EvolveInit(FieldTask *taskMan) v4 = Party_GetPokemonBySlotIndex(v3, v2->unk_00); if (v2->unk_01 == 0) { - v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, 0x1, 73); + v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_GetPokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, 0x1, 73); } else { - v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, NULL, 73); + v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_GetPokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, NULL, 73); } { diff --git a/src/game_records.c b/src/game_records.c index 2aca82fd73..095d20beee 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -409,7 +409,7 @@ u32 GameRecords_GetTrainerScore(GameRecords *records) void GameRecords_IncrementTrainerScoreOnCatch(GameRecords *records, const Pokedex *pokedex, const u16 species) { - if (!PokedexData_HasCaughtSpecies(pokedex, species)) { + if (!Pokedex_HasCaughtSpecies(pokedex, species)) { GameRecords_IncrementTrainerScore(records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); } } diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 5f6fd7fe19..fe5accd9c3 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -676,7 +676,7 @@ BOOL ScrCmd_304(ScriptContext *param0) v4 = Party_GetPokemonBySlotIndex(v5, v7); Pokemon_SetRotomForm(v4, v10, v8); - PokedexData_Capture(SaveData_Pokedex(fieldSystem->saveData), v4); + Pokedex_Capture(SaveData_GetPokedex(fieldSystem->saveData), v4); return 0; } diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index f89313b601..53ed8032e0 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -86,48 +86,47 @@ static void ov5_021F819C(ListMenu *param0, u32 param1, u8 param2); static void ov5_021F81A8(SysTask *param0, void *param1); static void ov5_021F8250(UnkStruct_ov5_021F7ED8 *param0); -BOOL ScrCmd_337(ScriptContext *param0) +BOOL ScrCmd_HasSeenSpecies(ScriptContext *ctx) { - u16 v0 = FieldSystem_TryGetVar(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); - u16 *v1 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); - Pokedex *v2 = SaveData_Pokedex(param0->fieldSystem->saveData); + u16 species = FieldSystem_TryGetVar(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); + u16 *seen = FieldSystem_GetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); - *v1 = PokedexData_HasSeenSpecies(v2, v0); + *seen = Pokedex_HasSeenSpecies(SaveData_GetPokedex(ctx->fieldSystem->saveData), species); return 0; } -BOOL ScrCmd_2E5(ScriptContext *param0) +BOOL ScrCmd_2E5(ScriptContext *ctx) { Pokemon *v0; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); + u16 v1 = ScriptContext_GetVar(ctx); + u16 v2 = ScriptContext_GetVar(ctx); + u16 *v3 = ScriptContext_GetVarPointer(ctx); - v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v1); + v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(ctx->fieldSystem->saveData), v1); *v3 = ov5_021F7B60(v0, v2); return 0; } -BOOL ScrCmd_2E9(ScriptContext *param0) +BOOL ScrCmd_2E9(ScriptContext *ctx) { - u16 v0 = ScriptContext_GetVar(param0); - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); + u16 v0 = ScriptContext_GetVar(ctx); + u16 v1 = ScriptContext_GetVar(ctx); + u16 v2 = ScriptContext_GetVar(ctx); - sub_02054988(Party_GetFromSavedata(param0->fieldSystem->saveData), v0, v1, v2); + sub_02054988(Party_GetFromSavedata(ctx->fieldSystem->saveData), v0, v1, v2); return 0; } -BOOL ScrCmd_2EA(ScriptContext *param0) +BOOL ScrCmd_2EA(ScriptContext *ctx) { int v0; u8 v1, v2, v3, v4; Bag *v5; - u16 v6 = ScriptContext_GetVar(param0); - u16 *v7 = ScriptContext_GetVarPointer(param0); + u16 v6 = ScriptContext_GetVar(ctx); + u16 *v7 = ScriptContext_GetVarPointer(ctx); - v5 = SaveData_GetBag(param0->fieldSystem->saveData); + v5 = SaveData_GetBag(ctx->fieldSystem->saveData); for (v0 = 0; v0 < (NELEMS(sTeachableMoves)); v0++) { if (v6 == sTeachableMoves[v0].moveID) { @@ -174,14 +173,14 @@ BOOL ScrCmd_2EA(ScriptContext *param0) return 0; } -BOOL ScrCmd_2EB(ScriptContext *param0) +BOOL ScrCmd_2EB(ScriptContext *ctx) { int v0; u8 v1, v2, v3, v4; Bag *v5; - u16 v6 = ScriptContext_GetVar(param0); + u16 v6 = ScriptContext_GetVar(ctx); - v5 = SaveData_GetBag(param0->fieldSystem->saveData); + v5 = SaveData_GetBag(ctx->fieldSystem->saveData); for (v0 = 0; v0 < (NELEMS(sTeachableMoves)); v0++) { if (v6 == sTeachableMoves[v0].moveID) { diff --git a/src/overlay005/save_info_window.c b/src/overlay005/save_info_window.c index 344350d48c..2a3baa25dd 100644 --- a/src/overlay005/save_info_window.c +++ b/src/overlay005/save_info_window.c @@ -51,7 +51,7 @@ static void SaveInfo_SetValues(SaveInfo *saveInfo, const FieldSystem *fieldSyste { SaveData *saveData = fieldSystem->saveData; Location *curLocation = FieldOverworldState_GetPlayerLocation(SaveData_GetFieldOverworldState(saveData)); - Pokedex *pokedex = SaveData_Pokedex(saveData); + Pokedex *pokedex = SaveData_GetPokedex(saveData); saveInfo->mapLabelTextID = MapHeader_GetMapLabelTextID(curLocation->mapId); diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index 70511f983b..73f11fc93f 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -325,7 +325,7 @@ BOOL ov6_02240D5C(FieldSystem *fieldSystem) v13[i].minLevel = encounterData->grassEncounters.encounters[i].level; } - BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_Pokedex(FieldSystem_GetSaveData(fieldSystem))); + BOOL nationalDexObtained = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(FieldSystem_GetSaveData(fieldSystem))); WildEncounters_ReplaceTimedEncounters(encounterData, &v13[2].species, &v13[3].species); WildEncounters_ReplaceRadarEncounters(fieldSystem, encounterData, &v13[0].species, &v13[1].species); @@ -513,7 +513,7 @@ BOOL ov6_022411C8(FieldSystem *fieldSystem, FieldTask *param1) v12[i].minLevel = encounterData->grassEncounters.encounters[i].level; } - BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_Pokedex(FieldSystem_GetSaveData(fieldSystem))); + BOOL nationalDexObtained = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(FieldSystem_GetSaveData(fieldSystem))); WildEncounters_ReplaceTimedEncounters(encounterData, &v12[2].species, &v12[3].species); WildEncounters_ReplaceRadarEncounters(fieldSystem, encounterData, &v12[0].species, &v12[1].species); @@ -642,7 +642,7 @@ BOOL ov6_022413E4(FieldSystem *fieldSystem, FieldBattleDTO **battleParams) v12[i].minLevel = encounterData->grassEncounters.encounters[i].level; } - BOOL nationalDexObtained = PokedexData_IsNationalDexObtained(SaveData_Pokedex(FieldSystem_GetSaveData(fieldSystem))); + BOOL nationalDexObtained = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(FieldSystem_GetSaveData(fieldSystem))); WildEncounters_ReplaceTimedEncounters(encounterData, &v12[2].species, &v12[3].species); WildEncounters_ReplaceRadarEncounters(fieldSystem, encounterData, &v12[0].species, &v12[1].species); diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c index 9985dbcc1a..10e1c2130a 100644 --- a/src/overlay006/ov6_02242984.c +++ b/src/overlay006/ov6_02242984.c @@ -42,7 +42,7 @@ int ov6_02242984(FieldSystem *fieldSystem) v2[i] = encounterData->grassEncounters.encounters[i].species; } - BOOL v1 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(FieldSystem_GetSaveData(fieldSystem))); + BOOL v1 = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(FieldSystem_GetSaveData(fieldSystem))); ov6_02242F74(sub_0202D814(sub_0202D834(fieldSystem->saveData), 1), v1, fieldSystem->location->mapId, &v2[6], &v2[7]); WildEncounters_ReplaceTimedEncounters(encounterData, &v2[2], &v2[3]); diff --git a/src/overlay006/ov6_02246A30.c b/src/overlay006/ov6_02246A30.c index 704de32fc6..00b29fa8de 100644 --- a/src/overlay006/ov6_02246A30.c +++ b/src/overlay006/ov6_02246A30.c @@ -97,45 +97,39 @@ static BOOL ov6_02246A34(FieldSystem *fieldSystem) static BOOL ov6_02246A38(FieldSystem *fieldSystem) { - VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); - return SystemFlag_HandleFirstArrivalToZone(v0, HANDLE_FLAG_CHECK, FIRST_ARRIVAL_JUBILIFE_CITY); + return SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(fieldSystem->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_JUBILIFE_CITY); } static BOOL ov6_02246A4C(FieldSystem *fieldSystem) { - VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); - return SystemFlag_HandleFirstArrivalToZone(v0, HANDLE_FLAG_CHECK, FIRST_ARRIVAL_FLOAROMA_TOWN); + return SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(fieldSystem->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_FLOAROMA_TOWN); } static BOOL ov6_02246A60(FieldSystem *fieldSystem) { - VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); - return SystemFlag_HandleFirstArrivalToZone(v0, HANDLE_FLAG_CHECK, FIRST_ARRIVAL_OREBURGH_CITY); + return SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(fieldSystem->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_OREBURGH_CITY); } static BOOL ov6_02246A74(FieldSystem *fieldSystem) { - VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); - return SystemFlag_HandleFirstArrivalToZone(v0, HANDLE_FLAG_CHECK, FIRST_ARRIVAL_ETERNA_CITY); + return SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(fieldSystem->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_ETERNA_CITY); } static BOOL ov6_02246A88(FieldSystem *fieldSystem) { - VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); - return SystemFlag_HandleFirstArrivalToZone(v0, HANDLE_FLAG_CHECK, FIRST_ARRIVAL_HEARTHOME_CITY); + return SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(fieldSystem->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_HEARTHOME_CITY); } static BOOL ov6_02246A9C(FieldSystem *fieldSystem) { - VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); - return SystemFlag_HandleFirstArrivalToZone(v0, HANDLE_FLAG_CHECK, FIRST_ARRIVAL_FIGHT_AREA); + return SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(fieldSystem->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_FIGHT_AREA); } static BOOL ov6_02246AB0(FieldSystem *fieldSystem) { - TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); + TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); - if (TrainerInfo_BadgeCount(v0) >= 5) { + if (TrainerInfo_BadgeCount(trainerInfo) >= 5) { return 1; } else { return 0; @@ -144,20 +138,17 @@ static BOOL ov6_02246AB0(FieldSystem *fieldSystem) static BOOL ov6_02246AC8(FieldSystem *fieldSystem) { - Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); - return PokedexData_LocalDexCompleted(v0); + return Pokedex_LocalDexCompleted(SaveData_GetPokedex(fieldSystem->saveData)); } static BOOL ov6_02246AD8(FieldSystem *fieldSystem) { - Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); - return Pokedex_IsObtained(pokedex); + return Pokedex_IsObtained(SaveData_GetPokedex(fieldSystem->saveData)); } static BOOL ov6_02246AE8(FieldSystem *fieldSystem) { - VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); - return SystemFlag_CheckGameCompleted(v0); + return SystemFlag_CheckGameCompleted(SaveData_GetVarsFlags(fieldSystem->saveData)); } static int ov6_02246AF8(FieldSystem *fieldSystem, u8 *param1) diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 019b2e0fb0..c276a25647 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -313,7 +313,7 @@ UnkStruct_ov21_021D0F60 *ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80 v0->unk_1D6C = ov21_021D3FE0(param0); v0->unk_1D70 = ov21_021D3FE0(param0); - v2.dexData = param1->pokedex; + v2.pokedex = param1->pokedex; v2.unk_04 = param1->trainerInfo; v2.timeOfDay = param1->timeOfDay; v2.fullmoonIslandVisible = param1->fullmoonIslandVisible; diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index eb1aad134d..38a389902a 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -74,17 +74,17 @@ enum PokedexDataSortIndex { PDSI_NUMSORTS }; -static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, const Pokedex *dexData, const u16 *fullDex, int pokedexLength); -static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u16 *pokedex1, int dexLen1, const u16 *pokedex2, int dexLen2, BOOL keepUncaught, const Pokedex *dexData); -static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const Pokedex *dexData, const u16 *encounteredPokedex, int caughtStatusLength); +static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, const Pokedex *pokedex, const u16 *fullDex, int pokedexLength); +static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u16 *pokedex1, int dexLen1, const u16 *pokedex2, int dexLen2, BOOL keepUncaught, const Pokedex *pokedex); +static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const Pokedex *pokedex, const u16 *encounteredPokedex, int caughtStatusLength); static void PopulateDisplayPokedex_Blanks(SortedPokedex *sortedPokedex, const u16 *fullDex, int pokedexLength); static void PopulateDisplayPokedex(SortedPokedex *sortedPokedex); static void NumEncounteredAndCaught(SortedPokedex *sortedPokedex, int *caughtStatusLength, int *numCaught); static u16 *PokedexFromNARC(int heapID, int pokedexSort, int *pokedexLength); -static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData); -static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData); -static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData); -static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData); +static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex); +static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex); +static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex); +static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex); void PokedexSort_PopulatePokedexStatus(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, int heapID) { @@ -98,10 +98,10 @@ void PokedexSort_PopulatePokedexStatus(UnkStruct_ov21_021D3320 *param0, UnkStruc memset(param0, 0, sizeof(UnkStruct_ov21_021D3320)); - param0->dexData = param1->dexData; + param0->pokedex = param1->pokedex; param0->timeOfDay = param1->timeOfDay; - if (PokedexData_IsNationalDexObtained(param0->dexData)) { + if (Pokedex_IsNationalDexObtained(param0->pokedex)) { param0->isNationalDexUnlocked = TRUE; } else { param0->isNationalDexUnlocked = FALSE; @@ -171,7 +171,7 @@ u32 ov21_021D334C(const UnkStruct_ov21_021D3320 *param0, int param1, int param2) { u32 v0; - v0 = PokedexData_DisplayedGender(param0->dexData, param1, param2); + v0 = Pokedex_DisplayedGender(param0->pokedex, param1, param2); return v0; } @@ -180,7 +180,7 @@ u32 ov21_021D335C(const UnkStruct_ov21_021D3320 *param0, int param1) int v0; GF_ASSERT(param1 < 28); - v0 = PokedexData_GetForm_Unown(param0->dexData, param1); + v0 = Pokedex_GetForm_Unown(param0->pokedex, param1); return v0; } @@ -190,7 +190,7 @@ u32 ov21_021D3374(const UnkStruct_ov21_021D3320 *param0, int param1) u32 v0; GF_ASSERT(param1 < 2); - v0 = PokedexData_GetForm_Shellos(param0->dexData, param1); + v0 = Pokedex_GetForm_Shellos(param0->pokedex, param1); return v0; } @@ -201,7 +201,7 @@ u32 ov21_021D338C(const UnkStruct_ov21_021D3320 *param0, int param1) GF_ASSERT(param1 < 2); - v0 = PokedexData_GetForm_Gastrodon(param0->dexData, param1); + v0 = Pokedex_GetForm_Gastrodon(param0->pokedex, param1); return v0; } @@ -211,7 +211,7 @@ u32 ov21_021D33A4(const UnkStruct_ov21_021D3320 *param0, int param1) GF_ASSERT(param1 < 3); - v0 = PokedexData_GetForm_Burmy(param0->dexData, param1); + v0 = Pokedex_GetForm_Burmy(param0->pokedex, param1); return v0; } @@ -221,13 +221,13 @@ u32 ov21_021D33BC(const UnkStruct_ov21_021D3320 *param0, int param1) GF_ASSERT(param1 < 3); - v0 = PokedexData_GetForm_Wormadam(param0->dexData, param1); + v0 = Pokedex_GetForm_Wormadam(param0->pokedex, param1); return v0; } u32 ov21_021D33D4(const UnkStruct_ov21_021D3320 *param0, u32 species) { - return Pokedex_GetDisplayForm(param0->dexData, species, 0); + return Pokedex_GetDisplayForm(param0->pokedex, species, 0); } u32 ov21_021D33E0(const UnkStruct_ov21_021D3320 *param0, int param1) @@ -243,27 +243,27 @@ u32 ov21_021D33E0(const UnkStruct_ov21_021D3320 *param0, int param1) u32 ov21_021D33F8(const UnkStruct_ov21_021D3320 *param0) { - return PokedexData_GetForm_Spinda(param0->dexData, 0); + return Pokedex_GetForm_Spinda(param0->pokedex, 0); } u32 ov21_021D3404(const UnkStruct_ov21_021D3320 *param0, int param1) { - return PokedexData_GetForm_Deoxys(param0->dexData, param1); + return Pokedex_GetForm_Deoxys(param0->pokedex, param1); } u32 ov21_021D3410(const UnkStruct_ov21_021D3320 *param0, u32 param1, int param2) { - return Pokedex_GetDisplayForm(param0->dexData, param1, param2); + return Pokedex_GetDisplayForm(param0->pokedex, param1, param2); } u32 ov21_021D341C(const UnkStruct_ov21_021D3320 *param0, u32 param1) { - return PokedexData_NumFormsSeen(param0->dexData, param1); + return Pokedex_NumFormsSeen(param0->pokedex, param1); } BOOL PokedexSort_IsNationalUnlocked(const UnkStruct_ov21_021D3320 *param0) { - return PokedexData_IsNationalDexObtained(param0->dexData); + return Pokedex_IsNationalDexObtained(param0->pokedex); } void ov21_021D3434(UnkStruct_ov21_021D3320 *param0, u32 param1) @@ -311,13 +311,13 @@ BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filter if (isNationalDex == FALSE) { fullDex = PokedexFromNARC(heapID, PDSI_SINNOH, &fullDexLength); - FilterUnencountered(encounteredPokedex, &caughtStatusLength, param0->dexData, fullDex, fullDexLength); + FilterUnencountered(encounteredPokedex, &caughtStatusLength, param0->pokedex, fullDex, fullDexLength); } else { fullDex = PokedexFromNARC(heapID, PDSI_NATIONAL, &fullDexLength); - FilterUnencountered(encounteredPokedex, &caughtStatusLength, param0->dexData, fullDex, fullDexLength); + FilterUnencountered(encounteredPokedex, &caughtStatusLength, param0->pokedex, fullDex, fullDexLength); } - DexSortOrder(sortOrder, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->dexData); + DexSortOrder(sortOrder, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->pokedex); memcpy(encounteredPokedex, resultingPokedex, sizeof(u16) * numResulting); caughtStatusLength = numResulting; @@ -326,7 +326,7 @@ BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filter numResulting = 0; do { - FilterByName(filterName, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->dexData); + FilterByName(filterName, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->pokedex); if (numResulting == 0) { dexExists = FALSE; @@ -339,7 +339,7 @@ BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filter memset(resultingPokedex, 0, sizeof(u16) * numResulting); numResulting = 0; - FilterByType(filterType1, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->dexData); + FilterByType(filterType1, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->pokedex); if (numResulting == 0) { dexExists = FALSE; @@ -352,7 +352,7 @@ BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filter memset(resultingPokedex, 0, sizeof(u16) * numResulting); numResulting = 0; - FilterByType(filterType2, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->dexData); + FilterByType(filterType2, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->pokedex); if (numResulting == 0) { dexExists = FALSE; @@ -365,7 +365,7 @@ BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filter memset(resultingPokedex, 0, sizeof(u16) * numResulting); numResulting = 0; - FilterByForm(filterForm, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->dexData); + FilterByForm(filterForm, resultingPokedex, &numResulting, encounteredPokedex, caughtStatusLength, heapID, param0->pokedex); if (numResulting == 0) { dexExists = FALSE; @@ -378,7 +378,7 @@ BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filter memset(resultingPokedex, 0, sizeof(u16) * numResulting); numResulting = 0; - UpdateCaughtStatus(¶m0->sortedPokedex, param0->dexData, encounteredPokedex, caughtStatusLength); + UpdateCaughtStatus(¶m0->sortedPokedex, param0->pokedex, encounteredPokedex, caughtStatusLength); if ((sortOrder != SO_NUMERICAL) || (filterName != FN_NONE) || (filterType1 != FT_NONE) || (filterType2 != FT_NONE) || (filterForm != FF_NONE)) { isFiltered = TRUE; @@ -620,16 +620,16 @@ BOOL ov21_021D392C(const UnkStruct_ov21_021D3320 *param0, int param1) { int species = PokedexSort_CurrentSpecies(param0); - if (PokedexData_CanDetectLanguages(param0->dexData) == 0) { + if (Pokedex_CanDetectLanguages(param0->pokedex) == 0) { return FALSE; } - return PokedexData_IsLanguageObtained(param0->dexData, species, param1); + return Pokedex_IsLanguageObtained(param0->pokedex, species, param1); } BOOL PokedexSort_CanDetectForms(const UnkStruct_ov21_021D3320 *param0) { - return PokedexData_CanDetectForms(param0->dexData); + return Pokedex_CanDetectForms(param0->pokedex); } void ov21_021D3960(UnkStruct_ov21_021D3320 *param0) @@ -653,19 +653,19 @@ u32 ov21_021D3998(const UnkStruct_ov21_021D3320 *param0) return param0->unk_1758; } -static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, const Pokedex *dexData, const u16 *fullDex, int pokedexLength) +static void FilterUnencountered(u16 *encounteredDex, int *caughtStatusLength, const Pokedex *pokedex, const u16 *fullDex, int pokedexLength) { *caughtStatusLength = 0; for (int species = 0; species < pokedexLength; species++) { - if (PokedexData_HasSeenSpecies(dexData, fullDex[species])) { + if (Pokedex_HasSeenSpecies(pokedex, fullDex[species])) { encounteredDex[*caughtStatusLength] = fullDex[species]; (*caughtStatusLength)++; } } } -static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u16 *pokedex1, int dexLen1, const u16 *pokedex2, int dexLen2, BOOL keepUncaught, const Pokedex *dexData) +static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u16 *pokedex1, int dexLen1, const u16 *pokedex2, int dexLen2, BOOL keepUncaught, const Pokedex *pokedex) { int dexIndex2; @@ -677,7 +677,7 @@ static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u if (keepUncaught == TRUE) { break; } else { - if (PokedexData_HasCaughtSpecies(dexData, pokedex1[dexIndex1])) { + if (Pokedex_HasCaughtSpecies(pokedex, pokedex1[dexIndex1])) { break; } } @@ -691,12 +691,12 @@ static void IntersectPokedexes(u16 *resultingPokedex, int *numResulting, const u } } -static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const Pokedex *dexData, const u16 *encounteredPokedex, int caughtStatusLength) +static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const Pokedex *pokedex, const u16 *encounteredPokedex, int caughtStatusLength) { sortedPokedex->caughtStatusLength = 0; for (int dexIndex = 0; dexIndex < caughtStatusLength; dexIndex++) { - if (PokedexData_HasCaughtSpecies(dexData, encounteredPokedex[dexIndex])) { + if (Pokedex_HasCaughtSpecies(pokedex, encounteredPokedex[dexIndex])) { sortedPokedex->caughtStatusArray[sortedPokedex->caughtStatusLength].caughtStatus = CS_CAUGHT; } else { sortedPokedex->caughtStatusArray[sortedPokedex->caughtStatusLength].caughtStatus = CS_ENCOUNTERED; @@ -749,7 +749,7 @@ static u16 *PokedexFromNARC(int heapID, int pokedexSort, int *pokedexLength) return pokedexFromFile; } -static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData) +static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex) { u16 *pokedexFromFile; int pokedexLength; @@ -781,7 +781,7 @@ static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting } if (pokedexFromFile != NULL) { - IntersectPokedexes(resultingPokedex, numResulting, pokedexFromFile, pokedexLength, encounteredPokedex, caughtStatusLength, keepUncaught, dexData); + IntersectPokedexes(resultingPokedex, numResulting, pokedexFromFile, pokedexLength, encounteredPokedex, caughtStatusLength, keepUncaught, pokedex); Heap_FreeToHeap(pokedexFromFile); } else { memcpy(resultingPokedex, encounteredPokedex, (sizeof(u16)) * caughtStatusLength); @@ -789,7 +789,7 @@ static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting } } -static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData) +static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex) { u16 *pokedexFromFile; int pokedexLength; @@ -831,7 +831,7 @@ static void FilterByName(int filterName, u16 *resultingPokedex, int *numResultin } if (pokedexFromFile != NULL) { - IntersectPokedexes(resultingPokedex, numResulting, encounteredPokedex, caughtStatusLength, pokedexFromFile, pokedexLength, TRUE, dexData); + IntersectPokedexes(resultingPokedex, numResulting, encounteredPokedex, caughtStatusLength, pokedexFromFile, pokedexLength, TRUE, pokedex); Heap_FreeToHeap(pokedexFromFile); } else { memcpy(resultingPokedex, encounteredPokedex, (sizeof(u16)) * caughtStatusLength); @@ -839,7 +839,7 @@ static void FilterByName(int filterName, u16 *resultingPokedex, int *numResultin } } -static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData) +static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex) { u16 *pokedexFromFile; int pokedexLength; @@ -905,7 +905,7 @@ static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResultin } if (pokedexFromFile != NULL) { - IntersectPokedexes(resultingPokedex, numResulting, encounteredPokedex, caughtStatusLength, pokedexFromFile, pokedexLength, FALSE, dexData); + IntersectPokedexes(resultingPokedex, numResulting, encounteredPokedex, caughtStatusLength, pokedexFromFile, pokedexLength, FALSE, pokedex); Heap_FreeToHeap(pokedexFromFile); } else { memcpy(resultingPokedex, encounteredPokedex, (sizeof(u16)) * caughtStatusLength); @@ -913,7 +913,7 @@ static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResultin } } -static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *dexData) +static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex) { u16 *pokedexFromFile; int pokedexLength; @@ -970,7 +970,7 @@ static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResultin } if (pokedexFromFile != NULL) { - IntersectPokedexes(resultingPokedex, numResulting, encounteredPokedex, caughtStatusLength, pokedexFromFile, pokedexLength, TRUE, dexData); + IntersectPokedexes(resultingPokedex, numResulting, encounteredPokedex, caughtStatusLength, pokedexFromFile, pokedexLength, TRUE, pokedex); Heap_FreeToHeap(pokedexFromFile); } else { memcpy(resultingPokedex, encounteredPokedex, (sizeof(u16)) * caughtStatusLength); diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index 9d7839ed2f..b3567f33d1 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1777,10 +1777,10 @@ static BOOL ov23_0223F838(int param0, int param1, int param2) static int ov23_0223F970(UnkStruct_ov23_02256EB0 *param0) { - SaveData *v0 = FieldSystem_GetSaveData(Unk_ov23_02257740->fieldSystem); - UndergroundData *v1 = sub_020298B0(v0); - BOOL v2 = TrainerInfo_ID(SaveData_GetTrainerInfo(v0)) % 2; - BOOL v3 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(v0)); + SaveData *saveData = FieldSystem_GetSaveData(Unk_ov23_02257740->fieldSystem); + UndergroundData *v1 = sub_020298B0(saveData); + BOOL v2 = TrainerInfo_ID(SaveData_GetTrainerInfo(saveData)) % 2; + BOOL v3 = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(saveData)); int v4 = 0; if (v3) { diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index 08a3797b58..919511996f 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -131,9 +131,9 @@ static void ov23_022522F0(UnkStruct_ov23_02250CD4 *param0, int param1) { MATHRandContext16 v0; int v1, v2, v3, v4, v5; - SaveData *v6 = FieldSystem_GetSaveData(param0->fieldSystem); - UndergroundData *v7 = sub_020298B0(v6); - BOOL v8 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(v6)); + SaveData *saveData = FieldSystem_GetSaveData(param0->fieldSystem); + UndergroundData *v7 = sub_020298B0(saveData); + BOOL natdexObtained = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(saveData)); MATH_InitRand16(&v0, sub_02028930(v7) + param1); @@ -154,7 +154,7 @@ static void ov23_022522F0(UnkStruct_ov23_02250CD4 *param0, int param1) param0->unk_274[v5] = v1; param0->unk_279[v5] = sub_0205742C(v1); - if ((v8 == 0) && (1 == sub_0205747C(v1))) { + if ((natdexObtained == 0) && (1 == sub_0205747C(v1))) { v5--; continue; } diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index a845eb8565..8faf11eda3 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -632,18 +632,18 @@ static void ov28_02256914(UnkStruct_ov28_02256210 *param0, const UnkStruct_ov28_ s64 v0 = ov28_02257468(param1); if ((v0 > 0) && (v0 <= NATIONAL_DEX_COUNT)) { - Pokedex *v1; + Pokedex *pokedex; u16 v2; - v1 = SaveData_Pokedex(PoketchSystem_GetSaveData(param0->poketchSys)); + pokedex = SaveData_GetPokedex(PoketchSystem_GetSaveData(param0->poketchSys)); - if (PokedexData_IsNationalDexObtained(v1)) { + if (Pokedex_IsNationalDexObtained(pokedex)) { v2 = v0; } else { v2 = Pokemon_NationalDexNumber((u16)v0); } - if (v2 > 0 && v2 <= NATIONAL_DEX_COUNT && PokedexData_HasSeenSpecies(v1, v2)) { + if (v2 > 0 && v2 <= NATIONAL_DEX_COUNT && Pokedex_HasSeenSpecies(pokedex, v2)) { ov25_02254444(v2, 0); } } diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index f8b42f1f3f..f646a4899b 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -1472,10 +1472,10 @@ static BOOL ov62_02239984(UnkStruct_0208C06C *param0, int param1) int v7; int v8 = 0; BOOL v9; - Pokedex *v10 = SaveData_Pokedex(param0->unk_830); + Pokedex *pokedex = SaveData_GetPokedex(param0->unk_830); for (v7 = v3; v7 < v4; v7++) { - v9 = PokedexData_HasSeenSpecies(v10, v1[v7]); + v9 = Pokedex_HasSeenSpecies(pokedex, v1[v7]); if (v9 == 0) { v1[v7] = 0xFFFF; @@ -1516,12 +1516,12 @@ static void ov62_02239A0C(UnkStruct_0208C06C *param0, int param1) int v5; int v6 = 0; BOOL v7; - Pokedex *v8 = SaveData_Pokedex(param0->unk_830); + Pokedex *v8 = SaveData_GetPokedex(param0->unk_830); v4->unk_1D4.unk_00 = 0; for (v5 = v2; v5 < v3; v5++) { - v7 = PokedexData_HasSeenSpecies(v8, v0[v5]); + v7 = Pokedex_HasSeenSpecies(v8, v0[v5]); if (v7 == 0) { v0[v5] = 0xFFFF; diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index 6af7a7ef39..d0f2141fed 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -1516,10 +1516,10 @@ static BOOL ov62_02242748 (UnkStruct_0208C06C * param0, int param1) int v7; int v8 = 0; BOOL v9; - Pokedex * v10 = SaveData_Pokedex(param0->unk_830); + Pokedex * v10 = SaveData_GetPokedex(param0->unk_830); for (v7 = v3; v7 < v4; v7++) { - v9 = PokedexData_HasSeenSpecies(v10, v1[v7]); + v9 = Pokedex_HasSeenSpecies(v10, v1[v7]); if (v9 == 0) { v1[v7] = 0xFFFF; @@ -1560,12 +1560,12 @@ static void ov62_022427D0 (UnkStruct_0208C06C * param0, int param1) int v5; int v6 = 0; BOOL v7; - Pokedex * v8 = SaveData_Pokedex(param0->unk_830); + Pokedex * v8 = SaveData_GetPokedex(param0->unk_830); v4->unk_4C8.unk_00 = 0; for (v5 = v2; v5 < v3; v5++) { - v7 = PokedexData_HasSeenSpecies(v8, v0[v5]); + v7 = Pokedex_HasSeenSpecies(v8, v0[v5]); if (v7 == 0) { v0[v5] = 0xFFFF; diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index c824a9d567..d1ce99f935 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -1795,7 +1795,7 @@ static int ov65_0222F490 (UnkStruct_ov65_0222EBE0 * param0, int param1) static void ov65_0222F4C4 (UnkStruct_ov65_0222EBE0 * param0, int param1) { TrainerInfo * v0 = SaveData_GetTrainerInfo(param0->unk_160); - Pokedex * v1 = SaveData_Pokedex(param0->unk_160); + Pokedex * v1 = SaveData_GetPokedex(param0->unk_160); Party * v2 = Party_GetFromSavedata(param0->unk_160); UnkStruct_0202C878 * v3 = sub_0202C878(param0->unk_160); int v4, v5; @@ -1813,7 +1813,7 @@ static void ov65_0222F4C4 (UnkStruct_ov65_0222EBE0 * param0, int param1) param0->unk_04->unk_00.unk_18 = TrainerInfo_GameCode(v0); param0->unk_04->unk_00.unk_19 = TrainerInfo_RegionCode(v0); - param0->unk_04->unk_00.unk_1A = PokedexData_IsNationalDexObtained(v1); + param0->unk_04->unk_00.unk_1A = Pokedex_IsNationalDexObtained(v1); param0->unk_04->unk_00.unk_1B = 29; ov65_02232E70(param0, param1); diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 2d7f6a9a19..511e9cfbdb 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -2311,7 +2311,7 @@ static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *param1, u32 { v0 = SaveData_GetTrainerInfo(param1); v1 = Party_GetFromSavedata(param1); - v3 = SaveData_Pokedex(param1); + v3 = SaveData_GetPokedex(param1); v2 = sub_0202C878(param1); v4 = SaveData_GetGameTime(param1); } @@ -2354,7 +2354,7 @@ static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *param1, u32 param0->unk_20.unk_3A = ov66_02230C0C(param0->unk_20.unk_3A); param0->unk_20.unk_3C = sub_0202C8C0(v2); param0->unk_20.unk_3E = sub_0202C8C4(v2); - param0->unk_20.unk_3F = PokedexData_IsNationalDexObtained(v3); + param0->unk_20.unk_3F = Pokedex_IsNationalDexObtained(v3); param0->unk_20.unk_40 = TrainerInfo_IsMainStoryCleared(v0); param0->unk_20.unk_41 = 0xff; param0->unk_20.unk_43 = 0; diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 71c9d0fd9a..f9457e3b4c 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -1134,12 +1134,12 @@ static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoad for (v0 = 0; v0 < v3; v0++) { if (v4) { - if (PokedexData_HasSeenSpecies(param7, param3[v1 + v0])) { + if (Pokedex_HasSeenSpecies(param7, param3[v1 + v0])) { v2++; } } else { if (param4[param3[v1 + v0]]) { - if (PokedexData_HasSeenSpecies(param7, param3[v1 + v0])) { + if (Pokedex_HasSeenSpecies(param7, param3[v1 + v0])) { v2++; } } @@ -1150,12 +1150,12 @@ static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoad for (v0 = 0; v0 < v3; v0++) { if (v4) { - if (PokedexData_HasSeenSpecies(param7, param3[v1 + v0])) { + if (Pokedex_HasSeenSpecies(param7, param3[v1 + v0])) { StringList_AddFromMessageBank(*param0, param1, param3[v1 + v0], param3[v1 + v0]); } } else { if (param4[param3[v1 + v0]]) { - if (PokedexData_HasSeenSpecies(param7, param3[v1 + v0])) { + if (Pokedex_HasSeenSpecies(param7, param3[v1 + v0])) { StringList_AddFromMessageBank(*param0, param1, param3[v1 + v0], param3[v1 + v0]); } } diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index adab601bdb..f8f516fc0a 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -237,7 +237,7 @@ static void ov97_0222AF1C(UnkStruct_0222AE60 *param0) SetGBACartridgeVersion(v0); - if (PokedexData_IsNationalDexObtained(param0->unk_08) == FALSE) { + if (Pokedex_IsNationalDexObtained(param0->unk_08) == FALSE) { return; } @@ -987,7 +987,7 @@ static int ov97_0222BD70(OverlayManager *param0, int *param1) v0->unk_11C = FX32_ONE * 0; v0->unk_120 = FX32_ONE * 0; v0->unk_0C = SaveData_GetTrainerInfo(v0->unk_04); - v0->unk_08 = SaveData_Pokedex(v0->unk_04); + v0->unk_08 = SaveData_GetPokedex(v0->unk_04); v0->playTime = SaveData_GetPlayTime(v0->unk_04); v0->unk_4C = Pokedex_IsObtained(v0->unk_08); v0->unk_50 = TrainerInfo_BadgeCount(v0->unk_0C); diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 98d347b35a..46aa676753 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -681,7 +681,7 @@ static int ov97_0222C6F8(OverlayManager *param0, int *param1) v0->unk_04 = BgConfig_New(v0->unk_00); v0->unk_08 = ((ApplicationArgs *)OverlayManager_Args(param0))->saveData; v0->unk_10 = SaveData_GetTrainerInfo(v0->unk_08); - v0->unk_0C = SaveData_Pokedex(v0->unk_08); + v0->unk_0C = SaveData_GetPokedex(v0->unk_08); v0->unk_14 = SaveData_Options(v0->unk_08); ov97_02237694(v0->unk_00); diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index dbd275d8a8..e05dc986cc 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -93,7 +93,7 @@ int ov118_021D0DBC(GameWindowLayout *param0) break; } - PokedexData_Capture(SaveData_Pokedex(FieldSystem_GetSaveData(param0->unk_5A4->unk_1C)), v1); + Pokedex_Capture(SaveData_GetPokedex(FieldSystem_GetSaveData(param0->unk_5A4->unk_1C)), v1); } v0->unk_00++; break; diff --git a/src/pokedex_data.c b/src/pokedex_data.c index 1716a92253..d622d33718 100644 --- a/src/pokedex_data.c +++ b/src/pokedex_data.c @@ -218,7 +218,7 @@ static int NumFormsSeen_TwoForms(const Pokedex *pokedexData, u32 species) { GF_ASSERT((species == SPECIES_SHELLOS) || (species == SPECIES_GASTRODON) || (species == SPECIES_SHAYMIN) || (species == SPECIES_GIRATINA)); - if (PokedexData_HasSeenSpecies(pokedexData, species) == FALSE) { + if (Pokedex_HasSeenSpecies(pokedexData, species) == FALSE) { return 0; } @@ -252,7 +252,7 @@ static BOOL FormSeen_TwoForms(const Pokedex *pokedexData, u32 species, u8 form) { GF_ASSERT((species == SPECIES_SHELLOS) || (species == SPECIES_GASTRODON) || (species == SPECIES_SHAYMIN) || (species == SPECIES_GIRATINA)); - if (PokedexData_HasSeenSpecies(pokedexData, species) == FALSE) { + if (Pokedex_HasSeenSpecies(pokedexData, species) == FALSE) { return FALSE; } @@ -324,7 +324,7 @@ static int NumFormsSeen_ThreeForms(const Pokedex *pokedexData, u32 species) { GF_ASSERT((species == SPECIES_BURMY) || (species == SPECIES_WORMADAM)); - if (PokedexData_HasSeenSpecies(pokedexData, species) == FALSE) { + if (Pokedex_HasSeenSpecies(pokedexData, species) == FALSE) { return 0; } @@ -351,7 +351,7 @@ static BOOL FormSeen_ThreeForms(const Pokedex *pokedexData, u32 species, u8 form { GF_ASSERT((species == SPECIES_BURMY) || (species == SPECIES_WORMADAM)); - if (PokedexData_HasSeenSpecies(pokedexData, species) == FALSE) { + if (Pokedex_HasSeenSpecies(pokedexData, species) == FALSE) { return FALSE; } @@ -500,7 +500,7 @@ static int NumFormsSeen_Rotom(const Pokedex *pokedexData, u32 species) { GF_ASSERT(species == SPECIES_ROTOM); - if (PokedexData_HasSeenSpecies(pokedexData, species) == FALSE) { + if (Pokedex_HasSeenSpecies(pokedexData, species) == FALSE) { return 0; } @@ -525,7 +525,7 @@ static BOOL FormSeen_Rotom(const Pokedex *pokedexData, u32 species, u8 form) { GF_ASSERT(species == SPECIES_ROTOM); - if (PokedexData_HasSeenSpecies(pokedexData, species) == FALSE) { + if (Pokedex_HasSeenSpecies(pokedexData, species) == FALSE) { return FALSE; } @@ -753,7 +753,7 @@ u16 Pokedex_CountCaught_National(const Pokedex *pokedexData) int species; int caughtCount = 0; for (species = 1; species <= NATIONAL_DEX_COUNT; species++) { - if (PokedexData_HasCaughtSpecies(pokedexData, species) == TRUE) { + if (Pokedex_HasCaughtSpecies(pokedexData, species) == TRUE) { caughtCount++; } } @@ -768,7 +768,7 @@ u16 Pokedex_CountSeen_National(const Pokedex *pokedex) int species; int seenCount = 0; for (species = 1; species <= NATIONAL_DEX_COUNT; species++) { - if (PokedexData_HasSeenSpecies(pokedex, species) == TRUE) { + if (Pokedex_HasSeenSpecies(pokedex, species) == TRUE) { seenCount++; } } @@ -778,21 +778,21 @@ u16 Pokedex_CountSeen_National(const Pokedex *pokedex) u16 Pokedex_CountSeen(const Pokedex *pokedex) { - if (PokedexData_IsNationalDexObtained(pokedex)) { + if (Pokedex_IsNationalDexObtained(pokedex)) { return Pokedex_CountSeen_National(pokedex); } - return PokedexData_CountSeen_Local(pokedex); + return Pokedex_CountSeen_Local(pokedex); } -u16 PokedexData_CountCaught_Local(const Pokedex *pokedexData) +u16 Pokedex_CountCaught_Local(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); int species; int caughtCount = 0; for (species = 1; species <= NATIONAL_DEX_COUNT; species++) { - if (PokedexData_HasCaughtSpecies(pokedexData, species) == TRUE) { + if (Pokedex_HasCaughtSpecies(pokedexData, species) == TRUE) { if (Pokemon_SinnohDexNumber(species) != 0) { caughtCount++; } @@ -802,14 +802,14 @@ u16 PokedexData_CountCaught_Local(const Pokedex *pokedexData) return caughtCount; } -u16 PokedexData_CountSeen_Local(const Pokedex *pokedex) +u16 Pokedex_CountSeen_Local(const Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); int species; int seenCount = 0; for (species = 1; species <= NATIONAL_DEX_COUNT; species++) { - if (PokedexData_HasSeenSpecies(pokedex, species) == TRUE && Pokemon_SinnohDexNumber(species) != 0) { + if (Pokedex_HasSeenSpecies(pokedex, species) == TRUE && Pokemon_SinnohDexNumber(species) != 0) { seenCount++; } } @@ -817,9 +817,9 @@ u16 PokedexData_CountSeen_Local(const Pokedex *pokedex) return seenCount; } -BOOL PokedexData_NationalDexCompleted(const Pokedex *pokedexData) +BOOL Pokedex_NationalDexCompleted(const Pokedex *pokedexData) { - u16 numCaught = PokedexData_NumCaught_National(pokedexData); + u16 numCaught = Pokedex_NumCaught_National(pokedexData); if (numCaught >= NATIONAL_DEX_GOAL) { return TRUE; @@ -828,9 +828,9 @@ BOOL PokedexData_NationalDexCompleted(const Pokedex *pokedexData) return FALSE; } -BOOL PokedexData_LocalDexCompleted(const Pokedex *pokedexData) +BOOL Pokedex_LocalDexCompleted(const Pokedex *pokedexData) { - u16 numCaught = PokedexData_NumCaught_Local(pokedexData); + u16 numCaught = Pokedex_NumCaught_Local(pokedexData); if (numCaught >= LOCAL_DEX_GOAL) { return TRUE; @@ -839,13 +839,13 @@ BOOL PokedexData_LocalDexCompleted(const Pokedex *pokedexData) return FALSE; } -u16 PokedexData_NumCaught_National(const Pokedex *pokedexData) +u16 Pokedex_NumCaught_National(const Pokedex *pokedexData) { int species; u16 numCaught = 0; for (species = 1; species <= NATIONAL_DEX_COUNT; species++) { - if (PokedexData_HasCaughtSpecies(pokedexData, species) == TRUE) { + if (Pokedex_HasCaughtSpecies(pokedexData, species) == TRUE) { if (CountsForDexCompletion_National(species) == TRUE) { numCaught++; } @@ -855,13 +855,13 @@ u16 PokedexData_NumCaught_National(const Pokedex *pokedexData) return numCaught; } -u16 PokedexData_NumCaught_Local(const Pokedex *pokedexData) +u16 Pokedex_NumCaught_Local(const Pokedex *pokedexData) { int species; u16 numCaught = 0; for (species = 1; species <= NATIONAL_DEX_COUNT; species++) { - if (PokedexData_HasSeenSpecies(pokedexData, species) == TRUE) { + if (Pokedex_HasSeenSpecies(pokedexData, species) == TRUE) { if (Pokemon_SinnohDexNumber(species) != 0 && CountsForDexCompletion_Local(species) == TRUE) { numCaught++; @@ -872,7 +872,7 @@ u16 PokedexData_NumCaught_Local(const Pokedex *pokedexData) return numCaught; } -BOOL PokedexData_HasCaughtSpecies(const Pokedex *pokedex, u16 species) +BOOL Pokedex_HasCaughtSpecies(const Pokedex *pokedex, u16 species) { CheckPokedexIntegrity(pokedex); @@ -887,7 +887,7 @@ BOOL PokedexData_HasCaughtSpecies(const Pokedex *pokedex, u16 species) } } -BOOL PokedexData_HasSeenSpecies(const Pokedex *pokedex, u16 species) +BOOL Pokedex_HasSeenSpecies(const Pokedex *pokedex, u16 species) { CheckPokedexIntegrity(pokedex); @@ -898,7 +898,7 @@ BOOL PokedexData_HasSeenSpecies(const Pokedex *pokedex, u16 species) return SpeciesSeen(pokedex, species); } -u32 PokedexData_GetForm_Spinda(const Pokedex *pokedexData, u8 formIndex) +u32 Pokedex_GetForm_Spinda(const Pokedex *pokedexData, u8 formIndex) { CheckPokedexIntegrity(pokedexData); @@ -915,7 +915,7 @@ u32 PokedexData_GetForm_Spinda(const Pokedex *pokedexData, u8 formIndex) return form; } -u32 PokedexData_DisplayedGender(const Pokedex *pokedexData, u16 species, int displaySecondary) +u32 Pokedex_DisplayedGender(const Pokedex *pokedexData, u16 species, int displaySecondary) { CheckPokedexIntegrity(pokedexData); @@ -930,7 +930,7 @@ u32 PokedexData_DisplayedGender(const Pokedex *pokedexData, u16 species, int dis return GetDisplayGender(pokedexData, species, displaySecondary); } -u32 PokedexData_GetForm_Unown(const Pokedex *pokedexData, int formIndex) +u32 Pokedex_GetForm_Unown(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -941,13 +941,13 @@ u32 PokedexData_GetForm_Unown(const Pokedex *pokedexData, int formIndex) return GetForm_Unown(pokedexData, formIndex); } -u32 PokedexData_NumFormsSeen_Unown(const Pokedex *pokedexData) +u32 Pokedex_NumFormsSeen_Unown(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_Unown(pokedexData); } -u32 PokedexData_GetForm_Shellos(const Pokedex *pokedexData, int formIndex) +u32 Pokedex_GetForm_Shellos(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -958,13 +958,13 @@ u32 PokedexData_GetForm_Shellos(const Pokedex *pokedexData, int formIndex) return GetForm_TwoForms(pokedexData, SPECIES_SHELLOS, formIndex); } -u32 PokedexData_NumFormsSeen_Shellos(const Pokedex *pokedexData) +u32 Pokedex_NumFormsSeen_Shellos(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_TwoForms(pokedexData, SPECIES_SHELLOS); } -u32 PokedexData_GetForm_Gastrodon(const Pokedex *pokedexData, int formIndex) +u32 Pokedex_GetForm_Gastrodon(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -975,13 +975,13 @@ u32 PokedexData_GetForm_Gastrodon(const Pokedex *pokedexData, int formIndex) return GetForm_TwoForms(pokedexData, SPECIES_GASTRODON, formIndex); } -u32 PokedexData_NumFormsSeen_Gastrodon(const Pokedex *pokedexData) +u32 Pokedex_NumFormsSeen_Gastrodon(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_TwoForms(pokedexData, SPECIES_GASTRODON); } -u32 PokedexData_GetForm_Burmy(const Pokedex *pokedexData, int formIndex) +u32 Pokedex_GetForm_Burmy(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -992,13 +992,13 @@ u32 PokedexData_GetForm_Burmy(const Pokedex *pokedexData, int formIndex) return GetForm_3Forms(pokedexData, SPECIES_BURMY, formIndex); } -u32 PokedexData_NumFormsSeen_Burmy(const Pokedex *pokedexData) +u32 Pokedex_NumFormsSeen_Burmy(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_ThreeForms(pokedexData, SPECIES_BURMY); } -u32 PokedexData_GetForm_Wormadam(const Pokedex *pokedexData, int formIndex) +u32 Pokedex_GetForm_Wormadam(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); @@ -1009,19 +1009,19 @@ u32 PokedexData_GetForm_Wormadam(const Pokedex *pokedexData, int formIndex) return GetForm_3Forms(pokedexData, SPECIES_WORMADAM, formIndex); } -u32 PokedexData_NumFormsSeen_Wormadam(const Pokedex *pokedexData) +u32 Pokedex_NumFormsSeen_Wormadam(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_ThreeForms(pokedexData, SPECIES_WORMADAM); } -u32 PokedexData_GetForm_Deoxys(const Pokedex *pokedexData, int formIndex) +u32 Pokedex_GetForm_Deoxys(const Pokedex *pokedexData, int formIndex) { CheckPokedexIntegrity(pokedexData); return GetForm_Deoxys(pokedexData, formIndex); } -u32 PokedexData_NumFormsSeen_Deoxys(const Pokedex *pokedexData) +u32 Pokedex_NumFormsSeen_Deoxys(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return NumFormsSeen_Deoxys(pokedexData); @@ -1054,7 +1054,7 @@ void Pokedex_Encounter(Pokedex *pokedexData, Pokemon *pokemon) Write_SeenSpecies(pokedexData, species); } -void PokedexData_Capture(Pokedex *pokedexData, Pokemon *pokemon) +void Pokedex_Capture(Pokedex *pokedexData, Pokemon *pokemon) { u16 species = Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL); u32 language = Pokemon_GetValue(pokemon, MON_DATA_LANGUAGE, NULL); @@ -1085,31 +1085,31 @@ void PokedexData_Capture(Pokedex *pokedexData, Pokemon *pokemon) Write_SeenSpecies(pokedexData, species); } -void PokedexData_ObtainNationalDex(Pokedex *pokedexData) +void Pokedex_ObtainNationalDex(Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); pokedexData->nationalDexObtained = TRUE; } -BOOL PokedexData_IsNationalDexObtained(const Pokedex *pokedex) +BOOL Pokedex_IsNationalDexObtained(const Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); return pokedex->nationalDexObtained; } -BOOL PokedexData_CanDetectForms(const Pokedex *pokedexData) +BOOL Pokedex_CanDetectForms(const Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); return pokedexData->canDetectForms; } -void PokedexData_TurnOnFormDetection(Pokedex *pokedexData) +void Pokedex_TurnOnFormDetection(Pokedex *pokedexData) { CheckPokedexIntegrity(pokedexData); pokedexData->canDetectForms = TRUE; } -BOOL PokedexData_IsLanguageObtained(const Pokedex *pokedexData, u16 species, u32 languageIndex) +BOOL Pokedex_IsLanguageObtained(const Pokedex *pokedexData, u16 species, u32 languageIndex) { int bitIndex; @@ -1123,12 +1123,12 @@ BOOL PokedexData_IsLanguageObtained(const Pokedex *pokedexData, u16 species, u32 return pokedexData->recordedLanguages[bitIndex] & (1 << languageIndex); } -void PokedexData_TurnOnLanguageDetection(Pokedex *pokedexData) +void Pokedex_TurnOnLanguageDetection(Pokedex *pokedexData) { pokedexData->canDetectLanguages = TRUE; } -BOOL PokedexData_CanDetectLanguages(const Pokedex *pokedexData) +BOOL Pokedex_CanDetectLanguages(const Pokedex *pokedexData) { return pokedexData->canDetectLanguages; } @@ -1139,13 +1139,13 @@ BOOL Pokedex_IsObtained(const Pokedex *pokedex) return pokedex->pokedexObtained; } -void PokedexData_ObtainPokedex(Pokedex *pokedex) +void Pokedex_ObtainPokedex(Pokedex *pokedex) { CheckPokedexIntegrity(pokedex); pokedex->pokedexObtained = TRUE; } -Pokedex *SaveData_Pokedex(SaveData *saveData) +Pokedex *SaveData_GetPokedex(SaveData *saveData) { Pokedex *pokedex = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_POKEDEX); return pokedex; @@ -1157,33 +1157,33 @@ u32 Pokedex_GetDisplayForm(const Pokedex *pokedexData, int species, int formInde switch (species) { case SPECIES_UNOWN: - if (formIndex < PokedexData_NumFormsSeen_Unown(pokedexData)) { - return PokedexData_GetForm_Unown(pokedexData, formIndex); + if (formIndex < Pokedex_NumFormsSeen_Unown(pokedexData)) { + return Pokedex_GetForm_Unown(pokedexData, formIndex); } break; case SPECIES_SHELLOS: - if (formIndex < PokedexData_NumFormsSeen_Shellos(pokedexData)) { - return PokedexData_GetForm_Shellos(pokedexData, formIndex); + if (formIndex < Pokedex_NumFormsSeen_Shellos(pokedexData)) { + return Pokedex_GetForm_Shellos(pokedexData, formIndex); } break; case SPECIES_GASTRODON: - if (formIndex < PokedexData_NumFormsSeen_Gastrodon(pokedexData)) { - return PokedexData_GetForm_Gastrodon(pokedexData, formIndex); + if (formIndex < Pokedex_NumFormsSeen_Gastrodon(pokedexData)) { + return Pokedex_GetForm_Gastrodon(pokedexData, formIndex); } break; case SPECIES_BURMY: - if (formIndex < PokedexData_NumFormsSeen_Burmy(pokedexData)) { - return PokedexData_GetForm_Burmy(pokedexData, formIndex); + if (formIndex < Pokedex_NumFormsSeen_Burmy(pokedexData)) { + return Pokedex_GetForm_Burmy(pokedexData, formIndex); } break; case SPECIES_WORMADAM: - if (formIndex < PokedexData_NumFormsSeen_Wormadam(pokedexData)) { - return PokedexData_GetForm_Wormadam(pokedexData, formIndex); + if (formIndex < Pokedex_NumFormsSeen_Wormadam(pokedexData)) { + return Pokedex_GetForm_Wormadam(pokedexData, formIndex); } break; case SPECIES_DEOXYS: - if (formIndex < PokedexData_NumFormsSeen_Deoxys(pokedexData)) { - return PokedexData_GetForm_Deoxys(pokedexData, formIndex); + if (formIndex < Pokedex_NumFormsSeen_Deoxys(pokedexData)) { + return Pokedex_GetForm_Deoxys(pokedexData, formIndex); } break; case SPECIES_SHAYMIN: @@ -1208,23 +1208,23 @@ u32 Pokedex_GetDisplayForm(const Pokedex *pokedexData, int species, int formInde return 0; } -u32 PokedexData_NumFormsSeen(const Pokedex *pokedex, int species) +u32 Pokedex_NumFormsSeen(const Pokedex *pokedex, int species) { CheckPokedexIntegrity(pokedex); switch (species) { case SPECIES_UNOWN: - return PokedexData_NumFormsSeen_Unown(pokedex); + return Pokedex_NumFormsSeen_Unown(pokedex); case SPECIES_SHELLOS: - return PokedexData_NumFormsSeen_Shellos(pokedex); + return Pokedex_NumFormsSeen_Shellos(pokedex); case SPECIES_GASTRODON: - return PokedexData_NumFormsSeen_Gastrodon(pokedex); + return Pokedex_NumFormsSeen_Gastrodon(pokedex); case SPECIES_BURMY: - return PokedexData_NumFormsSeen_Burmy(pokedex); + return Pokedex_NumFormsSeen_Burmy(pokedex); case SPECIES_WORMADAM: - return PokedexData_NumFormsSeen_Wormadam(pokedex); + return Pokedex_NumFormsSeen_Wormadam(pokedex); case SPECIES_DEOXYS: - return PokedexData_NumFormsSeen_Deoxys(pokedex); + return Pokedex_NumFormsSeen_Deoxys(pokedex); case SPECIES_SHAYMIN: return NumFormsSeen_TwoForms(pokedex, SPECIES_SHAYMIN); case SPECIES_GIRATINA: diff --git a/src/scrcmd.c b/src/scrcmd.c index 7dedb81e56..26d8f78b68 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1589,7 +1589,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_334, ScrCmd_335, ScrCmd_336, - ScrCmd_337, + ScrCmd_HasSeenSpecies, ScrCmd_338, ScrCmd_339, ScrCmd_33A, @@ -4975,25 +4975,25 @@ static BOOL ScrCmd_11D(ScriptContext *ctx) static BOOL ScrCmd_11E(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); - *v1 = PokedexData_CountSeen_Local(v0); + *v1 = Pokedex_CountSeen_Local(v0); return 0; } static BOOL ScrCmd_11F(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); - *v1 = PokedexData_CountCaught_Local(v0); + *v1 = Pokedex_CountCaught_Local(v0); return 0; } static BOOL ScrCmd_120(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = Pokedex_CountSeen_National(v0); @@ -5002,7 +5002,7 @@ static BOOL ScrCmd_120(ScriptContext *ctx) static BOOL ScrCmd_121(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = Pokedex_CountCaught_National(v0); @@ -5018,17 +5018,17 @@ static BOOL ScrCmd_122(ScriptContext *ctx) static BOOL ScrCmd_123(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); const TrainerInfo *v1 = SaveData_GetTrainerInfo(ctx->fieldSystem->saveData); u8 v2 = ScriptContext_ReadByte(ctx); u16 *v3 = ScriptContext_GetVarPointer(ctx); u16 v4; if (v2 == 0) { - v4 = PokedexData_NumCaught_Local(v0); + v4 = Pokedex_NumCaught_Local(v0); *v3 = sub_0205E078(v4, SystemFlag_HandleFirstArrivalToZone(SaveData_GetVarsFlags(ctx->fieldSystem->saveData), HANDLE_FLAG_CHECK, FIRST_ARRIVAL_ETERNA_CITY)); } else { - v4 = PokedexData_NumCaught_National(v0); + v4 = Pokedex_NumCaught_National(v0); *v3 = sub_0205E0E4(v4, TrainerInfo_Gender(v1)); } @@ -6238,12 +6238,12 @@ static BOOL ScrCmd_1D6(ScriptContext *ctx) static BOOL ScrCmd_1E8(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; - if (PokedexData_LocalDexCompleted(v0) == 1) { + if (Pokedex_LocalDexCompleted(v0) == 1) { *v1 = 1; } @@ -6252,12 +6252,12 @@ static BOOL ScrCmd_1E8(ScriptContext *ctx) static BOOL ScrCmd_1E9(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; - if (PokedexData_NationalDexCompleted(v0) == 1) { + if (Pokedex_NationalDexCompleted(v0) == 1) { *v1 = 1; } @@ -6466,16 +6466,16 @@ static BOOL ScrCmd_214(ScriptContext *ctx) static BOOL ScrCmd_218(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2, v3, v4, v5; - v2 = PokedexData_CountSeen_Local(v0); + v2 = Pokedex_CountSeen_Local(v0); v3 = LCRNG_Next() % v2; *v1 = 25; for (v4 = 1, v5 = 0; v4 <= NATIONAL_DEX_COUNT; v4++) { - if (PokedexData_HasSeenSpecies(v0, v4) == TRUE && Pokemon_SinnohDexNumber(v4) != FALSE) { + if (Pokedex_HasSeenSpecies(v0, v4) == TRUE && Pokemon_SinnohDexNumber(v4) != FALSE) { if (v5 == v3) { *v1 = v4; break; @@ -6565,13 +6565,13 @@ static BOOL ScrCmd_22A(ScriptContext *ctx) static BOOL ScrCmd_22B(ScriptContext *ctx) { - PokedexData_TurnOnLanguageDetection(SaveData_Pokedex(ctx->fieldSystem->saveData)); + Pokedex_TurnOnLanguageDetection(SaveData_GetPokedex(ctx->fieldSystem->saveData)); return 0; } static BOOL ScrCmd_22C(ScriptContext *ctx) { - PokedexData_TurnOnFormDetection(SaveData_Pokedex(ctx->fieldSystem->saveData)); + Pokedex_TurnOnFormDetection(SaveData_GetPokedex(ctx->fieldSystem->saveData)); return 0; } @@ -6583,10 +6583,10 @@ static BOOL ScrCmd_22D(ScriptContext *ctx) *v1 = 0; if (v0 == 1) { - PokedexData_ObtainNationalDex(SaveData_Pokedex(ctx->fieldSystem->saveData)); + Pokedex_ObtainNationalDex(SaveData_GetPokedex(ctx->fieldSystem->saveData)); TrainerInfo_GiveNationalDex(SaveData_GetTrainerInfo(ctx->fieldSystem->saveData)); } else if (v0 == 2) { - *v1 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(ctx->fieldSystem->saveData)); + *v1 = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(ctx->fieldSystem->saveData)); } else { GF_ASSERT(FALSE); } @@ -6768,7 +6768,7 @@ static BOOL ScrCmd_24D(ScriptContext *ctx) static void sub_020451B4(FieldSystem *fieldSystem, u16 param1) { - Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *v0 = SaveData_GetPokedex(fieldSystem->saveData); Pokemon *v1 = Pokemon_New(32); Pokemon_Init(v1); @@ -6887,7 +6887,7 @@ static BOOL ScrCmd_263(ScriptContext *ctx) int v3; int v4 = Party_GetCurrentCount(v1); Pokemon *v5; - Pokedex *v6 = SaveData_Pokedex(ctx->fieldSystem->saveData); + Pokedex *v6 = SaveData_GetPokedex(ctx->fieldSystem->saveData); for (v2 = 0; v2 < v4; v2++) { v5 = Party_GetPokemonBySlotIndex(v1, v2); @@ -6896,7 +6896,7 @@ static BOOL ScrCmd_263(ScriptContext *ctx) if (v3 == SPECIES_DEOXYS) { Pokemon_SetValue(v5, MON_DATA_FORM, &v0); Pokemon_CalcLevelAndStats(v5); - PokedexData_Capture(v6, v5); + Pokedex_Capture(v6, v5); } } @@ -7240,10 +7240,10 @@ static BOOL ScrCmd_282(ScriptContext *ctx) static BOOL ScrCmd_284(ScriptContext *ctx) { - const Pokedex *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *v0 = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); - *v1 = PokedexData_NumFormsSeen_Unown(v0); + *v1 = Pokedex_NumFormsSeen_Unown(v0); return 0; } @@ -8333,7 +8333,7 @@ static BOOL ScrCmd_328(ScriptContext *ctx) v5 = Party_GetPokemonBySlotIndex(v1, v3); if ((Pokemon_GetValue(v5, MON_DATA_IS_EGG, NULL) == 0) && (Pokemon_GetValue(v5, MON_DATA_SPECIES, NULL) == SPECIES_GIRATINA)) { - PokedexData_Capture(SaveData_Pokedex(fieldSystem->saveData), v5); + Pokedex_Capture(SaveData_GetPokedex(fieldSystem->saveData), v5); } } } diff --git a/src/scrcmd_system_flags.c b/src/scrcmd_system_flags.c index 114155e7c0..668d058f64 100644 --- a/src/scrcmd_system_flags.c +++ b/src/scrcmd_system_flags.c @@ -18,7 +18,7 @@ BOOL ScrCmd_CheckPokedexAcquired(ScriptContext *ctx) { - const Pokedex *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData); + const Pokedex *pokedex = SaveData_GetPokedex(ctx->fieldSystem->saveData); u16 *destVar = ScriptContext_GetVarPointer(ctx); *destVar = Pokedex_IsObtained(pokedex); return FALSE; @@ -26,8 +26,8 @@ BOOL ScrCmd_CheckPokedexAcquired(ScriptContext *ctx) BOOL ScrCmd_GivePokedex(ScriptContext *ctx) { - Pokedex *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData); - PokedexData_ObtainPokedex(pokedex); + Pokedex *pokedex = SaveData_GetPokedex(ctx->fieldSystem->saveData); + Pokedex_ObtainPokedex(pokedex); return FALSE; } diff --git a/src/unk_0202F180.c b/src/unk_0202F180.c index 7f0a7a0feb..7aaaae0c2b 100644 --- a/src/unk_0202F180.c +++ b/src/unk_0202F180.c @@ -11,13 +11,13 @@ #include "poketch_data.h" #include "savedata.h" -void sub_0202F180(SaveData *param0, const Pokemon *param1) +void sub_0202F180(SaveData *saveData, const Pokemon *pokemon) { - if (Pokemon_GetValue((Pokemon *)param1, MON_DATA_IS_EGG, NULL) == 0) { - Pokedex *v0 = SaveData_Pokedex(param0); + if (Pokemon_GetValue((Pokemon *)pokemon, MON_DATA_IS_EGG, NULL) == 0) { + Pokedex *pokedex = SaveData_GetPokedex(saveData); - GameRecords_IncrementTrainerScoreOnCatch(SaveData_GetGameRecordsPtr(param0), v0, Pokemon_GetValue((Pokemon *)param1, MON_DATA_SPECIES, NULL)); - PokedexData_Capture(v0, (Pokemon *)param1); - PoketchData_PokemonHistoryEnqueue(SaveData_PoketchData(param0), (const BoxPokemon *)param1); + GameRecords_IncrementTrainerScoreOnCatch(SaveData_GetGameRecordsPtr(saveData), pokedex, Pokemon_GetValue((Pokemon *)pokemon, MON_DATA_SPECIES, NULL)); + Pokedex_Capture(pokedex, (Pokemon *)pokemon); + PoketchData_PokemonHistoryEnqueue(SaveData_PoketchData(saveData), (const BoxPokemon *)pokemon); } } diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 42ec41a14f..4a1e97cb95 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -537,7 +537,7 @@ BOOL sub_0202FAC0(void) return 1; } -void sub_0202FAFC(FieldBattleDTO *param0, SaveData *param1) +void sub_0202FAFC(FieldBattleDTO *param0, SaveData *saveData) { int v0; UnkStruct_0202F298 *v1 = &Unk_021C07A4->unk_E8; @@ -561,7 +561,7 @@ void sub_0202FAFC(FieldBattleDTO *param0, SaveData *param1) param0->resultMask = BATTLE_IN_PROGRESS; param0->leveledUpMonsMask = 0; - Pokedex_Copy(SaveData_Pokedex(param1), param0->pokedex); + Pokedex_Copy(SaveData_GetPokedex(saveData), param0->pokedex); for (v0 = 0; v0 < 4; v0++) { param0->trainerIDs[v0] = v1->unk_00.unk_08[v0]; @@ -575,7 +575,7 @@ void sub_0202FAFC(FieldBattleDTO *param0, SaveData *param1) param0->unk_194[v0] = v1->unk_00.unk_14C[v0]; } - Options_Copy(SaveData_Options(param1), param0->options); + Options_Copy(SaveData_Options(saveData), param0->options); param0->options->frame = v1->unk_1BE8.frame; if (param0->options->frame >= 20) { @@ -583,23 +583,23 @@ void sub_0202FAFC(FieldBattleDTO *param0, SaveData *param1) } } -static void sub_0202FCE8(const Party *param0, UnkStruct_0202FD30 *param1) +static void sub_0202FCE8(const Party *party, UnkStruct_0202FD30 *param1) { int v0; Pokemon *v1; MI_CpuClear8(param1, sizeof(UnkStruct_0202FD30)); - param1->unk_00 = Party_GetCapacity(param0); - param1->unk_02 = Party_GetCurrentCount(param0); + param1->unk_00 = Party_GetCapacity(party); + param1->unk_02 = Party_GetCurrentCount(party); for (v0 = 0; v0 < param1->unk_02; v0++) { - v1 = Party_GetPokemonBySlotIndex(param0, v0); + v1 = Party_GetPokemonBySlotIndex(party, v0); sub_02078B40(v1, ¶m1->unk_04[v0]); } } -static void sub_0202FD30(UnkStruct_0202FD30 *param0, Party *param1) +static void sub_0202FD30(UnkStruct_0202FD30 *param0, Party *party) { int v0; Pokemon *v1; @@ -607,12 +607,12 @@ static void sub_0202FD30(UnkStruct_0202FD30 *param0, Party *param1) v1 = Pokemon_New(11); - Party_InitWithCapacity(param1, param0->unk_00); + Party_InitWithCapacity(party, param0->unk_00); for (v0 = 0; v0 < param0->unk_02; v0++) { sub_02078E0C(¶m0->unk_04[v0], v1); Pokemon_SetValue(v1, MON_DATA_MAIL_ID, &v2); - Party_AddPokemon(param1, v1); + Party_AddPokemon(party, v1); } Heap_FreeToHeap(v1); diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 874cc56e95..514a0f2a13 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -979,7 +979,7 @@ static void sub_0203DB38(UnkStruct_ov88_0223C370 *param0, FieldSystem *fieldSyst param0->unk_0C = SaveData_SaveTable(fieldSystem->saveData, 9); param0->unk_14 = sub_0202C878(fieldSystem->saveData); param0->unk_18 = SaveData_Options(fieldSystem->saveData); - param0->unk_24 = SaveData_Pokedex(fieldSystem->saveData); + param0->unk_24 = SaveData_GetPokedex(fieldSystem->saveData); param0->unk_30 = sub_0207A274(fieldSystem->saveData); param0->unk_10 = fieldSystem->saveData; param0->unk_1C = fieldSystem->journalEntry; @@ -1075,7 +1075,7 @@ BOOL sub_0203DBF0(FieldTask *param0) if ((v4 = sub_02076B94(NULL, v2->unk_04.unk_40, 1, v3, &v5)) != 0) { Heap_Create(3, 26, 0x30000); - v2->unk_60 = sub_0207AE68(NULL, v2->unk_04.unk_40, v4, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v5, 0x4, 26); + v2->unk_60 = sub_0207AE68(NULL, v2->unk_04.unk_40, v4, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_GetPokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v5, 0x4, 26); v2->unk_00 = 6; } else { v2->unk_00 = 7; @@ -1366,7 +1366,7 @@ void sub_0203E0FC(FieldSystem *fieldSystem, int param1) v0->unk_04 = SaveData_GetSystemData(fieldSystem->saveData); v0->unk_08 = SaveData_SaveTable(fieldSystem->saveData, 2); v0->unk_0C = SaveData_PCBoxes(fieldSystem->saveData); - v0->unk_10 = SaveData_Pokedex(fieldSystem->saveData); + v0->unk_10 = SaveData_GetPokedex(fieldSystem->saveData); v0->unk_14 = sub_0202B370(fieldSystem->saveData); v0->unk_18 = sub_0202C878(fieldSystem->saveData); v0->unk_1C = SaveData_GetTrainerInfo(fieldSystem->saveData); diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index d0928965be..203e9a3ce1 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -107,7 +107,7 @@ BOOL ScrCmd_0FA(ScriptContext *param0) v8.unk_01 = v4; v8.unk_02 = v6; v8.unk_03 = SystemFlag_CheckGameCompleted(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); - v8.unk_04 = PokedexData_IsNationalDexObtained(SaveData_Pokedex(param0->fieldSystem->saveData)); + v8.unk_04 = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(param0->fieldSystem->saveData)); v8.unk_05 = v7; v8.unk_08 = v1; v8.unk_0C = v0; diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index d2e7c7f801..64a430617a 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -106,13 +106,13 @@ StringTemplate *sub_0204AEE8(SaveData *param0, u16 param1, u16 param2, u8 param3 u8 v0; u16 v1; Strbuf *v2, *v3; - Pokedex *v4; + Pokedex *pokedex; StringTemplate *v5; MessageLoader *v6; v2 = Strbuf_Init(12 + 2, 4); v3 = Strbuf_Init(2, 4); - v4 = SaveData_Pokedex(param0); + pokedex = SaveData_GetPokedex(param0); v6 = MessageLoader_Init(1, 26, 412, 4); v5 = StringTemplate_New(18 + 1, 12 + 2, 4); @@ -121,7 +121,7 @@ StringTemplate *sub_0204AEE8(SaveData *param0, u16 param1, u16 param2, u8 param3 for (v0 = 0; v0 < 18; v0++) { v1 = sub_02078824(v0); - if (PokedexData_HasSeenSpecies(v4, v1)) { + if (Pokedex_HasSeenSpecies(pokedex, v1)) { MessageLoader_GetStrbuf(v6, v1, v2); StringTemplate_SetStrbuf(v5, (*param4) + 1, v2, param2, param3, GAME_LANGUAGE); (*param4)++; diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index fee911d308..6a9b5379ed 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -66,7 +66,7 @@ BOOL ScrCmd_255(ScriptContext *param0) PCBoxes *v1 = SaveData_PCBoxes(param0->fieldSystem->saveData); Pokemon *v2 = Pokemon_New(32); TrainerInfo *v3 = SaveData_GetTrainerInfo(param0->fieldSystem->saveData); - Pokedex *v4 = SaveData_Pokedex(param0->fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(param0->fieldSystem->saveData); BOOL v5; int v6; diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index e18e336989..be7707f2d9 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -192,7 +192,7 @@ void sub_02052E58(FieldTask *param0) v5->unk_04.playTime = SaveData_GetPlayTime(fieldSystem->saveData); v5->unk_10.unk_00 = TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)); v5->unk_10.unk_04 = SystemFlag_CheckGameCompleted(v3); - v5->unk_10.unk_08 = SaveData_Pokedex(fieldSystem->saveData); + v5->unk_10.unk_08 = SaveData_GetPokedex(fieldSystem->saveData); if (SystemFlag_CheckGameCompleted(v3) == 0) { sub_02055C2C(fieldSystem); diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 9300be8a49..741f75923b 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -1065,7 +1065,7 @@ static u32 sub_02069130(const UnkStruct_020684D0 *param0) return -1; } - if (PokedexData_IsNationalDexObtained(SaveData_Pokedex(param0->fieldSystem->saveData)) == FALSE) { + if (Pokedex_IsNationalDexObtained(SaveData_GetPokedex(param0->fieldSystem->saveData)) == FALSE) { return -1; } diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index c5c6555f1d..f545a09bfc 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -770,10 +770,10 @@ static int sub_0206D2E0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206D320(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); UnkStruct_0206D140 *v1 = ov6_02246498(param1); - return PokedexData_HasSeenSpecies(v0, v1->unk_06); + return Pokedex_HasSeenSpecies(pokedex, v1->unk_06); } void sub_0206D340(FieldSystem *fieldSystem, BOOL param1, u16 param2, Pokemon *param3) @@ -814,7 +814,7 @@ static BOOL sub_0206D3C0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param return 1; } - return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); + return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00); } static void sub_0206D3E4(FieldSystem *fieldSystem, int param1) @@ -935,7 +935,7 @@ static int sub_0206D5B0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206D5F0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { UnkStruct_0206D5B0 *v0 = (UnkStruct_0206D5B0 *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); + return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206D60C(FieldSystem *fieldSystem, Pokemon *param1) @@ -961,10 +961,10 @@ static int sub_0206D644(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206D6A8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); UnkStruct_0206D644 *v1 = (UnkStruct_0206D644 *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(v0, v1->unk_00); + return Pokedex_HasSeenSpecies(pokedex, v1->unk_00); } void sub_0206D6C8(FieldSystem *fieldSystem, int param1, int param2) @@ -1022,17 +1022,17 @@ static int sub_0206D75C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206D7A4(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - Pokedex *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); UnkStruct_0206D75C *v1 = (UnkStruct_0206D75C *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(v0, v1->unk_00); + return Pokedex_HasSeenSpecies(pokedex, v1->unk_00); } void sub_0206D7C4(FieldSystem *fieldSystem) { u32 v0, v1, v2, v3; u8 v4, v5; - Pokemon *v6; + Pokemon *pokemon; UnkUnion_0206D1B8 v7; Party *v8; UnkStruct_0206D8B0 *v9 = &v7.val11; @@ -1044,10 +1044,10 @@ void sub_0206D7C4(FieldSystem *fieldSystem) v4 = Party_GetCurrentCount(v8); for (v5 = 0; v5 < v4; v5++) { - v6 = Party_GetPokemonBySlotIndex(v8, v5); + pokemon = Party_GetPokemonBySlotIndex(v8, v5); - if (Pokemon_GetValue(v6, MON_DATA_IS_EGG, NULL) == 0) { - v3 = Pokemon_GetValue(v6, MON_DATA_GENDER, NULL); + if (Pokemon_GetValue(pokemon, MON_DATA_IS_EGG, NULL) == 0) { + v3 = Pokemon_GetValue(pokemon, MON_DATA_GENDER, NULL); if (v3 == 0) { v0 = 1; @@ -1061,12 +1061,12 @@ void sub_0206D7C4(FieldSystem *fieldSystem) if (v2 == 0) { if ((v0 == 1) && (v1 == 0)) { - v6 = Party_FindFirstHatchedMon(Party_GetFromSavedata(fieldSystem->saveData)); - sub_0206CE38(v6, &v9->unk_00, &v9->unk_02, &v9->unk_03, &v9->unk_04); + pokemon = Party_FindFirstHatchedMon(Party_GetFromSavedata(fieldSystem->saveData)); + sub_0206CE38(pokemon, &v9->unk_00, &v9->unk_02, &v9->unk_03, &v9->unk_04); sub_0206CD70(fieldSystem, 2, 16, v9); } else if ((v0 == 0) && (v1 == 1)) { - v6 = Party_FindFirstHatchedMon(Party_GetFromSavedata(fieldSystem->saveData)); - sub_0206CE38(v6, &v9->unk_00, &v9->unk_02, &v9->unk_03, &v9->unk_04); + pokemon = Party_FindFirstHatchedMon(Party_GetFromSavedata(fieldSystem->saveData)); + sub_0206CE38(pokemon, &v9->unk_00, &v9->unk_02, &v9->unk_03, &v9->unk_04); sub_0206CD70(fieldSystem, 2, 16, v9); } } @@ -1092,7 +1092,7 @@ static BOOL sub_0206D8F0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { UnkStruct_0206D8B0 *v0 = (UnkStruct_0206D8B0 *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); + return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206D90C(TVBroadcast *fieldSystem, Pokemon *param1, u16 param2) @@ -1171,7 +1171,7 @@ static BOOL sub_0206DA50(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { UnkStruct_0206D9F4 *v0 = (UnkStruct_0206D9F4 *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); + return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00); } static void sub_0206DA6C(UnkStruct_0206DA6C *param0, const TrainerInfo *param1) @@ -1304,7 +1304,7 @@ static BOOL sub_0206DC3C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { UnkStruct_0206DBE8 *v0 = (UnkStruct_0206DBE8 *)ov6_02246498(param1); - if (PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_02) == 0) { + if (Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_02) == 0) { return 0; } @@ -1341,7 +1341,7 @@ static int sub_0206DC9C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206DD1C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { UnkStruct_0206DC9C *v0 = (UnkStruct_0206DC9C *)ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); + return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206DD38(FieldSystem *fieldSystem, u32 param1, u32 param2, u32 param3) @@ -1682,7 +1682,7 @@ static BOOL sub_0206E248(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param { UnkStruct_0206E1C0 *v0 = ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); + return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206E264(FieldSystem *fieldSystem, u16 param1) @@ -1742,7 +1742,7 @@ static int sub_0206E300(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206E37C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { UnkStruct_0206E300 *v0 = ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00.unk_02); + return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00.unk_02); } void sub_0206E398(FieldSystem *fieldSystem, u16 param1) @@ -1776,7 +1776,7 @@ static int sub_0206E3C8(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206E3F8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { UnkStruct_0206E3C8 *v0 = ov6_02246498(param1); - return PokedexData_HasSeenSpecies(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); + return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00); } void sub_0206E414(FieldSystem *fieldSystem, u16 param1) @@ -2754,12 +2754,12 @@ static int sub_0206F01C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr { Strbuf *v0; u16 v1, v2, v3; - const Pokedex *v4 = SaveData_Pokedex(fieldSystem->saveData); + const Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); v1 = (LCRNG_Next() % (NATIONAL_DEX_COUNT - 1)) + 1; for (v2 = 1; v2 <= NATIONAL_DEX_COUNT; v2++) { - if (PokedexData_HasSeenSpecies(v4, v1) == TRUE) { + if (Pokedex_HasSeenSpecies(pokedex, v1) == TRUE) { v3 = v1; break; } @@ -2803,7 +2803,7 @@ static Strbuf *sub_0206F0D8(u16 param0, u32 param1) static BOOL sub_0206F100(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - const Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); + const Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); if (Pokedex_IsObtained(pokedex) == TRUE) { return TRUE; @@ -2846,21 +2846,21 @@ static int sub_0206F160(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr { Strbuf *v0; u16 v1, v2; - Pokemon *v3; - Party *v4; - TrainerInfo *v5 = SaveData_GetTrainerInfo(fieldSystem->saveData); - Pokedex *v6 = SaveData_Pokedex(fieldSystem->saveData); + Pokemon *pokemon; + Party *party; + TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); + Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); - v4 = Party_GetFromSavedata(fieldSystem->saveData); - v3 = Party_GetPokemonBySlotIndex(v4, sub_0205E1B4(fieldSystem->saveData)); + party = Party_GetFromSavedata(fieldSystem->saveData); + pokemon = Party_GetPokemonBySlotIndex(party, sub_0205E1B4(fieldSystem->saveData)); - sub_0206CE74(param1, 0, Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL), Pokemon_GetValue(v3, MON_DATA_GENDER, NULL), TrainerInfo_RegionCode(v5), TrainerInfo_GameCode(v5)); + sub_0206CE74(param1, 0, Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL), Pokemon_GetValue(pokemon, MON_DATA_GENDER, NULL), TrainerInfo_RegionCode(trainerInfo), TrainerInfo_GameCode(trainerInfo)); StringTemplate_SetContestAccessoryName(param1, 1, (LCRNG_Next() % 100)); v1 = (LCRNG_Next() % (NATIONAL_DEX_COUNT - 2) + 1); for (v2 = 1; v2 <= NATIONAL_DEX_COUNT; v2++) { - if (PokedexData_HasSeenSpecies(v6, v1) == TRUE) { + if (Pokedex_HasSeenSpecies(pokedex, v1) == TRUE) { v0 = sub_0206F0D8(v1, 4); StringTemplate_SetStrbuf(param1, 2, v0, 0, 1, GAME_LANGUAGE); Strbuf_Free(v0); @@ -2881,7 +2881,7 @@ static int sub_0206F160(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr static BOOL sub_0206F260(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - const Pokedex *pokedex = SaveData_Pokedex(fieldSystem->saveData); + const Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData); if (Pokedex_IsObtained(pokedex) == TRUE) { return TRUE; diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index f7e7177014..4bdab8e85b 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -46,13 +46,13 @@ static BOOL sub_02072230(FieldTask *param0); void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem *fieldSystem, TrainerCard *param5) { - TrainerInfo *v0; - GameRecords *v1; - SaveData *v2; + TrainerInfo *trainerInfo; + GameRecords *gameRecords; + SaveData *saveData; - v2 = FieldSystem_GetSaveData(fieldSystem); - v0 = SaveData_GetTrainerInfo(v2); - v1 = SaveData_GetGameRecordsPtr(v2); + saveData = FieldSystem_GetSaveData(fieldSystem); + trainerInfo = SaveData_GetTrainerInfo(saveData); + gameRecords = SaveData_GetGameRecordsPtr(saveData); param5->unk_05 = param3; @@ -60,10 +60,10 @@ void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 pa u8 v3; v3 = sub_02071F28(fieldSystem); - sub_02072014(param0, GAME_VERSION, v3, param2, TrainerInfo_RegionCode(v0), param5); + sub_02072014(param0, GAME_VERSION, v3, param2, TrainerInfo_RegionCode(trainerInfo), param5); } - sub_02072038(TrainerInfo_ID_LowHalf(v0), TrainerInfo_Gender(v0), TrainerInfo_Name(v0), TrainerInfo_Money(v0), Pokedex_CountSeen(SaveData_Pokedex(fieldSystem->saveData)), Pokedex_IsObtained(SaveData_Pokedex(fieldSystem->saveData)), GameRecords_GetTrainerScore(v1), param5); + sub_02072038(TrainerInfo_ID_LowHalf(trainerInfo), TrainerInfo_Gender(trainerInfo), TrainerInfo_Name(trainerInfo), TrainerInfo_Money(trainerInfo), Pokedex_CountSeen(SaveData_GetPokedex(fieldSystem->saveData)), Pokedex_IsObtained(SaveData_GetPokedex(fieldSystem->saveData)), GameRecords_GetTrainerScore(gameRecords), param5); { RTCDate v4; @@ -71,7 +71,7 @@ void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 pa RTCTime v6; PlayTime *playTime; - playTime = SaveData_GetPlayTime(v2); + playTime = SaveData_GetPlayTime(saveData); sub_02055BF4(fieldSystem, &v4, &v6); sub_02055C10(fieldSystem, &v5, &v6); @@ -83,15 +83,15 @@ void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 pa UnkStruct_0202C834 *v12; v12 = sub_0202C834(fieldSystem->saveData); - v8 = GameRecords_GetRecordValue(v1, RECORD_UNK_091) + GameRecords_GetRecordValue(v1, RECORD_UNK_019) + GameRecords_GetRecordValue(v1, RECORD_UNK_024) + GameRecords_GetRecordValue(v1, RECORD_UNK_020) + GameRecords_GetRecordValue(v1, RECORD_UNK_025) + GameRecords_GetRecordValue(v1, RECORD_UNK_032); - v9 = GameRecords_GetRecordValue(v1, RECORD_UNK_021) + GameRecords_GetRecordValue(v1, RECORD_UNK_026); - v10 = GameRecords_GetRecordValue(v1, RECORD_UNK_022) + GameRecords_GetRecordValue(v1, RECORD_UNK_027); - v11 = GameRecords_GetRecordValue(v1, RECORD_UNK_019) + GameRecords_GetRecordValue(v1, RECORD_UNK_024); + v8 = GameRecords_GetRecordValue(gameRecords, RECORD_UNK_091) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_019) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_024) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_020) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_025) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_032); + v9 = GameRecords_GetRecordValue(gameRecords, RECORD_UNK_021) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_026); + v10 = GameRecords_GetRecordValue(gameRecords, RECORD_UNK_022) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_027); + v11 = GameRecords_GetRecordValue(gameRecords, RECORD_UNK_019) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_024); sub_02072120(v8, v9, v10, v11, sub_0202C840(v12), param5); } - sub_0207216C(v0, fieldSystem, param5); + sub_0207216C(trainerInfo, fieldSystem, param5); { int v13, v14 = 0; @@ -123,24 +123,24 @@ void sub_02071F20(TrainerCard *param0) u8 sub_02071F28(FieldSystem *fieldSystem) { u8 v0; - SaveData *v1; - GameRecords *v2; - VarsFlags *v3; + SaveData *saveData; + GameRecords *gameRecords; + VarsFlags *varsFlags; SecretBaseRecord *v4; UnkStruct_0203068C *v5; - v1 = FieldSystem_GetSaveData(fieldSystem); - v2 = SaveData_GetGameRecordsPtr(v1); - v3 = SaveData_GetVarsFlags(v1); - v4 = SaveData_SecretBaseRecord(v1); - v5 = sub_0203068C(v1); + saveData = FieldSystem_GetSaveData(fieldSystem); + gameRecords = SaveData_GetGameRecordsPtr(saveData); + varsFlags = SaveData_GetVarsFlags(saveData); + v4 = SaveData_SecretBaseRecord(saveData); + v5 = sub_0203068C(saveData); v0 = 0; - if (SystemFlag_CheckGameCompleted(v3)) { + if (SystemFlag_CheckGameCompleted(varsFlags)) { v0++; } - if (PokedexData_NationalDexCompleted(SaveData_Pokedex(v1))) { + if (Pokedex_NationalDexCompleted(SaveData_GetPokedex(saveData))) { v0++; } @@ -148,7 +148,7 @@ u8 sub_02071F28(FieldSystem *fieldSystem) v0++; } - if (SystemFlag_CheckContestMaster(v3, 0) || SystemFlag_CheckContestMaster(v3, 1) || SystemFlag_CheckContestMaster(v3, 3) || SystemFlag_CheckContestMaster(v3, 4) || SystemFlag_CheckContestMaster(v3, 2)) { + if (SystemFlag_CheckContestMaster(varsFlags, 0) || SystemFlag_CheckContestMaster(varsFlags, 1) || SystemFlag_CheckContestMaster(varsFlags, 3) || SystemFlag_CheckContestMaster(varsFlags, 4) || SystemFlag_CheckContestMaster(varsFlags, 2)) { v0++; } diff --git a/src/unk_0207A274.c b/src/unk_0207A274.c index 64cb36777c..42a5e0f283 100644 --- a/src/unk_0207A274.c +++ b/src/unk_0207A274.c @@ -13,7 +13,7 @@ u32 sub_0207A274(SaveData *param0) { Pokedex *v0; - v0 = SaveData_Pokedex(param0); + v0 = SaveData_GetPokedex(param0); return sub_0207A280(v0); } @@ -21,7 +21,7 @@ u32 sub_0207A280(const Pokedex *param0) { BOOL v0; - v0 = PokedexData_IsNationalDexObtained(param0); + v0 = Pokedex_IsNationalDexObtained(param0); if (v0 == 1) { return 1; diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index f091ab43de..632053ac69 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -409,7 +409,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) case 12: if (Text_IsPrinterActive(param0->unk_65) == 0) { if (--param0->unk_66 == 0) { - PokedexData_Capture(param0->unk_48, param0->unk_28); + Pokedex_Capture(param0->unk_48, param0->unk_28); GameRecords_IncrementRecordValue(param0->records, RECORD_UNK_012); GameRecords_IncrementTrainerScore(param0->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); PoketchData_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(param0->unk_28)); @@ -739,7 +739,7 @@ static void sub_0207C028(UnkStruct_0207AE68 *param0) Pokemon_CalcLevelAndStats(v1); Party_AddPokemon(param0->unk_24, v1); - PokedexData_Capture(param0->unk_48, v1); + Pokedex_Capture(param0->unk_48, v1); GameRecords_IncrementRecordValue(param0->records, RECORD_UNK_012); GameRecords_IncrementTrainerScore(param0->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); PoketchData_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(v1)); diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 36cc16462b..1495fbb08d 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -1623,7 +1623,7 @@ void sub_02094C44(UnkStruct_02095C48 *param0, SaveData *param1, u32 param2, Jour } int i; - Pokedex *pokedex = SaveData_Pokedex(param0->unk_1970); + Pokedex *pokedex = SaveData_GetPokedex(param0->unk_1970); for (i = param0->unk_00.unk_117; i < 4; i++) { Pokedex_Encounter(pokedex, param0->unk_00.unk_00[i]); diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index 3874a15788..91cb5a4a24 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -33,19 +33,19 @@ struct UnkStruct_0209747C_t { u16 unk_20[2]; }; -UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *param2, u32 param3) +UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, u32 param3) { UnkStruct_0209747C *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_0209747C)); v0->unk_00 = param0; v0->unk_01 = param1; - v0->unk_0C = SaveData_Pokedex(param2); - v0->unk_10 = sub_02014EC4(param2); - v0->unk_04 = SystemFlag_CheckGameCompleted(SaveData_GetVarsFlags(param2)); + v0->unk_0C = SaveData_GetPokedex(saveData); + v0->unk_10 = sub_02014EC4(saveData); + v0->unk_04 = SystemFlag_CheckGameCompleted(SaveData_GetVarsFlags(saveData)); v0->unk_05 = 0; v0->unk_02 = 1; v0->unk_03 = 0; - v0->unk_08 = Options_Frame(SaveData_Options(param2)); + v0->unk_08 = Options_Frame(SaveData_Options(saveData)); if (param0 == 2) { sub_02014A9C(&v0->unk_14, 3); diff --git a/src/unk_020998EC.c b/src/unk_020998EC.c index a85759b878..177f39f02b 100644 --- a/src/unk_020998EC.c +++ b/src/unk_020998EC.c @@ -3229,14 +3229,14 @@ static inline BOOL inline_02099BF4(const UnkStruct_020998EC *param0, u32 param1) static u32 sub_02099980(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3) { - const Pokedex *v0; + const Pokedex *pokedex; u32 v1, v2; v2 = 0; - v0 = sub_0209755C(param0->unk_00); + pokedex = sub_0209755C(param0->unk_00); for (v1 = 0; v1 < param2; v1++) { - if (PokedexData_HasSeenSpecies(v0, param1[v1])) { + if (Pokedex_HasSeenSpecies(pokedex, param1[v1])) { inline_02099980(param0, param1[v1]); *param3++ = param1[v1]; v2++; diff --git a/tools/scripts/make_pokedex_data.py b/tools/scripts/make_pokedex_data.py index 8b3b9ef13c..c354d12b76 100644 --- a/tools/scripts/make_pokedex_data.py +++ b/tools/scripts/make_pokedex_data.py @@ -114,8 +114,8 @@ def DataSize(num): # sinnoh dex order with open(source_dir / 'sinnoh_pokedex.json') as data_file: - dexData = json.load(data_file) - for mon in dexData: + pokedex = json.load(data_file) + for mon in pokedex: if mon not in ['SPECIES_EGG', 'SPECIES_BAD_EGG', 'SPECIES_NONE', 'SPECIES_ARCEUS']: binData[12] = binData[12] + PokemonSpecies[mon].value.to_bytes(2, 'little') From 69425c07e7a274f7eb8f36cd71e3a1ca9f7d96a8 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Tue, 14 Jan 2025 08:17:01 -0500 Subject: [PATCH 21/28] run make format --- include/constants/battle.h | 10 +++++----- src/battle/ov16_0223B140.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/constants/battle.h b/include/constants/battle.h index 14c32faf56..daf5c43152 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -100,11 +100,11 @@ enum BattlerBootState { * * PLAYER_SLOT_1 PLAYER_SLOT_2 */ -#define BATTLER_PLAYER_1 0 -#define BATTLER_ENEMY_1 1 -#define BATTLER_PLAYER_2 2 -#define BATTLER_ENEMY_2 3 -#define BATTLER_NONE 0xFF +#define BATTLER_PLAYER_1 0 +#define BATTLER_ENEMY_1 1 +#define BATTLER_PLAYER_2 2 +#define BATTLER_ENEMY_2 3 +#define BATTLER_NONE 0xFF #define BATTLER_TYPE_SOLO_PLAYER 0 #define BATTLER_TYPE_SOLO_ENEMY 1 diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index f7695bedbe..8da3eab2b5 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -727,7 +727,7 @@ static void ov16_0223BCB4(OverlayManager *param0) TrainerInfo_Copy(battleSystem->trainerInfo[battlerId], v1->trainerInfo[battlerId]); Heap_FreeToHeap(battleSystem->trainerInfo[battlerId]); } - + sub_02015760(battleSystem->unk_1AC); Bag_Copy(battleSystem->unk_58, v1->bag); Heap_FreeToHeap(battleSystem->unk_58); From 56a10c5e31fc43d5f6f91b726a86f0c8606b6222 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 15 Jan 2025 08:47:57 -0800 Subject: [PATCH 22/28] Use a struct for PalParkSpecies instead of a raw u8 buffer --- src/catching_show.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/catching_show.c b/src/catching_show.c index d85ecedd35..756ac86b1c 100644 --- a/src/catching_show.c +++ b/src/catching_show.c @@ -26,18 +26,18 @@ #define PAL_PARK_AREA_NONE 0 #define POINTS_LOST_PER_SECOND 2 -#define BYTES_PER_SPECIES 6 #define WEIGHT_NO_ENCOUNTER 20 #define DISTINCT_TYPE_BONUS 50 #define DIFFERENT_TYPE_BONUS 200 #define MAX_TIME_SECONDS 1000 -enum PAL_PARK_SPECIES_DATA_INDEXES { - SPECIES_DATA_LAND_AREA = 0, - SPECIES_DATA_WATER_AREA, - SPECIES_DATA_CATCHING_POINTS, - SPECIES_DATA_RARITY, -}; +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); @@ -119,19 +119,19 @@ int CatchingShow_GetTypePoints(FieldSystem *fieldSystem) return CalculateTypePoints(&sCatchingShow); } -static void BufferSpeciesData(u32 species, u8 *speciesDataArray) +static void BufferSpeciesData(u32 species, PalParkSpecies *speciesData) { GF_ASSERT(0 < species && species <= NATIONAL_DEX_COUNT); - int speciesOffset = (species - 1) * BYTES_PER_SPECIES; + int speciesOffset = (species - 1) * sizeof(PalParkSpecies); - NARC_ReadFromMemberByIndexPair(speciesDataArray, NARC_INDEX_ARC__PPARK, 0, speciesOffset, sizeof(u8) * BYTES_PER_SPECIES); + NARC_ReadFromMemberByIndexPair(speciesData, NARC_INDEX_ARC__PPARK, 0, speciesOffset, sizeof(PalParkSpecies)); } static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow) { int i; - u8 speciesData[8]; + PalParkSpecies speciesData; u16 monSpecies; PalParkTransfer *v4 = SaveData_PalParkTransfer(fieldSystem->saveData); Pokemon *mon = Pokemon_New(HEAP_ID_FIELD); @@ -143,16 +143,16 @@ static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); catchingShow->pokemon[i].species = monSpecies; - BufferSpeciesData(monSpecies, speciesData); + BufferSpeciesData(monSpecies, &speciesData); - if (speciesData[SPECIES_DATA_LAND_AREA] != 0) { - catchingShow->pokemon[i].area = speciesData[SPECIES_DATA_LAND_AREA]; + if (speciesData.landArea != 0) { + catchingShow->pokemon[i].area = speciesData.landArea; } else { - catchingShow->pokemon[i].area = PAL_PARK_AREA_LAND_END - 1 + speciesData[SPECIES_DATA_WATER_AREA]; + catchingShow->pokemon[i].area = PAL_PARK_AREA_LAND_END - 1 + speciesData.waterArea; } - catchingShow->pokemon[i].rarity = speciesData[SPECIES_DATA_RARITY]; - catchingShow->pokemon[i].catchingPoints = speciesData[SPECIES_DATA_CATCHING_POINTS]; + 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); } From b36df89104a9db48382bdd166f91281e7f533dc6 Mon Sep 17 00:00:00 2001 From: DylanDoesProgramming <120761889+DylanDoesProgramming664@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:46:21 +0000 Subject: [PATCH 23/28] MON_NAME_LENGTH & TRTRAINENAME_LENGTH discoverie --- docs/index.md | 4 ---- docs/mods/fast_guage.md | 18 ------------------ src/overlay006/ov6_022489E4.c | 2 +- src/overlay013/ov13_02227288.c | 2 +- src/overlay043/ov43_02256544.c | 2 +- src/overlay062/ov62_02248408.c | 6 +++--- src/unk_020298BC.c | 2 +- src/unk_0202DF8C.c | 6 +++--- src/unk_0204AEE8.c | 2 +- 9 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 docs/mods/fast_guage.md diff --git a/docs/index.md b/docs/index.md index c981ba9316..f098ee72ed 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,3 @@ For more detailed information about the project as a whole, please refer to its - [2D Graphics](2d_rendering.md) - [3D Graphics](3d_rendering.md) - -## Mods - -- [Fast Guage](mods/fast_guage.md) \ No newline at end of file diff --git a/docs/mods/fast_guage.md b/docs/mods/fast_guage.md deleted file mode 100644 index 1e66f2c65a..0000000000 --- a/docs/mods/fast_guage.md +++ /dev/null @@ -1,18 +0,0 @@ -# Fast Guage - -This is a quick tutorial on how to modify the guage of exp and health bars of Plat so that the bar visually updates in subpixels per second instead of points per second. - -This mod is a backport of the healthbar fix made by the contributors of [pret/pokeheartgold](https://github.com/pret/pokeheartgold) for the heartgold/soulsilver decomp. - -Fixes are written in the `diff` format, as mentioned in [Bugs and Glitches](../bugs_and_glitches.md). - -## Edit - -1. Go to [/src/battle/healthbar.c](/src/battle/healthbar.c) -2. Go to the ``UpdateGuage`` function. -3. Edit the function like so: -```diff -if (max < corrected) { -- ratio = max * 0x100 / corrected; -+ ratio = (max >> 8) / corrected; -``` \ No newline at end of file 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/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/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 000c2dadd0..f509e41a88 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->trainerData[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->trainerData[v4].name, 8); + Strbuf_ToChars(v7, param1->trainerData[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->trainerData[v4].name, 8); + Strbuf_ToChars(v7, param1->trainerData[v4].name, TRAINER_NAME_LEN + 1); continue; } } 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 a92dd87db8..7f25938b6b 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); From 3cd9699165c709b5ab3243072f03da9f4061883e Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Fri, 17 Jan 2025 18:00:54 +0100 Subject: [PATCH 24/28] Renaming functions and data + rearranging if statements --- include/map_object.h | 4 +-- src/comm_player_manager.c | 2 +- src/map_object.c | 6 ++--- src/map_object_move.c | 51 +++++++++++++++++++++-------------- src/overlay009/ov9_02249960.c | 4 +-- src/player_avatar.c | 4 +-- src/scrcmd.c | 2 +- src/unk_0205C22C.c | 2 +- 8 files changed, 43 insertions(+), 32 deletions(-) diff --git a/include/map_object.h b/include/map_object.h index eaefa7223e..7a8d78858f 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -281,8 +281,8 @@ int ObjectEvent_GetY(const ObjectEvent *objectEvent); void ObjectEvent_SetZ(ObjectEvent *objectEvent, int z); int ObjectEvent_GetZ(const ObjectEvent *objectEvent); MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3); -void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2); -void MapObject_SetPosDir(MapObject *mapObj, int x, int y, int z, int dir); +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); diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index d8dc53893d..b97c41cf7a 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -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/map_object.c b/src/map_object.c index 1bc5cf55fa..bbb3e033c6 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -2429,7 +2429,7 @@ MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int par return NULL; } -void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2) +void MapObject_SetPosDirFromVec(MapObject *mapObj, const VecFx32 *pos, int dir) { int x, y, z; @@ -2445,14 +2445,14 @@ void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2) 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 x, int y, int z, int dir) +void MapObject_SetPosDirFromCoords(MapObject *mapObj, int x, int y, int z, int dir) { VecFx32 pos; diff --git a/src/map_object_move.c b/src/map_object_move.c index 568b196017..9933f2d224 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -385,10 +385,14 @@ static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha return; } - 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 + 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 { @@ -411,10 +415,14 @@ static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha return; } - 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 + 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 { @@ -424,9 +432,12 @@ static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha static void sub_02063BB4(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - 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) { + 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; } @@ -796,13 +807,13 @@ int MapObject_IsOnBikeBridgeEastWest(MapObject *mapObj, u32 tileBehavior) } 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, @@ -810,10 +821,10 @@ static const int DATA_GPosY_Dir4AddTbl[] = { }; static const int sMapObjectDzDir[] = { - -1, - 0x1, - 0x0, - 0x0 + [DIR_NORTH] = -1, + [DIR_SOUTH] = 1, + [DIR_WEST] = 0, + [DIR_EAST] = 0 }; int MapObject_GetDxFromDir(int dir) diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index fe0c96f456..f6ebe4cda9 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -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); @@ -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); { 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 6dace8745a..94614742e6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -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_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); From 189877ae13b92d320b2083f8974afac21ead9bb6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 17 Jan 2025 15:17:02 -0800 Subject: [PATCH 25/28] Update INSTALL.md Some updates to the install docs while assisting some new contributors with installation. --- INSTALL.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 8216e4d66b..2f46920c86 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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 ``` From 992d32bdac7363b1226214d627bd5a68f3233eb4 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Fri, 17 Jan 2025 23:22:10 -0500 Subject: [PATCH 26/28] Requested changes --- asm/macros/scrcmd.inc | 6 +- include/field_battle_data_transfer.h | 2 +- include/overlay025/poketch_system.h | 2 +- include/{pokedex_data.h => pokedex.h} | 6 +- include/{poketch_data.h => poketch.h} | 64 +++++++++---------- include/struct_defs/battle_system.h | 2 +- include/struct_defs/struct_0207AE68_t.h | 2 +- include/unk_0206AFE0.h | 2 +- include/unk_0207AE68.h | 2 +- platinum.us/main.lsf | 4 +- .../scripts/scripts_pokemon_mansion_office.s | 2 +- src/battle/ov16_0223B140.c | 2 +- src/battle/ov16_0223DF00.c | 6 +- src/field_battle_data_transfer.c | 6 +- src/field_menu.c | 4 +- src/game_records.c | 2 +- src/meson.build | 4 +- src/overlay005/ov5_021DDAE4.c | 4 +- src/overlay005/ov5_021EA714.c | 8 +-- src/overlay005/ov5_021F6454.c | 2 +- src/overlay005/ov5_021F77A8.c | 2 +- src/overlay005/save_info_window.c | 2 +- src/overlay006/ov6_02240C9C.c | 2 +- src/overlay006/ov6_02242984.c | 2 +- src/overlay006/ov6_02246A30.c | 2 +- src/overlay021/ov21_021D0D80.c | 2 +- src/overlay021/pokedex_sort.c | 2 +- src/overlay023/ov23_0223E140.c | 2 +- src/overlay023/ov23_022521F0.c | 2 +- src/overlay025/ov25_02254560.c | 10 +-- src/overlay025/poketch_system.c | 16 ++--- src/overlay028/ov28_022561C0.c | 2 +- src/overlay031/ov31_022561C0.c | 8 +-- src/overlay036/ov36_022561C0.c | 8 +-- src/overlay045/ov45_022561C0.c | 8 +-- src/overlay047/ov47_022561C0.c | 6 +- src/overlay049/ov49_022561C0.c | 6 +- src/overlay050/ov50_022561C0.c | 10 +-- src/overlay054/ov54_022561C0.c | 8 +-- src/overlay062/ov62_02237D24.c | 2 +- src/overlay062/ov62_02241204.c | 2 +- src/overlay065/ov65_0222DCE0.c | 2 +- src/overlay066/ov66_0222DDF0.c | 2 +- src/overlay094/ov94_022414B8.c | 2 +- src/overlay094/ov94_022444C8.c | 2 +- src/overlay097/ov97_0222AE60.c | 2 +- src/overlay097/ov97_0222C174.c | 2 +- src/overlay118/ov118_021D0D80.c | 2 +- src/{pokedex_data.c => pokedex.c} | 2 +- src/{poketch_data.c => poketch.c} | 58 ++++++++--------- src/savedata/save_table.c | 4 +- src/scrcmd.c | 10 +-- src/scrcmd_system_flags.c | 2 +- src/unk_0202F180.c | 6 +- src/unk_0202F1D4.c | 2 +- src/unk_0203D1B8.c | 4 +- src/unk_02046C7C.c | 2 +- src/unk_020474B8.c | 4 +- src/unk_02048DD8.c | 4 +- src/unk_0204AEE8.c | 2 +- src/unk_0204B830.c | 6 +- src/unk_0204C500.c | 2 +- src/unk_02052C6C.c | 2 +- src/unk_020683F4.c | 2 +- src/unk_0206AFE0.c | 4 +- src/unk_0206CCB0.c | 2 +- src/unk_02071D40.c | 2 +- src/unk_0207A274.c | 2 +- src/unk_0207AE68.c | 8 +-- src/unk_020933F8.c | 2 +- src/unk_0209747C.c | 2 +- src/unk_020998EC.c | 2 +- 72 files changed, 193 insertions(+), 193 deletions(-) rename include/{pokedex_data.h => pokedex.h} (95%) rename include/{poketch_data.h => poketch.h} (65%) rename src/{pokedex_data.c => pokedex.c} (99%) rename src/{poketch_data.c => poketch.c} (75%) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 9f52354040..7cb9c1f90a 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -4475,10 +4475,10 @@ .short \arg0 .endm - .macro ScrCmd_HasSeenSpecies arg0, arg1 + .macro has_seen_species species, ret .short 823 - .short \arg0 - .short \arg1 + .short \species + .short \ret .endm .macro ScrCmd_338 diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h index 81ffcf9cf1..2df30e0455 100644 --- a/include/field_battle_data_transfer.h +++ b/include/field_battle_data_transfer.h @@ -19,7 +19,7 @@ #include "game_options.h" #include "game_records.h" #include "journal.h" -#include "poketch_data.h" +#include "poketch.h" #include "rtc.h" #include "savedata.h" #include "trainer_info.h" diff --git a/include/overlay025/poketch_system.h b/include/overlay025/poketch_system.h index 4db20f8487..07ff9d237c 100644 --- a/include/overlay025/poketch_system.h +++ b/include/overlay025/poketch_system.h @@ -9,7 +9,7 @@ #include "overlay025/struct_ov25_02254560_decl.h" #include "bg_window.h" -#include "poketch_data.h" +#include "poketch.h" #include "savedata.h" #include "sys_task_manager.h" diff --git a/include/pokedex_data.h b/include/pokedex.h similarity index 95% rename from include/pokedex_data.h rename to include/pokedex.h index 983b556deb..d79250d79c 100644 --- a/include/pokedex_data.h +++ b/include/pokedex.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_POKEDEX_DATA_H -#define POKEPLATINUM_POKEDEX_DATA_H +#ifndef POKEPLATINUM_POKEDEX_H +#define POKEPLATINUM_POKEDEX_H #include "struct_decls/pokedexdata_decl.h" @@ -50,4 +50,4 @@ Pokedex *SaveData_GetPokedex(SaveData *saveData); u32 Pokedex_GetDisplayForm(const Pokedex *pokedex, int species, int formIndex); u32 Pokedex_NumFormsSeen(const Pokedex *pokedex, int species); -#endif // POKEPLATINUM_POKEDEX_DATA_H +#endif // POKEPLATINUM_POKEDEX_H diff --git a/include/poketch_data.h b/include/poketch.h similarity index 65% rename from include/poketch_data.h rename to include/poketch.h index 7732f564a7..c1b9247f82 100644 --- a/include/poketch_data.h +++ b/include/poketch.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_POKETCH_DATA_H -#define POKEPLATINUM_POKETCH_DATA_H +#ifndef POKEPLATINUM_POKETCH_H +#define POKEPLATINUM_POKETCH_H #include "consts/poketch.h" @@ -11,7 +11,7 @@ #define POKETCH_REGISTRY_SIZE 32 #define POKETCH_DOTART_SIZE_BYTES 120 -/** Poketch Screen colors, used in PoketchData_SetScreenColor */ +/** Poketch Screen colors, used in Poketch_SetScreenColor */ enum PoketchScreenColor { POKETCH_SCREEN_COLOR_GREEN = 0, POKETCH_SCREEN_COLOR_YELLOW, @@ -37,7 +37,7 @@ typedef struct Poketch { s8 appCount; //!< Number of currently registered apps s8 appIndex; //!< Currently selected app - u8 appRegistry[POKETCH_REGISTRY_SIZE]; //!< Registration status of all apps. Indices 0-24 correspond to the App IDs in poketch_data.h. Indices 25-31 are unused. + u8 appRegistry[POKETCH_REGISTRY_SIZE]; //!< Registration status of all apps. Indices 0-24 correspond to the App IDs in poketch.h. Indices 25-31 are unused. u32 stepCount; @@ -73,100 +73,100 @@ int Poketch_SaveSize(void); void Poketch_Init(Poketch *poketch); -void PoketchData_Enable(Poketch *poketch); +void Poketch_Enable(Poketch *poketch); -BOOL PoketchData_IsEnabled(Poketch *poketch); +BOOL Poketch_IsEnabled(Poketch *poketch); -BOOL PoketchData_IsAppRegistered(Poketch *poketch, enum PoketchAppID appID); +BOOL Poketch_IsAppRegistered(Poketch *poketch, enum PoketchAppID appID); -BOOL PoketchData_RegisterApp(Poketch *poketch, enum PoketchAppID appID); +BOOL Poketch_RegisterApp(Poketch *poketch, enum PoketchAppID appID); -enum PoketchAppID PoketchData_CurrentAppID(const Poketch *poketch); +enum PoketchAppID Poketch_CurrentAppID(const Poketch *poketch); /** * Sets the current Poketch app to the next registered app, skipping unregistered App IDs and wrapping around if necessary. */ -int PoketchData_IncrementAppID(Poketch *poketch); +int Poketch_IncrementAppID(Poketch *poketch); /** * Sets the current Poketch app to the previous registered app, skipping unregistered App IDs and wrapping around if necessary. */ -int PoketchData_DecrementAppID(Poketch *poketch); +int Poketch_DecrementAppID(Poketch *poketch); -u32 PoketchData_CurrentScreenColor(const Poketch *poketch); +u32 Poketch_CurrentScreenColor(const Poketch *poketch); /** * Sets the Poketch's color setting with values from the PoketchScreenColor enum above. * This function asserts that the given value is less than POKETCH_SCREEN_COLOR_MAX. */ -void PoketchData_SetScreenColor(Poketch *poketch, u32 screenColor); +void Poketch_SetScreenColor(Poketch *poketch, u32 screenColor); -u32 PoketchData_StepCount(const Poketch *poketch); +u32 Poketch_StepCount(const Poketch *poketch); /** * Overwrites the current step count. This function will not do anything unless the Pedometer app is registered. */ -void PoketchData_SetStepCount(Poketch *poketch, u32 value); +void Poketch_SetStepCount(Poketch *poketch, u32 value); -BOOL PoketchData_IsAlarmSet(const Poketch *poketch); +BOOL Poketch_IsAlarmSet(const Poketch *poketch); -void PoketchData_AlarmTime(const Poketch *poketch, u32 *hour, u32 *minute); +void Poketch_AlarmTime(const Poketch *poketch, u32 *hour, u32 *minute); -void PoketchData_SetAlarm(Poketch *poketch, BOOL enabled, u32 hour, u32 minute); +void Poketch_SetAlarm(Poketch *poketch, BOOL enabled, u32 hour, u32 minute); /** * Marks the given date on the Calendar app as highlighted. * Passing this function a new month will change the month on the calendar and clear all days except the given one. */ -void PoketchData_SetCalendarMark(Poketch *poketch, u32 month, u32 day); +void Poketch_SetCalendarMark(Poketch *poketch, u32 month, u32 day); /** * Clears the mark on the given date on the Calendar app. * Passing this function a new month will change the month on the calendar and clear every day. */ -void PoketchData_ClearCalendarMark(Poketch *poketch, u32 month, u32 day); +void Poketch_ClearCalendarMark(Poketch *poketch, u32 month, u32 day); -BOOL PoketchData_CalendarMarked(const Poketch *poketch, u32 month, u32 day); +BOOL Poketch_CalendarMarked(const Poketch *poketch, u32 month, u32 day); /** * Sets the location of a map marker. Asserts that index is less than POKETCH_MAPMARKER_COUNT. */ -void PoketchData_SetMapMarker(Poketch *poketch, int index, u8 x, u8 y); +void Poketch_SetMapMarker(Poketch *poketch, int index, u8 x, u8 y); /** * Gets the location of a map marker. Asserts that index is less than POKETCH_MAPMARKER_COUNT. */ -void PoketchData_MapMarkerPos(const Poketch *poketch, int index, u8 *x, u8 *y); +void Poketch_MapMarkerPos(const Poketch *poketch, int index, u8 *x, u8 *y); /** * Checks whether or not the Dot Art data has been modified at any point. - * This will return FALSE until PoketchData_ModifyDotArtData is called, at which point it will always return TRUE. + * This will return FALSE until Poketch_ModifyDotArtData is called, at which point it will always return TRUE. */ -BOOL PoketchData_DotArtModified(const Poketch *poketch); +BOOL Poketch_DotArtModified(const Poketch *poketch); -void PoketchData_CopyDotArtData(const Poketch *poketch, u8 *dst); +void Poketch_CopyDotArtData(const Poketch *poketch, u8 *dst); -void PoketchData_ModifyDotArtData(Poketch *poketch, const u8 *src); +void Poketch_ModifyDotArtData(Poketch *poketch, const u8 *src); /** * Adds a new Pokemon to the end of the Pokemon History list. */ -void PoketchData_PokemonHistoryEnqueue(Poketch *poketch, const BoxPokemon *boxPokemon); +void Poketch_PokemonHistoryEnqueue(Poketch *poketch, const BoxPokemon *boxPokemon); -int PoketchData_PokemonHistorySize(const Poketch *poketch); +int Poketch_PokemonHistorySize(const Poketch *poketch); /** * Gets the species and icon info of a given index in the Pokemon History. * This function asserts that index is less than POKETCH_POKEMONHISTORY_MAX. */ -void PoketchData_PokemonHistorySpeciesAndIcon(const Poketch *poketch, int index, int *species, int *icon); +void Poketch_PokemonHistorySpeciesAndIcon(const Poketch *poketch, int index, int *species, int *icon); /** * Gets the form info of a given index in the pokemon history. * This function asserts that index is less than POKETCH_POKEMONHISTORY_MAX. */ -u32 PoketchData_PokemonHistoryForm(const Poketch *poketch, int index); +u32 Poketch_PokemonHistoryForm(const Poketch *poketch, int index); Poketch *SaveData_PoketchData(SaveData *saveData); -#endif // POKEPLATINUM_POKETCH_DATA_H +#endif // POKEPLATINUM_POKETCH_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 732c7e52f6..2fd126e640 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -35,7 +35,7 @@ #include "game_options.h" #include "message.h" #include "palette.h" -#include "poketch_data.h" +#include "poketch.h" #include "strbuf.h" #include "string_template.h" #include "sys_task_manager.h" diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index 4d1fe2d840..ab24e5aa49 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -20,7 +20,7 @@ #include "overlay_manager.h" #include "palette.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/unk_0206AFE0.h b/include/unk_0206AFE0.h index 52a93c4818..dd732534e2 100644 --- a/include/unk_0206AFE0.h +++ b/include/unk_0206AFE0.h @@ -16,7 +16,7 @@ u16 sub_0206B034(VarsFlags *varsFlags); BOOL sub_0206B044(VarsFlags *varsFlags, u16 param1); u16 sub_0206B054(VarsFlags *varsFlags); u16 sub_0206B064(VarsFlags *varsFlags); -u16 VarsFlags_GetProfessorAssistantStarterSpecies(VarsFlags *varsFlags); +u16 VarsFlags_GetPlayerCounterpartStarterSpecies(VarsFlags *varsFlags); u16 sub_0206B0B4(VarsFlags *varsFlags); BOOL sub_0206B0C4(VarsFlags *varsFlags, u16 param1); void VsSeeker_Reset(VarsFlags *varsFlags); diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h index f68be04d1e..d1d27c7ffd 100644 --- a/include/unk_0207AE68.h +++ b/include/unk_0207AE68.h @@ -9,7 +9,7 @@ #include "game_options.h" #include "game_records.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, Pokedex *param5, Bag *param6, GameRecords *records, Poketch *poketch, int param9, int param10, int param11); BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index bc91520794..7bfad6c8a2 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -109,7 +109,7 @@ Static main Object main.nef.p/src_unk_0202602C.c.o Object main.nef.p/src_unk_02026150.c.o Object main.nef.p/src_unk_020261E4.c.o - Object main.nef.p/src_pokedex_data.c.o + Object main.nef.p/src_pokedex.c.o Object main.nef.p/src_savedata_misc.c.o Object main.nef.p/src_game_options.c.o Object main.nef.p/src_berry_patches.c.o @@ -233,7 +233,7 @@ Static main Object main.nef.p/src_unk_020559DC.c.o Object main.nef.p/src_unk_02055C50.c.o Object main.nef.p/src_catching_show.c.o - Object main.nef.p/src_poketch_data.c.o + Object main.nef.p/src_poketch.c.o Object main.nef.p/src_unk_02056B30.c.o Object main.nef.p/src_unk_020573FC.c.o Object main.nef.p/src_unk_0205749C.c.o diff --git a/res/field/scripts/scripts_pokemon_mansion_office.s b/res/field/scripts/scripts_pokemon_mansion_office.s index 4a477656dc..c8364d7538 100644 --- a/res/field/scripts/scripts_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_pokemon_mansion_office.s @@ -305,7 +305,7 @@ _0399: _03C2: Message 20 GoToIfSet 251, _0408 - ScrCmd_HasSeenSpecies SPECIES_MANAPHY, 0x800C + has_seen_species SPECIES_MANAPHY, 0x800C GoToIfEq 0x800C, 1, _03FC ScrCmd_208 SPECIES_MANAPHY, 0 WaitABPress diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 8da3eab2b5..0073b03b84 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -56,7 +56,7 @@ #include "overlay_manager.h" #include "palette.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "render_text.h" #include "render_window.h" diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index ee2b52a75a..e6962917d0 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -57,9 +57,9 @@ #include "message.h" #include "palette.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "render_text.h" #include "strbuf.h" #include "string_template.h" @@ -1116,7 +1116,7 @@ void ov16_0223EF2C(BattleSystem *battleSystem, int param1, int param2) void ov16_0223EF48(BattleSystem *battleSystem, Pokemon *param1) { if (battleSystem->poketch) { - PoketchData_PokemonHistoryEnqueue(battleSystem->poketch, Pokemon_GetBoxPokemon(param1)); + Poketch_PokemonHistoryEnqueue(battleSystem->poketch, Pokemon_GetBoxPokemon(param1)); } } diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index e78642fe93..456a7dd29c 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -39,9 +39,9 @@ #include "message.h" #include "party.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "rtc.h" #include "save_player.h" #include "savedata.h" @@ -171,7 +171,7 @@ FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapId heapID, const Fie Bag_TryAddItem(dto->bag, ITEM_POKE_BALL, 20, heapID); mon = Pokemon_New(heapID); - Pokemon_InitWith(mon, VarsFlags_GetProfessorAssistantStarterSpecies(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, 32, FALSE, 0, OTID_NOT_SHINY, 0); + Pokemon_InitWith(mon, VarsFlags_GetPlayerCounterpartStarterSpecies(SaveData_GetVarsFlags(fieldSystem->saveData)), 5, 32, FALSE, 0, OTID_NOT_SHINY, 0); Party_AddPokemon(dto->parties[BATTLER_PLAYER_1], mon); Pokemon_InitWith(mon, SPECIES_BIDOOF, 2, 32, FALSE, 0, OTID_NOT_SHINY, 0); Party_AddPokemon(dto->parties[BATTLER_ENEMY_1], mon); diff --git a/src/field_menu.c b/src/field_menu.c index 454dd1a594..ff732513b7 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -53,9 +53,9 @@ #include "narc.h" #include "party.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "render_window.h" #include "save_player.h" #include "savedata.h" diff --git a/src/game_records.c b/src/game_records.c index 095d20beee..415c46f134 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -4,7 +4,7 @@ #include "game_records.h" #include "math.h" -#include "pokedex_data.h" +#include "pokedex.h" #define START_ENCODED_RECORDS RECORD_TRAINER_SCORE #define SIZE_ENCODED_RECORDS (sizeof(GameRecords) - sizeof(EncodingSeed) - (START_ENCODED_RECORDS * sizeof(u32))) diff --git a/src/meson.build b/src/meson.build index 7df5287087..bf82051252 100644 --- a/src/meson.build +++ b/src/meson.build @@ -101,7 +101,7 @@ pokeplatinum_c = files( 'unk_0202602C.c', 'unk_02026150.c', 'unk_020261E4.c', - 'pokedex_data.c', + 'pokedex.c', 'savedata_misc.c', 'game_options.c', 'berry_patches.c', @@ -221,7 +221,7 @@ pokeplatinum_c = files( 'unk_020559DC.c', 'unk_02055C50.c', 'catching_show.c', - 'poketch_data.c', + 'poketch.c', 'unk_02056B30.c', 'unk_020573FC.c', 'unk_0205749C.c', diff --git a/src/overlay005/ov5_021DDAE4.c b/src/overlay005/ov5_021DDAE4.c index d70f265615..fd81d2b944 100644 --- a/src/overlay005/ov5_021DDAE4.c +++ b/src/overlay005/ov5_021DDAE4.c @@ -11,7 +11,7 @@ #include "field_task.h" #include "game_overlay.h" #include "heap.h" -#include "poketch_data.h" +#include "poketch.h" #include "unk_0200A784.h" #include "unk_0200A9DC.h" @@ -44,7 +44,7 @@ static BOOL ov5_021DDAE4(FieldTask *param0) Overlay_UnloadByID(FS_OVERLAY_ID(overlay24)); Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2); - PoketchData_Enable(poketch); + Poketch_Enable(poketch); PoketchSystem_Create(fieldSystem, &fieldSystem->unk_04->poketchSys, fieldSystem->saveData, fieldSystem->bgConfig, sub_0200A914(1)); v1->unk_00++; } diff --git a/src/overlay005/ov5_021EA714.c b/src/overlay005/ov5_021EA714.c index c84d1fb3f3..52aa2b1d7a 100644 --- a/src/overlay005/ov5_021EA714.c +++ b/src/overlay005/ov5_021EA714.c @@ -8,7 +8,7 @@ #include "overlay024/ov24_02253CE0.h" #include "game_overlay.h" -#include "poketch_data.h" +#include "poketch.h" #include "system_flags.h" #include "unk_0200A784.h" #include "vars_flags.h" @@ -28,7 +28,7 @@ void ov5_021EA728(FieldSystem *fieldSystem) Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(poketch) + if (Poketch_IsEnabled(poketch) && (SystemFlag_CheckPoketchHidden(varsFlags) == 0)) { Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2); PoketchSystem_Create(fieldSystem, &fieldSystem->unk_04->poketchSys, fieldSystem->saveData, fieldSystem->bgConfig, sub_0200A914(1)); @@ -43,7 +43,7 @@ void ov5_021EA790(FieldSystem *fieldSystem) Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(poketch) + if (Poketch_IsEnabled(poketch) && (SystemFlag_CheckPoketchHidden(varsFlags) == 0)) { PoketchSystem_StartShutdown(fieldSystem->unk_04->poketchSys); } else { @@ -56,7 +56,7 @@ u8 ov5_021EA7CC(FieldSystem *fieldSystem) Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - if (PoketchData_IsEnabled(poketch) + if (Poketch_IsEnabled(poketch) && (SystemFlag_CheckPoketchHidden(varsFlags) == 0)) { if (PoketchSystem_IsSystemShutdown(fieldSystem->unk_04->poketchSys)) { fieldSystem->unk_04->poketchSys = NULL; diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index fe5accd9c3..d6c2b659a2 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -34,7 +34,7 @@ #include "narc.h" #include "party.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "render_window.h" #include "savedata_misc.h" diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 53ed8032e0..9e3a8497a2 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -20,7 +20,7 @@ #include "list_menu.h" #include "message.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "render_window.h" #include "script_manager.h" diff --git a/src/overlay005/save_info_window.c b/src/overlay005/save_info_window.c index 2a3baa25dd..fe9a396f8f 100644 --- a/src/overlay005/save_info_window.c +++ b/src/overlay005/save_info_window.c @@ -21,7 +21,7 @@ #include "map_header.h" #include "message_util.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "render_window.h" #include "save_player.h" #include "savedata.h" diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index 73f11fc93f..c8020b8623 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -40,7 +40,7 @@ #include "narc.h" #include "party.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "pokeradar.h" #include "roaming_pokemon.h" diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c index 10e1c2130a..749d9d1024 100644 --- a/src/overlay006/ov6_02242984.c +++ b/src/overlay006/ov6_02242984.c @@ -16,7 +16,7 @@ #include "map_header_data.h" #include "narc.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "unk_0202D7A8.h" #include "unk_02039C80.h" diff --git a/src/overlay006/ov6_02246A30.c b/src/overlay006/ov6_02246A30.c index 00b29fa8de..31db55a4be 100644 --- a/src/overlay006/ov6_02246A30.c +++ b/src/overlay006/ov6_02246A30.c @@ -11,7 +11,7 @@ #include "inlines.h" #include "math.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "save_player.h" #include "system_flags.h" #include "trainer_info.h" diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index c276a25647..818c8de7a4 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -55,7 +55,7 @@ #include "heap.h" #include "message.h" #include "overlay_manager.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokedex_data_index.h" #include "pokemon.h" #include "sprite_resource.h" diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index 38a389902a..2614fab407 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -14,7 +14,7 @@ #include "graphics.h" #include "heap.h" #include "narc.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokedex_data_index.h" #include "pokedex_heightweight.h" #include "strbuf.h" diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index b3567f33d1..6451725e76 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -41,7 +41,7 @@ #include "math.h" #include "menu.h" #include "narc.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "render_window.h" #include "save_player.h" #include "savedata.h" diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index 919511996f..d27bbe27ec 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -27,7 +27,7 @@ #include "map_object.h" #include "menu.h" #include "message.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "render_window.h" #include "savedata.h" #include "strbuf.h" diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index e07b78f6ae..19e94fc8cc 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -19,7 +19,7 @@ #include "graphics.h" #include "gx_layers.h" #include "heap.h" -#include "poketch_data.h" +#include "poketch.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02005474.h" @@ -163,7 +163,7 @@ void ov25_022546B8(u32 param0, u32 param1) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(poketch); + u32 v2 = Poketch_CurrentScreenColor(poketch); GXS_LoadBGPltt(&v0->unk_200[v2 * 32], param0 * 0x20, 0x20); GXS_LoadOBJPltt(&v0->unk_200[v2 * 32], param1, 0x20); @@ -173,7 +173,7 @@ void ov25_022546F0(u32 param0, u32 param1) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(poketch); + u32 v2 = Poketch_CurrentScreenColor(poketch); GXS_LoadBGPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20); GXS_LoadOBJPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20); @@ -183,7 +183,7 @@ void ov25_02254728(u16 *param0) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(poketch); + u32 v2 = Poketch_CurrentScreenColor(poketch); MI_CpuCopy16(&v0->unk_200[v2 * 32], param0, 0x20); } @@ -605,7 +605,7 @@ static void ov25_02254DE0(UnkStruct_ov25_02254560 *param0, UnkStruct_ov25_02254D static void ov25_02254E84(UnkStruct_ov25_02254560 *param0, u32 param1) { Poketch *poketch = PoketchSystem_GetPoketchData(param0->poketchSys); - u32 v2 = PoketchData_CurrentScreenColor(poketch); + u32 v2 = Poketch_CurrentScreenColor(poketch); ov25_02254728(param0->unk_400); diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 5b47427b49..e806a08a22 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -166,13 +166,13 @@ void PoketchSystem_SendEvent(PoketchSystem *poketchSys, enum PoketchEventID even poketchSys->playerMoving = TRUE; break; case POKETCH_EVENT_PEDOMETER: { - u32 step_count = PoketchData_StepCount(poketchSys->poketch); + u32 step_count = Poketch_StepCount(poketchSys->poketch); if (++step_count > POKETCH_PEDOMETER_MAX) { step_count = 0; } - PoketchData_SetStepCount(poketchSys->poketch, step_count); + Poketch_SetStepCount(poketchSys->poketch, step_count); poketchSys->pedometerUpdated = TRUE; } break; case POKETCH_EVENT_SAVE: @@ -278,7 +278,7 @@ static void PoketchEvent_InitApp(PoketchSystem *poketchSys) break; case 1: if (ov25_022547F4(poketchSys->unk_1C, 0)) { - u32 app_ID = PoketchData_CurrentAppID(poketchSys->poketch); + u32 app_ID = Poketch_CurrentAppID(poketchSys->poketch); PoketchSystem_LoadApp(poketchSys, app_ID); PoketchSystem_InitApp(poketchSys, app_ID); @@ -325,9 +325,9 @@ static void PoketchEvent_UpdateApp(PoketchSystem *poketchSys) if (ov25_02254800(poketchSys->unk_1C)) { if (poketchSys->buttonDir == BUTTON_UP) { - poketchSys->unk_20.unk_00 = PoketchData_DecrementAppID(poketchSys->poketch); + poketchSys->unk_20.unk_00 = Poketch_DecrementAppID(poketchSys->poketch); } else { - poketchSys->unk_20.unk_00 = PoketchData_IncrementAppID(poketchSys->poketch); + poketchSys->unk_20.unk_00 = Poketch_IncrementAppID(poketchSys->poketch); } if (poketchSys->skipApp) { @@ -367,9 +367,9 @@ static void PoketchEvent_UpdateApp(PoketchSystem *poketchSys) case 4: if (poketchSys->buttonState == BUTTON_MANAGER_STATE_TAP || poketchSys->buttonState == BUTTON_MANAGER_STATE_TIMER0) { if (poketchSys->buttonDir == BUTTON_UP) { - poketchSys->unk_20.unk_00 = PoketchData_DecrementAppID(poketchSys->poketch); + poketchSys->unk_20.unk_00 = Poketch_DecrementAppID(poketchSys->poketch); } else { - poketchSys->unk_20.unk_00 = PoketchData_IncrementAppID(poketchSys->poketch); + poketchSys->unk_20.unk_00 = Poketch_IncrementAppID(poketchSys->poketch); } poketchSys->appSkipTimer = 30; @@ -395,7 +395,7 @@ static void PoketchEvent_OnAppChange(PoketchSystem *poketchSys) u32 v0; poketchSys->unk_06 = 1; - v0 = PoketchData_CurrentAppID(poketchSys->poketch); + v0 = Poketch_CurrentAppID(poketchSys->poketch); PoketchSystem_LoadApp(poketchSys, v0); PoketchSystem_InitApp(poketchSys, v0); diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index 8faf11eda3..3e9dadb215 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -16,7 +16,7 @@ #include "bg_window.h" #include "heap.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "sys_task.h" #include "sys_task_manager.h" diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c index 3dee70e56b..87fcc38785 100644 --- a/src/overlay031/ov31_022561C0.c +++ b/src/overlay031/ov31_022561C0.c @@ -10,7 +10,7 @@ #include "bg_window.h" #include "heap.h" #include "inlines.h" -#include "poketch_data.h" +#include "poketch.h" #include "sys_task.h" #include "sys_task_manager.h" #include "touch_screen.h" @@ -92,7 +92,7 @@ static void ov31_02256268(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_022565 { Poketch *poketch = PoketchSystem_GetPoketchData(param0->poketchSys); - if (PoketchData_DotArtModified(poketch)) { + if (Poketch_DotArtModified(poketch)) { ov31_02256298(param0, param1, poketch); } else { ov31_0225635C(param1); @@ -113,7 +113,7 @@ static void ov31_02256298(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_022565 { int v0, v1, v2; - PoketchData_CopyDotArtData(poketch, param0->unk_1F4); + Poketch_CopyDotArtData(poketch, param0->unk_1F4); v2 = 0; @@ -138,7 +138,7 @@ static void ov31_022562EC(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_022565 } } - PoketchData_ModifyDotArtData(poketch, param0->unk_1F4); + Poketch_ModifyDotArtData(poketch, param0->unk_1F4); } static void ov31_0225635C(UnkStruct_ov31_02256554_1 *param0) diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index ef83e3224a..836c634f5f 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -8,7 +8,7 @@ #include "bg_window.h" #include "heap.h" -#include "poketch_data.h" +#include "poketch.h" #include "sys_task.h" #include "sys_task_manager.h" #include "touch_screen.h" @@ -73,7 +73,7 @@ static BOOL ov36_0225621C(UnkStruct_ov36_0225621C *param0, PoketchSystem *poketc param0->poketchSys = poketchSys; param0->poketch = PoketchSystem_GetPoketchData(poketchSys); param0->unk_04.unk_04 = 1; - param0->unk_04.unk_00 = PoketchData_StepCount(param0->poketch); + param0->unk_04.unk_00 = Poketch_StepCount(param0->poketch); if (ov36_02256404(&(param0->unk_0C), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -181,7 +181,7 @@ static BOOL ov36_02256330(UnkStruct_ov36_0225621C *param0) } if (PoketchSystem_PedometerUpdated(param0->poketchSys)) { - v0->unk_00 = PoketchData_StepCount(param0->poketch); + v0->unk_00 = Poketch_StepCount(param0->poketch); ov36_0225653C(param0->unk_0C, 3); break; } @@ -201,7 +201,7 @@ static BOOL ov36_02256330(UnkStruct_ov36_0225621C *param0) v0->unk_04 = 1; v0->unk_00 = 0; - PoketchData_SetStepCount(param0->poketch, 0); + Poketch_SetStepCount(param0->poketch, 0); ov36_0225653C(param0->unk_0C, 2); ov36_0225653C(param0->unk_0C, 3); diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index d020ac3c57..51d3ab5c0b 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -10,7 +10,7 @@ #include "bg_window.h" #include "heap.h" -#include "poketch_data.h" +#include "poketch.h" #include "rtc.h" #include "sys_task.h" #include "sys_task_manager.h" @@ -118,9 +118,9 @@ static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 *param0, PoketchSystem *poketc u32 v1, v2; param0->poketch = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_03.unk_00 = PoketchData_IsAlarmSet(param0->poketch); + param0->unk_03.unk_00 = Poketch_IsAlarmSet(param0->poketch); - PoketchData_AlarmTime(param0->poketch, &v1, &v2); + Poketch_AlarmTime(param0->poketch, &v1, &v2); param0->unk_03.unk_03 = v1; param0->unk_03.unk_04 = v2; @@ -258,7 +258,7 @@ static BOOL ov45_022563C0(UnkStruct_ov45_022561D4 *param0) if ((param0->unk_1C == 1) && (param0->unk_18 == 0)) { param0->unk_03.unk_00 = 1; ov45_022562C0(¶m0->unk_03); - PoketchData_SetAlarm(param0->poketch, 1, param0->unk_03.unk_03, param0->unk_03.unk_04); + Poketch_SetAlarm(param0->poketch, 1, param0->unk_03.unk_03, param0->unk_03.unk_04); ov45_02256918(param0->unk_08, 2); param0->unk_1C = 0; param0->unk_01++; diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c index 640c602a10..8ea6243ee0 100644 --- a/src/overlay047/ov47_022561C0.c +++ b/src/overlay047/ov47_022561C0.c @@ -13,7 +13,7 @@ #include "bg_window.h" #include "heap.h" #include "inlines.h" -#include "poketch_data.h" +#include "poketch.h" #include "sys_task.h" #include "sys_task_manager.h" #include "unk_0202D7A8.h" @@ -81,7 +81,7 @@ static BOOL ov47_0225621C(UnkStruct_ov47_0225621C *param0, PoketchSystem *poketc param0->unk_04.unk_0C[v0].unk_03 = 1; param0->unk_04.unk_0C[v0].unk_02 = v0; - PoketchData_MapMarkerPos(param0->poketch, v0, &(param0->unk_04.unk_0C[v0].unk_00), &(param0->unk_04.unk_0C[v0].unk_01)); + Poketch_MapMarkerPos(param0->poketch, v0, &(param0->unk_04.unk_0C[v0].unk_00), &(param0->unk_04.unk_0C[v0].unk_01)); param0->unk_04.unk_0C[v0].unk_00 += 16; param0->unk_04.unk_0C[v0].unk_01 += 16; @@ -129,7 +129,7 @@ static void ov47_0225634C(UnkStruct_ov47_0225621C *param0) int v0; for (v0 = 0; v0 < 6; v0++) { - PoketchData_SetMapMarker(param0->poketch, v0, (param0->unk_04.unk_0C[v0].unk_00 - 16), (param0->unk_04.unk_0C[v0].unk_01 - 16)); + Poketch_SetMapMarker(param0->poketch, v0, (param0->unk_04.unk_0C[v0].unk_00 - 16), (param0->unk_04.unk_0C[v0].unk_01 - 16)); } ov47_02256670(param0->unk_70); diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index 694e5c5af4..ac64ed3b76 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/src/overlay049/ov49_022561C0.c @@ -9,7 +9,7 @@ #include "bg_window.h" #include "heap.h" -#include "poketch_data.h" +#include "poketch.h" #include "sys_task.h" #include "sys_task_manager.h" #include "touch_screen.h" @@ -64,7 +64,7 @@ static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *pa static BOOL ov49_0225621C(UnkStruct_ov49_0225621C *param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3) { param0->poketch = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_04.unk_00 = PoketchData_CurrentScreenColor(param0->poketch); + param0->unk_04.unk_00 = Poketch_CurrentScreenColor(param0->poketch); param0->unk_03 = param0->unk_04.unk_00; if (ov49_022563D4(&(param0->unk_08), &(param0->unk_04), param2)) { @@ -178,7 +178,7 @@ static BOOL ov49_02256348(UnkStruct_ov49_0225621C *param0) if (v2 != param0->unk_03) { param0->unk_04.unk_00 = v2; param0->unk_03 = v2; - PoketchData_SetScreenColor(param0->poketch, v2); + Poketch_SetScreenColor(param0->poketch, v2); return 1; } } diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index c19d2fc6a8..c7210dbfc4 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -10,7 +10,7 @@ #include "bg_window.h" #include "heap.h" -#include "poketch_data.h" +#include "poketch.h" #include "rtc.h" #include "sys_task.h" #include "sys_task_manager.h" @@ -168,7 +168,7 @@ static void ov50_022562AC(UnkStruct_ov50_02256510_1 *param0, UnkStruct_ov50_0225 for (v1 = 0; v1 < (param0->unk_04); v1++) { param0->unk_0C[v1].unk_00 = v1 + 1; - param0->unk_0C[v1].unk_03 = PoketchData_CalendarMarked(param1->poketch, param0->unk_00, v1 + 1); + param0->unk_0C[v1].unk_03 = Poketch_CalendarMarked(param1->poketch, param0->unk_00, v1 + 1); param0->unk_0C[v1].unk_02 = v2 + v1; } } @@ -260,10 +260,10 @@ static BOOL ov50_02256418(UnkStruct_ov50_022561D4 *param0) if ((param0->unk_A4 >= param0->unk_A8) && (param0->unk_A4 <= param0->unk_AC)) { int v0 = (param0->unk_A4 - param0->unk_A8); - if (PoketchData_CalendarMarked(param0->poketch, param0->unk_04.unk_00, v0 + 1)) { - PoketchData_ClearCalendarMark(param0->poketch, param0->unk_04.unk_00, v0 + 1); + if (Poketch_CalendarMarked(param0->poketch, param0->unk_04.unk_00, v0 + 1)) { + Poketch_ClearCalendarMark(param0->poketch, param0->unk_04.unk_00, v0 + 1); } else { - PoketchData_SetCalendarMark(param0->poketch, param0->unk_04.unk_00, v0 + 1); + Poketch_SetCalendarMark(param0->poketch, param0->unk_04.unk_00, v0 + 1); } param0->unk_04.unk_0C[v0].unk_03 ^= 1; diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index e5c20cdeed..1598fb0009 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -10,7 +10,7 @@ #include "bg_window.h" #include "heap.h" -#include "poketch_data.h" +#include "poketch.h" #include "sys_task.h" #include "sys_task_manager.h" #include "touch_screen.h" @@ -119,11 +119,11 @@ static BOOL ov54_0225621C(UnkStruct_ov54_0225621C *param0, PoketchSystem *poketc int v2; poketch = PoketchSystem_GetPoketchData(poketchSys); - param0->unk_04.unk_90 = PoketchData_PokemonHistorySize(poketch); + param0->unk_04.unk_90 = Poketch_PokemonHistorySize(poketch); for (v2 = 0; v2 < param0->unk_04.unk_90; v2++) { - PoketchData_PokemonHistorySpeciesAndIcon(poketch, v2, &(param0->unk_04.unk_00[v2].unk_00), &(param0->unk_04.unk_00[v2].unk_08)); - param0->unk_04.unk_00[v2].unk_04 = PoketchData_PokemonHistoryForm(poketch, v2); + Poketch_PokemonHistorySpeciesAndIcon(poketch, v2, &(param0->unk_04.unk_00[v2].unk_00), &(param0->unk_04.unk_00[v2].unk_08)); + param0->unk_04.unk_00[v2].unk_04 = Poketch_PokemonHistoryForm(poketch, v2); } if (ov54_0225642C(&(param0->unk_98), &(param0->unk_04), param2)) { diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index f646a4899b..faab054d19 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -37,7 +37,7 @@ #include "heap.h" #include "message.h" #include "palette.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "strbuf.h" #include "string_template.h" #include "text.h" diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index d0f2141fed..497ed5a058 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -50,7 +50,7 @@ #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02023FCC.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "unk_0202F1D4.h" #include "unk_02030A80.h" #include "unk_020393C8.h" diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index d1ce99f935..6de24b49c1 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -80,7 +80,7 @@ #include "unk_0201E86C.h" #include "unk_0201F834.h" #include "unk_02023FCC.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "unk_0202ACE0.h" #include "unk_0202C858.h" #include "unk_0203061C.h" diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 511e9cfbdb..5a4968cd3c 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -51,7 +51,7 @@ #include "math.h" #include "message.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "save_player.h" #include "savedata.h" diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index f9457e3b4c..66094261f1 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -32,7 +32,7 @@ #include "message.h" #include "message_util.h" #include "narc.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "render_window.h" #include "strbuf.h" diff --git a/src/overlay094/ov94_022444C8.c b/src/overlay094/ov94_022444C8.c index 31f859a40e..e71e4a3e2f 100644 --- a/src/overlay094/ov94_022444C8.c +++ b/src/overlay094/ov94_022444C8.c @@ -13,7 +13,7 @@ #include "overlay_manager.h" #include "party.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "trainer_info.h" #include "unk_0202DA40.h" #include "unk_020797C8.h" diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index f8f516fc0a..d19f832686 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -26,7 +26,7 @@ #include "message_util.h" #include "overlay_manager.h" #include "play_time.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "render_window.h" #include "save_player.h" #include "savedata.h" diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 46aa676753..61d0f9fa10 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -29,7 +29,7 @@ #include "message.h" #include "message_util.h" #include "overlay_manager.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "render_window.h" #include "rtc.h" #include "save_player.h" diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index e05dc986cc..c6d9544e8e 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -15,7 +15,7 @@ #include "heap.h" #include "message.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "spl.h" #include "strbuf.h" diff --git a/src/pokedex_data.c b/src/pokedex.c similarity index 99% rename from src/pokedex_data.c rename to src/pokedex.c index d622d33718..ebcebc472b 100644 --- a/src/pokedex_data.c +++ b/src/pokedex.c @@ -1,4 +1,4 @@ -#include "pokedex_data.h" +#include "pokedex.h" #include #include diff --git a/src/poketch_data.c b/src/poketch.c similarity index 75% rename from src/poketch_data.c rename to src/poketch.c index ad40c3a565..baed6c8d3f 100644 --- a/src/poketch_data.c +++ b/src/poketch.c @@ -1,4 +1,4 @@ -#include "poketch_data.h" +#include "poketch.h" #include #include @@ -58,25 +58,25 @@ void Poketch_Init(Poketch *poketch) } poketch->dotArtModifiedByPlayer = 0; - PoketchData_RegisterApp(poketch, POKETCH_APPID_DIGITALWATCH); + Poketch_RegisterApp(poketch, POKETCH_APPID_DIGITALWATCH); } -void PoketchData_Enable(Poketch *poketch) +void Poketch_Enable(Poketch *poketch) { poketch->poketchEnabled = 1; } -BOOL PoketchData_IsEnabled(Poketch *poketch) +BOOL Poketch_IsEnabled(Poketch *poketch) { return poketch->poketchEnabled; } -BOOL PoketchData_IsAppRegistered(Poketch *poketch, enum PoketchAppID appID) +BOOL Poketch_IsAppRegistered(Poketch *poketch, enum PoketchAppID appID) { return poketch->appRegistry[appID]; } -BOOL PoketchData_RegisterApp(Poketch *poketch, enum PoketchAppID appID) +BOOL Poketch_RegisterApp(Poketch *poketch, enum PoketchAppID appID) { BOOL appRegistered = FALSE; @@ -96,12 +96,12 @@ BOOL PoketchData_RegisterApp(Poketch *poketch, enum PoketchAppID appID) return appRegistered; } -enum PoketchAppID PoketchData_CurrentAppID(const Poketch *poketch) +enum PoketchAppID Poketch_CurrentAppID(const Poketch *poketch) { return poketch->appIndex; } -int PoketchData_IncrementAppID(Poketch *poketch) +int Poketch_IncrementAppID(Poketch *poketch) { int nextIndex = poketch->appIndex; @@ -124,7 +124,7 @@ int PoketchData_IncrementAppID(Poketch *poketch) return poketch->appIndex; } -int PoketchData_DecrementAppID(Poketch *poketch) +int Poketch_DecrementAppID(Poketch *poketch) { int prevIndex = poketch->appIndex; @@ -147,13 +147,13 @@ int PoketchData_DecrementAppID(Poketch *poketch) return poketch->appIndex; } -u32 PoketchData_CurrentScreenColor(const Poketch *poketch) +u32 Poketch_CurrentScreenColor(const Poketch *poketch) { GF_ASSERT(poketch); return poketch->screenColor; } -void PoketchData_SetScreenColor(Poketch *poketch, u32 screenColor) +void Poketch_SetScreenColor(Poketch *poketch, u32 screenColor) { GF_ASSERT(poketch); GF_ASSERT(screenColor < POKETCH_SCREEN_COLOR_MAX); @@ -161,37 +161,37 @@ void PoketchData_SetScreenColor(Poketch *poketch, u32 screenColor) poketch->screenColor = screenColor; } -u32 PoketchData_StepCount(const Poketch *poketch) +u32 Poketch_StepCount(const Poketch *poketch) { return poketch->stepCount; } -void PoketchData_SetStepCount(Poketch *poketch, u32 value) +void Poketch_SetStepCount(Poketch *poketch, u32 value) { if (poketch->pedometerEnabled) { poketch->stepCount = value; } } -BOOL PoketchData_IsAlarmSet(const Poketch *poketch) +BOOL Poketch_IsAlarmSet(const Poketch *poketch) { return poketch->alarmSet; } -void PoketchData_AlarmTime(const Poketch *poketch, u32 *hour, u32 *minute) +void Poketch_AlarmTime(const Poketch *poketch, u32 *hour, u32 *minute) { *hour = poketch->alarmHour; *minute = poketch->alarmMinute; } -void PoketchData_SetAlarm(Poketch *poketch, BOOL enable, u32 hour, u32 minute) +void Poketch_SetAlarm(Poketch *poketch, BOOL enable, u32 hour, u32 minute) { poketch->alarmSet = enable; poketch->alarmHour = hour; poketch->alarmMinute = minute; } -void PoketchData_SetCalendarMark(Poketch *poketch, u32 month, u32 day) +void Poketch_SetCalendarMark(Poketch *poketch, u32 month, u32 day) { if (poketch->calendarMonth == month) { poketch->calendarMarkBitmap |= (1 << (day - 1)); @@ -201,7 +201,7 @@ void PoketchData_SetCalendarMark(Poketch *poketch, u32 month, u32 day) } } -void PoketchData_ClearCalendarMark(Poketch *poketch, u32 month, u32 day) +void Poketch_ClearCalendarMark(Poketch *poketch, u32 month, u32 day) { if (poketch->calendarMonth == month) { poketch->calendarMarkBitmap &= ~(1 << (day - 1)); @@ -211,7 +211,7 @@ void PoketchData_ClearCalendarMark(Poketch *poketch, u32 month, u32 day) } } -BOOL PoketchData_CalendarMarked(const Poketch *poketch, u32 month, u32 day) +BOOL Poketch_CalendarMarked(const Poketch *poketch, u32 month, u32 day) { if (poketch->calendarMonth == month) { return (poketch->calendarMarkBitmap >> (day - 1)) & 1; @@ -220,7 +220,7 @@ BOOL PoketchData_CalendarMarked(const Poketch *poketch, u32 month, u32 day) return FALSE; } -void PoketchData_SetMapMarker(Poketch *poketch, int index, u8 x, u8 y) +void Poketch_SetMapMarker(Poketch *poketch, int index, u8 x, u8 y) { GF_ASSERT(index < POKETCH_MAPMARKER_COUNT); @@ -228,7 +228,7 @@ void PoketchData_SetMapMarker(Poketch *poketch, int index, u8 x, u8 y) poketch->markMapPositions[index].y = y; } -void PoketchData_MapMarkerPos(const Poketch *poketch, int index, u8 *x, u8 *y) +void Poketch_MapMarkerPos(const Poketch *poketch, int index, u8 *x, u8 *y) { GF_ASSERT(index < POKETCH_MAPMARKER_COUNT); @@ -236,27 +236,27 @@ void PoketchData_MapMarkerPos(const Poketch *poketch, int index, u8 *x, u8 *y) *y = poketch->markMapPositions[index].y; } -BOOL PoketchData_DotArtModified(const Poketch *poketch) +BOOL Poketch_DotArtModified(const Poketch *poketch) { return poketch->dotArtModifiedByPlayer; } -void PoketchData_CopyDotArtData(const Poketch *poketch, u8 *dst) +void Poketch_CopyDotArtData(const Poketch *poketch, u8 *dst) { if (poketch->dotArtModifiedByPlayer) { MI_CpuCopy8(poketch->dotArtData, dst, POKETCH_DOTART_SIZE_BYTES); } } -void PoketchData_ModifyDotArtData(Poketch *poketch, const u8 *src) +void Poketch_ModifyDotArtData(Poketch *poketch, const u8 *src) { MI_CpuCopy8(src, poketch->dotArtData, POKETCH_DOTART_SIZE_BYTES); poketch->dotArtModifiedByPlayer = TRUE; } -void PoketchData_PokemonHistoryEnqueue(Poketch *poketch, const BoxPokemon *boxPokemon) +void Poketch_PokemonHistoryEnqueue(Poketch *poketch, const BoxPokemon *boxPokemon) { - int index = PoketchData_PokemonHistorySize(poketch); + int index = Poketch_PokemonHistorySize(poketch); // Shift all entries one index up if (index >= POKETCH_POKEMONHISTORY_MAX) { @@ -274,7 +274,7 @@ void PoketchData_PokemonHistoryEnqueue(Poketch *poketch, const BoxPokemon *boxPo poketch->pokemonHistoryQueue[index].form = BoxPokemon_GetValue((BoxPokemon *)boxPokemon, MON_DATA_FORM, NULL); } -int PoketchData_PokemonHistorySize(const Poketch *poketch) +int Poketch_PokemonHistorySize(const Poketch *poketch) { int size; @@ -287,7 +287,7 @@ int PoketchData_PokemonHistorySize(const Poketch *poketch) return size; } -void PoketchData_PokemonHistorySpeciesAndIcon(const Poketch *poketch, int index, int *species, int *icon) +void Poketch_PokemonHistorySpeciesAndIcon(const Poketch *poketch, int index, int *species, int *icon) { GF_ASSERT(index < POKETCH_POKEMONHISTORY_MAX); GF_ASSERT(poketch->pokemonHistoryQueue[index].species); @@ -296,7 +296,7 @@ void PoketchData_PokemonHistorySpeciesAndIcon(const Poketch *poketch, int index, *icon = poketch->pokemonHistoryQueue[index].icon; } -u32 PoketchData_PokemonHistoryForm(const Poketch *poketch, int index) +u32 Poketch_PokemonHistoryForm(const Poketch *poketch, int index) { GF_ASSERT(index < POKETCH_POKEMONHISTORY_MAX); GF_ASSERT(poketch->pokemonHistoryQueue[index].species); diff --git a/src/savedata/save_table.c b/src/savedata/save_table.c index 46816319c8..86430a31b0 100644 --- a/src/savedata/save_table.c +++ b/src/savedata/save_table.c @@ -9,8 +9,8 @@ #include "journal.h" #include "party.h" #include "poffin.h" -#include "pokedex_data.h" -#include "poketch_data.h" +#include "pokedex.h" +#include "poketch.h" #include "record_mixed_rng.h" #include "save_player.h" #include "savedata.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index 26d8f78b68..2e9092e0e6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -122,10 +122,10 @@ #include "party.h" #include "player_avatar.h" #include "poffin.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "pokeradar.h" -#include "poketch_data.h" +#include "poketch.h" #include "render_window.h" #include "roaming_pokemon.h" #include "rtc.h" @@ -5183,7 +5183,7 @@ static BOOL ScrCmd_132(ScriptContext *ctx) Poketch *poketch = SaveData_PoketchData(ctx->fieldSystem->saveData); u16 *v1 = ScriptContext_GetVarPointer(ctx); - *v1 = PoketchData_IsEnabled(poketch); + *v1 = Poketch_IsEnabled(poketch); return 0; } @@ -5192,7 +5192,7 @@ static BOOL ScrCmd_RegisterPoketchApp(ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; u16 appID = ScriptContext_GetVar(ctx); - PoketchData_RegisterApp(SaveData_PoketchData(fieldSystem->saveData), appID); + Poketch_RegisterApp(SaveData_PoketchData(fieldSystem->saveData), appID); return FALSE; } @@ -5202,7 +5202,7 @@ static BOOL ScrCmd_134(ScriptContext *ctx) u16 v1 = ScriptContext_GetVar(ctx); u16 *v2 = ScriptContext_GetVarPointer(ctx); - *v2 = PoketchData_IsAppRegistered(SaveData_PoketchData(fieldSystem->saveData), v1); + *v2 = Poketch_IsAppRegistered(SaveData_PoketchData(fieldSystem->saveData), v1); return 0; } diff --git a/src/scrcmd_system_flags.c b/src/scrcmd_system_flags.c index 668d058f64..a02992d7ab 100644 --- a/src/scrcmd_system_flags.c +++ b/src/scrcmd_system_flags.c @@ -10,7 +10,7 @@ #include "field_script_context.h" #include "inlines.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "save_player.h" #include "system_flags.h" #include "trainer_info.h" diff --git a/src/unk_0202F180.c b/src/unk_0202F180.c index 7aaaae0c2b..c3c20cce49 100644 --- a/src/unk_0202F180.c +++ b/src/unk_0202F180.c @@ -6,9 +6,9 @@ #include "struct_decls/pokedexdata_decl.h" #include "game_records.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "savedata.h" void sub_0202F180(SaveData *saveData, const Pokemon *pokemon) @@ -18,6 +18,6 @@ void sub_0202F180(SaveData *saveData, const Pokemon *pokemon) GameRecords_IncrementTrainerScoreOnCatch(SaveData_GetGameRecordsPtr(saveData), pokedex, Pokemon_GetValue((Pokemon *)pokemon, MON_DATA_SPECIES, NULL)); Pokedex_Capture(pokedex, (Pokemon *)pokemon); - PoketchData_PokemonHistoryEnqueue(SaveData_PoketchData(saveData), (const BoxPokemon *)pokemon); + Poketch_PokemonHistoryEnqueue(SaveData_PoketchData(saveData), (const BoxPokemon *)pokemon); } } diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 4a1e97cb95..4484a1413e 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -24,7 +24,7 @@ #include "heap.h" #include "math.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "save_player.h" #include "savedata.h" diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 514a0f2a13..e7ba9e3bf7 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -99,9 +99,9 @@ #include "overlay_manager.h" #include "party.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "record_mixed_rng.h" #include "rtc.h" #include "save_player.h" diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index 203e9a3ce1..bef99b6e79 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -12,7 +12,7 @@ #include "inlines.h" #include "map_header.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "save_player.h" #include "script_manager.h" diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index 1a1f08c2fc..0d728547b1 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -312,7 +312,7 @@ BOOL ScrCmd_0DD(ScriptContext *param0) { StringTemplate **v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = VarsFlags_GetProfessorAssistantStarterSpecies(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); + u16 v2 = VarsFlags_GetPlayerCounterpartStarterSpecies(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); Strbuf *v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); @@ -546,7 +546,7 @@ BOOL ScrCmd_342(ScriptContext *param0) { StringTemplate **v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 v1 = ScriptContext_ReadByte(param0); - u16 v2 = VarsFlags_GetProfessorAssistantStarterSpecies(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); + u16 v2 = VarsFlags_GetPlayerCounterpartStarterSpecies(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); StringTemplate_SetSpeciesNameWithArticleByID(*v0, v1, v2); return 0; diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index f5eb314c93..008b1cc26b 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -29,7 +29,7 @@ #include "message.h" #include "party.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "script_manager.h" #include "strbuf.h" #include "string_template.h" @@ -320,7 +320,7 @@ static BOOL sub_02049348(FieldSystem *fieldSystem) static BOOL sub_02049358(FieldSystem *fieldSystem) { Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); - return PoketchData_IsEnabled(poketch); + return Poketch_IsEnabled(poketch); } static BOOL sub_02049368(FieldSystem *fieldSystem) diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index 64a430617a..83fa77c369 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -21,7 +21,7 @@ #include "message.h" #include "narc.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "save_player.h" #include "savedata.h" diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index 675a8a9bcf..9164d4728f 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -19,7 +19,7 @@ #include "math.h" #include "party.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "ribbon.h" #include "save_player.h" #include "script_manager.h" @@ -715,7 +715,7 @@ static BOOL sub_0204C458(FieldSystem *fieldSystem, void *param1) Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); - return PoketchData_IsEnabled(poketch); + return Poketch_IsEnabled(poketch); } static void sub_0204C474(FieldSystem *fieldSystem, void *param1) @@ -723,7 +723,7 @@ static void sub_0204C474(FieldSystem *fieldSystem, void *param1) Poketch *poketch = SaveData_PoketchData(fieldSystem->saveData); UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); - PoketchData_RegisterApp(poketch, v1->val6.unk_00); + Poketch_RegisterApp(poketch, v1->val6.unk_00); } static void sub_0204C494(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index 6a9b5379ed..838f097200 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -15,7 +15,7 @@ #include "field_script_context.h" #include "heap.h" #include "inlines.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "save_player.h" #include "system_flags.h" diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index be7707f2d9..d8212f9d4d 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -26,7 +26,7 @@ #include "message.h" #include "message_util.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "render_window.h" #include "rtc.h" #include "save_player.h" diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 741f75923b..10065f0d13 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -43,7 +43,7 @@ #include "map_tile_behavior.h" #include "party.h" #include "player_avatar.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokeradar.h" #include "render_window.h" #include "save_player.h" diff --git a/src/unk_0206AFE0.c b/src/unk_0206AFE0.c index 940ff4fbfa..08049b291b 100644 --- a/src/unk_0206AFE0.c +++ b/src/unk_0206AFE0.c @@ -21,7 +21,7 @@ static u16 sub_0206B010(VarsFlags *param0, u16 param1); BOOL sub_0206B044(VarsFlags *param0, u16 param1); u16 sub_0206B054(VarsFlags *param0); u16 sub_0206B064(VarsFlags *param0); -u16 VarsFlags_GetProfessorAssistantStarterSpecies(VarsFlags *param0); +u16 VarsFlags_GetPlayerCounterpartStarterSpecies(VarsFlags *param0); void sub_0206B558(VarsFlags *param0, u16 param1); void sub_0206B514(SaveData *param0); static u8 sub_0206B4A4(VarsFlags *param0); @@ -90,7 +90,7 @@ u16 sub_0206B064(VarsFlags *param0) return v0; } -u16 VarsFlags_GetProfessorAssistantStarterSpecies(VarsFlags *param0) +u16 VarsFlags_GetPlayerCounterpartStarterSpecies(VarsFlags *param0) { u16 v0; u16 v1 = sub_0206B010(param0, (0 + (((0 + VARS_START) + 32) + 16))); diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index f545a09bfc..75b9b21c9b 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -42,7 +42,7 @@ #include "math.h" #include "message.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "record_mixed_rng.h" #include "ribbon.h" diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 4bdab8e85b..c88f11d0a8 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -19,7 +19,7 @@ #include "game_records.h" #include "heap.h" #include "play_time.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "save_player.h" #include "savedata.h" #include "system_flags.h" diff --git a/src/unk_0207A274.c b/src/unk_0207A274.c index 42a5e0f283..c3e4d3d3c3 100644 --- a/src/unk_0207A274.c +++ b/src/unk_0207A274.c @@ -5,7 +5,7 @@ #include "struct_decls/pokedexdata_decl.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "savedata.h" diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 632053ac69..b9d057a4d9 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -35,9 +35,9 @@ #include "overlay_manager.h" #include "palette.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" -#include "poketch_data.h" +#include "poketch.h" #include "render_text.h" #include "render_window.h" #include "strbuf.h" @@ -412,7 +412,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) Pokedex_Capture(param0->unk_48, param0->unk_28); GameRecords_IncrementRecordValue(param0->records, RECORD_UNK_012); GameRecords_IncrementTrainerScore(param0->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); - PoketchData_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(param0->unk_28)); + Poketch_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(param0->unk_28)); if (Pokemon_GetValue(param0->unk_28, MON_DATA_HAS_NICKNAME, NULL) == 0) { Pokemon_SetValue(param0->unk_28, MON_DATA_SPECIES_NAME, NULL); @@ -742,7 +742,7 @@ static void sub_0207C028(UnkStruct_0207AE68 *param0) Pokedex_Capture(param0->unk_48, v1); GameRecords_IncrementRecordValue(param0->records, RECORD_UNK_012); GameRecords_IncrementTrainerScore(param0->records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); - PoketchData_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(v1)); + Poketch_PokemonHistoryEnqueue(param0->poketch, Pokemon_GetBoxPokemon(v1)); Heap_FreeToHeap(v1); Bag_TryRemoveItem(param0->unk_4C, ITEM_POKE_BALL, 1, param0->unk_5C); } diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 1495fbb08d..9c8c515b02 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -37,7 +37,7 @@ #include "journal.h" #include "math.h" #include "party.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "pokemon.h" #include "ribbon.h" #include "rtc.h" diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index 91cb5a4a24..57a16bb930 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -10,7 +10,7 @@ #include "game_options.h" #include "heap.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "save_player.h" #include "savedata.h" #include "system_flags.h" diff --git a/src/unk_020998EC.c b/src/unk_020998EC.c index 177f39f02b..6a874d7e12 100644 --- a/src/unk_020998EC.c +++ b/src/unk_020998EC.c @@ -11,7 +11,7 @@ #include "heap.h" #include "inlines.h" -#include "pokedex_data.h" +#include "pokedex.h" #include "strbuf.h" #include "unk_02014D38.h" #include "unk_0209747C.h" From b8ece9ea4adaa8cd06c8a6201876536ab864e107 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Sat, 18 Jan 2025 17:56:26 -0500 Subject: [PATCH 27/28] fix casing --- asm/macros/scrcmd.inc | 2 +- res/field/scripts/scripts_pokemon_mansion_office.s | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 7cb9c1f90a..2fc04b463f 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -4475,7 +4475,7 @@ .short \arg0 .endm - .macro has_seen_species species, ret + .macro HasSeenSpecies species, ret .short 823 .short \species .short \ret diff --git a/res/field/scripts/scripts_pokemon_mansion_office.s b/res/field/scripts/scripts_pokemon_mansion_office.s index c8364d7538..8455ab0dc3 100644 --- a/res/field/scripts/scripts_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_pokemon_mansion_office.s @@ -305,7 +305,7 @@ _0399: _03C2: Message 20 GoToIfSet 251, _0408 - has_seen_species SPECIES_MANAPHY, 0x800C + HasSeenSpecies SPECIES_MANAPHY, 0x800C GoToIfEq 0x800C, 1, _03FC ScrCmd_208 SPECIES_MANAPHY, 0 WaitABPress From abbd9245e8669c1fcc0777e27d84ed9200e18fce Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Sun, 19 Jan 2025 02:01:50 +0100 Subject: [PATCH 28/28] Adding a macro, returning an enum, and using constants --- include/map_header.h | 8 +++---- src/main.c | 2 +- src/map_header.c | 4 ++-- src/map_header_data.c | 55 +++++++++++++------------------------------ 4 files changed, 23 insertions(+), 46 deletions(-) diff --git a/include/map_header.h b/include/map_header.h index 66e25a8e4e..c261d8e5ca 100644 --- a/include/map_header.h +++ b/include/map_header.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_0203A024_H -#define POKEPLATINUM_UNK_0203A024_H +#ifndef POKEPLATINUM_MAP_HEADER_H +#define POKEPLATINUM_MAP_HEADER_H typedef struct { u8 unk_00; @@ -58,6 +58,6 @@ BOOL MapHeader_IsTrophyGarden(const u32 headerID); BOOL MapHeader_IsAmitySquare(const u32 headerID); BOOL MapHeader_IsAzureFluteAllowed(const u32 headerID); BOOL MapHeader_IsPokemonCenter2F(const u32 headerID); -u32 MapHeader_GetMapEvolutionMethod(u32 headerID); +enum PokemonEvoMethod MapHeader_GetMapEvolutionMethod(u32 headerID); -#endif // POKEPLATINUM_UNK_0203A024_H +#endif // POKEPLATINUM_MAP_HEADER_H diff --git a/src/main.c b/src/main.c index f6ba02ce99..b72589c353 100644 --- a/src/main.c +++ b/src/main.c @@ -269,7 +269,7 @@ static void HeapCanaryFailed(int resetParam, int param1) if (param1 == 3) { sub_02039834(0, 3, 0); - } else if (resetParam == 0) { + } else if (resetParam == RESET_CLEAN) { if (sub_020389B8() == TRUE) { sub_02039834(0, 6, 0); } else { diff --git a/src/map_header.c b/src/map_header.c index 5bbbe39c65..1fc1507f35 100644 --- a/src/map_header.c +++ b/src/map_header.c @@ -252,7 +252,7 @@ BOOL MapHeader_IsPokemonCenter2F(const u32 headerID) return FALSE; } -u32 MapHeader_GetMapEvolutionMethod(u32 headerID) +enum PokemonEvoMethod MapHeader_GetMapEvolutionMethod(u32 headerID) { static const u16 mapEvolutionMethods[] = { MAP_HEADER_ROUTE_217, @@ -306,5 +306,5 @@ u32 MapHeader_GetMapEvolutionMethod(u32 headerID) } } - return 0; + return EVO_NONE; } diff --git a/src/map_header_data.c b/src/map_header_data.c index d63a715645..ac0cdc600a 100644 --- a/src/map_header_data.c +++ b/src/map_header_data.c @@ -191,49 +191,26 @@ BOOL MapHeaderData_SetBgEventPos(FieldSystem *fieldSystem, u16 index, u16 x, u16 return TRUE; } +#define CONSUME_EVENTS(T, dataTEvents, dataNumTEvents) \ + do { \ + (dataNumTEvents) = *(u32 *)events; \ + events += sizeof(u32); \ + if ((dataNumTEvents) != 0) { \ + (dataTEvents) = (const T *)events; \ + } else { \ + (dataTEvents) = NULL; \ + } \ + events += sizeof(T) * (dataNumTEvents); \ + } while (0) + static void MapHeaderData_ParseEvents(MapHeaderData *data) { const u8 *events = (const u8 *)data->tmpEventsBuf; - // bgEvents - data->numBgEvents = *(u32 *)events; - events += sizeof(u32); - if (data->numBgEvents != 0) { - data->bgEvents = (const BgEvent *)events; - } else { - data->bgEvents = NULL; - } - events += sizeof(BgEvent) * data->numBgEvents; - - // objectEvents - data->numObjectEvents = *(u32 *)events; - events += sizeof(u32); - if (data->numObjectEvents != 0) { - data->objectEvents = (const ObjectEvent *)events; - } else { - data->objectEvents = NULL; - } - events += sizeof(ObjectEvent) * data->numObjectEvents; - - // warpEvents - data->numWarpEvents = *(u32 *)events; - events += sizeof(u32); - if (data->numWarpEvents != 0) { - data->warpEvents = (const WarpEvent *)events; - } else { - data->warpEvents = NULL; - } - events += sizeof(WarpEvent) * data->numWarpEvents; - - // coordEvents - data->numCoordEvents = *(u32 *)events; - events += sizeof(u32); - if (data->numCoordEvents != 0) { - data->coordEvents = (const CoordEvent *)events; - } else { - data->coordEvents = NULL; - } - events += sizeof(CoordEvent) * data->numCoordEvents; + CONSUME_EVENTS(BgEvent, data->bgEvents, data->numBgEvents); + CONSUME_EVENTS(ObjectEvent, data->objectEvents, data->numObjectEvents); + CONSUME_EVENTS(WarpEvent, data->warpEvents, data->numWarpEvents); + CONSUME_EVENTS(CoordEvent, data->coordEvents, data->numCoordEvents); } void MapHeaderData_LoadWildEncounters(WildEncounters *data, int headerID)