diff --git a/asm/include/overlay_25.inc b/asm/include/overlay_25.inc index 573dac31b..ed550a073 100644 --- a/asm/include/overlay_25.inc +++ b/asm/include/overlay_25.inc @@ -19,7 +19,7 @@ .public ScriptReadHalfword .public FieldSysGetAttrAddr .public FieldSystem_VarGet -.public sub_02050AAC +.public CallTask_020509F0 .public sub_020517E8 .public sub_020517FC .public BattleSetup_New diff --git a/asm/include/unk_02078834.inc b/asm/include/unk_02078834.inc index 83e65525e..2127e48db 100644 --- a/asm/include/unk_02078834.inc +++ b/asm/include/unk_02078834.inc @@ -17,7 +17,7 @@ .public CallApplicationAsTask .public TaskManager_GetFieldSystem .public TaskManager_GetEnvironment -.public sub_020514A4 +.public CallTask_02050960 .public SetFlag970 .public sub_02078B58 .public sub_02078B78 diff --git a/asm/overlay_25.s b/asm/overlay_25.s index 0bc9977ec..f6bb35bea 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -70,7 +70,7 @@ _0225990E: add r1, r6, #0 add r2, r4, #0 add r3, r7, #0 - bl sub_02050AAC + bl CallTask_020509F0 add sp, #0x184 pop {r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/asm/unk_02078834.s b/asm/unk_02078834.s index bf5fc983b..f6d5f1976 100644 --- a/asm/unk_02078834.s +++ b/asm/unk_02078834.s @@ -218,7 +218,7 @@ _0207899C: ldrb r3, [r4, #0xd] ldr r1, [r1, #8] add r0, r6, #0 - bl sub_020514A4 + bl CallTask_02050960 ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] diff --git a/include/battle/battle.h b/include/battle/battle.h index 043cbfa40..cebab851d 100644 --- a/include/battle/battle.h +++ b/include/battle/battle.h @@ -531,7 +531,7 @@ struct BattleSystem { Bag *bag; BagCursor *bagCursor; Pokedex *pokedex; - PC_STORAGE *storage; + PCStorage *storage; Party *trainerParty[4]; SOUND_CHATOT *chatotVoice[4]; u32 *unk88; @@ -542,7 +542,7 @@ struct BattleSystem { u32 *unk9C; u16 trainerId[4]; u8 trainerGender[4]; - TRAINER trainers[4]; + Trainer trainers[4]; UnkBattleSystemSub17C unk17C[2]; //Battle Background..? u32 *unk19C; u32 *unk1A0[2]; diff --git a/include/battle/battle_setup.h b/include/battle/battle_setup.h index 29f44318b..81cdc639a 100644 --- a/include/battle/battle_setup.h +++ b/include/battle/battle_setup.h @@ -27,12 +27,12 @@ struct BattleSetup { //declared in trainer_data.h Party* party[BATTLER_MAX]; // 4 int winFlag; // 14 int trainerId[BATTLER_MAX]; // 18 - TRAINER trainer[BATTLER_MAX]; // 28 + Trainer trainer[BATTLER_MAX]; // 28 PlayerProfile *profile[BATTLER_MAX]; // f8 Bag* bag; // 108 void* unk_10C; Pokedex* pokedex; // 110 - PC_STORAGE* storagePC; // 114 + PCStorage* storagePC; // 114 SOUND_CHATOT* chatot[BATTLER_MAX]; // 118 void* unk_128; void* unk_12C; diff --git a/include/battle/battle_system.h b/include/battle/battle_system.h index 0e4524991..1b89a8c92 100644 --- a/include/battle/battle_system.h +++ b/include/battle/battle_system.h @@ -41,7 +41,7 @@ UnkBattleSystemSub1D0 *ov12_0223A99C(BattleSystem *bsys); u32 *ov12_0223A9A4(BattleSystem *bsys); String *BattleSystem_GetMessageBuffer(BattleSystem *bsys); u16 BattleSystem_GetTrainerIndex(BattleSystem *bsys, int battlerId); -TRAINER *BattleSystem_GetTrainer(BattleSystem *bsys, int battlerId); +Trainer *BattleSystem_GetTrainer(BattleSystem *bsys, int battlerId); PlayerProfile *BattleSystem_GetPlayerProfile(BattleSystem *bsys, int a1); Bag *BattleSystem_GetBag(BattleSystem *bsys); BagCursor *BattleSystem_GetBagCursor(BattleSystem *bsys); @@ -52,7 +52,7 @@ int ov12_0223AAD8(BattleSystem *bsys, int a1); u8 ov12_0223AB0C(BattleSystem *bsys, int battlerId); u8 BattleSystem_GetFieldSide(BattleSystem *bsys, int battlerId); void *BattleSystem_GetMessageIcon(BattleSystem *bsys); -PC_STORAGE *BattleSystem_GetPcStorage(BattleSystem *bsys); +PCStorage *BattleSystem_GetPcStorage(BattleSystem *bsys); Terrain BattleSystem_GetTerrainId(BattleSystem *bsys); int ov12_0223AB54(BattleSystem *bsys); int BattleSystem_GetLocation(BattleSystem *bsys); diff --git a/include/bug_contest.h b/include/bug_contest.h index c9896c7c0..2a9b61ab5 100644 --- a/include/bug_contest.h +++ b/include/bug_contest.h @@ -5,18 +5,18 @@ #include "script.h" void FieldSystem_StartBugContestTimer(FieldSystem *fieldSystem); -BUGCONTEST *BugContest_New(FieldSystem *fieldSystem, u32 weekday); -void BugContest_Delete(BUGCONTEST *bugContest); -void BugContest_Judge(BUGCONTEST *bugContest); -void BugContest_BufferContestWinnerNames(BUGCONTEST *bugContest, MsgData *msgData, MessageFormat *msgFmt, u8 place); -BOOL BugContest_ContestantIsRegistered(BUGCONTEST *bugContest, u8 id); -BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MessageFormat *msgFmt, u8 slot); -void BugContest_BackUpParty(BUGCONTEST *bugContest); -void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest); -BOOL BugContest_ContestantIsRegisteredN(BUGCONTEST *bugContest, u8 id, u8 n); -void BugContest_InitOpponents(BUGCONTEST *bugContest); -void BugContest_InitEncounters(BUGCONTEST *bugContest); -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon); -ENC_SLOT *BugContest_GetEncounterSlot(BUGCONTEST *bugContest, HeapID heapId); +BugContest *BugContest_New(FieldSystem *fieldSystem, u32 weekday); +void BugContest_Delete(BugContest *bugContest); +void BugContest_Judge(BugContest *bugContest); +void BugContest_BufferContestWinnerNames(BugContest *bugContest, MsgData *msgData, MessageFormat *msgFmt, u8 place); +BOOL BugContest_ContestantIsRegistered(BugContest *bugContest, u8 id); +BOOL BugContest_BufferCaughtMonNick(BugContest *bugContest, MessageFormat *msgFmt, u8 slot); +void BugContest_BackUpParty(BugContest *bugContest); +void BugContest_RestoreParty_RetrieveCaughtPokemon(BugContest *bugContest); +BOOL BugContest_ContestantIsRegisteredN(BugContest *bugContest, u8 id, u8 n); +void BugContest_InitOpponents(BugContest *bugContest); +void BugContest_InitEncounters(BugContest *bugContest); +u16 BugContest_JudgePlayerMon(BugContest *bugContest, Pokemon *pokemon); +ENC_SLOT *BugContest_GetEncounterSlot(BugContest *bugContest, HeapID heapId); #endif //POKEHEARTGOLD_BUG_CONTEST_H diff --git a/include/bug_contest_internal.h b/include/bug_contest_internal.h index 6cb4ce48f..61f480c9c 100644 --- a/include/bug_contest_internal.h +++ b/include/bug_contest_internal.h @@ -16,25 +16,25 @@ typedef struct BUGMON { #define BUGMON_COUNT 10 -typedef struct BUGCONTESTANT_BIN { +typedef struct BugContestantData { u8 national; u8 day; u16 species; u16 score; u16 randmod; -} BUGCONTESTANT_BIN; +} BugContestantData; -typedef struct BUGCONTESTANT { +typedef struct BugContestant { u8 id; u16 score; - BUGCONTESTANT_BIN data; -} BUGCONTESTANT; + BugContestantData data; +} BugContestant; #define BUGCONTESTANT_NPC_COUNT 5 #define BUGCONTESTANT_PLAYER BUGCONTESTANT_NPC_COUNT #define BUGCONTESTANT_COUNT (BUGCONTESTANT_NPC_COUNT+1) -typedef struct BUGCONTEST { +typedef struct BugContest { HeapID heapId; // Always set to 3 SaveData *saveData; // Pointer to save data Party *party_bak; // Player's party is held for the contest @@ -50,8 +50,8 @@ typedef struct BUGCONTEST { u16 prize; // Item ID u32 elapsed_time; // Used to determine when the contest ends BUGMON encounters[BUGMON_COUNT]; // Which wild Pokemon you can find - BUGCONTESTANT contestants[BUGCONTESTANT_COUNT]; // 5 NPCs + player + BugContestant contestants[BUGCONTESTANT_COUNT]; // 5 NPCs + player u8 ranking[BUGCONTESTANT_COUNT]; // Index sorting by score at the end -} BUGCONTEST; +} BugContest; #endif //POKEHEARTGOLD_BUG_CONTEST_INTERNAL_H diff --git a/include/constants/battle.h b/include/constants/battle.h index 5043e2954..8d0981d65 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -64,6 +64,7 @@ typedef enum Terrain { // Battle outcome // Used with BattleSetup::winFlag +#define BATTLE_OUTCOME_NONE 0 #define BATTLE_OUTCOME_WIN 1 #define BATTLE_OUTCOME_LOSE 2 #define BATTLE_OUTCOME_DRAW 3 @@ -72,6 +73,7 @@ typedef enum Terrain { #define BATTLE_OUTCOME_FOE_FLED 6 //Battle Type +#define BATTLE_TYPE_NONE 0 #define BATTLE_TYPE_TRAINER (1 << 0) #define BATTLE_TYPE_DOUBLES (1 << 1) #define BATTLE_TYPE_LINK (1 << 2) diff --git a/include/constants/game_stat.h b/include/constants/game_stats.h similarity index 66% rename from include/constants/game_stat.h rename to include/constants/game_stats.h index e8985b700..995b51bdd 100644 --- a/include/constants/game_stat.h +++ b/include/constants/game_stats.h @@ -1,10 +1,11 @@ -#ifndef POKEHEARTGOLD_CONSTANTS_GAME_STAT_H -#define POKEHEARTGOLD_CONSTANTS_GAME_STAT_H +#ifndef POKEHEARTGOLD_CONSTANTS_GAME_STATS_H +#define POKEHEARTGOLD_CONSTANTS_GAME_STATS_H #define GAME_STAT_APRICORN_GET 1 #define GAME_STAT_UNK2 2 #define GAME_STAT_UNK6 6 -#define GAME_STAT_UNK9 9 +#define GAME_STAT_UNK8 8 //wild battles? +#define GAME_STAT_UNK9 9 //trainer battles? #define GAME_STAT_UNK10 10 #define GAME_STAT_UNK11 11 #define GAME_STAT_UNK12 12 @@ -15,4 +16,4 @@ #define GAME_STAT_UNK46 46 #define GAME_STAT_BATTLE_POINTS 69 -#endif //POKEHEARTGOLD_CONSTANTS_GAME_STAT_H +#endif //POKEHEARTGOLD_CONSTANTS_GAME_STATS_H diff --git a/include/constants/std_script.h b/include/constants/std_script.h index 0a6e09ffc..ac9d2e426 100644 --- a/include/constants/std_script.h +++ b/include/constants/std_script.h @@ -3,6 +3,9 @@ #include "constants/trainers.h" +// TODO: decide whether we want to keep this case +// or whether we want to capitalise this file. + // The _std_XXX constants are group thresholds for // use in fieldmap.c (sScriptBankMapping). // The std_XXX constants (no leading underscore) diff --git a/include/encounter.h b/include/encounter.h index 2f2242e23..82a144a6b 100644 --- a/include/encounter.h +++ b/include/encounter.h @@ -5,35 +5,34 @@ #include "field_player_avatar.h" #include "task.h" -typedef struct EncounterWork { +typedef struct Encounter { u32 *winFlag; - int effect; - int bgm; - int unkC; + s32 effect; + s32 bgm; + s32 unkC; BattleSetup *setup; -} ENCOUNTER; +} Encounter; -typedef struct WildEncounterWork { - int state; - int effect; - int bgm; - int *winFlag; +typedef struct WildEncounter { + s32 state; + s32 effect; + s32 bgm; + u32 *winFlag; BattleSetup *setup; -} WILD_ENCOUNTER; +} WildEncounter; +void CallTask_020509F0(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag); void sub_02050B08(FieldSystem *fieldSystem, BattleSetup *setup); -void sub_02051428(TaskManager *taskManager, void *a1, int a2); -void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canRun, BOOL shiny); -void sub_02051090(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canRun); -void sub_02051228(TaskManager *taskManager, u16 species, u8 level); +void sub_02050B90(FieldSystem *fieldSystem, TaskManager *taskManager, BattleSetup *setup); +void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canFlee, BOOL shiny); +void SetupAndStartFatefulWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canRun); +void sub_020511F8(FieldSystem *fieldSystem, BattleSetup *setup); +void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level); void SetupAndStartTutorialBattle(TaskManager *taskManager); void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, HeapID heapId, u32 *winFlag); -void sub_02050B90(FieldSystem *fieldSystem, TaskManager *taskManager, BattleSetup *setup); -void sub_0205239C(BattleSetup *setup, FieldSystem *fieldSystem); -void sub_02050AAC(TaskManager *man, BattleSetup *setup, int effect, int bgm, u32 *winFlag); -void sub_020511F8(FieldSystem *fieldSystem, BattleSetup *setup); -void sub_020515FC(FieldSystem *fieldSystem, Party *party, int battleFlags); -void sub_02051598(FieldSystem *fieldSystem, void *a1, int battleFlags); -void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag); +void CallTask_020508B8(TaskManager *taskManager, void *param1, u32 battleType); +void CallTask_02050960(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag); +void sub_02051598(FieldSystem *fieldSystem, void *param1, s32 battleType); +void sub_020515FC(FieldSystem *fieldSystem, Party *party, s32 battleType); #endif //POKEHEARTGOLD_ENCOUNTER_H diff --git a/include/field_follow_poke.h b/include/field_follow_poke.h index 000856c09..a00eb0bc8 100644 --- a/include/field_follow_poke.h +++ b/include/field_follow_poke.h @@ -5,8 +5,8 @@ #include "heap.h" #include "map_object_manager.h" -LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int direction, u32 mapno); -void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno); +LocalMapObject *sub_020699F8(MapObjectManager *mapObjectManager, int x, int y, int direction, u32 mapno); +void sub_02069B74(MapObjectManager *mapObjectManager, u32 mapno); LocalMapObject *FollowingPokemon_GetMapObject(FieldSystem *fieldSystem); u32 FollowingPokemon_GetSpriteID(int species, u16 form, u32 gender); void sub_02069DC8(LocalMapObject *mapObject, BOOL enable_bit); diff --git a/include/field_map_object.h b/include/field_map_object.h index 990473372..60541fd2d 100644 --- a/include/field_map_object.h +++ b/include/field_map_object.h @@ -160,8 +160,8 @@ void sub_0205E104(MapObjectManager* manager, u32 a1, u32 a2, u32 num_object_even MapObjectManager* MapObjectManager_New(u32 count); LocalMapObject* sub_0205E1D0(MapObjectManager* manager, ObjectEvent* object_events, u32 map_no); LocalMapObject *CreateSpecialFieldObject(MapObjectManager *objectMan, u32 x, u32 z, u32 direction, u32 sprite, u32 movement, u32 mapNo); -LocalMapObject *CreateSpecialFieldObjectEx(MapObjectManager *mapObjectMan, u32 x, u32 y, u32 direction, u32 a4, u32 a5, u32 mapNo, u32 a7, u32 a8, u32 spriteId); -LocalMapObject* CreateMapObjectFromTemplate(MapObjectManager *mapObjectMan, u16 objectId, u32 numObjects, u32 mapId, const ObjectEvent *templates); +LocalMapObject *CreateSpecialFieldObjectEx(MapObjectManager *mapObjectManager, u32 x, u32 y, u32 direction, u32 a4, u32 a5, u32 mapNo, u32 a7, u32 a8, u32 spriteId); +LocalMapObject* CreateMapObjectFromTemplate(MapObjectManager *mapObjectManager, u16 objectId, u32 numObjects, u32 mapId, const ObjectEvent *templates); void sub_0205E38C(LocalMapObject* object, u32 sprite_id); void sub_0205E3AC(LocalMapObject* object, u32 sprite_id); void MapObject_Remove(LocalMapObject *object); @@ -171,8 +171,8 @@ void MapObjectManager_RemoveAllActiveObjects(MapObjectManager *man); void sub_0205E4C8(MapObjectManager* manager); void sub_0205E520(MapObjectManager* manager); void sub_0205E580(MapObjectManager* manager); -void FieldSystem_SyncMapObjectsToSaveEx(FieldSystem *fieldSystem, MapObjectManager *mapObjectMan, struct SavedMapObject *saveObj, int objNum); -void MapObjectManager_RestoreFromSave(MapObjectManager *mapObjectMan, SavedMapObject *list, u32 numObj); +void FieldSystem_SyncMapObjectsToSaveEx(FieldSystem *fieldSystem, MapObjectManager *mapObjectManager, struct SavedMapObject *saveObj, int objNum); +void MapObjectManager_RestoreFromSave(MapObjectManager *mapObjectManager, SavedMapObject *list, u32 numObj); void sub_0205E680(FieldSystem* fieldSystem, LocalMapObject* local_object, SavedMapObject* saved_object); void sub_0205E7C4(LocalMapObject* local_object, SavedMapObject* saved_object); void sub_0205E8EC(MapObjectManager* manager, LocalMapObject* object); diff --git a/include/field_system.h b/include/field_system.h index 76981ac78..d7492fa2e 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -123,7 +123,7 @@ struct FieldSystem { FieldSystemUnkSub2C *unk2C; MAPMATRIX *mapMatrix; u8 filler34[0x8]; - MapObjectManager *mapObjectMan; + MapObjectManager *mapObjectManager; PlayerAvatar *playerAvatar; void *unk_44; u8 filler48[0xC]; @@ -165,7 +165,7 @@ struct FieldSystem { u8 unk_110; u8 unk_111[3]; GearPhoneRingManager *unk114; - BUGCONTEST *bugContest; + BugContest *bugContest; u8 unk11C[0x8]; u32 judgeStatPosition; }; // size: 0x128 diff --git a/include/map_object_manager.h b/include/map_object_manager.h index dd9f5beed..7f8e5a09f 100644 --- a/include/map_object_manager.h +++ b/include/map_object_manager.h @@ -3,6 +3,6 @@ #include "field_system.h" -FieldSystem *MapObjectManager_GetFieldSysPtr(MapObjectManager *mapObjectMan); +FieldSystem *MapObjectManager_GetFieldSysPtr(MapObjectManager *mapObjectManager); #endif //POKEHEARTGOLD_MAP_OBJECT_MANAGER_H diff --git a/include/message_format.h b/include/message_format.h index d8ee5f0cb..55de007a4 100644 --- a/include/message_format.h +++ b/include/message_format.h @@ -57,13 +57,13 @@ void BufferStatusName(MessageFormat *messageFormat, u32 fieldno, u32 statusId); void BufferFlavorDislikeText(MessageFormat *messageFormat, u32 fieldno, u32 flavorId); void BufferLandmarkName(MessageFormat *messageFormat, u32 fieldno, u32 landmarkId); void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 fieldno, u32 trainerClassId); -void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, TRAINER *trainer); +void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, Trainer *trainer); void BufferTrainerName(MessageFormat *messageFormat, u32 fieldno, u32 trainerId); void BufferFrontierOpponentName(MessageFormat *messageFormat, u32 fieldno, u32 opponentId); -void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, TRAINER *trainer); +void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, Trainer *trainer); void BufferDecorationName(MessageFormat *messageFormat, u32 fieldno, u32 decorationId); void BufferGenderSymbol(MessageFormat *messageFormat, u32 fieldno, u8 gender); -void BufferPCBoxName(MessageFormat *messageFormat, u32 fieldno, PC_STORAGE *pcStorage, u32 boxno); +void BufferPCBoxName(MessageFormat *messageFormat, u32 fieldno, PCStorage *pcStorage, u32 boxno); void BufferCountryName(MessageFormat *messageFormat, u32 fieldno, u32 countryId); void BufferCityName(MessageFormat *messageFormat, u32 fieldno, u32 countryId, u32 cityId); void BufferSealName(MessageFormat *messageFormat, u32 fieldno, u32 sealId); diff --git a/include/overlay_01_021E90C0.h b/include/overlay_01_021E90C0.h index a1625ac80..1a0d75c29 100644 --- a/include/overlay_01_021E90C0.h +++ b/include/overlay_01_021E90C0.h @@ -16,4 +16,4 @@ void ov01_021E90DC(u32 x, u32 y, FieldEnvSubUnk18 *a2); BOOL ov01_021E90E4(FieldSystem *fieldSystem, FieldEnvSubUnk18 *a1); BOOL ov01_021E9374(FieldSystem *fieldSystem, FieldEnvSubUnk18 *a1); -#endif //POKEHEARTGOLD_OVERLAY_01_021E90C0_H \ No newline at end of file +#endif //POKEHEARTGOLD_OVERLAY_01_021E90C0_H diff --git a/include/overlay_02.h b/include/overlay_02.h index 01e14ea78..e68f56efc 100644 --- a/include/overlay_02.h +++ b/include/overlay_02.h @@ -95,7 +95,7 @@ BOOL ov02_02253134(SaveData *saveData); int ov02_0225316C(void); BOOL ov02_02253188(SaveData *saveData); int ov02_022531B4(SaveData *saveData); -BOOL ov02_022470A0(FieldSystem *fieldSystem, BattleSetup **a1); +BOOL ov02_022470A0(FieldSystem *fieldSystem, BattleSetup **setupPtr); void ov02_BattleExit_HandleRoamerAction(FieldSystem *fieldSystem, BattleSetup *setup); BOOL ov02_02247374(FieldSystem *fieldSystem, BattleSetup **setup, void *arg2); void ov02_02247F30(FieldSystem *fieldSystem, u16 mon, u8 level, BOOL shiny, BattleSetup *setup); diff --git a/include/overlay_03.h b/include/overlay_03.h index ad3fe9495..9131e4eb9 100644 --- a/include/overlay_03.h +++ b/include/overlay_03.h @@ -19,6 +19,6 @@ u16 ov03_02256A2C(FieldSystem *fieldSystem, MessageFormat *msgFmt, u16 a2); void ov03_02256710(FieldSystem *fieldSystem, u16 a1); void ov03_02258910(FieldSystem *fieldSystem); void ov03_02258CFC(TaskManager *taskManager, enum PokeathlonData data); -int ov03_02256B40(int); +u32 ov03_02256B40(int); #endif //POKEHEARTGOLD_OVERLAY_03_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 9b23c9617..bd77eed6f 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -6,7 +6,7 @@ #include "constants/pokemon.h" #include "constants/box_wallpaper.h" -typedef struct PokemonStorageSystem PC_STORAGE; +typedef struct PokemonStorageSystem PCStorage; typedef struct PC_Box { BoxPokemon mons[MONS_PER_BOX]; @@ -25,37 +25,37 @@ struct PokemonStorageSystem { #define BOX_ALL_MODIFIED_FLAG ((u32)((1<trainerId[trainerIndex], &trainer); TrainerData_ReadTrPoke(bsys->trainerId[trainerIndex], trPoke); - switch (trainer.trainerType) { + switch (trainer.data.trainerType) { default: case 0: TRPOKE_NOITEM_DFLTMOVES *pokeDef = (TRPOKE_NOITEM_DFLTMOVES *)trPoke; - level = pokeDef[trainer.npoke-1].level; + level = pokeDef[trainer.data.npoke-1].level; break; case 1: TRPOKE_NOITEM_CUSTMOVES *pokeCust = (TRPOKE_NOITEM_CUSTMOVES *)trPoke; - level = pokeCust[trainer.npoke-1].level; + level = pokeCust[trainer.data.npoke-1].level; break; case 2: TRPOKE_ITEM_DFLTMOVES *pokeItem = (TRPOKE_ITEM_DFLTMOVES *)trPoke; - level = pokeItem[trainer.npoke-1].level; + level = pokeItem[trainer.data.npoke-1].level; break; case 3: TRPOKE_ITEM_CUSTMOVES *pokeCustItem = (TRPOKE_ITEM_CUSTMOVES *)trPoke; - level = pokeCustItem[trainer.npoke-1].level; + level = pokeCustItem[trainer.data.npoke-1].level; break; } i = 0; - trainerClass = trainer.trainerClass; + trainerClass = trainer.data.trainerClass; do { if (trainerClass != sPrizeMoneyTbl[i][0]) { diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 71687263b..1abf7d1b9 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -48,7 +48,7 @@ BattleSetup* BattleSetup_New(HeapID heapId, u32 battleTypeFlags) { setup->weatherType = 0; for (i = 0; i < BATTLER_MAX; ++i) { setup->trainerId[i] = 0; - MI_CpuClear32(&setup->trainer[i], sizeof(TRAINER)); + MI_CpuClear32(&setup->trainer[i], sizeof(Trainer)); setup->party[i] = SaveArray_Party_Alloc(heapId); setup->profile[i] = PlayerProfile_New(heapId); setup->chatot[i] = Chatot_New(heapId); @@ -384,7 +384,7 @@ void sub_020520B0(BattleSetup* setup, FieldSystem *fieldSystem, Party *party, u8 if (sub_0203401C(sub_0203993C())) { int avatar = PlayerProfile_GetAvatar(profile); int gender = PlayerProfile_GetTrainerGender(profile); - setup->trainer[BATTLER_PLAYER].trainerClass = GetUnionRoomAvatarAttrBySprite(gender, avatar, 1); + setup->trainer[BATTLER_PLAYER].data.trainerClass = GetUnionRoomAvatarAttrBySprite(gender, avatar, 1); CopyU16StringArray(setup->trainer[BATTLER_PLAYER].name, PlayerProfile_GetNamePtr(setup->profile[BATTLER_PLAYER])); setup->trainer[BATTLER_PLAYER2] = setup->trainer[BATTLER_PLAYER]; } else { @@ -569,7 +569,7 @@ BOOL IsBattleResultLatiCaught(u32 result) { } void BattleSetup_SetAllySideBattlersToPlayer(BattleSetup* setup) { - setup->trainer[BATTLER_PLAYER].trainerClass = PlayerProfile_GetTrainerGender(setup->profile[BATTLER_PLAYER]); + setup->trainer[BATTLER_PLAYER].data.trainerClass = PlayerProfile_GetTrainerGender(setup->profile[BATTLER_PLAYER]); CopyU16StringArray(setup->trainer[BATTLER_PLAYER].name, PlayerProfile_GetNamePtr(setup->profile[BATTLER_PLAYER])); setup->trainer[BATTLER_PLAYER2] = setup->trainer[BATTLER_PLAYER]; } diff --git a/src/battle/battle_system.c b/src/battle/battle_system.c index 6161ed2a6..9ca5c4f9f 100644 --- a/src/battle/battle_system.c +++ b/src/battle/battle_system.c @@ -6,7 +6,7 @@ #include "pokemon_mood.h" #include "battle/overlay_12_0224E4FC.h" #include "battle/overlay_12_0226BEC4.h" -#include "constants/game_stat.h" +#include "constants/game_stats.h" #include "unk_0202FBCC.h" #include "unk_0200FA24.h" #include "unk_02005D10.h" @@ -177,7 +177,7 @@ u16 BattleSystem_GetTrainerIndex(BattleSystem *bsys, int battlerId) { } } -TRAINER *BattleSystem_GetTrainer(BattleSystem *bsys, int battlerId) { +Trainer *BattleSystem_GetTrainer(BattleSystem *bsys, int battlerId) { if ((bsys->battleType & BATTLE_TYPE_MULTI) || ((bsys->battleType & BATTLE_TYPE_INGAME_PARTNER) && (ov12_0223AB0C(bsys, battlerId) & 1))) { return &bsys->trainers[battlerId]; } else if (bsys->battleType & BATTLE_TYPE_DOUBLES) { @@ -246,7 +246,7 @@ void *BattleSystem_GetMessageIcon(BattleSystem *bsys) { return bsys->msgIcon; } -PC_STORAGE *BattleSystem_GetPcStorage(BattleSystem *bsys) { +PCStorage *BattleSystem_GetPcStorage(BattleSystem *bsys) { return bsys->storage; } @@ -1170,7 +1170,7 @@ int ov12_0223BFCC(BattleSystem *bsys, u16 battlerId) { } u16 BattleSystem_GetTrainerItem(BattleSystem *bsys, int battlerId, int index) { - return bsys->trainers[battlerId].items[index]; + return bsys->trainers[battlerId].data.items[index]; } BOOL ov12_0223BFEC(BattleSystem *bsys) { diff --git a/src/encounter.c b/src/encounter.c index 1bed27257..55035f0b9 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -31,6 +31,8 @@ #include "unk_0202FBCC.h" #include "unk_020290B4.h" #include "unk_02058034.h" +#include "constants/battle.h" +#include "constants/game_stats.h" #include "constants/std_script.h" #include "game_stats.h" #include "unk_020552A4.h" @@ -40,60 +42,72 @@ #include "field_warp_tasks.h" #include "unk_02058034.h" #include "pokedex_util.h" -#include "constants/battle.h" -#include "constants/game_stat.h" #include "fielddata/script/scr_seq/event_D10R0101.h" +static BOOL Task_StartBattle(TaskManager *taskManager); +static void CallTask_StartBattle(TaskManager *taskManager, BattleSetup *setup); +static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag); +static void Encounter_Delete(Encounter *encounter); +static void sub_02050724(BattleSetup *setup, FieldSystem *fieldSystem); +static BOOL Task_StartEncounter(TaskManager *taskManager); +static void sub_0205087C(s32 flag, FieldSystem *fieldSystem); +static BOOL Task_020508B8(TaskManager *taskManager); +static BOOL Task_02050960(TaskManager *taskManager); +static BOOL Task_020509F0(TaskManager *taskManager); +static BOOL Task_WildEncounter(TaskManager *taskManager); +static BOOL Task_SafariEncounter(TaskManager *taskManager); +static BOOL Task_BugContestEncounter(TaskManager *taskManager); +static BOOL Task_TutorialBattle(TaskManager *taskManager); +static u32 sub_02051474(void *param0, u32 battleType); static void sub_02051660(FieldSystem *fieldSystem, BattleSetup *setup); -static BOOL sub_02050660(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - BattleSetup *battleSetup = TaskManager_GetEnvironment(man); - int *state = TaskManager_GetStatePtr(man); +static BOOL Task_StartBattle(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + BattleSetup *battleSetup = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); switch (*state) { - case 0: - sub_0203E3C4(fieldSystem, battleSetup); - sub_0203E354(); - (*state)++; - break; - case 1: - if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { - return TRUE; - } - break; + case 0: + sub_0203E3C4(fieldSystem, battleSetup); + sub_0203E354(); + (*state)++; + break; + case 1: + if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { + return TRUE; + } + break; } return FALSE; } -static void sub_020506AC(TaskManager *man, BattleSetup *setup) { - TaskManager_Call(man, sub_02050660, setup); +static void CallTask_StartBattle(TaskManager *taskManager, BattleSetup *setup) { + TaskManager_Call(taskManager, Task_StartBattle, setup); } -static ENCOUNTER *Encounter_New(BattleSetup *setup, int effect, int bgm, u32 *flag) { - ENCOUNTER *work; - work = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(ENCOUNTER)); - work->winFlag = flag; - if (flag != NULL) { - *flag = 0; +static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { + Encounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(Encounter)); + encounter->winFlag = winFlag; + if (winFlag != NULL) { + *winFlag = BATTLE_OUTCOME_NONE; } - work->effect = effect; - work->bgm = bgm; - work->setup = setup; - return work; + encounter->effect = effect; + encounter->bgm = bgm; + encounter->setup = setup; + return encounter; } -static void Encounter_Delete(ENCOUNTER *work) { - BattleSetup_Delete(work->setup); - FreeToHeap(work); +static void Encounter_Delete(Encounter *encounter) { + BattleSetup_Delete(encounter->setup); + FreeToHeap(encounter); } -static BOOL sub_020506F4(ENCOUNTER *work, FieldSystem *fieldSystem) { - if (work->winFlag != NULL) { - *(work->winFlag) = work->setup->winFlag; +static BOOL Encounter_GetResult(Encounter *encounter, FieldSystem *fieldSystem) { + if (encounter->winFlag != NULL) { + *(encounter->winFlag) = encounter->setup->winFlag; } - FieldSystem_VarSet(fieldSystem, VAR_BATTLE_RESULT, work->setup->winFlag); - return IsBattleResultWin(work->setup->winFlag); + FieldSystem_VarSet(fieldSystem, VAR_BATTLE_RESULT, encounter->setup->winFlag); + return IsBattleResultWin(encounter->setup->winFlag); } static void sub_02050724(BattleSetup *setup, FieldSystem *fieldSystem) { @@ -102,28 +116,28 @@ static void sub_02050724(BattleSetup *setup, FieldSystem *fieldSystem) { } } -static BOOL sub_02050738(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - int *state = TaskManager_GetStatePtr(man); +static BOOL Task_StartEncounter(TaskManager *taskManager) { //todo: better name + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); switch (*state) { case 0: - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); - sub_02055218(man, encounter->effect, encounter->bgm); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + sub_02055218(taskManager, encounter->effect, encounter->bgm); (*state)++; break; case 1: - sub_0205525C(man); + sub_0205525C(taskManager); (*state)++; break; case 2: - sub_020506AC(man, encounter->setup); + CallTask_StartBattle(taskManager, encounter->setup); (*state)++; break; case 3: sub_02050724(encounter->setup, fieldSystem); - if (encounter->setup->flags == (0) || encounter->setup->flags == (1 << 8) || encounter->setup->flags == 0x4A) { + if (encounter->setup->flags == BATTLE_TYPE_NONE || encounter->setup->flags == BATTLE_TYPE_8 || encounter->setup->flags == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) { sub_02093070(fieldSystem); sub_020930C4(fieldSystem); } @@ -131,8 +145,8 @@ static BOOL sub_02050738(TaskManager *man) { fieldSystem->unk7E = 0; fieldSystem->unk7C = 0; - if (sub_020506F4(encounter, fieldSystem) == 0) { - if (encounter->setup->flags & (1 << 11)) { + if (Encounter_GetResult(encounter, fieldSystem) == FALSE) { + if (encounter->setup->flags & BATTLE_TYPE_11) { HealParty(SaveArray_Party_Get(fieldSystem->saveData)); } else { Encounter_Delete(encounter); @@ -145,12 +159,12 @@ static BOOL sub_02050738(TaskManager *man) { } sub_02051660(fieldSystem, encounter->setup); - CallTask_RestoreOverworld(man); + CallTask_RestoreOverworld(taskManager); (*state)++; break; case 4: - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - CallTask_FadeFromBlack(man); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); (*state)++; break; case 5: @@ -161,137 +175,133 @@ static BOOL sub_02050738(TaskManager *man) { return FALSE; } -static void sub_0205085C(TaskManager *man, BattleSetup *setup, int effect, int bgm, u32 *winFlag) { - ENCOUNTER *encounter = Encounter_New(setup, effect, bgm, winFlag); - TaskManager_Call(man, sub_02050738, encounter); +static void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { + Encounter *encounter = Encounter_New(setup, effect, bgm, winFlag); + TaskManager_Call(taskManager, Task_StartEncounter, encounter); } -static void sub_0205087C(int a0, FieldSystem *fieldSystem) { - switch(a0 & 15) { - case 1: - case 6: - sub_02034AC0(fieldSystem->saveData, 1); - break; - case 2: - case 5: - sub_02034AC0(fieldSystem->saveData, -1); - break; - +static void sub_0205087C(s32 flag, FieldSystem *fieldSystem) { + switch(flag & 0xF) { + case 1: + case 6: + sub_02034AC0(fieldSystem->saveData, 1); + break; + case 2: + case 5: + sub_02034AC0(fieldSystem->saveData, -1); + break; } } -static BOOL sub_020508B8(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - int *state = TaskManager_GetStatePtr(man); +static BOOL Task_020508B8(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); switch (*state) { - case 0: - sub_02055218(man, encounter->effect, encounter->bgm); - (*state)++; - break; - case 1: - sub_0205525C(man); - (*state)++; - break; - case 2: - sub_020506AC(man, encounter->setup); - (*state)++; - break; - case 3: - sub_0205087C(encounter->setup->winFlag, fieldSystem); - sub_02052444(encounter->setup, fieldSystem); - GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK20); - sub_020506F4(encounter, fieldSystem); - CallTask_RestoreOverworld(man); - (*state)++; - break; - case 4: - Encounter_Delete(encounter); - return TRUE; - break; + case 0: + sub_02055218(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0205525C(taskManager); + (*state)++; + break; + case 2: + CallTask_StartBattle(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_0205087C(encounter->setup->winFlag, fieldSystem); + sub_02052444(encounter->setup, fieldSystem); + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK20); + Encounter_GetResult(encounter, fieldSystem); + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 4: + Encounter_Delete(encounter); + return TRUE; + break; } return FALSE; } -static BOOL sub_02050960(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - int *state = TaskManager_GetStatePtr(man); +static BOOL Task_02050960(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); switch (*state) { - case 0: - sub_02004AD8(0); - sub_02004EC4(5, encounter->bgm, 1); - sub_020506AC(man, encounter->setup); - (*state)++; - break; - case 1: - sub_0205087C(encounter->setup->winFlag, fieldSystem); - sub_02052444(encounter->setup, fieldSystem); - GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK20); - sub_020506F4(encounter, fieldSystem); - (*state)++; - break; - case 2: - Encounter_Delete(encounter); - sub_0202FC24(); - return TRUE; + case 0: + sub_02004AD8(0); + sub_02004EC4(5, encounter->bgm, 1); + CallTask_StartBattle(taskManager, encounter->setup); + (*state)++; + break; + case 1: + sub_0205087C(encounter->setup->winFlag, fieldSystem); + sub_02052444(encounter->setup, fieldSystem); + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK20); + Encounter_GetResult(encounter, fieldSystem); + (*state)++; + break; + case 2: + Encounter_Delete(encounter); + sub_0202FC24(); + return TRUE; } return FALSE; } -static BOOL sub_020509F0(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - int *state = TaskManager_GetStatePtr(man); +static BOOL Task_020509F0(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); switch (*state) { - case 0: - sub_02055218(man, encounter->effect, encounter->bgm); - (*state)++; - break; - case 1: - sub_0205525C(man); - (*state)++; - break; - case 2: - sub_020506AC(man, encounter->setup); - (*state)++; - break; - case 3: - sub_02052444(encounter->setup, fieldSystem); - - if (fieldSystem->unkA0 != NULL) { - sub_02067484(fieldSystem, &encounter->setup->unk138); - } - - sub_020506F4(encounter, fieldSystem); - CallTask_RestoreOverworld(man); - - (*state)++; - break; - case 4: - CallTask_FadeFromBlack(man); - (*state)++; - break; - case 5: - Encounter_Delete(encounter); - return TRUE; + case 0: + sub_02055218(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0205525C(taskManager); + (*state)++; + break; + case 2: + CallTask_StartBattle(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_02052444(encounter->setup, fieldSystem); + if (fieldSystem->unkA0 != NULL) { + sub_02067484(fieldSystem, &encounter->setup->unk138); + } + Encounter_GetResult(encounter, fieldSystem); + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 4: + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 5: + Encounter_Delete(encounter); + return TRUE; } return FALSE; } -void sub_02050AAC(TaskManager *man, BattleSetup *setup, int effect, int bgm, u32 *winFlag) { - ENCOUNTER *encounter = Encounter_New(setup, effect, bgm, winFlag); - TaskManager_Call(man, sub_020509F0, encounter); +void CallTask_020509F0(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag) { + Encounter *encounter = Encounter_New(battleSetup, effect, bgm, winFlag); + TaskManager_Call(taskManager, Task_020509F0, encounter); } -static WILD_ENCOUNTER *WildEncounter_New(BattleSetup *setup, int effect, int bgm, int *winFlag) { - WILD_ENCOUNTER *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(WILD_ENCOUNTER)); +static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) { + WildEncounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(WildEncounter)); encounter->winFlag = winFlag; if (winFlag != NULL) { - *winFlag = 0; + *winFlag = BATTLE_OUTCOME_NONE; } encounter->effect = effect; encounter->bgm = bgm; @@ -300,417 +310,407 @@ static WILD_ENCOUNTER *WildEncounter_New(BattleSetup *setup, int effect, int bgm return encounter; } -static void WildEncounter_Delete(WILD_ENCOUNTER *encounter) { +static void WildEncounter_Delete(WildEncounter *encounter) { BattleSetup_Delete(encounter->setup); FreeToHeap(encounter); } -static BOOL Task_SafariEncounter(TaskManager *man); -static BOOL Task_BugContestEncounter(TaskManager *man); -static BOOL Task_WildEncounter(TaskManager *man); - void sub_02050B08(FieldSystem *fieldSystem, BattleSetup *setup) { SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->saveData); - int a0 = sub_020517E8(setup); - int a1 = sub_020517FC(setup); + s32 effect = sub_020517E8(setup); + s32 bgm = sub_020517FC(setup); if (Save_VarsFlags_CheckSafariSysFlag(flags)) { - ENCOUNTER *encounter = Encounter_New(setup, a0, a1, NULL); + Encounter *encounter = Encounter_New(setup, effect, bgm, NULL); FieldSystem_CreateTask(fieldSystem, Task_SafariEncounter, encounter); } else if (CheckFlag996(flags)) { - ENCOUNTER *encounter = Encounter_New(setup, a0, a1, NULL); + Encounter *encounter = Encounter_New(setup, effect, bgm, NULL); FieldSystem_CreateTask(fieldSystem, Task_BugContestEncounter, encounter); } else { - WILD_ENCOUNTER *encounter = WildEncounter_New(setup, a0, a1, NULL); + WildEncounter *encounter = WildEncounter_New(setup, effect, bgm, NULL); FieldSystem_CreateTask(fieldSystem, Task_WildEncounter, encounter); } } -void sub_02050B90(FieldSystem *fieldSystem, TaskManager *man, BattleSetup *setup) { +void sub_02050B90(FieldSystem *fieldSystem, TaskManager *taskManager, BattleSetup *setup) { SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->saveData); - int a0 = sub_020517E8(setup); - int a1 = sub_020517FC(setup); + s32 effect = sub_020517E8(setup); + s32 bgm = sub_020517FC(setup); if (Save_VarsFlags_CheckSafariSysFlag(flags)) { - ENCOUNTER *encounter = Encounter_New(setup, a0, a1, NULL); - TaskManager_Jump(man, Task_SafariEncounter, encounter); + Encounter *encounter = Encounter_New(setup, effect, bgm, NULL); + TaskManager_Jump(taskManager, Task_SafariEncounter, encounter); } else if (CheckFlag996(flags)) { - ENCOUNTER *encounter = Encounter_New(setup, a0, a1, NULL); - TaskManager_Jump(man, Task_BugContestEncounter, encounter); + Encounter *encounter = Encounter_New(setup, effect, bgm, NULL); + TaskManager_Jump(taskManager, Task_BugContestEncounter, encounter); } else { - WILD_ENCOUNTER *encounter = WildEncounter_New(setup, a0, a1, NULL); - TaskManager_Jump(man, Task_WildEncounter, encounter); + WildEncounter *encounter = WildEncounter_New(setup, effect, bgm, NULL); + TaskManager_Jump(taskManager, Task_WildEncounter, encounter); } } -static BOOL Task_WildEncounter(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - WILD_ENCOUNTER *encounter = TaskManager_GetEnvironment(man); +static BOOL Task_WildEncounter(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + WildEncounter *encounter = TaskManager_GetEnvironment(taskManager); switch (encounter->state) { - case 0: - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); - GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8); - sub_02055218(man, encounter->effect, encounter->bgm); - encounter->state++; - break; - case 1: - sub_0205525C(man); - encounter->state++; - break; - case 2: - sub_020506AC(man, encounter->setup); - encounter->state++; - break; - case 3: - sub_02050724(encounter->setup, fieldSystem); - sub_02093070(fieldSystem); - sub_020930C4(fieldSystem); - - if (IsBattleResultWin(encounter->setup->winFlag) == FALSE) { - WildEncounter_Delete(encounter); - TaskManager_Jump(man, FieldTask_BlackOut, NULL); - return FALSE; - } - - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData))) { - HealParty(SaveArray_Party_Get(fieldSystem->saveData)); - } - - sub_02051660(fieldSystem, encounter->setup); - CallTask_RestoreOverworld(man); - - encounter->state++; - break; - case 4: - ov02_BattleExit_HandleRoamerAction(fieldSystem, encounter->setup); - CallTask_FadeFromBlack(man); - encounter->state++; - break; - case 5: - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - WildEncounter_Delete(encounter); - return TRUE; - break; - } - return FALSE; -} - -static BOOL Task_SafariEncounter(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - int *state = TaskManager_GetStatePtr(man); - u16 *safariBall = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fieldSystem->saveData)); - - switch (*state) { - case 0: - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); - GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8); - sub_02055218(man, encounter->effect, encounter->bgm); - (*state)++; - break; - case 1: - sub_0205525C(man); - (*state)++; - break; - case 2: - sub_020506AC(man, encounter->setup); - (*state)++; - break; - case 3: - sub_02050724(encounter->setup, fieldSystem); - if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { - sub_020270C4(fieldSystem->saveData); - Party_GetMonByIndex(encounter->setup->party[1], 0); + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); + sub_02055218(taskManager, encounter->effect, encounter->bgm); + encounter->state++; + break; + case 1: + sub_0205525C(taskManager); + encounter->state++; + break; + case 2: + CallTask_StartBattle(taskManager, encounter->setup); + encounter->state++; + break; + case 3: + sub_02050724(encounter->setup, fieldSystem); sub_02093070(fieldSystem); sub_020930C4(fieldSystem); - } - sub_02051660(fieldSystem, encounter->setup); - - if (*safariBall == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) { - Location *loc = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData)); - sub_020537A8(man, loc); - } else { - *state = 5; - return FALSE; - } - - (*state)++; - break; - case 4: - QueueScript(man, std_safari_enter, NULL, NULL); - (*state)++; - break; - case 5: - CallTask_RestoreOverworld(man); - (*state)++; - break; - case 6: - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - CallTask_FadeFromBlack(man); - (*state)++; - break; - case 7: - if (*safariBall == 0) { - if(encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { - QueueScript(man, std_safari_balls_out, NULL, NULL); + if (IsBattleResultWin(encounter->setup->winFlag) == FALSE) { + WildEncounter_Delete(encounter); + TaskManager_Jump(taskManager, FieldTask_BlackOut, NULL); + return FALSE; } - } else { - PC_STORAGE *pc = SaveArray_PCStorage_Get(fieldSystem->saveData); - Party *party = SaveArray_Party_Get(fieldSystem->saveData); - if (PCStorage_FindFirstBoxWithEmptySlot(pc) == 18 && Party_GetCount(party) == 6) { - QueueScript(man, std_safari_storage_out, NULL, NULL); + + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData))) { + HealParty(SaveArray_Party_Get(fieldSystem->saveData)); } - } - (*state)++; - break; - case 8: - Encounter_Delete(encounter); - return TRUE; + + sub_02051660(fieldSystem, encounter->setup); + CallTask_RestoreOverworld(taskManager); + + encounter->state++; + break; + case 4: + ov02_BattleExit_HandleRoamerAction(fieldSystem, encounter->setup); + CallTask_FadeFromBlack(taskManager); + encounter->state++; + break; + case 5: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + WildEncounter_Delete(encounter); + return TRUE; } return FALSE; } -static BOOL Task_BugContestEncounter(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - BUGCONTEST *contest = FieldSystem_BugContest_Get(fieldSystem); - int *state = TaskManager_GetStatePtr(man); +static BOOL Task_SafariEncounter(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); + u16 *safariBalls = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fieldSystem->saveData)); + + switch (*state) { + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); + sub_02055218(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0205525C(taskManager); + (*state)++; + break; + case 2: + CallTask_StartBattle(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_02050724(encounter->setup, fieldSystem); + if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { + sub_020270C4(fieldSystem->saveData); //Save_SafariZone_Get? + Party_GetMonByIndex(encounter->setup->party[BATTLER_ENEMY], 0); + sub_02093070(fieldSystem); + sub_020930C4(fieldSystem); + } + + sub_02051660(fieldSystem, encounter->setup); + + if (*safariBalls == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) { + Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData)); + sub_020537A8(taskManager, location); + } else { + *state = 5; + return FALSE; + } + + (*state)++; + break; + case 4: + QueueScript(taskManager, std_safari_enter, NULL, NULL); + (*state)++; + break; + case 5: + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 6: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 7: + if (*safariBalls == 0) { + if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { + QueueScript(taskManager, std_safari_balls_out, NULL, NULL); + } + } else { + PCStorage *pc = SaveArray_PCStorage_Get(fieldSystem->saveData); + Party *party = SaveArray_Party_Get(fieldSystem->saveData); + if (PCStorage_FindFirstBoxWithEmptySlot(pc) == NUM_BOXES && Party_GetCount(party) == PARTY_SIZE) { + QueueScript(taskManager, std_safari_storage_out, NULL, NULL); + } + } + (*state)++; + break; + case 8: + Encounter_Delete(encounter); + return TRUE; + } + return FALSE; +} + +static BOOL Task_BugContestEncounter(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + BugContest *contest = FieldSystem_BugContest_Get(fieldSystem); + u32 *state = TaskManager_GetStatePtr(taskManager); u16 *sportBall = BugContest_GetSportBallsAddr(contest); switch (*state) { - case 0: - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); - GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8); - sub_02055218(man, encounter->effect, encounter->bgm); - (*state)++; - break; - case 1: - sub_0205525C(man); - (*state)++; - break; - case 2: - sub_020506AC(man, encounter->setup); - (*state)++; - break; - case 3: - sub_02050724(encounter->setup, fieldSystem); - if (!IsBattleResultWin(encounter->setup->winFlag)) { + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); + sub_02055218(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0205525C(taskManager); + (*state)++; + break; + case 2: + CallTask_StartBattle(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_02050724(encounter->setup, fieldSystem); + if (!IsBattleResultWin(encounter->setup->winFlag)) { + Encounter_Delete(encounter); + TaskManager_Jump(taskManager, sub_0205298C, NULL); + return FALSE; + } + + sub_02051660(fieldSystem, encounter->setup); + + if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { + sub_0206DB94(taskManager, encounter->setup->bugContestMon); + sub_02093070(fieldSystem); + sub_020930C4(fieldSystem); + } + (*state)++; + break; + case 4: + if (*sportBall == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) { + sub_0206DB58(taskManager, fieldSystem); + } + (*state)++; + break; + case 5: + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 6: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 7: Encounter_Delete(encounter); - TaskManager_Jump(man, sub_0205298C, NULL); - return FALSE; - } - - sub_02051660(fieldSystem, encounter->setup); - - if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { - sub_0206DB94(man, encounter->setup->bugContestMon); - sub_02093070(fieldSystem); - sub_020930C4(fieldSystem); - } - (*state)++; - break; - case 4: - if (*sportBall == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) { - sub_0206DB58(man, fieldSystem); - } - (*state)++; - break; - case 5: - CallTask_RestoreOverworld(man); - (*state)++; - break; - case 6: - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - CallTask_FadeFromBlack(man); - (*state)++; - break; - case 7: - Encounter_Delete(encounter); - if (*sportBall == 0 && encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { - StartScriptFromMenu(man, std_bug_contest_balls_up, NULL); - return FALSE; - } - return TRUE; + if (*sportBall == 0 && encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { + StartScriptFromMenu(taskManager, std_bug_contest_balls_up, NULL); + return FALSE; + } + return TRUE; } return FALSE; } -void SetupAndStartWildBattle(TaskManager *man, u16 mon, u8 level, u32 *winFlag, BOOL canFlee, BOOL shiny) { +void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canFlee, BOOL shiny) { BattleSetup *setup; - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - setup = BattleSetup_New(HEAP_ID_FIELD, 0); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_TYPE_NONE); BattleSetup_InitFromFieldSystem(setup, fieldSystem); - ov02_02247F30(fieldSystem, mon, level, shiny, setup); + ov02_02247F30(fieldSystem, species, level, shiny, setup); if (canFlee) { setup->unk_18C |= 8; } - GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); - sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag); + CallTask_StartEncounter(taskManager, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag); } -void sub_02051090(TaskManager *man, u16 species, u8 level, u32 *winFlag, BOOL canRun) { +void SetupAndStartFatefulWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canRun) { BattleSetup *setup; - FieldSystem *fieldSystem; - int var; - - fieldSystem = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); setup = BattleSetup_New(HEAP_ID_FIELD, 0); BattleSetup_InitFromFieldSystem(setup, fieldSystem); + ov02_02247F30(fieldSystem, species, level, FALSE, setup); - ov02_02247F30(fieldSystem, species, level, 0, setup); + u32 var = 1; - var = 1; - - SetMonData(Party_GetMonByIndex(setup->party[1], 0), 110, &var); + SetMonData(Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0), MON_DATA_FATEFUL_ENCOUNTER, &var); if (canRun) { setup->unk_18C |= 8; } - GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); - sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag); + CallTask_StartEncounter(taskManager, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag); } -static BOOL Task_PalParkEncounter(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - int *state = TaskManager_GetStatePtr(man); +static BOOL Task_PalParkEncounter(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); switch(*state) { - case 0: - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); - GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8); - sub_02055218(man, encounter->effect, encounter->bgm); - (*state)++; - break; - case 1: - sub_0205525C(man); - (*state)++; - break; - case 2: - sub_020506AC(man, encounter->setup); - (*state)++; - break; - case 3: - sub_02050724(encounter->setup, fieldSystem); - PalPark_HandleBattleEnd(fieldSystem, encounter->setup); - sub_02051660(fieldSystem, encounter->setup); - (*state)++; - break; - case 4: - CallTask_RestoreOverworld(man); - (*state)++; - break; - case 5: - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - CallTask_FadeFromBlack(man); - (*state)++; - break; - case 6: - Encounter_Delete(encounter); - if (PalPark_CountMonsNotCaught(fieldSystem) == 0) { - // Ding-dong! - // Congratulations! - // $PLAYER has successfully - // caught the stocked Pokémon! - StartScriptFromMenu(man, _EV_scr_seq_D10R0101_002 + 1, NULL); - return FALSE; - } - return TRUE; + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); + sub_02055218(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0205525C(taskManager); + (*state)++; + break; + case 2: + CallTask_StartBattle(taskManager, encounter->setup); + (*state)++; + break; + case 3: + sub_02050724(encounter->setup, fieldSystem); + PalPark_HandleBattleEnd(fieldSystem, encounter->setup); + sub_02051660(fieldSystem, encounter->setup); + (*state)++; + break; + case 4: + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 5: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 6: + Encounter_Delete(encounter); + if (PalPark_CountMonsNotCaught(fieldSystem) == 0) { + // Ding-dong! + // Congratulations! + // $PLAYER has successfully + // caught the stocked Pokémon! + StartScriptFromMenu(taskManager, _EV_scr_seq_D10R0101_002 + 1, NULL); //??? - what is script 3? + return FALSE; + } + return TRUE; } return FALSE; } void sub_020511F8(FieldSystem *fieldSystem, BattleSetup *setup) { - ENCOUNTER *encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); + Encounter *encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); FieldSystem_CreateTask(fieldSystem, Task_PalParkEncounter, encounter); } -void sub_02051228(TaskManager *man, u16 species, u8 level) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, 0); +void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level) { //leftover from DP, still used to setup a battle where items are not usable and the player cannot run + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_TYPE_NONE); BattleSetup_InitFromFieldSystem(setup, fieldSystem); - ov02_02247F30(fieldSystem, species, level, 0, setup); + ov02_02247F30(fieldSystem, species, level, FALSE, setup); setup->unk_18C = 1; - GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), 8); + GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8); - sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), NULL); + CallTask_StartEncounter(taskManager, setup, sub_020517E8(setup), sub_020517FC(setup), NULL); } -static BOOL Task_TutorialBattle(TaskManager *man) { - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - int *state = TaskManager_GetStatePtr(man); +static BOOL Task_TutorialBattle(TaskManager *taskManager) { + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); switch(*state) { - case 0: - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); - sub_02055218(man, encounter->effect, encounter->bgm); - (*state)++; - break; - case 1: - sub_0205525C(man); - (*state)++; - break; - case 2: - sub_020506AC(man, encounter->setup); - (*state)++; - break; - case 3: - (*state)++; - break; - case 4: - CallTask_RestoreOverworld(man); - (*state)++; - break; - case 5: - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - CallTask_FadeFromBlack(man); - (*state)++; - break; - case 6: - Encounter_Delete(encounter); - return TRUE; + case 0: + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); + sub_02055218(taskManager, encounter->effect, encounter->bgm); + (*state)++; + break; + case 1: + sub_0205525C(taskManager); + (*state)++; + break; + case 2: + CallTask_StartBattle(taskManager, encounter->setup); + (*state)++; + break; + case 3: + (*state)++; + break; + case 4: + CallTask_RestoreOverworld(taskManager); + (*state)++; + break; + case 5: + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); + CallTask_FadeFromBlack(taskManager); + (*state)++; + break; + case 6: + Encounter_Delete(encounter); + return TRUE; } return FALSE; } -void SetupAndStartTutorialBattle(TaskManager *man) { - ENCOUNTER *encounter; +void SetupAndStartTutorialBattle(TaskManager *taskManager) { + Encounter *encounter; BattleSetup *setup; - FieldSystem *fieldSystem; + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - fieldSystem = TaskManager_GetFieldSystem(man); setup = BattleSetup_New_Tutorial(HEAP_ID_FIELD, fieldSystem); encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); - TaskManager_Call(man, Task_TutorialBattle, encounter); + TaskManager_Call(taskManager, Task_TutorialBattle, encounter); } -void SetupAndStartTrainerBattle(TaskManager *man, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, HeapID heapId, u32 *winFlag) { +void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, HeapID heapId, u32 *winFlag) { u32 battleType; BattleSetup *setup; - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); if (opponentTrainer2 != 0 && opponentTrainer1 != opponentTrainer2) { if (followerTrainerNum == 0) { battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_INGAME_PARTNER); } else { - battleType = 0x4b; + battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6); } } else if (opponentTrainer1 == opponentTrainer2) { - battleType = 3; + battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES); } else { - battleType = 1; + battleType = BATTLE_TYPE_TRAINER; if (a4) { battleType |= BATTLE_TYPE_11; } @@ -719,9 +719,9 @@ void SetupAndStartTrainerBattle(TaskManager *man, u32 opponentTrainer1, u32 oppo setup = BattleSetup_New(HEAP_ID_FIELD, battleType); BattleSetup_InitFromFieldSystem(setup, fieldSystem); - setup->trainerId[1] = opponentTrainer1; - setup->trainerId[3] = opponentTrainer2; - setup->trainerId[2] = followerTrainerNum; + setup->trainerId[BATTLER_ENEMY] = opponentTrainer1; + setup->trainerId[BATTLER_ENEMY2] = opponentTrainer2; + setup->trainerId[BATTLER_PLAYER2] = followerTrainerNum; EnemyTrainerSet_Init(setup, fieldSystem->saveData, heapId); @@ -735,28 +735,25 @@ void SetupAndStartTrainerBattle(TaskManager *man, u32 opponentTrainer1, u32 oppo } } - sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag); + CallTask_StartEncounter(taskManager, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag); } -static BOOL sub_020508B8(TaskManager *man); - -void sub_02051428(TaskManager *man, void *a1, int battleType) { - FieldSystem *fieldSystem; - ENCOUNTER *encounter; +void CallTask_020508B8(TaskManager *taskManager, void *param1, u32 battleType) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter; BattleSetup *setup; - fieldSystem = TaskManager_GetFieldSystem(man); setup = BattleSetup_New(HEAP_ID_FIELD, battleType); - sub_020522F0(setup, fieldSystem, a1); + sub_020522F0(setup, fieldSystem, param1); encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); - TaskManager_Call(man, sub_020508B8, encounter); + TaskManager_Call(taskManager, Task_020508B8, encounter); } -static int sub_02051474(void *a0, int battleType) { - int var = sub_02029264(a0); - int mode; +static u32 sub_02051474(void *param0, u32 battleType) { + u32 var = sub_02029264(param0); + u32 mode; if (battleType & BATTLE_TYPE_MULTI) { mode = 14; @@ -772,25 +769,25 @@ static int sub_02051474(void *a0, int battleType) { return mode; } -void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag) { - FieldSystem *fieldSystem; - ENCOUNTER *encounter; +void CallTask_02050960(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter; BattleSetup *setup; - int result, mode; - - fieldSystem = TaskManager_GetFieldSystem(man); + u32 result; + u32 mode; if (flag == 0) { - setup = BattleSetup_New(HEAP_ID_FIELD, 5); + setup = BattleSetup_New(HEAP_ID_FIELD, (BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER)); mode = 0; } else if (flag == 1) { - setup = BattleSetup_New(HEAP_ID_FIELD, 7); + setup = BattleSetup_New(HEAP_ID_FIELD, (BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_TRAINER)); mode = 7; } else { - setup = BattleSetup_New(HEAP_ID_FIELD, 143); + setup = BattleSetup_New(HEAP_ID_FIELD, (BATTLE_TYPE_TOWER | BATTLE_TYPE_MULTI | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_TRAINER)); - setup->trainerId[1] = 1; - setup->trainerId[3] = 2; + //these don't seem right + setup->trainerId[BATTLER_ENEMY] = TRAINER_RIVAL_SILVER; + setup->trainerId[BATTLER_ENEMY2] = TRAINER_RIVAL_SILVER_2; EnemyTrainerSet_Init(setup, fieldSystem->saveData, HEAP_ID_FIELD); mode = 14; @@ -805,36 +802,35 @@ void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag) { encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); encounter->unkC = target; - TaskManager_Call(man, sub_02050960, encounter); + TaskManager_Call(taskManager, Task_02050960, encounter); } -static BOOL sub_02051540(TaskManager *man) { - FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnvironment(man); - int *state = TaskManager_GetStatePtr(man); +static BOOL sub_02051540(TaskManager *taskManager) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Encounter *encounter = TaskManager_GetEnvironment(taskManager); + u32 *state = TaskManager_GetStatePtr(taskManager); switch (*state) { - case 0: - TaskManager_Call(man, sub_020508B8, encounter); - (*state)++; - break; - case 1: - if (sub_0202FC48() == TRUE) { - sub_0202FC24(); - } - sub_02058190(fieldSystem); - return TRUE; + case 0: + TaskManager_Call(taskManager, Task_020508B8, encounter); + (*state)++; + break; + case 1: + if (sub_0202FC48() == TRUE) { + sub_0202FC24(); + } + sub_02058190(fieldSystem); + return TRUE; } return FALSE; } -void sub_02051598(FieldSystem *fieldSystem, void *a1, int battleType) { - ENCOUNTER *encounter; - BattleSetup *setup; - int var; +void sub_02051598(FieldSystem *fieldSystem, void *param1, s32 battleType) { + Encounter *encounter; + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, battleType); + u32 var; - setup = BattleSetup_New(HEAP_ID_FIELD, battleType); - sub_020522F0(setup, fieldSystem, a1); + sub_020522F0(setup, fieldSystem, param1); sub_0202FBF0(fieldSystem->saveData, HEAP_ID_FIELD, &var); setup->unk1B2 = sub_02051474(fieldSystem->unkA4, battleType); @@ -844,12 +840,11 @@ void sub_02051598(FieldSystem *fieldSystem, void *a1, int battleType) { FieldSystem_CreateTask(fieldSystem, sub_02051540, encounter); } -void sub_020515FC(FieldSystem *fieldSystem, Party *party, int battleType) { - ENCOUNTER *encounter; - BattleSetup *setup; - int var; +void sub_020515FC(FieldSystem *fieldSystem, Party *party, s32 battleType) { + Encounter *encounter; + BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, battleType); + u32 var; - setup = BattleSetup_New(HEAP_ID_FIELD, battleType); sub_020520B0(setup, fieldSystem, party, NULL); sub_0202FBF0(fieldSystem->saveData, HEAP_ID_FIELD, &var); @@ -863,18 +858,18 @@ void sub_020515FC(FieldSystem *fieldSystem, Party *party, int battleType) { static void sub_02051660(FieldSystem *fieldSystem, BattleSetup *setup) { Pokemon *mon; u32 battleType = setup->flags; - int winFlag = setup->winFlag; + u32 winFlag = setup->winFlag; if (battleType & BATTLE_TYPE_LINK || battleType & BATTLE_TYPE_TOWER) { return; } - if (battleType == 0 || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) { + if (battleType == BATTLE_TYPE_NONE || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) { if (winFlag == BATTLE_OUTCOME_WIN) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9); } else if (winFlag == BATTLE_OUTCOME_MON_CAUGHT) { - mon = Party_GetMonByIndex(setup->party[1], 0); - if (Pokedex_ConvertToCurrentDexNo(0, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { + mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0); + if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10); } else { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK11); @@ -885,8 +880,8 @@ static void sub_02051660(FieldSystem *fieldSystem, BattleSetup *setup) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK12); } } else if ((battleType & BATTLE_TYPE_SAFARI || battleType & BATTLE_TYPE_PAL_PARK) && winFlag == BATTLE_OUTCOME_MON_CAUGHT) { - mon = Party_GetMonByIndex(setup->party[1], 0); - if (Pokedex_ConvertToCurrentDexNo(0, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { + mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0); + if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10); } else { GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK11); diff --git a/src/field/overlay_01_apricorn_tree_anim.c b/src/field/overlay_01_apricorn_tree_anim.c index c3950770a..4c7a4d92c 100644 --- a/src/field/overlay_01_apricorn_tree_anim.c +++ b/src/field/overlay_01_apricorn_tree_anim.c @@ -131,7 +131,7 @@ static BOOL Task_AnimApricornTree(TaskManager *taskman) { PlayerAvatar_GetCoordsInFront(fieldSystem->playerAvatar, &posX, &posZ); apricornType = FieldSystem_ApricornTree_TryGetApricorn(fieldSystem, env->tree) - 1; GF_ASSERT(apricornType >= APRICORN_NONE); - env->apricorn = CreateJumpingApricornObj(fieldSystem->mapObjectMan, SPRITE_BONMI_R + apricornType, posX, posZ); + env->apricorn = CreateJumpingApricornObj(fieldSystem->mapObjectManager, SPRITE_BONMI_R + apricornType, posX, posZ); MapObject_GetPositionVec(env->apricorn, &pos); pos.y += 12 * FX32_ONE; MapObject_SetPositionVec(env->apricorn, &pos); diff --git a/src/field/scrcmd_pokemon_misc.c b/src/field/scrcmd_pokemon_misc.c index 47b42dd68..4bc78883c 100644 --- a/src/field/scrcmd_pokemon_misc.c +++ b/src/field/scrcmd_pokemon_misc.c @@ -86,7 +86,7 @@ static void ov01_02201088(struct ListMenu *listMenu, s32 unused1, u8 unused2); static void ov01_022010CC(SysTask *sysTask, void *work); static void ov01_0220116C(SCR_648_STRUCT *unkPtr); static void GetHiddenPowerPowerType(Pokemon *mon, s32 *power, s32 *type); -static LocalMapObject *ov01_02201F98(MapObjectManager *mapObjectMan, u8 unkA, u16 species, u16 form, u32 gender, u32 x, u32 y, u32 mapId); +static LocalMapObject *ov01_02201F98(MapObjectManager *mapObjectManager, u8 unkA, u16 species, u16 form, u32 gender, u32 x, u32 y, u32 mapId); extern u16 ov01_02209AE0[10]; @@ -606,7 +606,7 @@ BOOL ScrCmd_GetPartyMonForm(ScriptContext *ctx) { BOOL ScrCmd_699(ScriptContext *ctx) { u32 unkVar; FieldSystem *fieldSystem; - MapObjectManager *mapObjectMan; + MapObjectManager *mapObjectManager; LocalMapObject *playerObj; LocalMapObject *curObj; Sprite *sprite; @@ -616,14 +616,14 @@ BOOL ScrCmd_699(ScriptContext *ctx) { unkVar = 0; fieldSystem = ctx->fieldSystem; - mapObjectMan = fieldSystem->mapObjectMan; + mapObjectManager = fieldSystem->mapObjectManager; playerObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); MapObject_GetPositionVec(playerObj, &vec); height = vec.y; - while (sub_0205EEF4(mapObjectMan, &curObj, &unkVar, 1) == TRUE) { + while (sub_0205EEF4(mapObjectManager, &curObj, &unkVar, 1) == TRUE) { if (curObj == playerObj) continue; MapObject_SetFlagsBits(curObj, MAPOBJECTFLAG_UNK13); if (MapObject_TestFlagsBits(curObj, MAPOBJECTFLAG_UNK12) == TRUE) { @@ -644,16 +644,16 @@ BOOL ScrCmd_699(ScriptContext *ctx) { BOOL ScrCmd_700(ScriptContext *ctx) { u32 index = 0; FieldSystem *fieldSystem; - MapObjectManager *mapObjectMan; + MapObjectManager *mapObjectManager; LocalMapObject *playerObj; LocalMapObject *curObj; fieldSystem = ctx->fieldSystem; - mapObjectMan = fieldSystem->mapObjectMan; + mapObjectManager = fieldSystem->mapObjectManager; playerObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); - while (sub_0205EEF4(mapObjectMan, &curObj, &index, MAPOBJECTFLAG_ACTIVE) == TRUE) { + while (sub_0205EEF4(mapObjectManager, &curObj, &index, MAPOBJECTFLAG_ACTIVE) == TRUE) { if (curObj == playerObj) continue; MapObject_ClearFlagsBits(curObj, MAPOBJECTFLAG_UNK13); } @@ -714,8 +714,8 @@ BOOL ScrCmd_775(ScriptContext *ctx) { u32 objIdA = ScriptGetVar(ctx); u32 objIdB = ScriptGetVar(ctx); - LocalMapObject *objA = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objIdA); - LocalMapObject *objB = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objIdB); + LocalMapObject *objA = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objIdA); + LocalMapObject *objB = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objIdB); ov02_022469B4(ctx->fieldSystem->taskman, objA, objB); @@ -929,7 +929,7 @@ BOOL ScrCmd_CreatePokeathlonFriendshipRoomStatues(ScriptContext *ctx) { SavePokeathlonFriendshipRecords *unkPtr = sub_02031B00(fieldSystem->saveData); for (i = 0; i < 3; i++) { - LocalMapObject *mapObj = GetMapObjectByID(fieldSystem->mapObjectMan, 0xf6 + i); + LocalMapObject *mapObj = GetMapObjectByID(fieldSystem->mapObjectManager, 0xf6 + i); if (mapObj) { DeleteMapObject(mapObj); @@ -938,13 +938,13 @@ BOOL ScrCmd_CreatePokeathlonFriendshipRoomStatues(ScriptContext *ctx) { species = unkPtr->friendshipRoomStatues[i].species; if (species != SPECIES_NONE && species <= SPECIES_ARCEUS) { - ov01_02201F98(fieldSystem->mapObjectMan, (u8) i, species, unkPtr->friendshipRoomStatues[i].form, unkPtr->friendshipRoomStatues[i].gender, sFriendshipRoomStatuesPositions[i][0], sFriendshipRoomStatuesPositions[i][1], fieldSystem->location->mapId); + ov01_02201F98(fieldSystem->mapObjectManager, (u8) i, species, unkPtr->friendshipRoomStatues[i].form, unkPtr->friendshipRoomStatues[i].gender, sFriendshipRoomStatuesPositions[i][0], sFriendshipRoomStatuesPositions[i][1], fieldSystem->location->mapId); } } return TRUE; } -static LocalMapObject *ov01_02201F98(MapObjectManager *mapObjectMan, u8 unkA, u16 species, u16 form, u32 gender, u32 x, u32 y, u32 mapId) { +static LocalMapObject *ov01_02201F98(MapObjectManager *mapObjectManager, u8 unkA, u16 species, u16 form, u32 gender, u32 x, u32 y, u32 mapId) { LocalMapObject *mapObj; u32 spriteId; u32 size; @@ -952,7 +952,7 @@ static LocalMapObject *ov01_02201F98(MapObjectManager *mapObjectMan, u8 unkA, u1 spriteId = FollowingPokemon_GetSpriteID(species, form, gender) << 1; size = GetFollowPokeSizeParamBySpecies(species)*3 + unkA; - mapObj = CreateSpecialFieldObjectEx(mapObjectMan, x, y, DIR_SOUTH, size + 0x19f, 0, mapId, 0, 0, spriteId); + mapObj = CreateSpecialFieldObjectEx(mapObjectManager, x, y, DIR_SOUTH, size + 0x19f, 0, mapId, 0, 0, spriteId); if (!mapObj) { GF_AssertFail(); @@ -1442,7 +1442,7 @@ BOOL ScrCmd_BugContestAction(ScriptContext *ctx) { BOOL ScrCmd_BufferBugContestWinner(ScriptContext *ctx) { MessageFormat **msgfmt; - BUGCONTEST *bugContest; + BugContest *bugContest; msgfmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); bugContest = FieldSystem_BugContest_Get(ctx->fieldSystem); @@ -1453,7 +1453,7 @@ BOOL ScrCmd_BufferBugContestWinner(ScriptContext *ctx) { } BOOL ScrCmd_JudgeBugContest(ScriptContext *ctx) { - BUGCONTEST *bugContest; + BugContest *bugContest; u16 *prize; u16 *placement; u16 *species; @@ -1479,7 +1479,7 @@ BOOL ScrCmd_JudgeBugContest(ScriptContext *ctx) { BOOL ScrCmd_BufferBugContestMonNick(ScriptContext *ctx) { MessageFormat **msgfmt; - BUGCONTEST *bugContest; + BugContest *bugContest; u32 script_index; msgfmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -1494,7 +1494,7 @@ BOOL ScrCmd_BufferBugContestMonNick(ScriptContext *ctx) { BOOL ScrCmd_BugContestGetTimeLeft(ScriptContext *ctx) { MessageFormat **msgfmt; - BUGCONTEST *bugContest; + BugContest *bugContest; u32 script_index; u32 timeLeft; @@ -1515,7 +1515,7 @@ BOOL ScrCmd_BugContestGetTimeLeft(ScriptContext *ctx) { } BOOL ScrCmd_IsBugContestantRegistered(ScriptContext *ctx) { - BUGCONTEST *bugContest = FieldSystem_BugContest_Get(ctx->fieldSystem); + BugContest *bugContest = FieldSystem_BugContest_Get(ctx->fieldSystem); u32 id = ScriptGetVar(ctx); u16 *ptr = ScriptGetVarPointer(ctx); *ptr = BugContest_ContestantIsRegistered(bugContest, id); diff --git a/src/field_follow_poke.c b/src/field_follow_poke.c index 6311876c1..9f2ba9721 100644 --- a/src/field_follow_poke.c +++ b/src/field_follow_poke.c @@ -12,7 +12,7 @@ static void FieldSystemFollowMonClear(FollowMon *followMon); static void FollowingPoke_SetObjectShinyFlag(LocalMapObject *mapObject, BOOL enable); static BOOL FollowPokePermissionDiglettCheck(int mapno); static void FollowingPoke_SetObjectFormParam(LocalMapObject *mapObject, int species, u8 form); -static LocalMapObject *CreateFollowingSpriteFieldObject(MapObjectManager *mapObjectMan, int species, u16 form, int gender, int direction, int x, int y, int shiny); +static LocalMapObject *CreateFollowingSpriteFieldObject(MapObjectManager *mapObjectManager, int species, u16 form, int gender, int direction, int x, int y, int shiny); static const u16 sModelIndexLUT[] = { FOLLOWER_MON_NONE, @@ -1503,7 +1503,7 @@ static const u16 sFemaleFlagLUT[] = { FALSE, // SPECIES_ARCEUS }; -LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int direction, u32 mapno) { +LocalMapObject *sub_020699F8(MapObjectManager *mapObjectManager, int x, int y, int direction, u32 mapno) { FieldSystem *fieldSystem; Party *party; int partyCount; @@ -1514,7 +1514,7 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int d int shiny; int player_unk; - fieldSystem = MapObjectManager_GetFieldSysPtr(mapObjectMan); + fieldSystem = MapObjectManager_GetFieldSysPtr(mapObjectManager); party = SaveArray_Party_Get(fieldSystem->saveData); partyCount = Party_GetCount(party); FieldSystemFollowMonClear(&fieldSystem->followMon); @@ -1531,7 +1531,7 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int d form = GetMonData(mon, MON_DATA_FORM, NULL); gender = GetMonData(mon, MON_DATA_GENDER, NULL); shiny = MonIsShiny(mon); - fieldSystem->followMon.mapObject = CreateFollowingSpriteFieldObject(mapObjectMan, species, form, gender, direction, x, y, shiny); + fieldSystem->followMon.mapObject = CreateFollowingSpriteFieldObject(mapObjectManager, species, form, gender, direction, x, y, shiny); fieldSystem->followMon.active = TRUE; FieldSystem_SetFollowerPokeParam(fieldSystem, species, form, shiny, gender); FieldSystemUnkSub108_Set(fieldSystem->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); @@ -1558,7 +1558,7 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int d return fieldSystem->followMon.mapObject; } -void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) { +void sub_02069B74(MapObjectManager *mapObjectManager, u32 mapno) { FieldSystem *fieldSystem; Party *party; int partyCount; @@ -1570,7 +1570,7 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) { int player_unk; LocalMapObject *followPokeObj; - fieldSystem = MapObjectManager_GetFieldSysPtr(mapObjectMan); + fieldSystem = MapObjectManager_GetFieldSysPtr(mapObjectManager); party = SaveArray_Party_Get(fieldSystem->saveData); partyCount = Party_GetCount(party); FieldSystemFollowMonClear(&fieldSystem->followMon); @@ -1579,7 +1579,7 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) { species = GetMonData(mon, MON_DATA_SPECIES, NULL); FieldSystemUnkSub108_Set(fieldSystem->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); if (GetFollowPokePermissionBySpeciesAndMap(species, mapno)) { - followPokeObj = GetMapObjectByID(fieldSystem->mapObjectMan, obj_partner_poke); + followPokeObj = GetMapObjectByID(fieldSystem->mapObjectManager, obj_partner_poke); if (followPokeObj == NULL) { fieldSystem->followMon.unk15 = 1; } else { @@ -1612,7 +1612,7 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) { MapObject_ClearFlag18(fieldSystem->followMon.mapObject, FALSE); } } else { - followPokeObj = GetMapObjectByID(fieldSystem->mapObjectMan, obj_partner_poke); + followPokeObj = GetMapObjectByID(fieldSystem->mapObjectManager, obj_partner_poke); if (followPokeObj != NULL) { form = GetMonData(mon, MON_DATA_FORM, NULL); gender = GetMonGender(mon); @@ -1904,11 +1904,11 @@ static void FollowingPoke_SetObjectFormParam(LocalMapObject *mapObject, int spec MapObject_SetParam(mapObject, param, 1); } -static LocalMapObject *CreateFollowingSpriteFieldObject(MapObjectManager *mapObjectMan, int species, u16 form, int gender, int direction, int x, int y, int shiny) { +static LocalMapObject *CreateFollowingSpriteFieldObject(MapObjectManager *mapObjectManager, int species, u16 form, int gender, int direction, int x, int y, int shiny) { LocalMapObject *ret; ret = CreateSpecialFieldObject( - mapObjectMan, + mapObjectManager, x, y, direction, diff --git a/src/field_use_item.c b/src/field_use_item.c index ab9aa0f6d..d2e06ffdf 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -306,7 +306,7 @@ static BOOL Task_MountOrDismountBicycle(TaskManager *taskManager) { (*state_p)++; break; case 2: - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); return TRUE; } @@ -491,7 +491,7 @@ static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { switch (env->state) { case 0: fieldSystem->unkD2_6 = TRUE; - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); sub_0205B514(fieldSystem->bgConfig, &env->window, 3); options = Save_PlayerData_GetOptionsAddr(fieldSystem->saveData); sub_0205B564(&env->window, options); @@ -508,7 +508,7 @@ static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { } break; case 2: - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); RemoveWindow(&env->window); String_Delete(env->strbuf); FreeToHeap(env); @@ -661,7 +661,7 @@ static BOOL Task_ActivateDowsingMchnUI(TaskManager *taskManager) { break; case 1: if (ov01_021F6B10(fieldSystem) == TRUE) { - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); return TRUE; } break; @@ -817,7 +817,7 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { switch (env->state) { case 0: - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); ov01_021E636C(0); env->state = 1; break; @@ -845,14 +845,14 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { break; case 4: if (sub_020505C8(fieldSystem)) { - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); ov01_021E636C(1); env->state = 5; } break; case 5: if (IsPaletteFadeFinished()) { - MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); FreeToHeap(env); return TRUE; } diff --git a/src/field_warp_tasks.c b/src/field_warp_tasks.c index f86c83845..b74d7d670 100644 --- a/src/field_warp_tasks.c +++ b/src/field_warp_tasks.c @@ -221,15 +221,15 @@ static void sub_0205316C(FieldSystem *fieldSystem) { if (fieldSystem->unkAC) { gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData)); playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData)); - fieldSystem->playerAvatar = sub_0205C390(fieldSystem->mapObjectMan, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, playerSaveData->unk4, gender, 2, playerSaveData); + fieldSystem->playerAvatar = sub_0205C390(fieldSystem->mapObjectManager, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, playerSaveData->unk4, gender, 2, playerSaveData); } else { - fieldSystem->mapObjectMan = sub_0205E0BC(fieldSystem, 64, HEAP_ID_BATTLE); + fieldSystem->mapObjectManager = sub_0205E0BC(fieldSystem, 64, HEAP_ID_BATTLE); gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData)); playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData)); - fieldSystem->playerAvatar = sub_0205C390(fieldSystem->mapObjectMan, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, playerSaveData->unk4, gender, 2, playerSaveData); - sub_020699F8(fieldSystem->mapObjectMan, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, fieldSystem->location->mapId); + fieldSystem->playerAvatar = sub_0205C390(fieldSystem->mapObjectManager, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, playerSaveData->unk4, gender, 2, playerSaveData); + sub_020699F8(fieldSystem->mapObjectManager, fieldSystem->location->x, fieldSystem->location->y, fieldSystem->location->direction, fieldSystem->location->mapId); Field_InitMapObjectsFromZoneEventData(fieldSystem); - sub_0205F55C(fieldSystem->mapObjectMan); + sub_0205F55C(fieldSystem->mapObjectManager); } } @@ -239,8 +239,8 @@ static void sub_02053210(FieldSystem *fieldSystem) { } else { sub_02056E38(); PlayerAvatar_FreeToHeap(fieldSystem->playerAvatar); - MapObjectManager_RemoveAllActiveObjects(fieldSystem->mapObjectMan); - MapObjectManager_Delete(fieldSystem->mapObjectMan); + MapObjectManager_RemoveAllActiveObjects(fieldSystem->mapObjectManager); + MapObjectManager_Delete(fieldSystem->mapObjectManager); } } @@ -248,13 +248,13 @@ static void sub_0205323C(FieldSystem *fieldSystem) { u32 gender; struct PlayerSaveData *playerSaveData; - fieldSystem->mapObjectMan = sub_0205E0BC(fieldSystem, 64, HEAP_ID_BATTLE); + fieldSystem->mapObjectManager = sub_0205E0BC(fieldSystem, 64, HEAP_ID_BATTLE); FieldSystem_RestoreMapObjectsFromSave(fieldSystem); playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fieldSystem->saveData)); gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->saveData)); - fieldSystem->playerAvatar = sub_0205C408(fieldSystem->mapObjectMan, playerSaveData, gender); - sub_02069B74(fieldSystem->mapObjectMan, fieldSystem->location->mapId); - sub_0205F55C(fieldSystem->mapObjectMan); + fieldSystem->playerAvatar = sub_0205C408(fieldSystem->mapObjectManager, playerSaveData, gender); + sub_02069B74(fieldSystem->mapObjectManager, fieldSystem->location->mapId); + sub_0205F55C(fieldSystem->mapObjectManager); } static void sub_02053284(FieldSystem *fieldSystem) { diff --git a/src/map_events.c b/src/map_events.c index f9e0146b4..e26c28f19 100644 --- a/src/map_events.c +++ b/src/map_events.c @@ -35,7 +35,7 @@ void Field_InitMapObjectsFromZoneEventData(FieldSystem *fieldSystem) { u32 obj_count = fieldSystem->mapEvents->num_object_events; GF_ASSERT(fieldSystem->mapEvents != NULL); if (obj_count != 0) { - InitMapObjectsFromEventTemplates(fieldSystem->mapObjectMan, fieldSystem->location->mapId, obj_count, fieldSystem->mapEvents->object_events); + InitMapObjectsFromEventTemplates(fieldSystem->mapObjectManager, fieldSystem->location->mapId, obj_count, fieldSystem->mapEvents->object_events); } } diff --git a/src/message_format.c b/src/message_format.c index 57e5f214c..e8beb7487 100644 --- a/src/message_format.c +++ b/src/message_format.c @@ -290,10 +290,10 @@ void BufferTrainerClassNameWithArticle(MessageFormat *msgFmt, u32 fieldno, u32 t } } -void BufferTrainerClassNameFromDataStruct(MessageFormat *msgFmt, u32 fieldno, TRAINER *trainer) { +void BufferTrainerClassNameFromDataStruct(MessageFormat *msgFmt, u32 fieldno, Trainer *trainer) { MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0730_bin, msgFmt->heapId); if (msgData != NULL) { - ReadMsgDataIntoString(msgData, trainer->trainerClass, msgFmt->buffer); + ReadMsgDataIntoString(msgData, trainer->data.trainerClass, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); DestroyMsgData(msgData); } @@ -317,7 +317,7 @@ void BufferFrontierOpponentName(MessageFormat *msgFmt, u32 fieldno, u32 opponent } } -void BufferTrainerNameFromDataStruct(MessageFormat *msgFmt, u32 fieldno, TRAINER *trainer) { +void BufferTrainerNameFromDataStruct(MessageFormat *msgFmt, u32 fieldno, Trainer *trainer) { CopyU16ArrayToString(msgFmt->buffer, trainer->name); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } @@ -349,7 +349,7 @@ void BufferGenderSymbol(MessageFormat *msgFmt, u32 fieldno, u8 gender) { DestroyMsgData(msgData); } -void BufferPCBoxName(MessageFormat *msgFmt, u32 fieldno, PC_STORAGE *pcStorage, u32 boxno) { +void BufferPCBoxName(MessageFormat *msgFmt, u32 fieldno, PCStorage *pcStorage, u32 boxno) { PCStorage_GetBoxName(pcStorage, boxno, msgFmt->buffer); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } diff --git a/src/overlay_26_022599D0.c b/src/overlay_26_022599D0.c index 1400667b0..3583d23b0 100644 --- a/src/overlay_26_022599D0.c +++ b/src/overlay_26_022599D0.c @@ -43,7 +43,7 @@ static LocalMapObject* ov26_02259A24(FieldSystem* fieldSystem, LocalMapObject* a } for (int i = 0; i < num_events; i++) { - LocalMapObject* object = GetMapObjectByID(fieldSystem->mapObjectMan, i); + LocalMapObject* object = GetMapObjectByID(fieldSystem->mapObjectManager, i); if (object == NULL) { continue; } diff --git a/src/overlay_55.c b/src/overlay_55.c index d26ffb293..4c810ebf1 100644 --- a/src/overlay_55.c +++ b/src/overlay_55.c @@ -1,6 +1,6 @@ #include #include "global.h" -#include "constants/game_stat.h" +#include "constants/game_stats.h" #include "constants/mail.h" #include "game_stats.h" #include "overlay_55.h" diff --git a/src/overlay_bug_contest.c b/src/overlay_bug_contest.c index 942fd2604..49f840aec 100644 --- a/src/overlay_bug_contest.c +++ b/src/overlay_bug_contest.c @@ -25,17 +25,17 @@ const u16 sBugContestOpponentClasses[] = { TRAINERCLASS_SCHOOL_KID_M, // Kipp }; -void BugContest_BackUpParty(BUGCONTEST *bugContest); -void BugContest_InitOpponents(BUGCONTEST *bugContest); -void BugContest_InitEncounters(BUGCONTEST *bugContest); -void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest); -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *mon); +void BugContest_BackUpParty(BugContest *bugContest); +void BugContest_InitOpponents(BugContest *bugContest); +void BugContest_InitEncounters(BugContest *bugContest); +void BugContest_RestoreParty_RetrieveCaughtPokemon(BugContest *bugContest); +u16 BugContest_JudgePlayerMon(BugContest *bugContest, Pokemon *mon); -BUGCONTEST *BugContest_New(FieldSystem *fieldSystem, u32 weekday) { - BUGCONTEST *bugContest; +BugContest *BugContest_New(FieldSystem *fieldSystem, u32 weekday) { + BugContest *bugContest; - bugContest = (BUGCONTEST *)AllocFromHeap(HEAP_ID_3, sizeof(BUGCONTEST)); - MI_CpuClear8(bugContest, sizeof(BUGCONTEST)); + bugContest = (BugContest *)AllocFromHeap(HEAP_ID_3, sizeof(BugContest)); + MI_CpuClear8(bugContest, sizeof(BugContest)); bugContest->heapId = HEAP_ID_3; bugContest->saveData = fieldSystem->saveData; bugContest->sport_balls = 20; @@ -49,17 +49,17 @@ BUGCONTEST *BugContest_New(FieldSystem *fieldSystem, u32 weekday) { return bugContest; } -void BugContest_Delete(BUGCONTEST *bugContest) { +void BugContest_Delete(BugContest *bugContest) { BugContest_RestoreParty_RetrieveCaughtPokemon(bugContest); FreeToHeap(bugContest->mon); FreeToHeap(bugContest); } -void BugContest_Judge(BUGCONTEST *bugContest) { +void BugContest_Judge(BugContest *bugContest) { int i, j, cur_max, score, score2; u8 temp; u8 rand; - BUGCONTESTANT *player; + BugContestant *player; // Judge the player's caught Pokemon player = &bugContest->contestants[BUGCONTESTANT_PLAYER]; @@ -123,8 +123,8 @@ void BugContest_Judge(BUGCONTEST *bugContest) { } } -void BugContest_BufferContestWinnerNames(BUGCONTEST *bugContest, MsgData *msgData, MessageFormat *msgFmt, u8 place) { - BUGCONTESTANT *contestant; +void BugContest_BufferContestWinnerNames(BugContest *bugContest, MsgData *msgData, MessageFormat *msgFmt, u8 place) { + BugContestant *contestant; String *string; contestant = &bugContest->contestants[bugContest->ranking[place]]; @@ -140,7 +140,7 @@ void BugContest_BufferContestWinnerNames(BUGCONTEST *bugContest, MsgData *msgDat BufferIntegerAsString(msgFmt, 3, contestant->score, 3, PRINTING_MODE_LEFT_ALIGN, 1); } -BOOL BugContest_ContestantIsRegistered(BUGCONTEST *bugContest, u8 id) { +BOOL BugContest_ContestantIsRegistered(BugContest *bugContest, u8 id) { int i; for (i = 0; i < BUGCONTESTANT_NPC_COUNT; i++) { if (id == bugContest->contestants[i].id) { @@ -150,7 +150,7 @@ BOOL BugContest_ContestantIsRegistered(BUGCONTEST *bugContest, u8 id) { return FALSE; } -BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MessageFormat *msgFmt, u8 slot) { +BOOL BugContest_BufferCaughtMonNick(BugContest *bugContest, MessageFormat *msgFmt, u8 slot) { String *string; if (!bugContest->caught_poke) { @@ -164,7 +164,7 @@ BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MessageFormat *msgFm return bugContest->party_cur_num >= PARTY_SIZE; } -ENC_SLOT *BugContest_GetEncounterSlot(BUGCONTEST *bugContest, HeapID heapId) { +ENC_SLOT *BugContest_GetEncounterSlot(BugContest *bugContest, HeapID heapId) { ENC_SLOT *slot; u16 roll; int i; @@ -184,7 +184,7 @@ ENC_SLOT *BugContest_GetEncounterSlot(BUGCONTEST *bugContest, HeapID heapId) { return slot; } -void BugContest_BackUpParty(BUGCONTEST *bugContest) { +void BugContest_BackUpParty(BugContest *bugContest) { int i; bugContest->party_bak = SaveArray_Party_Alloc(bugContest->heapId); bugContest->party_cur = SaveArray_Party_Get(bugContest->saveData); @@ -202,7 +202,7 @@ void BugContest_BackUpParty(BUGCONTEST *bugContest) { } } -void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest) { +void BugContest_RestoreParty_RetrieveCaughtPokemon(BugContest *bugContest) { Pokemon *mon; PartyExtraSub sub; @@ -227,7 +227,7 @@ void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest) { } } -BOOL BugContest_ContestantIsRegisteredN(BUGCONTEST *bugContest, u8 id, u8 n) { +BOOL BugContest_ContestantIsRegisteredN(BugContest *bugContest, u8 id, u8 n) { int i; for (i = 0; i < n; i++) { if (id == bugContest->contestants[i].id) { @@ -237,10 +237,10 @@ BOOL BugContest_ContestantIsRegisteredN(BUGCONTEST *bugContest, u8 id, u8 n) { return FALSE; } -void BugContest_InitOpponents(BUGCONTEST *bugContest) { +void BugContest_InitOpponents(BugContest *bugContest) { FSFile file; u32 flen; - BUGCONTESTANT_BIN *bin, *curbin; + BugContestantData *bin, *curbin; u8 *idxs; int i, j, k; u8 rand; @@ -274,7 +274,7 @@ void BugContest_InitOpponents(BUGCONTEST *bugContest) { } idxs[k++] = j; } - MI_CpuCopy8(&curbin[idxs[LCRandom() % k]], &bugContest->contestants[i].data, sizeof(BUGCONTESTANT_BIN)); + MI_CpuCopy8(&curbin[idxs[LCRandom() % k]], &bugContest->contestants[i].data, sizeof(BugContestantData)); score = (LCRandom() % (2 * bugContest->contestants[i].data.randmod)) - bugContest->contestants[i].data.randmod; bugContest->contestants[i].score = score + bugContest->contestants[i].data.score; } @@ -283,7 +283,7 @@ void BugContest_InitOpponents(BUGCONTEST *bugContest) { FS_CloseFile(&file); } -void BugContest_InitEncounters(BUGCONTEST *bugContest) { +void BugContest_InitEncounters(BugContest *bugContest) { FSFile file; u32 flen; BUGMON *bugmon; @@ -307,7 +307,7 @@ void BugContest_InitEncounters(BUGCONTEST *bugContest) { FS_CloseFile(&file); } -u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *mon) { +u16 BugContest_JudgePlayerMon(BugContest *bugContest, Pokemon *mon) { u16 score = 0; int i; u16 species; diff --git a/src/pal_park.c b/src/pal_park.c index 5479bd736..079c46995 100644 --- a/src/pal_park.c +++ b/src/pal_park.c @@ -8,7 +8,7 @@ #include "unk_02054648.h" #include "metatile_behavior.h" #include "battle/battle_setup.h" -#include "constants/game_stat.h" +#include "constants/game_stats.h" #include "constants/battle.h" #include "arc/ppark.naix" diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 6ead7beab..de874d816 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -5,19 +5,19 @@ #include "msgdata/msg.naix" #include "msgdata/msg/msg_0024.h" -void PCStorage_InitializeBoxes(PC_STORAGE *storage); -BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE *storage, u32 boxno, BoxPokemon *boxMon); -void PCStorage_SetBoxModified(PC_STORAGE *storage, u8 boxno); +void PCStorage_InitializeBoxes(PCStorage *storage); +BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PCStorage *storage, u32 boxno, BoxPokemon *boxMon); +void PCStorage_SetBoxModified(PCStorage *storage, u8 boxno); -void PCStorage_Init(PC_STORAGE *storage) { +void PCStorage_Init(PCStorage *storage) { PCStorage_InitializeBoxes(storage); } u32 PCStorage_sizeof(void) { - return sizeof(PC_STORAGE); + return sizeof(PCStorage); } -void PCStorage_InitializeBoxes(PC_STORAGE *storage) { +void PCStorage_InitializeBoxes(PCStorage *storage) { u32 i, j; MsgData *msgData; @@ -48,7 +48,7 @@ void PCStorage_InitializeBoxes(PC_STORAGE *storage) { storage->curBox = 0; } -BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon *boxMon) { +BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PCStorage *storage, BoxPokemon *boxMon) { u32 i = storage->curBox; do { RestoreBoxMonPP(boxMon); @@ -64,7 +64,7 @@ BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon return FALSE; } -BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon *boxMon) { +BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PCStorage* storage, u32 boxno, BoxPokemon *boxMon) { u32 i; RestoreBoxMonPP(boxMon); if (boxno == -1u) { @@ -80,7 +80,7 @@ BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPo return FALSE; } -BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon *boxMon) { +BOOL PCStorage_PlaceMonInBoxByIndexPair(PCStorage* storage, u32 boxno, u32 slotno, BoxPokemon *boxMon) { RestoreBoxMonPP(boxMon); if (boxno == -1u) { boxno = storage->curBox; @@ -94,7 +94,7 @@ BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slot return FALSE; } -void PCStorage_SwapMonsInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 from, u32 to) { +void PCStorage_SwapMonsInBoxByIndexPair(PCStorage* storage, u32 boxno, u32 from, u32 to) { BoxPokemon temp; temp = storage->boxes[boxno].mons[from]; @@ -103,7 +103,7 @@ void PCStorage_SwapMonsInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 from PCStorage_SetBoxModified(storage, boxno); } -void PCStorage_DeleteBoxMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno) { +void PCStorage_DeleteBoxMonByIndexPair(PCStorage* storage, u32 boxno, u32 slotno) { if (boxno == -1u) { boxno = storage->curBox; } @@ -116,11 +116,11 @@ void PCStorage_DeleteBoxMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotn GF_ASSERT(0); } -int PCStorage_GetActiveBox(PC_STORAGE *storage) { +int PCStorage_GetActiveBox(PCStorage *storage) { return storage->curBox; } -int PCStorage_FindFirstBoxWithEmptySlot(PC_STORAGE *storage) { +int PCStorage_FindFirstBoxWithEmptySlot(PCStorage *storage) { int boxno = storage->curBox; int i; @@ -138,7 +138,7 @@ int PCStorage_FindFirstBoxWithEmptySlot(PC_STORAGE *storage) { return NUM_BOXES; } -BOOL PCStorage_FindFirstEmptySlot(PC_STORAGE* storage, int* boxno_p, int* slotno_p) { +BOOL PCStorage_FindFirstEmptySlot(PCStorage* storage, int* boxno_p, int* slotno_p) { int i, j; if (*boxno_p == -1) { @@ -173,7 +173,7 @@ BOOL PCStorage_FindFirstEmptySlot(PC_STORAGE* storage, int* boxno_p, int* slotno return NUM_BOXES; } -int PCStorage_CountEmptySpotsInAllBoxes(PC_STORAGE* storage) { +int PCStorage_CountEmptySpotsInAllBoxes(PCStorage* storage) { int i, j, count = 0; for (i = 0; i < NUM_BOXES; i++) { for (j = 0; j < MONS_PER_BOX; j++) { @@ -185,7 +185,7 @@ int PCStorage_CountEmptySpotsInAllBoxes(PC_STORAGE* storage) { return count; } -int PCStorage_CountEmptySpotsInBox(PC_STORAGE* storage, u32 boxno) { +int PCStorage_CountEmptySpotsInBox(PCStorage* storage, u32 boxno) { int i, count; if (boxno == -1u) { @@ -201,7 +201,7 @@ int PCStorage_CountEmptySpotsInBox(PC_STORAGE* storage, u32 boxno) { return count; } -void PCStorage_SetActiveBox(PC_STORAGE* storage, u32 boxno) { +void PCStorage_SetActiveBox(PCStorage* storage, u32 boxno) { if (boxno < NUM_BOXES) { storage->curBox = boxno; return; @@ -209,7 +209,7 @@ void PCStorage_SetActiveBox(PC_STORAGE* storage, u32 boxno) { GF_ASSERT(0); } -u8 PCStorage_GetBoxWallpaper(PC_STORAGE* storage, u32 boxno) { +u8 PCStorage_GetBoxWallpaper(PCStorage* storage, u32 boxno) { if (boxno < NUM_BOXES) { return storage->wallpapers[boxno]; } @@ -222,7 +222,7 @@ BOOL PCStorage_IsValidWallpaperId(u8 wallpaperno) { || (wallpaperno >= BONUS_WALLPAPER_MIN && wallpaperno < BONUS_WALLPAPER_MAX); } -void PCStorage_SetBoxWallpaper(PC_STORAGE* storage, u32 boxno, u8 wallpaperno) { +void PCStorage_SetBoxWallpaper(PCStorage* storage, u32 boxno, u8 wallpaperno) { if (boxno == -1u) { boxno = storage->curBox; } @@ -233,7 +233,7 @@ void PCStorage_SetBoxWallpaper(PC_STORAGE* storage, u32 boxno, u8 wallpaperno) { GF_ASSERT(0); } -void PCStorage_GetBoxName(PC_STORAGE* storage, u32 boxno, String* dest) { +void PCStorage_GetBoxName(PCStorage* storage, u32 boxno, String* dest) { if (boxno == -1u) { boxno = storage->curBox; } @@ -244,7 +244,7 @@ void PCStorage_GetBoxName(PC_STORAGE* storage, u32 boxno, String* dest) { GF_ASSERT(0); } -void PCStorage_SetBoxName(PC_STORAGE* storage, u32 boxno, const String* src) { +void PCStorage_SetBoxName(PCStorage* storage, u32 boxno, const String* src) { if (boxno == -1u) { boxno = storage->curBox; } @@ -253,7 +253,7 @@ void PCStorage_SetBoxName(PC_STORAGE* storage, u32 boxno, const String* src) { } } -int PCStorage_CountMonsAndEggsInBox(PC_STORAGE* storage, u32 boxno) { +int PCStorage_CountMonsAndEggsInBox(PCStorage* storage, u32 boxno) { int i, count; if (boxno == -1u) { boxno = storage->curBox; @@ -272,7 +272,7 @@ int PCStorage_CountMonsAndEggsInBox(PC_STORAGE* storage, u32 boxno) { return 0; } -int PCStorage_CountMonsInBox(PC_STORAGE* storage, u32 boxno) { +int PCStorage_CountMonsInBox(PCStorage* storage, u32 boxno) { int i, count; if (boxno == -1u) { boxno = storage->curBox; @@ -292,7 +292,7 @@ int PCStorage_CountMonsInBox(PC_STORAGE* storage, u32 boxno) { return 0; } -int PCStorage_CountMonsInAllBoxes(PC_STORAGE* storage) { +int PCStorage_CountMonsInAllBoxes(PCStorage* storage) { int count; u32 i; @@ -302,7 +302,7 @@ int PCStorage_CountMonsInAllBoxes(PC_STORAGE* storage) { return count; } -u32 PCStorage_GetMonDataByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, int attr, void *ptr) { +u32 PCStorage_GetMonDataByIndexPair(PCStorage* storage, u32 boxno, u32 slotno, int attr, void *ptr) { GF_ASSERT(boxno < NUM_BOXES || boxno == -1u); GF_ASSERT(slotno < MONS_PER_BOX); if (boxno == -1u) { @@ -311,7 +311,7 @@ u32 PCStorage_GetMonDataByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, return GetBoxMonData(&storage->boxes[boxno].mons[slotno], attr, ptr); } -BoxPokemon *PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno) { +BoxPokemon *PCStorage_GetMonByIndexPair(PCStorage* storage, u32 boxno, u32 slotno) { GF_ASSERT(boxno < NUM_BOXES || boxno == -1u); GF_ASSERT(slotno < MONS_PER_BOX); if (boxno == -1u) { @@ -320,17 +320,17 @@ BoxPokemon *PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slot return &storage->boxes[boxno].mons[slotno]; } -void PCStorage_UnlockBonusWallpaper(PC_STORAGE* storage, u32 wallpaper) { +void PCStorage_UnlockBonusWallpaper(PCStorage* storage, u32 wallpaper) { GF_ASSERT(wallpaper < NUM_BONUS_WALLPAPER); storage->unlockedWallpapers |= (1 << wallpaper); } -BOOL PCStorage_IsBonusWallpaperUnlocked(PC_STORAGE* storage, u32 wallpaper) { +BOOL PCStorage_IsBonusWallpaperUnlocked(PCStorage* storage, u32 wallpaper) { GF_ASSERT(wallpaper < NUM_BONUS_WALLPAPER); return (storage->unlockedWallpapers & (1 << wallpaper)) != 0; } -void PCStorage_SetBoxModified(PC_STORAGE* storage, u8 boxno) { +void PCStorage_SetBoxModified(PCStorage* storage, u8 boxno) { if (boxno >= NUM_BOXES) { GF_ASSERT(0); return; @@ -338,15 +338,15 @@ void PCStorage_SetBoxModified(PC_STORAGE* storage, u8 boxno) { storage->boxModifiedFlag |= 1 << boxno; } -void PCStorage_SetAllBoxesModified(PC_STORAGE* storage) { +void PCStorage_SetAllBoxesModified(PCStorage* storage) { storage->boxModifiedFlag = BOX_ALL_MODIFIED_FLAG; } -void PCStorage_ResetBoxModifiedFlags(PC_STORAGE* storage) { +void PCStorage_ResetBoxModifiedFlags(PCStorage* storage) { storage->boxModifiedFlag = 0; } -u32 PCStorage_GetBoxModifiedFlags(PC_STORAGE* storage) { +u32 PCStorage_GetBoxModifiedFlags(PCStorage* storage) { return storage->boxModifiedFlag; } @@ -354,7 +354,7 @@ u32 sub_02074120(void) { return sizeof(PC_BOX); } -void sub_02074128(PC_STORAGE* storage) { +void sub_02074128(PCStorage* storage) { u8 i, j; for (i = 0; i < NUM_BOXES; i++) { diff --git a/src/save_arrays.c b/src/save_arrays.c index 39b1f4d06..f946fda08 100644 --- a/src/save_arrays.c +++ b/src/save_arrays.c @@ -262,12 +262,12 @@ const struct SaveChunkHeader gSaveChunkHeaders[] = { }; const int gNumSaveChunkHeaders = NELEMS(gSaveChunkHeaders); -struct UnkStruct_0202E474 *sub_020270C4(SaveData *saveData) { +struct UnkStruct_0202E474 *sub_020270C4(SaveData *saveData) { //Save_SafariZone_Get? conflicts with other one SaveSubstruct_AssertCRC(SAVE_UNK_23); return SaveArray_Get(saveData, SAVE_UNK_23); } -PC_STORAGE *SaveArray_PCStorage_Get(SaveData *saveData) { +PCStorage *SaveArray_PCStorage_Get(SaveData *saveData) { return SaveArray_Get(saveData, SAVE_PCSTORAGE); } @@ -329,21 +329,21 @@ u32 PCStorage_GetNumBoxes(void) { } u32 Save_GetPCBoxModifiedFlags(SaveData *saveData) { - PC_STORAGE *pcStorage = SaveArray_Get(saveData, SAVE_PCSTORAGE); + PCStorage *pcStorage = SaveArray_Get(saveData, SAVE_PCSTORAGE); return PCStorage_GetBoxModifiedFlags(pcStorage); } void Save_ResetPCBoxModifiedFlags(SaveData *saveData) { - PC_STORAGE *pcStorage = SaveArray_Get(saveData, SAVE_PCSTORAGE); + PCStorage *pcStorage = SaveArray_Get(saveData, SAVE_PCSTORAGE); PCStorage_ResetBoxModifiedFlags(pcStorage); } void Save_SetAllPCBoxesModified(SaveData *saveData) { - PC_STORAGE *pcStorage = SaveArray_Get(saveData, SAVE_PCSTORAGE); + PCStorage *pcStorage = SaveArray_Get(saveData, SAVE_PCSTORAGE); PCStorage_SetAllBoxesModified(pcStorage); } void sub_020271A0(SaveData *saveData) { - PC_STORAGE *pcStorage = SaveArray_Get(saveData, SAVE_PCSTORAGE); + PCStorage *pcStorage = SaveArray_Get(saveData, SAVE_PCSTORAGE); sub_02074128(pcStorage); } diff --git a/src/save_local_field_data.c b/src/save_local_field_data.c index 93215d092..961c53004 100644 --- a/src/save_local_field_data.c +++ b/src/save_local_field_data.c @@ -123,7 +123,7 @@ struct SavedMapObjectList *Save_MapObjects_Get(SaveData *saveData) { void FieldSystem_SyncMapObjectsToSave(FieldSystem *fieldSystem) { struct SavedMapObjectList *unk = Save_MapObjects_Get(fieldSystem->saveData); - FieldSystem_SyncMapObjectsToSaveEx(fieldSystem, fieldSystem->mapObjectMan, unk->subs, 64); + FieldSystem_SyncMapObjectsToSaveEx(fieldSystem, fieldSystem->mapObjectManager, unk->subs, 64); } void FieldSystem_RestoreMapObjectsFromSave(FieldSystem *fieldSystem) { @@ -143,5 +143,5 @@ void FieldSystem_RestoreMapObjectsFromSave(FieldSystem *fieldSystem) { follower->gfxId = SPRITE_FOLLOWER_MON_SHAYMIN; } } - MapObjectManager_RestoreFromSave(fieldSystem->mapObjectMan, unk->subs, 64); + MapObjectManager_RestoreFromSave(fieldSystem->mapObjectManager, unk->subs, 64); } diff --git a/src/scrcmd_12.c b/src/scrcmd_12.c index 115294dfc..126cd37a4 100644 --- a/src/scrcmd_12.c +++ b/src/scrcmd_12.c @@ -54,7 +54,7 @@ BOOL ScrCmd_509(ScriptContext *ctx) { BOOL ScrCmd_510(ScriptContext *ctx) { struct MigratedPokemonSav *unkStruct = Save_MigratedPokemon_Get(ctx->fieldSystem->saveData); - PC_STORAGE *storage = SaveArray_PCStorage_Get(ctx->fieldSystem->saveData); + PCStorage *storage = SaveArray_PCStorage_Get(ctx->fieldSystem->saveData); Pokemon *mon = AllocMonZeroed(HEAP_ID_32); PlayerProfile *profile = Save_PlayerData_GetProfileAddr(ctx->fieldSystem->saveData); Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveData); diff --git a/src/scrcmd_20.c b/src/scrcmd_20.c index cdd0fc0a0..cc426912a 100644 --- a/src/scrcmd_20.c +++ b/src/scrcmd_20.c @@ -27,7 +27,7 @@ #include "unk_02078E30.h" #include "unk_02088288.h" #include "unk_02091564.h" -#include "constants/game_stat.h" +#include "constants/game_stats.h" typedef enum BattleHallChallengeType { BATTLE_HALL_CHALLENGE_TYPE_SINGLE, diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 9c27f362b..5abf0754b 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -1182,12 +1182,12 @@ BOOL ScrCmd_563(ScriptContext *ctx) { LocalMapObject *sub_02041C70(FieldSystem *fieldSystem, u16 person) { if (person == 0xF2) { - return sub_0205EEB4(fieldSystem->mapObjectMan, 0x30); + return sub_0205EEB4(fieldSystem->mapObjectManager, 0x30); } else if (person == 0xF1) { LocalMapObject **attr = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_CAMERA_TARGET); return *attr; } else { - return GetMapObjectByID(fieldSystem->mapObjectMan, person); + return GetMapObjectByID(fieldSystem->mapObjectManager, person); } } @@ -1250,7 +1250,7 @@ BOOL ScrCmd_LockAll(ScriptContext *ctx) { p_lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); if (*p_lastInteracted == NULL) { - MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager); followingPoke = FollowingPokemon_GetMapObject(fieldSystem); if (FollowingPokemon_IsActive(fieldSystem) && MapObject_IsSingleMovementActive(followingPoke)) { MapObject_UnpauseMovement(followingPoke); @@ -1304,7 +1304,7 @@ static BOOL _WaitMovementPauseBeforeMsg(ScriptContext *ctx) { } if (_CheckMovementPauseWaitFlag(2)) { - unk = sub_0205EEB4(fieldSystem->mapObjectMan, 0x30); + unk = sub_0205EEB4(fieldSystem->mapObjectManager, 0x30); if (MapObject_IsSingleMovementActive(unk) == FALSE) { MapObject_PauseMovement(unk); _ClearMovementPauseWaitFlag(2); @@ -1336,13 +1336,13 @@ BOOL ScrCmd_LockLastTalked(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); LocalMapObject *playerObject = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); - LocalMapObject *unk = sub_0205EEB4(fieldSystem->mapObjectMan, 0x30); + LocalMapObject *unk = sub_0205EEB4(fieldSystem->mapObjectManager, 0x30); LocalMapObject *unk2 = sub_020660C0(*p_lastInteracted); - MapObjectManager *mapObjectMan = fieldSystem->mapObjectMan; + MapObjectManager *mapObjectManager = fieldSystem->mapObjectManager; _ResetMovementPauseWaitFlags(); - MapObjectManager_PauseAllMovement(mapObjectMan); + MapObjectManager_PauseAllMovement(mapObjectManager); if (MapObject_IsMovementPaused(playerObject) == FALSE) { _SetMovementPauseWaitFlag(1); @@ -1369,14 +1369,14 @@ BOOL ScrCmd_LockLastTalked(ScriptContext *ctx) { } BOOL ScrCmd_ReleaseAll(ScriptContext *ctx) { - MapObjectManager_UnpauseAllMovement(ctx->fieldSystem->mapObjectMan); + MapObjectManager_UnpauseAllMovement(ctx->fieldSystem->mapObjectManager); return TRUE; } BOOL ScrCmd_098(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 objectId = ScriptReadHalfword(ctx); - LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectManager, objectId); if (object != NULL) { MapObject_PauseMovement(object); } else { @@ -1388,7 +1388,7 @@ BOOL ScrCmd_098(ScriptContext *ctx) { BOOL ScrCmd_099(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 objectId = ScriptReadHalfword(ctx); - LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectManager, objectId); if (object != NULL) { MapObject_UnpauseMovement(object); } else { @@ -1402,14 +1402,14 @@ BOOL ScrCmd_ShowPerson(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u32 nobjs = Field_GetNumObjectEvents(fieldSystem); const ObjectEvent *objectEvents = Field_GetObjectEvents(fieldSystem); - GF_ASSERT(CreateMapObjectFromTemplate(fieldSystem->mapObjectMan, objectId, nobjs, fieldSystem->location->mapId, objectEvents)); + GF_ASSERT(CreateMapObjectFromTemplate(fieldSystem->mapObjectManager, objectId, nobjs, fieldSystem->location->mapId, objectEvents)); return FALSE; } BOOL ScrCmd_HidePerson(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 objectId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectManager, objectId); if (object == NULL) { GF_ASSERT(0); } else { @@ -1423,7 +1423,7 @@ BOOL ScrCmd_102(ScriptContext *ctx) { u16 y = ScriptGetVar(ctx); LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET); VecFx32 *pos; - *p_cameraObj = CreateSpecialFieldObject(ctx->fieldSystem->mapObjectMan, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fieldSystem->location->mapId); + *p_cameraObj = CreateSpecialFieldObject(ctx->fieldSystem->mapObjectManager, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fieldSystem->location->mapId); sub_02061070(*p_cameraObj); MapObject_SetVisible(*p_cameraObj, TRUE); MapObject_ClearFlag18(*p_cameraObj, FALSE); @@ -1437,7 +1437,7 @@ BOOL ScrCmd_103(ScriptContext *ctx) { LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET); VecFx32 *pos; MapObject_Remove(*p_cameraObj); - pos = MapObject_GetPositionVecPtr(GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_player)); + pos = MapObject_GetPositionVecPtr(GetMapObjectByID(ctx->fieldSystem->mapObjectManager, obj_player)); ov01_021F62E8(pos, ctx->fieldSystem->unk2C); Camera_SetFixedTarget(pos, ctx->fieldSystem->camera); return FALSE; @@ -1447,7 +1447,7 @@ BOOL ScrCmd_678(ScriptContext *ctx) { u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET); - *p_cameraObj = CreateSpecialFieldObject(ctx->fieldSystem->mapObjectMan, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fieldSystem->location->mapId); + *p_cameraObj = CreateSpecialFieldObject(ctx->fieldSystem->mapObjectManager, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fieldSystem->location->mapId); sub_02061070(*p_cameraObj); MapObject_SetVisible(*p_cameraObj, TRUE); MapObject_ClearFlag18(*p_cameraObj, FALSE); @@ -1513,7 +1513,7 @@ BOOL ScrCmd_GetPlayerCoords(ScriptContext *ctx) { BOOL ScrCmd_GetPersonCoords(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 personId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, personId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectManager, personId); u16 *p_x = ScriptGetVarPointer(ctx); u16 *p_y = ScriptGetVarPointer(ctx); @@ -1552,7 +1552,7 @@ BOOL ScrCmd_107(ScriptContext *ctx) { BOOL ScrCmd_108(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); u8 arg = ScriptReadByte(ctx); MapObject_SetFlag10(object, arg); return FALSE; @@ -1560,7 +1560,7 @@ BOOL ScrCmd_108(ScriptContext *ctx) { BOOL ScrCmd_109(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); u16 arg = ScriptReadHalfword(ctx); if (object != NULL) { sub_0205FC94(object, arg); @@ -1572,7 +1572,7 @@ BOOL ScrCmd_574(ScriptContext *ctx) { u16 *p_dest = ScriptGetVarPointer(ctx); *p_dest = 0; u16 objectId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); if (object != NULL) { *p_dest = MapObject_GetMovement(object); } @@ -2099,7 +2099,7 @@ BOOL ScrCmd_NameRival(ScriptContext *ctx) { BOOL ScrCmd_NicknameInput(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 partyPos = ScriptGetVar(ctx); - BUGCONTEST *contest; + BugContest *contest; Pokemon *mon; u16 nickname[20]; u16 *var_ret; @@ -2466,7 +2466,7 @@ BOOL ScrCmd_229(ScriptContext *ctx) { BOOL ScrCmd_230(ScriptContext *ctx) { struct UnkStruct_ScrCmd230 **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); struct UnkStruct_ScrCmd230 *work = *p_work; - sub_02051428(ctx->fieldSystem->taskman, &work->unk_30, 5); + CallTask_020508B8(ctx->fieldSystem->taskman, &work->unk_30, 5); FreeToHeap(work); *p_work = NULL; return TRUE; @@ -2575,14 +2575,14 @@ BOOL ScrCmd_686(ScriptContext *ctx) { u32 *winFlag = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); u16 species = ScriptGetVar(ctx); u16 level = ScriptGetVar(ctx); - sub_02051090(ctx->taskman, species, level, winFlag, TRUE); + SetupAndStartFatefulWildBattle(ctx->taskman, species, level, winFlag, TRUE); return TRUE; } BOOL ScrCmd_250(ScriptContext *ctx) { u16 species = ScriptGetVar(ctx); u16 level = ScriptGetVar(ctx); - sub_02051228(ctx->taskman, species, level); + SetupAndStartFirstBattle(ctx->taskman, species, level); return TRUE; } @@ -2777,7 +2777,7 @@ BOOL sub_02044318(ScriptContext *ctx) { } BOOL ScrCmd_270(ScriptContext *ctx) { - sub_0205B27C(ctx->fieldSystem->mapObjectMan, ctx->fieldSystem->unk84); + sub_0205B27C(ctx->fieldSystem->mapObjectManager, ctx->fieldSystem->unk84); return FALSE; } @@ -2978,7 +2978,7 @@ BOOL ScrCmd_MovePersonFacing(ScriptContext *ctx) { u16 height = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); u16 direction = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); sub_0205FC2C(object, x, height, y, direction); sub_02061070(object); return FALSE; @@ -3017,7 +3017,7 @@ BOOL ScrCmd_MoveBgEvent(ScriptContext *ctx) { BOOL ScrCmd_344(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u16 dir = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); GF_ASSERT(object != NULL); ov01_021F9408(object, dir); return FALSE; @@ -3201,7 +3201,7 @@ BOOL ScrCmd_EggHatchAnim(ScriptContext *ctx) { BOOL ScrCmd_374(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 objId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectManager, objId); GF_ASSERT(object != NULL); MapObject_SetVisible(object, FALSE); return FALSE; @@ -3210,7 +3210,7 @@ BOOL ScrCmd_374(ScriptContext *ctx) { BOOL ScrCmd_375(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 objId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectManager, objId); GF_ASSERT(object != NULL); MapObject_SetVisible(object, TRUE); return FALSE; @@ -3575,7 +3575,7 @@ BOOL ScrCmd_PrimoPasswordCheck1(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(fieldSystem)); u16 *p_ret = ScriptGetVarPointer(ctx); - PC_STORAGE *pcStorage = SaveArray_PCStorage_Get(fieldSystem->saveData); + PCStorage *pcStorage = SaveArray_PCStorage_Get(fieldSystem->saveData); u16 a = ScriptGetVar(ctx); u16 b = ScriptGetVar(ctx); u16 c = ScriptGetVar(ctx); @@ -3597,7 +3597,7 @@ BOOL ScrCmd_PrimoPasswordCheck2(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(fieldSystem)); u16 *p_ret = ScriptGetVarPointer(ctx); - PC_STORAGE *pcStorage = SaveArray_PCStorage_Get(fieldSystem->saveData); + PCStorage *pcStorage = SaveArray_PCStorage_Get(fieldSystem->saveData); u16 a = ScriptGetVar(ctx); u16 b = ScriptGetVar(ctx); u16 c = ScriptGetVar(ctx); @@ -3764,7 +3764,7 @@ BOOL ScrCmd_523(ScriptContext *ctx) { u16 sp8 = ScriptGetVar(ctx); u16 r6 = ScriptGetVar(ctx); u16 r4 = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); GF_ASSERT(object != NULL); sub_0205BED8(ctx->taskman, object, spC, sp8, r6, r4); return TRUE; @@ -3774,7 +3774,7 @@ BOOL ScrCmd_524(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u16 r7 = ScriptGetVar(ctx); u16 r6 = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); GF_ASSERT(object != NULL); sub_0205BFB4(ctx->taskman, object, r7, r6); return TRUE; @@ -4100,7 +4100,7 @@ BOOL ScrCmd_582(ScriptContext *ctx) { BOOL ScrCmd_583(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u8 r4 = ScriptReadByte(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); GF_ASSERT(object != NULL); MapObject_ClearFlag18(object, r4); return FALSE; @@ -4287,7 +4287,7 @@ u32 sub_020467A8(SaveData *saveData) { } } - PC_STORAGE *pcStorage = SaveArray_PCStorage_Get(saveData); + PCStorage *pcStorage = SaveArray_PCStorage_Get(saveData); for (i = 0; i < (u32)NUM_BOXES; i++) { for (j = 0; j < MONS_PER_BOX; j++) { BoxPokemon *boxMon = PCStorage_GetMonByIndexPair(pcStorage, i, j); @@ -4413,13 +4413,13 @@ BOOL ScrCmd_FollowerPokeIsEventTrigger(ScriptContext *ctx) { BOOL ScrCmd_596(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = ov01_022055DC(GetMapObjectByID(fieldSystem->mapObjectMan, obj_partner_poke)); + *p_ret = ov01_022055DC(GetMapObjectByID(fieldSystem->mapObjectManager, obj_partner_poke)); return FALSE; } BOOL ScrCmd_597(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - ov01_02203AB4(fieldSystem, GetMapObjectByID(fieldSystem->mapObjectMan, obj_partner_poke), 0); + ov01_02203AB4(fieldSystem, GetMapObjectByID(fieldSystem->mapObjectManager, obj_partner_poke), 0); return TRUE; } @@ -4503,7 +4503,7 @@ BOOL ScrCmd_WaitFollowingPokemonMovement(ScriptContext *ctx) { BOOL ScrCmd_FollowingPokemonMovement(ScriptContext *ctx) { u16 movement = ScriptReadHalfword(ctx); if (FollowingPokemon_IsActive(ctx->fieldSystem)) { - sub_0205FC94(GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_partner_poke), movement); + sub_0205FC94(GetMapObjectByID(ctx->fieldSystem->mapObjectManager, obj_partner_poke), movement); } return TRUE; } @@ -4521,7 +4521,7 @@ BOOL ScrCmd_605(ScriptContext *ctx) { u8 r4 = ScriptReadByte(ctx); if (FollowingPokemon_IsActive(ctx->fieldSystem)) { LocalMapObject *playerObj = PlayerAvatar_GetMapObject(ctx->fieldSystem->playerAvatar); - LocalMapObject *tsurePokeObj = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_partner_poke); + LocalMapObject *tsurePokeObj = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, obj_partner_poke); ov01_02205720(playerObj, tsurePokeObj, r6, r4); } return FALSE; @@ -4551,7 +4551,7 @@ BOOL ScrCmd_607(ScriptContext *ctx) { BOOL ScrCmd_608(ScriptContext *ctx) { if (FollowingPokemon_IsActive(ctx->fieldSystem)) { - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_partner_poke); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, obj_partner_poke); ov01_02205784(object); } return FALSE; @@ -4559,7 +4559,7 @@ BOOL ScrCmd_608(ScriptContext *ctx) { BOOL ScrCmd_609(ScriptContext *ctx) { if (FollowingPokemon_IsActive(ctx->fieldSystem)) { - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_partner_poke); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, obj_partner_poke); sub_020659CC(object); } return TRUE; @@ -4778,7 +4778,7 @@ BOOL ScrCmd_621(ScriptContext *ctx) { BOOL ScrCmd_622(ScriptContext *ctx) { u16 objectId = ScriptReadHalfword(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, objectId); if (object != NULL) { *p_ret = MapObject_GetFacingDirection(object); } else { diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index 980dadb27..df6e09313 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -157,7 +157,7 @@ BOOL ScrCmd_UpdateDaycareMonObjects(ScriptContext* ctx) { daycare = Save_Daycare_Get(fieldSystem->saveData); for (s32 dc_mon_idx = 0, y = 5, x = 8; dc_mon_idx < 2; dc_mon_idx++, y += 4, x += 2) { - LocalMapObject* mon_map_object = GetMapObjectByID(fieldSystem->mapObjectMan, obj_daycare_poke_1 + dc_mon_idx); + LocalMapObject* mon_map_object = GetMapObjectByID(fieldSystem->mapObjectManager, obj_daycare_poke_1 + dc_mon_idx); if (mon_map_object) { DeleteMapObject(mon_map_object); } @@ -172,7 +172,7 @@ BOOL ScrCmd_UpdateDaycareMonObjects(ScriptContext* ctx) { u32 gender = GetBoxMonData(boxMon, MON_DATA_GENDER, NULL); BOOL shiny = BoxMonIsShiny(boxMon); - CreateDaycareMonSpriteInternal(fieldSystem->mapObjectMan, (u8)dc_mon_idx, species, form, gender, 1, x, y, fieldSystem->location->mapId, shiny); + CreateDaycareMonSpriteInternal(fieldSystem->mapObjectManager, (u8)dc_mon_idx, species, form, gender, 1, x, y, fieldSystem->location->mapId, shiny); } return FALSE; diff --git a/src/scrcmd_lottery.c b/src/scrcmd_lottery.c index 656f36e1f..c4445c158 100644 --- a/src/scrcmd_lottery.c +++ b/src/scrcmd_lottery.c @@ -23,7 +23,7 @@ BOOL ScrCmd_LotoIdGet(ScriptContext *ctx) { BOOL ScrCmd_LotoIdSearch(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - PC_STORAGE *storage = SaveArray_PCStorage_Get(fieldSystem->saveData); + PCStorage *storage = SaveArray_PCStorage_Get(fieldSystem->saveData); u16 *retPtr0 = ScriptGetVarPointer(ctx); u16 *retPtr1 = ScriptGetVarPointer(ctx); u16 *retPtr2 = ScriptGetVarPointer(ctx); diff --git a/src/scrcmd_party.c b/src/scrcmd_party.c index 36cfd146d..f916fee75 100644 --- a/src/scrcmd_party.c +++ b/src/scrcmd_party.c @@ -375,7 +375,7 @@ BOOL ScrCmd_CountAliveMonsAndPC(ScriptContext *ctx) { int partyCount, count, i; FieldSystem *fieldSystem = ctx->fieldSystem; u16 *pokemonCount = ScriptGetVarPointer(ctx); - PC_STORAGE *pc = SaveArray_PCStorage_Get(fieldSystem->saveData); + PCStorage *pc = SaveArray_PCStorage_Get(fieldSystem->saveData); partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); for (i = 0, count = 0; i < partyCount; i++) { diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index a8fac86e0..2d33ff7b4 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -179,7 +179,7 @@ BOOL ScrCmd_BufferPartyMonNick(ScriptContext* ctx) { BOOL ScrCmd_BufferBoxMonNick(ScriptContext* ctx) { FieldSystem* fieldSystem = ctx->fieldSystem; - PC_STORAGE* pc = SaveArray_PCStorage_Get(fieldSystem->saveData); + PCStorage* pc = SaveArray_PCStorage_Get(fieldSystem->saveData); MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 box_mon_slot = ScriptGetVar(ctx); diff --git a/src/trainer_data.c b/src/trainer_data.c index de3425634..2b9c49c4f 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -13,7 +13,7 @@ void CreateNPCTrainerParty(BattleSetup *battleSetup, int trainerIndex, HeapID heapId); void EnemyTrainerSet_Init(BattleSetup *battleSetup, SaveData *saveData, HeapID heapId) { - TRAINER trainer; + Trainer trainer; MsgData *msgData; const u16 *rivalName; int i; @@ -25,7 +25,7 @@ void EnemyTrainerSet_Init(BattleSetup *battleSetup, SaveData *saveData, HeapID h if (battleSetup->trainerId[i] != 0) { TrainerData_ReadTrData(battleSetup->trainerId[i], &trainer); battleSetup->trainer[i] = trainer; - if (trainer.trainerClass == TRAINERCLASS_RIVAL) { + if (trainer.data.trainerClass == TRAINERCLASS_RIVAL) { CopyU16StringArray(battleSetup->trainer[i].name, rivalName); } else { string = NewString_ReadMsgData(msgData, battleSetup->trainerId[i]); @@ -35,38 +35,38 @@ void EnemyTrainerSet_Init(BattleSetup *battleSetup, SaveData *saveData, HeapID h CreateNPCTrainerParty(battleSetup, i, heapId); } } - battleSetup->flags |= trainer.doubleBattle; + battleSetup->flags |= trainer.data.doubleBattle; DestroyMsgData(msgData); } int TrainerData_GetAttr(u32 trainerIndex, TrainerAttr attr) { - TRAINER trainer; + Trainer trainer; int result; TrainerData_ReadTrData(trainerIndex, &trainer); switch (attr) { case TRATTR_TYPE: - result = trainer.trainerType; + result = trainer.data.trainerType; break; case TRATTR_CLASS: - result = trainer.trainerClass; + result = trainer.data.trainerClass; break; case TRATTR_UNK2: - result = trainer.unk_2; + result = trainer.data.unk_2; break; case TRATTR_NPOKE: - result = trainer.npoke; + result = trainer.data.npoke; break; case TRATTR_ITEM1: case TRATTR_ITEM2: case TRATTR_ITEM3: case TRATTR_ITEM4: - result = trainer.items[attr - TRATTR_ITEM1]; + result = trainer.data.items[attr - TRATTR_ITEM1]; break; case TRATTR_AIFLAGS: - result = trainer.ai_flags; + result = trainer.data.aiFlags; break; case TRATTR_DOUBLEBTL: - result = trainer.doubleBattle; + result = trainer.data.doubleBattle; break; } return result; @@ -117,7 +117,7 @@ void GetTrainerMessageByIdPair(u32 trainerIndex, u32 msg_id, String * str, HeapI } } -void TrainerData_ReadTrData(u32 idx, TRAINER * dest) { +void TrainerData_ReadTrData(u32 idx, Trainer * dest) { ReadWholeNarcMemberByIdPair(dest, NARC_poketool_trainer_trdata, (s32)idx); } @@ -285,7 +285,7 @@ void CreateNPCTrainerParty(BattleSetup *enemies, int partyIndex, HeapID heapId) // gender as its trainer. Otherwise, it will assume the more abundant gender // according to its species gender ratio. In double battles, the behavior is // identical to that of a solitary male opponent. - if (TrainerClass_GetGenderOrTrainerCount(enemies->trainer[partyIndex].trainerClass) == TRAINER_FEMALE) { + if (TrainerClass_GetGenderOrTrainerCount(enemies->trainer[partyIndex].data.trainerClass) == TRAINER_FEMALE) { pidGender = 0x78; } else { pidGender = 0x88; @@ -295,13 +295,13 @@ void CreateNPCTrainerParty(BattleSetup *enemies, int partyIndex, HeapID heapId) // array, with bit 0 being custom moveset and bit 1 being held item. // Game Freak didn't do it that way, instead using a switch statement and a lot // of code duplication. This has been the case since the 2nd generation games. - switch (enemies->trainer[partyIndex].trainerType) { + switch (enemies->trainer[partyIndex].data.trainerType) { case TRTYPE_MON: { TRPOKE_NOITEM_DFLTMOVES *monSpecies; u16 species; u8 form; monSpecies = &data->species; - for (i = 0; i < enemies->trainer[partyIndex].npoke; i++) { + for (i = 0; i < enemies->trainer[partyIndex].data.npoke; i++) { // Starting in Platinum, the Pokemon's form was encoded // in the upper 6 bits of the species. species = monSpecies[i].species & 0x3FF; @@ -318,7 +318,7 @@ void CreateNPCTrainerParty(BattleSetup *enemies, int partyIndex, HeapID heapId) // This procedure results in only a 24-bit peersonality value. personality = monSpecies[i].difficulty + monSpecies[i].level + species + enemies->trainerId[partyIndex]; SetLCRNGSeed(personality); - for (j = 0; j < enemies->trainer[partyIndex].trainerClass; j++) { + for (j = 0; j < enemies->trainer[partyIndex].data.trainerClass; j++) { personality = LCRandom(); } personality = (personality << 8) + pidGender; @@ -348,13 +348,13 @@ void CreateNPCTrainerParty(BattleSetup *enemies, int partyIndex, HeapID heapId) u16 species; u8 form; monSpeciesMoves = &data->species_moves; - for (i = 0; i < enemies->trainer[partyIndex].npoke; i++) { + for (i = 0; i < enemies->trainer[partyIndex].data.npoke; i++) { species = monSpeciesMoves[i].species & 0x3FF; form = (monSpeciesMoves[i].species & 0xFC00) >> 10; TrMon_OverridePidGender(species, form, monSpeciesMoves[i].genderAbilityOverride, &pidGender); personality = monSpeciesMoves[i].difficulty + monSpeciesMoves[i].level + species + enemies->trainerId[partyIndex]; SetLCRNGSeed(personality); - for (j = 0; j < enemies->trainer[partyIndex].trainerClass; j++) { + for (j = 0; j < enemies->trainer[partyIndex].data.trainerClass; j++) { personality = LCRandom(); } personality = (personality << 8) + pidGender; @@ -375,13 +375,13 @@ void CreateNPCTrainerParty(BattleSetup *enemies, int partyIndex, HeapID heapId) u16 species; u8 form; monSpeciesItem = &data->species_item; - for (i = 0; i < enemies->trainer[partyIndex].npoke; i++) { + for (i = 0; i < enemies->trainer[partyIndex].data.npoke; i++) { species = monSpeciesItem[i].species & 0x3FF; form = (monSpeciesItem[i].species & 0xFC00) >> 10; TrMon_OverridePidGender(species, form, monSpeciesItem[i].genderAbilityOverride, &pidGender); personality = monSpeciesItem[i].difficulty + monSpeciesItem[i].level + species + enemies->trainerId[partyIndex]; SetLCRNGSeed(personality); - for (j = 0; j < enemies->trainer[partyIndex].trainerClass; j++) { + for (j = 0; j < enemies->trainer[partyIndex].data.trainerClass; j++) { personality = LCRandom(); } personality = (personality << 8) + pidGender; @@ -400,13 +400,13 @@ void CreateNPCTrainerParty(BattleSetup *enemies, int partyIndex, HeapID heapId) u16 species; u8 form; monSpeciesItemMoves = &data->species_item_moves; - for (i = 0; i < enemies->trainer[partyIndex].npoke; i++) { + for (i = 0; i < enemies->trainer[partyIndex].data.npoke; i++) { species = monSpeciesItemMoves[i].species & 0x3FF; form = (monSpeciesItemMoves[i].species & 0xFC00) >> 10; TrMon_OverridePidGender(species, form, monSpeciesItemMoves[i].genderAbilityOverride, &pidGender); personality = monSpeciesItemMoves[i].difficulty + monSpeciesItemMoves[i].level + species + enemies->trainerId[partyIndex]; SetLCRNGSeed(personality); - for (j = 0; j < enemies->trainer[partyIndex].trainerClass; j++) { + for (j = 0; j < enemies->trainer[partyIndex].data.trainerClass; j++) { personality = LCRandom(); } personality = (personality << 8) + pidGender; diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c index 088eb4c27..d3deb7d3f 100644 --- a/src/voltorb_flip/voltorb_flip.c +++ b/src/voltorb_flip/voltorb_flip.c @@ -26,7 +26,7 @@ #include "unk_02025154.h" #include "bg_window.h" #include "constants/sndseq.h" -#include "constants/game_stat.h" +#include "constants/game_stats.h" #include "msgdata/msg/msg_0039.h" #include "voltorb_flip/voltorb_flip.h" #include "voltorb_flip/voltorb_flip_data.h" diff --git a/tmp.NCLR b/tmp.NCLR deleted file mode 100644 index 1e74a73ec..000000000 Binary files a/tmp.NCLR and /dev/null differ