From 1e8d93ef9ca8843d1ed29087ec07c0afd49a6890 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 29 Aug 2023 23:25:04 -0400 Subject: [PATCH 1/4] Replaced decomp list with pret.github.io link --- README.md | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/README.md b/README.md index b698bd45f..2dbd37157 100644 --- a/README.md +++ b/README.md @@ -7,29 +7,4 @@ This repository builds the following ROMs: * [**pokeheartgold.us.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=4787) `sha1: 4fcded0e2713dc03929845de631d0932ea2b5a37` * [**pokesoulsilver.us.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=4788) `sha1: f8dc38ea20c17541a43b58c5e6d18c1732c7e582` -Other disassembly and/or decompilation projects: -* [**Pokémon Red and Blue**](https://github.com/pret/pokered) -* [**Pokémon Gold and Silver (Space World '97 demo)**](https://github.com/pret/pokegold-spaceworld) -* [**Pokémon Yellow**](https://github.com/pret/pokeyellow) -* [**Pokémon Trading Card Game**](https://github.com/pret/poketcg) -* [**Pokémon Pinball**](https://github.com/pret/pokepinball) -* [**Pokémon Stadium**](https://github.com/pret/pokestadium) -* [**Pokémon Gold and Silver**](https://github.com/pret/pokegold) -* [**Pokémon Crystal**](https://github.com/pret/pokecrystal) -* [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby) -* [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs) -* [**Pokémon FireRed and LeafGreen**](https://github.com/pret/pokefirered) -* [**Pokémon Emerald**](https://github.com/pret/pokeemerald) -* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red) - -Gen 4 decompilation projects: -* [**Pokémon Diamond and Pearl**](https://github.com/pret/pokediamond) -* [**Pokémon Platinum**](https://github.com/pret/pokeplatinum) -* [**Pokémon Mystery Dungeon: Explorers of Sky**](https://github.com/pret/pmd-sky) - -## Contacts - -You can find us on: - -* [Discord (VoidMatrix, #decomp)](https://discord.gg/prUAgd5). -* [Discord (PRET, #pokeheartgold)](https://discord.gg/d5dubZ3) +For contacts and other pret projects, see [pret.github.io](https://pret.github.io/). In addition to the pret Discord, also see the [VoidMatrix Discord (#decomp)](https://discord.gg/prUAgd5). From 4f7d522cb4582a0ef0d832e211cdfe335db5274b Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 29 Aug 2023 23:45:50 -0400 Subject: [PATCH 2/4] Removed VoidMatrix link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2dbd37157..52b063d07 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,4 @@ This repository builds the following ROMs: * [**pokeheartgold.us.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=4787) `sha1: 4fcded0e2713dc03929845de631d0932ea2b5a37` * [**pokesoulsilver.us.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=4788) `sha1: f8dc38ea20c17541a43b58c5e6d18c1732c7e582` -For contacts and other pret projects, see [pret.github.io](https://pret.github.io/). In addition to the pret Discord, also see the [VoidMatrix Discord (#decomp)](https://discord.gg/prUAgd5). +For contacts and other pret projects, see [pret.github.io](https://pret.github.io/). From 6b4322a8c14a96e694ddda3c5a1ae3469535f046 Mon Sep 17 00:00:00 2001 From: red031000 Date: Tue, 12 Sep 2023 03:48:29 +0100 Subject: [PATCH 3/4] #208 split PR 4, rename some misc funcs --- asm/field_take_photo.s | 14 ++-- asm/include/field_take_photo.inc | 6 +- asm/include/overlay_01_021E90C0.inc | 2 +- asm/include/overlay_01_021F1AFC.inc | 6 +- asm/include/overlay_01_021F3114.inc | 2 +- asm/include/overlay_01_021F6CFC.inc | 2 +- asm/include/overlay_01_021F72DC.inc | 2 +- asm/include/overlay_01_021FC05C.inc | 2 +- asm/include/overlay_01_021FC66C.inc | 2 +- asm/include/overlay_01_021FCE98.inc | 2 +- asm/include/overlay_01_02203A18.inc | 2 +- asm/include/overlay_01_022053EC.inc | 4 +- asm/include/overlay_02.inc | 4 +- asm/include/overlay_03.inc | 4 +- asm/include/overlay_04.inc | 2 +- asm/include/overlay_25.inc | 2 +- asm/include/scrcmd_9.inc | 2 +- asm/include/unk_0203BC10.inc | 2 +- asm/include/unk_0203DB6C.inc | 4 +- asm/include/unk_0203E348.inc | 4 +- asm/include/unk_020551B8.inc | 2 +- asm/include/unk_02055244.inc | 4 +- asm/include/unk_02056680.inc | 2 +- asm/include/unk_02058AEC.inc | 2 +- asm/include/unk_0205BB1C.inc | 2 +- asm/include/unk_02066EDC.inc | 2 +- asm/include/unk_0206793C.inc | 6 +- asm/include/unk_02067A60.inc | 2 +- asm/include/unk_02068FC8.inc | 2 +- asm/include/unk_0206A360.inc | 2 +- asm/include/unk_0206B910.inc | 6 +- asm/include/unk_0206D494.inc | 4 +- asm/include/unk_02078834.inc | 2 +- asm/include/unk_020910D8.inc | 4 +- asm/include/unk_02092B04.inc | 2 +- asm/include/unk_02095DF4.inc | 2 +- asm/include/unk_020961D8.inc | 2 +- asm/include/unk_020977CC.inc | 2 +- asm/include/unk_020979A8.inc | 2 +- asm/include/unk_02097BE0.inc | 4 +- asm/include/unk_02097D3C.inc | 2 +- asm/overlay_01_021E90C0.s | 12 ++-- asm/overlay_01_021F1AFC.s | 16 ++--- asm/overlay_01_021F3114.s | 2 +- asm/overlay_01_021F6CFC.s | 2 +- asm/overlay_01_021F72DC.s | 2 +- asm/overlay_01_021FC05C.s | 2 +- asm/overlay_01_021FC66C.s | 2 +- asm/overlay_01_021FCE98.s | 4 +- asm/overlay_01_02203A18.s | 2 +- asm/overlay_01_022053EC.s | 10 +-- asm/overlay_02.s | 50 +++++++------- asm/overlay_03.s | 14 ++-- asm/overlay_04.s | 18 ++--- asm/overlay_25.s | 2 +- asm/scrcmd_9.s | 18 ++--- asm/unk_0203BC10.s | 84 +++++++++++------------ asm/unk_0203DB6C.s | 4 +- asm/unk_0203E348.s | 14 ++-- asm/unk_020551B8.s | 2 +- asm/unk_02055244.s | 16 ++--- asm/unk_02056680.s | 12 ++-- asm/unk_02058AEC.s | 8 +-- asm/unk_0205BB1C.s | 4 +- asm/unk_02066EDC.s | 6 +- asm/unk_0206793C.s | 8 +-- asm/unk_02067A60.s | 2 +- asm/unk_02068FC8.s | 2 +- asm/unk_0206A360.s | 2 +- asm/unk_0206B910.s | 18 ++--- asm/unk_0206D494.s | 6 +- asm/unk_02078834.s | 2 +- asm/unk_020910D8.s | 4 +- asm/unk_02092B04.s | 4 +- asm/unk_02095DF4.s | 2 +- asm/unk_020961D8.s | 2 +- asm/unk_020977CC.s | 4 +- asm/unk_020979A8.s | 4 +- asm/unk_02097BE0.s | 6 +- asm/unk_02097D3C.s | 2 +- include/field_follow_poke.h | 2 +- include/field_map_object.h | 2 +- include/fieldmap.h | 12 ++-- include/scrcmd.h | 2 +- include/task.h | 2 +- include/unk_02055244.h | 2 +- include/unk_020552A4.h | 2 +- src/choose_starter.c | 2 +- src/encounter.c | 54 +++++++-------- src/field/overlay_01_apricorn_tree_anim.c | 4 +- src/field/overlay_01_rock_smash_item.c | 4 +- src/field_black_out.c | 4 +- src/field_follow_poke.c | 8 +-- src/field_map_object.c | 8 +-- src/field_move.c | 52 +++++++------- src/field_use_item.c | 44 ++++++------ src/field_warp_tasks.c | 50 +++++++------- src/fieldmap.c | 26 +++---- src/game_clear.c | 4 +- src/overlay_01_02204ED8.c | 2 +- src/scrcmd_20.c | 4 +- src/scrcmd_battle.c | 2 +- src/scrcmd_battle_arcade.c | 4 +- src/scrcmd_battle_castle.c | 4 +- src/scrcmd_c.c | 18 ++--- src/task.c | 4 +- src/unk_02055BF0.c | 26 +++---- src/unk_02097720.c | 4 +- 108 files changed, 427 insertions(+), 427 deletions(-) diff --git a/asm/field_take_photo.s b/asm/field_take_photo.s index 936066a9a..8fc4772a4 100644 --- a/asm/field_take_photo.s +++ b/asm/field_take_photo.s @@ -180,7 +180,7 @@ sub_0206A8E4: ; 0x0206A8E4 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #8 @@ -581,7 +581,7 @@ sub_0206ABB0: ; 0x0206ABB0 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r7, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #8] ldr r1, [r4] @@ -635,7 +635,7 @@ _0206ABF2: b _0206AEA2 _0206AC28: add r0, r7, #0 - bl sub_020552A4 + bl CallTask_RestoreOverworld ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1413,7 +1413,7 @@ sub_0206B270: ; 0x0206B270 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #0x14] cmp r1, #0x14 @@ -1485,7 +1485,7 @@ _0206B2DC: b _0206B824 _0206B30A: add r0, r6, #0 - bl sub_020552A4 + bl CallTask_RestoreOverworld mov r0, #4 strb r0, [r4, #0x14] b _0206B824 @@ -1806,7 +1806,7 @@ _0206B5A0: mov r1, #4 bl sub_0206B8AC add r0, r6, #0 - bl sub_0205532C + bl CallTask_FadeFromBlack add r0, r4, #0 mov r1, #0 add r0, #0xca @@ -2043,7 +2043,7 @@ _0206B768: b _0206B824 _0206B794: add r0, r6, #0 - bl sub_020552A4 + bl CallTask_RestoreOverworld mov r0, #0x13 strb r0, [r4, #0x14] b _0206B824 diff --git a/asm/include/field_take_photo.inc b/asm/include/field_take_photo.inc index 34b6dff97..19b1d7c05 100644 --- a/asm/include/field_take_photo.inc +++ b/asm/include/field_take_photo.inc @@ -37,14 +37,14 @@ .public TaskManager_Call .public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_020537A8 .public GetFirstAliveMonInParty_CrashIfNone .public sub_02054EB0 .public sub_0205525C -.public sub_020552A4 +.public CallTask_RestoreOverworld .public PalleteFadeUntilFinished -.public sub_0205532C +.public CallTask_FadeFromBlack .public PlayerAvatar_GetFacingDirection .public GetPlayerXCoord .public GetPlayerYCoord diff --git a/asm/include/overlay_01_021E90C0.inc b/asm/include/overlay_01_021E90C0.inc index 42bb30197..03f73e059 100644 --- a/asm/include/overlay_01_021E90C0.inc +++ b/asm/include/overlay_01_021E90C0.inc @@ -25,7 +25,7 @@ .public sub_0203B58C .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02054A60 .public sub_02054AE4 .public sub_02054B74 diff --git a/asm/include/overlay_01_021F1AFC.inc b/asm/include/overlay_01_021F1AFC.inc index 2f0a1ade4..d352045f2 100644 --- a/asm/include/overlay_01_021F1AFC.inc +++ b/asm/include/overlay_01_021F1AFC.inc @@ -12,13 +12,13 @@ .public sub_0201F988 .public GF_AssertFail .public StartScriptFromMenu -.public FlagSet -.public FlagClear +.public FieldSystem_FlagSet +.public FieldSystem_FlagClear .public Save_VarsFlags_Get .public FieldSystem_CreateTask .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02054790 .public FieldSystem_SetSavedMusicId .public GetMapMusic diff --git a/asm/include/overlay_01_021F3114.inc b/asm/include/overlay_01_021F3114.inc index b05a0f018..d7a4b75c7 100644 --- a/asm/include/overlay_01_021F3114.inc +++ b/asm/include/overlay_01_021F3114.inc @@ -6,7 +6,7 @@ .public FreeToHeapExplicit .public GF_AssertFail .public FieldSystem_CreateTask -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_0205B9DC .public sub_0205B9E8 .public sub_0205B9F4 diff --git a/asm/include/overlay_01_021F6CFC.inc b/asm/include/overlay_01_021F6CFC.inc index 6e77e62ea..230c300d8 100644 --- a/asm/include/overlay_01_021F6CFC.inc +++ b/asm/include/overlay_01_021F6CFC.inc @@ -35,7 +35,7 @@ .public FieldSystem_CreateTask .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_0205B514 .public sub_0205B564 .public sub_0205B5B4 diff --git a/asm/include/overlay_01_021F72DC.inc b/asm/include/overlay_01_021F72DC.inc index a04cde6c9..5a18727f3 100644 --- a/asm/include/overlay_01_021F72DC.inc +++ b/asm/include/overlay_01_021F72DC.inc @@ -40,7 +40,7 @@ .public sub_02064084 .public FollowingPokemon_GetSpriteID .public FollowPokeMapObjectSetParams -.public FieldSystem_SetFollowPokeParam +.public FieldSystem_SetFollowerPokeParam .public FieldSystemUnkSub108_Set .public GetMonData .public GetMonGender diff --git a/asm/include/overlay_01_021FC05C.inc b/asm/include/overlay_01_021FC05C.inc index ed345b0a8..97790aa34 100644 --- a/asm/include/overlay_01_021FC05C.inc +++ b/asm/include/overlay_01_021FC05C.inc @@ -14,7 +14,7 @@ .public MapHeader_HasWildEncounters .public QueueScript .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public GetMetatileBehaviorAt .public GetPlayerXCoord .public GetPlayerYCoord diff --git a/asm/include/overlay_01_021FC66C.inc b/asm/include/overlay_01_021FC66C.inc index 29476a30a..624ac370b 100644 --- a/asm/include/overlay_01_021FC66C.inc +++ b/asm/include/overlay_01_021FC66C.inc @@ -22,7 +22,7 @@ .public Save_GameStats_Get .public GameStats_Inc .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02050B90 .public BattleSetup_Delete .public GetFirstAliveMonInParty_CrashIfNone diff --git a/asm/include/overlay_01_021FCE98.inc b/asm/include/overlay_01_021FCE98.inc index 310029653..e1c2138cf 100644 --- a/asm/include/overlay_01_021FCE98.inc +++ b/asm/include/overlay_01_021FCE98.inc @@ -5,7 +5,7 @@ .public GF_ExpHeap_FndInitAllocator .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public PlayerAvatar_GetState .public PlayerAvatar_GetGender diff --git a/asm/include/overlay_01_02203A18.inc b/asm/include/overlay_01_02203A18.inc index 02f67992a..824f798e8 100644 --- a/asm/include/overlay_01_02203A18.inc +++ b/asm/include/overlay_01_02203A18.inc @@ -15,7 +15,7 @@ .public GF_AssertFail .public sub_02026E18 .public TaskManager_Call -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public sub_0205F0A8 .public MapObject_GetID diff --git a/asm/include/overlay_01_022053EC.inc b/asm/include/overlay_01_022053EC.inc index 968db58bb..5983e9aa6 100644 --- a/asm/include/overlay_01_022053EC.inc +++ b/asm/include/overlay_01_022053EC.inc @@ -23,10 +23,10 @@ .public GF_AssertFail .public sub_02026E18 .public ScriptReadHalfword -.public VarGet +.public FieldSystem_VarGet .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public GetIdxOfFirstAliveMonInParty_CrashIfNone .public GetMetatileBehaviorAt diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index b873cf178..e78441e49 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -204,13 +204,13 @@ .public FieldSystem_GetSaveData .public StartMapSceneScript .public QueueScript -.public FlagGet +.public FieldSystem_FlagGet .public HiddenItemScriptNoToFlagId .public Save_VarsFlags_Get .public CheckFlagInArray .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public sub_02050B08 .public sub_02050B90 diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index bb0114639..ca3984ca1 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -170,13 +170,13 @@ .public ScriptReadHalfword .public FieldSysGetAttrAddr .public GetVarPointer -.public VarGet +.public FieldSystem_VarGet .public ScrNative_WaitApplication_DestroyTaskData .public Save_VarsFlags_Get .public TaskManager_Jump .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_020580E4 .public sub_02058124 .public sub_02058164 diff --git a/asm/include/overlay_04.inc b/asm/include/overlay_04.inc index 379b24a79..5f0ff15d1 100644 --- a/asm/include/overlay_04.inc +++ b/asm/include/overlay_04.inc @@ -27,7 +27,7 @@ .public FieldSystem_CreateTask .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public sub_020548C0 .public GetMetatileBehaviorAt diff --git a/asm/include/overlay_25.inc b/asm/include/overlay_25.inc index 90a58429c..573dac31b 100644 --- a/asm/include/overlay_25.inc +++ b/asm/include/overlay_25.inc @@ -18,7 +18,7 @@ .public SetupNativeScript .public ScriptReadHalfword .public FieldSysGetAttrAddr -.public VarGet +.public FieldSystem_VarGet .public sub_02050AAC .public sub_020517E8 .public sub_020517FC diff --git a/asm/include/scrcmd_9.inc b/asm/include/scrcmd_9.inc index 94d4aa224..1b8146204 100644 --- a/asm/include/scrcmd_9.inc +++ b/asm/include/scrcmd_9.inc @@ -60,7 +60,7 @@ .public ScriptReadHalfword .public FieldSysGetAttrAddr .public GetVarPointer -.public VarGet +.public FieldSystem_VarGet .public sub_0204A5B0 .public sub_0204A68C .public sub_0204A824 diff --git a/asm/include/unk_0203BC10.inc b/asm/include/unk_0203BC10.inc index 2cc5bb04c..78ac97c01 100644 --- a/asm/include/unk_0203BC10.inc +++ b/asm/include/unk_0203BC10.inc @@ -88,7 +88,7 @@ .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02055164 .public sub_0205A904 .public sub_0205AA6C diff --git a/asm/include/unk_0203DB6C.inc b/asm/include/unk_0203DB6C.inc index 3575e44ba..4150d54d8 100644 --- a/asm/include/unk_0203DB6C.inc +++ b/asm/include/unk_0203DB6C.inc @@ -8,8 +8,8 @@ .public GetInteractedBackgroundEventScript .public sub_0203DDA4 .public sub_0203DE04 -.public VarGet -.public FlagGet +.public FieldSystem_VarGet +.public FieldSystem_FlagGet .public HiddenItemScriptNoToFlagId .public GetMetatileBehaviorAt .public sub_0205B700 diff --git a/asm/include/unk_0203E348.inc b/asm/include/unk_0203E348.inc index afaf90fc0..3a0107e7c 100644 --- a/asm/include/unk_0203E348.inc +++ b/asm/include/unk_0203E348.inc @@ -145,11 +145,11 @@ .public FieldSystem_ApplicationIsRunning .public CallApplicationAsTask .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public FieldSystem_GetOverriddenMusicId .public sub_0205525C -.public sub_020552A4 +.public CallTask_RestoreOverworld .public Field_GetTimeOfDay .public sub_0205A508 .public PlayerAvatar_GetState diff --git a/asm/include/unk_020551B8.inc b/asm/include/unk_020551B8.inc index 93b19134a..1d53dff90 100644 --- a/asm/include/unk_020551B8.inc +++ b/asm/include/unk_020551B8.inc @@ -5,7 +5,7 @@ .public FreeToHeap .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02055218 .public ov01_021EFB64 .public ov01_021EFC04 diff --git a/asm/include/unk_02055244.inc b/asm/include/unk_02055244.inc index 1c8d40d19..e6522fb85 100644 --- a/asm/include/unk_02055244.inc +++ b/asm/include/unk_02055244.inc @@ -11,9 +11,9 @@ .public TaskManager_GetFieldSystem .public TaskManager_GetStatePtr .public sub_0205525C -.public sub_020552A4 +.public CallTask_RestoreOverworld .public PalleteFadeUntilFinished -.public sub_0205532C +.public CallTask_FadeFromBlack .public sub_020553B0 .public sub_02055408 .public ov01_021EFAF8 diff --git a/asm/include/unk_02056680.inc b/asm/include/unk_02056680.inc index f80e3a237..3bbbf8749 100644 --- a/asm/include/unk_02056680.inc +++ b/asm/include/unk_02056680.inc @@ -12,7 +12,7 @@ .public TaskManager_Call .public CallApplicationAsTask .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public GetMetatileBehaviorAt .public sub_02054940 .public sub_02056680 diff --git a/asm/include/unk_02058AEC.inc b/asm/include/unk_02058AEC.inc index 053001696..5ded4da7a 100644 --- a/asm/include/unk_02058AEC.inc +++ b/asm/include/unk_02058AEC.inc @@ -84,7 +84,7 @@ .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02056E60 .public sub_02057A34 .public sub_02057A88 diff --git a/asm/include/unk_0205BB1C.inc b/asm/include/unk_0205BB1C.inc index f1be3576f..088e9f74e 100644 --- a/asm/include/unk_0205BB1C.inc +++ b/asm/include/unk_0205BB1C.inc @@ -5,7 +5,7 @@ .public GF_SinDegNoWrap .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public CountDigits .public ItemIsTMOrHM .public sub_0205BBD0 diff --git a/asm/include/unk_02066EDC.inc b/asm/include/unk_02066EDC.inc index 81dd6af89..0b98c1569 100644 --- a/asm/include/unk_02066EDC.inc +++ b/asm/include/unk_02066EDC.inc @@ -36,7 +36,7 @@ .public TaskManager_Call .public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02067118 .public sub_02067200 .public sub_020672A4 diff --git a/asm/include/unk_0206793C.inc b/asm/include/unk_0206793C.inc index 099afdb9b..d846b7f9b 100644 --- a/asm/include/unk_0206793C.inc +++ b/asm/include/unk_0206793C.inc @@ -5,11 +5,11 @@ .public TaskManager_Call .public CallApplicationAsTask .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_0205525C -.public sub_020552A4 +.public CallTask_RestoreOverworld .public PalleteFadeUntilFinished -.public sub_0205532C +.public CallTask_FadeFromBlack .public CallTask_NPCTrade .public AllocMonZeroed .public memset diff --git a/asm/include/unk_02067A60.inc b/asm/include/unk_02067A60.inc index 08b79cda1..ad925742c 100644 --- a/asm/include/unk_02067A60.inc +++ b/asm/include/unk_02067A60.inc @@ -20,7 +20,7 @@ .public Save_VarsFlags_Get .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02053908 .public GetIdxOfFirstAliveMonInParty_CrashIfNone .public PlayerAvatar_GetMapObject diff --git a/asm/include/unk_02068FC8.inc b/asm/include/unk_02068FC8.inc index ac503639c..eb3a5a02b 100644 --- a/asm/include/unk_02068FC8.inc +++ b/asm/include/unk_02068FC8.inc @@ -34,7 +34,7 @@ .public TaskManager_Call .public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02055624 .public FieldSystem_GetGameClearTime .public sub_0205ABD8 diff --git a/asm/include/unk_0206A360.inc b/asm/include/unk_0206A360.inc index f7881f4ef..19c90e5ca 100644 --- a/asm/include/unk_0206A360.inc +++ b/asm/include/unk_0206A360.inc @@ -21,7 +21,7 @@ .public FieldSystem_GetBgConfigPtr .public TaskManager_Call .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public PlayerAvatar_GetMapObject .public PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply .public MapObject_GetPositionVec diff --git a/asm/include/unk_0206B910.inc b/asm/include/unk_0206B910.inc index 409c18173..010d38654 100644 --- a/asm/include/unk_0206B910.inc +++ b/asm/include/unk_0206B910.inc @@ -21,13 +21,13 @@ .public ScriptReadHalfword .public FieldSysGetAttrAddr .public GetVarPointer -.public VarGet +.public FieldSystem_VarGet .public TaskManager_Call .public CallApplicationAsTask .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_0205525C -.public sub_020552A4 +.public CallTask_RestoreOverworld .public sub_0206B910 .public SetMonData .public Party_GetCount diff --git a/asm/include/unk_0206D494.inc b/asm/include/unk_0206D494.inc index 0ff66b0a3..2be57cbb2 100644 --- a/asm/include/unk_0206D494.inc +++ b/asm/include/unk_0206D494.inc @@ -29,13 +29,13 @@ .public sub_0203EDDC .public ScriptReadHalfword .public GetVarPointer -.public VarGet +.public FieldSystem_VarGet .public Save_VarsFlags_Get .public FieldSystem_CreateTask .public TaskManager_Call .public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public sub_020537A8 .public GetMetatileBehaviorAt diff --git a/asm/include/unk_02078834.inc b/asm/include/unk_02078834.inc index 8e80695f0..83e65525e 100644 --- a/asm/include/unk_02078834.inc +++ b/asm/include/unk_02078834.inc @@ -16,7 +16,7 @@ .public FieldSystem_ApplicationIsRunning .public CallApplicationAsTask .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_020514A4 .public SetFlag970 .public sub_02078B58 diff --git a/asm/include/unk_020910D8.inc b/asm/include/unk_020910D8.inc index 852f774a7..6141eef3a 100644 --- a/asm/include/unk_020910D8.inc +++ b/asm/include/unk_020910D8.inc @@ -10,9 +10,9 @@ .public TaskManager_Call .public CallApplicationAsTask .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_0205525C -.public sub_020552A4 +.public CallTask_RestoreOverworld .public sub_0206D328 .public GetMonData .public SetMonData diff --git a/asm/include/unk_02092B04.inc b/asm/include/unk_02092B04.inc index 0c1ca717a..a5b4b2e36 100644 --- a/asm/include/unk_02092B04.inc +++ b/asm/include/unk_02092B04.inc @@ -6,7 +6,7 @@ .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_0207791C .public sub_02092B04 .public ov01_021E636C diff --git a/asm/include/unk_02095DF4.inc b/asm/include/unk_02095DF4.inc index 06ef32147..464af4258 100644 --- a/asm/include/unk_02095DF4.inc +++ b/asm/include/unk_02095DF4.inc @@ -10,5 +10,5 @@ .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02095DF4 diff --git a/asm/include/unk_020961D8.inc b/asm/include/unk_020961D8.inc index 1bbcab2b2..ffeb872ca 100644 --- a/asm/include/unk_020961D8.inc +++ b/asm/include/unk_020961D8.inc @@ -15,7 +15,7 @@ .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02090C94 .public sub_02090D0C .public sub_02090D20 diff --git a/asm/include/unk_020977CC.inc b/asm/include/unk_020977CC.inc index 2c61dec2c..94b2a5753 100644 --- a/asm/include/unk_020977CC.inc +++ b/asm/include/unk_020977CC.inc @@ -15,7 +15,7 @@ .public TaskManager_Call .public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public sub_020537F0 .public sub_02055110 diff --git a/asm/include/unk_020979A8.inc b/asm/include/unk_020979A8.inc index 02548ce91..1ea9788e8 100644 --- a/asm/include/unk_020979A8.inc +++ b/asm/include/unk_020979A8.inc @@ -13,7 +13,7 @@ .public TaskManager_Call .public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public TaskManager_GetStatePtr .public sub_020537F0 .public sub_02055110 diff --git a/asm/include/unk_02097BE0.inc b/asm/include/unk_02097BE0.inc index f0d044156..a023c8c5e 100644 --- a/asm/include/unk_02097BE0.inc +++ b/asm/include/unk_02097BE0.inc @@ -7,8 +7,8 @@ .public TaskManager_Call .public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_0205525C -.public sub_020552A4 +.public CallTask_RestoreOverworld .public Field_GetTimeOfDay .public sub_02097BE0 diff --git a/asm/include/unk_02097D3C.inc b/asm/include/unk_02097D3C.inc index f19249347..0ad812468 100644 --- a/asm/include/unk_02097D3C.inc +++ b/asm/include/unk_02097D3C.inc @@ -12,5 +12,5 @@ .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem -.public TaskManager_GetEnv +.public TaskManager_GetEnvironment .public sub_02097D3C diff --git a/asm/overlay_01_021E90C0.s b/asm/overlay_01_021E90C0.s index 633c36d14..4259fd6a5 100644 --- a/asm/overlay_01_021E90C0.s +++ b/asm/overlay_01_021E90C0.s @@ -1282,7 +1282,7 @@ ov01_021E9ABC: ; 0x021E9ABC bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4] ldr r0, [r5, #0x58] @@ -1486,7 +1486,7 @@ ov01_021E9C40: ; 0x021E9C40 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r6, r0, #0 ldr r0, [r6] cmp r0, #8 @@ -1800,7 +1800,7 @@ ov01_021E9EEC: ; 0x021E9EEC bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 ldrb r0, [r5] cmp r0, #0 @@ -1868,7 +1868,7 @@ ov01_021E9F78: ; 0x021E9F78 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r0, [r4] cmp r0, #0 @@ -1932,7 +1932,7 @@ ov01_021E9FF8: ; 0x021E9FF8 bl TaskManager_GetFieldSystem add r5, r0, #0 ldr r0, [sp, #0x10] - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r0, [r4] cmp r0, #3 @@ -2084,7 +2084,7 @@ ov01_021EA128: ; 0x021EA128 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r7, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r0, [r4] cmp r0, #3 diff --git a/asm/overlay_01_021F1AFC.s b/asm/overlay_01_021F1AFC.s index efb2225d1..ef1654916 100644 --- a/asm/overlay_01_021F1AFC.s +++ b/asm/overlay_01_021F1AFC.s @@ -522,7 +522,7 @@ _021F1EC8: .word ov01_021F1ECC ov01_021F1ECC: ; 0x021F1ECC push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0xc] bl PlayerAvatar_GetMapObject @@ -641,7 +641,7 @@ _021F1F96: lsl r1, r1, #0x10 add r0, r7, #0 lsr r1, r1, #0x10 - bl FlagSet + bl FieldSystem_FlagSet add r0, r5, #0 bl DeleteMapObject mov r1, #0xa @@ -651,7 +651,7 @@ _021F1F96: add r0, r7, #0 add r1, r1, r2 ldrh r1, [r1, #8] - bl FlagClear + bl FieldSystem_FlagClear mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F1FF4: @@ -810,7 +810,7 @@ _021F2112: ov01_021F2118: ; 0x021F2118 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #9 @@ -1129,7 +1129,7 @@ _021F23B4: .word ov01_021F23B8 thumb_func_start ov01_021F23B8 ov01_021F23B8: ; 0x021F23B8 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r0, [r4] cmp r0, #0 @@ -1436,7 +1436,7 @@ _021F2622: ov01_021F2628: ; 0x021F2628 push {r3, r4, r5, r6, r7, lr} add r6, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r7, _021F268C ; =ov01_022069D0 add r4, r0, #0 _021F2634: @@ -1850,7 +1850,7 @@ _021F2940: .word ov01_021F2944 thumb_func_start ov01_021F2944 ov01_021F2944: ; 0x021F2944 push {r4, r5, r6, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r6, _021F2990 ; =ov01_022069BC ldr r4, _021F2994 ; =ov01_022069A8 add r5, r0, #0 @@ -2449,7 +2449,7 @@ CallFieldTask_Whirlpool: ; 0x021F2DA4 thumb_func_start ov01_021F2DD0 ov01_021F2DD0: ; 0x021F2DD0 push {r4, r5, r6, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r6, _021F2E04 ; =ov01_02206994 add r5, r0, #0 _021F2DDA: diff --git a/asm/overlay_01_021F3114.s b/asm/overlay_01_021F3114.s index 5cb72479b..aaaae08b3 100644 --- a/asm/overlay_01_021F3114.s +++ b/asm/overlay_01_021F3114.s @@ -121,7 +121,7 @@ _021F31C8: thumb_func_start ov01_021F31CC ov01_021F31CC: ; 0x021F31CC push {r4, r5, r6, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0x10] bl PlayerAvatar_GetMapObject diff --git a/asm/overlay_01_021F6CFC.s b/asm/overlay_01_021F6CFC.s index 1cc4e9359..b2df88321 100644 --- a/asm/overlay_01_021F6CFC.s +++ b/asm/overlay_01_021F6CFC.s @@ -554,7 +554,7 @@ _021F70FA: ov01_021F7100: ; 0x021F7100 push {r3, r4, r5, lr} add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetFieldSystem diff --git a/asm/overlay_01_021F72DC.s b/asm/overlay_01_021F72DC.s index 9d15c735c..21311f308 100644 --- a/asm/overlay_01_021F72DC.s +++ b/asm/overlay_01_021F72DC.s @@ -437,7 +437,7 @@ _021F761C: ldr r3, [sp, #4] add r1, r7, #0 lsr r2, r2, #0x18 - bl FieldSystem_SetFollowPokeParam + bl FieldSystem_SetFollowerPokeParam add r0, r5, #0 mov r1, #1 bl MapObject_ForceSetFacingDirection diff --git a/asm/overlay_01_021FC05C.s b/asm/overlay_01_021FC05C.s index 3bbc2582e..7b042c705 100644 --- a/asm/overlay_01_021FC05C.s +++ b/asm/overlay_01_021FC05C.s @@ -407,7 +407,7 @@ Task_HoneyOrSweetScent: ; 0x021FC310 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r1, [r4, #8] cmp r1, #9 diff --git a/asm/overlay_01_021FC66C.s b/asm/overlay_01_021FC66C.s index aad90a60d..60178d75e 100644 --- a/asm/overlay_01_021FC66C.s +++ b/asm/overlay_01_021FC66C.s @@ -46,7 +46,7 @@ Task_OverworldFish: ; 0x021FC698 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r0, [r5] cmp r0, #0 diff --git a/asm/overlay_01_021FCE98.s b/asm/overlay_01_021FCE98.s index fc7fe5f8c..a75bcbba6 100644 --- a/asm/overlay_01_021FCE98.s +++ b/asm/overlay_01_021FCE98.s @@ -21,7 +21,7 @@ Task_UseSweetScentInField: ; 0x021FCE98 bl TaskManager_GetFieldSystem add r6, r0, #0 ldr r0, [sp] - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r7, r0, #0 ldr r0, [sp] bl TaskManager_GetStatePtr @@ -203,7 +203,7 @@ _021FD010: .word ov01_021FD014 ov01_021FD014: ; 0x021FD014 push {r3, r4, r5, lr} add r4, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 add r0, r4, #0 bl TaskManager_GetStatePtr diff --git a/asm/overlay_01_02203A18.s b/asm/overlay_01_02203A18.s index a4cb6dada..ce9b2b729 100644 --- a/asm/overlay_01_02203A18.s +++ b/asm/overlay_01_02203A18.s @@ -120,7 +120,7 @@ ov01_02203AD8: ; 0x02203AD8 bl TaskManager_GetStatePtr add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r5] cmp r0, #0 diff --git a/asm/overlay_01_022053EC.s b/asm/overlay_01_022053EC.s index 95234d10a..e9f88648c 100644 --- a/asm/overlay_01_022053EC.s +++ b/asm/overlay_01_022053EC.s @@ -23,7 +23,7 @@ ScrCmd_808: ; 0x022053EC add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet ldr r6, _02205420 ; =FS_OVERLAY_ID(OVY_25) add r4, r0, #0 add r0, r6, #0 @@ -993,7 +993,7 @@ ov01_02205B14: ; 0x02205B14 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4] cmp r1, #7 @@ -1317,7 +1317,7 @@ ov01_02205DB4: ; 0x02205DB4 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r6, r0, #0 add r0, r4, #0 bl TaskManager_GetStatePtr @@ -1468,7 +1468,7 @@ ov01_02205F00: ; 0x02205F00 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r6, r0, #0 add r0, r5, #0 bl TaskManager_GetStatePtr @@ -1728,7 +1728,7 @@ ov01_0220610C: ; 0x0220610C bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetStatePtr diff --git a/asm/overlay_02.s b/asm/overlay_02.s index 4b19b17ae..f93da91b2 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -53,7 +53,7 @@ _02245BB4: ov02_02245BC8: ; 0x02245BC8 push {r3, r4, lr} sub sp, #0xc - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r1, [r4, #8] cmp r1, #4 @@ -718,7 +718,7 @@ _022460E6: ov02_022460FC: ; 0x022460FC push {r3, r4, lr} sub sp, #0xc - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r0, [r4, #0xc] cmp r0, #0 @@ -832,7 +832,7 @@ ov02_022461DC: ; 0x022461DC push {r4, r5, lr} sub sp, #0xc add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r0, [r4, #0x12] cmp r0, #4 @@ -997,7 +997,7 @@ _0224631C: thumb_func_start ov02_02246330 ov02_02246330: ; 0x02246330 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #8] cmp r1, #0 @@ -1556,7 +1556,7 @@ _02246766: thumb_func_start ov02_02246798 ov02_02246798: ; 0x02246798 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #8] bl ov02_0224663C @@ -1622,7 +1622,7 @@ _02246802: thumb_func_start ov02_02246818 ov02_02246818: ; 0x02246818 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #0x18] cmp r1, #0 @@ -1879,7 +1879,7 @@ _022469F8: thumb_func_start ov02_02246A34 ov02_02246A34: ; 0x02246A34 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #4] cmp r0, #0 @@ -12741,7 +12741,7 @@ PokecenterAnimRun: ; 0x0224BB90 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #0xf] cmp r1, #5 @@ -13065,7 +13065,7 @@ ov02_0224BE24: ; 0x0224BE24 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #2] cmp r1, #4 @@ -13327,7 +13327,7 @@ Task_FieldEscapeRope: ; 0x0224C020 bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 _0224C032: ldr r3, [r5] @@ -13563,7 +13563,7 @@ ov02_0224C1F8: ; 0x0224C1F8 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r7, _0224C230 ; =ov02_022536F0 add r4, r0, #0 _0224C20C: @@ -13787,7 +13787,7 @@ Task_FieldDig: ; 0x0224C3AC bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r7, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r7, #0 bl TaskManager_GetStatePtr @@ -14010,7 +14010,7 @@ Task_FieldTeleport: ; 0x0224C558 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r7, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r7, #0 bl TaskManager_GetStatePtr @@ -15156,7 +15156,7 @@ ov02_0224CE28: ; 0x0224CE28 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #0xf] cmp r1, #5 @@ -17740,7 +17740,7 @@ ov02_0224E0EC: ; 0x0224E0EC bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] mov r5, #0 @@ -20433,7 +20433,7 @@ _0224F5A4: bl HiddenItemScriptNoToFlagId add r1, r0, #0 ldr r0, [sp] - bl FlagGet + bl FieldSystem_FlagGet cmp r0, #0 bne _0224F5BE add r4, r4, #1 @@ -22894,7 +22894,7 @@ ov02_022507E8: ; 0x022507E8 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 add r0, r4, #0 bl TaskManager_GetStatePtr @@ -23019,7 +23019,7 @@ ov02_022508D8: ; 0x022508D8 bl TaskManager_GetStatePtr add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r1, [r5] add r4, r0, #0 cmp r1, #3 @@ -24226,7 +24226,7 @@ ov02_02251280: ; 0x02251280 ov02_022512AC: ; 0x022512AC push {r3, r4, r5, lr} add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetStatePtr @@ -24631,7 +24631,7 @@ ov02_022515D0: ; 0x022515D0 bl TaskManager_GetFieldSystem str r0, [sp, #8] add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetStatePtr @@ -25658,7 +25658,7 @@ _02251E40: .word ov02_02251E44 thumb_func_start ov02_02251E44 ov02_02251E44: ; 0x02251E44 push {r4, r5, r6, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #4] ldr r5, [r0, #0x24] @@ -26394,7 +26394,7 @@ ov02_022523D0: ; 0x022523D0 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r6, r0, #0 ldr r0, [r5] cmp r0, #4 @@ -26584,7 +26584,7 @@ ov02_0225255C: ; 0x0225255C add r0, r4, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r1, [r5] add r4, r0, #0 cmp r1, #5 @@ -27216,7 +27216,7 @@ ov02_02252A28: ; 0x02252A28 add r0, r4, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r5] cmp r0, #5 @@ -27848,7 +27848,7 @@ ov02_02252F14: ; 0x02252F14 add r0, r5, #0 bl TaskManager_GetFieldSystem add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r1, [r4] add r5, r0, #0 cmp r1, #4 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index f275575ac..f00018447 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -4769,7 +4769,7 @@ ov03_022564A8: ; 0x022564A8 add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #0x7c] cmp r1, #0xb @@ -5995,7 +5995,7 @@ ov03_02256E2C: ; 0x02256E2C bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r1, _02257064 ; =0x00000272 add r4, r0, #0 ldrb r2, [r4, r1] @@ -9232,7 +9232,7 @@ ov03_02258764: ; 0x02258764 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r5, #0xc] bl Save_Bag_Get @@ -9398,7 +9398,7 @@ _02258890: .word 0x000005D8 thumb_func_start ov03_02258894 ov03_02258894: ; 0x02258894 push {r3, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment ldr r1, [r0] cmp r1, #0 bne _022588A8 @@ -9544,7 +9544,7 @@ ScrCmd_718: ; 0x02258998 add r5, #0x80 add r1, r0, #0 ldr r0, [r5] - bl VarGet + bl FieldSystem_VarGet add r2, r0, #0 lsl r2, r2, #0x18 ldr r0, [r6] @@ -9603,7 +9603,7 @@ ScrCmd_720: ; 0x02258A18 add r4, #0x80 add r1, r0, #0 ldr r0, [r4] - bl VarGet + bl FieldSystem_VarGet str r0, [sp] ldr r0, [r5, #0x40] bl PlayerAvatar_GetFacingDirection @@ -9978,7 +9978,7 @@ ov03_02258D3C: ; 0x02258D3C add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4] cmp r1, #0 diff --git a/asm/overlay_04.s b/asm/overlay_04.s index efa6698ee..bc4bb0e86 100644 --- a/asm/overlay_04.s +++ b/asm/overlay_04.s @@ -145,7 +145,7 @@ ov04_02253F38: ; 0x02253F38 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4] cmp r1, #0 @@ -192,7 +192,7 @@ ov04_02253F94: ; 0x02253F94 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4] cmp r1, #0 @@ -995,7 +995,7 @@ ov04_0225463C: ; 0x0225463C bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4] cmp r1, #0 @@ -2009,7 +2009,7 @@ ov04_02254E20: ; 0x02254E20 thumb_func_start ov04_02254E50 ov04_02254E50: ; 0x02254E50 push {r4, r5, r6, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #0xc] ldr r0, [r1, #4] @@ -3585,7 +3585,7 @@ ov04_022559C8: ; 0x022559C8 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r6, #4] ldr r5, [r0, #0x24] @@ -3705,7 +3705,7 @@ ov04_02255AC4: ; 0x02255AC4 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r5, #4] ldr r6, [r0, #0x24] @@ -4469,7 +4469,7 @@ ov04_022560D4: ; 0x022560D4 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r6, #0x40] bl PlayerAvatar_GetMapObject @@ -4947,7 +4947,7 @@ ov04_022564A0: ; 0x022564A0 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetStatePtr @@ -6853,7 +6853,7 @@ ov04_02257308: ; 0x02257308 add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment mov r1, #0x23 lsl r1, r1, #4 ldr r0, [r0, r1] diff --git a/asm/overlay_25.s b/asm/overlay_25.s index bf6e7d7f2..0bc9977ec 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -196,7 +196,7 @@ ScrCmd_809: ; 0x02259A30 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r4, r0, #0 add r0, r5, #0 add r0, #0x80 diff --git a/asm/scrcmd_9.s b/asm/scrcmd_9.s index e5021c629..1fb65ba30 100644 --- a/asm/scrcmd_9.s +++ b/asm/scrcmd_9.s @@ -124,7 +124,7 @@ ScrCmd_412: ; 0x02049D04 add r0, r7, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0 add r0, r7, #0 bl ScriptReadHalfword @@ -483,7 +483,7 @@ ScrCmd_413: ; 0x02049FC8 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -491,7 +491,7 @@ ScrCmd_413: ; 0x02049FC8 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -581,7 +581,7 @@ ScrCmd_416: ; 0x0204A098 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -589,7 +589,7 @@ ScrCmd_416: ; 0x0204A098 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp, #4] add r0, r5, #0 bl ScriptReadHalfword @@ -699,7 +699,7 @@ ScrCmd_417: ; 0x0204A184 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -912,7 +912,7 @@ ScrCmd_555: ; 0x0204A31C add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r5, #0x80 add r6, r0, #0 ldr r0, [r5] @@ -944,7 +944,7 @@ ScrCmd_556: ; 0x0204A360 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r5, #0x80 add r6, r0, #0 ldr r0, [r5] @@ -976,7 +976,7 @@ ScrCmd_CheckBattlePoints: ; 0x0204A3A4 add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0 add r0, r4, #0 bl ScriptReadHalfword diff --git a/asm/unk_0203BC10.s b/asm/unk_0203BC10.s index 50d34e89c..8b7ae2fba 100644 --- a/asm/unk_0203BC10.s +++ b/asm/unk_0203BC10.s @@ -423,7 +423,7 @@ sub_0203BEF0: ; 0x0203BEF0 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 ldrh r1, [r5, #0x26] cmp r1, #0x14 @@ -711,7 +711,7 @@ sub_0203C14C: ; 0x0203C14C bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 add r1, r5, #0 add r2, r5, #0 @@ -1128,7 +1128,7 @@ sub_0203C47C: ; 0x0203C47C bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl ov01_021F6B00 @@ -1634,7 +1634,7 @@ sub_0203C870: ; 0x0203C870 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r1, r6, #0 add r4, r0, #0 bl sub_0203C38C @@ -1663,7 +1663,7 @@ sub_0203C8B0: ; 0x0203C8B0 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl FieldSystem_ApplicationIsRunning @@ -1702,7 +1702,7 @@ sub_0203C8F0: ; 0x0203C8F0 thumb_func_start sub_0203C8FC sub_0203C8FC: ; 0x0203C8FC push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0 bl ov01_021E636C @@ -1726,7 +1726,7 @@ sub_0203C920: ; 0x0203C920 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment str r0, [sp] ldr r0, [r4, #0xc] bl Save_LocalFieldData_Get @@ -1839,7 +1839,7 @@ sub_0203CA14: ; 0x0203CA14 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl sub_020505C0 @@ -1860,7 +1860,7 @@ _0203CA3C: thumb_func_start sub_0203CA44 sub_0203CA44: ; 0x0203CA44 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0 bl ov01_021E636C @@ -1883,7 +1883,7 @@ sub_0203CA68: ; 0x0203CA68 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment mov r1, #0x37 add r4, r0, #0 lsl r1, r1, #4 @@ -1911,7 +1911,7 @@ sub_0203CA9C: ; 0x0203CA9C bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r7, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xb mov r1, #0x44 @@ -2420,7 +2420,7 @@ _0203CEFE: thumb_func_start sub_0203CF0C sub_0203CF0C: ; 0x0203CF0C push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0 bl ov01_021E636C @@ -2443,7 +2443,7 @@ sub_0203CF30: ; 0x0203CF30 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment mov r1, #0xd6 add r4, r0, #0 lsl r1, r1, #2 @@ -2513,7 +2513,7 @@ sub_0203CFC0: ; 0x0203CFC0 bl TaskManager_GetFieldSystem str r0, [sp, #8] add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xb bl BagView_New @@ -2728,7 +2728,7 @@ _0203D1A4: .word sub_0203D830 thumb_func_start sub_0203D1A8 sub_0203D1A8: ; 0x0203D1A8 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0 bl ov01_021E636C @@ -2752,7 +2752,7 @@ sub_0203D1CC: ; 0x0203D1CC bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xb bl sub_020691C4 @@ -2788,7 +2788,7 @@ sub_0203D218: ; 0x0203D218 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xe lsl r0, r0, #6 @@ -2807,7 +2807,7 @@ sub_0203D218: ; 0x0203D218 sub_0203D244: ; 0x0203D244 push {r3, r4, r5, lr} add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetFieldSystem @@ -2827,7 +2827,7 @@ sub_0203D264: ; 0x0203D264 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl ov01_021F6B00 @@ -2847,7 +2847,7 @@ sub_0203D288: ; 0x0203D288 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl ov01_021F6B00 @@ -2880,7 +2880,7 @@ _0203D2C8: sub_0203D2CC: ; 0x0203D2CC push {r3, r4, r5, lr} add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetFieldSystem @@ -2897,7 +2897,7 @@ sub_0203D2CC: ; 0x0203D2CC sub_0203D2EC: ; 0x0203D2EC push {r3, r4, r5, lr} add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetFieldSystem @@ -2913,7 +2913,7 @@ sub_0203D304: ; 0x0203D304 add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment mov r1, #0x10 strh r1, [r0, #0x26] pop {r4, pc} @@ -2922,7 +2922,7 @@ sub_0203D304: ; 0x0203D304 thumb_func_start sub_0203D318 sub_0203D318: ; 0x0203D318 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0 bl ov01_021E636C @@ -2945,7 +2945,7 @@ sub_0203D33C: ; 0x0203D33C bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl sub_0203EE24 @@ -2968,7 +2968,7 @@ sub_0203D368: ; 0x0203D368 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xe lsl r0, r0, #6 @@ -2986,7 +2986,7 @@ sub_0203D368: ; 0x0203D368 thumb_func_start sub_0203D394 sub_0203D394: ; 0x0203D394 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0 bl ov01_021E636C @@ -3010,7 +3010,7 @@ sub_0203D3B8: ; 0x0203D3B8 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xb str r0, [sp] @@ -3056,7 +3056,7 @@ sub_0203D418: ; 0x0203D418 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 mov r0, #0xe lsl r0, r0, #6 @@ -3108,7 +3108,7 @@ sub_0203D488: ; 0x0203D488 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r1, r4, #0 add r6, r0, #0 bl sub_0203C38C @@ -3159,7 +3159,7 @@ _0203D4FC: .word 0x000028A4 thumb_func_start sub_0203D500 sub_0203D500: ; 0x0203D500 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0 bl ov01_021E636C @@ -3182,7 +3182,7 @@ sub_0203D524: ; 0x0203D524 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl PhoneUI_New @@ -3205,7 +3205,7 @@ sub_0203D550: ; 0x0203D550 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl sub_020505C0 @@ -3230,7 +3230,7 @@ sub_0203D580: ; 0x0203D580 bl TaskManager_GetFieldSystem str r0, [sp] add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xb mov r1, #0x3c @@ -3338,7 +3338,7 @@ sub_0203D664: ; 0x0203D664 bl TaskManager_GetFieldSystem str r0, [sp, #4] add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment str r0, [sp] ldr r0, [sp, #4] ldr r0, [r0, #0xc] @@ -3385,7 +3385,7 @@ sub_0203D6C8: ; 0x0203D6C8 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 add r0, #0x94 @@ -3423,7 +3423,7 @@ sub_0203D718: ; 0x0203D718 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment mov r1, #0xe add r4, r0, #0 lsl r1, r1, #6 @@ -3455,7 +3455,7 @@ Task_UseFlyInField: ; 0x0203D758 bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xe1 lsl r0, r0, #2 @@ -3558,7 +3558,7 @@ sub_0203D830: ; 0x0203D830 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xe1 lsl r0, r0, #2 @@ -3739,7 +3739,7 @@ sub_0203D9B4: ; 0x0203D9B4 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment mov r1, #0xd6 add r4, r0, #0 lsl r1, r1, #2 @@ -3766,7 +3766,7 @@ sub_0203D9E8: ; 0x0203D9E8 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r6, r0, #0 mov r0, #0xe lsl r0, r0, #6 @@ -3877,7 +3877,7 @@ sub_0203DAE4: ; 0x0203DAE4 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #0xe lsl r0, r0, #6 diff --git a/asm/unk_0203DB6C.s b/asm/unk_0203DB6C.s index dad0be184..b08f0283c 100644 --- a/asm/unk_0203DB6C.s +++ b/asm/unk_0203DB6C.s @@ -262,7 +262,7 @@ _0203DD1E: bl HiddenItemScriptNoToFlagId add r1, r0, #0 add r0, r4, #0 - bl FlagGet + bl FieldSystem_FlagGet cmp r0, #1 beq _0203DD34 mov r0, #1 @@ -430,7 +430,7 @@ _0203DE2A: bge _0203DE5E ldrh r1, [r5, #0xe] ldr r0, [sp] - bl VarGet + bl FieldSystem_VarGet ldrh r1, [r5, #0xc] cmp r1, r0 bne _0203DE5E diff --git a/asm/unk_0203E348.s b/asm/unk_0203E348.s index 20acf3ef7..84a811d4a 100644 --- a/asm/unk_0203E348.s +++ b/asm/unk_0203E348.s @@ -516,7 +516,7 @@ sub_0203E604: ; 0x0203E604 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetStatePtr @@ -826,7 +826,7 @@ sub_0203E878: ; 0x0203E878 bl TaskManager_GetStatePtr add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r6, #0 bl TaskManager_GetFieldSystem @@ -1967,7 +1967,7 @@ sub_0203F134: ; 0x0203F134 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r0, [r5] cmp r0, #0 @@ -2172,7 +2172,7 @@ sub_0203F2C8: ; 0x0203F2C8 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #7 @@ -2516,7 +2516,7 @@ sub_0203F580: ; 0x0203F580 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #3 @@ -2550,7 +2550,7 @@ _0203F5BA: b _0203F648 _0203F5CC: add r0, r5, #0 - bl sub_020552A4 + bl CallTask_RestoreOverworld ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2621,7 +2621,7 @@ NamingScreen_SetName: ; 0x0203F650 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #0xc] ldr r0, [r0] diff --git a/asm/unk_020551B8.s b/asm/unk_020551B8.s index 30f8cf221..17ab22f33 100644 --- a/asm/unk_020551B8.s +++ b/asm/unk_020551B8.s @@ -11,7 +11,7 @@ sub_020551B8: ; 0x020551B8 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #0 diff --git a/asm/unk_02055244.s b/asm/unk_02055244.s index e856e4ccc..570c46657 100644 --- a/asm/unk_02055244.s +++ b/asm/unk_02055244.s @@ -57,8 +57,8 @@ _0205529E: .balign 4, 0 thumb_func_end sub_0205528C - thumb_func_start sub_020552A4 -sub_020552A4: ; 0x020552A4 + thumb_func_start CallTask_RestoreOverworld +CallTask_RestoreOverworld: ; 0x020552A4 push {r3, r4, r5, lr} add r5, r0, #0 bl TaskManager_GetFieldSystem @@ -78,7 +78,7 @@ _020552BC: pop {r3, r4, r5, pc} nop _020552D0: .word sub_0205528C - thumb_func_end sub_020552A4 + thumb_func_end CallTask_RestoreOverworld thumb_func_start sub_020552D4 sub_020552D4: ; 0x020552D4 @@ -128,8 +128,8 @@ _02055302: _02055328: .word sub_020552D4 thumb_func_end PalleteFadeUntilFinished - thumb_func_start sub_0205532C -sub_0205532C: ; 0x0205532C + thumb_func_start CallTask_FadeFromBlack +CallTask_FadeFromBlack: ; 0x0205532C push {r3, r4, lr} sub sp, #0xc add r4, r0, #0 @@ -159,7 +159,7 @@ _02055346: pop {r3, r4, pc} nop _0205536C: .word sub_020552D4 - thumb_func_end sub_0205532C + thumb_func_end CallTask_FadeFromBlack thumb_func_start sub_02055370 sub_02055370: ; 0x02055370 @@ -227,7 +227,7 @@ sub_020553C0: ; 0x020553C0 b _02055404 _020553E0: add r0, r5, #0 - bl sub_020552A4 + bl CallTask_RestoreOverworld ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -235,7 +235,7 @@ _020553E0: _020553EE: bl ov01_021EFAF8 add r0, r5, #0 - bl sub_0205532C + bl CallTask_FadeFromBlack ldr r0, [r4] add r0, r0, #1 str r0, [r4] diff --git a/asm/unk_02056680.s b/asm/unk_02056680.s index 3daeb6c59..6f203e7b9 100644 --- a/asm/unk_02056680.s +++ b/asm/unk_02056680.s @@ -16,7 +16,7 @@ sub_02056680: ; 0x02056680 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r0, [r4, #2] cmp r0, #0 @@ -75,7 +75,7 @@ sub_020566F8: ; 0x020566F8 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r0, [r4, #2] cmp r0, #3 @@ -168,7 +168,7 @@ sub_020567B4: ; 0x020567B4 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r5, #0x40] bl PlayerAvatar_GetMapObject @@ -219,7 +219,7 @@ sub_0205681C: ; 0x0205681C bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r0, [r4, #2] cmp r0, #5 @@ -351,7 +351,7 @@ sub_02056938: ; 0x02056938 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r0, [r4, #2] cmp r0, #5 @@ -807,7 +807,7 @@ sub_02056D30: ; 0x02056D30 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r1, [r4] cmp r1, #0 diff --git a/asm/unk_02058AEC.s b/asm/unk_02058AEC.s index f2e56b51b..cc9b13515 100644 --- a/asm/unk_02058AEC.s +++ b/asm/unk_02058AEC.s @@ -332,7 +332,7 @@ sub_02058D4C: ; 0x02058D4C push {r3, r4, r5, lr} sub sp, #8 add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r5, #0 bl TaskManager_GetFieldSystem @@ -1476,11 +1476,11 @@ _02059672: thumb_func_start sub_0205969C sub_0205969C: ; 0x0205969C - ldr r3, _020596A4 ; =TaskManager_GetEnv + ldr r3, _020596A4 ; =TaskManager_GetEnvironment ldr r0, [r0, #0x10] bx r3 nop -_020596A4: .word TaskManager_GetEnv +_020596A4: .word TaskManager_GetEnvironment thumb_func_end sub_0205969C thumb_func_start sub_020596A8 @@ -2135,7 +2135,7 @@ sub_02059B64: ; 0x02059B64 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r1, #0 ldr r0, [r4, #0x24] diff --git a/asm/unk_0205BB1C.s b/asm/unk_0205BB1C.s index d585d8952..59bd86c25 100644 --- a/asm/unk_0205BB1C.s +++ b/asm/unk_0205BB1C.s @@ -461,7 +461,7 @@ sub_0205BE28: ; 0x0205BE28 add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 mov r0, #2 lsl r0, r0, #0xe @@ -613,7 +613,7 @@ sub_0205BF6C: ; 0x0205BF6C add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4, #9] ldr r0, [r4] diff --git a/asm/unk_02066EDC.s b/asm/unk_02066EDC.s index 7593fcd13..f5a928ec2 100644 --- a/asm/unk_02066EDC.s +++ b/asm/unk_02066EDC.s @@ -249,7 +249,7 @@ sub_020670B0: ; 0x020670B0 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #4] cmp r1, #4 @@ -386,7 +386,7 @@ sub_020671B0: ; 0x020671B0 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #4] cmp r1, #0 @@ -456,7 +456,7 @@ sub_02067238: ; 0x02067238 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 bl sub_0203769C mov r1, #1 diff --git a/asm/unk_0206793C.s b/asm/unk_0206793C.s index 5bbf7be8d..6fa19a3cf 100644 --- a/asm/unk_0206793C.s +++ b/asm/unk_0206793C.s @@ -20,7 +20,7 @@ sub_0206793C: ; 0x0206793C add r4, r0, #0 bl TaskManager_GetFieldSystem add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r2, r0, #0 ldr r1, _02067958 ; =_020FE79C add r0, r4, #0 @@ -39,7 +39,7 @@ Task_NPCTrade: ; 0x0206795C bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #4] cmp r0, #6 @@ -100,14 +100,14 @@ _020679D4: b _02067A16 _020679E2: add r0, r5, #0 - bl sub_020552A4 + bl CallTask_RestoreOverworld ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] b _02067A16 _020679F0: add r0, r5, #0 - bl sub_0205532C + bl CallTask_FadeFromBlack ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] diff --git a/asm/unk_02067A60.s b/asm/unk_02067A60.s index 550ef2765..8739afd84 100644 --- a/asm/unk_02067A60.s +++ b/asm/unk_02067A60.s @@ -259,7 +259,7 @@ sub_02067C30: ; 0x02067C30 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrh r0, [r4, #4] cmp r0, #6 diff --git a/asm/unk_02068FC8.s b/asm/unk_02068FC8.s index 75ee9e61e..68c867be2 100644 --- a/asm/unk_02068FC8.s +++ b/asm/unk_02068FC8.s @@ -612,7 +612,7 @@ sub_02069498: ; 0x02069498 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 ldr r0, [r5] cmp r0, #0xa diff --git a/asm/unk_0206A360.s b/asm/unk_0206A360.s index 7c0bad219..9368dd487 100644 --- a/asm/unk_0206A360.s +++ b/asm/unk_0206A360.s @@ -121,7 +121,7 @@ sub_0206A410: ; 0x0206A410 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #3 diff --git a/asm/unk_0206B910.s b/asm/unk_0206B910.s index 7a2351756..1386cae21 100644 --- a/asm/unk_0206B910.s +++ b/asm/unk_0206B910.s @@ -70,7 +70,7 @@ sub_0206B984: ; 0x0206B984 push {r4, r5, r6, r7, lr} sub sp, #0xc str r0, [sp] - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r7, r0, #0 ldr r0, [sp] ldr r6, [r7, #4] @@ -249,7 +249,7 @@ _0206BAF2: b _0206BB1C _0206BAF8: ldr r0, [sp] - bl sub_020552A4 + bl CallTask_RestoreOverworld mov r0, #6 str r0, [r7, #0x10] b _0206BB1C @@ -286,7 +286,7 @@ ScrCmd_232: ; 0x0206BB2C add r5, #0x80 add r1, r0, #0 ldr r0, [r5] - bl VarGet + bl FieldSystem_VarGet add r1, r0, #0 lsl r1, r1, #0x18 ldr r0, [r4] @@ -310,7 +310,7 @@ ScrCmd_233: ; 0x0206BB5C add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet str r0, [r4, #0x64] ldr r1, _0206BB8C ; =sub_0206BB90 add r0, r4, #0 @@ -353,7 +353,7 @@ ScrCmd_234: ; 0x0206BBAC add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r6, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -361,7 +361,7 @@ ScrCmd_234: ; 0x0206BBAC add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r7, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -369,7 +369,7 @@ ScrCmd_234: ; 0x0206BBAC add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet str r0, [sp] add r0, r5, #0 bl ScriptReadHalfword @@ -377,7 +377,7 @@ ScrCmd_234: ; 0x0206BBAC add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r1, sp, #4 strb r7, [r1] ldr r0, [sp] @@ -410,7 +410,7 @@ ScrCmd_235: ; 0x0206BC2C add r0, r5, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r5, #0x80 ldr r0, [r5] ldr r0, [r0, #0x20] diff --git a/asm/unk_0206D494.s b/asm/unk_0206D494.s index f88da5fc4..c3ddcc85c 100644 --- a/asm/unk_0206D494.s +++ b/asm/unk_0206D494.s @@ -54,7 +54,7 @@ sub_0206D4E4: ; 0x0206D4E4 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r5, r0, #0 add r0, r4, #0 bl TaskManager_GetStatePtr @@ -928,7 +928,7 @@ sub_0206DBC0: ; 0x0206DBC0 bl TaskManager_GetFieldSystem add r7, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r7, #0 bl FieldSystem_BugContest_Get @@ -1004,7 +1004,7 @@ ScrCmd_807: ; 0x0206DC50 add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl VarGet + bl FieldSystem_VarGet add r5, r0, #0 add r0, r4, #0 bl ScriptReadHalfword diff --git a/asm/unk_02078834.s b/asm/unk_02078834.s index ab56432cc..bf5fc983b 100644 --- a/asm/unk_02078834.s +++ b/asm/unk_02078834.s @@ -20,7 +20,7 @@ sub_02078834: ; 0x02078834 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r6, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #4] cmp r1, #0x19 diff --git a/asm/unk_020910D8.s b/asm/unk_020910D8.s index 71c5b97ed..cb14bd6eb 100644 --- a/asm/unk_020910D8.s +++ b/asm/unk_020910D8.s @@ -17,7 +17,7 @@ sub_020910D8: ; 0x020910D8 push {r3, r4, r5, r6, r7, lr} sub sp, #0x10 add r5, r0, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4] cmp r1, #6 @@ -162,7 +162,7 @@ _0209120C: b _02091232 _0209121A: add r0, r5, #0 - bl sub_020552A4 + bl CallTask_RestoreOverworld ldr r0, [r4] add r0, r0, #1 str r0, [r4] diff --git a/asm/unk_02092B04.s b/asm/unk_02092B04.s index dd380033b..0e341aa51 100644 --- a/asm/unk_02092B04.s +++ b/asm/unk_02092B04.s @@ -16,7 +16,7 @@ sub_02092B04: ; 0x02092B04 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, _02092B3C ; =0x00000272 ldrb r0, [r4, r0] @@ -81,7 +81,7 @@ sub_02092B7C: ; 0x02092B7C bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 add r0, r6, #0 bl sub_020505C8 diff --git a/asm/unk_02095DF4.s b/asm/unk_02095DF4.s index 2ec2373d1..baf0a5cb3 100644 --- a/asm/unk_02095DF4.s +++ b/asm/unk_02095DF4.s @@ -48,7 +48,7 @@ sub_02095E30: ; 0x02095E30 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #3 diff --git a/asm/unk_020961D8.s b/asm/unk_020961D8.s index 1d65a9646..925c7f402 100644 --- a/asm/unk_020961D8.s +++ b/asm/unk_020961D8.s @@ -75,7 +75,7 @@ sub_02096248: ; 0x02096248 thumb_func_start sub_02096260 sub_02096260: ; 0x02096260 push {r4, lr} - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #0x18] cmp r1, #4 diff --git a/asm/unk_020977CC.s b/asm/unk_020977CC.s index 1a3de3067..e91fac127 100644 --- a/asm/unk_020977CC.s +++ b/asm/unk_020977CC.s @@ -104,7 +104,7 @@ sub_02097878: ; 0x02097878 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r6, r0, #0 add r0, r5, #0 bl TaskManager_GetStatePtr @@ -151,7 +151,7 @@ sub_020978D0: ; 0x020978D0 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4] cmp r1, #5 diff --git a/asm/unk_020979A8.s b/asm/unk_020979A8.s index 0b0af81bc..405daaf82 100644 --- a/asm/unk_020979A8.s +++ b/asm/unk_020979A8.s @@ -100,7 +100,7 @@ sub_02097A48: ; 0x02097A48 bl TaskManager_GetFieldSystem add r4, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r6, r0, #0 add r0, r5, #0 bl TaskManager_GetStatePtr @@ -147,7 +147,7 @@ sub_02097AA0: ; 0x02097AA0 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldrb r1, [r4] cmp r1, #5 diff --git a/asm/unk_02097BE0.s b/asm/unk_02097BE0.s index 9b9dac6b0..96a7687ee 100644 --- a/asm/unk_02097BE0.s +++ b/asm/unk_02097BE0.s @@ -78,7 +78,7 @@ sub_02097C50: ; 0x02097C50 bl TaskManager_GetFieldSystem add r6, r0, #0 add r0, r5, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r1, [r4, #0x50] cmp r1, #3 @@ -111,7 +111,7 @@ _02097C8A: b _02097CB0 _02097C9A: add r0, r5, #0 - bl sub_020552A4 + bl CallTask_RestoreOverworld ldr r0, [r4, #0x50] add r0, r0, #1 str r0, [r4, #0x50] @@ -152,7 +152,7 @@ sub_02097CD8: ; 0x02097CD8 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4, #8] ldr r1, [r4] diff --git a/asm/unk_02097D3C.s b/asm/unk_02097D3C.s index a6b0701e1..4cdd9f9b5 100644 --- a/asm/unk_02097D3C.s +++ b/asm/unk_02097D3C.s @@ -50,7 +50,7 @@ sub_02097D80: ; 0x02097D80 bl TaskManager_GetFieldSystem add r5, r0, #0 add r0, r4, #0 - bl TaskManager_GetEnv + bl TaskManager_GetEnvironment add r4, r0, #0 ldr r0, [r4] cmp r0, #4 diff --git a/include/field_follow_poke.h b/include/field_follow_poke.h index 61a9036ee..000856c09 100644 --- a/include/field_follow_poke.h +++ b/include/field_follow_poke.h @@ -20,7 +20,7 @@ u8 sub_02069EC0(LocalMapObject *mapObject); u8 sub_02069ED4(LocalMapObject *mapObject); void FollowPokeMapObjectSetParams(LocalMapObject *mapObject, int species, u8 form, BOOL shiny); void sub_02069F0C(LocalMapObject *mapObject, int species, u8 form, BOOL shiny, int a4); -void FieldSystem_SetFollowPokeParam(FieldSystem *fieldSystem, int species, u8 form, BOOL shiny, u8 gender); +void FieldSystem_SetFollowerPokeParam(FieldSystem *fieldSystem, int species, u8 form, BOOL shiny, u8 gender); u8 GetFollowPokeSizeParamBySpecies(int species); int FollowPokeObj_GetSpecies(LocalMapObject *mapObject); BOOL FollowingPokemon_IsActive(FieldSystem *fieldSystem); diff --git a/include/field_map_object.h b/include/field_map_object.h index 02150b0c8..990473372 100644 --- a/include/field_map_object.h +++ b/include/field_map_object.h @@ -354,7 +354,7 @@ MapObjectManager* MapObject_GetManager(LocalMapObject* object); MapObjectManager* sub_0205F364(LocalMapObject* object); ObjectEvent* sub_0205FA98(u16 id, int num_templates, ObjectEvent* templates); void sub_0205F338(LocalMapObject* object, SysTask* a1); -BOOL FlagGet(FieldSystem*, u16); +BOOL FieldSystem_FlagGet(FieldSystem*, u16); u16 ObjectEventTemplate_GetXCoord(ObjectEvent* template); u32 ObjectEventTemplate_GetHeight(ObjectEvent* template); u16 ObjectEventTemplate_GetYCoord(ObjectEvent* template); diff --git a/include/fieldmap.h b/include/fieldmap.h index 82ea71034..481ccebfc 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -31,12 +31,12 @@ void ScriptRunByIndex(ScriptContext *ctx, int idx); u8 *LoadScriptsForCurrentMap(u32 mapId); u32 GetCurrentMapMessageBank(u32 mapId); u16* GetVarPointer(FieldSystem* fieldSystem, u16 varId); -u16 VarGet(FieldSystem* fieldSystem, u16 varId); -BOOL VarSet(FieldSystem* fieldSystem, u16 varId, u16 value); -u16 VarGetObjectEventGraphicsId(FieldSystem* fieldSystem, u16 objId); -BOOL FlagGet(FieldSystem *fieldSystem, u16 flagId); -void FlagSet(FieldSystem *fieldSystem, u16 flagId); -void FlagClear(FieldSystem *fieldSystem, u16 flagId); +u16 FieldSystem_VarGet(FieldSystem* fieldSystem, u16 varId); +BOOL FieldSystem_VarSet(FieldSystem* fieldSystem, u16 varId, u16 value); +u16 FieldSystem_VarGetObjectEventGraphicsId(FieldSystem* fieldSystem, u16 objId); +BOOL FieldSystem_FlagGet(FieldSystem *fieldSystem, u16 flagId); +void FieldSystem_FlagSet(FieldSystem *fieldSystem, u16 flagId); +void FieldSystem_FlagClear(FieldSystem *fieldSystem, u16 flagId); void ClearTempFieldEventData(FieldSystem *fieldSystem); void ClearDailyFlags(FieldSystem *fieldSystem); void FieldMoveArgsSet(FieldSystem *fieldSystem, u16 v8000, u16 v8001, u16 v8002, u16 v8003); diff --git a/include/scrcmd.h b/include/scrcmd.h index 739277d30..18081e224 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -7,7 +7,7 @@ #include "script.h" static inline u16 ScriptGetVar(ScriptContext* ctx) { - return VarGet(ctx->fieldSystem, ScriptReadHalfword(ctx)); + return FieldSystem_VarGet(ctx->fieldSystem, ScriptReadHalfword(ctx)); } static inline u16* ScriptGetVarPointer(ScriptContext* ctx) { diff --git a/include/task.h b/include/task.h index 68a71844e..43a07e1be 100644 --- a/include/task.h +++ b/include/task.h @@ -37,7 +37,7 @@ void sub_020505C0(FieldSystem *fieldSystem); BOOL sub_020505C8(FieldSystem *fieldSystem); void CallApplicationAsTask(TaskManager *taskManager, const OVY_MGR_TEMPLATE *template, void *work); FieldSystem *TaskManager_GetFieldSystem(TaskManager *taskManager); -void *TaskManager_GetEnv(TaskManager *taskManager); +void *TaskManager_GetEnvironment(TaskManager *taskManager); u32 *TaskManager_GetStatePtr(TaskManager *taskManager); u32 sub_02050658(TaskManager *taskManager); diff --git a/include/unk_02055244.h b/include/unk_02055244.h index f422544a5..3183112df 100644 --- a/include/unk_02055244.h +++ b/include/unk_02055244.h @@ -5,7 +5,7 @@ void sub_0205525C(TaskManager *taskManager); void PalleteFadeUntilFinished(TaskManager *taskManager); -void sub_0205532C(TaskManager *taskManager); +void CallTask_FadeFromBlack(TaskManager *taskManager); void sub_020553B0(TaskManager *taskManager); void sub_02055408(TaskManager *taskManager); diff --git a/include/unk_020552A4.h b/include/unk_020552A4.h index 8b9c5e587..ff41d1cd2 100644 --- a/include/unk_020552A4.h +++ b/include/unk_020552A4.h @@ -3,6 +3,6 @@ #include "task.h" -void sub_020552A4(TaskManager *taskManager); +void CallTask_RestoreOverworld(TaskManager *taskManager); #endif //POKEHEARTGOLD_UNK_020552A4_H diff --git a/src/choose_starter.c b/src/choose_starter.c index 76ff466e2..d3144e7f6 100644 --- a/src/choose_starter.c +++ b/src/choose_starter.c @@ -25,7 +25,7 @@ void LaunchStarterChoiceScene(FieldSystem *fieldSystem) { static BOOL CreateStarter(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct ChooseStarterTaskData *env = TaskManager_GetEnv(taskManager); + struct ChooseStarterTaskData *env = TaskManager_GetEnvironment(taskManager); int i; u32 mapsec; Party *party; diff --git a/src/encounter.c b/src/encounter.c index 17d7e2fcd..1bed27257 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -48,7 +48,7 @@ static void sub_02051660(FieldSystem *fieldSystem, BattleSetup *setup); static BOOL sub_02050660(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - BattleSetup *battleSetup = TaskManager_GetEnv(man); + BattleSetup *battleSetup = TaskManager_GetEnvironment(man); int *state = TaskManager_GetStatePtr(man); switch (*state) { @@ -92,7 +92,7 @@ static BOOL sub_020506F4(ENCOUNTER *work, FieldSystem *fieldSystem) { if (work->winFlag != NULL) { *(work->winFlag) = work->setup->winFlag; } - VarSet(fieldSystem, VAR_BATTLE_RESULT, work->setup->winFlag); + FieldSystem_VarSet(fieldSystem, VAR_BATTLE_RESULT, work->setup->winFlag); return IsBattleResultWin(work->setup->winFlag); } @@ -104,7 +104,7 @@ static void sub_02050724(BattleSetup *setup, FieldSystem *fieldSystem) { static BOOL sub_02050738(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); int *state = TaskManager_GetStatePtr(man); switch (*state) { @@ -145,12 +145,12 @@ static BOOL sub_02050738(TaskManager *man) { } sub_02051660(fieldSystem, encounter->setup); - sub_020552A4(man); + CallTask_RestoreOverworld(man); (*state)++; break; case 4: MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - sub_0205532C(man); + CallTask_FadeFromBlack(man); (*state)++; break; case 5: @@ -182,7 +182,7 @@ static void sub_0205087C(int a0, FieldSystem *fieldSystem) { static BOOL sub_020508B8(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); int *state = TaskManager_GetStatePtr(man); switch (*state) { @@ -203,7 +203,7 @@ static BOOL sub_020508B8(TaskManager *man) { sub_02052444(encounter->setup, fieldSystem); GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK20); sub_020506F4(encounter, fieldSystem); - sub_020552A4(man); + CallTask_RestoreOverworld(man); (*state)++; break; case 4: @@ -216,7 +216,7 @@ static BOOL sub_020508B8(TaskManager *man) { static BOOL sub_02050960(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); int *state = TaskManager_GetStatePtr(man); switch (*state) { @@ -243,7 +243,7 @@ static BOOL sub_02050960(TaskManager *man) { static BOOL sub_020509F0(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); int *state = TaskManager_GetStatePtr(man); switch (*state) { @@ -267,12 +267,12 @@ static BOOL sub_020509F0(TaskManager *man) { } sub_020506F4(encounter, fieldSystem); - sub_020552A4(man); + CallTask_RestoreOverworld(man); (*state)++; break; case 4: - sub_0205532C(man); + CallTask_FadeFromBlack(man); (*state)++; break; case 5: @@ -345,7 +345,7 @@ void sub_02050B90(FieldSystem *fieldSystem, TaskManager *man, BattleSetup *setup static BOOL Task_WildEncounter(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - WILD_ENCOUNTER *encounter = TaskManager_GetEnv(man); + WILD_ENCOUNTER *encounter = TaskManager_GetEnvironment(man); switch (encounter->state) { case 0: @@ -378,13 +378,13 @@ static BOOL Task_WildEncounter(TaskManager *man) { } sub_02051660(fieldSystem, encounter->setup); - sub_020552A4(man); + CallTask_RestoreOverworld(man); encounter->state++; break; case 4: ov02_BattleExit_HandleRoamerAction(fieldSystem, encounter->setup); - sub_0205532C(man); + CallTask_FadeFromBlack(man); encounter->state++; break; case 5: @@ -398,7 +398,7 @@ static BOOL Task_WildEncounter(TaskManager *man) { static BOOL Task_SafariEncounter(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); int *state = TaskManager_GetStatePtr(man); u16 *safariBall = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fieldSystem->saveData)); @@ -443,12 +443,12 @@ static BOOL Task_SafariEncounter(TaskManager *man) { (*state)++; break; case 5: - sub_020552A4(man); + CallTask_RestoreOverworld(man); (*state)++; break; case 6: MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - sub_0205532C(man); + CallTask_FadeFromBlack(man); (*state)++; break; case 7: @@ -474,7 +474,7 @@ static BOOL Task_SafariEncounter(TaskManager *man) { static BOOL Task_BugContestEncounter(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); BUGCONTEST *contest = FieldSystem_BugContest_Get(fieldSystem); int *state = TaskManager_GetStatePtr(man); u16 *sportBall = BugContest_GetSportBallsAddr(contest); @@ -518,12 +518,12 @@ static BOOL Task_BugContestEncounter(TaskManager *man) { (*state)++; break; case 5: - sub_020552A4(man); + CallTask_RestoreOverworld(man); (*state)++; break; case 6: MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - sub_0205532C(man); + CallTask_FadeFromBlack(man); (*state)++; break; case 7: @@ -579,7 +579,7 @@ void sub_02051090(TaskManager *man, u16 species, u8 level, u32 *winFlag, BOOL ca static BOOL Task_PalParkEncounter(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); int *state = TaskManager_GetStatePtr(man); switch(*state) { @@ -604,12 +604,12 @@ static BOOL Task_PalParkEncounter(TaskManager *man) { (*state)++; break; case 4: - sub_020552A4(man); + CallTask_RestoreOverworld(man); (*state)++; break; case 5: MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - sub_0205532C(man); + CallTask_FadeFromBlack(man); (*state)++; break; case 6: @@ -647,7 +647,7 @@ void sub_02051228(TaskManager *man, u16 species, u8 level) { } static BOOL Task_TutorialBattle(TaskManager *man) { - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); int *state = TaskManager_GetStatePtr(man); @@ -669,12 +669,12 @@ static BOOL Task_TutorialBattle(TaskManager *man) { (*state)++; break; case 4: - sub_020552A4(man); + CallTask_RestoreOverworld(man); (*state)++; break; case 5: MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); - sub_0205532C(man); + CallTask_FadeFromBlack(man); (*state)++; break; case 6: @@ -810,7 +810,7 @@ void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag) { static BOOL sub_02051540(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - ENCOUNTER *encounter = TaskManager_GetEnv(man); + ENCOUNTER *encounter = TaskManager_GetEnvironment(man); int *state = TaskManager_GetStatePtr(man); switch (*state) { diff --git a/src/field/overlay_01_apricorn_tree_anim.c b/src/field/overlay_01_apricorn_tree_anim.c index 37ad639a3..c3950770a 100644 --- a/src/field/overlay_01_apricorn_tree_anim.c +++ b/src/field/overlay_01_apricorn_tree_anim.c @@ -66,7 +66,7 @@ static BOOL Task_AnimApricornTree(TaskManager *taskman) { int apricornType; FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); - AnimApricornTreeWork *env = TaskManager_GetEnv(taskman); + AnimApricornTreeWork *env = TaskManager_GetEnvironment(taskman); switch (env->state) { case 0: @@ -214,7 +214,7 @@ static BOOL Task_AnimPlayerShakeTree(TaskManager *taskman) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); LocalMapObject *playerObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); int *state_p = TaskManager_GetStatePtr(taskman); - AnimPlayerShakeTreeWork *env = TaskManager_GetEnv(taskman); + AnimPlayerShakeTreeWork *env = TaskManager_GetEnvironment(taskman); switch (*state_p) { case 0: diff --git a/src/field/overlay_01_rock_smash_item.c b/src/field/overlay_01_rock_smash_item.c index c6dd0912b..9306b269c 100644 --- a/src/field/overlay_01_rock_smash_item.c +++ b/src/field/overlay_01_rock_smash_item.c @@ -103,7 +103,7 @@ void FieldSystem_RockSmashItemCheck(FieldSystem *fieldSystem, int followMonKnows static BOOL Task_RockSmashItemCheck(TaskManager *taskman) { BattleSetup *setup; FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); - RockSmashItemCheckWork *env = TaskManager_GetEnv(taskman); + RockSmashItemCheckWork *env = TaskManager_GetEnvironment(taskman); if (ov02_022470A0(fieldSystem, &setup)) { *env->itemFound = FALSE; @@ -175,7 +175,7 @@ static BOOL Task_GetRockSmashItem(TaskManager *taskman) { LocalMapObject *obj; int *state_p = TaskManager_GetStatePtr(taskman); - RockSmashItemCheckWork *env = TaskManager_GetEnv(taskman); + RockSmashItemCheckWork *env = TaskManager_GetEnvironment(taskman); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); switch (*state_p) { diff --git a/src/field_black_out.c b/src/field_black_out.c index f7e2a9406..e3a342a34 100644 --- a/src/field_black_out.c +++ b/src/field_black_out.c @@ -109,7 +109,7 @@ static void DrawBlackoutMessage(FieldSystem *fieldSystem, TaskManager *taskManag } static BOOL FieldTask_ShowPrintedMessage(TaskManager *taskManager) { - struct BlackoutScreenWork *work = TaskManager_GetEnv(taskManager); + struct BlackoutScreenWork *work = TaskManager_GetEnvironment(taskManager); switch (work->state) { case 0: BeginNormalPaletteFade(3, 1, 43, RGB_WHITE, 8, 1, (HeapID)32); @@ -201,7 +201,7 @@ BOOL FieldTask_BlackOut(TaskManager *taskManager) { (*state)++; break; case 4: - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); (*state)++; break; case 5: diff --git a/src/field_follow_poke.c b/src/field_follow_poke.c index 94211031a..6311876c1 100644 --- a/src/field_follow_poke.c +++ b/src/field_follow_poke.c @@ -1533,7 +1533,7 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int d shiny = MonIsShiny(mon); fieldSystem->followMon.mapObject = CreateFollowingSpriteFieldObject(mapObjectMan, species, form, gender, direction, x, y, shiny); fieldSystem->followMon.active = TRUE; - FieldSystem_SetFollowPokeParam(fieldSystem, species, form, shiny, gender); + FieldSystem_SetFollowerPokeParam(fieldSystem, species, form, shiny, gender); FieldSystemUnkSub108_Set(fieldSystem->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); player_unk = PlayerAvatar_GetState(fieldSystem->playerAvatar); if (player_unk == 0 || player_unk == 3) { @@ -1588,7 +1588,7 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) { shiny = MonIsShiny(mon); fieldSystem->followMon.mapObject = followPokeObj; fieldSystem->followMon.active = TRUE; - FieldSystem_SetFollowPokeParam(fieldSystem, species, form, shiny, gender); + FieldSystem_SetFollowerPokeParam(fieldSystem, species, form, shiny, gender); FollowPokeMapObjectSetParams(followPokeObj, species, form, shiny); MapObject_SetGfxID(fieldSystem->followMon.mapObject, FollowingPokemon_GetSpriteID(species, form, gender)); player_unk = PlayerAvatar_GetState(fieldSystem->playerAvatar); @@ -1617,7 +1617,7 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) { form = GetMonData(mon, MON_DATA_FORM, NULL); gender = GetMonGender(mon); shiny = MonIsShiny(mon); - FieldSystem_SetFollowPokeParam(fieldSystem, species, form, shiny, gender); + FieldSystem_SetFollowerPokeParam(fieldSystem, species, form, shiny, gender); FollowPokeMapObjectSetParams(followPokeObj, species, form, shiny); MapObject_SetGfxID(followPokeObj, FollowingPokemon_GetSpriteID(species, form, gender)); fieldSystem->followMon.mapObject = followPokeObj; @@ -1755,7 +1755,7 @@ void sub_02069F0C(LocalMapObject *mapObject, int species, u8 form, BOOL shiny, i MapObject_SetParam(mapObject, species, 0); } -void FieldSystem_SetFollowPokeParam(FieldSystem *fieldSystem, int species, u8 form, BOOL shiny, u8 gender) { +void FieldSystem_SetFollowerPokeParam(FieldSystem *fieldSystem, int species, u8 form, BOOL shiny, u8 gender) { fieldSystem->followMon.species = species; fieldSystem->followMon.shiny = shiny; fieldSystem->followMon.form = form; diff --git a/src/field_map_object.c b/src/field_map_object.c index c05910e01..c1328a40b 100644 --- a/src/field_map_object.c +++ b/src/field_map_object.c @@ -149,7 +149,7 @@ LocalMapObject* CreateMapObjectFromTemplate(MapObjectManager* manager, u16 id, u if (event != NULL) { u32 flag_id = ObjectEventTemplate_GetFlagID(event); FieldSystem* fieldSystem = MapObjectManager_GetFieldSysPtr(manager); - if (FlagGet(fieldSystem, (u16)flag_id) == FALSE) { + if (FieldSystem_FlagGet(fieldSystem, (u16)flag_id) == FALSE) { ret = sub_0205E1D0(manager, event, map_no); } } @@ -184,7 +184,7 @@ void MapObject_Remove(LocalMapObject* object) { void DeleteMapObject(LocalMapObject* object) { u32 flag_id = MapObject_GetFlagID(object); FieldSystem* fieldSystem = MapObject_GetFieldSysPtr(object); - FlagSet(fieldSystem, (u16)flag_id); + FieldSystem_FlagSet(fieldSystem, (u16)flag_id); MapObject_Remove(object); } @@ -475,7 +475,7 @@ void sub_0205EA08(struct MapObjectInitArgs* args) { ObjectEvent* template = args->templates; do { - GF_ASSERT((ObjectEventTemplate_ScriptIdIsFFFF(template) != TRUE && FlagGet(fieldSystem, template->flag) != FALSE) || + GF_ASSERT((ObjectEventTemplate_ScriptIdIsFFFF(template) != TRUE && FieldSystem_FlagGet(fieldSystem, template->flag) != FALSE) || sub_0205E1D0(args->manager, template, args->map_no) != NULL); template++; @@ -719,7 +719,7 @@ void sub_0205EF6C(LocalMapObject* object) { u32 ResolveObjectGfxId(FieldSystem* fieldSystem, int a1) { if (a1 >= 101 && a1 <= 117) { - a1 = VarGetObjectEventGraphicsId(fieldSystem, (u16)(a1 - 101)); + a1 = FieldSystem_VarGetObjectEventGraphicsId(fieldSystem, (u16)(a1 - 101)); } return a1; } diff --git a/src/field_move.c b/src/field_move.c index 97a59ee22..5b5bf9d62 100644 --- a/src/field_move.c +++ b/src/field_move.c @@ -197,7 +197,7 @@ static u32 FieldMoveMenuCheck_Cut(const struct FieldMoveCheckData *checkData) { } static void FieldMoveMenuUse_Cut(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *bagWork = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *bagWork = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *useMoveEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); bagWork->atexit_TaskFunc = Task_UseCutInField; @@ -206,7 +206,7 @@ static void FieldMoveMenuUse_Cut(struct FieldMoveUseData *useData, const struct } static BOOL Task_UseCutInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_cut, env->facingObject); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); @@ -243,7 +243,7 @@ static u32 FieldMoveMenuCheck_Fly(const struct FieldMoveCheckData *checkData) { static void FieldMoveMenuUse_Fly(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(useData->taskManager); struct FlyTaskStruct *flyEnv = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct FlyTaskStruct)); flyEnv->partySlot = useData->partySlot; env->unk_0384 = flyEnv; @@ -279,7 +279,7 @@ static u32 FieldMoveMenuCheck_Surf(const struct FieldMoveCheckData *checkData) { } static void FieldMoveMenuUse_Surf(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseSurfInField; @@ -288,7 +288,7 @@ static void FieldMoveMenuUse_Surf(struct FieldMoveUseData *useData, const struct } static BOOL Task_UseSurfInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_surf, NULL); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); @@ -315,7 +315,7 @@ static u32 FieldMoveMenuCheck_Strength(const struct FieldMoveCheckData *checkDat } static void FieldMoveMenuUse_Strength(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseStrengthInField; @@ -324,7 +324,7 @@ static void FieldMoveMenuUse_Strength(struct FieldMoveUseData *useData, const st } static BOOL Task_UseStrengthInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_strength, env->facingObject); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); @@ -347,7 +347,7 @@ static u32 FieldMoveMenuCheck_RockSmash(const struct FieldMoveCheckData *checkDa } static void FieldMoveMenuUse_RockSmash(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseRockSmashInField; @@ -356,7 +356,7 @@ static void FieldMoveMenuUse_RockSmash(struct FieldMoveUseData *useData, const s } static BOOL Task_UseRockSmashInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_rock_smash, env->facingObject); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); @@ -382,7 +382,7 @@ static u32 FieldMoveMenuCheck_Waterfall(const struct FieldMoveCheckData *checkDa } static void FieldMoveMenuUse_Waterfall(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseWaterfallInField; @@ -391,7 +391,7 @@ static void FieldMoveMenuUse_Waterfall(struct FieldMoveUseData *useData, const s } static BOOL Task_UseWaterfallInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_waterfall, NULL); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); @@ -423,7 +423,7 @@ static u32 FieldMoveMenuCheck_RockClimb(const struct FieldMoveCheckData *checkDa } static void FieldMoveMenuUse_RockClimb(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseRockClimbInField; @@ -432,7 +432,7 @@ static void FieldMoveMenuUse_RockClimb(struct FieldMoveUseData *useData, const s } static BOOL Task_UseRockClimbInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_rock_climb, NULL); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); @@ -457,7 +457,7 @@ static u32 FieldMoveMenuCheck_Flash(const struct FieldMoveCheckData *checkData) } static void FieldMoveMenuUse_Flash(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseFlashInField; @@ -466,7 +466,7 @@ static void FieldMoveMenuUse_Flash(struct FieldMoveUseData *useData, const struc } static BOOL Task_UseFlashInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); if (CheckUseFlashInAlphChamber(fieldSystem)) { StartScriptFromMenu(taskManager, _EV_scr_seq_D24R0204_002 + 1, NULL); @@ -503,7 +503,7 @@ static u32 FieldMoveMenuCheck_Teleport(const struct FieldMoveCheckData *checkDat static void FieldMoveMenuUse_Teleport(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); sub_020505C0(fieldSystem); struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->saveData); struct FlyTaskStruct *retSub = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct FlyTaskStruct)); @@ -516,7 +516,7 @@ static void FieldMoveMenuUse_Teleport(struct FieldMoveUseData *useData, const st static BOOL Task_UseTeleportInField(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct TeleportFieldEnv *env = TaskManager_GetEnv(taskManager); + struct TeleportFieldEnv *env = TaskManager_GetEnvironment(taskManager); struct FieldLongWarpTaskData *newEnv = CreateFieldTeleportTaskEnv(fieldSystem, env->mon, env->flySub->partySlot, HEAP_ID_4); FreeToHeap(env->flySub); FreeToHeap(env); @@ -545,7 +545,7 @@ static u32 FieldMoveMenuCheck_Dig(const struct FieldMoveCheckData *checkData) { static void FieldMoveMenuUse_Dig(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); sub_020505C0(fieldSystem); struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->saveData); struct FlyTaskStruct *retSub = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct FlyTaskStruct)); @@ -558,7 +558,7 @@ static void FieldMoveMenuUse_Dig(struct FieldMoveUseData *useData, const struct static BOOL Task_UseDigInField(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct TeleportFieldEnv *env = TaskManager_GetEnv(taskManager); + struct TeleportFieldEnv *env = TaskManager_GetEnvironment(taskManager); struct FieldLongWarpTaskData *newEnv = CreateFieldDigTaskEnv(fieldSystem, env->mon, env->flySub->partySlot, HEAP_ID_FIELD); FreeToHeap(env->flySub); FreeToHeap(env); @@ -580,7 +580,7 @@ static u32 FieldMoveMenuCheck_SweetScent(const struct FieldMoveCheckData *checkD static void FieldMoveMenuUse_SweetScent(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fieldSystem->saveData); struct FlyTaskStruct *retSub = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct FlyTaskStruct)); retEnv->flySub = retSub; @@ -601,7 +601,7 @@ static u32 FieldMoveMenuCheck_Chatter(const struct FieldMoveCheckData *checkData static void FieldMoveMenuUse_Chatter(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *partyEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(fieldSystem); menuEnv->atexit_TaskFunc = Task_UseChatterInField; @@ -610,7 +610,7 @@ static void FieldMoveMenuUse_Chatter(struct FieldMoveUseData *useData, const str } static BOOL Task_UseChatterInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_chatter, NULL); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); @@ -639,7 +639,7 @@ static u32 FieldMoveMenuCheck_Whirlpool(const struct FieldMoveCheckData *checkDa } static void FieldMoveMenuUse_Whirlpool(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *partyEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseWhirlpoolInField; @@ -648,7 +648,7 @@ static void FieldMoveMenuUse_Whirlpool(struct FieldMoveUseData *useData, const s } static BOOL Task_UseWhirlpoolInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_whirlpool, NULL); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); @@ -669,7 +669,7 @@ static u32 FieldMoveMenuCheck_Headbutt(const struct FieldMoveCheckData *checkDat } static void FieldMoveMenuUse_Headbutt(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); + struct BagViewAppWork *menuEnv = TaskManager_GetEnvironment(useData->taskManager); struct FieldUseMoveEnv *partyEnv = PartyMenuEnv_create(useData, checkData); sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseHeadbuttInField; @@ -678,7 +678,7 @@ static void FieldMoveMenuUse_Headbutt(struct FieldMoveUseData *useData, const st } static BOOL Task_UseHeadbuttInField(TaskManager *taskManager) { - struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); + struct FieldUseMoveEnv *env = TaskManager_GetEnvironment(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_headbutt, env->facingObject); FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); diff --git a/src/field_use_item.c b/src/field_use_item.c index b3121211b..ab9aa0f6d 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -181,7 +181,7 @@ static struct AlphItemUseData *CreateAlphItemUseWork(int scriptNo, u16 var_8000, static void ExitMenuAndJumpToAlphChamberReaction(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2, int scriptNo) { #pragma unused(dat2) FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_UseItemInAlphChamber; env->atexit_TaskEnv = CreateAlphItemUseWork(scriptNo, data->itemId, 0, 0, 0); @@ -190,7 +190,7 @@ static void ExitMenuAndJumpToAlphChamberReaction(struct ItemMenuUseData *data, c static BOOL Task_UseItemInAlphChamber(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct AlphItemUseData *env = TaskManager_GetEnv(taskManager); + struct AlphItemUseData *env = TaskManager_GetEnvironment(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); LocalMapObject *sp0; @@ -215,7 +215,7 @@ static BOOL Task_UseItemInAlphChamber(TaskManager *taskManager) { static void ItemMenuUseFunc_HealingItem(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { #pragma unused(dat2) FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); struct UseItemInPartyTaskEnv *usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); usedat->party = SaveArray_Party_Get(fieldSystem->saveData); @@ -242,7 +242,7 @@ static enum ItemUseError ItemCheckUseFunc_Dummy(const struct ItemCheckUseData *d static void ItemMenuUseFunc_Bicycle(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { #pragma unused(dat2) FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_MountOrDismountBicycle; env->atexit_TaskEnv = NULL; @@ -338,7 +338,7 @@ static enum ItemUseError ItemCheckUseFunc_Bicycle(const struct ItemCheckUseData static void ItemMenuUseFunc_TMHM(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { #pragma unused(dat2) FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); struct UseItemInPartyTaskEnv *usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); usedat->party = SaveArray_Party_Get(fieldSystem->saveData); @@ -361,7 +361,7 @@ static void ItemMenuUseFunc_TMHM(struct ItemMenuUseData *data, const struct Item static void ItemMenuUseFunc_Mail(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { #pragma unused(dat2) FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); struct UseMailWork *mailWork = CreateUseMailWork(fieldSystem, 3, ItemToMailId(data->itemId), HEAP_ID_FIELD); env->unk_0384 = sub_0203D818(data->itemId, 3, 0); env->atexit_TaskEnv = mailWork; @@ -374,7 +374,7 @@ static enum ItemUseError ItemCheckUseFunc_Berry(const struct ItemCheckUseData *d static void ItemMenuUseFunc_Berry(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); ItemMenuUseFunc_HealingItem(data, dat2); } @@ -385,7 +385,7 @@ BOOL Leftover_CanPlantBerry(const struct ItemCheckUseData *data) { static void ItemMenuUseFunc_PalPad(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); env->atexit_TaskEnv = CreatePalPadWork(fieldSystem, fieldSystem->saveData, HEAP_ID_FIELD); sub_0203C8F0(env, sub_0203D718); } @@ -403,7 +403,7 @@ static void ItemMenuUseFunc_Honey(struct ItemMenuUseData *data, const struct Ite size_t size; void *honey_work; FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); sub_020505C0(fieldSystem); size = GetHoneySweetScentWorkSize(); honey_work = AllocFromHeapAtEnd(HEAP_ID_FIELD, size); @@ -416,7 +416,7 @@ static void ItemMenuUseFunc_Honey(struct ItemMenuUseData *data, const struct Ite static void ItemMenuUseFunc_OldRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_OverworldFish; env->atexit_TaskEnv = CreateFishingRodTaskEnv(fieldSystem, HEAP_ID_FIELD, 0); @@ -430,7 +430,7 @@ static BOOL ItemFieldUseFunc_OldRod(struct ItemFieldUseData *data) { static void ItemMenuUseFunc_GoodRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_OverworldFish; env->atexit_TaskEnv = CreateFishingRodTaskEnv(fieldSystem, HEAP_ID_FIELD, 1); @@ -444,7 +444,7 @@ static BOOL ItemFieldUseFunc_GoodRod(struct ItemFieldUseData *data) { static void ItemMenuUseFunc_SuperRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_OverworldFish; env->atexit_TaskEnv = CreateFishingRodTaskEnv(fieldSystem, HEAP_ID_FIELD, 2); @@ -485,7 +485,7 @@ static BOOL ItemFieldUseFunc_Generic(struct ItemFieldUseData *data) { static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct RegisteredKeyItemUseMessagePrintTaskData *env = TaskManager_GetEnv(taskManager); + struct RegisteredKeyItemUseMessagePrintTaskData *env = TaskManager_GetEnvironment(taskManager); OPTIONS *options; switch (env->state) { @@ -528,7 +528,7 @@ static void ItemMenuUseFunc_EvoStone(struct ItemMenuUseData *data, const struct ExitMenuAndJumpToAlphChamberReaction(data, dat2, _EV_scr_seq_D24R0206_002 + 1); return; } - env = TaskManager_GetEnv(data->taskManager); + env = TaskManager_GetEnvironment(data->taskManager); usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); usedat->party = SaveArray_Party_Get(fieldSystem->saveData); @@ -558,7 +558,7 @@ static void ItemMenuUseFunc_EscapeRope(struct ItemMenuUseData *data, const struc } fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - env = TaskManager_GetEnv(data->taskManager); + env = TaskManager_GetEnvironment(data->taskManager); sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_JumpToFieldEscapeRope; env->atexit_TaskEnv = NULL; @@ -589,7 +589,7 @@ static BOOL Task_JumpToFieldEscapeRope(TaskManager *taskManager) { static void ItemMenuUseFunc_ApricornBox(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); env->atexit_TaskEnv = CreateApricornBoxWork(fieldSystem, 1); sub_0203C8F0(env, sub_0203D718); } @@ -605,7 +605,7 @@ static struct ApricornBoxWork *_CreateApricornBoxWork(FieldSystem *fieldSystem) static void ItemMenuUseFunc_BerryPots(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); env->atexit_TaskEnv = BerryPotsArgs_New(fieldSystem); sub_0203C8F0(env, sub_0203D718); } @@ -621,7 +621,7 @@ static struct BerryPotsArgs *_BerryPotsArgs_New(FieldSystem *fieldSystem) { static void ItemMenuUseFunc_UnownReport(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); env->atexit_TaskEnv = CreateUnownReportWork(fieldSystem); sub_0203C8F0(env, sub_0203D718); } @@ -637,7 +637,7 @@ static struct UnownReportWork *_CreateUnownReportWork(FieldSystem *fieldSystem) static void ItemMenuUseFunc_DowsingMchn(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_ActivateDowsingMchnUI; env->atexit_TaskEnv = NULL; @@ -687,7 +687,7 @@ static BOOL ItemFieldUseFunc_GbSounds(struct ItemFieldUseData *data) { static void ItemMenuUseFunc_Gracidea(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); env->atexit_TaskEnv = sub_0203FAE8(fieldSystem, HEAP_ID_FIELD, ITEM_GRACIDEA); sub_0203C8F0(env, sub_0203CA9C); } @@ -703,7 +703,7 @@ static struct GracideaWork *_CreateGracideaWork(FieldSystem *fieldSystem) { static void ItemMenuUseFunc_VSRecorder(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); - struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); + struct BagViewAppWork *env = TaskManager_GetEnvironment(data->taskManager); sub_0203F570(fieldSystem, fieldSystem->saveData); env->atexit_TaskEnv = NULL; sub_0203C8F0(env, sub_0203D9B4); @@ -813,7 +813,7 @@ static void RegisteredItem_GoToPrintErrorTask(struct ItemFieldUseData *data, enu static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct ItemFieldUseData *env = TaskManager_GetEnv(taskManager); + struct ItemFieldUseData *env = TaskManager_GetEnvironment(taskManager); switch (env->state) { case 0: diff --git a/src/field_warp_tasks.c b/src/field_warp_tasks.c index a1072ffbc..f86c83845 100644 --- a/src/field_warp_tasks.c +++ b/src/field_warp_tasks.c @@ -396,7 +396,7 @@ TaskManager *CallFieldTask_ContinueGame_Normal(FieldSystem *fieldSystem) { static BOOL FieldTask_ContinueGame_CommError(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct ErrorContinueEnv *env = TaskManager_GetEnv(taskManager); + struct ErrorContinueEnv *env = TaskManager_GetEnvironment(taskManager); SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->saveData); u32 *state_p = TaskManager_GetStatePtr(taskManager); @@ -416,7 +416,7 @@ static BOOL FieldTask_ContinueGame_CommError(TaskManager *taskManager) { case 2: fieldSystem->unk80 = sub_02059DB0(fieldSystem); fieldSystem->unk84 = sub_0205AC88(fieldSystem->unk80); - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); (*state_p)++; break; case 3: @@ -458,7 +458,7 @@ TaskManager *CallFieldTask_ContinueGame_CommError(FieldSystem *fieldSystem) { static BOOL sub_02053688(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053688 *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053688 *env = TaskManager_GetEnvironment(taskManager); switch (env->unk0) { case 0: @@ -496,7 +496,7 @@ static void sub_02053710(TaskManager *taskManager, Location *location) { static BOOL sub_02053740(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct ErrorContinueEnv *env = TaskManager_GetEnv(taskManager); + struct ErrorContinueEnv *env = TaskManager_GetEnvironment(taskManager); switch (env->state) { case 0: @@ -545,7 +545,7 @@ void sub_020537F0(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, static BOOL Task_ScriptWarp(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct ErrorContinueEnv *env = TaskManager_GetEnv(taskManager); + struct ErrorContinueEnv *env = TaskManager_GetEnvironment(taskManager); switch (env->state) { case 0: @@ -562,7 +562,7 @@ static BOOL Task_ScriptWarp(TaskManager *taskManager) { break; } sub_02055110(fieldSystem, env->location.mapId, 0); - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); env->state++; break; case 3: @@ -612,7 +612,7 @@ void sub_02053908(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, static BOOL sub_02053950(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053950 *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053950 *env = TaskManager_GetEnvironment(taskManager); Location *location = &env->location; switch (env->unk0) { case 0: @@ -661,7 +661,7 @@ static BOOL sub_020539E8(TaskManager *taskManager) { } static void sub_02053A14(TaskManager *taskManager) { - TaskManager_Call(taskManager, sub_02053A2C, TaskManager_GetEnv(taskManager)); + TaskManager_Call(taskManager, sub_02053A2C, TaskManager_GetEnvironment(taskManager)); } static BOOL sub_02053A2C(TaskManager *taskManager) { @@ -669,7 +669,7 @@ static BOOL sub_02053A2C(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); switch (*state_p) { case 0: - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); (*state_p)++; break; case 1: @@ -690,7 +690,7 @@ static BOOL sub_02053A2C(TaskManager *taskManager) { static void sub_02053AA0(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053950 *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053950 *env = TaskManager_GetEnvironment(taskManager); if (!sub_0203DF7C(fieldSystem)) { GF_ASSERT(0); return; @@ -700,7 +700,7 @@ static void sub_02053AA0(TaskManager *taskManager) { } static BOOL sub_02053AE4(TaskManager *taskManager) { - struct UnkTaskEnv_02053950 *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053950 *env = TaskManager_GetEnvironment(taskManager); if (ov02_0224B43C(env->unk4) == TRUE) { ov02_0224B448(env->unk4); return TRUE; @@ -720,7 +720,7 @@ void sub_02053B04(TaskManager *taskManager, Location *location, int a2) { static BOOL sub_02053B3C(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnvironment(taskManager); Location *location = &env->location; switch (env->unk0) { @@ -777,18 +777,18 @@ static BOOL sub_02053BF8(TaskManager *taskManager) { } static void sub_02053C24(TaskManager *taskManager) { - struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnvironment(taskManager); TaskManager_Call(taskManager, sub_02053C3C, env); } static BOOL sub_02053C3C(TaskManager *taskManager) { u32 *state_p = TaskManager_GetStatePtr(taskManager); FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnv(taskManager); // unused + struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnvironment(taskManager); // unused switch (*state_p) { case 0: - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); (*state_p)++; break; case 1: @@ -805,7 +805,7 @@ static BOOL sub_02053C3C(TaskManager *taskManager) { static void sub_02053C90(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnvironment(taskManager); if (!sub_0203DF7C(fieldSystem)) { GF_ASSERT(0); @@ -816,7 +816,7 @@ static void sub_02053C90(TaskManager *taskManager) { static BOOL sub_02053CCC(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053CCC *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053CCC *env = TaskManager_GetEnvironment(taskManager); Location *location = &env->location; struct LocalMapObject *follow_poke_obj; @@ -852,7 +852,7 @@ static BOOL sub_02053CCC(TaskManager *taskManager) { break; } sub_02055110(fieldSystem, location->mapId, 0); - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); env->unk0++; break; case 5: @@ -895,7 +895,7 @@ TaskManager *sub_02053E08(FieldSystem *fieldSystem, u32 mapId, int warpId) { static BOOL sub_02053E5C(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053E5C *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053E5C *env = TaskManager_GetEnvironment(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); Location *location = &env->location; @@ -920,11 +920,11 @@ static BOOL sub_02053E5C(TaskManager *taskManager) { break; } sub_02055110(fieldSystem, location->mapId, 0); - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); (*state_p)++; break; case 4: - sub_0205532C(taskManager); + CallTask_FadeFromBlack(taskManager); (*state_p)++; break; case 5: @@ -949,7 +949,7 @@ void sub_02053F14(FieldSystem *fieldSystem) { static BOOL sub_02053F70(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053E5C *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053E5C *env = TaskManager_GetEnvironment(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); Location *location = &env->location; @@ -972,7 +972,7 @@ static BOOL sub_02053F70(TaskManager *taskManager) { break; } sub_02055110(fieldSystem, location->mapId, 0); - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); (*state_p)++; break; case 4: @@ -1008,7 +1008,7 @@ void sub_02054030(TaskManager *taskManager) { static BOOL sub_020540A4(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - struct UnkTaskEnv_02053688 *env = TaskManager_GetEnv(taskManager); + struct UnkTaskEnv_02053688 *env = TaskManager_GetEnvironment(taskManager); switch (env->unk0) { case 0: @@ -1026,7 +1026,7 @@ static BOOL sub_020540A4(TaskManager *taskManager) { break; } sub_02055110(fieldSystem, env->location.mapId, 0); - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); env->unk0++; break; case 3: diff --git a/src/fieldmap.c b/src/fieldmap.c index a0b872ec9..5a38377b8 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -66,7 +66,7 @@ void StartMapSceneScript(FieldSystem *fieldSystem, u16 script, LocalMapObject *l } void FieldSystem_SetEngagedTrainer(FieldSystem *fieldSystem, LocalMapObject *obj, int a2, int a3, int a4, int trainerId, int encounterType, int idx) { - ScriptEnvironment *env = TaskManager_GetEnv(fieldSystem->taskman); + ScriptEnvironment *env = TaskManager_GetEnvironment(fieldSystem->taskman); EngagedTrainer *r0 = &env->engagedTrainers[idx]; r0->unk0 = a2; r0->unk4 = a3; @@ -95,7 +95,7 @@ BOOL Task_RunScripts(TaskManager *taskman) { FieldSystem *fieldSystem; ScriptEnvironment *env; - env = TaskManager_GetEnv(taskman); + env = TaskManager_GetEnvironment(taskman); fieldSystem = TaskManager_GetFieldSystem(taskman); switch (env->state) { @@ -321,14 +321,14 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv } void* FieldSysGetAttrAddr(FieldSystem *fieldSystem, enum ScriptEnvField field) { - ScriptEnvironment *unk = TaskManager_GetEnv(fieldSystem->taskman); + ScriptEnvironment *unk = TaskManager_GetEnvironment(fieldSystem->taskman); GF_ASSERT(unk != NULL); GF_ASSERT(unk->check == Unk80_10_C_MAGIC); return FieldSysGetAttrAddrInternal(unk, field); } void sub_0204031C(FieldSystem *fieldSystem) { - ScriptEnvironment *unk = TaskManager_GetEnv(fieldSystem->taskman); + ScriptEnvironment *unk = TaskManager_GetEnvironment(fieldSystem->taskman); if (sub_0203BC10(fieldSystem) == TRUE) { unk->scrctx_end_cb = sub_0203BD64; } @@ -358,7 +358,7 @@ u16 *GetVarPointer(FieldSystem *fieldSystem, u16 varIdx) { } } -u16 VarGet(FieldSystem *fieldSystem, u16 varIdx) { +u16 FieldSystem_VarGet(FieldSystem *fieldSystem, u16 varIdx) { u16 *ptr = GetVarPointer(fieldSystem, varIdx); if (ptr != NULL) { varIdx = *ptr; @@ -366,7 +366,7 @@ u16 VarGet(FieldSystem *fieldSystem, u16 varIdx) { return varIdx; } -BOOL VarSet(FieldSystem *fieldSystem, u16 varIdx, u16 value) { +BOOL FieldSystem_VarSet(FieldSystem *fieldSystem, u16 varIdx, u16 value) { u16 *ptr = GetVarPointer(fieldSystem, varIdx); if (ptr == NULL) { return FALSE; @@ -375,20 +375,20 @@ BOOL VarSet(FieldSystem *fieldSystem, u16 varIdx, u16 value) { return TRUE; } -u16 VarGetObjectEventGraphicsId(FieldSystem *fieldSystem, u16 varobjId) { +u16 FieldSystem_VarGetObjectEventGraphicsId(FieldSystem *fieldSystem, u16 varobjId) { GF_ASSERT(varobjId < NUM_OBJ_GFX_VARS); - return VarGet(fieldSystem, VAR_OBJ_GFX_BASE + varobjId); + return FieldSystem_VarGet(fieldSystem, VAR_OBJ_GFX_BASE + varobjId); } -BOOL FlagGet(FieldSystem *fieldSystem, u16 flagId) { +BOOL FieldSystem_FlagGet(FieldSystem *fieldSystem, u16 flagId) { return CheckFlagInArray(Save_VarsFlags_Get(fieldSystem->saveData), flagId); } -void FlagSet(FieldSystem *fieldSystem, u16 flagId) { +void FieldSystem_FlagSet(FieldSystem *fieldSystem, u16 flagId) { return SetFlagInArray(Save_VarsFlags_Get(fieldSystem->saveData), flagId); } -void FlagClear(FieldSystem *fieldSystem, u16 flagId) { +void FieldSystem_FlagClear(FieldSystem *fieldSystem, u16 flagId) { return ClearFlagInArray(Save_VarsFlags_Get(fieldSystem->saveData), flagId); } @@ -551,7 +551,7 @@ HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fieldSystem, Hea // To fix, subtract 1 from num_bgs in the condition clause for (i = 0; i < num_bgs; i++) { if (bgEvents[i].type == 2 - && !FlagGet(fieldSystem, HiddenItemScriptNoToFlagId(bgEvents[i].scr))) { + && !FieldSystem_FlagGet(fieldSystem, HiddenItemScriptNoToFlagId(bgEvents[i].scr))) { if (bgEvents[i].x >= left && bgEvents[i].x <= right && bgEvents[i].y >= top @@ -649,7 +649,7 @@ u16 GetMapSceneScriptId(FieldSystem *fieldSystem, u8 *header, u8 type) { return 0xFFFF; } var2 = header[2] + (header[3] << 8); - if (VarGet(fieldSystem, var1) == VarGet(fieldSystem, var2)) { + if (FieldSystem_VarGet(fieldSystem, var1) == FieldSystem_VarGet(fieldSystem, var2)) { return header[4] + (header[5] << 8); } header += 6; diff --git a/src/game_clear.c b/src/game_clear.c index d2c9b137b..980e752bb 100644 --- a/src/game_clear.c +++ b/src/game_clear.c @@ -115,7 +115,7 @@ BOOL sub_0205298C(TaskManager *taskman) { } break; case 3: - sub_020552A4(taskman); + CallTask_RestoreOverworld(taskman); *state += 1; break; case 4: @@ -152,7 +152,7 @@ static void AddHallOfFameEntry(FieldSystem *fieldSystem, BOOL gameCleared) { // the game and launches the credits. static BOOL Task_GameClear(TaskManager *taskman) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); - GameClearWork *env = TaskManager_GetEnv(taskman); + GameClearWork *env = TaskManager_GetEnvironment(taskman); int *state = TaskManager_GetStatePtr(taskman); switch (*state) { diff --git a/src/overlay_01_02204ED8.c b/src/overlay_01_02204ED8.c index 4c1b5baf7..493b2787a 100644 --- a/src/overlay_01_02204ED8.c +++ b/src/overlay_01_02204ED8.c @@ -99,7 +99,7 @@ void ov01_02204ED8(FieldSystem *fieldSystem, u16 *varPointer) { static BOOL ov01_02204EFC(TaskManager *taskManager) { UnkStruct_02204EFC *unk4; FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - u16 **didHeadbuttStartBattle = TaskManager_GetEnv(taskManager); + u16 **didHeadbuttStartBattle = TaskManager_GetEnvironment(taskManager); unk4 = AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_a_2_5_2, fieldSystem->location->mapId, HEAP_ID_FIELD); if (unk4->unk00 != 0 || unk4->unk02 != 0) { BattleSetup *setup; diff --git a/src/scrcmd_20.c b/src/scrcmd_20.c index 5d43fbea7..cdd0fc0a0 100644 --- a/src/scrcmd_20.c +++ b/src/scrcmd_20.c @@ -251,7 +251,7 @@ static void sub_0204F1E4(TaskManager *taskManager, u16 playerSpecies, u16 *resul } static BOOL sub_0204F228(TaskManager *taskManager) { - UnkStruct_0204F1E4 *r4 = TaskManager_GetEnv(taskManager); + UnkStruct_0204F1E4 *r4 = TaskManager_GetEnvironment(taskManager); switch (r4->state) { case 0: if (sub_02037030(0x84, r4, sizeof(UnkStruct_0204F1E4)) == 1) { @@ -286,7 +286,7 @@ static void sub_0204F284(TaskManager *taskManager, void *a1, BattleHallChallenge static BOOL sub_0204F2B8(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - UnkStruct_0204F284 *r4 = TaskManager_GetEnv(taskManager); + UnkStruct_0204F284 *r4 = TaskManager_GetEnvironment(taskManager); switch (r4->state) { case 0: r4->state = sub_0204F320(r4, fieldSystem, HEAP_ID_FIELD); diff --git a/src/scrcmd_battle.c b/src/scrcmd_battle.c index c6ce1f253..8ba73211a 100644 --- a/src/scrcmd_battle.c +++ b/src/scrcmd_battle.c @@ -214,7 +214,7 @@ BOOL ScrCmd_StaticWildWonOrCaughtCheck(ScriptContext *ctx) { int val; if (var0 == 1) { - val = IsBattleResultStaticWildWin(VarGet(ctx->fieldSystem, VAR_BATTLE_RESULT)); + val = IsBattleResultStaticWildWin(FieldSystem_VarGet(ctx->fieldSystem, VAR_BATTLE_RESULT)); } else { val = IsBattleResultStaticWildWin(*(u32 *)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG)); } diff --git a/src/scrcmd_battle_arcade.c b/src/scrcmd_battle_arcade.c index 25d3c8921..d5044085c 100644 --- a/src/scrcmd_battle_arcade.c +++ b/src/scrcmd_battle_arcade.c @@ -131,7 +131,7 @@ static void sub_02050060(TaskManager *taskManager, u16 firstMon, u16 secondMon, } static BOOL sub_020500A0(TaskManager *taskManager) { - UnkStruct_02050060 *unk = TaskManager_GetEnv(taskManager); + UnkStruct_02050060 *unk = TaskManager_GetEnvironment(taskManager); switch (unk->state) { case 0: if (sub_02037030(134, unk, 16) == 1) { @@ -168,7 +168,7 @@ static void sub_0205011C(TaskManager *taskManager, void *a1, BattleArcadeChallen static BOOL sub_02050150(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - UnkStruct_0204FBDC *unk = TaskManager_GetEnv(taskManager); + UnkStruct_0204FBDC *unk = TaskManager_GetEnvironment(taskManager); switch (unk->state) { case 0: unk->state = sub_020501B8(unk, fieldSystem, HEAP_ID_FIELD); diff --git a/src/scrcmd_battle_castle.c b/src/scrcmd_battle_castle.c index 1215416bd..c651f8056 100644 --- a/src/scrcmd_battle_castle.c +++ b/src/scrcmd_battle_castle.c @@ -135,7 +135,7 @@ static void sub_0204FB20(TaskManager *taskManager, u16 firstMon, u16 secondMon, } static BOOL sub_0204FB60(TaskManager *taskManager) { - UnkStruct_0204FB20 *unk = TaskManager_GetEnv(taskManager); + UnkStruct_0204FB20 *unk = TaskManager_GetEnvironment(taskManager); switch (unk->state) { case 0: if (sub_02037030(133, unk, 16) == TRUE) { @@ -172,7 +172,7 @@ static void sub_0204FBDC(TaskManager *taskManager, void *a1, BattleCastleChallen static BOOL sub_0204FC10(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - UnkStruct_0204FBDC *unk = TaskManager_GetEnv(taskManager); + UnkStruct_0204FBDC *unk = TaskManager_GetEnvironment(taskManager); switch (unk->state) { case 0: unk->state = sub_0204FC78(unk, fieldSystem, HEAP_ID_FIELD); diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 1a2d28e85..9c27f362b 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -450,7 +450,7 @@ BOOL ScrCmd_SetFlag(ScriptContext* ctx) { FieldSystem* fieldSystem = ctx->fieldSystem; u16 flag_to_set = ScriptReadHalfword(ctx); - FlagSet(fieldSystem, flag_to_set); + FieldSystem_FlagSet(fieldSystem, flag_to_set); return FALSE; } @@ -459,7 +459,7 @@ BOOL ScrCmd_ClearFlag(ScriptContext* ctx) { FieldSystem* fieldSystem = ctx->fieldSystem; u16 flag_to_clear = ScriptReadHalfword(ctx); - FlagClear(fieldSystem, flag_to_clear); + FieldSystem_FlagClear(fieldSystem, flag_to_clear); return FALSE; } @@ -468,7 +468,7 @@ BOOL ScrCmd_CheckFlag(ScriptContext* ctx) { FieldSystem* fieldSystem = ctx->fieldSystem; u16 flag_to_check = ScriptReadHalfword(ctx); - ctx->comparisonResult = FlagGet(fieldSystem, flag_to_check); + ctx->comparisonResult = FieldSystem_FlagGet(fieldSystem, flag_to_check); return FALSE; } @@ -478,7 +478,7 @@ BOOL ScrCmd_CheckFlagVar(ScriptContext* ctx) { u16* flag_in_var_to_check = ScriptGetVarPointer(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); - *ret_ptr = FlagGet(fieldSystem, *flag_in_var_to_check); + *ret_ptr = FieldSystem_FlagGet(fieldSystem, *flag_in_var_to_check); return FALSE; } @@ -487,7 +487,7 @@ BOOL ScrCmd_SetFlagVar(ScriptContext* ctx) { FieldSystem* fieldSystem = ctx->fieldSystem; u16* flag_in_var_to_set = ScriptGetVarPointer(ctx); - FlagSet(fieldSystem, *flag_in_var_to_set); + FieldSystem_FlagSet(fieldSystem, *flag_in_var_to_set); return FALSE; } @@ -496,7 +496,7 @@ BOOL ScrCmd_ClearFlagVar(ScriptContext* ctx) { FieldSystem* fieldSystem = ctx->fieldSystem; u16* flag_in_var_to_clear = ScriptGetVarPointer(ctx); - FlagClear(fieldSystem, *flag_in_var_to_clear); + FieldSystem_FlagClear(fieldSystem, *flag_in_var_to_clear); return FALSE; } @@ -1781,7 +1781,7 @@ BOOL ScrNative_WaitApplication(ScriptContext *ctx) { } BOOL ScrCmd_150(ScriptContext *ctx) { - sub_020552A4(ctx->fieldSystem->taskman); + CallTask_RestoreOverworld(ctx->fieldSystem->taskman); return TRUE; } @@ -4760,9 +4760,9 @@ BOOL ScrCmd_621(ScriptContext *ctx) { int n, i; int partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->saveData)); - if (FlagGet(fieldSystem, FLAG_GOT_TM51_FROM_FALKNER)) { + if (FieldSystem_FlagGet(fieldSystem, FLAG_GOT_TM51_FROM_FALKNER)) { n = 0; - } else if (FlagGet(fieldSystem, FLAG_MET_PASSERBY_BOY)) { + } else if (FieldSystem_FlagGet(fieldSystem, FLAG_MET_PASSERBY_BOY)) { n = 1; } else if (partyCount > 0) { n = 2; diff --git a/src/task.c b/src/task.c index 389df6dea..253813d84 100644 --- a/src/task.c +++ b/src/task.c @@ -87,7 +87,7 @@ static BOOL Task_RunApplicationUntilComplete(TaskManager *taskManager) { struct UnkTaskEnv *env; fieldSystem = TaskManager_GetFieldSystem(taskManager); - env = TaskManager_GetEnv(taskManager); + env = TaskManager_GetEnvironment(taskManager); switch (env->state) { case 0: @@ -118,7 +118,7 @@ FieldSystem *TaskManager_GetFieldSystem(TaskManager *taskManager) { return taskManager->fieldSystem; } -void *TaskManager_GetEnv(TaskManager *taskManager) { +void *TaskManager_GetEnvironment(TaskManager *taskManager) { return taskManager->env; } diff --git a/src/unk_02055BF0.c b/src/unk_02055BF0.c index 84335e2e6..fa19fe40b 100644 --- a/src/unk_02055BF0.c +++ b/src/unk_02055BF0.c @@ -50,7 +50,7 @@ void NewFieldFadeEnvironment(TaskManager *man, int pattern, int typeTop, int typ BOOL RoutineFieldFade(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldFadeEnvironment *fenv = TaskManager_GetEnv(man); + FieldFadeEnvironment *fenv = TaskManager_GetEnvironment(man); switch (fenv->state) { case 0: ov01_021FB514(fieldSystem->unk4->unk1c); @@ -135,7 +135,7 @@ void sub_02055CD8(FieldSystem *fieldSystem, int mapID, int warpID, int x, int y, //this function handles transition routines between maps BOOL sub_02055DBC(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *env = TaskManager_GetEnv(man); + FieldTransitionEnvironment *env = TaskManager_GetEnvironment(man); switch (env->state) { case 0: env->transitionState = 0; @@ -177,7 +177,7 @@ BOOL sub_02055DBC(TaskManager *man) { env->state++; break; case 5: - sub_020552A4(man); + CallTask_RestoreOverworld(man); env->state++; break; case 6: @@ -232,7 +232,7 @@ BOOL sub_02055DBC(TaskManager *man) { BOOL sub_02056004(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); switch (fenv->transitionState) { case 0: PlaySE(SEQ_SE_DP_KAIDAN2); @@ -247,7 +247,7 @@ BOOL sub_02056004(TaskManager *man) { BOOL sub_02056040(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); switch (fenv->transitionState) { case 0: fenv->unk18 = ov01_021E90C0(); @@ -272,7 +272,7 @@ BOOL sub_02056040(TaskManager *man) { BOOL sub_020560C4(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); switch (fenv->transitionState) { case 0: fenv->unk18 = ov01_021E90C0(); @@ -294,7 +294,7 @@ BOOL sub_020560C4(TaskManager *man) { BOOL sub_0205613C(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); LocalMapObject *obj; switch (fenv->transitionState) { case 0: @@ -341,7 +341,7 @@ BOOL sub_0205613C(TaskManager *man) { BOOL sub_02056220(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); switch (fenv->transitionState) { case 0: @@ -356,7 +356,7 @@ BOOL sub_02056220(TaskManager *man) { BOOL sub_02056268(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); switch (fenv->transitionState) { case 0: @@ -371,7 +371,7 @@ BOOL sub_02056268(TaskManager *man) { BOOL sub_020562B0(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); LocalMapObject *obj; FieldEnvSubUnk18 *fenv18; switch (fenv->transitionState) { @@ -449,7 +449,7 @@ BOOL sub_020562B0(TaskManager *man) { BOOL sub_02056424(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); LocalMapObject *obj; FieldEnvSubUnk18 *fenv18; switch (fenv->transitionState) { @@ -502,7 +502,7 @@ BOOL sub_02056424(TaskManager *man) { BOOL sub_02056530(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); LocalMapObject *obj; switch (fenv->transitionState) { case 0: @@ -536,7 +536,7 @@ BOOL sub_02056530(TaskManager *man) { BOOL sub_020565FC(TaskManager *man) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); - FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); + FieldTransitionEnvironment *fenv = TaskManager_GetEnvironment(man); switch (fenv->transitionState) { case 0: LocalMapObject *mapObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); diff --git a/src/unk_02097720.c b/src/unk_02097720.c index 47247342f..b6cf39066 100644 --- a/src/unk_02097720.c +++ b/src/unk_02097720.c @@ -15,7 +15,7 @@ void sub_02097720(TaskManager *taskManager, u16* unknownPtr) { BOOL sub_02097754(TaskManager *taskManager) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); - UnkStruct_02097720* env = TaskManager_GetEnv(taskManager); + UnkStruct_02097720* env = TaskManager_GetEnvironment(taskManager); switch (env->unknown_0) { case 0: @@ -30,7 +30,7 @@ BOOL sub_02097754(TaskManager *taskManager) { } break; case 2: - sub_020552A4(taskManager); + CallTask_RestoreOverworld(taskManager); env->unknown_0++; break; case 3: From ef830ff24c2a00d9679c699323658dbce5563cd4 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Thu, 10 Aug 2023 02:33:33 -0400 Subject: [PATCH 4/4] cleanup encounter.c Up to Battle Random functions start cleaning up encounter.c fix build fix build again remove two files from bad rebase switch fully to battle type constants rename TRAINER to Trainer few more funcs finish cleanup address some review comments de-capitalise std_script --- asm/include/overlay_25.inc | 2 +- asm/include/unk_02078834.inc | 2 +- asm/overlay_25.s | 2 +- asm/unk_02078834.s | 2 +- include/battle/battle.h | 4 +- include/battle/battle_setup.h | 4 +- include/battle/battle_system.h | 4 +- include/bug_contest.h | 26 +- include/bug_contest_internal.h | 16 +- include/constants/battle.h | 2 + .../constants/{game_stat.h => game_stats.h} | 9 +- include/constants/std_script.h | 3 + include/encounter.h | 43 +- include/field_follow_poke.h | 4 +- include/field_map_object.h | 8 +- include/field_system.h | 4 +- include/map_object_manager.h | 2 +- include/message_format.h | 6 +- include/overlay_01_021E90C0.h | 2 +- include/overlay_02.h | 2 +- include/overlay_03.h | 2 +- include/pokemon_storage_system.h | 60 +- include/save_arrays.h | 2 +- include/trainer_data.h | 10 +- include/unk_020290B4.h | 2 +- include/unk_0205AC88.h | 2 +- include/unk_0206D494.h | 4 +- src/battle/battle_command.c | 14 +- src/battle/battle_setup.c | 6 +- src/battle/battle_system.c | 8 +- src/encounter.c | 1027 ++++++++--------- src/field/overlay_01_apricorn_tree_anim.c | 2 +- src/field/scrcmd_pokemon_misc.c | 36 +- src/field_follow_poke.c | 20 +- src/field_use_item.c | 14 +- src/field_warp_tasks.c | 22 +- src/map_events.c | 2 +- src/message_format.c | 8 +- src/overlay_26_022599D0.c | 2 +- src/overlay_55.c | 2 +- src/overlay_bug_contest.c | 50 +- src/pal_park.c | 2 +- src/pokemon_storage_system.c | 66 +- src/save_arrays.c | 12 +- src/save_local_field_data.c | 4 +- src/scrcmd_12.c | 2 +- src/scrcmd_20.c | 2 +- src/scrcmd_c.c | 82 +- src/scrcmd_daycare.c | 4 +- src/scrcmd_lottery.c | 2 +- src/scrcmd_party.c | 2 +- src/scrcmd_strbuf.c | 2 +- src/trainer_data.c | 44 +- src/voltorb_flip/voltorb_flip.c | 2 +- tmp.NCLR | Bin 552 -> 0 bytes 55 files changed, 836 insertions(+), 832 deletions(-) rename include/constants/{game_stat.h => game_stats.h} (66%) delete mode 100644 tmp.NCLR 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 46824a54f..1f8e04124 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 bf5a057ee..26ee54651 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 1e74a73ec849dbf6b2e6fe502fa986066de19838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmWIYarXQFkAYExiGe|Yfsr93#3w)k$Yy4M0% zakgE2JOe{<(B66$qkg^Dx*D2hc6pjyir%*N{>Nls@>`;+i&>10NqES;MCzf7%9 zRZH=jq`ee2c@aGs>;2I$b@DyGr1EQ)S;mCH^k0hu*-t2ZmWyyH7HG=Xn90>y%h!}y z+QRii-0!Vv6ckm=srboorWsJ))ZPzfK1BY6h@av&O$$XE<2_nY`L9wvT~X!nhYtWN C@u}4S