From e36deb2333a82860890dc9729ea415c00a43199d Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 20 Aug 2023 18:52:40 +0100 Subject: [PATCH] fsys to fieldSystem --- asm/battle_setup.s | 10 +- asm/field_take_photo.s | 8 +- asm/include/battle_setup.inc | 6 +- asm/include/field_take_photo.inc | 4 +- asm/include/overlay_01_021E5900.inc | 4 +- asm/include/overlay_01_021E6880.inc | 12 +- asm/include/overlay_01_021EDAFC.inc | 2 +- asm/include/overlay_01_021F1AFC.inc | 4 +- asm/include/overlay_01_021F3114.inc | 2 +- asm/include/overlay_01_021F3F50.inc | 2 +- asm/include/overlay_01_021F6CFC.inc | 2 +- asm/include/overlay_01_021F72DC.inc | 4 +- asm/include/overlay_01_021FC66C.inc | 4 +- asm/include/overlay_01_021FCE98.inc | 2 +- asm/include/overlay_02.inc | 12 +- asm/include/overlay_04.inc | 2 +- asm/include/overlay_124.inc | 2 +- asm/include/overlay_27.inc | 10 +- asm/include/overlay_28.inc | 6 +- asm/include/overlay_30.inc | 2 +- asm/include/overlay_34.inc | 2 +- asm/include/unk_0203BC10.inc | 8 +- asm/include/unk_0203DB6C.inc | 2 +- asm/include/unk_0203E348.inc | 10 +- asm/include/unk_02054E00.inc | 4 +- asm/include/unk_020557E0.inc | 2 +- asm/include/unk_02056D7C.inc | 2 +- asm/include/unk_02058AEC.inc | 8 +- asm/include/unk_0205AC88.inc | 2 +- asm/include/unk_0205CB48.inc | 2 +- asm/include/unk_02061284.inc | 2 +- asm/include/unk_020632B0.inc | 4 +- asm/include/unk_020658D4.inc | 2 +- asm/include/unk_02066EDC.inc | 4 +- asm/include/unk_02067A60.inc | 4 +- asm/include/unk_02068DE0.inc | 2 +- asm/include/unk_02068FC8.inc | 4 +- asm/include/unk_0206A360.inc | 2 +- asm/include/unk_0206D494.inc | 10 +- asm/include/unk_02078834.inc | 4 +- asm/include/unk_02092B04.inc | 2 +- asm/include/unk_02095DF4.inc | 4 +- asm/include/unk_020961D8.inc | 2 +- asm/include/unk_020968B0.inc | 2 +- asm/include/unk_02097024.inc | 4 +- asm/include/unk_020977CC.inc | 2 +- asm/include/unk_020979A8.inc | 2 +- asm/include/unk_02097BE0.inc | 2 +- asm/include/unk_02097D3C.inc | 2 +- asm/overlay_01_021E5900.s | 4 +- asm/overlay_01_021E6880.s | 20 +- asm/overlay_01_021EDAFC.s | 6 +- asm/overlay_01_021F1AFC.s | 10 +- asm/overlay_01_021F3114.s | 2 +- asm/overlay_01_021F3F50.s | 2 +- asm/overlay_01_021F6CFC.s | 2 +- asm/overlay_01_021F72DC.s | 4 +- asm/overlay_01_021FC66C.s | 4 +- asm/overlay_01_021FCE98.s | 2 +- asm/overlay_02.s | 36 +- asm/overlay_04.s | 6 +- asm/overlay_124.s | 2 +- asm/overlay_27.s | 22 +- asm/overlay_28.s | 14 +- asm/overlay_30.s | 2 +- asm/overlay_34.s | 6 +- asm/scrcmd_11.s | 90 +- asm/unk_0203BC10.s | 20 +- asm/unk_0203DB6C.s | 8 +- asm/unk_0203E348.s | 184 +-- asm/unk_02054E00.s | 22 +- asm/unk_02056D7C.s | 2 +- asm/unk_02058AEC.s | 16 +- asm/unk_0205AC88.s | 2 +- asm/unk_0205CB48.s | 2 +- asm/unk_02061284.s | 4 +- asm/unk_020632B0.s | 14 +- asm/unk_020658D4.s | 22 +- asm/unk_02066EDC.s | 10 +- asm/unk_02067A60.s | 8 +- asm/unk_02068DE0.s | 6 +- asm/unk_02068FC8.s | 4 +- asm/unk_0206A360.s | 2 +- asm/unk_0206D494.s | 26 +- asm/unk_02078834.s | 22 +- asm/unk_02092B04.s | 2 +- asm/unk_02095DF4.s | 4 +- asm/unk_020961D8.s | 2 +- asm/unk_020968B0.s | 2 +- asm/unk_02097024.s | 12 +- asm/unk_020977CC.s | 2 +- asm/unk_020979A8.s | 2 +- asm/unk_02097BE0.s | 2 +- asm/unk_02097D3C.s | 2 +- include/battle/battle_setup.h | 12 +- include/bug_contest.h | 4 +- include/choose_starter.h | 2 +- include/encounter.h | 12 +- include/field_alph_checks.h | 6 +- include/field_follow_poke.h | 24 +- include/field_map_object.h | 12 +- include/field_move.h | 2 +- include/field_player_avatar.h | 2 +- include/field_system.h | 40 +- include/field_take_photo.h | 4 +- include/field_use_item.h | 12 +- include/field_warp_tasks.h | 16 +- include/fieldmap.h | 56 +- include/get_egg.h | 2 +- include/map_events.h | 32 +- include/mart.h | 2 +- include/npc_trade.h | 8 +- include/overlay_01.h | 70 +- include/overlay_01_021E6880.h | 12 +- include/overlay_01_021E90C0.h | 6 +- include/overlay_01_021EDAFC.h | 8 +- include/overlay_01_021F1348.h | 6 +- include/overlay_01_021F3D38.h | 2 +- include/overlay_01_021F4704.h | 2 +- include/overlay_01_021F6830.h | 2 +- include/overlay_01_02204ED8.h | 2 +- include/overlay_01_022053EC.h | 2 +- include/overlay_01_apricorn_tree_anim.h | 2 +- include/overlay_01_rock_smash_item.h | 2 +- include/overlay_02.h | 82 +- include/overlay_03.h | 12 +- include/overlay_04.h | 60 +- include/overlay_124.h | 2 +- include/overlay_26.h | 2 +- include/overlay_94.h | 2 +- include/pal_park.h | 22 +- include/party_menu.h | 2 +- include/pokegear.h | 2 +- include/save_local_field_data.h | 4 +- include/scrcmd.h | 4 +- include/script.h | 4 +- include/task.h | 14 +- include/unk_0203DB6C.h | 2 +- include/unk_0203DFA4.h | 10 +- include/unk_0203E348.h | 96 +- include/unk_02054514.h | 4 +- include/unk_02054648.h | 4 +- include/unk_02054E00.h | 18 +- include/unk_02055418.h | 44 +- include/unk_02055BF0.h | 4 +- include/unk_02056680.h | 8 +- include/unk_02056D7C.h | 2 +- include/unk_02058034.h | 2 +- include/unk_02058AEC.h | 18 +- include/unk_0205A44C.h | 10 +- include/unk_0205CB48.h | 2 +- include/unk_020632B0.h | 2 +- include/unk_020648EC.h | 6 +- include/unk_02066EDC.h | 4 +- include/unk_0206793C.h | 14 +- include/unk_02067A80.h | 2 +- include/unk_02068DE0.h | 18 +- include/unk_02068FC8.h | 4 +- include/unk_0206D494.h | 8 +- include/unk_02092BE8.h | 4 +- include/unk_02095DF4.h | 2 +- include/unk_02097024.h | 2 +- include/unk_020977CC.h | 2 +- include/unk_020979A8.h | 2 +- include/unk_02097BE0.h | 2 +- include/unk_02097D3C.h | 2 +- src/choose_starter.c | 26 +- src/encounter.c | 280 ++-- src/field/overlay_01_021FFECC.c | 10 +- src/field/overlay_01_apricorn_tree_anim.c | 34 +- src/field/overlay_01_rock_smash_item.c | 32 +- src/field/scrcmd_message.c | 72 +- src/field/scrcmd_moneybox.c | 18 +- src/field/scrcmd_pokemon_misc.c | 240 ++-- src/field_alph_checks.c | 12 +- src/field_black_out.c | 24 +- src/field_follow_poke.c | 148 +- src/field_map_object.c | 40 +- src/field_move.c | 198 +-- src/field_player_avatar.c | 4 +- src/field_system.c | 188 +-- src/field_use_item.c | 348 ++--- src/field_warp_tasks.c | 482 +++---- src/fieldmap.c | 158 +-- src/game_clear.c | 92 +- src/get_egg.c | 14 +- src/map_events.c | 82 +- src/npc_trade.c | 26 +- src/overlay_01_02204ED8.c | 36 +- src/overlay_22.c | 50 +- src/overlay_26_022599D0.c | 12 +- src/overlay_94.c | 2 +- src/overlay_bug_contest.c | 6 +- src/pal_park.c | 62 +- src/save_local_field_data.c | 14 +- src/scrcmd_12.c | 36 +- src/scrcmd_17.c | 46 +- src/scrcmd_20.c | 108 +- src/scrcmd_8.c | 10 +- src/scrcmd_apricorn.c | 14 +- src/scrcmd_battle.c | 86 +- src/scrcmd_battle_arcade.c | 58 +- src/scrcmd_battle_castle.c | 58 +- src/scrcmd_c.c | 1578 ++++++++++----------- src/scrcmd_daycare.c | 68 +- src/scrcmd_fossils.c | 4 +- src/scrcmd_items.c | 10 +- src/scrcmd_lottery.c | 14 +- src/scrcmd_mart.c | 32 +- src/scrcmd_money.c | 10 +- src/scrcmd_move_relearner.c | 22 +- src/scrcmd_move_tutor.c | 16 +- src/scrcmd_party.c | 200 +-- src/scrcmd_size_record.c | 36 +- src/scrcmd_sound.c | 10 +- src/scrcmd_strbuf.c | 128 +- src/task.c | 60 +- src/unk_02055418.c | 128 +- src/unk_02055BF0.c | 150 +- src/unk_020648EC.c | 18 +- src/unk_02092BE8.c | 12 +- src/unk_02097720.c | 8 +- 222 files changed, 3672 insertions(+), 3672 deletions(-) diff --git a/asm/battle_setup.s b/asm/battle_setup.s index eef0c8ed0..f45b215bb 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -779,8 +779,8 @@ _02051EB0: _02051EFC: .word 0x000F423F thumb_func_end sub_02051D18 - thumb_func_start BattleSetup_InitFromFsys -BattleSetup_InitFromFsys: ; 0x02051F00 + thumb_func_start BattleSetup_InitFromFieldSystem +BattleSetup_InitFromFieldSystem: ; 0x02051F00 push {r4, lr} sub sp, #8 add r2, r1, #0 @@ -801,7 +801,7 @@ BattleSetup_InitFromFsys: ; 0x02051F00 add sp, #8 pop {r4, pc} .balign 4, 0 - thumb_func_end BattleSetup_InitFromFsys + thumb_func_end BattleSetup_InitFromFieldSystem thumb_func_start sub_02051F2C sub_02051F2C: ; 0x02051F2C @@ -1312,7 +1312,7 @@ _0205237A: cmp r0, #0 beq _02052394 add r0, r6, #0 - bl Fsys_GetGearPhoneRingManager + bl FieldSystem_GetGearPhoneRingManager mov r1, #0xc mov r2, #1 bl sub_02092E14 @@ -1383,7 +1383,7 @@ _0205241E: cmp r0, #0 beq _02052434 add r0, r4, #0 - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get bl BugContest_GetSportBallsAddr add r6, r0, #0 _02052434: diff --git a/asm/field_take_photo.s b/asm/field_take_photo.s index 44505c4fc..708c708fc 100644 --- a/asm/field_take_photo.s +++ b/asm/field_take_photo.s @@ -12,8 +12,8 @@ .text - thumb_func_start FieldSys_TakePhoto -FieldSys_TakePhoto: ; 0x0206A798 + thumb_func_start FieldSystem_TakePhoto +FieldSystem_TakePhoto: ; 0x0206A798 push {r3, r4, r5, r6, r7, lr} sub sp, #0x28 add r5, r0, #0 @@ -101,7 +101,7 @@ _0206A858: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 _0206A85C: .word sub_0206B270 - thumb_func_end FieldSys_TakePhoto + thumb_func_end FieldSystem_TakePhoto thumb_func_start sub_0206A860 sub_0206A860: ; 0x0206A860 @@ -287,7 +287,7 @@ sub_0206A9A0: ; 0x0206A9A0 sub_0206A9B4: ; 0x0206A9B4 push {r3, r4, r5, lr} add r5, r2, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _0206A9C4 mov r0, #1 diff --git a/asm/include/battle_setup.inc b/asm/include/battle_setup.inc index 4d20fcbc7..64d7787ff 100644 --- a/asm/include/battle_setup.inc +++ b/asm/include/battle_setup.inc @@ -61,7 +61,7 @@ .public BattleSetup_Delete .public BattleSetup_AddMonToParty .public sub_02051D18 -.public BattleSetup_InitFromFsys +.public BattleSetup_InitFromFieldSystem .public sub_02051F2C .public sub_020520B0 .public sub_020522F0 @@ -92,7 +92,7 @@ .public sub_02067A78 .public FollowingPokemon_IsActive .public sub_02069FB0 -.public FieldSys_BugContest_Get +.public FieldSystem_BugContest_Get .public BugContest_GetSportBallsAddr .public AllocMonZeroed .public CreateMon @@ -113,7 +113,7 @@ .public Bag_AddItem .public Save_Bag_Get .public sub_02088288 -.public Fsys_GetGearPhoneRingManager +.public FieldSystem_GetGearPhoneRingManager .public sub_02092E14 .public sub_0209322C .public MIi_CpuClear32 diff --git a/asm/include/field_take_photo.inc b/asm/include/field_take_photo.inc index 3bae09427..bf5e0936d 100644 --- a/asm/include/field_take_photo.inc +++ b/asm/include/field_take_photo.inc @@ -35,7 +35,7 @@ .public FieldSystem_GetSaveDataPtr .public sub_0203EBA4 .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem .public TaskManager_GetEnv .public sub_020537A8 @@ -85,7 +85,7 @@ .public sub_02069DC8 .public FollowPokeMapObjectSetParams .public FollowingPokemon_IsActive -.public FieldSys_TakePhoto +.public FieldSystem_TakePhoto .public sub_0206A860 .public sub_0206A8C0 .public sub_0206A8DC diff --git a/asm/include/overlay_01_021E5900.inc b/asm/include/overlay_01_021E5900.inc index bc0c6f78b..facbaa347 100644 --- a/asm/include/overlay_01_021E5900.inc +++ b/asm/include/overlay_01_021E5900.inc @@ -66,13 +66,13 @@ .public sub_0203E348 .public TryStartMapScriptByType .public Save_VarsFlags_Get -.public Fsys_TaskIsRunning +.public FieldSystem_TaskIsRunning .public sub_02053018 .public sub_02053038 .public FieldSystem_GetOverriddenMusicId .public FieldSystem_PlayOrFadeToNewMusicId .public sub_02055164 -.public FieldSys_StartBugContestTimer +.public FieldSystem_StartBugContestTimer .public sub_02055680 .public sub_020556A8 .public sub_02057FA4 diff --git a/asm/include/overlay_01_021E6880.inc b/asm/include/overlay_01_021E6880.inc index 60a12d853..dec56d251 100644 --- a/asm/include/overlay_01_021E6880.inc +++ b/asm/include/overlay_01_021E6880.inc @@ -115,7 +115,7 @@ .public sub_0205C6D4 .public PlayerAvatar_GetMapObject .public PlayerAvatar_GetState -.public FieldSys_GetPlayerAvatar +.public FieldSystem_GetPlayerAvatar .public sub_0205CA38 .public sub_0205CB38 .public sub_0205CF44 @@ -142,18 +142,18 @@ .public CheckBattledRedGyarados .public Save_VarsFlags_GetVar404B .public Save_VarsFlags_SetVar404B -.public Fsys_IsSavGymmickTypeEqualTo +.public FieldSystem_IsSavGymmickTypeEqualTo .public FollowingPokemon_GetMapObject .public FollowingPokemon_IsActive .public sub_02069FB0 -.public FsysUnkSub108_MoveMoodTowardsNeutral +.public FieldSystemUnkSub108_MoveMoodTowardsNeutral .public HandleDaycareStep -.public FieldSys_BugContest_Get +.public FieldSystem_BugContest_Get .public MonApplyFriendshipMod .public Party_GetCount .public Party_GetMonByIndex .public SaveArray_Party_Get -.public Fsys_GetGearPhoneRingManager +.public FieldSystem_GetGearPhoneRingManager .public sub_02092E14 .public ov01_021E5924 .public ov01_021E5BE4 @@ -165,7 +165,7 @@ .public ov01_021E6FD4 .public ov01_021E7F00 .public ov01_021E7F54 -.public FieldSys_FacingModelIsHeadbuttTree +.public FieldSystem_FacingModelIsHeadbuttTree .public ov01_021F1D94 .public Field_PlayerCanStartSurfingByStandingAndFacingTileBehaviors .public MetatileBehavior_IsRockClimbInDirection diff --git a/asm/include/overlay_01_021EDAFC.inc b/asm/include/overlay_01_021EDAFC.inc index e5166ca6d..eb3100453 100644 --- a/asm/include/overlay_01_021EDAFC.inc +++ b/asm/include/overlay_01_021EDAFC.inc @@ -67,7 +67,7 @@ .public PrintCurFloorInNewWindow .public MapNumToFloorNo .public ov01_021EE974 -.public Fsys_ShowMoneyBox +.public FieldSystem_ShowMoneyBox .public MoneyBoxSys_Delete .public MoneyBoxSys_Update .public ov01_021EEC00 diff --git a/asm/include/overlay_01_021F1AFC.inc b/asm/include/overlay_01_021F1AFC.inc index a6a438b45..2f0a1ade4 100644 --- a/asm/include/overlay_01_021F1AFC.inc +++ b/asm/include/overlay_01_021F1AFC.inc @@ -15,7 +15,7 @@ .public FlagSet .public FlagClear .public Save_VarsFlags_Get -.public FieldSys_CreateTask +.public FieldSystem_CreateTask .public TaskManager_Call .public TaskManager_GetFieldSystem .public TaskManager_GetEnv @@ -90,7 +90,7 @@ .public FollowingPokemon_GetMapObject .public sub_02069DC8 .public FollowingPokemon_IsActive -.public FsysUnkSub108_AddMonMood +.public FieldSystemUnkSub108_AddMonMood .public GetMonData .public Party_GetMonByIndex .public SaveArray_Party_Get diff --git a/asm/include/overlay_01_021F3114.inc b/asm/include/overlay_01_021F3114.inc index 8a13f106e..b05a0f018 100644 --- a/asm/include/overlay_01_021F3114.inc +++ b/asm/include/overlay_01_021F3114.inc @@ -5,7 +5,7 @@ .public AllocFromHeapAtEnd .public FreeToHeapExplicit .public GF_AssertFail -.public FieldSys_CreateTask +.public FieldSystem_CreateTask .public TaskManager_GetEnv .public sub_0205B9DC .public sub_0205B9E8 diff --git a/asm/include/overlay_01_021F3F50.inc b/asm/include/overlay_01_021F3F50.inc index ee9fe4ae0..ce4f6ed92 100644 --- a/asm/include/overlay_01_021F3F50.inc +++ b/asm/include/overlay_01_021F3F50.inc @@ -39,7 +39,7 @@ .public MapHeader_GetMapSec .public LocalFieldData_GetCurrentPosition .public Save_LocalFieldData_Get -.public Fsys_SyncMapObjectsToSave +.public FieldSystem_SyncMapObjectsToSave .public PlayerAvatar_GetFacingDirection .public GetPlayerXCoord .public GetPlayerYCoord diff --git a/asm/include/overlay_01_021F6CFC.inc b/asm/include/overlay_01_021F6CFC.inc index e22eae1df..6e77e62ea 100644 --- a/asm/include/overlay_01_021F6CFC.inc +++ b/asm/include/overlay_01_021F6CFC.inc @@ -32,7 +32,7 @@ .public sub_0203A1C4 .public sub_0203A280 .public sub_0203E30C -.public FieldSys_CreateTask +.public FieldSystem_CreateTask .public TaskManager_Call .public TaskManager_GetFieldSystem .public TaskManager_GetEnv diff --git a/asm/include/overlay_01_021F72DC.inc b/asm/include/overlay_01_021F72DC.inc index 89198934f..0099e86c1 100644 --- a/asm/include/overlay_01_021F72DC.inc +++ b/asm/include/overlay_01_021F72DC.inc @@ -40,8 +40,8 @@ .public sub_02064084 .public FollowingPokemon_GetSpriteID .public FollowPokeMapObjectSetParams -.public FollowPokeFsysParamSet -.public FsysUnkSub108_Set +.public FollowPokeFieldSystemParamSet +.public FieldSystemUnkSub108_Set .public GetMonData .public GetMonGender .public MonIsShiny diff --git a/asm/include/overlay_01_021FC66C.inc b/asm/include/overlay_01_021FC66C.inc index f470611ff..29476a30a 100644 --- a/asm/include/overlay_01_021FC66C.inc +++ b/asm/include/overlay_01_021FC66C.inc @@ -42,10 +42,10 @@ .public sub_02068B48 .public FollowingPokemon_GetMapObject .public FollowingPokemon_IsActive -.public FsysUnkSub108_GetMonMood +.public FieldSystemUnkSub108_GetMonMood .public GetMonData .public SaveArray_Party_Get -.public Fsys_GetGearPhoneRingManager +.public FieldSystem_GetGearPhoneRingManager .public sub_02092FA8 .public memset .public _s32_div_f diff --git a/asm/include/overlay_01_021FCE98.inc b/asm/include/overlay_01_021FCE98.inc index aa6489486..310029653 100644 --- a/asm/include/overlay_01_021FCE98.inc +++ b/asm/include/overlay_01_021FCE98.inc @@ -12,7 +12,7 @@ .public MapObject_GetPositionVec .public FollowingPokemon_GetMapObject .public sub_02069FB0 -.public FsysUnkSub108_AddMonMood +.public FieldSystemUnkSub108_AddMonMood .public memset .public ov01_021FBCD8 .public ov01_021FBDA8 diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index bb485cf94..3be00650e 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -218,7 +218,7 @@ .public sub_02051A60 .public sub_02051A74 .public BattleSetup_Delete -.public BattleSetup_InitFromFsys +.public BattleSetup_InitFromFieldSystem .public sub_02052544 .public sub_02053B04 .public GetFirstAliveMonInParty_CrashIfNone @@ -309,10 +309,10 @@ .public FollowPokeObj_GetSpecies .public FollowingPokemon_IsActive .public sub_02069FB0 -.public FsysUnkSub108_AddMonMood -.public FsysUnkSub108_SetMonMood -.public FsysUnkSub108_GetMonMood -.public FieldSys_BugContest_Get +.public FieldSystemUnkSub108_AddMonMood +.public FieldSystemUnkSub108_SetMonMood +.public FieldSystemUnkSub108_GetMonMood +.public FieldSystem_BugContest_Get .public BugContest_GetSportBallsAddr .public ZeroMonData .public AllocMonZeroed @@ -503,7 +503,7 @@ .public ov02_0224E4EC .public ov02_0224E698 .public ov02_0224E754 -.public Fsys_FollowPokeInteract +.public FieldSystem_FollowPokeInteract .public ov02_0224F864 .public ov02_0224F8F4 .public ov02_02250780 diff --git a/asm/include/overlay_04.inc b/asm/include/overlay_04.inc index 518b774ab..69c9a1592 100644 --- a/asm/include/overlay_04.inc +++ b/asm/include/overlay_04.inc @@ -24,7 +24,7 @@ .public SavGymmick_GetType .public FieldSystem_GetSaveDataPtr .public FieldSysGetAttrAddr -.public FieldSys_CreateTask +.public FieldSystem_CreateTask .public TaskManager_Call .public TaskManager_GetFieldSystem .public TaskManager_GetEnv diff --git a/asm/include/overlay_124.inc b/asm/include/overlay_124.inc index d8166d39f..b83898d34 100644 --- a/asm/include/overlay_124.inc +++ b/asm/include/overlay_124.inc @@ -8,7 +8,7 @@ .public Field_AllocateMapEvents .public LocalFieldData_GetCurrentPosition .public Save_LocalFieldData_Get -.public FsysUnkSub108_Alloc +.public FieldSystemUnkSub108_Alloc .public BagCursor_New .public sub_02092BB8 .public GearPhoneRingManager_New diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc index b1ac703b0..754526fbc 100644 --- a/asm/include/overlay_27.inc +++ b/asm/include/overlay_27.inc @@ -94,12 +94,12 @@ .public LocalFieldData_GetSafariBallsCounter .public Save_LocalFieldData_Get .public sub_0203C3CC -.public Fsys_GetFacingObject +.public FieldSystem_GetFacingObject .public sub_0203DF8C .public sub_0203E13C .public MapSceneScriptCheck .public Save_VarsFlags_Get -.public Fsys_TaskIsRunning +.public FieldSystem_TaskIsRunning .public PalPark_CountMonsNotCaught .public sub_02056EE0 .public sub_02057A0C @@ -111,7 +111,7 @@ .public PlayerAvatar_GetMapObject .public PlayerAvatar_GetState .public PlayerSaveData_CheckRunningShoes -.public FieldSys_GetPlayerAvatar +.public FieldSystem_GetPlayerAvatar .public sub_0205CB38 .public sub_0205CB40 .public MapObject_GetGfxID @@ -121,7 +121,7 @@ .public CheckFlag996 .public Save_VarsFlags_CheckPalParkSysFlag .public sub_02067584 -.public FieldSys_BugContest_Get +.public FieldSystem_BugContest_Get .public BugContest_GetSportBallsAddr .public GetMonData .public Pokemon_GetIconNaix @@ -131,7 +131,7 @@ .public Bag_GetRegisteredItem1 .public Bag_GetRegisteredItem2 .public Save_Bag_Get -.public Fsys_GetGearPhoneRingManager +.public FieldSystem_GetGearPhoneRingManager .public sub_02092E08 .public GXS_SetGraphicsMode .public GX_SetBankForSubBG diff --git a/asm/include/overlay_28.inc b/asm/include/overlay_28.inc index a0edac1ff..c21c31547 100644 --- a/asm/include/overlay_28.inc +++ b/asm/include/overlay_28.inc @@ -66,14 +66,14 @@ .public System_GetTouchNew .public sub_02025364 .public String_Delete -.public Fsys_GetFacingObject +.public FieldSystem_GetFacingObject .public sub_0203DF8C .public sub_0203E13C .public AllocAndFetchNearbyHiddenItems -.public Fsys_TaskIsRunning +.public FieldSystem_TaskIsRunning .public PlayerAvatar_GetMapObject .public PlayerAvatar_GetState -.public FieldSys_GetPlayerAvatar +.public FieldSystem_GetPlayerAvatar .public sub_0205CB38 .public sub_0205CB40 .public MapObject_GetGfxID diff --git a/asm/include/overlay_30.inc b/asm/include/overlay_30.inc index d57ed1b24..33bda23dc 100644 --- a/asm/include/overlay_30.inc +++ b/asm/include/overlay_30.inc @@ -47,7 +47,7 @@ .public Save_PlayerData_GetOptionsAddr .public Options_GetTextFrameDelay .public Options_GetFrame -.public Fsys_TaskIsRunning +.public FieldSystem_TaskIsRunning .public GXS_SetGraphicsMode .public GX_SetBankForSubBG .public GX_SetBankForSubOBJ diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index 1ffd4f837..9890e7681 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -75,7 +75,7 @@ .public sub_02035754 .public sub_02035784 .public sub_02035798 -.public Fsys_TaskIsRunning +.public FieldSystem_TaskIsRunning .public sub_0205AA84 .public sub_0205B4EC .public DC_FlushRange diff --git a/asm/include/unk_0203BC10.inc b/asm/include/unk_0203BC10.inc index 9ffaf65b6..2cc5bb04c 100644 --- a/asm/include/unk_0203BC10.inc +++ b/asm/include/unk_0203BC10.inc @@ -68,7 +68,7 @@ .public sub_0203D830 .public sub_0203D9B4 .public sub_0203DF64 -.public FieldSys_LaunchApplication +.public FieldSystem_LaunchApplication .public sub_0203E3D4 .public sub_0203E3FC .public sub_0203E4EC @@ -82,9 +82,9 @@ .public sub_0203F7F4 .public StartScriptFromMenu .public Save_VarsFlags_Get -.public FieldSys_CreateTask +.public FieldSystem_CreateTask .public TaskManager_Jump -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem @@ -115,7 +115,7 @@ .public sub_02067BF8 .public sub_02067C30 .public PartyMenu_GetFieldMoveFunc -.public Fsys_MakeFieldMoveCheckData +.public FieldSystem_MakeFieldMoveCheckData .public sub_02068FC8 .public sub_020691C4 .public sub_020691E0 diff --git a/asm/include/unk_0203DB6C.inc b/asm/include/unk_0203DB6C.inc index d2e6eaf55..3575e44ba 100644 --- a/asm/include/unk_0203DB6C.inc +++ b/asm/include/unk_0203DB6C.inc @@ -3,7 +3,7 @@ .public sub_0203DB6C .public sub_0203DB70 .public sub_0203DB74 -.public Fsys_GetFacingObject +.public FieldSystem_GetFacingObject .public sub_0203DC64 .public GetInteractedBackgroundEventScript .public sub_0203DDA4 diff --git a/asm/include/unk_0203E348.inc b/asm/include/unk_0203E348.inc index 8ce815e16..13d1e9d3d 100644 --- a/asm/include/unk_0203E348.inc +++ b/asm/include/unk_0203E348.inc @@ -60,7 +60,7 @@ .public sub_0203A040 .public LocalFieldData_GetCurrentPosition .public Save_LocalFieldData_Get -.public FieldSys_LaunchApplication +.public FieldSystem_LaunchApplication .public FieldSystem_GetSaveDataPtr .public LocationData_BackUp .public LocationData_Restore @@ -91,7 +91,7 @@ .public sub_0203EB08 .public sub_0203EB64 .public sub_0203EBA4 -.public Fsys_CreateApplication_AlphPuzzle +.public FieldSystem_CreateApplication_AlphPuzzle .public CreateUnownReportWork .public BerryPotsArgs_New .public CreateApricornBoxWork @@ -134,7 +134,7 @@ .public ScratchOffCards_Create .public sub_0203FB94 .public sub_0203FC14 -.public Fsys_LaunchPokeathlonCourseApplication +.public FieldSystem_LaunchPokeathlonCourseApplication .public sub_0203FC68 .public sub_0203FC90 .public sub_0203FCB8 @@ -142,7 +142,7 @@ .public Save_VarsFlags_Get .public CheckFlagInArray .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public CallApplicationAsTask .public TaskManager_GetFieldSystem .public TaskManager_GetEnv @@ -156,7 +156,7 @@ .public CheckGameClearFlag .public CheckFlag997 .public sub_0206CE44 -.public FieldSys_BugContest_Get +.public FieldSystem_BugContest_Get .public GetMonData .public SetMonData .public sub_02070D90 diff --git a/asm/include/unk_02054E00.inc b/asm/include/unk_02054E00.inc index 1f1ecbb6b..59831687b 100644 --- a/asm/include/unk_02054E00.inc +++ b/asm/include/unk_02054E00.inc @@ -25,12 +25,12 @@ .public sub_02054EB0 .public sub_02054F14 .public FieldSystem_SetSavedMusicId -.public Fsys_ClearSavedMusicId +.public FieldSystem_ClearSavedMusicId .public FieldSystem_GetOverriddenMusicId .public GetMapMusic .public FieldSystem_PlayOrFadeToNewMusicId .public Trainer_GetEncounterMusic -.public Fsys_BeginFadeOutMusic +.public FieldSystem_BeginFadeOutMusic .public sub_02055110 .public sub_02055164 .public sub_02055198 diff --git a/asm/include/unk_020557E0.inc b/asm/include/unk_020557E0.inc index ef44c87cd..0ae2557d0 100644 --- a/asm/include/unk_020557E0.inc +++ b/asm/include/unk_020557E0.inc @@ -12,7 +12,7 @@ .public GetMigratedPokemonByIndex .public BattleSetup_New_PalPark .public BattleSetup_AddMonToParty -.public BattleSetup_InitFromFsys +.public BattleSetup_InitFromFieldSystem .public GetMetatileBehaviorAt .public PalPark_ClearState .public PalPark_InitFromSave diff --git a/asm/include/unk_02056D7C.inc b/asm/include/unk_02056D7C.inc index 70899d975..2e9e1c7cc 100644 --- a/asm/include/unk_02056D7C.inc +++ b/asm/include/unk_02056D7C.inc @@ -65,7 +65,7 @@ .public sub_0205C6CC .public sub_0205C6D4 .public PlayerAvatar_GetMapObject -.public FieldSys_GetPlayerAvatar +.public FieldSystem_GetPlayerAvatar .public sub_0205CB38 .public sub_0205DE38 .public sub_0205DF0C diff --git a/asm/include/unk_02058AEC.inc b/asm/include/unk_02058AEC.inc index 15ec4a1ad..975be9139 100644 --- a/asm/include/unk_02058AEC.inc +++ b/asm/include/unk_02058AEC.inc @@ -74,13 +74,13 @@ .public sub_02039918 .public sub_0203993C .public sub_0203996C -.public FieldSys_LaunchApplication +.public FieldSystem_LaunchApplication .public sub_0203E2F4 .public FieldSystem_GetSaveDataPtr .public sub_0203F7B0 -.public FieldSys_CreateTask -.public Fsys_TaskIsRunning -.public FieldSys_ApplicationIsRunning +.public FieldSystem_CreateTask +.public FieldSystem_TaskIsRunning +.public FieldSystem_ApplicationIsRunning .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem diff --git a/asm/include/unk_0205AC88.inc b/asm/include/unk_0205AC88.inc index dbfa9601b..a130f9ca6 100644 --- a/asm/include/unk_0205AC88.inc +++ b/asm/include/unk_0205AC88.inc @@ -17,7 +17,7 @@ .public PalPad_PlayerIdIsFriendOrMutual .public sub_02037F94 .public sub_02037FCC -.public Fsys_TaskIsRunning +.public FieldSystem_TaskIsRunning .public sub_0205A1F0 .public sub_0205A1F4 .public sub_0205AC88 diff --git a/asm/include/unk_0205CB48.inc b/asm/include/unk_0205CB48.inc index 67f911cad..4b0af09c0 100644 --- a/asm/include/unk_0205CB48.inc +++ b/asm/include/unk_0205CB48.inc @@ -113,7 +113,7 @@ .public MapObject_ClearHeldMovement .public sub_0206234C .public sub_02062390 -.public Fsys_IsSavGymmickTypeEqualTo +.public FieldSystem_IsSavGymmickTypeEqualTo .public FollowingPokemon_IsActive .public sub_0206D494 .public Field_PlayerAvatar_ApplyTransitionFlags diff --git a/asm/include/unk_02061284.inc b/asm/include/unk_02061284.inc index c375a91c7..b6755eda7 100644 --- a/asm/include/unk_02061284.inc +++ b/asm/include/unk_02061284.inc @@ -5,7 +5,7 @@ .public GetPlayerXCoord .public GetPlayerYCoord .public PlayerAvatar_GetMapObject -.public FieldSys_GetPlayerAvatar +.public FieldSystem_GetPlayerAvatar .public sub_0205DE98 .public MapObject_SetFlagsBits .public MapObject_ClearFlagsBits diff --git a/asm/include/unk_020632B0.inc b/asm/include/unk_020632B0.inc index fcbc64c59..061978644 100644 --- a/asm/include/unk_020632B0.inc +++ b/asm/include/unk_020632B0.inc @@ -14,12 +14,12 @@ .public sub_02023F40 .public GF_AssertFail .public StartMapSceneScript -.public FieldSys_SetEngagedTrainer +.public FieldSystem_SetEngagedTrainer .public ScriptNumToTrainerNum .public TrainerNumIsDouble .public TrainerFlagCheck .public sub_02055780 -.public FieldSys_ApricornTree_TryGetApricorn +.public FieldSystem_ApricornTree_TryGetApricorn .public PlayerAvatar_GetFacingDirection .public GetPlayerXCoord .public GetPlayerYCoord diff --git a/asm/include/unk_020658D4.inc b/asm/include/unk_020658D4.inc index 7433ddc0b..71c5d274f 100644 --- a/asm/include/unk_020658D4.inc +++ b/asm/include/unk_020658D4.inc @@ -12,7 +12,7 @@ .public GetPlayerLastYCoord .public sub_0205C6D4 .public PlayerAvatar_GetMapObject -.public FieldSys_GetPlayerAvatar +.public FieldSystem_GetPlayerAvatar .public sub_0205CB00 .public sub_0205EEF4 .public MapObject_SetFlagsBits diff --git a/asm/include/unk_02066EDC.inc b/asm/include/unk_02066EDC.inc index bdb691ea1..81dd6af89 100644 --- a/asm/include/unk_02066EDC.inc +++ b/asm/include/unk_02066EDC.inc @@ -27,14 +27,14 @@ .public sub_0203769C .public sub_02037C44 .public sub_0203A05C -.public FieldSys_LaunchApplication +.public FieldSystem_LaunchApplication .public sub_0203F8EC .public GetVarPointer .public sub_0204B610 .public sub_0204B66C .public sub_0204B690 .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem .public TaskManager_GetEnv .public sub_02067118 diff --git a/asm/include/unk_02067A60.inc b/asm/include/unk_02067A60.inc index 43e10df6b..08b79cda1 100644 --- a/asm/include/unk_02067A60.inc +++ b/asm/include/unk_02067A60.inc @@ -48,12 +48,12 @@ .public sub_02067B88 .public sub_02067BA4 .public sub_02067BC0 -.public Fsys_ClearFollowingTrainer +.public FieldSystem_ClearFollowingTrainer .public sub_02067BE8 .public sub_02067BF8 .public sub_02067C30 .public sub_02069FB0 -.public FsysUnkSub108_AddMonMood +.public FieldSystemUnkSub108_AddMonMood .public GetMonData .public SaveArray_Party_Get .public MIi_CpuClearFast diff --git a/asm/include/unk_02068DE0.inc b/asm/include/unk_02068DE0.inc index d31bcab8f..827fce5e3 100644 --- a/asm/include/unk_02068DE0.inc +++ b/asm/include/unk_02068DE0.inc @@ -17,5 +17,5 @@ .public InitBlackthornGym .public InitFuchsiaGym .public InitViridianGym -.public Fsys_IsSavGymmickTypeEqualTo +.public FieldSystem_IsSavGymmickTypeEqualTo .public _s32_div_f diff --git a/asm/include/unk_02068FC8.inc b/asm/include/unk_02068FC8.inc index 98feb48f4..06ac44025 100644 --- a/asm/include/unk_02068FC8.inc +++ b/asm/include/unk_02068FC8.inc @@ -32,11 +32,11 @@ .public Save_VarsFlags_Get .public CheckFlagInArray .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem .public TaskManager_GetEnv .public sub_02055624 -.public FieldSys_GetGameClearTime +.public FieldSystem_GetGameClearTime .public sub_0205ABD8 .public sub_0205AC4C .public sub_0205AC70 diff --git a/asm/include/unk_0206A360.inc b/asm/include/unk_0206A360.inc index 0eca7fed7..f7881f4ef 100644 --- a/asm/include/unk_0206A360.inc +++ b/asm/include/unk_0206A360.inc @@ -18,7 +18,7 @@ .public AddWindowParameterized .public WindowArray_Delete .public GF_AssertFail -.public FieldSys_GetBgConfigPtr +.public FieldSystem_GetBgConfigPtr .public TaskManager_Call .public TaskManager_GetFieldSystem .public TaskManager_GetEnv diff --git a/asm/include/unk_0206D494.inc b/asm/include/unk_0206D494.inc index 23a6ceefc..0139b1c14 100644 --- a/asm/include/unk_0206D494.inc +++ b/asm/include/unk_0206D494.inc @@ -31,9 +31,9 @@ .public GetVarPointer .public VarGet .public Save_VarsFlags_Get -.public FieldSys_CreateTask +.public FieldSystem_CreateTask .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem .public TaskManager_GetEnv .public TaskManager_GetStatePtr @@ -71,12 +71,12 @@ .public sub_0206D494 .public MonIsInGameTradePoke .public sub_0206D8D0 -.public FieldSys_BugContest_Get +.public FieldSystem_BugContest_Get .public BugContest_GetSportBallsAddr -.public FieldSys_IncrementBugContestTimer +.public FieldSystem_IncrementBugContestTimer .public sub_0206DB58 .public sub_0206DB94 -.public Fsys_InitMystriStageGymmick +.public FieldSystem_InitMystriStageGymmick .public GetMonData .public CopyPokemonToPokemon .public MI_CpuFill8 diff --git a/asm/include/unk_02078834.inc b/asm/include/unk_02078834.inc index 837ccca2a..8e80695f0 100644 --- a/asm/include/unk_02078834.inc +++ b/asm/include/unk_02078834.inc @@ -9,11 +9,11 @@ .public sub_020378E4 .public sub_020398C8 .public sub_0203A05C -.public FieldSys_LaunchApplication +.public FieldSystem_LaunchApplication .public sub_0203F4A8 .public Save_VarsFlags_Get .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public CallApplicationAsTask .public TaskManager_GetFieldSystem .public TaskManager_GetEnv diff --git a/asm/include/unk_02092B04.inc b/asm/include/unk_02092B04.inc index e46ab716e..0c1ca717a 100644 --- a/asm/include/unk_02092B04.inc +++ b/asm/include/unk_02092B04.inc @@ -2,7 +2,7 @@ #pragma once .public FreeToHeap .public TaskManager_Jump -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem diff --git a/asm/include/unk_02095DF4.inc b/asm/include/unk_02095DF4.inc index 2528ff798..68fd99cc8 100644 --- a/asm/include/unk_02095DF4.inc +++ b/asm/include/unk_02095DF4.inc @@ -4,9 +4,9 @@ .public FreeToHeap .public sub_0203E30C .public FieldSystem_GetSaveDataPtr -.public Fsys_LaunchPokeathlonCourseApplication +.public FieldSystem_LaunchPokeathlonCourseApplication .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem diff --git a/asm/include/unk_020961D8.inc b/asm/include/unk_020961D8.inc index eb610e866..1bbcab2b2 100644 --- a/asm/include/unk_020961D8.inc +++ b/asm/include/unk_020961D8.inc @@ -11,7 +11,7 @@ .public SaveMisc_SetBattleGreeting .public sub_0203EA24 .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem diff --git a/asm/include/unk_020968B0.inc b/asm/include/unk_020968B0.inc index 8c8f8502f..db7b5bfa5 100644 --- a/asm/include/unk_020968B0.inc +++ b/asm/include/unk_020968B0.inc @@ -2,7 +2,7 @@ #pragma once .public AllocFromHeapAtEnd .public Save_PlayerData_GetOptionsAddr -.public FieldSys_LaunchApplication +.public FieldSystem_LaunchApplication .public sub_020968B0 .public MI_CpuFill8 .public _02108584 diff --git a/asm/include/unk_02097024.inc b/asm/include/unk_02097024.inc index 1518b87f2..2f7c5b0e9 100644 --- a/asm/include/unk_02097024.inc +++ b/asm/include/unk_02097024.inc @@ -6,11 +6,11 @@ .public Options_GetFrame .public Save_GameStats_Get .public sub_020398D4 -.public FieldSys_LaunchApplication +.public FieldSystem_LaunchApplication .public sub_0203E4EC .public sub_0203E740 .public sub_0203E76C -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public sub_02096C88 .public sub_02096CC8 .public sub_02096CF4 diff --git a/asm/include/unk_020977CC.inc b/asm/include/unk_020977CC.inc index a2cad5168..2c61dec2c 100644 --- a/asm/include/unk_020977CC.inc +++ b/asm/include/unk_020977CC.inc @@ -13,7 +13,7 @@ .public PlayerProfile_GetTrainerGender .public sub_0203FC68 .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem .public TaskManager_GetEnv .public TaskManager_GetStatePtr diff --git a/asm/include/unk_020979A8.inc b/asm/include/unk_020979A8.inc index c73c6de97..02548ce91 100644 --- a/asm/include/unk_020979A8.inc +++ b/asm/include/unk_020979A8.inc @@ -11,7 +11,7 @@ .public GF_AssertFail .public sub_0203FC90 .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem .public TaskManager_GetEnv .public TaskManager_GetStatePtr diff --git a/asm/include/unk_02097BE0.inc b/asm/include/unk_02097BE0.inc index b29491fcc..f0d044156 100644 --- a/asm/include/unk_02097BE0.inc +++ b/asm/include/unk_02097BE0.inc @@ -5,7 +5,7 @@ .public GF_AssertFail .public sub_0203FCB8 .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public TaskManager_GetFieldSystem .public TaskManager_GetEnv .public sub_0205525C diff --git a/asm/include/unk_02097D3C.inc b/asm/include/unk_02097D3C.inc index 14a515e74..87c125b83 100644 --- a/asm/include/unk_02097D3C.inc +++ b/asm/include/unk_02097D3C.inc @@ -8,7 +8,7 @@ .public FieldSystem_GetSaveDataPtr .public sub_0203FD08 .public TaskManager_Call -.public FieldSys_ApplicationIsRunning +.public FieldSystem_ApplicationIsRunning .public sub_020505C0 .public sub_020505C8 .public TaskManager_GetFieldSystem diff --git a/asm/overlay_01_021E5900.s b/asm/overlay_01_021E5900.s index fd41f8f59..088d55d2b 100644 --- a/asm/overlay_01_021E5900.s +++ b/asm/overlay_01_021E5900.s @@ -763,11 +763,11 @@ ov01_021E5FC0: ; 0x021E5FC0 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 bne _021E5FD4 add r0, r5, #0 - bl FieldSys_StartBugContestTimer + bl FieldSystem_StartBugContestTimer _021E5FD4: ldr r0, [r5, #0x50] bl ov01_021EA2A4 diff --git a/asm/overlay_01_021E6880.s b/asm/overlay_01_021E6880.s index 0266df874..dd86df84a 100644 --- a/asm/overlay_01_021E6880.s +++ b/asm/overlay_01_021E6880.s @@ -114,7 +114,7 @@ ov01_021E6928: ; 0x021E6928 add r6, r3, #0 bl ov01_021E6880 add r0, r4, #0 - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar bl sub_0205CB38 cmp r0, #0 beq _021E694E @@ -667,7 +667,7 @@ _021E6D9E: lsr r0, r0, #0x1f beq _021E6DB6 add r0, r4, #0 - bl Fsys_GetGearPhoneRingManager + bl FieldSystem_GetGearPhoneRingManager bl ov02_02251F20 cmp r0, #0 beq _021E6DB6 @@ -1698,7 +1698,7 @@ ov01_021E7628: ; 0x021E7628 push {r3, r4, r5, r6, r7, lr} mov r1, #6 add r5, r0, #0 - bl Fsys_IsSavGymmickTypeEqualTo + bl FieldSystem_IsSavGymmickTypeEqualTo cmp r0, #0 beq _021E7644 add r0, r5, #0 @@ -1822,7 +1822,7 @@ _021E7732: mov r0, #0x42 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FsysUnkSub108_MoveMoodTowardsNeutral + bl FieldSystemUnkSub108_MoveMoodTowardsNeutral _021E7746: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -2210,7 +2210,7 @@ ov01_021E7A08: ; 0x021E7A08 cmp r0, r1 blo _021E7A56 add r0, r4, #0 - bl Fsys_GetGearPhoneRingManager + bl FieldSystem_GetGearPhoneRingManager mov r1, #2 mov r2, #1 bl sub_02092E14 @@ -2227,7 +2227,7 @@ _021E7A5C: .word 0x00000984 BugContestTimeoutCheck: ; 0x021E7A60 push {r3, r4, r5, lr} add r4, r0, #0 - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get add r5, r0, #0 ldr r0, [r4, #0xc] bl Save_VarsFlags_Get @@ -2867,7 +2867,7 @@ _021E7F34: thumb_func_start ov01_021E7F38 ov01_021E7F38: ; 0x021E7F38 push {r3, lr} - bl FieldSys_FacingModelIsHeadbuttTree + bl FieldSystem_FacingModelIsHeadbuttTree cmp r0, #0 beq _021E7F46 ldr r0, _021E7F4C ; =std_field_headbutt @@ -2924,8 +2924,8 @@ _021E7F9E: _021E7FA4: .word 0x0000FFFF thumb_func_end ov01_021E7F54 - thumb_func_start FieldSys_FacingModelIsHeadbuttTree -FieldSys_FacingModelIsHeadbuttTree: ; 0x021E7FA8 + thumb_func_start FieldSystem_FacingModelIsHeadbuttTree +FieldSystem_FacingModelIsHeadbuttTree: ; 0x021E7FA8 push {r4, lr} sub sp, #8 add r1, sp, #4 @@ -2949,7 +2949,7 @@ _021E7FD4: add sp, #8 pop {r4, pc} .balign 4, 0 - thumb_func_end FieldSys_FacingModelIsHeadbuttTree + thumb_func_end FieldSystem_FacingModelIsHeadbuttTree .rodata diff --git a/asm/overlay_01_021EDAFC.s b/asm/overlay_01_021EDAFC.s index 4595e7a38..4696b59c7 100644 --- a/asm/overlay_01_021EDAFC.s +++ b/asm/overlay_01_021EDAFC.s @@ -2091,8 +2091,8 @@ ov01_021EEA44: ; 0x021EEA44 bx lr thumb_func_end ov01_021EEA44 - thumb_func_start Fsys_ShowMoneyBox -Fsys_ShowMoneyBox: ; 0x021EEA90 + thumb_func_start FieldSystem_ShowMoneyBox +FieldSystem_ShowMoneyBox: ; 0x021EEA90 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r5, r0, #0 @@ -2164,7 +2164,7 @@ Fsys_ShowMoneyBox: ; 0x021EEA90 nop _021EEB30: .word 0x000003D9 _021EEB34: .word 0x000001B3 - thumb_func_end Fsys_ShowMoneyBox + thumb_func_end FieldSystem_ShowMoneyBox thumb_func_start MoneyBoxSys_Delete MoneyBoxSys_Delete: ; 0x021EEB38 diff --git a/asm/overlay_01_021F1AFC.s b/asm/overlay_01_021F1AFC.s index e955bb56e..efb2225d1 100644 --- a/asm/overlay_01_021F1AFC.s +++ b/asm/overlay_01_021F1AFC.s @@ -512,7 +512,7 @@ ov01_021F1EA4: ; 0x021F1EA4 ldr r1, _021F1EC8 ; =ov01_021F1ECC add r0, r4, #0 str r6, [r2, #0xc] - bl FieldSys_CreateTask + bl FieldSystem_CreateTask pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 _021F1EC8: .word ov01_021F1ECC @@ -888,7 +888,7 @@ _021F21A8: lsl r0, r0, #2 ldr r0, [r1, r0] mov r1, #1 - bl FsysUnkSub108_AddMonMood + bl FieldSystemUnkSub108_AddMonMood mov r1, #2 b _021F21C6 _021F21C4: @@ -1120,7 +1120,7 @@ _021F23A6: ldr r1, _021F23B4 ; =ov01_021F23B8 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask pop {r3, r4, r5, r6, r7, pc} nop _021F23B4: .word ov01_021F23B8 @@ -1534,7 +1534,7 @@ ov01_021F26CC: ; 0x021F26CC lsl r0, r0, #2 ldr r0, [r1, r0] mov r1, #1 - bl FsysUnkSub108_AddMonMood + bl FieldSystemUnkSub108_AddMonMood mov r1, #2 b _021F26F0 _021F26EE: @@ -1812,7 +1812,7 @@ ov01_021F28EC: ; 0x021F28EC add r2, r0, #0 ldr r1, _021F2904 ; =ov01_021F2944 add r0, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask pop {r4, pc} nop _021F2904: .word ov01_021F2944 diff --git a/asm/overlay_01_021F3114.s b/asm/overlay_01_021F3114.s index b6ce7bc4c..5cb72479b 100644 --- a/asm/overlay_01_021F3114.s +++ b/asm/overlay_01_021F3114.s @@ -79,7 +79,7 @@ ov01_021F3170: ; 0x021F3170 ldr r1, _021F319C ; =ov01_021F31CC add r0, r5, #0 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 _021F3198: .word SEQ_SE_DP_F209 diff --git a/asm/overlay_01_021F3F50.s b/asm/overlay_01_021F3F50.s index 3fe9974cb..6879931de 100644 --- a/asm/overlay_01_021F3F50.s +++ b/asm/overlay_01_021F3F50.s @@ -615,7 +615,7 @@ _021F43FE: ov01_021F4404: ; 0x021F4404 push {r4, lr} add r4, r0, #0 - bl Fsys_SyncMapObjectsToSave + bl FieldSystem_SyncMapObjectsToSave add r0, r4, #0 mov r1, #4 mov r2, #0 diff --git a/asm/overlay_01_021F6CFC.s b/asm/overlay_01_021F6CFC.s index fcfacca0c..1cc4e9359 100644 --- a/asm/overlay_01_021F6CFC.s +++ b/asm/overlay_01_021F6CFC.s @@ -772,7 +772,7 @@ ov01_021F729C: ; 0x021F729C ldr r1, _021F72D8 ; =ov01_021F7100 add r0, r6, #0 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask pop {r4, r5, r6, pc} _021F72CA: ldr r1, _021F72D8 ; =ov01_021F7100 diff --git a/asm/overlay_01_021F72DC.s b/asm/overlay_01_021F72DC.s index eb00ba4a8..a9017bdc7 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 FollowPokeFsysParamSet + bl FollowPokeFieldSystemParamSet add r0, r5, #0 mov r1, #1 bl MapObject_ForceSetFacingDirection @@ -454,7 +454,7 @@ _021F7636: ldr r0, [r0, r1] ldr r1, [sp, #0xc] lsr r2, r2, #0x10 - bl FsysUnkSub108_Set + bl FieldSystemUnkSub108_Set _021F7654: add r0, r5, #0 bl ov01_021FA2D4 diff --git a/asm/overlay_01_021FC66C.s b/asm/overlay_01_021FC66C.s index 1afdf5aa2..aad90a60d 100644 --- a/asm/overlay_01_021FC66C.s +++ b/asm/overlay_01_021FC66C.s @@ -87,7 +87,7 @@ _021FC6E2: cmp r7, #1 bne _021FC728 add r0, r4, #0 - bl Fsys_GetGearPhoneRingManager + bl FieldSystem_GetGearPhoneRingManager bl sub_02092FA8 ldr r0, [r4, #0xc] bl Save_GameStats_Get @@ -910,7 +910,7 @@ ov01_021FCCB0: ; 0x021FCCB0 ldr r1, [r4, #0x20] lsl r0, r0, #2 ldr r0, [r1, r0] - bl FsysUnkSub108_GetMonMood + bl FieldSystemUnkSub108_GetMonMood mov r1, #9 mvn r1, r1 cmp r0, r1 diff --git a/asm/overlay_01_021FCE98.s b/asm/overlay_01_021FCE98.s index 449193ef7..fc7fe5f8c 100644 --- a/asm/overlay_01_021FCE98.s +++ b/asm/overlay_01_021FCE98.s @@ -135,7 +135,7 @@ _021FCF80: ldr r0, [r6, r0] mov r1, #1 mov r5, #2 - bl FsysUnkSub108_AddMonMood + bl FieldSystemUnkSub108_AddMonMood b _021FCF9E _021FCF9C: mov r5, #1 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index 9976a7eaa..3ca6be61c 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -2336,7 +2336,7 @@ _02246D8A: bl BattleSetup_New str r0, [sp, #0x20] add r1, r5, #0 - bl BattleSetup_InitFromFsys + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0x24] ldr r1, [sp, #0x1c] ldr r2, [sp, #0x20] @@ -2386,7 +2386,7 @@ _02246E18: _02246E22: ldr r0, [sp, #0x20] add r1, r5, #0 - bl BattleSetup_InitFromFsys + bl BattleSetup_InitFromFieldSystem add r0, sp, #0x18 ldrb r0, [r0, #1] cmp r0, #0 @@ -2613,7 +2613,7 @@ _02247002: ldr r0, [sp, #0x10] ldr r1, [sp, #0x20] ldr r0, [r0] - bl BattleSetup_InitFromFsys + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0x10] ldr r0, [r0] bl sub_02052544 @@ -2744,7 +2744,7 @@ _02247106: ldr r0, [sp, #4] ldr r1, [sp, #0xc] ldr r0, [r0] - bl BattleSetup_InitFromFsys + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0xc] bl MapEvents_GetLoadedEncTable add r5, r0, #0 @@ -2850,7 +2850,7 @@ _022471AC: bl BattleSetup_New str r0, [sp, #0x1c] add r1, r5, #0 - bl BattleSetup_InitFromFsys + bl BattleSetup_InitFromFieldSystem ldr r0, [sp, #0x20] ldr r1, [sp, #0x18] ldr r2, [sp, #0x1c] @@ -2894,7 +2894,7 @@ _0224724A: _02247254: ldr r0, [sp, #0x1c] add r1, r5, #0 - bl BattleSetup_InitFromFsys + bl BattleSetup_InitFromFieldSystem add r0, sp, #0x14 ldrb r0, [r0] cmp r0, #0 @@ -3055,7 +3055,7 @@ ov02_02247374: ; 0x02247374 ldr r0, [sp, #0xc] add r1, r5, #0 ldr r0, [r0] - bl BattleSetup_InitFromFsys + bl BattleSetup_InitFromFieldSystem mov r5, #0 add r0, sp, #0x14 _022473B0: @@ -4560,7 +4560,7 @@ ov02_02247ED8: ; 0x02247ED8 sub sp, #0xc add r6, r1, #0 add r5, r3, #0 - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get mov r1, #4 bl BugContest_GetEncounterSlot add r4, r0, #0 @@ -5063,7 +5063,7 @@ _02248252: str r0, [r5] pop {r3, r4, r5, pc} _0224826A: - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get add r4, r0, #0 bl BugContest_GetSportBallsAddr add r1, r0, #0 @@ -5187,7 +5187,7 @@ _02248350: bx r3 thumb_func_end ov02_022482BC -; BOOL ov02_GetRandomActiveRoamerInCurrMap(FieldSystem *fsys, Roamer **out); +; BOOL ov02_GetRandomActiveRoamerInCurrMap(FieldSystem *fieldSystem, Roamer **out); thumb_func_start ov02_GetRandomActiveRoamerInCurrMap ov02_GetRandomActiveRoamerInCurrMap: ; 0x02248360 push {r3, r4, r5, r6, r7, lr} @@ -13835,7 +13835,7 @@ _0224C3F8: ldr r0, [r6, r0] mov r1, #1 mov r4, #2 - bl FsysUnkSub108_AddMonMood + bl FieldSystemUnkSub108_AddMonMood b _0224C420 _0224C41E: mov r4, #1 @@ -14058,7 +14058,7 @@ _0224C5A4: ldr r0, [r6, r0] mov r1, #1 mov r4, #2 - bl FsysUnkSub108_AddMonMood + bl FieldSystemUnkSub108_AddMonMood b _0224C5CC _0224C5CA: mov r4, #1 @@ -19616,8 +19616,8 @@ _0224EF78: .balign 4, 0 thumb_func_end ov02_0224EF6C - thumb_func_start Fsys_FollowPokeInteract -Fsys_FollowPokeInteract: ; 0x0224EF80 + thumb_func_start FieldSystem_FollowPokeInteract +FieldSystem_FollowPokeInteract: ; 0x0224EF80 ldr r3, _0224EF8C ; =TaskManager_Call ldr r0, [r0, #0x10] ldr r1, _0224EF90 ; =Task_FollowPokeInteract @@ -19626,7 +19626,7 @@ Fsys_FollowPokeInteract: ; 0x0224EF80 nop _0224EF8C: .word TaskManager_Call _0224EF90: .word Task_FollowPokeInteract - thumb_func_end Fsys_FollowPokeInteract + thumb_func_end FieldSystem_FollowPokeInteract thumb_func_start ov02_0224EF94 ov02_0224EF94: ; 0x0224EF94 @@ -20574,7 +20574,7 @@ ov02_0224F698: ; 0x0224F698 mov r1, #0x42 lsl r1, r1, #2 ldr r0, [r0, r1] - bl FsysUnkSub108_GetMonMood + bl FieldSystemUnkSub108_GetMonMood strb r0, [r4, #0x15] pop {r4, pc} .balign 4, 0 @@ -22476,7 +22476,7 @@ ov02_02250504: ; 0x02250504 mov r0, #0x42 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FsysUnkSub108_GetMonMood + bl FieldSystemUnkSub108_GetMonMood mov r1, #0x12 str r0, [sp] lsl r1, r1, #4 @@ -22503,7 +22503,7 @@ _02250542: lsl r1, r1, #0x18 ldr r0, [r5, r0] asr r1, r1, #0x18 - bl FsysUnkSub108_SetMonMood + bl FieldSystemUnkSub108_SetMonMood add r0, r4, #0 mov r1, #9 mov r2, #0 diff --git a/asm/overlay_04.s b/asm/overlay_04.s index aec6d7ce0..c7b8825fd 100644 --- a/asm/overlay_04.s +++ b/asm/overlay_04.s @@ -3230,7 +3230,7 @@ _0225574A: ldr r0, [r5] ldr r1, _022557FC ; =ov04_02255AC4 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask mov r1, #1 b _022557F2 _02255762: @@ -3263,7 +3263,7 @@ _02255762: ldr r0, [r5] ldr r1, _02255800 ; =ov04_022559C8 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask mov r1, #1 b _022557F2 _022557AA: @@ -3297,7 +3297,7 @@ _022557AA: ldr r0, [r5] ldr r1, _02255800 ; =ov04_022559C8 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask mov r1, #1 _022557F2: add r0, r1, #0 diff --git a/asm/overlay_124.s b/asm/overlay_124.s index 11c14174b..b6805345e 100644 --- a/asm/overlay_124.s +++ b/asm/overlay_124.s @@ -80,7 +80,7 @@ _02260CB8: add r1, #0xa8 str r0, [r1] mov r0, #0xb - bl FsysUnkSub108_Alloc + bl FieldSystemUnkSub108_Alloc mov r1, #0x42 lsl r1, r1, #2 str r0, [r5, r1] diff --git a/asm/overlay_27.s b/asm/overlay_27.s index 95170e5b4..ca8225f7b 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -174,7 +174,7 @@ ov27_02259F80: ; 0x02259F80 b _0225A11A _0225A102: add r0, r5, #0 - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 bne _0225A11A add r0, r5, #0 @@ -503,7 +503,7 @@ _0225A3AE: str r2, [r5, r1] _0225A3C8: ldr r0, [r5, #0x10] - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 beq _0225A3DA add r0, r5, #0 @@ -602,7 +602,7 @@ ov27_0225A48C: ; 0x0225A48C cmp r1, #0 bne _0225A4B6 ldr r0, [r5, #0x10] - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r6, r0, #0 bl sub_0205CB38 add r4, r0, #0 @@ -623,7 +623,7 @@ ov27_0225A4B8: ; 0x0225A4B8 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x10] - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar bl sub_0205CB38 add r1, r0, #0 add r0, r4, #0 @@ -749,7 +749,7 @@ _0225A5A8: cmp r0, #0 bne _0225A5E6 add r0, r4, #0 - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar bl PlayerAvatar_GetMapObject add r7, r0, #0 bl sub_0205F330 @@ -780,7 +780,7 @@ _0225A5E6: bne _0225A618 add r0, r4, #0 add r1, sp, #0 - bl Fsys_GetFacingObject + bl FieldSystem_GetFacingObject ldr r0, [sp] bl MapObject_GetScript bl ov01_021F6BD0 @@ -1920,7 +1920,7 @@ _0225AEDE: cmp r2, r0 bne _0225AF22 mov r0, ip - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get str r0, [sp, #0x14] cmp r0, #0 bne _0225AEFA @@ -2347,7 +2347,7 @@ _0225B27E: cmp r0, #2 bne _0225B2D2 ldr r0, [r5, #0x10] - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get add r4, r0, #0 bne _0225B298 bl GF_AssertFail @@ -3782,7 +3782,7 @@ ov27_0225BDDC: ; 0x0225BDDC add r4, r1, #0 add r5, r0, #0 ldr r0, [r4, #0x10] - bl Fsys_GetGearPhoneRingManager + bl FieldSystem_GetGearPhoneRingManager str r0, [r5, #4] mov r0, #0xe7 lsl r0, r0, #2 @@ -4127,7 +4127,7 @@ ov27_0225C088: ; 0x0225C088 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0x10] - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get add r4, r0, #0 bne _0225C09A bl GF_AssertFail @@ -4610,7 +4610,7 @@ ov27_0225C434: ; 0x0225C434 push {r4, lr} add r4, r1, #0 ldr r0, [r4, #0x24] - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 bne _0225C46C ldr r0, [r4, #0x24] diff --git a/asm/overlay_28.s b/asm/overlay_28.s index cb13d3ab6..c7c4d9bf7 100644 --- a/asm/overlay_28.s +++ b/asm/overlay_28.s @@ -49,7 +49,7 @@ ov28_0225D520: ; 0x0225D520 bne _0225D5A6 ldr r0, [r4, #0x18] add r1, sp, #8 - bl Fsys_GetFacingObject + bl FieldSystem_GetFacingObject ldr r0, [sp, #8] bl MapObject_GetScript bl ov01_021F6BD0 @@ -735,7 +735,7 @@ ov28_0225DA74: ; 0x0225DA74 add r2, sp, #0x20 bl ov28_0225DA1C ldr r0, [r5, #0x18] - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar bl sub_0205CB38 cmp r0, #0 bne _0225DB22 @@ -923,7 +923,7 @@ _0225DC56: str r1, [r4, r0] _0225DC76: ldr r0, [r4, #0x18] - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #1 beq _0225DC98 ldr r0, _0225DD1C ; =ov28_0225EA88 @@ -2469,7 +2469,7 @@ _0225E828: cmp r0, #0 ldr r0, [r5, #0x18] bne _0225E860 - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar bl PlayerAvatar_GetMapObject add r4, r0, #0 bl MapObject_GetGfxID @@ -2497,7 +2497,7 @@ _0225E860: bne _0225E890 ldr r0, [r5, #0x18] add r1, sp, #0 - bl Fsys_GetFacingObject + bl FieldSystem_GetFacingObject ldr r0, [sp] bl MapObject_GetScript bl ov01_021F6BD0 @@ -2640,7 +2640,7 @@ _0225E96C: cmp r0, #1 bne _0225E9DA ldr r0, [r5, #0x18] - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r6, r0, #0 bl sub_0205CB38 add r4, r0, #0 @@ -2740,7 +2740,7 @@ ov28_0225EA58: ; 0x0225EA58 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x18] - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #1 bne _0225EA76 ldr r0, [r4, #0x18] diff --git a/asm/overlay_30.s b/asm/overlay_30.s index 2c71d4f32..e81b9c84b 100644 --- a/asm/overlay_30.s +++ b/asm/overlay_30.s @@ -212,7 +212,7 @@ ov30_0225D700: ; 0x0225D700 push {r4, lr} add r4, r1, #0 ldr r0, [r4, #0x1c] - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 ldr r0, [r4, #0x1c] bne _0225D73E diff --git a/asm/overlay_34.s b/asm/overlay_34.s index bab40250f..90cc0dddd 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -95,7 +95,7 @@ _0225D5C4: ; jump table .short _0225D5F4 - _0225D5C4 - 2 ; case 4 .short _0225D5F4 - _0225D5C4 - 2 ; case 5 _0225D5D0: - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 bne _0225D5E0 add r0, r4, #0 @@ -1542,7 +1542,7 @@ ov34_0225E164: ; 0x0225E164 ldr r0, [r5, #0xc] mov r4, #0 mvn r4, r4 - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 bne _0225E19A add r0, r5, #0 @@ -2012,7 +2012,7 @@ ov34_0225E4F8: ; 0x0225E4F8 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 ldr r0, [r5, #0xc] - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 bne _0225E55C mov r4, #0 diff --git a/asm/scrcmd_11.s b/asm/scrcmd_11.s index 7ee365b68..fb17fad8a 100644 --- a/asm/scrcmd_11.s +++ b/asm/scrcmd_11.s @@ -26,37 +26,37 @@ sScriptMysteryGiftActionTable: .text - thumb_func_start FieldSys_InitGetMysteryGiftGmmState -FieldSys_InitGetMysteryGiftGmmState: ; 0x0204BD78 + thumb_func_start FieldSystem_InitGetMysteryGiftGmmState +FieldSystem_InitGetMysteryGiftGmmState: ; 0x0204BD78 str r1, [r0] str r2, [r0, #4] str r3, [r0, #8] bx lr - thumb_func_end FieldSys_InitGetMysteryGiftGmmState + thumb_func_end FieldSystem_InitGetMysteryGiftGmmState - thumb_func_start FieldSys_GetTagOfNextMG -FieldSys_GetTagOfNextMG: ; 0x0204BD80 + thumb_func_start FieldSystem_GetTagOfNextMG +FieldSystem_GetTagOfNextMG: ; 0x0204BD80 push {r3, lr} bl GetFirstQueuedMysteryGiftIdx bl GetMysteryGiftTagByIdx pop {r3, pc} - thumb_func_end FieldSys_GetTagOfNextMG + thumb_func_end FieldSystem_GetTagOfNextMG - thumb_func_start FieldSys_GetDataOfNextMG -FieldSys_GetDataOfNextMG: ; 0x0204BD8C + thumb_func_start FieldSystem_GetDataOfNextMG +FieldSystem_GetDataOfNextMG: ; 0x0204BD8C push {r3, lr} bl GetFirstQueuedMysteryGiftIdx bl GetMysteryGiftDataByIdx pop {r3, pc} - thumb_func_end FieldSys_GetDataOfNextMG + thumb_func_end FieldSystem_GetDataOfNextMG - thumb_func_start FieldSys_SetQueuedMGReceived -FieldSys_SetQueuedMGReceived: ; 0x0204BD98 + thumb_func_start FieldSystem_SetQueuedMGReceived +FieldSystem_SetQueuedMGReceived: ; 0x0204BD98 push {r3, lr} bl GetFirstQueuedMysteryGiftIdx bl SetMysteryGiftReceivedByIdx pop {r3, pc} - thumb_func_end FieldSys_SetQueuedMGReceived + thumb_func_end FieldSystem_SetQueuedMGReceived thumb_func_start ScrCmd_MysteryGift ScrCmd_MysteryGift: ; 0x0204BDA4 @@ -120,7 +120,7 @@ _0204BDFC: add r4, #0x80 add r5, r0, #0 ldr r0, [r4] - bl FieldSys_GetTagOfNextMG + bl FieldSystem_GetTagOfNextMG cmp r0, #0 beq _0204BE22 mov r0, #1 @@ -142,7 +142,7 @@ _0204BE28: add r4, #0x80 add r5, r0, #0 ldr r0, [r4] - bl FieldSys_GetTagOfNextMG + bl FieldSystem_GetTagOfNextMG strh r0, [r5] b _0204BF8C _0204BE48: @@ -158,14 +158,14 @@ _0204BE48: add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl FieldSys_GetTagOfNextMG + bl FieldSystem_GetTagOfNextMG sub r0, r0, #1 lsl r5, r0, #4 add r0, r4, #0 add r0, #0x80 ldr r0, [r0] ldr r7, _0204BF94 ; =sScriptMysteryGiftActionTable - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r4, #0x80 add r1, r0, #0 ldr r0, [r4] @@ -178,7 +178,7 @@ _0204BE84: add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl FieldSys_GetTagOfNextMG + bl FieldSystem_GetTagOfNextMG sub r0, r0, #1 ldr r1, _0204BF94 ; =sScriptMysteryGiftActionTable lsl r0, r0, #4 @@ -186,7 +186,7 @@ _0204BE84: add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r1, r0, #0 add r0, r4, #0 add r0, #0x80 @@ -195,14 +195,14 @@ _0204BE84: blx r2 add r4, #0x80 ldr r0, [r4] - bl FieldSys_SetQueuedMGReceived + bl FieldSystem_SetQueuedMGReceived b _0204BF8C _0204BEB6: ; Get GMM add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl FieldSys_GetTagOfNextMG + bl FieldSystem_GetTagOfNextMG sub r0, r0, #1 ldr r1, _0204BF94 ; =sScriptMysteryGiftActionTable lsl r0, r0, #4 @@ -232,13 +232,13 @@ _0204BEB6: add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r4, #0x80 add r3, r0, #0 ldr r1, [r4] ldr r2, [r6] add r0, sp, #0x14 - bl FieldSys_InitGetMysteryGiftGmmState + bl FieldSystem_InitGetMysteryGiftGmmState ldr r2, [sp] ldr r3, [r5, #8] add r0, sp, #0x14 @@ -250,7 +250,7 @@ _0204BF22: add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl FieldSys_GetTagOfNextMG + bl FieldSystem_GetTagOfNextMG sub r0, r0, #1 ldr r1, _0204BF94 ; =sScriptMysteryGiftActionTable lsl r0, r0, #4 @@ -280,13 +280,13 @@ _0204BF22: add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r4, #0x80 add r3, r0, #0 ldr r1, [r4] ldr r2, [r6] add r0, sp, #8 - bl FieldSys_InitGetMysteryGiftGmmState + bl FieldSystem_InitGetMysteryGiftGmmState ldr r2, [sp, #4] ldr r3, [r5, #0xc] add r0, sp, #8 @@ -357,7 +357,7 @@ MGGive_Mon: ; 0x0204BFF0 push {r4, r5, r6, r7, lr} sub sp, #0x3c add r7, r0, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG str r0, [sp, #0x14] ldr r0, [r7, #0xc] bl Save_PlayerData_GetProfileAddr @@ -727,7 +727,7 @@ MGMessageSuccess_GiveMon: ; 0x0204C330 ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r7, r0, #0 mov r0, #0xd1 strh r0, [r4] @@ -774,7 +774,7 @@ MGMessageSuccess_Egg: ; 0x0204C380 ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r7, r0, #0 mov r0, #0xd1 strh r0, [r4] @@ -804,7 +804,7 @@ MGCheck_Item: ; 0x0204C3BC bl Save_Bag_Get add r4, r0, #0 add r0, r5, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r1, r0, #0 ldr r1, [r1] add r0, r4, #0 @@ -825,7 +825,7 @@ MGGive_Item: ; 0x0204C3E4 bl Save_Bag_Get add r6, r0, #0 add r0, r5, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldr r0, [r0] lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -854,7 +854,7 @@ MGMessageSuccess_Item: ; 0x0204C420 ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldr r0, [r0] lsl r0, r0, #0x10 lsr r7, r0, #0x10 @@ -887,7 +887,7 @@ MGMessageFailure_Item: ; 0x0204C45C add r6, r2, #0 bl Save_Bag_Get ldr r0, [r5] - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldr r0, [r0] mov r1, #0 lsl r0, r0, #0x10 @@ -912,7 +912,7 @@ MGCheck_BattleRules: ; 0x0204C48C MGGive_BattleRules: ; 0x0204C490 push {r4, lr} add r4, r0, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r1, r0, #0 ldr r0, [r4, #0xc] bl sub_020291D4 @@ -928,7 +928,7 @@ MGMessageSuccess_BattleRules: ; 0x0204C4A4 ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r7, r0, #0 mov r0, #0xd1 strh r0, [r4] @@ -989,7 +989,7 @@ MGMessageSuccess_Decoration: ; 0x0204C50C ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldr r7, [r0] mov r0, #0xd1 strh r0, [r4] @@ -1024,7 +1024,7 @@ MGMessageFailure_Decoration: ; 0x0204C544 MGCheck_MonDeco: ; 0x0204C550 push {r3, r4, r5, lr} add r5, r0, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldr r4, [r0, #4] ldr r0, [r0] cmp r0, #1 @@ -1057,7 +1057,7 @@ _0204C582: MGGive_MonDeco: ; 0x0204C588 push {r3, r4, r5, lr} add r5, r0, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldr r4, [r0, #4] ldr r0, [r0] cmp r0, #1 @@ -1098,7 +1098,7 @@ MGMessageSuccess_MonDeco: ; 0x0204C5D8 ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldr r2, [r0, #4] ldr r0, [r0] cmp r0, #1 @@ -1291,7 +1291,7 @@ MGMessageFailure_PoketchApp: ; 0x0204C6A8 MGCheck_PokewalkerCourse: ; 0x0204C6B4 push {r3, r4, r5, lr} add r5, r0, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r4, r0, #0 ldr r0, [r5, #0xc] bl Save_Pokewalker_Get @@ -1320,7 +1320,7 @@ MGGive_PokewalkerCourse: ; 0x0204C6E0 bl Save_Pokewalker_Get add r4, r0, #0 add r0, r5, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldrb r1, [r0] cmp r1, #0x1b bhs _0204C6FE @@ -1337,7 +1337,7 @@ MGMesageSuccess_PokewalkerCourse: ; 0x0204C700 ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r7, r0, #0 mov r0, #0xd1 strh r0, [r4] @@ -1365,7 +1365,7 @@ MGMesageFailure_PokewalkerCourse: ; 0x0204C738 ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r7, r0, #0 ldr r0, [r5] ldr r0, [r0, #0xc] @@ -1411,7 +1411,7 @@ _0204C794: MGGive_MemorialPhoto: ; 0x0204C798 push {r3, r4, r5, lr} add r4, r0, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG add r5, r0, #0 add r0, r4, #0 bl FieldSystem_GetSaveDataPtr @@ -1437,7 +1437,7 @@ MGMessageSuccess_MemorialPhoto: ; 0x0204C7C8 ldr r0, [r5] add r4, r1, #0 add r6, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG mov r0, #0xd1 strh r0, [r4] mov r0, #0x12 @@ -1460,7 +1460,7 @@ MGMessageFailure_MemorialPhoto: ; 0x0204C7F4 ldr r0, [r5] add r6, r1, #0 add r4, r2, #0 - bl FieldSys_GetDataOfNextMG + bl FieldSystem_GetDataOfNextMG ldr r0, [r5] ldr r0, [r0, #0xc] bl Save_Bag_Get diff --git a/asm/unk_0203BC10.s b/asm/unk_0203BC10.s index cc6f3d220..50d34e89c 100644 --- a/asm/unk_0203BC10.s +++ b/asm/unk_0203BC10.s @@ -127,7 +127,7 @@ _0203BCCA: ldr r1, _0203BCD8 ; =sub_0203BEF0 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask pop {r3, r4, r5, pc} nop _0203BCD8: .word sub_0203BEF0 @@ -160,7 +160,7 @@ _0203BD10: ldr r1, _0203BD1C ; =sub_0203BEF0 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask pop {r3, r4, r5, pc} .balign 4, 0 _0203BD1C: .word sub_0203BEF0 @@ -193,7 +193,7 @@ _0203BD54: ldr r1, _0203BD60 ; =sub_0203BEF0 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask pop {r3, r4, r5, pc} .balign 4, 0 _0203BD60: .word sub_0203BEF0 @@ -482,7 +482,7 @@ _0203BF60: lsl r1, r1, #4 add r0, r4, #0 add r1, r5, r1 - bl Fsys_MakeFieldMoveCheckData + bl FieldSystem_MakeFieldMoveCheckData add r0, r6, #0 bl sub_0203C14C add r0, r4, #0 @@ -528,7 +528,7 @@ _0203BFBA: lsl r1, r1, #4 add r0, r4, #0 add r1, r5, r1 - bl Fsys_MakeFieldMoveCheckData + bl FieldSystem_MakeFieldMoveCheckData mov r0, #3 strh r0, [r5, #0x26] b _0203C136 @@ -1666,7 +1666,7 @@ sub_0203C8B0: ; 0x0203C8B0 bl TaskManager_GetEnv add r4, r0, #0 add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _0203C8EE mov r1, #0xd5 @@ -2603,7 +2603,7 @@ _0203D066: ldr r0, [sp, #8] ldr r1, _0203D19C ; =_0210159C add r2, r5, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #0xe lsl r0, r0, #6 str r5, [r4, r0] @@ -2700,7 +2700,7 @@ _0203D166: ldr r0, [sp, #8] ldr r1, _0203D19C ; =_0210159C add r2, r5, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #0xe lsl r0, r0, #6 str r5, [r4, r0] @@ -3295,7 +3295,7 @@ _0203D604: ldr r0, [sp] ldr r1, _0203D65C ; =_0210159C add r2, r5, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #0xe1 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3719,7 +3719,7 @@ sub_0203D940: ; 0x0203D940 ldr r1, _0203D9AC ; =_0210159C add r0, r7, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #0xe lsl r0, r0, #6 str r4, [r5, r0] diff --git a/asm/unk_0203DB6C.s b/asm/unk_0203DB6C.s index d5db2203a..dad0be184 100644 --- a/asm/unk_0203DB6C.s +++ b/asm/unk_0203DB6C.s @@ -96,8 +96,8 @@ _0203DBF2: pop {r3, r4, r5, pc} thumb_func_end sub_0203DBD4 - thumb_func_start Fsys_GetFacingObject -Fsys_GetFacingObject: ; 0x0203DBF8 + thumb_func_start FieldSystem_GetFacingObject +FieldSystem_GetFacingObject: ; 0x0203DBF8 push {r4, r5, r6, lr} sub sp, #8 add r6, r1, #0 @@ -154,14 +154,14 @@ _0203DC52: str r0, [r6] add sp, #8 pop {r4, r5, r6, pc} - thumb_func_end Fsys_GetFacingObject + thumb_func_end FieldSystem_GetFacingObject thumb_func_start sub_0203DC64 sub_0203DC64: ; 0x0203DC64 push {r3, r4, r5, lr} add r4, r1, #0 add r5, r0, #0 - bl Fsys_GetFacingObject + bl FieldSystem_GetFacingObject ldr r0, [r4] cmp r0, #0 beq _0203DC8C diff --git a/asm/unk_0203E348.s b/asm/unk_0203E348.s index 26deca1d3..23adbdef9 100644 --- a/asm/unk_0203E348.s +++ b/asm/unk_0203E348.s @@ -200,12 +200,12 @@ sub_0203E3C0: ; 0x0203E3C0 thumb_func_start sub_0203E3C4 sub_0203E3C4: ; 0x0203E3C4 - ldr r3, _0203E3CC ; =FieldSys_LaunchApplication + ldr r3, _0203E3CC ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203E3D0 ; =_020FA484 bx r3 .balign 4, 0 -_0203E3CC: .word FieldSys_LaunchApplication +_0203E3CC: .word FieldSystem_LaunchApplication _0203E3D0: .word _020FA484 thumb_func_end sub_0203E3C4 @@ -224,7 +224,7 @@ sub_0203E3D4: ; 0x0203E3D4 stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -353,12 +353,12 @@ _0203E4E6: thumb_func_start sub_0203E4EC sub_0203E4EC: ; 0x0203E4EC - ldr r3, _0203E4F4 ; =FieldSys_LaunchApplication + ldr r3, _0203E4F4 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203E4F8 ; =_02103A1C bx r3 .balign 4, 0 -_0203E4F4: .word FieldSys_LaunchApplication +_0203E4F4: .word FieldSystem_LaunchApplication _0203E4F8: .word _02103A1C thumb_func_end sub_0203E4EC @@ -420,7 +420,7 @@ sub_0203E550: ; 0x0203E550 ldr r1, _0203E57C ; =_0210159C add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} nop @@ -439,7 +439,7 @@ sub_0203E580: ; 0x0203E580 ldr r1, _0203E5A0 ; =_0210159C add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, pc} nop @@ -458,7 +458,7 @@ sub_0203E5A4: ; 0x0203E5A4 ldr r1, _0203E5C4 ; =_0210159C add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, pc} nop @@ -488,7 +488,7 @@ sub_0203E5D0: ; 0x0203E5D0 ldr r1, _0203E5F4 ; =_0210159C add r0, r5, #0 add r2, r6, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r6, #0 pop {r4, r5, r6, pc} .balign 4, 0 @@ -540,13 +540,13 @@ _0203E63A: ldr r1, _0203E6D0 ; =_0210159C ldr r2, [r4, #4] add r0, r6, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #1 str r0, [r5] b _0203E6CC _0203E64A: add r0, r6, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _0203E6CC ldr r0, [r4, #4] @@ -589,7 +589,7 @@ _0203E680: b _0203E6CC _0203E6A2: add r0, r6, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _0203E6CC ldr r0, [r4, #8] @@ -684,7 +684,7 @@ sub_0203E740: ; 0x0203E740 ldr r1, _0203E768 ; =_0210159C add r0, r5, #0 add r2, r6, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r6, #0 pop {r4, r5, r6, pc} nop @@ -809,12 +809,12 @@ sub_0203E864: ; 0x0203E864 thumb_func_start sub_0203E868 sub_0203E868: ; 0x0203E868 - ldr r3, _0203E870 ; =FieldSys_LaunchApplication + ldr r3, _0203E870 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203E874 ; =_020FA414 bx r3 .balign 4, 0 -_0203E870: .word FieldSys_LaunchApplication +_0203E870: .word FieldSystem_LaunchApplication _0203E874: .word _020FA414 thumb_func_end sub_0203E868 @@ -847,7 +847,7 @@ _0203E8A4: str r0, [r5] b _0203E958 _0203E8B2: - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _0203E958 ldr r0, [r5] @@ -1032,12 +1032,12 @@ _0203EA20: .word sub_0203E878 thumb_func_start sub_0203EA24 sub_0203EA24: ; 0x0203EA24 - ldr r3, _0203EA2C ; =FieldSys_LaunchApplication + ldr r3, _0203EA2C ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203EA30 ; =_020FA404 bx r3 .balign 4, 0 -_0203EA2C: .word FieldSys_LaunchApplication +_0203EA2C: .word FieldSystem_LaunchApplication _0203EA30: .word _020FA404 thumb_func_end sub_0203EA24 @@ -1056,7 +1056,7 @@ SwitchToPokegearApp_Phone: ; 0x0203EA34 stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1078,7 +1078,7 @@ SwitchToPokegearApp_TownMap: ; 0x0203EA5C stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1146,7 +1146,7 @@ sub_0203EAE0: ; 0x0203EAE0 stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1194,7 +1194,7 @@ sub_0203EB3C: ; 0x0203EB3C stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1230,7 +1230,7 @@ sub_0203EB7C: ; 0x0203EB7C stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1265,8 +1265,8 @@ sub_0203EBA4: ; 0x0203EBA4 .balign 4, 0 thumb_func_end sub_0203EBA4 - thumb_func_start FieldSys_LaunchApplication_AlphPuzzle -FieldSys_LaunchApplication_AlphPuzzle: ; 0x0203EBDC + thumb_func_start FieldSystem_LaunchApplication_AlphPuzzle +FieldSystem_LaunchApplication_AlphPuzzle: ; 0x0203EBDC push {r4, r5, r6, lr} sub sp, #0x10 ldr r5, _0203EC00 ; =_020FA3A4 @@ -1280,15 +1280,15 @@ FieldSys_LaunchApplication_AlphPuzzle: ; 0x0203EBDC stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop _0203EC00: .word _020FA3A4 - thumb_func_end FieldSys_LaunchApplication_AlphPuzzle + thumb_func_end FieldSystem_LaunchApplication_AlphPuzzle - thumb_func_start Fsys_CreateApplication_AlphPuzzle -Fsys_CreateApplication_AlphPuzzle: ; 0x0203EC04 + thumb_func_start FieldSystem_CreateApplication_AlphPuzzle +FieldSystem_CreateApplication_AlphPuzzle: ; 0x0203EC04 push {r4, r5, r6, lr} add r5, r0, #0 add r6, r1, #0 @@ -1309,11 +1309,11 @@ Fsys_CreateApplication_AlphPuzzle: ; 0x0203EC04 add r0, r5, #0 add r1, r4, #0 strb r6, [r4, #5] - bl FieldSys_LaunchApplication_AlphPuzzle + bl FieldSystem_LaunchApplication_AlphPuzzle add r0, r4, #0 pop {r4, r5, r6, pc} .balign 4, 0 - thumb_func_end Fsys_CreateApplication_AlphPuzzle + thumb_func_end FieldSystem_CreateApplication_AlphPuzzle thumb_func_start sub_0203EC3C sub_0203EC3C: ; 0x0203EC3C @@ -1330,7 +1330,7 @@ sub_0203EC3C: ; 0x0203EC3C stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1378,7 +1378,7 @@ sub_0203EC98: ; 0x0203EC98 stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1430,7 +1430,7 @@ sub_0203ECFC: ; 0x0203ECFC stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1519,12 +1519,12 @@ sub_0203ED80: ; 0x0203ED80 thumb_func_start sub_0203EDCC sub_0203EDCC: ; 0x0203EDCC - ldr r3, _0203EDD4 ; =FieldSys_LaunchApplication + ldr r3, _0203EDD4 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203EDD8 ; =_020FA364 bx r3 .balign 4, 0 -_0203EDD4: .word FieldSys_LaunchApplication +_0203EDD4: .word FieldSystem_LaunchApplication _0203EDD8: .word _020FA364 thumb_func_end sub_0203EDCC @@ -1558,12 +1558,12 @@ sub_0203EDDC: ; 0x0203EDDC thumb_func_start sub_0203EE14 sub_0203EE14: ; 0x0203EE14 - ldr r3, _0203EE1C ; =FieldSys_LaunchApplication + ldr r3, _0203EE1C ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203EE20 ; =_020FA354 bx r3 .balign 4, 0 -_0203EE1C: .word FieldSys_LaunchApplication +_0203EE1C: .word FieldSystem_LaunchApplication _0203EE20: .word _020FA354 thumb_func_end sub_0203EE14 @@ -1622,12 +1622,12 @@ _0203EE8A: thumb_func_start sub_0203EE90 sub_0203EE90: ; 0x0203EE90 - ldr r3, _0203EE98 ; =FieldSys_LaunchApplication + ldr r3, _0203EE98 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203EE9C ; =_020FA344 bx r3 .balign 4, 0 -_0203EE98: .word FieldSys_LaunchApplication +_0203EE98: .word FieldSystem_LaunchApplication _0203EE9C: .word _020FA344 thumb_func_end sub_0203EE90 @@ -1657,12 +1657,12 @@ sub_0203EEA0: ; 0x0203EEA0 thumb_func_start sub_0203EED4 sub_0203EED4: ; 0x0203EED4 - ldr r3, _0203EEDC ; =FieldSys_LaunchApplication + ldr r3, _0203EEDC ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203EEE0 ; =_020FA314 bx r3 .balign 4, 0 -_0203EEDC: .word FieldSys_LaunchApplication +_0203EEDC: .word FieldSystem_LaunchApplication _0203EEE0: .word _020FA314 thumb_func_end sub_0203EED4 @@ -1702,12 +1702,12 @@ sub_0203EEE4: ; 0x0203EEE4 thumb_func_start sub_0203EF30 sub_0203EF30: ; 0x0203EF30 - ldr r3, _0203EF38 ; =FieldSys_LaunchApplication + ldr r3, _0203EF38 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203EF3C ; =_020FA324 bx r3 .balign 4, 0 -_0203EF38: .word FieldSys_LaunchApplication +_0203EF38: .word FieldSystem_LaunchApplication _0203EF3C: .word _020FA324 thumb_func_end sub_0203EF30 @@ -1748,12 +1748,12 @@ sub_0203EF40: ; 0x0203EF40 thumb_func_start sub_0203EF90 sub_0203EF90: ; 0x0203EF90 - ldr r3, _0203EF98 ; =FieldSys_LaunchApplication + ldr r3, _0203EF98 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203EF9C ; =_020FA424 bx r3 .balign 4, 0 -_0203EF98: .word FieldSys_LaunchApplication +_0203EF98: .word FieldSystem_LaunchApplication _0203EF9C: .word _020FA424 thumb_func_end sub_0203EF90 @@ -1789,11 +1789,11 @@ sub_0203EFD4: ; 0x0203EFD4 lsl r1, r1, #2 add r1, r0, r1 str r1, [r2, #0x1c] - ldr r3, _0203EFE4 ; =FieldSys_LaunchApplication + ldr r3, _0203EFE4 ; =FieldSystem_LaunchApplication ldr r1, _0203EFE8 ; =_020FA434 bx r3 .balign 4, 0 -_0203EFE4: .word FieldSys_LaunchApplication +_0203EFE4: .word FieldSystem_LaunchApplication _0203EFE8: .word _020FA434 thumb_func_end sub_0203EFD4 @@ -1887,7 +1887,7 @@ sub_0203F074: ; 0x0203F074 ldr r1, _0203F0A4 ; =_020FA2F4 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, pc} nop @@ -1909,7 +1909,7 @@ sub_0203F0A8: ; 0x0203F0A8 stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1985,7 +1985,7 @@ _0203F152: b _0203F192 _0203F162: add r0, r4, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _0203F192 ldr r1, [r5, #4] @@ -2063,7 +2063,7 @@ sub_0203F1E8: ; 0x0203F1E8 add r1, r0, r1 str r1, [r2, #0x20] ldr r1, _0203F200 ; =_0210F9AC - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #1 pop {r3, pc} nop @@ -2075,7 +2075,7 @@ sub_0203F204: ; 0x0203F204 push {r3, lr} add r2, r1, #0 ldr r1, _0203F214 ; =_0210F99C - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #1 pop {r3, pc} nop @@ -2431,7 +2431,7 @@ sub_0203F4C8: ; 0x0203F4C8 ldr r1, _0203F4F4 ; =_020FA2C4 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication pop {r3, r4, r5, pc} nop _0203F4F4: .word _020FA2C4 @@ -2464,7 +2464,7 @@ sub_0203F4F8: ; 0x0203F4F8 ldr r1, _0203F538 ; =_020FA2B4 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -2491,7 +2491,7 @@ CreatePalPadWork: ; 0x0203F53C ldr r1, _0203F56C ; =_020FA2A4 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} .balign 4, 0 @@ -2500,12 +2500,12 @@ _0203F56C: .word _020FA2A4 thumb_func_start sub_0203F570 sub_0203F570: ; 0x0203F570 - ldr r3, _0203F578 ; =FieldSys_LaunchApplication + ldr r3, _0203F578 ; =FieldSystem_LaunchApplication ldr r1, _0203F57C ; =_02102830 add r2, r0, #0 bx r3 .balign 4, 0 -_0203F578: .word FieldSys_LaunchApplication +_0203F578: .word FieldSystem_LaunchApplication _0203F57C: .word _02102830 thumb_func_end sub_0203F570 @@ -2659,7 +2659,7 @@ _0203F6A2: cmp r6, #0xff bne _0203F6B2 add r0, r5, #0 - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get ldr r0, [r0, #0x10] b _0203F6BE _0203F6B2: @@ -2734,7 +2734,7 @@ _0203F73C: cmp r0, #0xff bne _0203F74C add r0, r6, #0 - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get ldr r6, [r0, #0x10] b _0203F75A _0203F74C: @@ -2809,7 +2809,7 @@ sub_0203F7B0: ; 0x0203F7B0 ldr r1, _0203F7F0 ; =_020FA294 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication pop {r3, r4, r5, pc} nop _0203F7E8: .word 0x0000066C @@ -2822,7 +2822,7 @@ sub_0203F7F4: ; 0x0203F7F4 push {r3, lr} add r2, r1, #0 ldr r1, _0203F804 ; =_020FA284 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #1 pop {r3, pc} nop @@ -2831,12 +2831,12 @@ _0203F804: .word _020FA284 thumb_func_start LaunchChooseStarterApp LaunchChooseStarterApp: ; 0x0203F808 - ldr r3, _0203F810 ; =FieldSys_LaunchApplication + ldr r3, _0203F810 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203F814 ; =sAppTemplate_ChooseStarter bx r3 .balign 4, 0 -_0203F810: .word FieldSys_LaunchApplication +_0203F810: .word FieldSystem_LaunchApplication _0203F814: .word sAppTemplate_ChooseStarter thumb_func_end LaunchChooseStarterApp @@ -2857,7 +2857,7 @@ sub_0203F818: ; 0x0203F818 add r1, r2, #0 ldr r2, [r4, #0xc] add r0, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 @@ -2929,7 +2929,7 @@ sub_0203F844: ; 0x0203F844 add r1, sp, #0 add r2, r4, #0 str r6, [r4, #0x3c] - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -2982,7 +2982,7 @@ sub_0203F8EC: ; 0x0203F8EC add r0, r5, #0 add r1, sp, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -2992,23 +2992,23 @@ _0203F960: .word _020FA334 thumb_func_start sub_0203F964 sub_0203F964: ; 0x0203F964 - ldr r3, _0203F96C ; =FieldSys_LaunchApplication + ldr r3, _0203F96C ; =FieldSystem_LaunchApplication ldr r1, _0203F970 ; =_020FA224 ldr r2, [r0, #0xc] bx r3 .balign 4, 0 -_0203F96C: .word FieldSys_LaunchApplication +_0203F96C: .word FieldSystem_LaunchApplication _0203F970: .word _020FA224 thumb_func_end sub_0203F964 thumb_func_start LaunchHOFCongratsApp LaunchHOFCongratsApp: ; 0x0203F974 - ldr r3, _0203F97C ; =FieldSys_LaunchApplication + ldr r3, _0203F97C ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203F980 ; =_020FA214 bx r3 .balign 4, 0 -_0203F97C: .word FieldSys_LaunchApplication +_0203F97C: .word FieldSystem_LaunchApplication _0203F980: .word _020FA214 thumb_func_end LaunchHOFCongratsApp @@ -3031,7 +3031,7 @@ _0203F9A2: ldr r1, _0203F9B0 ; =_020FA204 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -3040,12 +3040,12 @@ _0203F9B0: .word _020FA204 thumb_func_start LaunchCreditsApp LaunchCreditsApp: ; 0x0203F9B4 - ldr r3, _0203F9BC ; =FieldSys_LaunchApplication + ldr r3, _0203F9BC ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203F9C0 ; =_020FA1F4 bx r3 .balign 4, 0 -_0203F9BC: .word FieldSys_LaunchApplication +_0203F9BC: .word FieldSystem_LaunchApplication _0203F9C0: .word _020FA1F4 thumb_func_end LaunchCreditsApp @@ -3068,7 +3068,7 @@ sub_0203F9C4: ; 0x0203F9C4 str r0, [r2, #0xc] add r0, r3, #0 add r1, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -3138,7 +3138,7 @@ LaunchVoltorbFlipApp: ; 0x0203FA38 str r0, [r4, #0x10] add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} nop @@ -3160,7 +3160,7 @@ sub_0203FA8C: ; 0x0203FA8C str r0, [r4] add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} .balign 4, 0 @@ -3187,7 +3187,7 @@ sub_0203FAB4: ; 0x0203FAB4 add r2, r4, #0 str r0, [r4] add r0, r5, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} nop @@ -3242,7 +3242,7 @@ sub_0203FAE8: ; 0x0203FAE8 ldr r1, _0203FB5C ; =_0210159C add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} nop @@ -3270,7 +3270,7 @@ _0203FB74: str r0, [r4] add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, pc} nop @@ -3324,7 +3324,7 @@ sub_0203FB94: ; 0x0203FB94 ldr r1, _0203FC10 ; =_02103A1C add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} nop @@ -3360,23 +3360,23 @@ sub_0203FC14: ; 0x0203FC14 add r0, r5, #0 add r2, r4, #0 strb r7, [r4, #0xc] - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 _0203FC54: .word _020FA1C4 thumb_func_end sub_0203FC14 - thumb_func_start Fsys_LaunchPokeathlonCourseApplication -Fsys_LaunchPokeathlonCourseApplication: ; 0x0203FC58 - ldr r3, _0203FC60 ; =FieldSys_LaunchApplication + thumb_func_start FieldSystem_LaunchPokeathlonCourseApplication +FieldSystem_LaunchPokeathlonCourseApplication: ; 0x0203FC58 + ldr r3, _0203FC60 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203FC64 ; =_020FA244 bx r3 .balign 4, 0 -_0203FC60: .word FieldSys_LaunchApplication +_0203FC60: .word FieldSystem_LaunchApplication _0203FC64: .word _020FA244 - thumb_func_end Fsys_LaunchPokeathlonCourseApplication + thumb_func_end FieldSystem_LaunchPokeathlonCourseApplication thumb_func_start sub_0203FC68 sub_0203FC68: ; 0x0203FC68 @@ -3393,7 +3393,7 @@ sub_0203FC68: ; 0x0203FC68 stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -3415,7 +3415,7 @@ sub_0203FC90: ; 0x0203FC90 stmia r4!, {r0, r1} add r0, r6, #0 add r1, r3, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -3456,7 +3456,7 @@ _0203FCE0: ldr r1, _0203FD04 ; =_020FA474 add r0, r6, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -3465,11 +3465,11 @@ _0203FD04: .word _020FA474 thumb_func_start sub_0203FD08 sub_0203FD08: ; 0x0203FD08 - ldr r3, _0203FD10 ; =FieldSys_LaunchApplication + ldr r3, _0203FD10 ; =FieldSystem_LaunchApplication add r2, r1, #0 ldr r1, _0203FD14 ; =_020FA494 bx r3 .balign 4, 0 -_0203FD10: .word FieldSys_LaunchApplication +_0203FD10: .word FieldSystem_LaunchApplication _0203FD14: .word _020FA494 thumb_func_end sub_0203FD08 diff --git a/asm/unk_02054E00.s b/asm/unk_02054E00.s index 38e3933ae..6295eb99a 100644 --- a/asm/unk_02054E00.s +++ b/asm/unk_02054E00.s @@ -186,18 +186,18 @@ FieldSystem_SetSavedMusicId: ; 0x02054F28 .balign 4, 0 thumb_func_end FieldSystem_SetSavedMusicId - thumb_func_start Fsys_GetSavedMusicId -Fsys_GetSavedMusicId: ; 0x02054F3C + thumb_func_start FieldSystem_GetSavedMusicId +FieldSystem_GetSavedMusicId: ; 0x02054F3C push {r3, lr} ldr r0, [r0, #0xc] bl Save_LocalFieldData_Get bl LocalFieldData_GetMusicIdAddr ldrh r0, [r0] pop {r3, pc} - thumb_func_end Fsys_GetSavedMusicId + thumb_func_end FieldSystem_GetSavedMusicId - thumb_func_start Fsys_ClearSavedMusicId -Fsys_ClearSavedMusicId: ; 0x02054F4C + thumb_func_start FieldSystem_ClearSavedMusicId +FieldSystem_ClearSavedMusicId: ; 0x02054F4C push {r3, lr} ldr r0, [r0, #0xc] bl Save_LocalFieldData_Get @@ -206,7 +206,7 @@ Fsys_ClearSavedMusicId: ; 0x02054F4C strh r1, [r0] pop {r3, pc} .balign 4, 0 - thumb_func_end Fsys_ClearSavedMusicId + thumb_func_end FieldSystem_ClearSavedMusicId thumb_func_start FieldSystem_GetOverriddenMusicId FieldSystem_GetOverriddenMusicId: ; 0x02054F60 @@ -230,11 +230,11 @@ _02054F82: bl GetMapMusic add r5, r0, #0 add r0, r4, #0 - bl Fsys_GetSavedMusicId + bl FieldSystem_GetSavedMusicId cmp r0, #0 beq _02054F9E add r0, r4, #0 - bl Fsys_GetSavedMusicId + bl FieldSystem_GetSavedMusicId add r5, r0, #0 _02054F9E: add r0, r5, #0 @@ -418,8 +418,8 @@ _020550DC: .word SEQ_GS_EYE_J_SHOUNEN _020550E0: .word sTrainerEncounterMusicParam thumb_func_end Trainer_GetEncounterMusic - thumb_func_start Fsys_BeginFadeOutMusic -Fsys_BeginFadeOutMusic: ; 0x020550E4 + thumb_func_start FieldSystem_BeginFadeOutMusic +FieldSystem_BeginFadeOutMusic: ; 0x020550E4 push {r4, r5, r6, lr} add r5, r0, #0 add r6, r1, #0 @@ -439,7 +439,7 @@ Fsys_BeginFadeOutMusic: ; 0x020550E4 _0205510C: pop {r4, r5, r6, pc} .balign 4, 0 - thumb_func_end Fsys_BeginFadeOutMusic + thumb_func_end FieldSystem_BeginFadeOutMusic thumb_func_start sub_02055110 sub_02055110: ; 0x02055110 diff --git a/asm/unk_02056D7C.s b/asm/unk_02056D7C.s index 67a182d54..eac7de3bf 100644 --- a/asm/unk_02056D7C.s +++ b/asm/unk_02056D7C.s @@ -731,7 +731,7 @@ sub_020572AC: ; 0x020572AC _020572BC: cmp r0, #0 beq _020572CE - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar bl sub_0205CB38 cmp r0, #0 beq _020572CE diff --git a/asm/unk_02058AEC.s b/asm/unk_02058AEC.s index e08bf30d2..00d0aa362 100644 --- a/asm/unk_02058AEC.s +++ b/asm/unk_02058AEC.s @@ -75,7 +75,7 @@ sub_02058AEC: ; 0x02058AEC ldr r1, _02058B80 ; =_02103A1C add r0, r6, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication str r4, [r7] add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -203,7 +203,7 @@ _02058C5C: ldr r0, [r5, #0x24] ldr r1, _02058C7C ; =_0210159C add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication str r4, [r5, #4] pop {r3, r4, r5, pc} .balign 4, 0 @@ -215,7 +215,7 @@ sub_02058C80: ; 0x02058C80 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _02058C92 mov r0, #0 @@ -264,7 +264,7 @@ sub_02058CD8: ; 0x02058CD8 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _02058CEA mov r0, #0 @@ -1431,7 +1431,7 @@ _02059640: ldr r1, _0205964C ; =sub_02058D4C add r0, r5, #0 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask _0205964A: pop {r4, r5, r6, pc} .balign 4, 0 @@ -2312,7 +2312,7 @@ _02059CCC: b _02059D36 _02059CE8: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02059D36 ldr r0, [r4, #0x28] @@ -2390,7 +2390,7 @@ _02059D66: str r0, [r2, #0x28] ldr r0, [sp] ldr r1, _02059DAC ; =sub_02059B64 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask bl sub_0203E2F4 pop {r3, r4, r5, r6, r7, pc} _02059D9C: @@ -2856,7 +2856,7 @@ sub_0205A114: ; 0x0205A114 push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 bne _0205A13C bl sub_02037FF0 diff --git a/asm/unk_0205AC88.s b/asm/unk_0205AC88.s index aedcc8f12..46b17aaa6 100644 --- a/asm/unk_0205AC88.s +++ b/asm/unk_0205AC88.s @@ -123,7 +123,7 @@ sub_0205AD60: ; 0x0205AD60 add r5, r1, #0 ldr r0, [r5, r0] ldr r4, [r5] - bl Fsys_TaskIsRunning + bl FieldSystem_TaskIsRunning cmp r0, #0 bne _0205AD96 ldr r3, _0205AD98 ; =0x000004D4 diff --git a/asm/unk_0205CB48.s b/asm/unk_0205CB48.s index 328d976f1..d8a3a4e00 100644 --- a/asm/unk_0205CB48.s +++ b/asm/unk_0205CB48.s @@ -1250,7 +1250,7 @@ _0205D4DE: bl MapObject_GetFieldSysPtr mov r1, #7 str r0, [sp, #8] - bl Fsys_IsSavGymmickTypeEqualTo + bl FieldSystem_IsSavGymmickTypeEqualTo cmp r0, #0 beq _0205D52E add r0, r5, #0 diff --git a/asm/unk_02061284.s b/asm/unk_02061284.s index b162c3f57..ac75399ff 100644 --- a/asm/unk_02061284.s +++ b/asm/unk_02061284.s @@ -1762,7 +1762,7 @@ sub_02061E90: ; 0x02061E90 _02061EA6: add r0, r5, #0 bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r6, r0, #0 bl sub_0205DE98 cmp r0, #0 @@ -1892,7 +1892,7 @@ _02061F92: str r0, [sp, #4] ldr r0, [sp] bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar str r0, [sp, #0xc] bl GetPlayerXCoord str r0, [sp, #0x10] diff --git a/asm/unk_020632B0.s b/asm/unk_020632B0.s index 11a6106c7..d611bb726 100644 --- a/asm/unk_020632B0.s +++ b/asm/unk_020632B0.s @@ -1642,7 +1642,7 @@ _02063E9C: add r0, r5, #0 bl MapObject_GetFieldSysPtr add r1, r5, #0 - bl FieldSys_ApricornTree_TryGetApricorn + bl FieldSystem_ApricornTree_TryGetApricorn add r1, r6, #0 bl sub_020640A4 str r0, [r4] @@ -1667,7 +1667,7 @@ _02063ECC: add r0, r5, #0 bl MapObject_GetFieldSysPtr add r1, r5, #0 - bl FieldSys_ApricornTree_TryGetApricorn + bl FieldSystem_ApricornTree_TryGetApricorn add r1, r6, #0 bl sub_020640A4 str r0, [r4] @@ -1954,7 +1954,7 @@ _02064114: ldr r2, [sp, #0x40] ldr r3, [sp, #0x44] add r0, r5, #0 - bl FieldSys_SetEngagedTrainer + bl FieldSystem_SetEngagedTrainer add sp, #0x58 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -1971,7 +1971,7 @@ _02064134: ldr r2, [sp, #0x40] ldr r3, [sp, #0x44] add r0, r5, #0 - bl FieldSys_SetEngagedTrainer + bl FieldSystem_SetEngagedTrainer ldr r0, [sp, #0x30] str r0, [sp] ldr r0, [sp, #0x34] @@ -1984,7 +1984,7 @@ _02064134: ldr r2, [sp, #0x28] ldr r3, [sp, #0x2c] add r0, r5, #0 - bl FieldSys_SetEngagedTrainer + bl FieldSystem_SetEngagedTrainer add sp, #0x58 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -2023,7 +2023,7 @@ _02064180: ldr r2, [sp, #0x40] ldr r3, [sp, #0x44] add r0, r5, #0 - bl FieldSys_SetEngagedTrainer + bl FieldSystem_SetEngagedTrainer ldr r0, [sp, #0x18] str r0, [sp] ldr r0, [sp, #0x1c] @@ -2035,7 +2035,7 @@ _02064180: ldr r2, [sp, #0x10] ldr r3, [sp, #0x14] add r0, r5, #0 - bl FieldSys_SetEngagedTrainer + bl FieldSystem_SetEngagedTrainer add sp, #0x58 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/unk_020658D4.s b/asm/unk_020658D4.s index 7cbc28fc0..9acafb3f0 100644 --- a/asm/unk_020658D4.s +++ b/asm/unk_020658D4.s @@ -186,7 +186,7 @@ sub_020659CC: ; 0x020659CC add r0, #0xe8 ; ->followMon.effectTimer str r1, [r0] mov r0, #1 - lsl r0, r0, #8 ; ->followMon.fsys + lsl r0, r0, #8 ; ->followMon.fieldSystem str r1, [r4, r0] add r0, r4, #0 add r0, #0xec ; ->followMon.duration @@ -293,7 +293,7 @@ _02065AEA: cmp r0, #0 beq _02065B0E add r0, r4, #0 - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar bl PlayerAvatar_GetFacingDirection add r1, r0, #0 lsl r1, r1, #0x18 @@ -499,7 +499,7 @@ sub_02065C90: ; 0x02065C90 push {r4, r5, r6, lr} add r5, r1, #0 bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r4, r0, #0 bl PlayerAvatar_GetMapObject mov r1, #0x10 @@ -556,7 +556,7 @@ sub_02065CFC: ; 0x02065CFC push {r3, r4, r5, lr} add r5, r1, #0 bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar mov r1, #1 add r4, r0, #0 strb r1, [r5, #1] @@ -576,7 +576,7 @@ sub_02065D24: ; 0x02065D24 push {r4, r5, r6, lr} add r5, r1, #0 bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r6, r0, #0 beq _02065D54 bl GetPlayerXCoord @@ -604,7 +604,7 @@ sub_02065D58: ; 0x02065D58 push {r3, r4, r5, lr} add r5, r1, #0 bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r4, r0, #0 bl GetPlayerXCoord strh r0, [r5, #4] @@ -620,7 +620,7 @@ sub_02065D78: ; 0x02065D78 push {r4, lr} bl MapObject_GetFieldSysPtr add r4, r0, #0 - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r4, #0xe8 ldr r0, [r4] add r1, r0, #0 @@ -657,7 +657,7 @@ _02065DB2: sub_02065DB4: ; 0x02065DB4 push {r3, lr} bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar bl PlayerAvatar_GetMapObject bl MapObject_GetMovementCommand add r1, r0, #0 @@ -698,7 +698,7 @@ sub_02065DF4: ; 0x02065DF4 add r5, r0, #0 add r4, r1, #0 bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r7, r0, #0 add r0, r5, #0 bl MapObject_GetCurrentX @@ -850,7 +850,7 @@ sub_02065F44: ; 0x02065F44 sub sp, #8 add r5, r0, #0 bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r4, r0, #0 add r0, r5, #0 bl MapObject_GetCurrentX @@ -905,7 +905,7 @@ sub_02065FBC: ; 0x02065FBC push {r3, r4, r5, lr} add r5, r0, #0 bl MapObject_GetFieldSysPtr - bl FieldSys_GetPlayerAvatar + bl FieldSystem_GetPlayerAvatar add r4, r0, #0 add r0, r5, #0 bl MapObject_GetCurrentX diff --git a/asm/unk_02066EDC.s b/asm/unk_02066EDC.s index 42ca619ae..7593fcd13 100644 --- a/asm/unk_02066EDC.s +++ b/asm/unk_02066EDC.s @@ -93,7 +93,7 @@ _02066F64: ldr r1, _02066F8C ; =_0210159C add r0, r6, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication ldr r0, [r5, #0x14] str r4, [r0] mov r0, #1 @@ -107,7 +107,7 @@ sub_02066F90: ; 0x02066F90 push {r3, r4, r5, lr} add r5, r0, #0 add r0, r1, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _02066FA2 mov r0, #1 @@ -209,7 +209,7 @@ sub_02066FEC: ; 0x02066FEC ldr r1, _02067084 ; =_02103A1C add r0, r7, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication ldr r0, [r6, #0x14] str r4, [r0] mov r0, #3 @@ -224,7 +224,7 @@ sub_02067088: ; 0x02067088 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _0206709A mov r0, #3 @@ -363,7 +363,7 @@ sub_0206718C: ; 0x0206718C push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _0206719E mov r0, #1 diff --git a/asm/unk_02067A60.s b/asm/unk_02067A60.s index f80693aac..550ef2765 100644 --- a/asm/unk_02067A60.s +++ b/asm/unk_02067A60.s @@ -196,8 +196,8 @@ sub_02067BC0: ; 0x02067BC0 .balign 4, 0 thumb_func_end sub_02067BC0 - thumb_func_start Fsys_ClearFollowingTrainer -Fsys_ClearFollowingTrainer: ; 0x02067BD0 + thumb_func_start FieldSystem_ClearFollowingTrainer +FieldSystem_ClearFollowingTrainer: ; 0x02067BD0 push {r4, lr} ldr r0, [r0, #0xc] bl Save_VarsFlags_Get @@ -207,7 +207,7 @@ Fsys_ClearFollowingTrainer: ; 0x02067BD0 mov r1, #0 bl Save_VarsFlags_SetFollowerTrainerNum pop {r4, pc} - thumb_func_end Fsys_ClearFollowingTrainer + thumb_func_end FieldSystem_ClearFollowingTrainer thumb_func_start sub_02067BE8 sub_02067BE8: ; 0x02067BE8 @@ -329,7 +329,7 @@ _02067CAE: ldr r0, [r5, r0] mov r1, #1 mov r6, #2 - bl FsysUnkSub108_AddMonMood + bl FieldSystemUnkSub108_AddMonMood b _02067CD6 _02067CD4: mov r6, #1 diff --git a/asm/unk_02068DE0.s b/asm/unk_02068DE0.s index 275a203ad..116fcf6cc 100644 --- a/asm/unk_02068DE0.s +++ b/asm/unk_02068DE0.s @@ -232,8 +232,8 @@ InitViridianGym: ; 0x02068F54 .balign 4, 0 thumb_func_end InitViridianGym - thumb_func_start Fsys_IsSavGymmickTypeEqualTo -Fsys_IsSavGymmickTypeEqualTo: ; 0x02068F68 + thumb_func_start FieldSystem_IsSavGymmickTypeEqualTo +FieldSystem_IsSavGymmickTypeEqualTo: ; 0x02068F68 push {r4, lr} add r4, r1, #0 bl FieldSystem_GetSaveDataPtr @@ -246,4 +246,4 @@ Fsys_IsSavGymmickTypeEqualTo: ; 0x02068F68 _02068F80: mov r0, #0 pop {r4, pc} - thumb_func_end Fsys_IsSavGymmickTypeEqualTo + thumb_func_end FieldSystem_IsSavGymmickTypeEqualTo diff --git a/asm/unk_02068FC8.s b/asm/unk_02068FC8.s index d162f56ff..c7ad2fe54 100644 --- a/asm/unk_02068FC8.s +++ b/asm/unk_02068FC8.s @@ -86,7 +86,7 @@ sub_02068FC8: ; 0x02068FC8 add r0, r6, #0 add r1, sp, #0x84 add r2, sp, #0x78 - bl FieldSys_GetGameClearTime + bl FieldSystem_GetGameClearTime ldr r0, [r6, #0xc] bl Save_VarsFlags_Get bl CheckGameClearFlag @@ -660,7 +660,7 @@ _020694E4: b _0206951C _02069500: add r0, r4, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _0206951C add r4, #0x80 diff --git a/asm/unk_0206A360.s b/asm/unk_0206A360.s index 6dca4ffe1..7c0bad219 100644 --- a/asm/unk_0206A360.s +++ b/asm/unk_0206A360.s @@ -57,7 +57,7 @@ sub_0206A388: ; 0x0206A388 str r0, [r4] str r0, [r4, #4] ldr r0, [sp, #4] - bl FieldSys_GetBgConfigPtr + bl FieldSystem_GetBgConfigPtr str r0, [r4, #0xc] mov r0, #0 strh r0, [r4, #0x18] diff --git a/asm/unk_0206D494.s b/asm/unk_0206D494.s index fa07fedd3..4b981dd30 100644 --- a/asm/unk_0206D494.s +++ b/asm/unk_0206D494.s @@ -34,7 +34,7 @@ sub_0206D494: ; 0x0206D494 ldr r1, _0206D4DC ; =sub_0206D4E4 add r0, r6, #0 add r2, r4, #0 - bl FieldSys_CreateTask + bl FieldSystem_CreateTask ldr r0, _0206D4E0 ; =0x00000905 bl PlaySE mov r0, #1 @@ -835,13 +835,13 @@ _0206DB18: _0206DB24: .word gGameVersion thumb_func_end MonIsInGameTradePokeEx - thumb_func_start FieldSys_BugContest_Get -FieldSys_BugContest_Get: ; 0x0206DB28 + thumb_func_start FieldSystem_BugContest_Get +FieldSystem_BugContest_Get: ; 0x0206DB28 mov r1, #0x46 lsl r1, r1, #2 ldr r0, [r0, r1] bx lr - thumb_func_end FieldSys_BugContest_Get + thumb_func_end FieldSystem_BugContest_Get thumb_func_start BugContest_GetSportBallsAddr BugContest_GetSportBallsAddr: ; 0x0206DB30 @@ -849,12 +849,12 @@ BugContest_GetSportBallsAddr: ; 0x0206DB30 bx lr thumb_func_end BugContest_GetSportBallsAddr - thumb_func_start FieldSys_IncrementBugContestTimer -FieldSys_IncrementBugContestTimer: ; 0x0206DB34 + thumb_func_start FieldSystem_IncrementBugContestTimer +FieldSystem_IncrementBugContestTimer: ; 0x0206DB34 push {r4, r5, r6, lr} add r5, r0, #0 add r6, r1, #0 - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get add r4, r0, #0 beq _0206DB56 ldr r0, [r5, #0xc] @@ -867,7 +867,7 @@ FieldSys_IncrementBugContestTimer: ; 0x0206DB34 str r0, [r4, #0x1c] _0206DB56: pop {r4, r5, r6, pc} - thumb_func_end FieldSys_IncrementBugContestTimer + thumb_func_end FieldSystem_IncrementBugContestTimer thumb_func_start sub_0206DB58 sub_0206DB58: ; 0x0206DB58 @@ -931,7 +931,7 @@ sub_0206DBC0: ; 0x0206DBC0 bl TaskManager_GetEnv add r4, r0, #0 add r0, r7, #0 - bl FieldSys_BugContest_Get + bl FieldSystem_BugContest_Get add r5, r0, #0 add r0, r6, #0 bl TaskManager_GetStatePtr @@ -963,7 +963,7 @@ _0206DBFC: b _0206DC4C _0206DC10: add r0, r7, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _0206DC4C ldr r0, [r4, #8] @@ -1052,8 +1052,8 @@ _0206DCBA: _0206DCC0: .word 0x00004021 thumb_func_end ScrCmd_807 - thumb_func_start Fsys_InitMystriStageGymmick -Fsys_InitMystriStageGymmick: ; 0x0206DCC4 + thumb_func_start FieldSystem_InitMystriStageGymmick +FieldSystem_InitMystriStageGymmick: ; 0x0206DCC4 push {r4, lr} bl FieldSystem_GetSaveDataPtr bl Save_GetGymmickPtr @@ -1066,4 +1066,4 @@ Fsys_InitMystriStageGymmick: ; 0x0206DCC4 mov r1, #0 str r1, [r0] pop {r4, pc} - thumb_func_end Fsys_InitMystriStageGymmick + thumb_func_end FieldSystem_InitMystriStageGymmick diff --git a/asm/unk_02078834.s b/asm/unk_02078834.s index fe501c988..ab56432cc 100644 --- a/asm/unk_02078834.s +++ b/asm/unk_02078834.s @@ -272,7 +272,7 @@ _020789FE: b _02078B20 _02078A16: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02078B20 ldr r0, [r4, #0x10] @@ -291,7 +291,7 @@ _02078A2C: b _02078B20 _02078A3E: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02078B20 add r0, r4, #0 @@ -310,7 +310,7 @@ _02078A52: b _02078B20 _02078A66: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02078B20 mov r0, #2 @@ -329,7 +329,7 @@ _02078A7C: b _02078B20 _02078A8E: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02078B20 add r0, r4, #0 @@ -348,7 +348,7 @@ _02078AA2: b _02078B20 _02078AB6: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02078B20 mov r0, #2 @@ -367,7 +367,7 @@ _02078ACC: b _02078B20 _02078ADE: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02078B20 add r0, r4, #0 @@ -386,7 +386,7 @@ _02078AF2: b _02078B20 _02078B06: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02078B20 mov r0, #2 @@ -487,7 +487,7 @@ sub_02078B9C: ; 0x02078B9C str r0, [r2, #8] add r0, r5, #0 str r2, [r6, #0x10] - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication pop {r4, r5, r6, pc} .balign 4, 0 _02078BD0: .word _0210125C @@ -561,7 +561,7 @@ sub_02078C18: ; 0x02078C18 ldr r1, _02078C5C ; =_02101260 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} .balign 4, 0 @@ -603,7 +603,7 @@ sub_02078C74: ; 0x02078C74 ldr r1, _02078CB0 ; =_02101270 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} .balign 4, 0 @@ -649,7 +649,7 @@ sub_02078CC8: ; 0x02078CC8 ldr r1, _02078D0C ; =_021012A0 add r0, r5, #0 add r2, r4, #0 - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/asm/unk_02092B04.s b/asm/unk_02092B04.s index 55f830552..dd380033b 100644 --- a/asm/unk_02092B04.s +++ b/asm/unk_02092B04.s @@ -47,7 +47,7 @@ sub_02092B40: ; 0x02092B40 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _02092B52 mov r0, #0x18 diff --git a/asm/unk_02095DF4.s b/asm/unk_02095DF4.s index a08c1d276..d3e6669c5 100644 --- a/asm/unk_02095DF4.s +++ b/asm/unk_02095DF4.s @@ -91,14 +91,14 @@ _02095E72: strb r1, [r0, #0xf] ldr r1, [r4, #4] add r0, r5, #0 - bl Fsys_LaunchPokeathlonCourseApplication + bl FieldSystem_LaunchPokeathlonCourseApplication bl sub_0203E30C mov r0, #1 str r0, [r4] b _02095EF4 _02095E9E: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02095EF4 mov r0, #2 diff --git a/asm/unk_020961D8.s b/asm/unk_020961D8.s index ad8a56ca4..1d65a9646 100644 --- a/asm/unk_020961D8.s +++ b/asm/unk_020961D8.s @@ -107,7 +107,7 @@ _02096284: b _02096314 _020962A2: ldr r0, [r4] - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02096314 ldr r0, [r4] diff --git a/asm/unk_020968B0.s b/asm/unk_020968B0.s index fd6260713..d601c4b9a 100644 --- a/asm/unk_020968B0.s +++ b/asm/unk_020968B0.s @@ -50,7 +50,7 @@ sub_020968B0: ; 0x020968B0 ldr r1, _0209690C ; =_02108584 add r0, r5, #0 str r5, [r4, #0x24] - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication add r0, r4, #0 pop {r4, r5, r6, pc} nop diff --git a/asm/unk_02097024.s b/asm/unk_02097024.s index c4aa3c07f..ae96bc2d9 100644 --- a/asm/unk_02097024.s +++ b/asm/unk_02097024.s @@ -127,7 +127,7 @@ sub_020970E4: ; 0x020970E4 ldr r0, [r4, #0x28] ldr r1, _02097104 ; =_02108EA0 ldr r2, [r4, #0x24] - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication mov r0, #0 pop {r4, pc} .balign 4, 0 @@ -139,7 +139,7 @@ sub_02097108: ; 0x02097108 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x28] - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02097142 ldr r0, [r4, #0x24] @@ -173,7 +173,7 @@ sub_02097148: ; 0x02097148 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0x28] - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _020971A4 ldr r0, [r5, #0x2c] @@ -206,7 +206,7 @@ _0209718C: str r4, [r0, #4] ldr r0, [r5, #0x28] ldr r2, [r5, #0x24] - bl FieldSys_LaunchApplication + bl FieldSystem_LaunchApplication ldr r0, [r5, #0x24] mov r1, #3 str r1, [r0] @@ -224,7 +224,7 @@ sub_020971AC: ; 0x020971AC push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x28] - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _020971CE ldr r0, [r4, #0x30] @@ -246,7 +246,7 @@ sub_020971D4: ; 0x020971D4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x28] - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _020971E6 mov r0, #5 diff --git a/asm/unk_020977CC.s b/asm/unk_020977CC.s index 25a3a7a68..1a3de3067 100644 --- a/asm/unk_020977CC.s +++ b/asm/unk_020977CC.s @@ -124,7 +124,7 @@ _020978A2: b _020978C4 _020978AC: add r0, r4, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _020978C4 mov r0, #0 diff --git a/asm/unk_020979A8.s b/asm/unk_020979A8.s index cebf543ba..0b0af81bc 100644 --- a/asm/unk_020979A8.s +++ b/asm/unk_020979A8.s @@ -120,7 +120,7 @@ _02097A72: b _02097A94 _02097A7C: add r0, r4, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 beq _02097A94 mov r0, #0 diff --git a/asm/unk_02097BE0.s b/asm/unk_02097BE0.s index d93061f1c..9b9dac6b0 100644 --- a/asm/unk_02097BE0.s +++ b/asm/unk_02097BE0.s @@ -177,7 +177,7 @@ _02097CFC: b _02097D36 _02097D14: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02097D36 ldr r0, [r4, #8] diff --git a/asm/unk_02097D3C.s b/asm/unk_02097D3C.s index 7b68c6bee..b03cea52a 100644 --- a/asm/unk_02097D3C.s +++ b/asm/unk_02097D3C.s @@ -97,7 +97,7 @@ _02097DD0: b _02097E46 _02097DEC: add r0, r5, #0 - bl FieldSys_ApplicationIsRunning + bl FieldSystem_ApplicationIsRunning cmp r0, #0 bne _02097E46 ldr r0, [r4] diff --git a/include/battle/battle_setup.h b/include/battle/battle_setup.h index 3378b9e8c..49c559586 100644 --- a/include/battle/battle_setup.h +++ b/include/battle/battle_setup.h @@ -68,13 +68,13 @@ BOOL IsBattleResultWin(u32 a0); int sub_02052564(u32 a0); int sub_02052574(u32 a0); void BattleSetup_Delete(BattleSetup *setup); -BattleSetup *sub_02051AAC(HeapID heapId, FieldSystem *fsys); -void sub_02052444(BattleSetup *setup, FieldSystem *fsys); -void BattleSetup_InitFromFsys(BattleSetup *setup, FieldSystem *fsys); +BattleSetup *sub_02051AAC(HeapID heapId, FieldSystem *fieldSystem); +void sub_02052444(BattleSetup *setup, FieldSystem *fieldSystem); +void BattleSetup_InitFromFieldSystem(BattleSetup *setup, FieldSystem *fieldSystem); BattleSetup *BattleSetup_New(HeapID heapId, u32 battleFlags); -void sub_020522F0(BattleSetup *setup, FieldSystem *fsys, void *a1); -void sub_02051F2C(BattleSetup *setup, FieldSystem *fsys, int level); -void sub_020520B0(BattleSetup *setup, FieldSystem *fsys, Party *party, void *a4); +void sub_020522F0(BattleSetup *setup, FieldSystem *fieldSystem, void *a1); +void sub_02051F2C(BattleSetup *setup, FieldSystem *fieldSystem, int level); +void sub_020520B0(BattleSetup *setup, FieldSystem *fieldSystem, Party *party, void *a4); BattleSetup* BattleSetup_New_PalPark(HeapID heapId, int monsRemaining); void BattleSetup_AddMonToParty(BattleSetup* setup, Pokemon* mon, int battler); diff --git a/include/bug_contest.h b/include/bug_contest.h index 91d31e9d4..c9896c7c0 100644 --- a/include/bug_contest.h +++ b/include/bug_contest.h @@ -4,8 +4,8 @@ #include "bug_contest_internal.h" #include "script.h" -void FieldSys_StartBugContestTimer(FieldSystem *fsys); -BUGCONTEST *BugContest_New(FieldSystem *fsys, u32 weekday); +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); diff --git a/include/choose_starter.h b/include/choose_starter.h index a05d74298..b7672a881 100644 --- a/include/choose_starter.h +++ b/include/choose_starter.h @@ -3,6 +3,6 @@ #include "script.h" -void LaunchStarterChoiceScene(FieldSystem *fsys); +void LaunchStarterChoiceScene(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_CHOOSE_STARTER_H diff --git a/include/encounter.h b/include/encounter.h index 2cd503e89..2f2242e23 100644 --- a/include/encounter.h +++ b/include/encounter.h @@ -21,19 +21,19 @@ typedef struct WildEncounterWork { BattleSetup *setup; } WILD_ENCOUNTER; -void sub_02050B08(FieldSystem *fsys, BattleSetup *setup); +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 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 *fsys, TaskManager *taskManager, BattleSetup *setup); -void sub_0205239C(BattleSetup *setup, FieldSystem *fsys); +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 *fsys, BattleSetup *setup); -void sub_020515FC(FieldSystem *fsys, Party *party, int battleFlags); -void sub_02051598(FieldSystem *fsys, void *a1, int battleFlags); +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); #endif //POKEHEARTGOLD_ENCOUNTER_H diff --git a/include/field_alph_checks.h b/include/field_alph_checks.h index 6ba29d9af..fc5926d63 100644 --- a/include/field_alph_checks.h +++ b/include/field_alph_checks.h @@ -3,8 +3,8 @@ #include "script.h" -BOOL CheckUseEscapeRopeInAlphChamber(FieldSystem* fsys); -BOOL CheckUseFlashInAlphChamber(FieldSystem* fsys); -BOOL CheckUseWaterStoneInAlphChamber(FieldSystem* fsys); +BOOL CheckUseEscapeRopeInAlphChamber(FieldSystem* fieldSystem); +BOOL CheckUseFlashInAlphChamber(FieldSystem* fieldSystem); +BOOL CheckUseWaterStoneInAlphChamber(FieldSystem* fieldSystem); #endif //POKEHEARTGOLD_FIELD_ALPH_CHECKS_H diff --git a/include/field_follow_poke.h b/include/field_follow_poke.h index 8a8494be5..34fa62e00 100644 --- a/include/field_follow_poke.h +++ b/include/field_follow_poke.h @@ -7,7 +7,7 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int direction, u32 mapno); void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno); -LocalMapObject *FollowingPokemon_GetMapObject(FieldSystem *fsys); +LocalMapObject *FollowingPokemon_GetMapObject(FieldSystem *fieldSystem); u32 FollowingPokemon_GetSpriteID(int species, u16 form, u32 gender); void sub_02069DC8(LocalMapObject *mapObject, BOOL enable_bit); void sub_02069DEC(LocalMapObject *mapObject, BOOL enable_bit); @@ -20,21 +20,21 @@ 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 FollowPokeFsysParamSet(FieldSystem *fsys, int species, u8 form, BOOL shiny, u8 gender); +void FollowPokeFieldSystemParamSet(FieldSystem *fieldSystem, int species, u8 form, BOOL shiny, u8 gender); u8 GetFollowPokeSizeParamBySpecies(int species); int FollowPokeObj_GetSpecies(LocalMapObject *mapObject); -BOOL FollowingPokemon_IsActive(FieldSystem *fsys); -BOOL sub_02069FB0(FieldSystem *fsys); -BOOL GetFollowPokePermission(FieldSystem *fsys); +BOOL FollowingPokemon_IsActive(FieldSystem *fieldSystem); +BOOL sub_02069FB0(FieldSystem *fieldSystem); +BOOL GetFollowPokePermission(FieldSystem *fieldSystem); BOOL GetFollowPokePermissionBySpeciesAndMap(int species, u32 mapno); void sub_0206A040(LocalMapObject *mapObject, BOOL enable_bit); -void sub_0206A054(FieldSystem *fsys); -struct FieldSystemUnk108 *FsysUnkSub108_Alloc(HeapID heapId); -void FsysUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by); -void FsysUnkSub108_SetMonMood(struct FieldSystemUnk108 *unk, s8 mood); -s8 FsysUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk); -void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *mon, u16 species, u32 personality); -void FsysUnkSub108_MoveMoodTowardsNeutral(struct FieldSystemUnk108 *a0); +void sub_0206A054(FieldSystem *fieldSystem); +struct FieldSystemUnk108 *FieldSystemUnkSub108_Alloc(HeapID heapId); +void FieldSystemUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by); +void FieldSystemUnkSub108_SetMonMood(struct FieldSystemUnk108 *unk, s8 mood); +s8 FieldSystemUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk); +void FieldSystemUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *mon, u16 species, u32 personality); +void FieldSystemUnkSub108_MoveMoodTowardsNeutral(struct FieldSystemUnk108 *a0); int SpeciesToOverworldModelIndexOffset(int species); int OverworldModelLookupFormCount(int species); BOOL OverworldModelLookupHasFemaleForm(int species); diff --git a/include/field_map_object.h b/include/field_map_object.h index a8ca6e4b0..02150b0c8 100644 --- a/include/field_map_object.h +++ b/include/field_map_object.h @@ -42,7 +42,7 @@ struct MapObjectManager { //declared field_system.h u8 unk18[4]; u8 unk1C[0x124-0x1C]; LocalMapObject* objects; - FieldSystem* fsys; + FieldSystem* fieldSystem; }; // size: 0x12c typedef void (*LocalMapObject_UnkCallback)(LocalMapObject* object); @@ -154,7 +154,7 @@ typedef enum MapObjectFlagBits { struct MapObjectInitArgs; // FIXME: Some of these declarations are static and don't belong in here. -MapObjectManager *sub_0205E0BC(FieldSystem *fsys, int num, HeapID heapId); +MapObjectManager *sub_0205E0BC(FieldSystem *fieldSystem, int num, HeapID heapId); void MapObjectManager_Delete(MapObjectManager *man); void sub_0205E104(MapObjectManager* manager, u32 a1, u32 a2, u32 num_object_events, ObjectEvent* object_events); MapObjectManager* MapObjectManager_New(u32 count); @@ -171,9 +171,9 @@ void MapObjectManager_RemoveAllActiveObjects(MapObjectManager *man); void sub_0205E4C8(MapObjectManager* manager); void sub_0205E520(MapObjectManager* manager); void sub_0205E580(MapObjectManager* manager); -void Fsys_SyncMapObjectsToSaveEx(FieldSystem *fsys, MapObjectManager *mapObjectMan, struct SavedMapObject *saveObj, int objNum); +void FieldSystem_SyncMapObjectsToSaveEx(FieldSystem *fieldSystem, MapObjectManager *mapObjectMan, struct SavedMapObject *saveObj, int objNum); void MapObjectManager_RestoreFromSave(MapObjectManager *mapObjectMan, SavedMapObject *list, u32 numObj); -void sub_0205E680(FieldSystem* fsys, LocalMapObject* local_object, SavedMapObject* saved_object); +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); void InitMapObjectsFromEventTemplates(MapObjectManager* man, u32 mapId, u32 nObjs, ObjectEvent* dest); @@ -181,7 +181,7 @@ void sub_0205EA08(struct MapObjectInitArgs* args); LocalMapObject* MapObjectManager_GetFirstInactiveObject(MapObjectManager*); LocalMapObject* sub_0205EA98(MapObjectManager*, u32, u32); void sub_0205EAF0(MapObjectManager* manager, LocalMapObject* object); -void MapObject_InitFromObjectEventTemplate(LocalMapObject* object, ObjectEvent* template, FieldSystem* fsys); +void MapObject_InitFromObjectEventTemplate(LocalMapObject* object, ObjectEvent* template, FieldSystem* fieldSystem); void MapObject_SetPositionVecFromTemplate(LocalMapObject* object, ObjectEvent* template); void sub_0205EC90(LocalMapObject* object, MapObjectManager* manager); void sub_0205ECE0(LocalMapObject* object); @@ -194,7 +194,7 @@ BOOL sub_0205EEF4(MapObjectManager*, LocalMapObject**, int*, u32); void sub_0205EF48(LocalMapObject* object); void sub_0205EF5C(LocalMapObject* object); void sub_0205EF6C(LocalMapObject* object); -u32 ResolveObjectGfxId(FieldSystem* fsys, int a1); +u32 ResolveObjectGfxId(FieldSystem* fieldSystem, int a1); void sub_0205EFA4(LocalMapObject* object); void sub_0205EFB4(LocalMapObject* object); BOOL MapObject_ScriptIdIsFFFF(LocalMapObject* object); diff --git a/include/field_move.h b/include/field_move.h index 4ad690595..1d8ec08b2 100644 --- a/include/field_move.h +++ b/include/field_move.h @@ -5,6 +5,6 @@ #include "party_menu.h" void *PartyMenu_GetFieldMoveFunc(int funcType, int fieldMoveIdx); -void Fsys_MakeFieldMoveCheckData(FieldSystem *fsys, struct FieldMoveCheckData *checkData); +void FieldSystem_MakeFieldMoveCheckData(FieldSystem *fieldSystem, struct FieldMoveCheckData *checkData); #endif //POKEHEARTGOLD_FIELD_MOVE_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 01f18f036..341ba3d25 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -103,7 +103,7 @@ void PlayerAvatar_ToggleAutomaticHeightUpdating(PlayerAvatar *avatar, u8 unkA); void PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(PlayerAvatar *avatar, BOOL unkA); u32 PlayerAvatar_GetSpriteByStateAndGender(u32 unkA, BOOL unkB); u32 PlayerAvatar_GetTransitionBits(u32 unkA); -PlayerAvatar *FieldSys_GetPlayerAvatar(FieldSystem *fsys); +PlayerAvatar *FieldSystem_GetPlayerAvatar(FieldSystem *fieldSystem); void sub_0205CA20(PlayerAvatar *avatar, BOOL unkA); BOOL sub_0205CA38(PlayerAvatar *avatar); void sub_0205CA4C(PlayerAvatar *avatar, BOOL unkA); diff --git a/include/field_system.h b/include/field_system.h index c7f04c57b..a95e96108 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -13,7 +13,7 @@ typedef struct FieldSystem FieldSystem; typedef struct TaskManager TaskManager; -typedef struct FsysUnkSub2C FsysUnkSub2C; +typedef struct FieldSystemUnkSub2C FieldSystemUnkSub2C; typedef struct LocalMapObject LocalMapObject; typedef struct FieldMapObject FieldMapObject; typedef struct PlayerAvatar PlayerAvatar; @@ -97,7 +97,7 @@ struct FieldSystemUnkSub68 { u8 unk13_7:1; }; -typedef struct FsysUnkSub4 { +typedef struct FieldSystemUnkSub4 { u32 unk0; u32 unk4; u32 unk8; @@ -106,11 +106,11 @@ typedef struct FsysUnkSub4 { u32 unk14; u32 unk18; u32 unk1c; -} FsysUnkSub4; +} FieldSystemUnkSub4; struct FieldSystem { struct FieldSystemUnkSub0 *unk0; - FsysUnkSub4 *unk4; + FieldSystemUnkSub4 *unk4; BgConfig *bgConfig; SaveData *savedata; TaskManager *taskman; @@ -120,7 +120,7 @@ struct FieldSystem { Location *location; Camera *camera; void *unk28; - FsysUnkSub2C *unk2C; + FieldSystemUnkSub2C *unk2C; MAPMATRIX *mapMatrix; u8 filler34[0x8]; MapObjectManager *mapObjectMan; @@ -181,24 +181,24 @@ BOOL Field_Continue_AppInit(OVY_MANAGER *man, int *unused); BOOL Field_NewGame_AppInit(OVY_MANAGER *man, int *unused); BOOL Field_AppExec(OVY_MANAGER *man, int *unused); BOOL Field_AppExit(OVY_MANAGER *man, int *unused); -void sub_0203DEF0(FieldSystem *fsys); -void sub_0203DF34(FieldSystem *fsys); -u8 sub_0203DF3C(FieldSystem *fsys); -void sub_0203DF64(FieldSystem *fsys, int a1); -BOOL sub_0203DF7C(FieldSystem *fsys); -BOOL sub_0203DF8C(FieldSystem *fsys); -BOOL sub_0203DFA4(FieldSystem *fsys); -void FieldSys_LaunchApplication(FieldSystem *fsys, const OVY_MGR_TEMPLATE *template, void *parentWork); -FieldSystem *FieldSys_New(OVY_MANAGER *man); -void FieldSys_Delete(OVY_MANAGER *man); -BOOL sub_0203E13C(FieldSystem *fsys); -void sub_0203E15C(FieldSystem *fsys); +void sub_0203DEF0(FieldSystem *fieldSystem); +void sub_0203DF34(FieldSystem *fieldSystem); +u8 sub_0203DF3C(FieldSystem *fieldSystem); +void sub_0203DF64(FieldSystem *fieldSystem, int a1); +BOOL sub_0203DF7C(FieldSystem *fieldSystem); +BOOL sub_0203DF8C(FieldSystem *fieldSystem); +BOOL sub_0203DFA4(FieldSystem *fieldSystem); +void FieldSystem_LaunchApplication(FieldSystem *fieldSystem, const OVY_MGR_TEMPLATE *template, void *parentWork); +FieldSystem *FieldSystem_New(OVY_MANAGER *man); +void FieldSystem_Delete(OVY_MANAGER *man); +BOOL sub_0203E13C(FieldSystem *fieldSystem); +void sub_0203E15C(FieldSystem *fieldSystem); void sub_0203E2F4(); void sub_0203E30C(); int sub_0203E324(); -void sub_0203E33C(FieldSystem *fsys, int a1); -BgConfig *FieldSys_GetBgConfigPtr(FieldSystem *fsys); -SaveData *FieldSystem_GetSaveDataPtr(FieldSystem *fsys); +void sub_0203E33C(FieldSystem *fieldSystem, int a1); +BgConfig *FieldSystem_GetBgConfigPtr(FieldSystem *fieldSystem); +SaveData *FieldSystem_GetSaveDataPtr(FieldSystem *fieldSystem); void sub_0203E348(); void sub_0203E354(); diff --git a/include/field_take_photo.h b/include/field_take_photo.h index 06bf9781c..d1c1a17a9 100644 --- a/include/field_take_photo.h +++ b/include/field_take_photo.h @@ -3,7 +3,7 @@ #include "script.h" -void FieldSys_TakePhoto(FieldSystem *fsys, u16 photo_id); -void sub_0206A860(FieldSystem *fsys); +void FieldSystem_TakePhoto(FieldSystem *fieldSystem, u16 photo_id); +void sub_0206A860(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_FIELD_TAKE_PHOTO_H diff --git a/include/field_use_item.h b/include/field_use_item.h index 0a536bfc2..14ebd0cc0 100644 --- a/include/field_use_item.h +++ b/include/field_use_item.h @@ -20,7 +20,7 @@ struct ItemCheckUseData { u16 facingTile; u16 standingTile; PlayerAvatar *playerAvatar; - FieldSystem *fsys; + FieldSystem *fieldSystem; }; struct AlphItemUseData { @@ -31,10 +31,10 @@ struct AlphItemUseData { u16 var_8003; }; -typedef void *(*FieldApplicationWorkCtor)(FieldSystem *fsys); +typedef void *(*FieldApplicationWorkCtor)(FieldSystem *fieldSystem); struct ItemFieldUseData { - FieldSystem *fsys; // 00 + FieldSystem *fieldSystem; // 00 struct ItemCheckUseData dat; // 04 FieldApplicationWorkCtor ctor; // 1C void *work; // 20 @@ -61,7 +61,7 @@ struct UseItemInPartyTaskEnv { struct UnkStruct_0202E474 *unk10; u32 unk14; void *unk18; - FieldSystem *fsys; + FieldSystem *fieldSystem; void *unk20; u8 unk24; u8 unk25; @@ -79,8 +79,8 @@ struct RegisteredKeyItemUseMessagePrintTaskData { }; void *GetItemFieldUseFunc(int funcType, int itemType); -void ItemCheckUseData_Init(FieldSystem *fsys, struct ItemCheckUseData *dat); +void ItemCheckUseData_Init(FieldSystem *fieldSystem, struct ItemCheckUseData *dat); BOOL Leftover_CanPlantBerry(const struct ItemCheckUseData *data); -int UseRegisteredItemButtonInField(FieldSystem *fsys, u8 slot); +int UseRegisteredItemButtonInField(FieldSystem *fieldSystem, u8 slot); #endif //POKEHEARTGOLD_FIELD_USE_ITEM_H diff --git a/include/field_warp_tasks.h b/include/field_warp_tasks.h index 9cdf5698b..8e3cc616d 100644 --- a/include/field_warp_tasks.h +++ b/include/field_warp_tasks.h @@ -3,19 +3,19 @@ #include "task.h" -void sub_02053018(FieldSystem *fsys); -void sub_02053038(FieldSystem *fsys, BOOL isConnection); -TaskManager *CallFieldTask_NewGame(FieldSystem *fsys); -TaskManager *CallFieldTask_ContinueGame_Normal(FieldSystem *fsys); -TaskManager *CallFieldTask_ContinueGame_CommError(FieldSystem *fsys); +void sub_02053018(FieldSystem *fieldSystem); +void sub_02053038(FieldSystem *fieldSystem, BOOL isConnection); +TaskManager *CallFieldTask_NewGame(FieldSystem *fieldSystem); +TaskManager *CallFieldTask_ContinueGame_Normal(FieldSystem *fieldSystem); +TaskManager *CallFieldTask_ContinueGame_CommError(FieldSystem *fieldSystem); void sub_020537A8(TaskManager *taskManager, Location *location); void sub_020537F0(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, int direction); void CallTask_ScriptWarp(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, int direction); -TaskManager *sub_020538C0(FieldSystem *fsys, u32 mapId, int warpId, int x, int y, int direction); +TaskManager *sub_020538C0(FieldSystem *fieldSystem, u32 mapId, int warpId, int x, int y, int direction); void sub_02053908(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, int direction); void sub_02053B04(TaskManager *taskManager, Location *location, int a2); -TaskManager *sub_02053E08(FieldSystem *fsys, u32 mapId, int warpId); -void sub_02053F14(FieldSystem *fsys); +TaskManager *sub_02053E08(FieldSystem *fieldSystem, u32 mapId, int warpId); +void sub_02053F14(FieldSystem *fieldSystem); void sub_02054030(TaskManager *taskManager); void sub_0205412C(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, int direction); void sub_02054190(TaskManager *taskManager); diff --git a/include/fieldmap.h b/include/fieldmap.h index 8dfcfdb4f..82ea71034 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -11,35 +11,35 @@ typedef struct HiddenItemResponse { u8 dummy; } HiddenItemResponse; -void StartMapSceneScript(FieldSystem *fsys, u16 script, LocalMapObject *lastTalked); -void FieldSys_SetEngagedTrainer(FieldSystem *fsys, LocalMapObject *obj, int a2, int a3, int a4, int trainerId, int encounterType, int idx); +void StartMapSceneScript(FieldSystem *fieldSystem, u16 script, LocalMapObject *lastTalked); +void FieldSystem_SetEngagedTrainer(FieldSystem *fieldSystem, LocalMapObject *obj, int a2, int a3, int a4, int trainerId, int encounterType, int idx); void QueueScript(TaskManager *taskman, u16 script, LocalMapObject *lastTalked, void *a3); void StartScriptFromMenu(TaskManager *taskman, u16 script, LocalMapObject *lastTalked); BOOL Task_RunScripts(TaskManager *taskman); ScriptEnvironment *ScriptEnvironment_New(void); void DestroyScriptContext(ScriptContext *ctx); -void SetupScriptEngine(FieldSystem *fsys, ScriptEnvironment *env, u16 script, LocalMapObject *lastTalked, void* a4); -ScriptContext *CreateScriptContext(FieldSystem *fsys, u16 script); -void SetUpScriptContextForMap(FieldSystem *fsys, ScriptContext *ctx, u16 scriptId, u32 unused_r3); -u16 LoadScriptsAndMessagesByMapId(FieldSystem *fsys, ScriptContext *ctx, u16 scriptId); -void LoadScriptsAndMessagesParameterized(FieldSystem *fsys, ScriptContext *ctx, int scriptBank, u32 msgBank); -void LoadScriptsAndMessagesForCurrentMap(FieldSystem *fsys, ScriptContext *ctx); -void *FieldSysGetAttrAddrInternal(ScriptEnvironment *fsys, enum ScriptEnvField field); -void *FieldSysGetAttrAddr(FieldSystem *fsys, enum ScriptEnvField field); -void sub_0204031C(FieldSystem *fsys); +void SetupScriptEngine(FieldSystem *fieldSystem, ScriptEnvironment *env, u16 script, LocalMapObject *lastTalked, void* a4); +ScriptContext *CreateScriptContext(FieldSystem *fieldSystem, u16 script); +void SetUpScriptContextForMap(FieldSystem *fieldSystem, ScriptContext *ctx, u16 scriptId, u32 unused_r3); +u16 LoadScriptsAndMessagesByMapId(FieldSystem *fieldSystem, ScriptContext *ctx, u16 scriptId); +void LoadScriptsAndMessagesParameterized(FieldSystem *fieldSystem, ScriptContext *ctx, int scriptBank, u32 msgBank); +void LoadScriptsAndMessagesForCurrentMap(FieldSystem *fieldSystem, ScriptContext *ctx); +void *FieldSysGetAttrAddrInternal(ScriptEnvironment *fieldSystem, enum ScriptEnvField field); +void *FieldSysGetAttrAddr(FieldSystem *fieldSystem, enum ScriptEnvField field); +void sub_0204031C(FieldSystem *fieldSystem); void ScriptRunByIndex(ScriptContext *ctx, int idx); u8 *LoadScriptsForCurrentMap(u32 mapId); u32 GetCurrentMapMessageBank(u32 mapId); -u16* GetVarPointer(FieldSystem* fsys, u16 varId); -u16 VarGet(FieldSystem* fsys, u16 varId); -BOOL VarSet(FieldSystem* fsys, u16 varId, u16 value); -u16 VarGetObjectEventGraphicsId(FieldSystem* fsys, u16 objId); -BOOL FlagGet(FieldSystem *fsys, u16 flagId); -void FlagSet(FieldSystem *fsys, u16 flagId); -void FlagClear(FieldSystem *fsys, u16 flagId); -void ClearTempFieldEventData(FieldSystem *fsys); -void ClearDailyFlags(FieldSystem *fsys); -void FieldMoveArgsSet(FieldSystem *fsys, u16 v8000, u16 v8001, u16 v8002, u16 v8003); +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); +void ClearTempFieldEventData(FieldSystem *fieldSystem); +void ClearDailyFlags(FieldSystem *fieldSystem); +void FieldMoveArgsSet(FieldSystem *fieldSystem, u16 v8000, u16 v8001, u16 v8002, u16 v8003); u16 ScriptNumToTrainerNum(u16 script); BOOL ScriptNoToDoublePartnerNo(u16 a0); BOOL TrainerNumIsDouble(u32 trainer); @@ -50,14 +50,14 @@ u16 HiddenItemScriptNoToFlagId(u16 script); u16 HiddenItemScriptNoToHiddenItemIdx(u16 script); u8 sub_02040578(u16 script); BOOL GetHiddenItemParams(ScriptEnvironment *env, u16 script); -HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fsys, HeapID heapId); -void RunInitScript(FieldSystem *fsys); -void StartMapLoadScript(FieldSystem *fsys, u16 script); -BOOL TryStartMapScriptByType(FieldSystem *fsys, u8 type); -BOOL MapSceneScriptCheck(FieldSystem *fsys); +HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fieldSystem, HeapID heapId); +void RunInitScript(FieldSystem *fieldSystem); +void StartMapLoadScript(FieldSystem *fieldSystem, u16 script); +BOOL TryStartMapScriptByType(FieldSystem *fieldSystem, u8 type); +BOOL MapSceneScriptCheck(FieldSystem *fieldSystem); u16 GetMapLoadScriptId(u8 *header, u8 type); -u16 GetMapSceneScriptId(FieldSystem *fsys, u8 *header, u8 type); -void* FieldSysGetAttrAddr(FieldSystem *fsys, enum ScriptEnvField field); +u16 GetMapSceneScriptId(FieldSystem *fieldSystem, u8 *header, u8 type); +void* FieldSysGetAttrAddr(FieldSystem *fieldSystem, enum ScriptEnvField field); BOOL sub_0203BC10(FieldSystem *); diff --git a/include/get_egg.h b/include/get_egg.h index 5d41e7b2e..e7cb953bf 100644 --- a/include/get_egg.h +++ b/include/get_egg.h @@ -13,7 +13,7 @@ u8 Save_Daycare_BufferGrowthAndNick(Daycare *dayCare, u32 slot, MessageFormat *m void Save_Daycare_ResetEggStats(Daycare *dayCare); void SetEggStats(Pokemon *mon, int species, u8 metLocation, PlayerProfile *profile, int a4, int a5); void GiveEggToPlayer(Daycare *dayCare, Party *party, PlayerProfile* profile); -BOOL HandleDaycareStep(Daycare *dayCare, Party *party, FieldSystem *fsys); +BOOL HandleDaycareStep(Daycare *dayCare, Party *party, FieldSystem *fieldSystem); Pokemon *sub_0206CE44(Party *party); void Save_Daycare_BufferStoredMonNicks(Daycare *dayCare, MessageFormat *msgFmt); void Save_Daycare_BufferMonStats(Daycare *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MessageFormat *msgFmt); diff --git a/include/map_events.h b/include/map_events.h index c7bf950ca..929ab8751 100644 --- a/include/map_events.h +++ b/include/map_events.h @@ -9,22 +9,22 @@ void Field_AllocateMapEvents(FieldSystem *work, HeapID heapId); void Field_FreeMapEvents(FieldSystem *work); void Field_InitMapEvents(FieldSystem *work, u32 mapno); -void Field_InitMapObjectsFromZoneEventData(FieldSystem *fsys); -BG_EVENT *Field_GetBgEvents(FieldSystem *fsys); -u32 Field_GetNumBgEvents(const FieldSystem *fsys); -const WARP_EVENT *Field_GetWarpEventI(const FieldSystem *fsys, u32 warpno); -int Field_GetWarpEventAtXYPos(const FieldSystem *fsys, int x, int y); -u32 Field_GetNumCoordEvents(const FieldSystem *fsys); -const COORD_EVENT *Field_GetCoordEvents(const FieldSystem *fsys); -u32 Field_GetNumObjectEvents(const FieldSystem *fsys); -const ObjectEvent *Field_GetObjectEvents(const FieldSystem *fsys); -BOOL Field_SetEventDefaultXYPos(FieldSystem *fsys, int id, u16 x, u16 y); -BOOL Field_SetEventDefaultDirection(FieldSystem *fsys, int id, u16 dirn); -BOOL Field_SetEventDefaultMovement(FieldSystem *fsys, int id, u16 mvt); -BOOL Field_SetWarpXYPos(FieldSystem *fsys, int warpno, u16 x, u16 y); -BOOL Field_SetBgEventXYPos(FieldSystem *fsys, int bgno, u32 x, u32 y); +void Field_InitMapObjectsFromZoneEventData(FieldSystem *fieldSystem); +BG_EVENT *Field_GetBgEvents(FieldSystem *fieldSystem); +u32 Field_GetNumBgEvents(const FieldSystem *fieldSystem); +const WARP_EVENT *Field_GetWarpEventI(const FieldSystem *fieldSystem, u32 warpno); +int Field_GetWarpEventAtXYPos(const FieldSystem *fieldSystem, int x, int y); +u32 Field_GetNumCoordEvents(const FieldSystem *fieldSystem); +const COORD_EVENT *Field_GetCoordEvents(const FieldSystem *fieldSystem); +u32 Field_GetNumObjectEvents(const FieldSystem *fieldSystem); +const ObjectEvent *Field_GetObjectEvents(const FieldSystem *fieldSystem); +BOOL Field_SetEventDefaultXYPos(FieldSystem *fieldSystem, int id, u16 x, u16 y); +BOOL Field_SetEventDefaultDirection(FieldSystem *fieldSystem, int id, u16 dirn); +BOOL Field_SetEventDefaultMovement(FieldSystem *fieldSystem, int id, u16 mvt); +BOOL Field_SetWarpXYPos(FieldSystem *fieldSystem, int warpno, u16 x, u16 y); +BOOL Field_SetBgEventXYPos(FieldSystem *fieldSystem, int bgno, u32 x, u32 y); void WildEncounters_ReadFromNarc(ENC_DATA *encData, u32 mapno); -ENC_DATA *MapEvents_GetLoadedEncTable(FieldSystem *fsys); -u8 *MapEvents_GetScriptHeader(FieldSystem *fsys); +ENC_DATA *MapEvents_GetLoadedEncTable(FieldSystem *fieldSystem); +u8 *MapEvents_GetScriptHeader(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_MAP_EVENTS_H diff --git a/include/mart.h b/include/mart.h index 16f4b5005..a88c05639 100644 --- a/include/mart.h +++ b/include/mart.h @@ -8,6 +8,6 @@ struct MartItem { u16 cost; }; -void InitMartUI(TaskManager *taskManager, FieldSystem *fsys, const u16 *items, int kind, int buy_sell, int deco_which, const struct MartItem *price_overrides); +void InitMartUI(TaskManager *taskManager, FieldSystem *fieldSystem, const u16 *items, int kind, int buy_sell, int deco_which, const struct MartItem *price_overrides); #endif //POKEHEARTGOLD_MART_H diff --git a/include/npc_trade.h b/include/npc_trade.h index ebf3af1de..5506e9d44 100644 --- a/include/npc_trade.h +++ b/include/npc_trade.h @@ -41,13 +41,13 @@ typedef struct NPCTradeAppData { NPCTradeAppData *NPCTradeApp_Init(HeapID heapId, u32 tradeno); void NPCTradeApp_Delete(NPCTradeAppData *work); -void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fsys, u8 tradeno, u8 level, u16 mapno); +void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fieldSystem, u8 tradeno, u8 level, u16 mapno); Mail *NPCTrade_MakeKenyaMail(void); -int NPCTrade_CanGiveUpLoanMon(FieldSystem *fsys, u8 tradeno, u8 idx); +int NPCTrade_CanGiveUpLoanMon(FieldSystem *fieldSystem, u8 tradeno, u8 idx); int NPCTradeApp_GetOfferedSpecies(NPCTradeAppData *work); int NPCTradeApp_GetRequestedSpecies(NPCTradeAppData *work); int NPCTradeApp_GetUnusedFlag(NPCTradeAppData *work); -void NPCTrade_ReceiveMonToSlot(FieldSystem *fsys, NPCTradeAppData *work, int slot); -void NPCTrade_CreateTradeAnim(FieldSystem *fsys, NPCTradeAppData *work, int slot, TRADE_ANIM_WORK *anim_work, Pokemon *my_mon_buf, Pokemon *trade_mon_buf); +void NPCTrade_ReceiveMonToSlot(FieldSystem *fieldSystem, NPCTradeAppData *work, int slot); +void NPCTrade_CreateTradeAnim(FieldSystem *fieldSystem, NPCTradeAppData *work, int slot, TRADE_ANIM_WORK *anim_work, Pokemon *my_mon_buf, Pokemon *trade_mon_buf); #endif //POKEHEARTGOLD_NPC_TRADE_H diff --git a/include/overlay_01.h b/include/overlay_01.h index 8560fc2f0..4fd5ad03c 100644 --- a/include/overlay_01.h +++ b/include/overlay_01.h @@ -24,27 +24,27 @@ struct UnkStruct_Ov01_021EF4C4 { struct UnkStruct_ov01_021EDC28; void ov01_021E636C(int a0); -void ov01_021EFAF8(FieldSystem *fsys); +void ov01_021EFAF8(FieldSystem *fieldSystem); void Field_PlayerAvatar_OrrTransitionFlags(PlayerAvatar *avatar, int a1); void Field_PlayerAvatar_ApplyTransitionFlags(PlayerAvatar *avatar); -void ov01_021F35C4(FieldSystem *fsys, int a1, int *a2); +void ov01_021F35C4(FieldSystem *fieldSystem, int a1, int *a2); u32 GetHoneySweetScentWorkSize(void); BOOL Task_HoneyOrSweetScent(TaskManager *taskManager); BOOL Task_OverworldFish(TaskManager *taskManager); -struct FishingRodWork *CreateFishingRodTaskEnv(FieldSystem *fsys, HeapID heapId, int rod); -void ov01_021F4440(FieldSystem *fsys); -void ov01_021F6A9C(FieldSystem *fsys, int a1, void *a2); -int ov01_021F6B00(FieldSystem *fsys); -int ov01_021F6AEC(FieldSystem *fsys); -BOOL ov01_021F6B10(FieldSystem *fsys); +struct FishingRodWork *CreateFishingRodTaskEnv(FieldSystem *fieldSystem, HeapID heapId, int rod); +void ov01_021F4440(FieldSystem *fieldSystem); +void ov01_021F6A9C(FieldSystem *fieldSystem, int a1, void *a2); +int ov01_021F6B00(FieldSystem *fieldSystem); +int ov01_021F6AEC(FieldSystem *fieldSystem); +BOOL ov01_021F6B10(FieldSystem *fieldSystem); UnkStruct_0206793C *ov01_0220329C(LocalMapObject *obj, int a1); -void ov01_02205790(FieldSystem *fsys, u8 a1); +void ov01_02205790(FieldSystem *fieldSystem, u8 a1); void ov01_02205784(LocalMapObject *object); -BOOL ov01_022057C4(FieldSystem *fsys); -BOOL ov01_02205D68(FieldSystem *fsys); +BOOL ov01_022057C4(FieldSystem *fieldSystem); +BOOL ov01_02205D68(FieldSystem *fieldSystem); BOOL Field_PlayerCanStartSurfingByStandingAndFacingTileBehaviors(PlayerAvatar *fieldPlayerAvatar, int standingTile, int facingTile); BOOL MetatileBehavior_IsRockClimbInDirection(int facingTile, int facingDirection); -BOOL FieldSys_FacingModelIsHeadbuttTree(FieldSystem *fsys); +BOOL FieldSystem_FacingModelIsHeadbuttTree(FieldSystem *fieldSystem); BOOL Task_UseSweetScentInField(TaskManager *taskManager); BOOL ov01_021EF348(ScriptContext* ctx); void ov01_021EF4C4(struct UnkStruct_Ov01_021EF4C4*, ScriptContext* ctx); @@ -54,9 +54,9 @@ void ov01_021F3D70(struct FieldSystemUnkSub68*, u8); Window* ov01_021F3D80(struct FieldSystemUnkSub68*); u8 ov01_021F3D84(struct FieldSystemUnkSub68*); BOOL ov01_021F3D88(struct FieldSystemUnkSub68*); -void ov01_021F3D98(FieldSystem* fsys); -struct UnkStruct_ov01_021EDC28 *ov01_021EDF78(FieldSystem *fsys, u8 x, u8 y, u8 initCursorPos, u8 cancellable, u16 *ret_p, MessageFormat *msgFmt, Window *window, MsgData *msgData); -struct UnkStruct_ov01_021EDC28 **ov01_021F6B20(FieldSystem *fsys); +void ov01_021F3D98(FieldSystem* fieldSystem); +struct UnkStruct_ov01_021EDC28 *ov01_021EDF78(FieldSystem *fieldSystem, u8 x, u8 y, u8 initCursorPos, u8 cancellable, u16 *ret_p, MessageFormat *msgFmt, Window *window, MsgData *msgData); +struct UnkStruct_ov01_021EDC28 **ov01_021F6B20(FieldSystem *fieldSystem); void ov01_021EDC7C(struct UnkStruct_ov01_021EDC28 *menu, u32 msgId, u32 value); void ov01_021EDC84(struct UnkStruct_ov01_021EDC28 *menu); void ov01_021EDF00(struct UnkStruct_ov01_021EDC28 *menu); @@ -69,13 +69,13 @@ void ov01_021EF018(struct UnkStruct_ov01_021EDC28 *menu, u8 a1); void ov01_021EF034(struct UnkStruct_ov01_021EDC28 *menu, u8 a1); void MoveTutorMenu_SetListItem(struct UnkStruct_ov01_021EDC28 *menu, int a1, int a2, int a3); void ov01_021F7704(LocalMapObject *object); -void ov01_021F62E8(VecFx32 *vec, FsysUnkSub2C *a1); +void ov01_021F62E8(VecFx32 *vec, FieldSystemUnkSub2C *a1); void ov01_021F9408(LocalMapObject *object, u32 dir); BOOL ov01_022055DC(LocalMapObject *object); void ov01_02205604(LocalMapObject *object, int *p_x, int *p_y); void ov01_021FF0E4(LocalMapObject *object, int a1, int x, int y, int a4); void ov01_021FF964(LocalMapObject *object, int a1, int x, int y, int a4); -void ov01_021F729C(FieldSystem *fsys); +void ov01_021F729C(FieldSystem *fieldSystem); void CallFieldTask_RockClimb(TaskManager *taskManager, int playerDirection, int partySlot); void CallFieldTask_Surf(TaskManager *taskManager, int playerDirection, int partySlot); void CallFieldTask_Waterfall(TaskManager *taskManager, int playerDirection, int partySlot); @@ -85,39 +85,39 @@ u32 ov01_021F149C(void *, int); void ov01_021F14A8(void *, int, void *); void ov01_021F1448(void *); int MapNumToFloorNo(u32 mapId); -void PrintCurFloorInNewWindow(FieldSystem *fsys, u8 x, u8 y, u16 *p_ret, MessageFormat *msgFmt, u16 floor); -int Field_SaveGameNormal(FieldSystem *fsys); -void ov01_021E9AE8(FieldSystem *fsys, int a1, int a2, u8 a3); -void ov01_021E9C00(FieldSystem *fsys, u8 a1); -void ov01_021E9C20(FieldSystem *fsys, u8 a1); -void ov01_021E9BB8(FieldSystem *fsys, u8 a1); -void ov01_021E9BDC(FieldSystem *fsys, u8 a1); -int Field_PlayerMovementSavingSet(FieldSystem *fsys); +void PrintCurFloorInNewWindow(FieldSystem *fieldSystem, u8 x, u8 y, u16 *p_ret, MessageFormat *msgFmt, u16 floor); +int Field_SaveGameNormal(FieldSystem *fieldSystem); +void ov01_021E9AE8(FieldSystem *fieldSystem, int a1, int a2, u8 a3); +void ov01_021E9C00(FieldSystem *fieldSystem, u8 a1); +void ov01_021E9C20(FieldSystem *fieldSystem, u8 a1); +void ov01_021E9BB8(FieldSystem *fieldSystem, u8 a1); +void ov01_021E9BDC(FieldSystem *fieldSystem, u8 a1); +int Field_PlayerMovementSavingSet(FieldSystem *fieldSystem); void Field_PlayerMovementSavingClear(int state); struct SaveStatsPrinter; -struct SaveStatsPrinter *Field_SaveStatsPrinter_New(FieldSystem *fsys, HeapID x, int y); +struct SaveStatsPrinter *Field_SaveStatsPrinter_New(FieldSystem *fieldSystem, HeapID x, int y); void Field_SaveStatsPrinter_Print(struct SaveStatsPrinter *printer); void Field_SaveStatsPrinter_RemoveFromScreen(struct SaveStatsPrinter *printer); void Field_SaveStatsPrinter_Delete(struct SaveStatsPrinter *printer); -void ov01_02203AB4(FieldSystem *fsys, LocalMapObject *partnerPokeObj, int a2); -void ov01_02205AEC(FieldSystem *fsys); +void ov01_02203AB4(FieldSystem *fieldSystem, LocalMapObject *partnerPokeObj, int a2); +void ov01_02205AEC(FieldSystem *fieldSystem); void ov01_02205720(LocalMapObject *playerObj, LocalMapObject *tsurePokeObj, int a2, int a3); -void ov01_021EACBC(void *fsysUnk28, u8 a1); -void ov01_021F6ABC(FieldSystem *fsys, int a1, int a2, void *a3); +void ov01_021EACBC(void *fieldSystemUnk28, u8 a1); +void ov01_021F6ABC(FieldSystem *fieldSystem, int a1, int a2, void *a3); typedef BOOL (*UnkCallback_021F6B34)(struct UnkStruct_ov01_021EDC28 *menu, int idx); -void ov01_021F6B34(FieldSystem *fsys, UnkCallback_021F6B34 cb, struct UnkStruct_ov01_021EDC28 *menu); +void ov01_021F6B34(FieldSystem *fieldSystem, UnkCallback_021F6B34 cb, struct UnkStruct_ov01_021EDC28 *menu); void ov01_021EEF9C(struct UnkStruct_ov01_021EDC28 *menu, int idx); struct UnkStruct_020FACDC { int filler_00[12/sizeof(int)]; }; -void ov01_021F3C0C(void *fsys_unk9C, int a1, const struct UnkStruct_020FACDC *unk_FACDC, int a3, void *fsys_unk54); -BOOL ov01_022060B8(FieldSystem *fsys, u8 a1, u8 a2); +void ov01_021F3C0C(void *fieldSystem_unk9C, int a1, const struct UnkStruct_020FACDC *unk_FACDC, int a3, void *fieldSystem_unk54); +BOOL ov01_022060B8(FieldSystem *fieldSystem, u8 a1, u8 a2); struct BankTransactionWorkSub { u32 max; @@ -129,8 +129,8 @@ struct BankTransactionWork { int mode; }; -Window *ov01_021EEF68(FieldSystem *fsys, u16 a1); +Window *ov01_021EEF68(FieldSystem *fieldSystem, u16 a1); void ov01_021EEF88(Window *window); -BOOL ov01_02206268(FieldSystem *fsys); +BOOL ov01_02206268(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_OVERLAY_01_H diff --git a/include/overlay_01_021E6880.h b/include/overlay_01_021E6880.h index bb52b102f..4100e01fb 100644 --- a/include/overlay_01_021E6880.h +++ b/include/overlay_01_021E6880.h @@ -3,11 +3,11 @@ #include "field_system.h" -void ov01_021E6928(Unk_0203E15C *a0, FieldSystem *fsys, u16 newKeys, u16 heldKeys); -int ov01_021E6AF4(Unk_0203E15C *a0, FieldSystem *fsys); -BOOL ov01_021E6E00(Unk_0203E15C *a0, FieldSystem *fsys); -BOOL ov01_021E6EFC(Unk_0203E15C *a0, FieldSystem *fsys); -BOOL ov01_021E6FD4(Unk_0203E15C *a0, FieldSystem *fsys); -void ov01_021E7F00(FieldSystem *fsys, BOOL a1); +void ov01_021E6928(Unk_0203E15C *a0, FieldSystem *fieldSystem, u16 newKeys, u16 heldKeys); +int ov01_021E6AF4(Unk_0203E15C *a0, FieldSystem *fieldSystem); +BOOL ov01_021E6E00(Unk_0203E15C *a0, FieldSystem *fieldSystem); +BOOL ov01_021E6EFC(Unk_0203E15C *a0, FieldSystem *fieldSystem); +BOOL ov01_021E6FD4(Unk_0203E15C *a0, FieldSystem *fieldSystem); +void ov01_021E7F00(FieldSystem *fieldSystem, BOOL a1); #endif diff --git a/include/overlay_01_021E90C0.h b/include/overlay_01_021E90C0.h index 5c5a62c5a..a1625ac80 100644 --- a/include/overlay_01_021E90C0.h +++ b/include/overlay_01_021E90C0.h @@ -5,7 +5,7 @@ #include "task.h" FieldEnvSubUnk18 *ov01_021E90C0(); -BOOL ov01_021E98F0(FieldSystem *fsys, FieldEnvSubUnk18 *a1, u8 direction); +BOOL ov01_021E98F0(FieldSystem *fieldSystem, FieldEnvSubUnk18 *a1, u8 direction); void ov01_021E90D4(FieldEnvSubUnk18 *a0); void *ov01_021E9C30(); BOOL ov01_021EA128(TaskManager *taskMan); @@ -13,7 +13,7 @@ BOOL ov01_021E9EEC(TaskManager *taskMan); BOOL ov01_021E9F78(TaskManager *taskMan); BOOL ov01_021E9FF8(TaskManager *taskMan); void ov01_021E90DC(u32 x, u32 y, FieldEnvSubUnk18 *a2); -BOOL ov01_021E90E4(FieldSystem *fsys, FieldEnvSubUnk18 *a1); -BOOL ov01_021E9374(FieldSystem *fsys, FieldEnvSubUnk18 *a1); +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 diff --git a/include/overlay_01_021EDAFC.h b/include/overlay_01_021EDAFC.h index 10d313a6f..7881eb9e1 100644 --- a/include/overlay_01_021EDAFC.h +++ b/include/overlay_01_021EDAFC.h @@ -5,12 +5,12 @@ #include "bg_window.h" void ov01_021EEC68(Window *window); -void ov01_021EEC7C(FieldSystem *fsys, Window *window, u8 type); +void ov01_021EEC7C(FieldSystem *fieldSystem, Window *window, u8 type); void MoneyBoxSys_Delete(Window *moneybox); -void MoneyBoxSys_Update(FieldSystem *fsys, Window *moneybox); -Window *ov01_021EED60(FieldSystem *fsys, u8 arg1, u8 arg2); +void MoneyBoxSys_Update(FieldSystem *fieldSystem, Window *moneybox); +Window *ov01_021EED60(FieldSystem *fieldSystem, u8 arg1, u8 arg2); void ov01_021EEE30(Window *window); -void ov01_021EEE44(FieldSystem *fsys, Window *window); +void ov01_021EEE44(FieldSystem *fieldSystem, Window *window); #endif //POKEHEARTGOLD_OVERLAY_01_021EDAFC_H diff --git a/include/overlay_01_021F1348.h b/include/overlay_01_021F1348.h index b3f65e2f2..f2ba63481 100644 --- a/include/overlay_01_021F1348.h +++ b/include/overlay_01_021F1348.h @@ -48,9 +48,9 @@ typedef struct { UnkOv01_021FFECC *ov01_021F1430(void *a0, int a1, int a2, int a3); FieldSystem *ov01_021F146C(LocalMapObject *mapObject); -TaskManager *ov01_021F1468(FieldSystem *fsys); -UnkOv01_021FFECC *ov01_021F1450(FieldSystem *fsys, int a1); -void ov01_021F1620(FieldSystem *fsys, const UnkOv01_02209280 *a1, VecFx32 *a2, int a3, UnkOv01_021FFF5C *a4, int a5); +TaskManager *ov01_021F1468(FieldSystem *fieldSystem); +UnkOv01_021FFECC *ov01_021F1450(FieldSystem *fieldSystem, int a1); +void ov01_021F1620(FieldSystem *fieldSystem, const UnkOv01_02209280 *a1, VecFx32 *a2, int a3, UnkOv01_021FFF5C *a4, int a5); void ov01_021F1448(UnkOv01_021FFECC *a0); void ov01_021F19F4(void *a0, UnkOv01_021FFECC_sub *a1, int a2, int a3, int a4); diff --git a/include/overlay_01_021F3D38.h b/include/overlay_01_021F3D38.h index 037955764..f23dd0aa2 100644 --- a/include/overlay_01_021F3D38.h +++ b/include/overlay_01_021F3D38.h @@ -3,6 +3,6 @@ #include "script.h" -void ov01_021F3DFC(FieldSystem *fsys, int a1); +void ov01_021F3DFC(FieldSystem *fieldSystem, int a1); #endif diff --git a/include/overlay_01_021F4704.h b/include/overlay_01_021F4704.h index 858b8983f..5875c8423 100644 --- a/include/overlay_01_021F4704.h +++ b/include/overlay_01_021F4704.h @@ -3,6 +3,6 @@ #include "field_system.h" -void ov01_021F6304(FsysUnkSub2C *a0); +void ov01_021F6304(FieldSystemUnkSub2C *a0); #endif //POKEHEARTGOLD_OVERLAY_01_021F4704_H diff --git a/include/overlay_01_021F6830.h b/include/overlay_01_021F6830.h index 9c4a90ce5..1dbc32687 100644 --- a/include/overlay_01_021F6830.h +++ b/include/overlay_01_021F6830.h @@ -3,6 +3,6 @@ #include "script.h" -void ov01_021F6830(FieldSystem *fsys, int a1, int a2); +void ov01_021F6830(FieldSystem *fieldSystem, int a1, int a2); #endif diff --git a/include/overlay_01_02204ED8.h b/include/overlay_01_02204ED8.h index d721054a1..c6799a21e 100644 --- a/include/overlay_01_02204ED8.h +++ b/include/overlay_01_02204ED8.h @@ -1,6 +1,6 @@ #ifndef POKEHEARTGOLD_OV_01_02204ED8_H #define POKEHEARTGOLD_OV_01_02204ED8_H -void ov01_02204ED8(FieldSystem *fsys, u16 *varPointer); +void ov01_02204ED8(FieldSystem *fieldSystem, u16 *varPointer); #endif //POKEHEARTGOLD_OV_01_02204ED8_H diff --git a/include/overlay_01_022053EC.h b/include/overlay_01_022053EC.h index 7a74f1f55..bddf97a2a 100644 --- a/include/overlay_01_022053EC.h +++ b/include/overlay_01_022053EC.h @@ -3,7 +3,7 @@ #include "field_system.h" -void ov01_022057D0(FieldSystem *fsys); +void ov01_022057D0(FieldSystem *fieldSystem); void ov01_02205990(int a0, int x, int y, FollowMon *mon); #endif //POKEHEARTGOLD_OVERLAY_01_022053EC_H diff --git a/include/overlay_01_apricorn_tree_anim.h b/include/overlay_01_apricorn_tree_anim.h index 93960d141..d43269d6b 100644 --- a/include/overlay_01_apricorn_tree_anim.h +++ b/include/overlay_01_apricorn_tree_anim.h @@ -3,6 +3,6 @@ #include "field_player_avatar.h" -void FieldSys_AnimApricornTree(FieldSystem *fsys, LocalMapObject *tree, u16 *a2); +void FieldSystem_AnimApricornTree(FieldSystem *fieldSystem, LocalMapObject *tree, u16 *a2); #endif //POKEHEARTGOLD_OVERLAY_01_APRICORN_TREE_ANIM_H diff --git a/include/overlay_01_rock_smash_item.h b/include/overlay_01_rock_smash_item.h index 2796a0a9e..646eb390e 100644 --- a/include/overlay_01_rock_smash_item.h +++ b/include/overlay_01_rock_smash_item.h @@ -7,6 +7,6 @@ #define NUM_ROCK_SMASH_TYPE 3 -void FieldSys_RockSmashItemCheck(FieldSystem *fsys, int followMonKnowsHm, u16 *itemFound, u16 *item); +void FieldSystem_RockSmashItemCheck(FieldSystem *fieldSystem, int followMonKnowsHm, u16 *itemFound, u16 *item); #endif //POKEHEARTGOLD_OVERLAY_01_ROCK_SMASH_ITEM_H diff --git a/include/overlay_02.h b/include/overlay_02.h index 79d0ebe2c..01e14ea78 100644 --- a/include/overlay_02.h +++ b/include/overlay_02.h @@ -10,7 +10,7 @@ struct FieldLongWarpTaskData; typedef struct UnkStruct_Ov02_0224E4EC { SaveData *saveData; - void *unk04; // points to fsys->unk_10C + void *unk04; // points to fieldSystem->unk_10C u8 unk08; u8 deltaX; u8 unk0A; @@ -32,24 +32,24 @@ typedef struct UnkStruct_Ov02_0224E4EC { u8 unk1A; u8 unk1B; u16 unk1C; // known from what's decompiled - u8 *unk20; // points to fsys->unk_111 + u8 *unk20; // points to fieldSystem->unk_111 } UnkStruct_Ov02_0224E4EC; -UNK_0201F79C_Sub *ov02_0224B418(FieldSystem *fsys, int gender); +UNK_0201F79C_Sub *ov02_0224B418(FieldSystem *fieldSystem, int gender); BOOL ov02_0224B43C(UNK_0201F79C_Sub *unk); void ov02_0224B448(UNK_0201F79C_Sub *unk); -struct FieldLongWarpTaskData *CreateFieldEscapeRopeTaskEnv(FieldSystem *fsys, HeapID heapId); -struct FieldLongWarpTaskData *CreateFieldTeleportTaskEnv(FieldSystem *fsys, Pokemon *mon, u8 slotno, HeapID heapId); -struct FieldLongWarpTaskData *CreateFieldDigTaskEnv(FieldSystem *fsys, Pokemon *mon, u8 slotno, HeapID heapId); +struct FieldLongWarpTaskData *CreateFieldEscapeRopeTaskEnv(FieldSystem *fieldSystem, HeapID heapId); +struct FieldLongWarpTaskData *CreateFieldTeleportTaskEnv(FieldSystem *fieldSystem, Pokemon *mon, u8 slotno, HeapID heapId); +struct FieldLongWarpTaskData *CreateFieldDigTaskEnv(FieldSystem *fieldSystem, Pokemon *mon, u8 slotno, HeapID heapId); BOOL Task_FieldEscapeRope(TaskManager *taskManager); BOOL Task_FieldTeleport(TaskManager *taskManager); BOOL Task_FieldDig(TaskManager *taskManager); BOOL ov02_0224C1F8(TaskManager *taskManager); -void *ov02_0224C1D8(FieldSystem *fsys, int a1, int a2); +void *ov02_0224C1D8(FieldSystem *fieldSystem, int a1, int a2); u8 ov02_02251EE8(GearPhoneRingManager *a0, u8 *a1); // TODO: define the struct, figure out what a1 is -void *ov02_02249458(FieldSystem *fsys, int a1, Pokemon *mon, int gender); +void *ov02_02249458(FieldSystem *fieldSystem, int a1, Pokemon *mon, int gender); BOOL ov02_0224953C(void *work); void ov02_02249548(void *work); @@ -57,48 +57,48 @@ void ov02_02245B80(TaskManager *taskManager); void ov02_022460AC(TaskManager *taskMan, u8 a1); void ShowLegendaryWing(TaskManager *taskMan, u8 a1); void ov02_022462E8(TaskManager *taskMan); -void PokecenterAnimCreate(FieldSystem *fsys, u8 kind); -void ov02_0224BDE8(FieldSystem *fsys, u8 direction, u8 length); +void PokecenterAnimCreate(FieldSystem *fieldSystem, u8 kind); +void ov02_0224BDE8(FieldSystem *fieldSystem, u8 direction, u8 length); int ov02_0224CD38(PlayerProfile *profile, u16 a, u16 b, u16 c, u16 d, HeapID heapId); int ov02_0224CD74(PlayerProfile *profile, u16 a, u16 b, u16 c, u16 d, HeapID heapId); -void ov02_0224BF58(FieldSystem *fsys, u8 a1); -void ov02_0224BFC0(FieldSystem *fsys, u8 a1); -void ov02_0224BFCC(FieldSystem *fsys, u8 a1); -void ov02_0224CDB0(FieldSystem *fsys, u8 a1); -void ov02_0224E074(FieldSystem *fsys, u16 *p_ret, int a2, HeapID heapId); +void ov02_0224BF58(FieldSystem *fieldSystem, u8 a1); +void ov02_0224BFC0(FieldSystem *fieldSystem, u8 a1); +void ov02_0224BFCC(FieldSystem *fieldSystem, u8 a1); +void ov02_0224CDB0(FieldSystem *fieldSystem, u8 a1); +void ov02_0224E074(FieldSystem *fieldSystem, u16 *p_ret, int a2, HeapID heapId); void ov02_0224E0BC(LocalMapObject *obj1, LocalMapObject *obj2, TaskManager *taskManager); void ov02_02251EB8(GearPhoneRingManager *phoneRingManager, u8 a1, u8 a2, u8 a3, u8 a4, u8 a5); -void Fsys_FollowPokeInteract(FieldSystem *fsys); -BOOL ov02_02250780(FieldSystem *fsys, u8 a1); -void ov02_022507B4(FieldSystem *fsys, u8 a1); -void ov02_022508B4(FieldSystem *fsys); -void ov02_02250A60(FieldSystem *fsys); -void ov02_02250AC8(FieldSystem *fsys); -void ov02_02250AE8(FieldSystem *fsys); -void ov02_02250AFC(FieldSystem *fsys, u8 a1); -void ov02_02250B30(FieldSystem *fsys); -void ov02_02250B80(FieldSystem *fsys); -void ov02_02251424(FieldSystem *fsys, u8 a1); -void ov02_022514C8(FieldSystem *fsys, u8 a1); -void ov02_02251554(FieldSystem *fsys); -void ov02_022515A4(FieldSystem *fsys); -void ov02_022518E0(FieldSystem *fsys); -void ov02_02251B14(FieldSystem *fsys); -void ov02_02251CF0(FieldSystem *fsys); -void ov02_02251DC4(FieldSystem *fsys); -void ov02_02251DE8(FieldSystem *fsys); +void FieldSystem_FollowPokeInteract(FieldSystem *fieldSystem); +BOOL ov02_02250780(FieldSystem *fieldSystem, u8 a1); +void ov02_022507B4(FieldSystem *fieldSystem, u8 a1); +void ov02_022508B4(FieldSystem *fieldSystem); +void ov02_02250A60(FieldSystem *fieldSystem); +void ov02_02250AC8(FieldSystem *fieldSystem); +void ov02_02250AE8(FieldSystem *fieldSystem); +void ov02_02250AFC(FieldSystem *fieldSystem, u8 a1); +void ov02_02250B30(FieldSystem *fieldSystem); +void ov02_02250B80(FieldSystem *fieldSystem); +void ov02_02251424(FieldSystem *fieldSystem, u8 a1); +void ov02_022514C8(FieldSystem *fieldSystem, u8 a1); +void ov02_02251554(FieldSystem *fieldSystem); +void ov02_022515A4(FieldSystem *fieldSystem); +void ov02_022518E0(FieldSystem *fieldSystem); +void ov02_02251B14(FieldSystem *fieldSystem); +void ov02_02251CF0(FieldSystem *fieldSystem); +void ov02_02251DC4(FieldSystem *fieldSystem); +void ov02_02251DE8(FieldSystem *fieldSystem); void ov02_022523B4(TaskManager *taskManager); -void ov02_02252534(FieldSystem *fsys); -void ov02_022529FC(FieldSystem *fsys); -void ov02_02252EE4(FieldSystem *fsys, u8 a1); +void ov02_02252534(FieldSystem *fieldSystem); +void ov02_022529FC(FieldSystem *fieldSystem); +void ov02_02252EE4(FieldSystem *fieldSystem, u8 a1); BOOL ov02_02253134(SaveData *saveData); int ov02_0225316C(void); BOOL ov02_02253188(SaveData *saveData); int ov02_022531B4(SaveData *saveData); -BOOL ov02_022470A0(FieldSystem *fsys, BattleSetup **a1); -void ov02_BattleExit_HandleRoamerAction(FieldSystem *fsys, BattleSetup *setup); -BOOL ov02_02247374(FieldSystem *fsys, BattleSetup **setup, void *arg2); -void ov02_02247F30(FieldSystem *fsys, u16 mon, u8 level, BOOL shiny, BattleSetup *setup); +BOOL ov02_022470A0(FieldSystem *fieldSystem, BattleSetup **a1); +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); void ov02_02246714(TaskManager *man, u32 a1, u32 a2, u32 a3, u32 a4); void ov02_022469B4(TaskManager *man, LocalMapObject *obj1, LocalMapObject *obj2); void OpenAlphHiddenRoom(TaskManager *man, u32 a1); diff --git a/include/overlay_03.h b/include/overlay_03.h index 2c773c71a..ad3fe9495 100644 --- a/include/overlay_03.h +++ b/include/overlay_03.h @@ -9,15 +9,15 @@ enum PokeathlonData { ACTION_DATA }; -void ov03_02255BB0(FieldSystem *fsys, u16 a1, u16 a2, u16 a3); +void ov03_02255BB0(FieldSystem *fieldSystem, u16 a1, u16 a2, u16 a3); int ov03_02255BFC(void); -void ov03_02255C18(FieldSystem *fsys, u16 a1, u16 a2, u16 a3); +void ov03_02255C18(FieldSystem *fieldSystem, u16 a1, u16 a2, u16 a3); int ov03_02255C64(void); void ov03_022566B0(TaskManager *taskManager, u16 *p_var); -void ov03_022566D0(FieldSystem *fsys, MessageFormat *msgFmt, u16 ruleset); -u16 ov03_02256A2C(FieldSystem *fsys, MessageFormat *msgFmt, u16 a2); -void ov03_02256710(FieldSystem *fsys, u16 a1); -void ov03_02258910(FieldSystem *fsys); +void ov03_022566D0(FieldSystem *fieldSystem, MessageFormat *msgFmt, u16 ruleset); +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); diff --git a/include/overlay_04.h b/include/overlay_04.h index a0f0f58c3..3cdd23ab8 100644 --- a/include/overlay_04.h +++ b/include/overlay_04.h @@ -3,37 +3,37 @@ #include "script.h" -void ov04_02254D84(FieldSystem *fsys); -void ov04_02256044(FieldSystem *fsys); -void ov04_022563B0(FieldSystem *fsys); -void ov04_02254710(FieldSystem *fsys); -void ov04_0225507C(FieldSystem *fsys); -void ov04_022566A0(FieldSystem *fsys); -void ov04_022566A0(FieldSystem *fsys); -void ov04_02256BA0(FieldSystem *fsys); -void ov04_02256EB0(FieldSystem *fsys); +void ov04_02254D84(FieldSystem *fieldSystem); +void ov04_02256044(FieldSystem *fieldSystem); +void ov04_022563B0(FieldSystem *fieldSystem); +void ov04_02254710(FieldSystem *fieldSystem); +void ov04_0225507C(FieldSystem *fieldSystem); +void ov04_022566A0(FieldSystem *fieldSystem); +void ov04_022566A0(FieldSystem *fieldSystem); +void ov04_02256BA0(FieldSystem *fieldSystem); +void ov04_02256EB0(FieldSystem *fieldSystem); -void ov04_02254CBC(FieldSystem *fsys); -void ov04_02255FC0(FieldSystem *fsys); -void ov04_02256304(FieldSystem *fsys); -void ov04_02253E20(FieldSystem *fsys); -void ov04_02254190(FieldSystem *fsys); -void ov04_02254F8C(FieldSystem *fsys); -void ov04_02256650(FieldSystem *fsys); -void ov04_02256B64(FieldSystem *fsys); -void ov04_02256E60(FieldSystem *fsys); -void ov04_02254D98(FieldSystem *fsys); -void ov04_02254DD0(FieldSystem *fsys); -void ov04_02254DE0(FieldSystem *fsys, int a1); -int ov04_02256058(FieldSystem *fsys); -void ov04_0225640C(FieldSystem *fsys, u8 lockno, u8 relock); -BOOL ov04_022563C4(FieldSystem *fsys, u8 canId); -void ov04_02253ED4(FieldSystem *fsys); -void BeginAzaleaGymSpinarakRide(FieldSystem *fsys, u8 spinarakNo); -void FlipAzaleaGymSwitch(FieldSystem *fsys, u8 switchNo); +void ov04_02254CBC(FieldSystem *fieldSystem); +void ov04_02255FC0(FieldSystem *fieldSystem); +void ov04_02256304(FieldSystem *fieldSystem); +void ov04_02253E20(FieldSystem *fieldSystem); +void ov04_02254190(FieldSystem *fieldSystem); +void ov04_02254F8C(FieldSystem *fieldSystem); +void ov04_02256650(FieldSystem *fieldSystem); +void ov04_02256B64(FieldSystem *fieldSystem); +void ov04_02256E60(FieldSystem *fieldSystem); +void ov04_02254D98(FieldSystem *fieldSystem); +void ov04_02254DD0(FieldSystem *fieldSystem); +void ov04_02254DE0(FieldSystem *fieldSystem, int a1); +int ov04_02256058(FieldSystem *fieldSystem); +void ov04_0225640C(FieldSystem *fieldSystem, u8 lockno, u8 relock); +BOOL ov04_022563C4(FieldSystem *fieldSystem, u8 canId); +void ov04_02253ED4(FieldSystem *fieldSystem); +void BeginAzaleaGymSpinarakRide(FieldSystem *fieldSystem, u8 spinarakNo); +void FlipAzaleaGymSwitch(FieldSystem *fieldSystem, u8 switchNo); -BOOL ov04_022550D4(FieldSystem* fsys, u32 a1, u32 a2, u32 a3, u32 a4); -void ov04_02256ED8(FieldSystem *fsys); -void ov04_02256F00(FieldSystem *fsys, u8 a1); +BOOL ov04_022550D4(FieldSystem* fieldSystem, u32 a1, u32 a2, u32 a3, u32 a4); +void ov04_02256ED8(FieldSystem *fieldSystem); +void ov04_02256F00(FieldSystem *fieldSystem, u8 a1); #endif //POKEHEARTGOLD_OVERLAY_04_H diff --git a/include/overlay_124.h b/include/overlay_124.h index 42ae96334..37d2da5cd 100644 --- a/include/overlay_124.h +++ b/include/overlay_124.h @@ -3,6 +3,6 @@ #include "field_system.h" -FieldSystem_Init(OVY_MANAGER *man, FieldSystem *fsys); +FieldSystem_Init(OVY_MANAGER *man, FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_OVERLAY_124_H diff --git a/include/overlay_26.h b/include/overlay_26.h index e55db426b..3c7c5d760 100644 --- a/include/overlay_26.h +++ b/include/overlay_26.h @@ -4,6 +4,6 @@ #include "script.h" u16 TryGetRematchTrainerIdByBaseTrainerId(SaveData* savedata, u16 trainer_no); -void ov26_022599D8(FieldSystem *fsys, LocalMapObject *lastTalked); +void ov26_022599D8(FieldSystem *fieldSystem, LocalMapObject *lastTalked); #endif //POKEHEARTGOLD_OVERLAY_26_H diff --git a/include/overlay_94.h b/include/overlay_94.h index 633266b51..060092508 100644 --- a/include/overlay_94.h +++ b/include/overlay_94.h @@ -11,7 +11,7 @@ typedef struct UnkStruct_Overlay_94_B { Party* party; u8 unk4[0x17]; - FieldSystem* fsys; + FieldSystem* fieldSystem; u8 unk2[0x7]; u8 unk27; } UnkStruct_Overlay_94_B; diff --git a/include/pal_park.h b/include/pal_park.h index c4649a87b..7f77d683f 100644 --- a/include/pal_park.h +++ b/include/pal_park.h @@ -42,27 +42,27 @@ struct PalParkMonsData { #define PPMONDAT_OFFSET_UNK4 4 #define PPMONDAT_OFFSET_UNK5 5 -// Resets the Pal Park state. fsys is unused. +// Resets the Pal Park state. fieldSystem is unused. // Called when entering the park game, right // after the countdown finishes. -void PalPark_ClearState(FieldSystem *fsys); +void PalPark_ClearState(FieldSystem *fieldSystem); // Initializes where your migrated Pokemon will spawn, and starts the timer. // Called on entry into Pal Park. -void PalPark_InitFromSave(FieldSystem *fsys); +void PalPark_InitFromSave(FieldSystem *fieldSystem); // Calculates how long you've been in Pal Park. // Called when returning to the gate from the park. -void PalPark_StopClock(FieldSystem *fsys); +void PalPark_StopClock(FieldSystem *fieldSystem); // Your species score is the sum of point values ascribed to each species. // See files/arc/ppark.json for the point values of each. -int PalPark_CalcSpeciesScore(FieldSystem *fsys); +int PalPark_CalcSpeciesScore(FieldSystem *fieldSystem); // There is a soft time limit of 1000 seconds. // If you catch all 6 Pokemon within that time, // you earn 2 points per second left on the clock. -int PalPark_CalcTimeScore(FieldSystem *fsys); +int PalPark_CalcTimeScore(FieldSystem *fieldSystem); // This is computed in two phases. // First, the types of each Pokemon you caught are compared @@ -70,7 +70,7 @@ int PalPark_CalcTimeScore(FieldSystem *fsys); // the park. You earn 200 points if none of them match. // Second, you earn an extra 50 points for each unique type // among the Pokemon caught. -u32 PalPark_CalcTypesScore(FieldSystem *fsys); +u32 PalPark_CalcTypesScore(FieldSystem *fieldSystem); // Determines whether to generate an encounter on the // current step. x and z are the player's coordinates. @@ -89,20 +89,20 @@ u32 PalPark_CalcTypesScore(FieldSystem *fsys); // random (LCRNG) based on the cumulative weights. // If the chosen bucket corresponds to a Pokemon, it will // be encountered. -BOOL PalPark_TryEncounter(FieldSystem* fsys, int x, int z); +BOOL PalPark_TryEncounter(FieldSystem* fieldSystem, int x, int z); // Called if PalPark_TryEncounter succeeds. Loads the // migrated Pokemon as the opponent and sets the Pal Park // state. -BattleSetup* PalPark_SetupEncounter(FieldSystem* fsys); +BattleSetup* PalPark_SetupEncounter(FieldSystem* fieldSystem); // Called on return from the battle. Action is based on // whether the player caught the Pokemon or fled from it. // Other outcomes are unexpected and trip an assert. -void PalPark_HandleBattleEnd(FieldSystem *fsys, BattleSetup *setup); +void PalPark_HandleBattleEnd(FieldSystem *fieldSystem, BattleSetup *setup); // Determines how many of the Pokemon in Pal Park were not // caught. -int PalPark_CountMonsNotCaught(FieldSystem *fsys); +int PalPark_CountMonsNotCaught(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_PAL_PARK_H diff --git a/include/party_menu.h b/include/party_menu.h index c445c4810..89fdd91cc 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -21,7 +21,7 @@ struct FieldMoveUseData { struct FieldMoveCheckData { u32 mapId; - FieldSystem *fsys; + FieldSystem *fieldSystem; LocalMapObject *facingObject; u16 flag; }; diff --git a/include/pokegear.h b/include/pokegear.h index 1a9d3c52d..53d252c94 100644 --- a/include/pokegear.h +++ b/include/pokegear.h @@ -5,6 +5,6 @@ typedef struct TownMap TownMap; -TownMap *TownMap_New(FieldSystem *fsys, int kind); +TownMap *TownMap_New(FieldSystem *fieldSystem, int kind); #endif //POKEHEARTGOLD_POKEGEAR_H diff --git a/include/save_local_field_data.h b/include/save_local_field_data.h index 0f5311ab4..eae75b323 100644 --- a/include/save_local_field_data.h +++ b/include/save_local_field_data.h @@ -30,7 +30,7 @@ u16 *LocalFieldData_GetSafariStepsCounter(LocalFieldData *localFieldData); u16 *LocalFieldData_GetPoisonStepCounter(LocalFieldData *localFieldData); LocalFieldData *Save_LocalFieldData_Get(SaveData *saveData); struct SavedMapObjectList *Save_MapObjects_Get(SaveData *saveData); -void Fsys_SyncMapObjectsToSave(FieldSystem *fsys); -void Fsys_RestoreMapObjectsFromSave(FieldSystem *fsys); +void FieldSystem_SyncMapObjectsToSave(FieldSystem *fieldSystem); +void FieldSystem_RestoreMapObjectsFromSave(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_SAVE_LOCAL_FIELD_DATA_H diff --git a/include/scrcmd.h b/include/scrcmd.h index d0cc62ea8..8cf097fa1 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -7,11 +7,11 @@ #include "script.h" static inline u16 ScriptGetVar(ScriptContext* ctx) { - return VarGet(ctx->fsys, ScriptReadHalfword(ctx)); + return VarGet(ctx->fieldSystem, ScriptReadHalfword(ctx)); } static inline u16* ScriptGetVarPointer(ScriptContext* ctx) { - return GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); + return GetVarPointer(ctx->fieldSystem, ScriptReadHalfword(ctx)); } // Basic commands diff --git a/include/script.h b/include/script.h index 4abe6bc9c..3d451f623 100644 --- a/include/script.h +++ b/include/script.h @@ -66,7 +66,7 @@ typedef struct ScriptEnvironment { WaitingIcon *waitingIcon; EngagedTrainer engagedTrainers[2]; u16 specialVars[NUM_SPECIAL_VARS]; - void (*scrctx_end_cb)(FieldSystem *fsys); + void (*scrctx_end_cb)(FieldSystem *fieldSystem); void *runningAppData; void *miscDataPtr; void *unk_B4; @@ -169,7 +169,7 @@ struct ScriptContext { TaskManager *taskman; MsgData *msgdata; u8 *mapScripts; - FieldSystem *fsys; + FieldSystem *fieldSystem; }; void InitScriptContext(ScriptContext *ctx, const ScrCmdFunc *cmd_table, u32 cmd_count); diff --git a/include/task.h b/include/task.h index d9c3a5438..68a71844e 100644 --- a/include/task.h +++ b/include/task.h @@ -23,18 +23,18 @@ struct TaskManager { //declared in field_system.h void *env; u32 unk10; void *unk14; - FieldSystem *fsys; + FieldSystem *fieldSystem; TaskManagerUnkSub1C *unk1C; // size=4 }; -TaskManager *FieldSys_CreateTask(FieldSystem *fsys, TaskFunc taskFunc, void *env); +TaskManager *FieldSystem_CreateTask(FieldSystem *fieldSystem, TaskFunc taskFunc, void *env); void TaskManager_Jump(TaskManager *taskman, TaskFunc taskFunc, void *env); void TaskManager_Call(TaskManager *taskman, TaskFunc taskFunc, void *env); -BOOL Fsys_RunTaskFrame(FieldSystem *fsys); -BOOL Fsys_TaskIsRunning(FieldSystem *fsys); -BOOL FieldSys_ApplicationIsRunning(FieldSystem *fsys); -void sub_020505C0(FieldSystem *fsys); -BOOL sub_020505C8(FieldSystem *fsys); +BOOL FieldSystem_RunTaskFrame(FieldSystem *fieldSystem); +BOOL FieldSystem_TaskIsRunning(FieldSystem *fieldSystem); +BOOL FieldSystem_ApplicationIsRunning(FieldSystem *fieldSystem); +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); diff --git a/include/unk_0203DB6C.h b/include/unk_0203DB6C.h index 15e7647e8..4921939c1 100644 --- a/include/unk_0203DB6C.h +++ b/include/unk_0203DB6C.h @@ -3,6 +3,6 @@ #include "script.h" -void Fsys_GetFacingObject(FieldSystem *fsys, LocalMapObject **ret_p); +void FieldSystem_GetFacingObject(FieldSystem *fieldSystem, LocalMapObject **ret_p); #endif //POKEHEARTGOLD_UNK_0203DB6C_H diff --git a/include/unk_0203DFA4.h b/include/unk_0203DFA4.h index 86b46e084..d61880465 100644 --- a/include/unk_0203DFA4.h +++ b/include/unk_0203DFA4.h @@ -4,10 +4,10 @@ #include "field_system.h" #include "overlay_manager.h" -void sub_0203DEF0(FieldSystem *fsys); -BOOL sub_0203DF7C(FieldSystem *fsys); -BOOL sub_0203DF8C(FieldSystem *fsys); -BOOL sub_0203DFA4(FieldSystem *fsys); -void FieldSys_LaunchApplication(FieldSystem *fsys, const OVY_MGR_TEMPLATE *template, void *parentWork); +void sub_0203DEF0(FieldSystem *fieldSystem); +BOOL sub_0203DF7C(FieldSystem *fieldSystem); +BOOL sub_0203DF8C(FieldSystem *fieldSystem); +BOOL sub_0203DFA4(FieldSystem *fieldSystem); +void FieldSystem_LaunchApplication(FieldSystem *fieldSystem, const OVY_MGR_TEMPLATE *template, void *parentWork); #endif //POKEHEARTGOLD_UNK_0203DFA4_H diff --git a/include/unk_0203E348.h b/include/unk_0203E348.h index 45cafbe72..fddd504c8 100644 --- a/include/unk_0203E348.h +++ b/include/unk_0203E348.h @@ -30,8 +30,8 @@ typedef struct PartyMenuAppData { MAILBOX *mailbox; OPTIONS *options; u8 filler_10[0xC]; - FieldSystem *fsys; - void *fsys_unk_10C; + FieldSystem *fieldSystem; + void *fieldSystem_unk_10C; u8 unk_24; u8 unk_25; u8 unk_26; @@ -81,7 +81,7 @@ struct UnkStruct_ScrCmd627 { typedef struct PCBoxAppData { SaveData *saveData; - void *fsysUnk10C; + void *fieldSystemUnk10C; int unk8; } PCBoxAppData; @@ -93,52 +93,52 @@ typedef struct ScratchCardAppData { u8 filler_14[4]; } ScratchCardAppData; -struct UseMailWork *CreateUseMailWork(FieldSystem *fsys, int kind, int mailId, HeapID heapId); -struct ApricornBoxWork *CreateApricornBoxWork(FieldSystem *fsys, int a1); -struct PalPadWork *CreatePalPadWork(FieldSystem *fsys, SaveData *saveData, HeapID heapId); -struct BerryPotsArgs *BerryPotsArgs_New(FieldSystem *fsys); -struct UnownReportWork *CreateUnownReportWork(FieldSystem *fsys); -struct GracideaWork *sub_0203FAE8(FieldSystem *fsys, HeapID heapId, u16 itemId); -PartyMenuAppData *sub_0203E580(HeapID heapId, FieldSystem *fsys); //todo: party select screen -PartyMenuAppData *sub_0203E5A4(HeapID heapId, FieldSystem *fsys); //todo: party trade screen +struct UseMailWork *CreateUseMailWork(FieldSystem *fieldSystem, int kind, int mailId, HeapID heapId); +struct ApricornBoxWork *CreateApricornBoxWork(FieldSystem *fieldSystem, int a1); +struct PalPadWork *CreatePalPadWork(FieldSystem *fieldSystem, SaveData *saveData, HeapID heapId); +struct BerryPotsArgs *BerryPotsArgs_New(FieldSystem *fieldSystem); +struct UnownReportWork *CreateUnownReportWork(FieldSystem *fieldSystem); +struct GracideaWork *sub_0203FAE8(FieldSystem *fieldSystem, HeapID heapId, u16 itemId); +PartyMenuAppData *sub_0203E580(HeapID heapId, FieldSystem *fieldSystem); //todo: party select screen +PartyMenuAppData *sub_0203E5A4(HeapID heapId, FieldSystem *fieldSystem); //todo: party trade screen PartyMenuAppData *sub_0203E6D4(TaskManager *taskManager, HeapID heapId); //todo: union party select screen int sub_0203E5C8(struct PartyMenuAppData *partyWork); int sub_0203E5F8(struct PartyMenuAppData *partyWork); -void sub_0203F570(FieldSystem *fsys, SaveData *saveData); -UnkStruct_Ov02_0224E4EC* sub_0203EB64(FieldSystem *fsys); -void sub_0203F964(FieldSystem *fsys); -void LaunchChooseStarterApp(FieldSystem *fsys, struct ChooseStarterAppArgs *args); +void sub_0203F570(FieldSystem *fieldSystem, SaveData *saveData); +UnkStruct_Ov02_0224E4EC* sub_0203EB64(FieldSystem *fieldSystem); +void sub_0203F964(FieldSystem *fieldSystem); +void LaunchChooseStarterApp(FieldSystem *fieldSystem, struct ChooseStarterAppArgs *args); void Save_CurrentLocation_BackUp(SaveData *saveData); u16 sub_0203E864(void *a0); u16 sub_0203E600(void *a0); -void *sub_0203E7F4(HeapID heapId, FieldSystem *fsys, u8 a2, u16 a3); -u32 *sub_0203ED80(FieldSystem *fsys, u32 a1, u16 *a2); -void *sub_0203FB94(HeapID heapId, FieldSystem *fsys, u16 a2, u16 a3); +void *sub_0203E7F4(HeapID heapId, FieldSystem *fieldSystem, u8 a2, u16 a3); +u32 *sub_0203ED80(FieldSystem *fieldSystem, u32 a1, u16 *a2); +void *sub_0203FB94(HeapID heapId, FieldSystem *fieldSystem, u16 a2, u16 a3); void sub_0203F198(TaskManager *taskManager, u16 *ret_p, SaveData *saveData, u16 a3, u16 a4); -void sub_0203F204(FieldSystem *fsys, FashionAppData *fashionData); -void sub_0203F0A8(FieldSystem *fsys, struct UnkStruct_ScrCmd408 *unk); -void sub_0203E868(FieldSystem *fsys, PCBoxAppData *pcBoxData); +void sub_0203F204(FieldSystem *fieldSystem, FashionAppData *fashionData); +void sub_0203F0A8(FieldSystem *fieldSystem, struct UnkStruct_ScrCmd408 *unk); +void sub_0203E868(FieldSystem *fieldSystem, PCBoxAppData *pcBoxData); void sub_0203F4A8(TaskManager *taskManager); -void sub_0203F4C8(FieldSystem *fsys); -void *sub_0203F4F8(FieldSystem *fsys); -void *sub_0203F984(FieldSystem *fsys); -void *sub_0203F844(FieldSystem *fsys, u16 a1); -void *sub_0203E460(FieldSystem *fsys, u8 a1); +void sub_0203F4C8(FieldSystem *fieldSystem); +void *sub_0203F4F8(FieldSystem *fieldSystem); +void *sub_0203F984(FieldSystem *fieldSystem); +void *sub_0203F844(FieldSystem *fieldSystem, u16 a1); +void *sub_0203E460(FieldSystem *fieldSystem, u8 a1); u16 sub_0203E4CC(void *a0); -void sub_0203F9C4(FieldSystem *fsys, struct MoveRelearner *moveRelearner); +void sub_0203F9C4(FieldSystem *fieldSystem, struct MoveRelearner *moveRelearner); static inline void InitUnkStructScrCmd408(struct UnkStruct_ScrCmd408 *data, u16 a1, u16 a2, ScriptContext *ctx) { MI_CpuClear8(data, sizeof(struct UnkStruct_ScrCmd408)); data->unk_4 = a1; data->unk_6 = a2; - data->saveData = ctx->fsys->savedata; + data->saveData = ctx->fieldSystem->savedata; } static inline PCBoxAppData *PCBoxAppData_New(ScriptContext *ctx) { PCBoxAppData *ret = AllocFromHeap(HEAP_ID_FIELD, sizeof(PCBoxAppData)); - ret->saveData = ctx->fsys->savedata; + ret->saveData = ctx->fieldSystem->savedata; ret->unk8 = ScriptReadByte(ctx); - ret->fsysUnk10C = &ctx->fsys->unk_10C; + ret->fieldSystemUnk10C = &ctx->fieldSystem->unk_10C; return ret; } @@ -151,25 +151,25 @@ static inline PCBoxAppData *PCBoxAppData_New(ScriptContext *ctx) { void CreateNamingScreen(TaskManager *taskManager, int kind, int param, int maxLen, int initPos, const u16 *defaultStr, u16 *retVar); void sub_0203E960(TaskManager *taskManager, int a1, u16 *a2, u16 *a3, u16 *a4); -void sub_0203F818(FieldSystem *fsys); -void HatchEggInParty(FieldSystem *fsys); -void *sub_0203F074(FieldSystem *fsys, HeapID heapId); -void *sub_0203FA8C(FieldSystem *fsys, HeapID heapId, u16 a2); -void *sub_0203E5D0(HeapID heapId, FieldSystem *fsys, u16 a2); -void *sub_0203FAB4(FieldSystem *fsys, u8 a1, u8 a2, u16 a3, HeapID heapId); -ScratchCardAppData *ScratchOffCards_Create(FieldSystem *fsys, HeapID heapId); -void sub_0203FC14(FieldSystem *fsys, u16 a1, u16 a2); -void *PhoneUI_New(FieldSystem *fsys); -void *sub_0203EEE4(FieldSystem *fsys); -void *sub_0203EF40(FieldSystem *fsys); -void *sub_0203EFA0(FieldSystem *fsys); -void *sub_0203EEA0(FieldSystem *fsys); -void *Fsys_CreateApplication_AlphPuzzle(FieldSystem *fsys, u8 puzzle); -void LaunchHOFCongratsApp(FieldSystem *fsys, HOFCongratsAppArgs *args); -void LaunchCreditsApp(FieldSystem *fsys, CreditsAppArgs *args); +void sub_0203F818(FieldSystem *fieldSystem); +void HatchEggInParty(FieldSystem *fieldSystem); +void *sub_0203F074(FieldSystem *fieldSystem, HeapID heapId); +void *sub_0203FA8C(FieldSystem *fieldSystem, HeapID heapId, u16 a2); +void *sub_0203E5D0(HeapID heapId, FieldSystem *fieldSystem, u16 a2); +void *sub_0203FAB4(FieldSystem *fieldSystem, u8 a1, u8 a2, u16 a3, HeapID heapId); +ScratchCardAppData *ScratchOffCards_Create(FieldSystem *fieldSystem, HeapID heapId); +void sub_0203FC14(FieldSystem *fieldSystem, u16 a1, u16 a2); +void *PhoneUI_New(FieldSystem *fieldSystem); +void *sub_0203EEE4(FieldSystem *fieldSystem); +void *sub_0203EF40(FieldSystem *fieldSystem); +void *sub_0203EFA0(FieldSystem *fieldSystem); +void *sub_0203EEA0(FieldSystem *fieldSystem); +void *FieldSystem_CreateApplication_AlphPuzzle(FieldSystem *fieldSystem, u8 puzzle); +void LaunchHOFCongratsApp(FieldSystem *fieldSystem, HOFCongratsAppArgs *args); +void LaunchCreditsApp(FieldSystem *fieldSystem, CreditsAppArgs *args); void LocationData_BackUp(Location *data); void LocationData_Restore(Location *data); -void sub_0203E3C4(FieldSystem *fsys, BattleSetup *battleSetup); -u32 *LaunchVoltorbFlipApp(FieldSystem *fsys, u32 luck); +void sub_0203E3C4(FieldSystem *fieldSystem, BattleSetup *battleSetup); +u32 *LaunchVoltorbFlipApp(FieldSystem *fieldSystem, u32 luck); #endif //POKEHEARTGOLD_UNK_0203E348_H diff --git a/include/unk_02054514.h b/include/unk_02054514.h index 2390beedf..4482a1437 100644 --- a/include/unk_02054514.h +++ b/include/unk_02054514.h @@ -3,7 +3,7 @@ #include "script.h" -void sub_02054514(FieldSystem *fsys, u8 a1); -void sub_0205453C(FieldSystem *fsys); +void sub_02054514(FieldSystem *fieldSystem, u8 a1); +void sub_0205453C(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_UNK_02054514_H diff --git a/include/unk_02054648.h b/include/unk_02054648.h index 541e2641d..fcea2881a 100644 --- a/include/unk_02054648.h +++ b/include/unk_02054648.h @@ -4,8 +4,8 @@ #include "script.h" void sub_0205489C(u32 *a0, int a1); -u8 GetMetatileBehaviorAt(FieldSystem *fsys, int x, int y); -BOOL sub_020549A8(FieldSystem *fsys, VecFx32 *playerPos, int xInFront, int yInFront, int a4); +u8 GetMetatileBehaviorAt(FieldSystem *fieldSystem, int x, int y); +BOOL sub_020549A8(FieldSystem *fieldSystem, VecFx32 *playerPos, int xInFront, int yInFront, int a4); BOOL sub_02060BFC(LocalMapObject *playerObj, int xInFront, int playerElev, int yInFront); void sub_020659CC(LocalMapObject *object); diff --git a/include/unk_02054E00.h b/include/unk_02054E00.h index 67d989d69..41dd371a4 100644 --- a/include/unk_02054E00.h +++ b/include/unk_02054E00.h @@ -4,15 +4,15 @@ #include "script.h" void sub_02054F14(void); -void FieldSystem_SetSavedMusicId(FieldSystem *fsys, u16 seqNo); -void Fsys_ClearSavedMusicId(FieldSystem *fsys); -u16 FieldSystem_GetOverriddenMusicId(FieldSystem *fsys, u32 mapId); -BOOL FieldSystem_PlayOrFadeToNewMusicId(FieldSystem *fsys, u16 seqNo, int a2); -void Fsys_BeginFadeOutMusic(FieldSystem *fsys, u32 mapId); -void sub_02055110(FieldSystem *fsys, u32 mapId, u32 a2); +void FieldSystem_SetSavedMusicId(FieldSystem *fieldSystem, u16 seqNo); +void FieldSystem_ClearSavedMusicId(FieldSystem *fieldSystem); +u16 FieldSystem_GetOverriddenMusicId(FieldSystem *fieldSystem, u32 mapId); +BOOL FieldSystem_PlayOrFadeToNewMusicId(FieldSystem *fieldSystem, u16 seqNo, int a2); +void FieldSystem_BeginFadeOutMusic(FieldSystem *fieldSystem, u32 mapId); +void sub_02055110(FieldSystem *fieldSystem, u32 mapId, u32 a2); int Trainer_GetEncounterMusic(u16 a0, BOOL isKanto); -u16 GetMapMusic(FieldSystem *fsys, int mapId); -void sub_02055198(FieldSystem *fsys, u16 a1); -void Fsys_BeginFadeOutMusic(FieldSystem *fsys, u32 mapId); +u16 GetMapMusic(FieldSystem *fieldSystem, int mapId); +void sub_02055198(FieldSystem *fieldSystem, u16 a1); +void FieldSystem_BeginFadeOutMusic(FieldSystem *fieldSystem, u32 mapId); #endif //POKEHEARTGOLD_UNK_02054E00_H diff --git a/include/unk_02055418.h b/include/unk_02055418.h index afcba7895..8d27a58cb 100644 --- a/include/unk_02055418.h +++ b/include/unk_02055418.h @@ -12,29 +12,29 @@ typedef struct UnkStruct_020556FC { NNSG3dResFileHeader *unk5c; } UnkStruct_020556FC; //size 0x60 -void FieldSys_StartBugContestTimer(FieldSystem* fsys); -void sub_02055450(FieldSystem* fsys, SysInfo_RTC *sysinfo, RTCDate* date); -void sub_02055478(FieldSystem* fsys, SysInfo_RTC *sysinfo, RTCDate* date, RTCTime* time); -void sub_02055508(FieldSystem* fsys, int unkA); -void sub_020555B4(FieldSystem* fsys, u32 unkA, RTCTime* time); -TIMEOFDAY Field_GetTimeOfDay(FieldSystem *fsys); -TimeOfDayWildParam Field_GetTimeOfDayWildParam(FieldSystem* fsys); -u32 Field_GetMonth(FieldSystem* fsys); -u32 Field_GetDay(FieldSystem* fsys); -u32 Field_GetHour(FieldSystem* fsys); -void sub_02055624(FieldSystem* fsys, RTCDate* date, RTCTime* time); -void FieldSys_GetGameClearTime(FieldSystem* fsys, RTCDate* date, RTCTime* time); -void FieldSys_SetGameClearTime(FieldSystem* fsys); -BOOL sub_02055670(FieldSystem *fsys); -UnkStruct_020556FC * sub_02055680(FieldSystem *fsys, HeapID heapID); +void FieldSystem_StartBugContestTimer(FieldSystem* fieldSystem); +void sub_02055450(FieldSystem* fieldSystem, SysInfo_RTC *sysinfo, RTCDate* date); +void sub_02055478(FieldSystem* fieldSystem, SysInfo_RTC *sysinfo, RTCDate* date, RTCTime* time); +void sub_02055508(FieldSystem* fieldSystem, int unkA); +void sub_020555B4(FieldSystem* fieldSystem, u32 unkA, RTCTime* time); +TIMEOFDAY Field_GetTimeOfDay(FieldSystem *fieldSystem); +TimeOfDayWildParam Field_GetTimeOfDayWildParam(FieldSystem* fieldSystem); +u32 Field_GetMonth(FieldSystem* fieldSystem); +u32 Field_GetDay(FieldSystem* fieldSystem); +u32 Field_GetHour(FieldSystem* fieldSystem); +void sub_02055624(FieldSystem* fieldSystem, RTCDate* date, RTCTime* time); +void FieldSystem_GetGameClearTime(FieldSystem* fieldSystem, RTCDate* date, RTCTime* time); +void FieldSystem_SetGameClearTime(FieldSystem* fieldSystem); +BOOL sub_02055670(FieldSystem *fieldSystem); +UnkStruct_020556FC * sub_02055680(FieldSystem *fieldSystem, HeapID heapID); void sub_020556A8(UnkStruct_020556FC *unkPtr); -void sub_020556B8(FieldSystem* fsys); -void sub_020556C8(FieldSystem *fsys, UnkStruct_020556FC *unkPtrB); +void sub_020556B8(FieldSystem* fieldSystem); +void sub_020556C8(FieldSystem *fieldSystem, UnkStruct_020556FC *unkPtrB); void sub_020556FC(struct UnkStruct_020556FC *unkPtr); -BOOL sub_02055708(FieldSystem* fsys, LocalMapObject* mapObject); -BOOL sub_02055760(FieldSystem* fsys, LocalMapObject* mapObj); -BOOL sub_02055780(FieldSystem* fsys, LocalMapObject* mapObj); -u32 FieldSys_ApricornTree_TryGetApricorn(FieldSystem* fsys, LocalMapObject* mapObject); -int FieldSys_ApricornTree_GetApricorn(FieldSystem* fsys, LocalMapObject* mapObject); +BOOL sub_02055708(FieldSystem* fieldSystem, LocalMapObject* mapObject); +BOOL sub_02055760(FieldSystem* fieldSystem, LocalMapObject* mapObj); +BOOL sub_02055780(FieldSystem* fieldSystem, LocalMapObject* mapObj); +u32 FieldSystem_ApricornTree_TryGetApricorn(FieldSystem* fieldSystem, LocalMapObject* mapObject); +int FieldSystem_ApricornTree_GetApricorn(FieldSystem* fieldSystem, LocalMapObject* mapObject); #endif //POKEHEARTGOLD_UNK_02055418_H diff --git a/include/unk_02055BF0.h b/include/unk_02055BF0.h index 00f2923bf..f315ad6be 100644 --- a/include/unk_02055BF0.h +++ b/include/unk_02055BF0.h @@ -28,8 +28,8 @@ typedef struct FieldTransitionEnvironment { } FieldTransitionEnvironment; //size: 0x28 void NewFieldFadeEnvironment(TaskManager* man, int pattern, int typeTop, int typeBottom, u16 colour, int duration, int framesPer, HeapID heapID); -void NewFieldTransitionEnvironment(FieldSystem* fsys, int mapID, int warpID, int x, int z, int dir, u32 transNo); -void sub_02055CD8(FieldSystem* fsys, int mapID, int warpID, int x, int z, int dir); +void NewFieldTransitionEnvironment(FieldSystem* fieldSystem, int mapID, int warpID, int x, int z, int dir, u32 transNo); +void sub_02055CD8(FieldSystem* fieldSystem, int mapID, int warpID, int x, int z, int dir); BOOL sub_02056004(TaskManager *man); BOOL sub_02056040(TaskManager *man); diff --git a/include/unk_02056680.h b/include/unk_02056680.h index 985e45d4e..c1993a7d3 100644 --- a/include/unk_02056680.h +++ b/include/unk_02056680.h @@ -14,10 +14,10 @@ BOOL sub_020566F8(TaskManager* man); BOOL sub_0205681C(TaskManager* man); BOOL sub_020567B4(TaskManager* man); BOOL sub_02056938(TaskManager* man); -void sub_02056A54(FieldSystem* fsys); -void sub_02056AEC(FieldSystem* fsys); -void sub_02056BC8(FieldSystem* fsys); -void sub_02056C64(FieldSystem* fsys); +void sub_02056A54(FieldSystem* fieldSystem); +void sub_02056AEC(FieldSystem* fieldSystem); +void sub_02056BC8(FieldSystem* fieldSystem); +void sub_02056C64(FieldSystem* fieldSystem); void sub_02056D00(TaskManager *taskManager, u16 a1); #endif //POKEHEARTGOLD_UNK_02056680_H diff --git a/include/unk_02056D7C.h b/include/unk_02056D7C.h index 077b9c885..3e4b09675 100644 --- a/include/unk_02056D7C.h +++ b/include/unk_02056D7C.h @@ -4,7 +4,7 @@ #include "script.h" void sub_02056E38(void); -void sub_020573F0(FieldSystem *fsys, int a1); +void sub_020573F0(FieldSystem *fieldSystem, int a1); int sub_02057A0C(void); void sub_02057F28(u16 val); diff --git a/include/unk_02058034.h b/include/unk_02058034.h index 699802ba4..65a51ce0e 100644 --- a/include/unk_02058034.h +++ b/include/unk_02058034.h @@ -3,7 +3,7 @@ #include "script.h" -void sub_02058190(FieldSystem *fsys); +void sub_02058190(FieldSystem *fieldSystem); void sub_02058284(void); void sub_020582A8(void); diff --git a/include/unk_02058AEC.h b/include/unk_02058AEC.h index 4e290d2ad..a5a3c9964 100644 --- a/include/unk_02058AEC.h +++ b/include/unk_02058AEC.h @@ -3,14 +3,14 @@ #include "script.h" -struct UnkStruct_02059E1C *sub_02059DB0(FieldSystem *fsys); -void sub_02059E04(FieldSystem *fsys); -int sub_0205A200(struct UnkStruct_02059E1C *fsys_unk80, int objId); -int sub_0205A284(struct UnkStruct_02059E1C *fsys_unk80, int objId, u16 a2); -int sub_0205A358(struct UnkStruct_02059E1C *fsys_unk80); -u32 sub_0205A35C(struct UnkStruct_02059E1C *fsys_unk80); -void sub_0205A3B0(struct UnkStruct_02059E1C *fsys_unk80, int a1, int a2); -int sub_0205A39C(struct UnkStruct_02059E1C *fsys_unk80); -int sub_0205A47C(struct UnkStruct_02059E1C *fsys_unk80, int a1); +struct UnkStruct_02059E1C *sub_02059DB0(FieldSystem *fieldSystem); +void sub_02059E04(FieldSystem *fieldSystem); +int sub_0205A200(struct UnkStruct_02059E1C *fieldSystem_unk80, int objId); +int sub_0205A284(struct UnkStruct_02059E1C *fieldSystem_unk80, int objId, u16 a2); +int sub_0205A358(struct UnkStruct_02059E1C *fieldSystem_unk80); +u32 sub_0205A35C(struct UnkStruct_02059E1C *fieldSystem_unk80); +void sub_0205A3B0(struct UnkStruct_02059E1C *fieldSystem_unk80, int a1, int a2); +int sub_0205A39C(struct UnkStruct_02059E1C *fieldSystem_unk80); +int sub_0205A47C(struct UnkStruct_02059E1C *fieldSystem_unk80, int a1); #endif //POKEHEARTGOLD_UNK_02058AEC_H diff --git a/include/unk_0205A44C.h b/include/unk_0205A44C.h index dbd866c6d..acfc20d10 100644 --- a/include/unk_0205A44C.h +++ b/include/unk_0205A44C.h @@ -4,14 +4,14 @@ #include "script.h" #include "easy_chat.h" -BOOL sub_0205A478(struct UnkStruct_02059E1C *fsys_unk80); -BOOL sub_0205A4D8(struct UnkStruct_02059E1C *fsys_unk80); +BOOL sub_0205A478(struct UnkStruct_02059E1C *fieldSystem_unk80); +BOOL sub_0205A4D8(struct UnkStruct_02059E1C *fieldSystem_unk80); int sub_0205A6AC(MessageFormat *msgFmt); -int sub_0205A750(struct UnkStruct_02059E1C *fsys_unk80, int objId, int a2, MessageFormat *msgFmt); +int sub_0205A750(struct UnkStruct_02059E1C *fieldSystem_unk80, int objId, int a2, MessageFormat *msgFmt); u32 sub_0205A894(void); void sub_0205A904(int command); -int sub_0205A9A0(struct UnkStruct_02059E1C *fsys_unk80, MessageFormat *msgFmt); +int sub_0205A9A0(struct UnkStruct_02059E1C *fieldSystem_unk80, MessageFormat *msgFmt); void sub_0205AA9C(MessageFormat *msgFmt, u16 a1, u16 objId, PlayerProfile *profile, SaveEasyChat *easyChat); -void sub_0205ABB0(struct UnkStruct_02059E1C *fsys_unk80); +void sub_0205ABB0(struct UnkStruct_02059E1C *fieldSystem_unk80); #endif //POKEHEARTGOLD_UNK_0205A44C_H diff --git a/include/unk_0205CB48.h b/include/unk_0205CB48.h index ca5a8a0fc..90553ede7 100644 --- a/include/unk_0205CB48.h +++ b/include/unk_0205CB48.h @@ -5,7 +5,7 @@ void PlayerAvatar_GetCoordsInFront(PlayerAvatar *playerAvatar, int *x, int *z); void sub_0205CE68(PlayerAvatar *playerAvatar); -void sub_0205CB48(PlayerAvatar *playerAvatar, FsysUnkSub2C *a1, int a2, u16 a3, u16 a4, int a5); +void sub_0205CB48(PlayerAvatar *playerAvatar, FieldSystemUnkSub2C *a1, int a2, u16 a3, u16 a4, int a5); void sub_0205CF44(PlayerAvatar *playerAvatar); #endif //POKEHEARTGOLD_UNK_0205CB48_H diff --git a/include/unk_020632B0.h b/include/unk_020632B0.h index 6455aa429..9fcf87f22 100644 --- a/include/unk_020632B0.h +++ b/include/unk_020632B0.h @@ -3,7 +3,7 @@ #include "script.h" -int sub_0206457C(FieldSystem *fsys, LocalMapObject *localMapObject, PlayerAvatar *playerAvatar, int a3, int a4, int a5, int a6, u16 trainerNum); +int sub_0206457C(FieldSystem *fieldSystem, LocalMapObject *localMapObject, PlayerAvatar *playerAvatar, int a3, int a4, int a5, int a6, u16 trainerNum); BOOL sub_02064598(void); void sub_020645AC(int a0); diff --git a/include/unk_020648EC.h b/include/unk_020648EC.h index 2f26860b3..4aa427337 100644 --- a/include/unk_020648EC.h +++ b/include/unk_020648EC.h @@ -3,8 +3,8 @@ #include "field_system.h" -void sub_020648EC(FieldSystem* fsys); -void sub_02064910(FieldSystem* fsys); -BOOL sub_02064938(FieldSystem *fsys, u32 a1, u32 a2, u32 a3, u32 a4); +void sub_020648EC(FieldSystem* fieldSystem); +void sub_02064910(FieldSystem* fieldSystem); +BOOL sub_02064938(FieldSystem *fieldSystem, u32 a1, u32 a2, u32 a3, u32 a4); #endif //POKEHEARTGOLD_UNK_020648EC_H diff --git a/include/unk_02066EDC.h b/include/unk_02066EDC.h index 560c68646..f1d1e40e0 100644 --- a/include/unk_02066EDC.h +++ b/include/unk_02066EDC.h @@ -3,8 +3,8 @@ #include "script.h" -void sub_02067484(FieldSystem *fsys, void *); -BOOL sub_02067584(FieldSystem *fsys); +void sub_02067484(FieldSystem *fieldSystem, void *); +BOOL sub_02067584(FieldSystem *fieldSystem); void sub_020674BC(SaveData *saveData); void sub_0206759C(SaveData *saveData, int a1); diff --git a/include/unk_0206793C.h b/include/unk_0206793C.h index 3c45b83e3..ad090c795 100644 --- a/include/unk_0206793C.h +++ b/include/unk_0206793C.h @@ -6,13 +6,13 @@ typedef struct UnkStruct_0206793C UnkStruct_0206793C; -void Fsys_ClearFollowingTrainer(FieldSystem *fsys); -void sub_02067AE4(FieldSystem *fsys); -void sub_02067A88(FieldSystem *fsys); -void sub_02067B88(FieldSystem *fsys); -void sub_02067BA4(FieldSystem *fsys); -void sub_02067BC0(FieldSystem *fsys); -void sub_02067BE8(FieldSystem *fsys); +void FieldSystem_ClearFollowingTrainer(FieldSystem *fieldSystem); +void sub_02067AE4(FieldSystem *fieldSystem); +void sub_02067A88(FieldSystem *fieldSystem); +void sub_02067B88(FieldSystem *fieldSystem); +void sub_02067BA4(FieldSystem *fieldSystem); +void sub_02067BC0(FieldSystem *fieldSystem); +void sub_02067BE8(FieldSystem *fieldSystem); BOOL sub_02068CCC(UnkStruct_0206793C *unk); void CallTask_NPCTrade(TaskManager *taskManager, NPCTradeAppData *tradeWork, u16 arg, HeapID heapId); diff --git a/include/unk_02067A80.h b/include/unk_02067A80.h index ff592706a..33d458a32 100644 --- a/include/unk_02067A80.h +++ b/include/unk_02067A80.h @@ -3,6 +3,6 @@ #include "script.h" -void sub_02067A80(FieldSystem *fsys, u8 a1); +void sub_02067A80(FieldSystem *fieldSystem, u8 a1); #endif //POKEHEARTGOLD_UNK_02067A80_H diff --git a/include/unk_02068DE0.h b/include/unk_02068DE0.h index 5882628be..46e87eb10 100644 --- a/include/unk_02068DE0.h +++ b/include/unk_02068DE0.h @@ -3,14 +3,14 @@ #include "script.h" -void InitEcruteakGym(FieldSystem *fsys); -void InitCianwoodGym(FieldSystem *fsys); -void InitVermilionGym(FieldSystem *fsys); -void PlaceVermilionGymSwitches(FieldSystem *fsys); -void InitVioletGym(FieldSystem *fsys); -void InitAzaleaGym(FieldSystem *fsys); -void InitBlackthornGym(FieldSystem *fsys); -void InitFuchsiaGym(FieldSystem *fsys); -void InitViridianGym(FieldSystem *fsys); +void InitEcruteakGym(FieldSystem *fieldSystem); +void InitCianwoodGym(FieldSystem *fieldSystem); +void InitVermilionGym(FieldSystem *fieldSystem); +void PlaceVermilionGymSwitches(FieldSystem *fieldSystem); +void InitVioletGym(FieldSystem *fieldSystem); +void InitAzaleaGym(FieldSystem *fieldSystem); +void InitBlackthornGym(FieldSystem *fieldSystem); +void InitFuchsiaGym(FieldSystem *fieldSystem); +void InitViridianGym(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_UNK_02068DE0_H diff --git a/include/unk_02068FC8.h b/include/unk_02068FC8.h index 53081897c..ed1c0946f 100644 --- a/include/unk_02068FC8.h +++ b/include/unk_02068FC8.h @@ -3,7 +3,7 @@ #include "script.h" -void sub_02069464(FieldSystem *fsys); -int sub_020691E8(FieldSystem *fsys); +void sub_02069464(FieldSystem *fieldSystem); +int sub_020691E8(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_UNK_02068FC8_H diff --git a/include/unk_0206D494.h b/include/unk_0206D494.h index 6f64c0a58..eedf95004 100644 --- a/include/unk_0206D494.h +++ b/include/unk_0206D494.h @@ -7,11 +7,11 @@ BOOL MonIsInGameTradePoke(Pokemon *mon, u8 tradeno); BOOL sub_0206D8D0(Pokemon *mon, SaveData *saveData); -BUGCONTEST *FieldSys_BugContest_Get(FieldSystem *fsys); +BUGCONTEST *FieldSystem_BugContest_Get(FieldSystem *fieldSystem); u16 *BugContest_GetSportBallsAddr(BUGCONTEST *contest); -void FieldSys_IncrementBugContestTimer(FieldSystem *fsys, int a1); -void Fsys_InitMystriStageGymmick(FieldSystem *fsys); -void sub_0206DB58(TaskManager *taskman, FieldSystem *fsys); +void FieldSystem_IncrementBugContestTimer(FieldSystem *fieldSystem, int a1); +void FieldSystem_InitMystriStageGymmick(FieldSystem *fieldSystem); +void sub_0206DB58(TaskManager *taskman, FieldSystem *fieldSystem); void sub_0206DB94(TaskManager *man, int a1); #endif //POKEHEARTGOLD_UNK_0206D494_H diff --git a/include/unk_02092BE8.h b/include/unk_02092BE8.h index d4b1fa4b5..7c210a78f 100644 --- a/include/unk_02092BE8.h +++ b/include/unk_02092BE8.h @@ -12,7 +12,7 @@ typedef struct UnkPokegearstruct_2c{ u8 unk00; u8 unk01; //One of the variables inside FieldSystem with offset 0x110 (currently unk_10C[1];) u16 mapMusicID; //0x02 (surf-overriden) - u8 unk04; //related to unk_var2 from UnkFsysSub_114 + u8 unk04; //related to unk_var2 from UnkFieldSystemSub_114 u8 unk05; u8 unk06; u8 playerGender; //0x07 @@ -42,7 +42,7 @@ void sub_02092D80(FieldSystem* sys, Unk_PokegearSTRUCT_2C* ptr); void sub_02092D8C(FieldSystem* sys, Unk_PokegearSTRUCT_2C* ptr); GearPhoneRingManager* GearPhoneRingManager_New(HeapID heapId, FieldSystem* sys); void sub_02092DD8(GearPhoneRingManager * ptr); -GearPhoneRingManager* Fsys_GetGearPhoneRingManager(FieldSystem* sys); +GearPhoneRingManager* FieldSystem_GetGearPhoneRingManager(FieldSystem* sys); void sub_02092DF4(GearPhoneRingManager* ptr); BOOL sub_02092E08(GearPhoneRingManager* ptr); PhoneBookEntry* sub_02092E10(GearPhoneRingManager* ptr); diff --git a/include/unk_02095DF4.h b/include/unk_02095DF4.h index 9f7cf89e9..3cd43a386 100644 --- a/include/unk_02095DF4.h +++ b/include/unk_02095DF4.h @@ -3,6 +3,6 @@ #include "script.h" -void sub_02095DF4(FieldSystem *fsys, u8 a1, u8 a2, u8 a3, u16 *a4, u16 *a5, u16 *a6, u16 *a7); +void sub_02095DF4(FieldSystem *fieldSystem, u8 a1, u8 a2, u8 a3, u16 *a4, u16 *a5, u16 *a6, u16 *a7); #endif //POKEHEARTGOLD_UNK_02095DF4_H diff --git a/include/unk_02097024.h b/include/unk_02097024.h index 03369f190..a432b3f74 100644 --- a/include/unk_02097024.h +++ b/include/unk_02097024.h @@ -2,6 +2,6 @@ #define POKEHEARTGOLD_UNK_02097024_H BOOL sub_020970C0(void *); -void *sub_0209707C(FieldSystem *fsys); +void *sub_0209707C(FieldSystem *fieldSystem); #endif //POKEHEARTGOLD_UNK_02097024_H diff --git a/include/unk_020977CC.h b/include/unk_020977CC.h index d416e6ebe..e1fa22daf 100644 --- a/include/unk_020977CC.h +++ b/include/unk_020977CC.h @@ -3,6 +3,6 @@ #include "script.h" -void sub_020977CC(FieldSystem *fsys, u8 a1, u8 a2, u16 a3, u16 a4, u16 a5); +void sub_020977CC(FieldSystem *fieldSystem, u8 a1, u8 a2, u16 a3, u16 a4, u16 a5); #endif //POKEHEARTGOLD_UNK_020977CC_H diff --git a/include/unk_020979A8.h b/include/unk_020979A8.h index febe58caa..98648bae2 100644 --- a/include/unk_020979A8.h +++ b/include/unk_020979A8.h @@ -3,6 +3,6 @@ #include "script.h" -void sub_020979A8(FieldSystem *fsys, u8 a1, u8 a2, u16 a3, u16 a4, u16 a5); +void sub_020979A8(FieldSystem *fieldSystem, u8 a1, u8 a2, u16 a3, u16 a4, u16 a5); #endif //POKEHEARTGOLD_UNK_020979A8_H diff --git a/include/unk_02097BE0.h b/include/unk_02097BE0.h index 0d3e1bb52..813dcc69f 100644 --- a/include/unk_02097BE0.h +++ b/include/unk_02097BE0.h @@ -3,6 +3,6 @@ #include "script.h" -void sub_02097BE0(FieldSystem *fsys, u16 scene); +void sub_02097BE0(FieldSystem *fieldSystem, u16 scene); #endif //POKEHEARTGOLD_UNK_02097BE0_H diff --git a/include/unk_02097D3C.h b/include/unk_02097D3C.h index 225b53d5c..48ae61df5 100644 --- a/include/unk_02097D3C.h +++ b/include/unk_02097D3C.h @@ -3,6 +3,6 @@ #include "script.h" -void sub_02097D3C(FieldSystem *fsys, u8 a1, u8 a2); +void sub_02097D3C(FieldSystem *fieldSystem, u8 a1, u8 a2); #endif //POKEHEARTGOLD_UNK_02097D3C_H diff --git a/src/choose_starter.c b/src/choose_starter.c index 297941f0f..c77e894b0 100644 --- a/src/choose_starter.c +++ b/src/choose_starter.c @@ -17,14 +17,14 @@ struct ChooseStarterTaskData { static BOOL CreateStarter(TaskManager *taskManager); -void LaunchStarterChoiceScene(FieldSystem *fsys) { +void LaunchStarterChoiceScene(FieldSystem *fieldSystem) { struct ChooseStarterTaskData *env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct ChooseStarterTaskData)); env->state = 0; - TaskManager_Call(fsys->taskman, CreateStarter, env); + TaskManager_Call(fieldSystem->taskman, CreateStarter, env); } static BOOL CreateStarter(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct ChooseStarterTaskData *env = TaskManager_GetEnv(taskManager); int i; u32 mapsec; @@ -45,14 +45,14 @@ static BOOL CreateStarter(TaskManager *taskManager) { SPECIES_CYNDAQUIL, SPECIES_TOTODILE, }; - mapsec = MapHeader_GetMapSec(fsys->location->mapId); //sp14 + mapsec = MapHeader_GetMapSec(fieldSystem->location->mapId); //sp14 env->args = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct ChooseStarterAppArgs)); env->args->cursorPos = 0; - env->args->options = Save_PlayerData_GetOptionsAddr(fsys->savedata); + env->args->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); for (i = 0; i < (int)NELEMS(species); i++) { Pokemon *mon = &env->args->starters[i]; - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(fsys->savedata); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata); ZeroMonData(mon); CreateMon(mon, species[i], 5, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); sub_020720FC(mon, profile, BALL_POKE, mapsec, 12, HEAP_ID_FIELD); @@ -62,30 +62,30 @@ static BOOL CreateStarter(TaskManager *taskManager) { } } } - LaunchChooseStarterApp(fsys, env->args); + LaunchChooseStarterApp(fieldSystem, env->args); sub_0203E30C(); env->state = 2; break; case 2: - if (FieldSys_ApplicationIsRunning(fsys)) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { break; } env->state = 3; break; case 3: { - Pokedex *pokedex = Save_Pokedex_Get(fsys->savedata); - party = SaveArray_Party_Get(fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(fieldSystem->savedata); + party = SaveArray_Party_Get(fieldSystem->savedata); Pokemon *myChoice = &env->args->starters[env->args->cursorPos]; if (Party_AddMon(party, myChoice)) { - UpdatePokedexWithReceivedSpecies(fsys->savedata, myChoice); + UpdatePokedexWithReceivedSpecies(fieldSystem->savedata, myChoice); } Pokedex_SetMonCaughtFlag(pokedex, Party_GetMonByIndex(party, 0)); env->state = 4; - sub_020505C0(fsys); + sub_020505C0(fieldSystem); break; } case 4: - if (!sub_020505C8(fsys)) { + if (!sub_020505C8(fieldSystem)) { break; } BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, HEAP_ID_4); diff --git a/src/encounter.c b/src/encounter.c index f85de9007..fd1e9063c 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -44,21 +44,21 @@ #include "constants/game_stat.h" #include "fielddata/script/scr_seq/event_D10R0101.h" -static void sub_02051660(FieldSystem *fsys, BattleSetup *setup); +static void sub_02051660(FieldSystem *fieldSystem, BattleSetup *setup); static BOOL sub_02050660(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); BattleSetup *battleSetup = TaskManager_GetEnv(man); int *state = TaskManager_GetStatePtr(man); switch (*state) { case 0: - sub_0203E3C4(fsys, battleSetup); + sub_0203E3C4(fieldSystem, battleSetup); sub_0203E354(); (*state)++; break; case 1: - if (!FieldSys_ApplicationIsRunning(fsys)) { + if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { return TRUE; } break; @@ -88,28 +88,28 @@ static void Encounter_Delete(ENCOUNTER *work) { FreeToHeap(work); } -static BOOL sub_020506F4(ENCOUNTER *work, FieldSystem *fsys) { +static BOOL sub_020506F4(ENCOUNTER *work, FieldSystem *fieldSystem) { if (work->winFlag != NULL) { *(work->winFlag) = work->setup->winFlag; } - VarSet(fsys, VAR_BATTLE_RESULT, work->setup->winFlag); + VarSet(fieldSystem, VAR_BATTLE_RESULT, work->setup->winFlag); return IsBattleResultWin(work->setup->winFlag); } -static void sub_02050724(BattleSetup *setup, FieldSystem *fsys) { +static void sub_02050724(BattleSetup *setup, FieldSystem *fieldSystem) { if (!(setup->flags & BATTLE_TYPE_DEBUG)) { - sub_0205239C(setup, fsys); + sub_0205239C(setup, fieldSystem); } } static BOOL sub_02050738(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); ENCOUNTER *encounter = TaskManager_GetEnv(man); int *state = TaskManager_GetStatePtr(man); switch (*state) { case 0: - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); sub_02055218(man, encounter->effect, encounter->bgm); (*state)++; break; @@ -122,34 +122,34 @@ static BOOL sub_02050738(TaskManager *man) { (*state)++; break; case 3: - sub_02050724(encounter->setup, fsys); + sub_02050724(encounter->setup, fieldSystem); if (encounter->setup->flags == (0) || encounter->setup->flags == (1 << 8) || encounter->setup->flags == 0x4A) { - sub_02093070(fsys); - sub_020930C4(fsys); + sub_02093070(fieldSystem); + sub_020930C4(fieldSystem); } - fsys->unk7E = 0; - fsys->unk7C = 0; + fieldSystem->unk7E = 0; + fieldSystem->unk7C = 0; - if (sub_020506F4(encounter, fsys) == 0) { + if (sub_020506F4(encounter, fieldSystem) == 0) { if (encounter->setup->flags & (1 << 11)) { - HealParty(SaveArray_Party_Get(fsys->savedata)); + HealParty(SaveArray_Party_Get(fieldSystem->savedata)); } else { Encounter_Delete(encounter); return TRUE; } } - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fsys->savedata))) { - HealParty(SaveArray_Party_Get(fsys->savedata)); + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->savedata))) { + HealParty(SaveArray_Party_Get(fieldSystem->savedata)); } - sub_02051660(fsys, encounter->setup); + sub_02051660(fieldSystem, encounter->setup); sub_020552A4(man); (*state)++; break; case 4: - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); sub_0205532C(man); (*state)++; break; @@ -166,22 +166,22 @@ static void sub_0205085C(TaskManager *man, BattleSetup *setup, int effect, int b TaskManager_Call(man, sub_02050738, encounter); } -static void sub_0205087C(int a0, FieldSystem *fsys) { +static void sub_0205087C(int a0, FieldSystem *fieldSystem) { switch(a0 & 15) { case 1: case 6: - sub_02034AC0(fsys->savedata, 1); + sub_02034AC0(fieldSystem->savedata, 1); break; case 2: case 5: - sub_02034AC0(fsys->savedata, -1); + sub_02034AC0(fieldSystem->savedata, -1); break; } } static BOOL sub_020508B8(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); ENCOUNTER *encounter = TaskManager_GetEnv(man); int *state = TaskManager_GetStatePtr(man); @@ -199,10 +199,10 @@ static BOOL sub_020508B8(TaskManager *man) { (*state)++; break; case 3: - sub_0205087C(encounter->setup->winFlag, fsys); - sub_02052444(encounter->setup, fsys); - GameStats_AddSpecial(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK20); - sub_020506F4(encounter, fsys); + 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); sub_020552A4(man); (*state)++; break; @@ -215,7 +215,7 @@ static BOOL sub_020508B8(TaskManager *man) { } static BOOL sub_02050960(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); ENCOUNTER *encounter = TaskManager_GetEnv(man); int *state = TaskManager_GetStatePtr(man); @@ -227,10 +227,10 @@ static BOOL sub_02050960(TaskManager *man) { (*state)++; break; case 1: - sub_0205087C(encounter->setup->winFlag, fsys); - sub_02052444(encounter->setup, fsys); - GameStats_AddSpecial(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK20); - sub_020506F4(encounter, fsys); + 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: @@ -242,7 +242,7 @@ static BOOL sub_02050960(TaskManager *man) { } static BOOL sub_020509F0(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); ENCOUNTER *encounter = TaskManager_GetEnv(man); int *state = TaskManager_GetStatePtr(man); @@ -260,13 +260,13 @@ static BOOL sub_020509F0(TaskManager *man) { (*state)++; break; case 3: - sub_02052444(encounter->setup, fsys); + sub_02052444(encounter->setup, fieldSystem); - if (fsys->unkA0 != NULL) { - sub_02067484(fsys, &encounter->setup->unk78); + if (fieldSystem->unkA0 != NULL) { + sub_02067484(fieldSystem, &encounter->setup->unk78); } - sub_020506F4(encounter, fsys); + sub_020506F4(encounter, fieldSystem); sub_020552A4(man); (*state)++; @@ -309,25 +309,25 @@ static BOOL Task_SafariEncounter(TaskManager *man); static BOOL Task_BugContestEncounter(TaskManager *man); static BOOL Task_WildEncounter(TaskManager *man); -void sub_02050B08(FieldSystem *fsys, BattleSetup *setup) { - SaveVarsFlags *flags = Save_VarsFlags_Get(fsys->savedata); +void sub_02050B08(FieldSystem *fieldSystem, BattleSetup *setup) { + SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->savedata); int a0 = sub_020517E8(setup); int a1 = sub_020517FC(setup); if (Save_VarsFlags_CheckSafariSysFlag(flags)) { ENCOUNTER *encounter = Encounter_New(setup, a0, a1, NULL); - FieldSys_CreateTask(fsys, Task_SafariEncounter, encounter); + FieldSystem_CreateTask(fieldSystem, Task_SafariEncounter, encounter); } else if (CheckFlag996(flags)) { ENCOUNTER *encounter = Encounter_New(setup, a0, a1, NULL); - FieldSys_CreateTask(fsys, Task_BugContestEncounter, encounter); + FieldSystem_CreateTask(fieldSystem, Task_BugContestEncounter, encounter); } else { WILD_ENCOUNTER *encounter = WildEncounter_New(setup, a0, a1, NULL); - FieldSys_CreateTask(fsys, Task_WildEncounter, encounter); + FieldSystem_CreateTask(fieldSystem, Task_WildEncounter, encounter); } } -void sub_02050B90(FieldSystem *fsys, TaskManager *man, BattleSetup *setup) { - SaveVarsFlags *flags = Save_VarsFlags_Get(fsys->savedata); +void sub_02050B90(FieldSystem *fieldSystem, TaskManager *man, BattleSetup *setup) { + SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->savedata); int a0 = sub_020517E8(setup); int a1 = sub_020517FC(setup); @@ -344,13 +344,13 @@ void sub_02050B90(FieldSystem *fsys, TaskManager *man, BattleSetup *setup) { } static BOOL Task_WildEncounter(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); WILD_ENCOUNTER *encounter = TaskManager_GetEnv(man); switch (encounter->state) { case 0: - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); - GameStats_Inc(Save_GameStats_Get(fsys->savedata), 8); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8); sub_02055218(man, encounter->effect, encounter->bgm); encounter->state++; break; @@ -363,9 +363,9 @@ static BOOL Task_WildEncounter(TaskManager *man) { encounter->state++; break; case 3: - sub_02050724(encounter->setup, fsys); - sub_02093070(fsys); - sub_020930C4(fsys); + sub_02050724(encounter->setup, fieldSystem); + sub_02093070(fieldSystem); + sub_020930C4(fieldSystem); if (IsBattleResultWin(encounter->setup->winFlag) == FALSE) { WildEncounter_Delete(encounter); @@ -373,22 +373,22 @@ static BOOL Task_WildEncounter(TaskManager *man) { return FALSE; } - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fsys->savedata))) { - HealParty(SaveArray_Party_Get(fsys->savedata)); + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->savedata))) { + HealParty(SaveArray_Party_Get(fieldSystem->savedata)); } - sub_02051660(fsys, encounter->setup); + sub_02051660(fieldSystem, encounter->setup); sub_020552A4(man); encounter->state++; break; case 4: - ov02_BattleExit_HandleRoamerAction(fsys, encounter->setup); + ov02_BattleExit_HandleRoamerAction(fieldSystem, encounter->setup); sub_0205532C(man); encounter->state++; break; case 5: - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); WildEncounter_Delete(encounter); return TRUE; break; @@ -397,15 +397,15 @@ static BOOL Task_WildEncounter(TaskManager *man) { } static BOOL Task_SafariEncounter(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); ENCOUNTER *encounter = TaskManager_GetEnv(man); int *state = TaskManager_GetStatePtr(man); - u16 *safariBall = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fsys->savedata)); + u16 *safariBall = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fieldSystem->savedata)); switch (*state) { case 0: - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); - GameStats_Inc(Save_GameStats_Get(fsys->savedata), 8); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8); sub_02055218(man, encounter->effect, encounter->bgm); (*state)++; break; @@ -418,18 +418,18 @@ static BOOL Task_SafariEncounter(TaskManager *man) { (*state)++; break; case 3: - sub_02050724(encounter->setup, fsys); + sub_02050724(encounter->setup, fieldSystem); if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { - sub_020270C4(fsys->savedata); + sub_020270C4(fieldSystem->savedata); Party_GetMonByIndex(encounter->setup->party[1], 0); - sub_02093070(fsys); - sub_020930C4(fsys); + sub_02093070(fieldSystem); + sub_020930C4(fieldSystem); } - sub_02051660(fsys, encounter->setup); + sub_02051660(fieldSystem, encounter->setup); if (*safariBall == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) { - Location *loc = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fsys->savedata)); + Location *loc = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata)); sub_020537A8(man, loc); } else { *state = 5; @@ -447,7 +447,7 @@ static BOOL Task_SafariEncounter(TaskManager *man) { (*state)++; break; case 6: - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); sub_0205532C(man); (*state)++; break; @@ -457,8 +457,8 @@ static BOOL Task_SafariEncounter(TaskManager *man) { QueueScript(man, std_safari_balls_out, NULL, NULL); } } else { - PC_STORAGE *pc = GetStoragePCPointer(fsys->savedata); - Party *party = SaveArray_Party_Get(fsys->savedata); + PC_STORAGE *pc = GetStoragePCPointer(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); } @@ -473,16 +473,16 @@ static BOOL Task_SafariEncounter(TaskManager *man) { } static BOOL Task_BugContestEncounter(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); ENCOUNTER *encounter = TaskManager_GetEnv(man); - BUGCONTEST *contest = FieldSys_BugContest_Get(fsys); + BUGCONTEST *contest = FieldSystem_BugContest_Get(fieldSystem); int *state = TaskManager_GetStatePtr(man); u16 *sportBall = BugContest_GetSportBallsAddr(contest); switch (*state) { case 0: - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); - GameStats_Inc(Save_GameStats_Get(fsys->savedata), 8); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8); sub_02055218(man, encounter->effect, encounter->bgm); (*state)++; break; @@ -495,25 +495,25 @@ static BOOL Task_BugContestEncounter(TaskManager *man) { (*state)++; break; case 3: - sub_02050724(encounter->setup, fsys); + sub_02050724(encounter->setup, fieldSystem); if (!IsBattleResultWin(encounter->setup->winFlag)) { Encounter_Delete(encounter); TaskManager_Jump(man, sub_0205298C, NULL); return FALSE; } - sub_02051660(fsys, encounter->setup); + sub_02051660(fieldSystem, encounter->setup); if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) { sub_0206DB94(man, encounter->setup->unk1C8); - sub_02093070(fsys); - sub_020930C4(fsys); + sub_02093070(fieldSystem); + sub_020930C4(fieldSystem); } (*state)++; break; case 4: if (*sportBall == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) { - sub_0206DB58(man, fsys); + sub_0206DB58(man, fieldSystem); } (*state)++; break; @@ -522,7 +522,7 @@ static BOOL Task_BugContestEncounter(TaskManager *man) { (*state)++; break; case 6: - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); sub_0205532C(man); (*state)++; break; @@ -539,30 +539,30 @@ static BOOL Task_BugContestEncounter(TaskManager *man) { void SetupAndStartWildBattle(TaskManager *man, u16 mon, u8 level, u32 *winFlag, BOOL canFlee, BOOL shiny) { BattleSetup *setup; - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); setup = BattleSetup_New(HEAP_ID_FIELD, 0); - BattleSetup_InitFromFsys(setup, fsys); - ov02_02247F30(fsys, mon, level, shiny, setup); + BattleSetup_InitFromFieldSystem(setup, fieldSystem); + ov02_02247F30(fieldSystem, mon, level, shiny, setup); if (canFlee) { setup->unkCC |= 8; } - GameStats_Inc(Save_GameStats_Get(fsys->savedata), 8); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8); sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag); } void sub_02051090(TaskManager *man, u16 species, u8 level, u32 *winFlag, BOOL canRun) { BattleSetup *setup; - FieldSystem *fsys; + FieldSystem *fieldSystem; int var; - fsys = TaskManager_GetFieldSystem(man); + fieldSystem = TaskManager_GetFieldSystem(man); setup = BattleSetup_New(HEAP_ID_FIELD, 0); - BattleSetup_InitFromFsys(setup, fsys); + BattleSetup_InitFromFieldSystem(setup, fieldSystem); - ov02_02247F30(fsys, species, level, 0, setup); + ov02_02247F30(fieldSystem, species, level, 0, setup); var = 1; @@ -572,20 +572,20 @@ void sub_02051090(TaskManager *man, u16 species, u8 level, u32 *winFlag, BOOL ca setup->unkCC |= 8; } - GameStats_Inc(Save_GameStats_Get(fsys->savedata), 8); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8); sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), winFlag); } static BOOL Task_PalParkEncounter(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); ENCOUNTER *encounter = TaskManager_GetEnv(man); int *state = TaskManager_GetStatePtr(man); switch(*state) { case 0: - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); - GameStats_Inc(Save_GameStats_Get(fsys->savedata), 8); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8); sub_02055218(man, encounter->effect, encounter->bgm); (*state)++; break; @@ -598,9 +598,9 @@ static BOOL Task_PalParkEncounter(TaskManager *man) { (*state)++; break; case 3: - sub_02050724(encounter->setup, fsys); - PalPark_HandleBattleEnd(fsys, encounter->setup); - sub_02051660(fsys, encounter->setup); + sub_02050724(encounter->setup, fieldSystem); + PalPark_HandleBattleEnd(fieldSystem, encounter->setup); + sub_02051660(fieldSystem, encounter->setup); (*state)++; break; case 4: @@ -608,13 +608,13 @@ static BOOL Task_PalParkEncounter(TaskManager *man) { (*state)++; break; case 5: - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); sub_0205532C(man); (*state)++; break; case 6: Encounter_Delete(encounter); - if (PalPark_CountMonsNotCaught(fsys) == 0) { + if (PalPark_CountMonsNotCaught(fieldSystem) == 0) { // Ding-dong! // Congratulations! // $PLAYER has successfully @@ -627,33 +627,33 @@ static BOOL Task_PalParkEncounter(TaskManager *man) { return FALSE; } -void sub_020511F8(FieldSystem *fsys, BattleSetup *setup) { +void sub_020511F8(FieldSystem *fieldSystem, BattleSetup *setup) { ENCOUNTER *encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); - FieldSys_CreateTask(fsys, Task_PalParkEncounter, encounter); + FieldSystem_CreateTask(fieldSystem, Task_PalParkEncounter, encounter); } void sub_02051228(TaskManager *man, u16 species, u8 level) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, 0); - BattleSetup_InitFromFsys(setup, fsys); + BattleSetup_InitFromFieldSystem(setup, fieldSystem); - ov02_02247F30(fsys, species, level, 0, setup); + ov02_02247F30(fieldSystem, species, level, 0, setup); setup->unkCC = 1; - GameStats_Inc(Save_GameStats_Get(fsys->savedata), 8); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 8); sub_0205085C(man, setup, sub_020517E8(setup), sub_020517FC(setup), NULL); } static BOOL Task_TutorialBattle(TaskManager *man) { ENCOUNTER *encounter = TaskManager_GetEnv(man); - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); int *state = TaskManager_GetStatePtr(man); switch(*state) { case 0: - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); sub_02055218(man, encounter->effect, encounter->bgm); (*state)++; break; @@ -673,7 +673,7 @@ static BOOL Task_TutorialBattle(TaskManager *man) { (*state)++; break; case 5: - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); sub_0205532C(man); (*state)++; break; @@ -687,10 +687,10 @@ static BOOL Task_TutorialBattle(TaskManager *man) { void SetupAndStartTutorialBattle(TaskManager *man) { ENCOUNTER *encounter; BattleSetup *setup; - FieldSystem *fsys; + FieldSystem *fieldSystem; - fsys = TaskManager_GetFieldSystem(man); - setup = sub_02051AAC(HEAP_ID_FIELD, fsys); + fieldSystem = TaskManager_GetFieldSystem(man); + setup = sub_02051AAC(HEAP_ID_FIELD, fieldSystem); encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); TaskManager_Call(man, Task_TutorialBattle, encounter); @@ -699,7 +699,7 @@ void SetupAndStartTutorialBattle(TaskManager *man) { void SetupAndStartTrainerBattle(TaskManager *man, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, HeapID heapId, u32 *winFlag) { u32 battleType; BattleSetup *setup; - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); if (opponentTrainer2 != 0 && opponentTrainer1 != opponentTrainer2) { if (followerTrainerNum == 0) { @@ -717,15 +717,15 @@ void SetupAndStartTrainerBattle(TaskManager *man, u32 opponentTrainer1, u32 oppo } setup = BattleSetup_New(HEAP_ID_FIELD, battleType); - BattleSetup_InitFromFsys(setup, fsys); + BattleSetup_InitFromFieldSystem(setup, fieldSystem); setup->trainerId[1] = opponentTrainer1; setup->trainerId[3] = opponentTrainer2; setup->trainerId[2] = followerTrainerNum; - EnemyTrainerSet_Init(setup, fsys->savedata, heapId); + EnemyTrainerSet_Init(setup, fieldSystem->savedata, heapId); - GameStats_Inc(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK9); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK9); if (a5) { if (battleType & BATTLE_TYPE_MULTI) { @@ -741,14 +741,14 @@ void SetupAndStartTrainerBattle(TaskManager *man, u32 opponentTrainer1, u32 oppo static BOOL sub_020508B8(TaskManager *man); void sub_02051428(TaskManager *man, void *a1, int battleType) { - FieldSystem *fsys; + FieldSystem *fieldSystem; ENCOUNTER *encounter; BattleSetup *setup; - fsys = TaskManager_GetFieldSystem(man); + fieldSystem = TaskManager_GetFieldSystem(man); setup = BattleSetup_New(HEAP_ID_FIELD, battleType); - sub_020522F0(setup, fsys, a1); + sub_020522F0(setup, fieldSystem, a1); encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); TaskManager_Call(man, sub_020508B8, encounter); @@ -773,12 +773,12 @@ static int sub_02051474(void *a0, int battleType) { } void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag) { - FieldSystem *fsys; + FieldSystem *fieldSystem; ENCOUNTER *encounter; BattleSetup *setup; int result, mode; - fsys = TaskManager_GetFieldSystem(man); + fieldSystem = TaskManager_GetFieldSystem(man); if (flag == 0) { setup = BattleSetup_New(HEAP_ID_FIELD, 5); @@ -792,13 +792,13 @@ void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag) { setup->trainerId[1] = 1; setup->trainerId[3] = 2; - EnemyTrainerSet_Init(setup, fsys->savedata, HEAP_ID_FIELD); + EnemyTrainerSet_Init(setup, fieldSystem->savedata, HEAP_ID_FIELD); mode = 14; } - sub_02051F2C(setup, fsys, maxLevel); + sub_02051F2C(setup, fieldSystem, maxLevel); - sub_0202FBF0(fsys->savedata, HEAP_ID_FIELD, &result); + sub_0202FBF0(fieldSystem->savedata, HEAP_ID_FIELD, &result); setup->unk1B2 = mode; @@ -809,7 +809,7 @@ void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag) { } static BOOL sub_02051540(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); ENCOUNTER *encounter = TaskManager_GetEnv(man); int *state = TaskManager_GetStatePtr(man); @@ -822,45 +822,45 @@ static BOOL sub_02051540(TaskManager *man) { if (sub_0202FC48() == TRUE) { sub_0202FC24(); } - sub_02058190(fsys); + sub_02058190(fieldSystem); return TRUE; } return FALSE; } -void sub_02051598(FieldSystem *fsys, void *a1, int battleType) { +void sub_02051598(FieldSystem *fieldSystem, void *a1, int battleType) { ENCOUNTER *encounter; BattleSetup *setup; int var; setup = BattleSetup_New(HEAP_ID_FIELD, battleType); - sub_020522F0(setup, fsys, a1); - sub_0202FBF0(fsys->savedata, HEAP_ID_FIELD, &var); + sub_020522F0(setup, fieldSystem, a1); + sub_0202FBF0(fieldSystem->savedata, HEAP_ID_FIELD, &var); - setup->unk1B2 = sub_02051474(fsys->unkA4, battleType); + setup->unk1B2 = sub_02051474(fieldSystem->unkA4, battleType); encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); - FieldSys_CreateTask(fsys, sub_02051540, encounter); + FieldSystem_CreateTask(fieldSystem, sub_02051540, encounter); } -void sub_020515FC(FieldSystem *fsys, Party *party, int battleType) { +void sub_020515FC(FieldSystem *fieldSystem, Party *party, int battleType) { ENCOUNTER *encounter; BattleSetup *setup; int var; setup = BattleSetup_New(HEAP_ID_FIELD, battleType); - sub_020520B0(setup, fsys, party, NULL); - sub_0202FBF0(fsys->savedata, HEAP_ID_FIELD, &var); + sub_020520B0(setup, fieldSystem, party, NULL); + sub_0202FBF0(fieldSystem->savedata, HEAP_ID_FIELD, &var); - setup->unk1B2 = sub_02051474(fsys->unkA4, battleType); + setup->unk1B2 = sub_02051474(fieldSystem->unkA4, battleType); encounter = Encounter_New(setup, sub_020517E8(setup), sub_020517FC(setup), NULL); - FieldSys_CreateTask(fsys, sub_02051540, encounter); + FieldSystem_CreateTask(fieldSystem, sub_02051540, encounter); } -static void sub_02051660(FieldSystem *fsys, BattleSetup *setup) { +static void sub_02051660(FieldSystem *fieldSystem, BattleSetup *setup) { Pokemon *mon; u32 battleType = setup->flags; int winFlag = setup->winFlag; @@ -871,25 +871,25 @@ static void sub_02051660(FieldSystem *fsys, BattleSetup *setup) { if (battleType == 0 || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) { if (winFlag == BATTLE_OUTCOME_WIN) { - GameStats_AddSpecial(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK9); + 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) { - GameStats_AddSpecial(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK10); + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK10); } else { - GameStats_AddSpecial(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK11); + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK11); } } } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) { if (winFlag == BATTLE_OUTCOME_WIN) { - GameStats_AddSpecial(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK12); + 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) { - GameStats_AddSpecial(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK10); + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK10); } else { - GameStats_AddSpecial(Save_GameStats_Get(fsys->savedata), GAME_STAT_UNK11); + GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->savedata), GAME_STAT_UNK11); } } } diff --git a/src/field/overlay_01_021FFECC.c b/src/field/overlay_01_021FFECC.c index 65945859d..c2925afce 100644 --- a/src/field/overlay_01_021FFECC.c +++ b/src/field/overlay_01_021FFECC.c @@ -52,8 +52,8 @@ void ov01_021FFF5C(LocalMapObject *mapObject, int a1) { VecFx32 temp; UnkOv01_021FFF5C temp2; - FieldSystem *fsys = ov01_021F146C(mapObject); - TaskManager* taskman = ov01_021F1468(fsys); + FieldSystem *fieldSystem = ov01_021F146C(mapObject); + TaskManager* taskman = ov01_021F1468(fieldSystem); int x = MapObject_GetCurrentX(mapObject); int y = MapObject_GetCurrentY(mapObject); @@ -62,15 +62,15 @@ void ov01_021FFF5C(LocalMapObject *mapObject, int a1) { sub_0206121C(taskman, &temp); temp2.unk0 = a1; - temp2.unk4 = fsys; + temp2.unk4 = fieldSystem; - UnkOv01_021FFECC *val1 = ov01_021F1450(fsys, 0xe); + UnkOv01_021FFECC *val1 = ov01_021F1450(fieldSystem, 0xe); temp2.unk8 = val1; temp2.unkC = mapObject; temp2.unk10 = ov01_021FFF50(val1, a1); int val3 = sub_0205F09C(mapObject, 2); - ov01_021F1620(fsys, &ov01_02209280, &temp, 0, &temp2, val3); + ov01_021F1620(fieldSystem, &ov01_02209280, &temp, 0, &temp2, val3); } static BOOL ov01_021FFFCC(void *a0, UnkOv01_021FFFCD *a1) { diff --git a/src/field/overlay_01_apricorn_tree_anim.c b/src/field/overlay_01_apricorn_tree_anim.c index a543ef127..37ad639a3 100644 --- a/src/field/overlay_01_apricorn_tree_anim.c +++ b/src/field/overlay_01_apricorn_tree_anim.c @@ -48,14 +48,14 @@ static BOOL Task_AnimPlayerShakeTree(TaskManager *taskman); static LocalMapObject *CreateJumpingApricornObj(MapObjectManager *taskman, u32 sprite, u32 x, u32 z); BOOL DoApricornJump(AnimApricornTreeWork *env); -void FieldSys_AnimApricornTree(FieldSystem *fsys, LocalMapObject *tree, u16 *a2) { +void FieldSystem_AnimApricornTree(FieldSystem *fieldSystem, LocalMapObject *tree, u16 *a2) { AnimApricornTreeWork *env = AllocFromHeap(HEAP_ID_32, sizeof(AnimApricornTreeWork)); MI_CpuFill8(env, 0, sizeof(AnimApricornTreeWork)); env->state = 0; env->tree = tree; env->unk24 = a2; - TaskManager_Call(fsys->taskman, Task_AnimApricornTree, env); + TaskManager_Call(fieldSystem->taskman, Task_AnimApricornTree, env); } static BOOL Task_AnimApricornTree(TaskManager *taskman) { @@ -65,12 +65,12 @@ static BOOL Task_AnimApricornTree(TaskManager *taskman) { VecFx32 pos; int apricornType; - FieldSystem *fsys = TaskManager_GetFieldSystem(taskman); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); AnimApricornTreeWork *env = TaskManager_GetEnv(taskman); switch (env->state) { case 0: - if (!sub_02055708(fsys, env->tree)) { + if (!sub_02055708(fieldSystem, env->tree)) { *env->unk24 = 0; env->state = 10; break; @@ -97,8 +97,8 @@ static BOOL Task_AnimApricornTree(TaskManager *taskman) { } sub_0205F328(env->tree, 0); MapObject_PauseMovement(env->tree); - if (sub_02055708(fsys, env->tree)) { - sub_02055760(fsys, env->tree); + if (sub_02055708(fieldSystem, env->tree)) { + sub_02055760(fieldSystem, env->tree); *env->unk24 = 1; env->state = 3; break; @@ -107,7 +107,7 @@ static BOOL Task_AnimApricornTree(TaskManager *taskman) { env->state = 10; break; case 3: - direction = PlayerAvatar_GetFacingDirection(fsys->playerAvatar); + direction = PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar); env->jumpDx = 0; env->jumpDz = 0; env->unk18 = 0; @@ -128,10 +128,10 @@ static BOOL Task_AnimApricornTree(TaskManager *taskman) { env->state = 4; break; case 4: - PlayerAvatar_GetCoordsInFront(fsys->playerAvatar, &posX, &posZ); - apricornType = FieldSys_ApricornTree_TryGetApricorn(fsys, env->tree) - 1; + PlayerAvatar_GetCoordsInFront(fieldSystem->playerAvatar, &posX, &posZ); + apricornType = FieldSystem_ApricornTree_TryGetApricorn(fieldSystem, env->tree) - 1; GF_ASSERT(apricornType >= APRICORN_NONE); - env->apricorn = CreateJumpingApricornObj(fsys->mapObjectMan, SPRITE_BONMI_R + apricornType, posX, posZ); + env->apricorn = CreateJumpingApricornObj(fieldSystem->mapObjectMan, SPRITE_BONMI_R + apricornType, posX, posZ); MapObject_GetPositionVec(env->apricorn, &pos); pos.y += 12 * FX32_ONE; MapObject_SetPositionVec(env->apricorn, &pos); @@ -211,8 +211,8 @@ static BOOL DoApricornJump(AnimApricornTreeWork *env) { } static BOOL Task_AnimPlayerShakeTree(TaskManager *taskman) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskman); - LocalMapObject *playerObj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); + LocalMapObject *playerObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); int *state_p = TaskManager_GetStatePtr(taskman); AnimPlayerShakeTreeWork *env = TaskManager_GetEnv(taskman); @@ -224,8 +224,8 @@ static BOOL Task_AnimPlayerShakeTree(TaskManager *taskman) { case 1: if (MapObject_AreBitsSetForMovementScriptInit(playerObj) == TRUE) { MapObject_ClearHeldMovementIfActive(playerObj); - Field_PlayerAvatar_OrrTransitionFlags(fsys->playerAvatar, 0x2000); - Field_PlayerAvatar_ApplyTransitionFlags(fsys->playerAvatar); + Field_PlayerAvatar_OrrTransitionFlags(fieldSystem->playerAvatar, 0x2000); + Field_PlayerAvatar_ApplyTransitionFlags(fieldSystem->playerAvatar); sub_0205F328(playerObj, 0); env->timer = 0; *state_p += 1; @@ -235,9 +235,9 @@ static BOOL Task_AnimPlayerShakeTree(TaskManager *taskman) { if (++env->timer > 24) { if (MapObject_AreBitsSetForMovementScriptInit(playerObj) == TRUE) { MapObject_ClearHeldMovementIfActive(playerObj); - int flags = PlayerAvatar_GetTransitionBits(PlayerAvatar_GetState(fsys->playerAvatar)); - Field_PlayerAvatar_OrrTransitionFlags(fsys->playerAvatar, flags); - Field_PlayerAvatar_ApplyTransitionFlags(fsys->playerAvatar); + int flags = PlayerAvatar_GetTransitionBits(PlayerAvatar_GetState(fieldSystem->playerAvatar)); + Field_PlayerAvatar_OrrTransitionFlags(fieldSystem->playerAvatar, flags); + Field_PlayerAvatar_ApplyTransitionFlags(fieldSystem->playerAvatar); *state_p += 1; } } diff --git a/src/field/overlay_01_rock_smash_item.c b/src/field/overlay_01_rock_smash_item.c index 19764998f..2bc7c4aa7 100644 --- a/src/field/overlay_01_rock_smash_item.c +++ b/src/field/overlay_01_rock_smash_item.c @@ -86,34 +86,34 @@ static const u16 sRockSmashItems_CliffCave[] = { #endif //HEARTGOLD static BOOL Task_RockSmashItemCheck(TaskManager *taskman); -static BOOL CheckRockSmashItemDrop(FieldSystem *fsys, RockSmashItemCheckWork *a1); +static BOOL CheckRockSmashItemDrop(FieldSystem *fieldSystem, RockSmashItemCheckWork *a1); static BOOL Task_GetRockSmashItem(TaskManager *taskman); -static int DrawRockSmashIdx(FieldSystem *fsys); +static int DrawRockSmashIdx(FieldSystem *fieldSystem); -void FieldSys_RockSmashItemCheck(FieldSystem *fsys, int followMonKnowsHm, u16 *itemFound, u16 *item) { +void FieldSystem_RockSmashItemCheck(FieldSystem *fieldSystem, int followMonKnowsHm, u16 *itemFound, u16 *item) { RockSmashItemCheckWork *env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(RockSmashItemCheckWork)); env->followMonKnowsHM = followMonKnowsHm != 0; env->itemFound = itemFound; env->item = item; *env->itemFound = FALSE; *env->item = ITEM_NONE; - TaskManager_Call(fsys->taskman, Task_RockSmashItemCheck, env); + TaskManager_Call(fieldSystem->taskman, Task_RockSmashItemCheck, env); } static BOOL Task_RockSmashItemCheck(TaskManager *taskman) { BattleSetup *setup; - FieldSystem *fsys = TaskManager_GetFieldSystem(taskman); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); RockSmashItemCheckWork *env = TaskManager_GetEnv(taskman); - if (ov02_022470A0(fsys, &setup)) { + if (ov02_022470A0(fieldSystem, &setup)) { *env->itemFound = FALSE; *env->item = ITEM_NONE; FreeToHeap(env); - sub_02050B90(fsys, taskman, setup); + sub_02050B90(fieldSystem, taskman, setup); return FALSE; } - if (CheckRockSmashItemDrop(fsys, env)) { + if (CheckRockSmashItemDrop(fieldSystem, env)) { TaskManager_Jump(taskman, Task_GetRockSmashItem, env); return FALSE; } @@ -124,12 +124,12 @@ static BOOL Task_RockSmashItemCheck(TaskManager *taskman) { return TRUE; } -static BOOL CheckRockSmashItemDrop(FieldSystem *fsys, RockSmashItemCheckWork *env) { +static BOOL CheckRockSmashItemDrop(FieldSystem *fieldSystem, RockSmashItemCheckWork *env) { int odds; int ability; ROCK_SMASH data; - ReadWholeNarcMemberByIdPair(&data, NARC_a_2_5_3, fsys->location->mapId); + ReadWholeNarcMemberByIdPair(&data, NARC_a_2_5_3, fieldSystem->location->mapId); odds = data.odds; if (odds == 0) { return FALSE; @@ -138,7 +138,7 @@ static BOOL CheckRockSmashItemDrop(FieldSystem *fsys, RockSmashItemCheckWork *en GF_ASSERT(FALSE); return FALSE; } - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), 0); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), 0); if (GetMonData(mon, MON_DATA_IS_EGG, NULL) == 0) { ability = GetMonData(mon, MON_DATA_ABILITY, NULL); } else { @@ -176,14 +176,14 @@ static BOOL Task_GetRockSmashItem(TaskManager *taskman) { int *state_p = TaskManager_GetStatePtr(taskman); RockSmashItemCheckWork *env = TaskManager_GetEnv(taskman); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskman); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); switch (*state_p) { case 0: if (env->followMonKnowsHM) { - obj = FollowingPokemon_GetMapObject(fsys); + obj = FollowingPokemon_GetMapObject(fieldSystem); } else { - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); } env->unk14 = ov01_02200540(obj, 0, 1); *state_p += 1; @@ -195,7 +195,7 @@ static BOOL Task_GetRockSmashItem(TaskManager *taskman) { } break; case 2: - u32 idx = DrawRockSmashIdx(fsys); + u32 idx = DrawRockSmashIdx(fieldSystem); if ((env->ability == ABILITY_SERENE_GRACE || env->ability == ABILITY_SUPER_LUCK) && idx < 7) { idx = (u8)(idx + 1); } @@ -227,7 +227,7 @@ static BOOL Task_GetRockSmashItem(TaskManager *taskman) { return FALSE; } -static int DrawRockSmashIdx(FieldSystem *fsys) { +static int DrawRockSmashIdx(FieldSystem *fieldSystem) { u8 rand = LCRandom() % 100; if (rand < 25) { return 0; diff --git a/src/field/scrcmd_message.c b/src/field/scrcmd_message.c index fb8cbe5bd..a353eb19f 100644 --- a/src/field/scrcmd_message.c +++ b/src/field/scrcmd_message.c @@ -26,9 +26,9 @@ typedef struct MessageBox { static void ovFieldMain_ShowMessageInField(ScriptContext *ctx, MsgData *messageData, u32 messageNum); static void ov01_021EF5C8(ScriptContext *ctx, MessageFormat *messageFormat, u8 messageNum, u32 canABSpeedUp); static u32 ovFieldMain_GetTextFrameDelay(ScriptContext *ctx); -static void ovFieldMain_GetMsgBoxParameters(FieldSystem *fsys, MessageBox *messageBox); -static void ovFieldMain_GetMsgBoxParametersEx(FieldSystem *fsys, MessageFormat *messageFormat, MessageBox *messageBox); -static void ovFieldMain_CreateMessageBox(FieldSystem *fsys, MessageBox *messageBox); +static void ovFieldMain_GetMsgBoxParameters(FieldSystem *fieldSystem, MessageBox *messageBox); +static void ovFieldMain_GetMsgBoxParametersEx(FieldSystem *fieldSystem, MessageFormat *messageFormat, MessageBox *messageBox); +static void ovFieldMain_CreateMessageBox(FieldSystem *fieldSystem, MessageBox *messageBox); static void ovFieldMain_ReadAndExpandMsgDataViaBuffer(MessageBox *messageBox, MsgData *messageData, u32 messageNum); static void ovFieldMain_GetFormattedECMessage(MessageBox *messageBox, u16 messageBank, u16 messageNum, u16 word1, u16 word2); static void ov01_021EF758(MessageBox *messageBox, FontID fontId, u32 textFrameDelay, BOOL canABSpeedUp, u32 a4); @@ -98,7 +98,7 @@ BOOL ScrCmd_442(ScriptContext *ctx) { BOOL ScrCmd_443(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); - void *r2 = ctx->fsys->unkA0; + void *r2 = ctx->fieldSystem->unkA0; if (r2 == NULL) { return FALSE; } @@ -115,13 +115,13 @@ BOOL ScrCmd_443(ScriptContext *ctx) { } BOOL ScrCmd_444(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 baseMessageNum = ScriptReadByte(ctx); u16 numEligiblePokemon = ScriptGetVar(ctx); u16 r2 = ScriptReadHalfword(ctx); u8 r3 = ScriptReadByte(ctx); u8 numLegendaryPokemonSeen = 0; - MessageFormat *messageFormat = sub_0204B538(fsys->savedata, numEligiblePokemon, r2, r3, &numLegendaryPokemonSeen); + MessageFormat *messageFormat = sub_0204B538(fieldSystem->savedata, numEligiblePokemon, r2, r3, &numLegendaryPokemonSeen); ov01_021EF5C8(ctx, messageFormat, baseMessageNum + numLegendaryPokemonSeen, TRUE); MessageFormat_Delete(messageFormat); SetupNativeScript(ctx, ov01_021EF348); @@ -146,7 +146,7 @@ BOOL ScrCmd_NPCMsg(ScriptContext *ctx) { } BOOL ov01_021EF348(ScriptContext *ctx) { - u8 *textPrinterNumPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); + u8 *textPrinterNumPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); return IsPrintFinished(*textPrinterNumPtr); } @@ -175,10 +175,10 @@ BOOL ScrCmd_NpcMsgVar(ScriptContext *ctx) { } BOOL ScrCmd_GenderMsgbox(ScriptContext *ctx) { - void *unused = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys)); + void *unused = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u8 messageNumMale = ScriptReadByte(ctx); u8 messageNumFemale = ScriptReadByte(ctx); - u32 gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys))); + u32 gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem))); if (gender != PLAYER_GENDER_MALE) { ov01_021EF4DC(ctx, ctx->msgdata, messageNumFemale, TRUE, NULL); } else { @@ -189,7 +189,7 @@ BOOL ScrCmd_GenderMsgbox(ScriptContext *ctx) { } BOOL ScrCmd_455(ScriptContext *ctx) { - LocalMapObject **objPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); + LocalMapObject **objPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u8 mapObjectType = MapObject_GetType(*objPtr); ov01_021EF4DC(ctx, ctx->msgdata, mapObjectType, TRUE, NULL); SetupNativeScript(ctx, ov01_021EF348); @@ -204,8 +204,8 @@ void ov01_021EF4C4(struct UnkStruct_Ov01_021EF4C4 *unkStruct, ScriptContext *ctx void ov01_021EF4DC(ScriptContext *ctx, MsgData *messageData, u16 messageNum, u8 canABSpeedUp, struct UnkStruct_Ov01_021EF4C4 *unkStruct) { MessageBox messageBox; - ovFieldMain_GetMsgBoxParameters(ctx->fsys, &messageBox); - ovFieldMain_CreateMessageBox(ctx->fsys, &messageBox); + ovFieldMain_GetMsgBoxParameters(ctx->fieldSystem, &messageBox); + ovFieldMain_CreateMessageBox(ctx->fieldSystem, &messageBox); ovFieldMain_ReadAndExpandMsgDataViaBuffer(&messageBox, messageData, messageNum); u32 textFrameDelay; u32 unk1; @@ -224,8 +224,8 @@ void ov01_021EF4DC(ScriptContext *ctx, MsgData *messageData, u16 messageNum, u8 static void ovFieldMain_ShowMessageInField(ScriptContext *ctx, MsgData *messageData, u32 messageNum) { MessageBox messageBox; - ovFieldMain_GetMsgBoxParameters(ctx->fsys, &messageBox); - ovFieldMain_CreateMessageBox(ctx->fsys, &messageBox); + ovFieldMain_GetMsgBoxParameters(ctx->fieldSystem, &messageBox); + ovFieldMain_CreateMessageBox(ctx->fieldSystem, &messageBox); ovFieldMain_ReadAndExpandMsgDataViaBuffer(&messageBox, messageData, messageNum); ovFieldMain_AddTextPrinterParameterized(&messageBox, 1); } @@ -233,8 +233,8 @@ static void ovFieldMain_ShowMessageInField(ScriptContext *ctx, MsgData *messageD // word2 needs to be signed to match void ov01_021EF564(ScriptContext *ctx, u16 messageBank, u16 messageNum, u16 word1, s16 word2, u8 canABSpeedUp) { MessageBox messageBox; - ovFieldMain_GetMsgBoxParameters(ctx->fsys, &messageBox); - ovFieldMain_CreateMessageBox(ctx->fsys, &messageBox); + ovFieldMain_GetMsgBoxParameters(ctx->fieldSystem, &messageBox); + ovFieldMain_CreateMessageBox(ctx->fieldSystem, &messageBox); ovFieldMain_GetFormattedECMessage(&messageBox, messageBank, messageNum, word1, (u16)word2); if (canABSpeedUp != 0xFF) { ov01_021EF758(&messageBox, 1, ovFieldMain_GetTextFrameDelay(ctx), canABSpeedUp, 0); @@ -245,40 +245,40 @@ void ov01_021EF564(ScriptContext *ctx, u16 messageBank, u16 messageNum, u16 word static void ov01_021EF5C8(ScriptContext *ctx, MessageFormat *messageFormat, u8 messageNum, u32 canABSpeedUp) { MessageBox messageBox; - ovFieldMain_GetMsgBoxParametersEx(ctx->fsys, messageFormat, &messageBox); - ovFieldMain_CreateMessageBox(ctx->fsys, &messageBox); + ovFieldMain_GetMsgBoxParametersEx(ctx->fieldSystem, messageFormat, &messageBox); + ovFieldMain_CreateMessageBox(ctx->fieldSystem, &messageBox); ovFieldMain_ReadAndExpandMsgDataViaBuffer(&messageBox, ctx->msgdata, messageNum); ov01_021EF758(&messageBox, 1, ovFieldMain_GetTextFrameDelay(ctx), canABSpeedUp, 0); } static u32 ovFieldMain_GetTextFrameDelay(ScriptContext *ctx) { - return Options_GetTextFrameDelay(Save_PlayerData_GetOptionsAddr(ctx->fsys->savedata)); + return Options_GetTextFrameDelay(Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->savedata)); } -static void ovFieldMain_GetMsgBoxParameters(FieldSystem *fsys, MessageBox *messageBox) { - messageBox->message = *(String **)FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0); - messageBox->buffer = *(String **)FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_1); - messageBox->messageFormat = *(MessageFormat **)FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); - messageBox->window = (Window *)FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW); - messageBox->unk10 = (u8 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_08); - messageBox->textPrinterNumPtr = (u8 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); +static void ovFieldMain_GetMsgBoxParameters(FieldSystem *fieldSystem, MessageBox *messageBox) { + messageBox->message = *(String **)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_0); + messageBox->buffer = *(String **)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_1); + messageBox->messageFormat = *(MessageFormat **)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + messageBox->window = (Window *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW); + messageBox->unk10 = (u8 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_FIELD_08); + messageBox->textPrinterNumPtr = (u8 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); } -static void ovFieldMain_GetMsgBoxParametersEx(FieldSystem *fsys, MessageFormat *messageFormat, MessageBox *messageBox) { - messageBox->message = *(String **)FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0); - messageBox->buffer = *(String **)FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_1); +static void ovFieldMain_GetMsgBoxParametersEx(FieldSystem *fieldSystem, MessageFormat *messageFormat, MessageBox *messageBox) { + messageBox->message = *(String **)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_0); + messageBox->buffer = *(String **)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_1); messageBox->messageFormat = messageFormat; - messageBox->window = (Window *)FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW); - messageBox->unk10 = (u8 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_08); - messageBox->textPrinterNumPtr = (u8 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); + messageBox->window = (Window *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW); + messageBox->unk10 = (u8 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_FIELD_08); + messageBox->textPrinterNumPtr = (u8 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); } -static void ovFieldMain_CreateMessageBox(FieldSystem *fsys, MessageBox *messageBox) { +static void ovFieldMain_CreateMessageBox(FieldSystem *fieldSystem, MessageBox *messageBox) { if (*(messageBox->unk10) == 0) { - sub_0205B514(fsys->bgConfig, messageBox->window, 3); - sub_0205B564(messageBox->window, Save_PlayerData_GetOptionsAddr(fsys->savedata)); + sub_0205B514(fieldSystem->bgConfig, messageBox->window, 3); + sub_0205B564(messageBox->window, Save_PlayerData_GetOptionsAddr(fieldSystem->savedata)); *(messageBox->unk10) = 1; - fsys->unkD2_6 = TRUE; + fieldSystem->unkD2_6 = TRUE; } FillWindowPixelBuffer(messageBox->window, 15); } diff --git a/src/field/scrcmd_moneybox.c b/src/field/scrcmd_moneybox.c index 6ed8bfeff..758c96765 100644 --- a/src/field/scrcmd_moneybox.c +++ b/src/field/scrcmd_moneybox.c @@ -1,29 +1,29 @@ #include "scrcmd.h" #include "overlay_01_021EDAFC.h" -extern Window *Fsys_ShowMoneyBox(FieldSystem *, u8, u8); +extern Window *FieldSystem_ShowMoneyBox(FieldSystem *, u8, u8); BOOL ScrCmd_ShowMoneyBox(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 xPos = ScriptGetVar(ctx); u16 yPos = ScriptGetVar(ctx); - Window **moneyBox = FieldSysGetAttrAddr(fsys, SCRIPTENV_MONEY_BOX); - *moneyBox = Fsys_ShowMoneyBox(ctx->fsys, xPos, yPos); + Window **moneyBox = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MONEY_BOX); + *moneyBox = FieldSystem_ShowMoneyBox(ctx->fieldSystem, xPos, yPos); return FALSE; } BOOL ScrCmd_HideMoneyBox(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - Window **moneyBox = FieldSysGetAttrAddr(fsys, SCRIPTENV_MONEY_BOX); + FieldSystem *fieldSystem = ctx->fieldSystem; + Window **moneyBox = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MONEY_BOX); MoneyBoxSys_Delete(*moneyBox); return FALSE; } BOOL ScrCmd_UpdateMoneyBox(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - Window **moneyBox = FieldSysGetAttrAddr(fsys, SCRIPTENV_MONEY_BOX); - MoneyBoxSys_Update(ctx->fsys, *moneyBox); + FieldSystem *fieldSystem = ctx->fieldSystem; + Window **moneyBox = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MONEY_BOX); + MoneyBoxSys_Update(ctx->fieldSystem, *moneyBox); return FALSE; } diff --git a/src/field/scrcmd_pokemon_misc.c b/src/field/scrcmd_pokemon_misc.c index 524e2b05d..216cfb9c0 100644 --- a/src/field/scrcmd_pokemon_misc.c +++ b/src/field/scrcmd_pokemon_misc.c @@ -42,7 +42,7 @@ #include "sound_02004A44.h" typedef struct UnkStructScr_648 { - FieldSystem *fsys; + FieldSystem *fieldSystem; SysTask *sysTask; Window window_8; Window *window_18; @@ -75,8 +75,8 @@ typedef struct UnkStructScr_648 { static BOOL ov01_02200C6C(ScriptContext *ctx); static void *ov01_02200C94(HeapID heapId, s32 fileId, u32 *unkPtr); static void ov01_02200CB4(SCR_648_STRUCT *unkPtr, MsgData *msgdata); -static void ov01_02200CBC(FieldSystem *fsys, SCR_648_STRUCT *unkPtr, u8 x, u8 y, u8 a4, u8 a5, s16 *input, MessageFormat *msgfmt, Window *window, MsgData *msgdata, u16 *cursorPos, u16 *itemsAbove); -static SCR_648_STRUCT *ov01_02200D9C(FieldSystem *fsys, u8 x, u8 y, u8 a3, u8 a4, s16* input, MessageFormat *msgfmt, Window *window, MsgData *msgdata, u16 *cursorPos, u16 *itemsAbove); +static void ov01_02200CBC(FieldSystem *fieldSystem, SCR_648_STRUCT *unkPtr, u8 x, u8 y, u8 a4, u8 a5, s16 *input, MessageFormat *msgfmt, Window *window, MsgData *msgdata, u16 *cursorPos, u16 *itemsAbove); +static SCR_648_STRUCT *ov01_02200D9C(FieldSystem *fieldSystem, u8 x, u8 y, u8 a3, u8 a4, s16* input, MessageFormat *msgfmt, Window *window, MsgData *msgdata, u16 *cursorPos, u16 *itemsAbove); static void ov01_02200DF8(SCR_648_STRUCT *unkPtr, int strNo, u16 a2, u32 a3); static void ov01_02200E00(SCR_648_STRUCT *unkPtr); static void ov01_02200EC8(SCR_648_STRUCT *unkPtr, int strNo, u16 a2, u32 a3); @@ -106,9 +106,9 @@ BOOL ScrCmd_648(ScriptContext *ctx) { Window *window; MessageFormat **msgfmt; MsgData *msgdata; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; - msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + msgfmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u32 unkA = ScriptGetVar(ctx); u32 fileIndex = ScriptGetVar(ctx); u16 unkC = ScriptReadHalfword(ctx); @@ -119,22 +119,22 @@ BOOL ScrCmd_648(ScriptContext *ctx) { msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, 237, HEAP_ID_32); - input = GetVarPointer(fsys, unkC); + input = GetVarPointer(fieldSystem, unkC); - window = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_WINDOW); + window = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WINDOW); - cursorPos = GetVarPointer(fsys, unkD); - itemsAbove = GetVarPointer(fsys, unkE); + cursorPos = GetVarPointer(fieldSystem, unkD); + itemsAbove = GetVarPointer(fieldSystem, unkE); - unkPtr = ov01_02200D9C(fsys, 20, 1, 0, 1, input, *msgfmt, window, msgdata, cursorPos, itemsAbove); + unkPtr = ov01_02200D9C(fieldSystem, 20, 1, 0, 1, input, *msgfmt, window, msgdata, cursorPos, itemsAbove); - unkG = sub_020312C4(fsys->savedata, 0xb, &out_1); + unkG = sub_020312C4(fieldSystem->savedata, 0xb, &out_1); if (out_1 == 1) { data = ov01_02200C94(HEAP_ID_32, ov01_02209AE0[fileIndex], &out_2); for (i = 0; i < out_2; i++) { - unkPtr_2 = sub_020312E0(fsys->savedata, unkG, sub_0205C144(unkA), data[i]); + unkPtr_2 = sub_020312E0(fieldSystem->savedata, unkG, sub_0205C144(unkA), data[i]); if (unkPtr_2 != 0) { ov01_02200DF8(unkPtr, data[i], 0xff, data[i]); } @@ -162,7 +162,7 @@ BOOL ScrCmd_648(ScriptContext *ctx) { } static BOOL ov01_02200C6C(ScriptContext *ctx) { - return (*GetVarPointer(ctx->fsys, ctx->data[0]) != 0xEEEE); + return (*GetVarPointer(ctx->fieldSystem, ctx->data[0]) != 0xEEEE); } static void *ov01_02200C94(HeapID heapId, s32 fileId, u32 *unkPtr) { @@ -176,12 +176,12 @@ static void ov01_02200CB4(SCR_648_STRUCT *unkPtr, MsgData *msgdata) { unkPtr->msgdata = msgdata; } -static void ov01_02200CBC(FieldSystem *fsys, SCR_648_STRUCT *unkPtr, u8 x, u8 y, u8 a4, u8 a5, s16 *input, MessageFormat *msgfmt, Window *window, MsgData *msgdata, u16 *cursorPos, u16 *itemsAbove) { +static void ov01_02200CBC(FieldSystem *fieldSystem, SCR_648_STRUCT *unkPtr, u8 x, u8 y, u8 a4, u8 a5, s16 *input, MessageFormat *msgfmt, Window *window, MsgData *msgdata, u16 *cursorPos, u16 *itemsAbove) { int i; unkPtr->msgdata = msgdata; unkPtr->unk_207 = unkPtr->unk_207 & ~0x2; unkPtr->msgfmt = msgfmt; - unkPtr->fsys = fsys; + unkPtr->fieldSystem = fieldSystem; unkPtr->input = input; i = 0; *unkPtr->input = 0; @@ -209,13 +209,13 @@ static void ov01_02200CBC(FieldSystem *fsys, SCR_648_STRUCT *unkPtr, u8 x, u8 y, *unkPtr->input = 0xEEEE; } -static SCR_648_STRUCT *ov01_02200D9C(FieldSystem *fsys, u8 x, u8 y, u8 a3, u8 a4, s16* input, MessageFormat *msgfmt, Window *window, MsgData *msgdata, u16 *cursorPos, u16 *itemsAbove) { +static SCR_648_STRUCT *ov01_02200D9C(FieldSystem *fieldSystem, u8 x, u8 y, u8 a3, u8 a4, s16* input, MessageFormat *msgfmt, Window *window, MsgData *msgdata, u16 *cursorPos, u16 *itemsAbove) { SCR_648_STRUCT *unkPtr = AllocFromHeap(HEAP_ID_4, sizeof(SCR_648_STRUCT)); if (!unkPtr) { return NULL; } memset(unkPtr, 0, sizeof(SCR_648_STRUCT)); - ov01_02200CBC(fsys, unkPtr, x, y, a3, a4, input, msgfmt, window, msgdata, cursorPos, itemsAbove); + ov01_02200CBC(fieldSystem, unkPtr, x, y, a3, a4, input, msgfmt, window, msgdata, cursorPos, itemsAbove); return unkPtr; } @@ -226,11 +226,11 @@ static void ov01_02200DF8(SCR_648_STRUCT *unkPtr, int strNo, u16 a2, u32 a3) { static void ov01_02200E00(SCR_648_STRUCT *unkPtr) { u32 unk = unkPtr->totalItems; if (unk > 8) { - AddWindowParameterized(unkPtr->fsys->bgConfig, &unkPtr->window_8, 3, unkPtr->x, unkPtr->y, 11, 0x10, 13, 1); + AddWindowParameterized(unkPtr->fieldSystem->bgConfig, &unkPtr->window_8, 3, unkPtr->x, unkPtr->y, 11, 0x10, 13, 1); } else { - AddWindowParameterized(unkPtr->fsys->bgConfig, &unkPtr->window_8, 3, unkPtr->x, unkPtr->y, 11, 2*unk, 13, 1); + AddWindowParameterized(unkPtr->fieldSystem->bgConfig, &unkPtr->window_8, 3, unkPtr->x, unkPtr->y, 11, 2*unk, 13, 1); } - LoadUserFrameGfx1(unkPtr->fsys->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4); + LoadUserFrameGfx1(unkPtr->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4); DrawFrameAndWindow1(&unkPtr->window_8, TRUE, 0x3D9, 11); ov01_02200F54(unkPtr); unkPtr->listMenu_23C = ListMenuInit(&unkPtr->listMenuTemplate, *unkPtr->cursorPos, *unkPtr->itemsAbove, HEAP_ID_4); @@ -352,12 +352,12 @@ BOOL ScrCmd_StatJudge(ScriptContext *ctx) { u32 i; u8 offset; u8 highestIvValue; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u32 monIndex = ScriptGetVar(ctx); u16 *ivTotal = ScriptGetVarPointer(ctx); u16 *highestIvIndex = ScriptGetVarPointer(ctx); u16 *highestIv = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), monIndex); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), monIndex); ivList[0] = GetMonData(mon, MON_DATA_HP_IV, 0); ivList[1] = GetMonData(mon, MON_DATA_ATK_IV, 0); ivList[2] = GetMonData(mon, MON_DATA_DEF_IV, 0); @@ -375,13 +375,13 @@ BOOL ScrCmd_StatJudge(ScriptContext *ctx) { } } - offset = fsys->judgeStatPosition; + offset = fieldSystem->judgeStatPosition; *highestIvIndex = offset; for (i = 0; i < 6; i = (u8)++i) { if (highestIvValue == ivList[offset]) { *highestIvIndex = offset; - fsys->judgeStatPosition = (offset + 1) % 6; + fieldSystem->judgeStatPosition = (offset + 1) % 6; break; } offset = (offset + 1) % 6; @@ -399,9 +399,9 @@ BOOL ScrCmd_CommSanitizeParty(ScriptContext *ctx) { u32 heldItems[6]; Pokemon *mon; int count = 0; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *success = ScriptGetVarPointer(ctx); - Party *party = SaveArray_Party_Get(fsys->savedata); + Party *party = SaveArray_Party_Get(fieldSystem->savedata); partyCount = Party_GetCount(party); *success = FALSE; @@ -414,7 +414,7 @@ BOOL ScrCmd_CommSanitizeParty(ScriptContext *ctx) { } } if (count > 0) { - if (Bag_AddItem(Save_Bag_Get(fsys->savedata), ITEM_GRISEOUS_ORB, count, HEAP_ID_4) == FALSE) { + if (Bag_AddItem(Save_Bag_Get(fieldSystem->savedata), ITEM_GRISEOUS_ORB, count, HEAP_ID_4) == FALSE) { *success = 255; return FALSE; } @@ -450,10 +450,10 @@ BOOL ScrCmd_CommSanitizeParty(ScriptContext *ctx) { } BOOL ScrCmd_SetMonForm(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 index = ScriptGetVar(ctx); u16 form = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), index); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), index); SetMonData(mon, MON_DATA_FORM, &form); return FALSE; } @@ -463,14 +463,14 @@ BOOL ScrCmd_CountTranformedRotomsInParty(ScriptContext *ctx) { u32 species, form, isEgg; Pokemon *mon; Party *party; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *rotomCount = ScriptGetVarPointer(ctx); u16 *firstIndex = ScriptGetVarPointer(ctx); count = 0; *firstIndex = 255; - party = SaveArray_Party_Get(fsys->savedata); + party = SaveArray_Party_Get(fieldSystem->savedata); partyCount = Party_GetCount(party); for (i = 0; i < partyCount; i++) { mon = Party_GetMonByIndex(party, i); @@ -489,23 +489,23 @@ BOOL ScrCmd_CountTranformedRotomsInParty(ScriptContext *ctx) { } BOOL ScrCmd_UpdateRotomForm(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; int rotomIndex = ScriptGetVar(ctx); int defaultSlot = ScriptGetVar(ctx); ScriptGetVar(ctx); //unsused variable u32 form = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), rotomIndex); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), rotomIndex); Mon_UpdateRotomForm(mon, form, defaultSlot); - Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(fsys->savedata), mon); + Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(fieldSystem->savedata), mon); return FALSE; } BOOL ScrCmd_GetHiddenPowerType(ScriptContext *ctx) { int power, type; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; int partyIndex = ScriptGetVar(ctx); u16 *typePtr = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), partyIndex); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), partyIndex); u16 species = GetMonData(mon, MON_DATA_SPECIES, 0); @@ -570,9 +570,9 @@ static void GetHiddenPowerPowerType(Pokemon *mon, s32 *power, s32 *type) { } BOOL ScrCmd_SetFavoriteMon(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), 0); - SAVE_MISC_DATA *data = Save_Misc_Get(fsys->savedata); + FieldSystem *fieldSystem = ctx->fieldSystem; + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), 0); + SAVE_MISC_DATA *data = Save_Misc_Get(fieldSystem->savedata); u32 species = GetMonData(mon, MON_DATA_SPECIES, 0); u32 form = GetMonData(mon, MON_DATA_FORM, 0); u32 isEgg = GetMonData(mon, MON_DATA_IS_EGG, 0); @@ -581,12 +581,12 @@ BOOL ScrCmd_SetFavoriteMon(ScriptContext *ctx) { } BOOL ScrCmd_GetFavoriteMon(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u32 sp, form, egg; u16 *species = ScriptGetVarPointer(ctx); u16 *formPtr = ScriptGetVarPointer(ctx); u16 *isEgg = ScriptGetVarPointer(ctx); - SAVE_MISC_DATA *data = Save_Misc_Get(fsys->savedata); + SAVE_MISC_DATA *data = Save_Misc_Get(fieldSystem->savedata); SaveMisc_GetFavoriteMon(data, &sp, &form, &egg); *species = sp; *formPtr = form; @@ -595,17 +595,17 @@ BOOL ScrCmd_GetFavoriteMon(ScriptContext *ctx) { } BOOL ScrCmd_GetPartyMonForm(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u32 index = ScriptGetVar(ctx); u16 *form = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), index); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), index); *form = GetMonData(mon, MON_DATA_FORM, 0); return FALSE; } BOOL ScrCmd_699(ScriptContext *ctx) { u32 unkVar; - FieldSystem *fsys; + FieldSystem *fieldSystem; MapObjectManager *mapObjectMan; LocalMapObject *playerObj; LocalMapObject *curObj; @@ -615,10 +615,10 @@ BOOL ScrCmd_699(ScriptContext *ctx) { unkVar = 0; - fsys = ctx->fsys; - mapObjectMan = fsys->mapObjectMan; + fieldSystem = ctx->fieldSystem; + mapObjectMan = fieldSystem->mapObjectMan; - playerObj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + playerObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); MapObject_GetPositionVec(playerObj, &vec); height = vec.y; @@ -643,15 +643,15 @@ BOOL ScrCmd_699(ScriptContext *ctx) { BOOL ScrCmd_700(ScriptContext *ctx) { u32 index = 0; - FieldSystem *fsys; + FieldSystem *fieldSystem; MapObjectManager *mapObjectMan; LocalMapObject *playerObj; LocalMapObject *curObj; - fsys = ctx->fsys; - mapObjectMan = fsys->mapObjectMan; + fieldSystem = ctx->fieldSystem; + mapObjectMan = fieldSystem->mapObjectMan; - playerObj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + playerObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); while (sub_0205EEF4(mapObjectMan, &curObj, &index, MAPOBJECTFLAG_ACTIVE) == TRUE) { if (curObj == playerObj) continue; @@ -662,7 +662,7 @@ BOOL ScrCmd_700(ScriptContext *ctx) { } BOOL ScrCmd_BattleTowerSetUpMultiBattle(ScriptContext *ctx) { - sub_0202CA44(ctx->fsys->savedata); + sub_0202CA44(ctx->fieldSystem->savedata); sub_02039F68(); return TRUE; } @@ -676,7 +676,7 @@ BOOL ScrCmd_CheckMonSeen(ScriptContext *ctx) { u16 monNumber = ScriptGetVar(ctx); u16 *seenFlag = ScriptGetVarPointer(ctx); - *seenFlag = Pokedex_CheckMonSeenFlag(Save_Pokedex_Get(ctx->fsys->savedata), monNumber); + *seenFlag = Pokedex_CheckMonSeenFlag(Save_Pokedex_Get(ctx->fieldSystem->savedata), monNumber); return FALSE; } @@ -684,19 +684,19 @@ BOOL ScrCmd_CheckMonSeen(ScriptContext *ctx) { //Related to the trapped floor in the rocket hideout BOOL ScrCmd_708(ScriptContext *ctx) { u32 unkVar = ScriptGetVar(ctx); - ov02_022460AC(ctx->fsys->taskman, unkVar); + ov02_022460AC(ctx->fieldSystem->taskman, unkVar); return TRUE; } BOOL ScrCmd_ShowLegendaryWing(ScriptContext *ctx) { u32 unkVar = ScriptGetVar(ctx); - ShowLegendaryWing(ctx->fsys->taskman, unkVar); + ShowLegendaryWing(ctx->fieldSystem->taskman, unkVar); return TRUE; } //Related to Persian statues in the rocket hideout BOOL ScrCmd_709(ScriptContext *ctx) { - ov02_022462E8(ctx->fsys->taskman); + ov02_022462E8(ctx->fieldSystem->taskman); return TRUE; } @@ -705,7 +705,7 @@ BOOL ScrCmd_ScreenShake(ScriptContext *ctx) { u32 a2 = ScriptGetVar(ctx); u32 a3 = ScriptGetVar(ctx); u32 a4 = ScriptGetVar(ctx); - ov02_02246714(ctx->fsys->taskman, a1, a2, a3, a4); + ov02_02246714(ctx->fieldSystem->taskman, a1, a2, a3, a4); return TRUE; } @@ -714,16 +714,16 @@ BOOL ScrCmd_775(ScriptContext *ctx) { u32 objIdA = ScriptGetVar(ctx); u32 objIdB = ScriptGetVar(ctx); - LocalMapObject *objA = GetMapObjectByID(ctx->fsys->mapObjectMan, objIdA); - LocalMapObject *objB = GetMapObjectByID(ctx->fsys->mapObjectMan, objIdB); + LocalMapObject *objA = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objIdA); + LocalMapObject *objB = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objIdB); - ov02_022469B4(ctx->fsys->taskman, objA, objB); + ov02_022469B4(ctx->fieldSystem->taskman, objA, objB); return TRUE; } BOOL ScrCmd_OpenAlphHiddenRoom(ScriptContext *ctx) { - OpenAlphHiddenRoom(ctx->fsys->taskman, ScriptReadByte(ctx)); + OpenAlphHiddenRoom(ctx->fieldSystem->taskman, ScriptReadByte(ctx)); return TRUE; } @@ -740,7 +740,7 @@ BOOL ScrCmd_724(ScriptContext *ctx) { u8 unkVar = ScriptGetVar(ctx); u16 *unkPtrA = ScriptGetVarPointer(ctx); - Pokeathlon_UnkSubStruct_B00 *unkPtrB = sub_0203199C(Save_Pokeathlon_Get(ctx->fsys->savedata)); + Pokeathlon_UnkSubStruct_B00 *unkPtrB = sub_0203199C(Save_Pokeathlon_Get(ctx->fieldSystem->savedata)); if (unkVar <= 9) { *unkPtrA = ov01_02201B2C(unkPtrB->unk44[unkVar]); @@ -787,7 +787,7 @@ BOOL ScrCmd_725(ScriptContext *ctx) { u8 unkA = ScriptReadByte(ctx); u32 unkB = ScriptGetVar(ctx); - Pokeathlon_UnkSubStruct_B00 *unkPtr = sub_020319F0(Save_Pokeathlon_Get(ctx->fsys->savedata)); + Pokeathlon_UnkSubStruct_B00 *unkPtr = sub_020319F0(Save_Pokeathlon_Get(ctx->fieldSystem->savedata)); if (unkA == 0) { val = unkPtr->unk70 + unkB; @@ -809,26 +809,26 @@ BOOL ScrCmd_725(ScriptContext *ctx) { } BOOL ScrCmd_726(ScriptContext *ctx) { - ov01_021E7F00(ctx->fsys, TRUE); + ov01_021E7F00(ctx->fieldSystem, TRUE); return FALSE; } //Related to Kurt BOOL ScrCmd_735(ScriptContext *ctx) { u16 *apricornQuantity = ScriptGetVarPointer(ctx); - *apricornQuantity = ApricornBox_GetKurtQuantity(Save_ApricornBox_Get(ctx->fsys->savedata)); + *apricornQuantity = ApricornBox_GetKurtQuantity(Save_ApricornBox_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_ClearKurtApricorn(ScriptContext *ctx) { - ApricornBox_SetKurtApricorn(Save_ApricornBox_Get(ctx->fsys->savedata), 0, 0); + ApricornBox_SetKurtApricorn(Save_ApricornBox_Get(ctx->fieldSystem->savedata), 0, 0); return FALSE; } //Related to Kurt BOOL ScrCmd_737(ScriptContext *ctx) { u16 *unkPtr = ScriptGetVarPointer(ctx); - *unkPtr = ApricornBox_GetKurtBall(Save_ApricornBox_Get(ctx->fsys->savedata)); + *unkPtr = ApricornBox_GetKurtBall(Save_ApricornBox_Get(ctx->fieldSystem->savedata)); return FALSE; } @@ -838,7 +838,7 @@ BOOL ScrCmd_GetTotalApricornCount(ScriptContext *ctx) { u32 cnt; u16 *unkPtr = ScriptGetVarPointer(ctx); cnt = 0; - SaveApricornBox *apricornBox = Save_ApricornBox_Get(ctx->fsys->savedata); + SaveApricornBox *apricornBox = Save_ApricornBox_Get(ctx->fieldSystem->savedata); for (i = 0; i < 7; i = i + 1) { cnt += ApricornBox_CountApricorn(apricornBox, i); } @@ -848,18 +848,18 @@ BOOL ScrCmd_GetTotalApricornCount(ScriptContext *ctx) { //Related to Kurt- canceling BOOL ScrCmd_739(ScriptContext *ctx) { //todo: rename structs and find out stuff - struct ApricornBoxWork **unkPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *unkPtr = CreateApricornBoxWork(ctx->fsys, 2); + struct ApricornBoxWork **unkPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *unkPtr = CreateApricornBoxWork(ctx->fieldSystem, 2); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } //Related to aprijuice stand- canceling BOOL ScrCmd_740(ScriptContext *ctx) { - u32 **unkPtrA = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + u32 **unkPtrA = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u32 unkVar = ScriptGetVar(ctx); u16 *unkPtrB = ScriptGetVarPointer(ctx); - *unkPtrA = sub_0203ED80(ctx->fsys, unkVar, unkPtrB); + *unkPtrA = sub_0203ED80(ctx->fieldSystem, unkVar, unkPtrB); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } @@ -876,8 +876,8 @@ BOOL ScrCmd_741(ScriptContext *ctx) { u16 *unkPtrC; String *str; - apricornBox = Save_ApricornBox_Get(ctx->fsys->savedata); - msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + apricornBox = Save_ApricornBox_Get(ctx->fieldSystem->savedata); + msgfmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); unkVar = ScriptGetVar(ctx); unkPtrA = ScriptGetVarPointer(ctx); price = ScriptGetVarPointer(ctx); @@ -924,12 +924,12 @@ extern u8 sFriendshipRoomStatuesPositions[3][2]; BOOL ScrCmd_CreatePokeathlonFriendshipRoomStatues(ScriptContext *ctx) { s32 i; u16 species; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; - SavePokeathlonFriendshipRecords *unkPtr = sub_02031B00(fsys->savedata); + SavePokeathlonFriendshipRecords *unkPtr = sub_02031B00(fieldSystem->savedata); for (i = 0; i < 3; i++) { - LocalMapObject *mapObj = GetMapObjectByID(fsys->mapObjectMan, 0xf6 + i); + LocalMapObject *mapObj = GetMapObjectByID(fieldSystem->mapObjectMan, 0xf6 + i); if (mapObj) { DeleteMapObject(mapObj); @@ -938,7 +938,7 @@ BOOL ScrCmd_CreatePokeathlonFriendshipRoomStatues(ScriptContext *ctx) { species = unkPtr->friendshipRoomStatues[i].species; if (species != SPECIES_NONE && species <= SPECIES_ARCEUS) { - ov01_02201F98(fsys->mapObjectMan, (u8) i, species, unkPtr->friendshipRoomStatues[i].form, unkPtr->friendshipRoomStatues[i].gender, sFriendshipRoomStatuesPositions[i][0], sFriendshipRoomStatuesPositions[i][1], fsys->location->mapId); + ov01_02201F98(fieldSystem->mapObjectMan, (u8) i, species, unkPtr->friendshipRoomStatues[i].form, unkPtr->friendshipRoomStatues[i].gender, sFriendshipRoomStatuesPositions[i][0], sFriendshipRoomStatuesPositions[i][1], fieldSystem->location->mapId); } } return TRUE; @@ -982,7 +982,7 @@ BOOL ScrCmd_CheckSeenAllLetterUnown(ScriptContext *ctx) { u16 *allUnownSeen; allUnownSeen = ScriptGetVarPointer(ctx); - pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); unownForms = Pokedex_GetSeenFormNum_Unown(pokedex, 1); if (unownForms < 26) { @@ -1014,10 +1014,10 @@ BOOL ScrCmd_GiveTogepiEgg(ScriptContext *ctx) { Pokemon *mon; PlayerProfile *profile; Party *party; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; - profile = Save_PlayerData_GetProfileAddr(fsys->savedata); - party = SaveArray_Party_Get(fsys->savedata); + profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata); + party = SaveArray_Party_Get(fieldSystem->savedata); if (Party_GetCount(party) >= 6) { return FALSE; @@ -1048,7 +1048,7 @@ BOOL ScrCmd_GiveTogepiEgg(ScriptContext *ctx) { FreeToHeap(mon); - SaveMisc_SetTogepiPersonalityGender(Save_Misc_Get(fsys->savedata), GetMonData(mon, MON_DATA_PERSONALITY, 0), GetMonData(mon, MON_DATA_GENDER, 0)); + SaveMisc_SetTogepiPersonalityGender(Save_Misc_Get(fieldSystem->savedata), GetMonData(mon, MON_DATA_PERSONALITY, 0), GetMonData(mon, MON_DATA_GENDER, 0)); return FALSE; } @@ -1058,9 +1058,9 @@ BOOL ScrCmd_777(ScriptContext *ctx) { u32 partyIndex = ScriptGetVar(ctx); u16 *unkPtr = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), partyIndex); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), partyIndex); - *unkPtr = sub_0206D8D0(mon, ctx->fsys->savedata); + *unkPtr = sub_0206D8D0(mon, ctx->fieldSystem->savedata); return FALSE; } @@ -1074,13 +1074,13 @@ BOOL ScrCmd_GiveSpikyEarPichu(ScriptContext *ctx) { u16 heldItem; Pokemon *mon; Party *party; - FieldSystem *fsys; + FieldSystem *fieldSystem; PlayerProfile *profile; - fsys = ctx->fsys; + fieldSystem = ctx->fieldSystem; - profile = Save_PlayerData_GetProfileAddr(fsys->savedata); - party = SaveArray_Party_Get(fsys->savedata); + profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata); + party = SaveArray_Party_Get(fieldSystem->savedata); if (Party_GetCount(party) >= 6) { return FALSE; } @@ -1103,7 +1103,7 @@ BOOL ScrCmd_GiveSpikyEarPichu(ScriptContext *ctx) { heldItem = ITEM_ZAP_PLATE; SetMonData(mon, MON_DATA_HELD_ITEM, &heldItem); - u32 unkB = sub_02017FE4(MAPSECTYPE_NORMAL, MapHeader_GetMapSec(ctx->fsys->location->mapId)); + u32 unkB = sub_02017FE4(MAPSECTYPE_NORMAL, MapHeader_GetMapSec(ctx->fieldSystem->location->mapId)); sub_020720FC(mon, profile, 4, unkB, 0x18, HEAP_ID_FIELD); @@ -1111,16 +1111,16 @@ BOOL ScrCmd_GiveSpikyEarPichu(ScriptContext *ctx) { FreeToHeap(mon); - UpdatePokedexWithReceivedSpecies(fsys->savedata, mon); + UpdatePokedexWithReceivedSpecies(fieldSystem->savedata, mon); return FALSE; } BOOL ScrCmd_PhotoAlbumIsFull(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *albumIsFull = ScriptGetVarPointer(ctx); - *albumIsFull = (PhotoAlbum_GetNumSaved(Save_PhotoAlbum_Get(fsys->savedata)) >= 36); + *albumIsFull = (PhotoAlbum_GetNumSaved(Save_PhotoAlbum_Get(fieldSystem->savedata)) >= 36); return FALSE; } @@ -1189,9 +1189,9 @@ static u32 SlotLuckiness(SaveData *savedata, u8 machineId, u8 city) { BOOL ScrCmd_CasinoGame(ScriptContext *ctx) { u8 machineId = ScriptReadByte(ctx); u8 city = ScriptReadByte(ctx); //1 = celadon; 0 = goldenrod - u32 **unkPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); //VoltorbFlipAppData + u32 **unkPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //VoltorbFlipAppData - *unkPtr = LaunchVoltorbFlipApp(ctx->fsys, SlotLuckiness(ctx->fsys->savedata, machineId, city)); //this is messy, very very messy + *unkPtr = LaunchVoltorbFlipApp(ctx->fieldSystem, SlotLuckiness(ctx->fieldSystem->savedata, machineId, city)); //this is messy, very very messy SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; @@ -1200,7 +1200,7 @@ BOOL ScrCmd_CasinoGame(ScriptContext *ctx) { BOOL ScrCmd_BufferPokeathlonCourseName(ScriptContext *ctx) { u8 fieldNo = ScriptReadByte(ctx); u32 courseId = ScriptGetVar(ctx); - BufferPokeathlonCourseName(*(MessageFormat**)FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT), fieldNo, (u8) courseId); + BufferPokeathlonCourseName(*(MessageFormat**)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT), fieldNo, (u8) courseId); return FALSE; } @@ -1209,14 +1209,14 @@ BOOL ScrCmd_811(ScriptContext *ctx) { u16 *unkPtr1 = ScriptGetVarPointer(ctx); u16 *unkPtr2 = ScriptGetVarPointer(ctx); - *unkPtr2 = sub_0202F224(SaveData_GetMomsSavingsAddr(ctx->fsys->savedata), 0, unkPtr1); + *unkPtr2 = sub_0202F224(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata), 0, unkPtr1); return FALSE; } //Gets called when getting a package from your mom BOOL ScrCmd_812(ScriptContext *ctx) { - sub_0202F1F4(SaveData_GetMomsSavingsAddr(ctx->fsys->savedata)); + sub_0202F1F4(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata)); return FALSE; } @@ -1224,7 +1224,7 @@ BOOL ScrCmd_GetBuenasPassword(ScriptContext *ctx) { u16 *msgPtr = ScriptGetVarPointer(ctx); u16 *unkPtr2 = ScriptGetVarPointer(ctx); - u8 unkVar = Save_VarsFlags_GetBuenasPasswordSet(Save_VarsFlags_Get(ctx->fsys->savedata)) % 30; + u8 unkVar = Save_VarsFlags_GetBuenasPasswordSet(Save_VarsFlags_Get(ctx->fieldSystem->savedata)) % 30; *msgPtr = 2*(unkVar / 3) + unkVar / 3 + msg_0066_D23R0102_00040; @@ -1249,15 +1249,15 @@ static u32 MonGetShinyLeafCount(Pokemon *mon) { BOOL ScrCmd_GetShinyLeafCount(ScriptContext *ctx) { u32 monIndex = ScriptGetVar(ctx); u16 *shinyLeafCount = ScriptGetVarPointer(ctx); - *shinyLeafCount = MonGetShinyLeafCount(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), monIndex)); + *shinyLeafCount = MonGetShinyLeafCount(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), monIndex)); return FALSE; } BOOL ScrCmd_TryGiveShinyLeafCrown(ScriptContext *ctx) { u32 monIndex = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), monIndex); - if (MonGetShinyLeafCount(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), monIndex)) == 5) { + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), monIndex); + if (MonGetShinyLeafCount(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), monIndex)) == 5) { u8 data = TRUE; SetMonData(mon, MON_DATA_SHINY_LEAF_CROWN, &data); } @@ -1268,7 +1268,7 @@ BOOL ScrCmd_TryGiveShinyLeafCrown(ScriptContext *ctx) { BOOL ScrCmd_GetUniqueSealsQuantity(ScriptContext *ctx) { u16 *uniqueSeals = ScriptGetVarPointer(ctx); - *uniqueSeals = SealCase_CountUniqueSeals(Save_SealCase_Get(ctx->fsys->savedata)); + *uniqueSeals = SealCase_CountUniqueSeals(Save_SealCase_Get(ctx->fieldSystem->savedata)); return FALSE; } @@ -1277,7 +1277,7 @@ BOOL ScrCmd_GetSealQuantity(ScriptContext *ctx) { u32 sealId = ScriptGetVar(ctx); u16 *sealQuantity = ScriptGetVarPointer(ctx); - *sealQuantity = SealCase_CountSealOccurrenceAnywhere(Save_SealCase_Get(ctx->fsys->savedata), sealId); + *sealQuantity = SealCase_CountSealOccurrenceAnywhere(Save_SealCase_Get(ctx->fieldSystem->savedata), sealId); return FALSE; } @@ -1286,7 +1286,7 @@ BOOL ScrCmd_GiveOrTakeSeal(ScriptContext *ctx) { u32 sealId = ScriptGetVar(ctx); u32 quantity = ScriptGetVar(ctx); - GiveOrTakeSeal(Save_SealCase_Get(ctx->fsys->savedata), sealId, quantity); + GiveOrTakeSeal(Save_SealCase_Get(ctx->fieldSystem->savedata), sealId, quantity); return FALSE; } @@ -1322,7 +1322,7 @@ BOOL ScrCmd_GiveRandomSeal(ScriptContext *ctx) { seal2 = ScriptGetVarPointer(ctx); seal3 = ScriptGetVarPointer(ctx); - sealcase = Save_SealCase_Get(ctx->fsys->savedata); + sealcase = Save_SealCase_Get(ctx->fieldSystem->savedata); sealThresholds = AllocFromHeapAtEnd(HEAP_ID_32, sizeof(u16)*SEAL_MYSTERY); @@ -1379,7 +1379,7 @@ BOOL ScrCmd_CheckKyogreGroudonInParty(ScriptContext *ctx) { u8 kyogreGroudonFlags = 0; unkPtr = ScriptGetVarPointer(ctx); - playerParty = SaveArray_Party_Get(ctx->fsys->savedata); + playerParty = SaveArray_Party_Get(ctx->fieldSystem->savedata); partyCount = Party_GetCount(playerParty); unkVar = *(ctx->script_ptr); @@ -1428,14 +1428,14 @@ BOOL ScrCmd_BugContestAction(ScriptContext *ctx) { u8 unkVar1 = ScriptReadByte(ctx); u32 weekday = ScriptGetVar(ctx); - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; if (unkVar1 == 0) { - fsys->bugContest = BugContest_New(fsys, weekday); + fieldSystem->bugContest = BugContest_New(fieldSystem, weekday); } else { - BugContest_Delete(fsys->bugContest); - fsys->bugContest = NULL; - sub_02093070(fsys); + BugContest_Delete(fieldSystem->bugContest); + fieldSystem->bugContest = NULL; + sub_02093070(fieldSystem); } return FALSE; } @@ -1444,8 +1444,8 @@ BOOL ScrCmd_BufferBugContestWinner(ScriptContext *ctx) { MessageFormat **msgfmt; BUGCONTEST *bugContest; - msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); - bugContest = FieldSys_BugContest_Get(ctx->fsys); + msgfmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + bugContest = FieldSystem_BugContest_Get(ctx->fieldSystem); BugContest_BufferContestWinnerNames(bugContest, ctx->msgdata, *msgfmt, *ctx->script_ptr++); @@ -1458,7 +1458,7 @@ BOOL ScrCmd_JudgeBugContest(ScriptContext *ctx) { u16 *placement; u16 *species; - bugContest = FieldSys_BugContest_Get(ctx->fsys); + bugContest = FieldSystem_BugContest_Get(ctx->fieldSystem); placement = ScriptGetVarPointer(ctx); prize = ScriptGetVarPointer(ctx); species = ScriptGetVarPointer(ctx); @@ -1482,8 +1482,8 @@ BOOL ScrCmd_BufferBugContestMonNick(ScriptContext *ctx) { BUGCONTEST *bugContest; u32 script_index; - msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); - bugContest = FieldSys_BugContest_Get(ctx->fsys); + msgfmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + bugContest = FieldSystem_BugContest_Get(ctx->fieldSystem); script_index = ScriptReadByte(ctx); @@ -1498,12 +1498,12 @@ BOOL ScrCmd_BugContestGetTimeLeft(ScriptContext *ctx) { u32 script_index; u32 timeLeft; - msgfmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + msgfmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); script_index = ScriptReadByte(ctx); timeLeft = 1; - bugContest = FieldSys_BugContest_Get(ctx->fsys); + bugContest = FieldSystem_BugContest_Get(ctx->fieldSystem); if (bugContest != 0 && bugContest->elapsed_time < 20) { timeLeft = 20 - bugContest->elapsed_time; @@ -1515,7 +1515,7 @@ BOOL ScrCmd_BugContestGetTimeLeft(ScriptContext *ctx) { } BOOL ScrCmd_IsBugContestantRegistered(ScriptContext *ctx) { - BUGCONTEST *bugContest = FieldSys_BugContest_Get(ctx->fsys); + 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_alph_checks.c b/src/field_alph_checks.c index b25093ceb..3f14defff 100644 --- a/src/field_alph_checks.c +++ b/src/field_alph_checks.c @@ -2,8 +2,8 @@ #include "field_alph_checks.h" #include "save_local_field_data.h" -BOOL CheckUseEscapeRopeInAlphChamber(FieldSystem* fsys) { - Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fsys->savedata)); +BOOL CheckUseEscapeRopeInAlphChamber(FieldSystem* fieldSystem) { + Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->savedata)); if (position->mapId != MAP_D24R0202) { return FALSE; @@ -16,8 +16,8 @@ BOOL CheckUseEscapeRopeInAlphChamber(FieldSystem* fsys) { return TRUE; } -BOOL CheckUseFlashInAlphChamber(FieldSystem* fsys) { - Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fsys->savedata)); +BOOL CheckUseFlashInAlphChamber(FieldSystem* fieldSystem) { + Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->savedata)); if (position->mapId != MAP_D24R0204) { return FALSE; @@ -30,8 +30,8 @@ BOOL CheckUseFlashInAlphChamber(FieldSystem* fsys) { return TRUE; } -BOOL CheckUseWaterStoneInAlphChamber(FieldSystem* fsys) { - Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fsys->savedata)); +BOOL CheckUseWaterStoneInAlphChamber(FieldSystem* fieldSystem) { + Location* position = LocalFieldData_GetCurrentPosition(Save_LocalFieldData_Get(fieldSystem->savedata)); if (position->mapId != MAP_D24R0206) { return FALSE; diff --git a/src/field_black_out.c b/src/field_black_out.c index dda520226..3c59494cd 100644 --- a/src/field_black_out.c +++ b/src/field_black_out.c @@ -21,7 +21,7 @@ struct BlackoutScreenWork { int state; - FieldSystem *fsys; + FieldSystem *fieldSystem; BgConfig *bgConfig; Window window; MsgData *msgData; @@ -29,7 +29,7 @@ struct BlackoutScreenWork { }; void _InitDisplays(BgConfig *bgConfig); -void DrawBlackoutMessage(FieldSystem *fsys, TaskManager *taskManager); +void DrawBlackoutMessage(FieldSystem *fieldSystem, TaskManager *taskManager); BOOL FieldTask_ShowPrintedMessage(TaskManager *taskManager); void _PrintMessage(struct BlackoutScreenWork *work, int msgno, u8 x, u8 y); @@ -69,14 +69,14 @@ static void _InitDisplays(BgConfig *bgConfig) { BG_SetMaskColor(3, RGB_WHITE); } -static void DrawBlackoutMessage(FieldSystem *fsys, TaskManager *taskManager) { +static void DrawBlackoutMessage(FieldSystem *fieldSystem, TaskManager *taskManager) { struct BlackoutScreenWork *env; env = AllocFromHeap((HeapID)11, sizeof(struct BlackoutScreenWork)); GF_ASSERT(env != NULL); memset(env, 0, sizeof(struct BlackoutScreenWork)); env->state = 0; - env->fsys = fsys; + env->fieldSystem = fieldSystem; env->bgConfig = BgConfig_Alloc((HeapID)11); sub_0200FBF4(0, RGB_WHITE); sub_0200FBF4(1, RGB_WHITE); @@ -98,8 +98,8 @@ static void DrawBlackoutMessage(FieldSystem *fsys, TaskManager *taskManager) { AddWindow(env->bgConfig, &env->window, &_020FC51C); } - BufferPlayersName(env->msgFmt, 0, Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fsys))); - if (fsys->location->mapId == MAP_T20R0201) { + BufferPlayersName(env->msgFmt, 0, Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fieldSystem))); + if (fieldSystem->location->mapId == MAP_T20R0201) { _PrintMessage(env, msg_0203_00004, 0, 0); } else { _PrintMessage(env, msg_0203_00003, 0, 0); @@ -167,7 +167,7 @@ static void _PrintMessage(struct BlackoutScreenWork *work, int msgno, u8 x, u8 y } BOOL FieldTask_BlackOut(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); u32 *state = TaskManager_GetStatePtr(taskManager); LocalFieldData *localFieldData; Location deathWarp; @@ -175,13 +175,13 @@ BOOL FieldTask_BlackOut(TaskManager *taskManager) { switch (*state) { case 0: - localFieldData = Save_LocalFieldData_Get(fsys->savedata); + localFieldData = Save_LocalFieldData_Get(fieldSystem->savedata); deathSpawn = LocalFieldData_GetBlackoutSpawn(localFieldData); GetDeathWarpData(deathSpawn, &deathWarp); GetSpecialSpawnWarpData(deathSpawn, LocalFieldData_GetSpecialSpawnWarpPtr(localFieldData)); sub_020537A8(taskManager, &deathWarp); - Fsys_ClearFollowingTrainer(fsys); - HealParty(SaveArray_Party_Get(fsys->savedata)); + FieldSystem_ClearFollowingTrainer(fieldSystem); + HealParty(SaveArray_Party_Get(fieldSystem->savedata)); (*state)++; break; case 1: @@ -197,7 +197,7 @@ BOOL FieldTask_BlackOut(TaskManager *taskManager) { case 3: SetBlendBrightness(-16, (GXBlendPlaneMask)(GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG0), SCREEN_MASK_MAIN); SetBlendBrightness(-16, (GXBlendPlaneMask)(GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG0), SCREEN_MASK_SUB); - DrawBlackoutMessage(fsys, taskManager); + DrawBlackoutMessage(fieldSystem, taskManager); (*state)++; break; case 4: @@ -206,7 +206,7 @@ BOOL FieldTask_BlackOut(TaskManager *taskManager) { break; case 5: SetBlendBrightness(0, (GXBlendPlaneMask)(GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG0), SCREEN_MASK_MAIN | SCREEN_MASK_SUB); - if (GetMomSpawnId() == LocalFieldData_GetBlackoutSpawn(Save_LocalFieldData_Get(fsys->savedata))) { + if (GetMomSpawnId() == LocalFieldData_GetBlackoutSpawn(Save_LocalFieldData_Get(fieldSystem->savedata))) { QueueScript(taskManager, std_whited_out_to_mom, NULL, NULL); } else { QueueScript(taskManager, std_whited_out_to_pokecenter, NULL, NULL); diff --git a/src/field_follow_poke.c b/src/field_follow_poke.c index 0da00f9e9..5aa81852e 100644 --- a/src/field_follow_poke.c +++ b/src/field_follow_poke.c @@ -8,7 +8,7 @@ #include "constants/scrcmd.h" #include "constants/follow_poke_idx.h" -static void FsysFollowMonClear(FollowMon *followMon); +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); @@ -1504,7 +1504,7 @@ static const u16 sFemaleFlagLUT[] = { }; LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int direction, u32 mapno) { - FieldSystem *fsys; + FieldSystem *fieldSystem; Party *party; int partyCount; Pokemon *mon; @@ -1514,11 +1514,11 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int d int shiny; int player_unk; - fsys = MapObjectManager_GetFieldSysPtr(mapObjectMan); - party = SaveArray_Party_Get(fsys->savedata); + fieldSystem = MapObjectManager_GetFieldSysPtr(mapObjectMan); + party = SaveArray_Party_Get(fieldSystem->savedata); partyCount = Party_GetCount(party); - FsysFollowMonClear(&fsys->followMon); - SavFollowPoke_SetUnused2bitField(0, Save_FollowPoke_Get(fsys->savedata)); + FieldSystemFollowMonClear(&fieldSystem->followMon); + SavFollowPoke_SetUnused2bitField(0, Save_FollowPoke_Get(fieldSystem->savedata)); if (partyCount != 0) { if (CountAlivePokemon(party) == 0) { mon = GetFirstNonEggInParty(party); @@ -1526,40 +1526,40 @@ LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int d mon = GetFirstAliveMonInParty_CrashIfNone(party); } species = GetMonData(mon, MON_DATA_SPECIES, NULL); - fsys->followMon.mapObject = NULL; + fieldSystem->followMon.mapObject = NULL; if (GetFollowPokePermissionBySpeciesAndMap(species, mapno)) { form = GetMonData(mon, MON_DATA_FORM, NULL); gender = GetMonData(mon, MON_DATA_GENDER, NULL); shiny = MonIsShiny(mon); - fsys->followMon.mapObject = CreateFollowingSpriteFieldObject(mapObjectMan, species, form, gender, direction, x, y, shiny); - fsys->followMon.active = TRUE; - FollowPokeFsysParamSet(fsys, species, form, shiny, gender); - FsysUnkSub108_Set(fsys->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); - player_unk = PlayerAvatar_GetState(fsys->playerAvatar); + fieldSystem->followMon.mapObject = CreateFollowingSpriteFieldObject(mapObjectMan, species, form, gender, direction, x, y, shiny); + fieldSystem->followMon.active = TRUE; + FollowPokeFieldSystemParamSet(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) { - SavFollowPoke_SetUnused2bitField(1, Save_FollowPoke_Get(fsys->savedata)); + SavFollowPoke_SetUnused2bitField(1, Save_FollowPoke_Get(fieldSystem->savedata)); } else if (player_unk == 1) { - SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fsys->savedata)); - sub_0206A054(fsys); - sub_0205FC94(FollowingPokemon_GetMapObject(fsys), 56); + SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->savedata)); + sub_0206A054(fieldSystem); + sub_0205FC94(FollowingPokemon_GetMapObject(fieldSystem), 56); } else if (player_unk == 2) { - SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fsys->savedata)); - sub_0206A054(fsys); - sub_0205FC94(FollowingPokemon_GetMapObject(fsys), 56); + SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->savedata)); + sub_0206A054(fieldSystem); + sub_0205FC94(FollowingPokemon_GetMapObject(fieldSystem), 56); } else { GF_ASSERT(0); } - if (SavFollowPoke_GetInhibitFlagState(Save_FollowPoke_Get(fsys->savedata))) { - sub_0206A054(fsys); + if (SavFollowPoke_GetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->savedata))) { + sub_0206A054(fieldSystem); } } } - return fsys->followMon.mapObject; + return fieldSystem->followMon.mapObject; } void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) { - FieldSystem *fsys; + FieldSystem *fieldSystem; Party *party; int partyCount; Pokemon *mon; @@ -1570,66 +1570,66 @@ void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno) { int player_unk; LocalMapObject *followPokeObj; - fsys = MapObjectManager_GetFieldSysPtr(mapObjectMan); - party = SaveArray_Party_Get(fsys->savedata); + fieldSystem = MapObjectManager_GetFieldSysPtr(mapObjectMan); + party = SaveArray_Party_Get(fieldSystem->savedata); partyCount = Party_GetCount(party); - FsysFollowMonClear(&fsys->followMon); + FieldSystemFollowMonClear(&fieldSystem->followMon); if (partyCount != 0) { mon = GetFirstAliveMonInParty_CrashIfNone(party); species = GetMonData(mon, MON_DATA_SPECIES, NULL); - FsysUnkSub108_Set(fsys->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); + FieldSystemUnkSub108_Set(fieldSystem->unk108, mon, species, GetMonData(mon, MON_DATA_PERSONALITY, NULL)); if (GetFollowPokePermissionBySpeciesAndMap(species, mapno)) { - followPokeObj = GetMapObjectByID(fsys->mapObjectMan, obj_partner_poke); + followPokeObj = GetMapObjectByID(fieldSystem->mapObjectMan, obj_partner_poke); if (followPokeObj == NULL) { - fsys->followMon.unk15 = 1; + fieldSystem->followMon.unk15 = 1; } else { form = GetMonData(mon, MON_DATA_FORM, NULL); gender = GetMonGender(mon); shiny = MonIsShiny(mon); - fsys->followMon.mapObject = followPokeObj; - fsys->followMon.active = TRUE; - FollowPokeFsysParamSet(fsys, species, form, shiny, gender); + fieldSystem->followMon.mapObject = followPokeObj; + fieldSystem->followMon.active = TRUE; + FollowPokeFieldSystemParamSet(fieldSystem, species, form, shiny, gender); FollowPokeMapObjectSetParams(followPokeObj, species, form, shiny); - MapObject_SetGfxID(fsys->followMon.mapObject, FollowingPokemon_GetSpriteID(species, form, gender)); - player_unk = PlayerAvatar_GetState(fsys->playerAvatar); + MapObject_SetGfxID(fieldSystem->followMon.mapObject, FollowingPokemon_GetSpriteID(species, form, gender)); + player_unk = PlayerAvatar_GetState(fieldSystem->playerAvatar); if (player_unk == 0 || player_unk == 3) { - SavFollowPoke_SetUnused2bitField(1, Save_FollowPoke_Get(fsys->savedata)); + SavFollowPoke_SetUnused2bitField(1, Save_FollowPoke_Get(fieldSystem->savedata)); } else if (player_unk == 1) { - SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fsys->savedata)); - sub_0206A040(fsys->followMon.mapObject, TRUE); + SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->savedata)); + sub_0206A040(fieldSystem->followMon.mapObject, TRUE); } else if (player_unk == 2) { - SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fsys->savedata)); - sub_0206A040(fsys->followMon.mapObject, TRUE); + SavFollowPoke_SetUnused2bitField(2, Save_FollowPoke_Get(fieldSystem->savedata)); + sub_0206A040(fieldSystem->followMon.mapObject, TRUE); } else { GF_ASSERT(0); } - if (sub_02069E14(fsys->followMon.mapObject)) { - sub_0206A040(fsys->followMon.mapObject, TRUE); + if (sub_02069E14(fieldSystem->followMon.mapObject)) { + sub_0206A040(fieldSystem->followMon.mapObject, TRUE); } - if (SavFollowPoke_GetInhibitFlagState(Save_FollowPoke_Get(fsys->savedata))) { - sub_0206A054(fsys); + if (SavFollowPoke_GetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->savedata))) { + sub_0206A054(fieldSystem); } - MapObject_ClearFlag18(fsys->followMon.mapObject, FALSE); + MapObject_ClearFlag18(fieldSystem->followMon.mapObject, FALSE); } } else { - followPokeObj = GetMapObjectByID(fsys->mapObjectMan, obj_partner_poke); + followPokeObj = GetMapObjectByID(fieldSystem->mapObjectMan, obj_partner_poke); if (followPokeObj != NULL) { form = GetMonData(mon, MON_DATA_FORM, NULL); gender = GetMonGender(mon); shiny = MonIsShiny(mon); - FollowPokeFsysParamSet(fsys, species, form, shiny, gender); + FollowPokeFieldSystemParamSet(fieldSystem, species, form, shiny, gender); FollowPokeMapObjectSetParams(followPokeObj, species, form, shiny); MapObject_SetGfxID(followPokeObj, FollowingPokemon_GetSpriteID(species, form, gender)); - fsys->followMon.mapObject = followPokeObj; - fsys->followMon.active = TRUE; - fsys->followMon.unk15 = 1; + fieldSystem->followMon.mapObject = followPokeObj; + fieldSystem->followMon.active = TRUE; + fieldSystem->followMon.unk15 = 1; } } } } -LocalMapObject *FollowingPokemon_GetMapObject(FieldSystem *fsys) { - return fsys->followMon.mapObject; +LocalMapObject *FollowingPokemon_GetMapObject(FieldSystem *fieldSystem) { + return fieldSystem->followMon.mapObject; } u32 FollowingPokemon_GetSpriteID(int species, u16 form, u32 gender) { @@ -1755,11 +1755,11 @@ void sub_02069F0C(LocalMapObject *mapObject, int species, u8 form, BOOL shiny, i MapObject_SetParam(mapObject, species, 0); } -void FollowPokeFsysParamSet(FieldSystem *fsys, int species, u8 form, BOOL shiny, u8 gender) { - fsys->followMon.species = species; - fsys->followMon.shiny = shiny; - fsys->followMon.form = form; - fsys->followMon.gender = gender; +void FollowPokeFieldSystemParamSet(FieldSystem *fieldSystem, int species, u8 form, BOOL shiny, u8 gender) { + fieldSystem->followMon.species = species; + fieldSystem->followMon.shiny = shiny; + fieldSystem->followMon.form = form; + fieldSystem->followMon.gender = gender; } u8 GetFollowPokeSizeParamBySpecies(int species) { @@ -1773,21 +1773,21 @@ int FollowPokeObj_GetSpecies(LocalMapObject *mapObject) { return MapObject_GetParam(mapObject, 0); } -BOOL FollowingPokemon_IsActive(FieldSystem *fsys) { - if (fsys->followMon.active == 0) { +BOOL FollowingPokemon_IsActive(FieldSystem *fieldSystem) { + if (fieldSystem->followMon.active == 0) { return FALSE; } - if (CountAlivePokemon(SaveArray_Party_Get(fsys->savedata)) != 0) { + if (CountAlivePokemon(SaveArray_Party_Get(fieldSystem->savedata)) != 0) { return TRUE; } else { return FALSE; } } -BOOL sub_02069FB0(FieldSystem *fsys) { - if (FollowingPokemon_IsActive(fsys)) { - if (!MapObject_CheckVisible(fsys->followMon.mapObject)) { +BOOL sub_02069FB0(FieldSystem *fieldSystem) { + if (FollowingPokemon_IsActive(fieldSystem)) { + if (!MapObject_CheckVisible(fieldSystem->followMon.mapObject)) { return TRUE; } else { return FALSE; @@ -1797,11 +1797,11 @@ BOOL sub_02069FB0(FieldSystem *fsys) { } } -BOOL GetFollowPokePermission(FieldSystem *fsys) { +BOOL GetFollowPokePermission(FieldSystem *fieldSystem) { u32 mapno; - mapno = SavFollowPoke_GetMapId(Save_FollowPoke_Get(fsys->savedata)); - return GetFollowPokePermissionBySpeciesAndMap(FollowPokeObj_GetSpecies(fsys->followMon.mapObject), mapno); + mapno = SavFollowPoke_GetMapId(Save_FollowPoke_Get(fieldSystem->savedata)); + return GetFollowPokePermissionBySpeciesAndMap(FollowPokeObj_GetSpecies(fieldSystem->followMon.mapObject), mapno); } BOOL GetFollowPokePermissionBySpeciesAndMap(int species, u32 mapno) { @@ -1834,13 +1834,13 @@ void sub_0206A040(LocalMapObject *mapObject, BOOL enable_bit) { MapObject_SetFlag19(mapObject, enable_bit); } -void sub_0206A054(FieldSystem *fsys) { - LocalMapObject *obj = fsys->followMon.mapObject; +void sub_0206A054(FieldSystem *fieldSystem) { + LocalMapObject *obj = fieldSystem->followMon.mapObject; sub_02069DC8(obj, TRUE); sub_02069DEC(obj, FALSE); } -static void FsysFollowMonClear(FollowMon *followMon) { +static void FieldSystemFollowMonClear(FollowMon *followMon) { followMon->active = FALSE; followMon->mapObject = NULL; followMon->unk4 = 0; @@ -1932,7 +1932,7 @@ static LocalMapObject *CreateFollowingSpriteFieldObject(MapObjectManager *mapObj return ret; } -struct FieldSystemUnk108 *FsysUnkSub108_Alloc(HeapID heapId) { +struct FieldSystemUnk108 *FieldSystemUnkSub108_Alloc(HeapID heapId) { struct FieldSystemUnk108 *ret; ret = AllocFromHeap(heapId, sizeof(struct FieldSystemUnk108)); @@ -1944,7 +1944,7 @@ struct FieldSystemUnk108 *FsysUnkSub108_Alloc(HeapID heapId) { return ret; } -void FsysUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by) { +void FieldSystemUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by) { s8 mood; if (unk->mon == NULL) { @@ -1963,7 +1963,7 @@ void FsysUnkSub108_AddMonMood(struct FieldSystemUnk108 *unk, s8 by) { SetMonData(unk->mon, MON_DATA_MOOD, &mood); } -void FsysUnkSub108_SetMonMood(struct FieldSystemUnk108 *unk, s8 mood) { +void FieldSystemUnkSub108_SetMonMood(struct FieldSystemUnk108 *unk, s8 mood) { if (unk->mon == NULL) { GF_ASSERT(0); return; @@ -1972,7 +1972,7 @@ void FsysUnkSub108_SetMonMood(struct FieldSystemUnk108 *unk, s8 mood) { SetMonData(unk->mon, MON_DATA_MOOD, &mood); } -s8 FsysUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk) { +s8 FieldSystemUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk) { if (unk->mon == NULL) { GF_ASSERT(0); return 0; @@ -1981,7 +1981,7 @@ s8 FsysUnkSub108_GetMonMood(struct FieldSystemUnk108 *unk) { return GetMonData(unk->mon, MON_DATA_MOOD, NULL); } -void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *mon, u16 species, u32 personality) { +void FieldSystemUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *mon, u16 species, u32 personality) { s8 mood; if (species != SPECIES_NONE && (a0->isRegistered == 0 || a0->species != species || a0->personality != personality)) { a0->species = species; @@ -1993,7 +1993,7 @@ void FsysUnkSub108_Set(struct FieldSystemUnk108 *a0, Pokemon *mon, u16 species, } } -void FsysUnkSub108_MoveMoodTowardsNeutral(struct FieldSystemUnk108 *a0) { +void FieldSystemUnkSub108_MoveMoodTowardsNeutral(struct FieldSystemUnk108 *a0) { s8 mood; if (a0->mon == NULL) { GF_ASSERT(0); diff --git a/src/field_map_object.c b/src/field_map_object.c index 9aa84c659..9a8288942 100644 --- a/src/field_map_object.c +++ b/src/field_map_object.c @@ -11,9 +11,9 @@ static void sub_0205E954(LocalMapObject* object); static void sub_0205ED18(LocalMapObject* object); static void sub_0205EF8C(LocalMapObject* object); -MapObjectManager* sub_0205E0BC(FieldSystem* fsys, int object_count, HeapID heapId) { +MapObjectManager* sub_0205E0BC(FieldSystem* fieldSystem, int object_count, HeapID heapId) { MapObjectManager* ret = MapObjectManager_New(object_count); - MapObjectManager_SetFieldSysPtr(ret, fsys); + MapObjectManager_SetFieldSysPtr(ret, fieldSystem); MapObjectManager_SetCount(ret, object_count); MapObjectManager_SetHeapID(ret, heapId); @@ -237,8 +237,8 @@ LocalMapObject* CreateMapObjectFromTemplate(MapObjectManager* manager, u16 id, u ObjectEvent* event = sub_0205FA98(id, num_object_events, (ObjectEvent*)templates); if (event != NULL) { u32 flag_id = ObjectEventTemplate_GetFlagID(event); - FieldSystem* fsys = MapObjectManager_GetFieldSysPtr(manager); - if (FlagGet(fsys, (u16)flag_id) == FALSE) { + FieldSystem* fieldSystem = MapObjectManager_GetFieldSysPtr(manager); + if (FlagGet(fieldSystem, (u16)flag_id) == FALSE) { ret = sub_0205E1D0(manager, event, map_no); } } @@ -272,8 +272,8 @@ void MapObject_Remove(LocalMapObject* object) { void DeleteMapObject(LocalMapObject* object) { u32 flag_id = MapObject_GetFlagID(object); - FieldSystem* fsys = MapObject_GetFieldSysPtr(object); - FlagSet(fsys, (u16)flag_id); + FieldSystem* fieldSystem = MapObject_GetFieldSysPtr(object); + FlagSet(fieldSystem, (u16)flag_id); MapObject_Remove(object); } @@ -377,12 +377,12 @@ void sub_0205E580(MapObjectManager* manager) { } while (i < count); } -void Fsys_SyncMapObjectsToSaveEx(FieldSystem* fsys, MapObjectManager* manager, SavedMapObject* list, int count) { +void FieldSystem_SyncMapObjectsToSaveEx(FieldSystem* fieldSystem, MapObjectManager* manager, SavedMapObject* list, int count) { int index = 0; LocalMapObject* local_object; SavedMapObject* saved_object = list; while (sub_0205EEF4(manager, &local_object, &index, MAPOBJECTFLAG_ACTIVE)) { - sub_0205E680(fsys, local_object, saved_object); + sub_0205E680(fieldSystem, local_object, saved_object); count--; saved_object++; @@ -445,9 +445,9 @@ _0205E67E: } #endif -extern BOOL sub_02061248(FieldSystem* fsys, VecFx32*, BOOL); +extern BOOL sub_02061248(FieldSystem* fieldSystem, VecFx32*, BOOL); -void sub_0205E680(FieldSystem* fsys, LocalMapObject* local_object, SavedMapObject* saved_object) { +void sub_0205E680(FieldSystem* fieldSystem, LocalMapObject* local_object, SavedMapObject* saved_object) { saved_object->unk0 = MapObject_GetFlagsWord(local_object); saved_object->unk4 = MapObject_GetFlags2Word(local_object); saved_object->objId = MapObject_GetID(local_object); @@ -476,7 +476,7 @@ void sub_0205E680(FieldSystem* fsys, LocalMapObject* local_object, SavedMapObjec sub_020611C8(saved_object->currentX, saved_object->currentY, &coords); coords.y = MapObject_GetPosVecYCoord(local_object); - if (!sub_02061248(fsys, &coords, MapObject_CheckFlag29(local_object))) { + if (!sub_02061248(fieldSystem, &coords, MapObject_CheckFlag29(local_object))) { saved_object->unk2C = MapObject_GetPosVecYCoord(local_object); } else { if (MapObject_CheckIgnoreHeights(local_object) == TRUE) { @@ -596,11 +596,11 @@ void InitMapObjectsFromEventTemplates(MapObjectManager* manager, u32 map_no, u32 } void sub_0205EA08(struct MapObjectInitArgs* args) { - FieldSystem* fsys = MapObjectManager_GetFieldSysPtr(args->manager); + FieldSystem* fieldSystem = MapObjectManager_GetFieldSysPtr(args->manager); ObjectEvent* template = args->templates; do { - GF_ASSERT((ObjectEventTemplate_ScriptIdIsFFFF(template) != TRUE && FlagGet(fsys, template->flag) != FALSE) || + GF_ASSERT((ObjectEventTemplate_ScriptIdIsFFFF(template) != TRUE && FlagGet(fieldSystem, template->flag) != FALSE) || sub_0205E1D0(args->manager, template, args->map_no) != NULL); template++; @@ -654,9 +654,9 @@ void sub_0205EAF0(MapObjectManager* manager, LocalMapObject* object) { sub_0205F338(object, task); } -void MapObject_InitFromObjectEventTemplate(LocalMapObject* object, ObjectEvent* template, FieldSystem* fsys) { +void MapObject_InitFromObjectEventTemplate(LocalMapObject* object, ObjectEvent* template, FieldSystem* fieldSystem) { MapObject_SetID(object, ObjectEventTemplate_GetID(template)); - MapObject_SetGfxID(object, ResolveObjectGfxId(fsys, ObjectEventTemplate_GetSprite(template))); + MapObject_SetGfxID(object, ResolveObjectGfxId(fieldSystem, ObjectEventTemplate_GetSprite(template))); MapObject_SetMovement(object, ObjectEventTemplate_GetMovement(template)); MapObject_SetType(object, ObjectEventTemplate_GetType(template)); MapObject_SetFlagID(object, ObjectEventTemplate_GetFlagID(template)); @@ -842,9 +842,9 @@ void sub_0205EF6C(LocalMapObject* object) { // No-op } -u32 ResolveObjectGfxId(FieldSystem* fsys, int a1) { +u32 ResolveObjectGfxId(FieldSystem* fieldSystem, int a1) { if (a1 >= 101 && a1 <= 117) { - a1 = VarGetObjectEventGraphicsId(fsys, (u16)(a1 - 101)); + a1 = VarGetObjectEventGraphicsId(fieldSystem, (u16)(a1 - 101)); } return a1; } @@ -1025,12 +1025,12 @@ void sub_0205F1D0(LocalMapObject** objects) { (*objects)++; } -void MapObjectManager_SetFieldSysPtr(MapObjectManager* manager, FieldSystem* fsys) { - manager->fsys = fsys; +void MapObjectManager_SetFieldSysPtr(MapObjectManager* manager, FieldSystem* fieldSystem) { + manager->fieldSystem = fieldSystem; } FieldSystem* MapObjectManager_GetFieldSysPtr(MapObjectManager* manager) { - return manager->fsys; + return manager->fieldSystem; } void FldObjSys_SetMModelNarc(MapObjectManager* manager, NARC* mmodel_narc) { diff --git a/src/field_move.c b/src/field_move.c index 7e08956d4..f04628fec 100644 --- a/src/field_move.c +++ b/src/field_move.c @@ -85,8 +85,8 @@ static const struct FieldMoveFuncDat sFieldMoveFuncTable[] = { }; static inline BOOL MoveUseCheck_SafariOrPalPark(const struct FieldMoveCheckData *checkData) { - if (Save_VarsFlags_CheckSafariSysFlag(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE || Save_VarsFlags_CheckPalParkSysFlag( - Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckSafariSysFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE || Save_VarsFlags_CheckPalParkSysFlag( + Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return TRUE; } else { return FALSE; @@ -95,7 +95,7 @@ static inline BOOL MoveUseCheck_SafariOrPalPark(const struct FieldMoveCheckData static inline BOOL MoveUseCheck_PalPark(const struct FieldMoveCheckData *checkData) { if (Save_VarsFlags_CheckPalParkSysFlag( - Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return TRUE; } else { return FALSE; @@ -118,16 +118,16 @@ void *PartyMenu_GetFieldMoveFunc(int funcType, int fieldMoveIdx) { } } -void Fsys_MakeFieldMoveCheckData(FieldSystem *fsys, struct FieldMoveCheckData *checkData) { +void FieldSystem_MakeFieldMoveCheckData(FieldSystem *fieldSystem, struct FieldMoveCheckData *checkData) { LocalMapObject *facingObject; int x, y; u32 standingTile, facingTile; - checkData->fsys = fsys; - checkData->mapId = fsys->location->mapId; + checkData->fieldSystem = fieldSystem; + checkData->mapId = fieldSystem->location->mapId; checkData->flag = 0; - Fsys_GetFacingObject(fsys, &facingObject); + FieldSystem_GetFacingObject(fieldSystem, &facingObject); checkData->facingObject = facingObject; if (facingObject != NULL) { switch (MapObject_GetGfxID(facingObject)) { @@ -142,17 +142,17 @@ void Fsys_MakeFieldMoveCheckData(FieldSystem *fsys, struct FieldMoveCheckData *c break; } } - x = GetPlayerXCoord(fsys->playerAvatar); - y = GetPlayerYCoord(fsys->playerAvatar); - standingTile = GetMetatileBehaviorAt(fsys, x, y); + x = GetPlayerXCoord(fieldSystem->playerAvatar); + y = GetPlayerYCoord(fieldSystem->playerAvatar); + standingTile = GetMetatileBehaviorAt(fieldSystem, x, y); - PlayerAvatar_GetCoordsInFront(fsys->playerAvatar, &x, &y); - facingTile = GetMetatileBehaviorAt(fsys, x, y); + PlayerAvatar_GetCoordsInFront(fieldSystem->playerAvatar, &x, &y); + facingTile = GetMetatileBehaviorAt(fieldSystem, x, y); - if (Field_PlayerCanStartSurfingByStandingAndFacingTileBehaviors(fsys->playerAvatar, standingTile, facingTile)) { + if (Field_PlayerCanStartSurfingByStandingAndFacingTileBehaviors(fieldSystem->playerAvatar, standingTile, facingTile)) { checkData->flag |= (1 << FIELD_MOVE_CHECK_WATER_F); } - if (MetatileBehavior_IsRockClimbInDirection(facingTile, PlayerAvatar_GetFacingDirection(fsys->playerAvatar) )) { + if (MetatileBehavior_IsRockClimbInDirection(facingTile, PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar) )) { checkData->flag |= (1 << FIELD_MOVE_CHECK_ROCKCLIMB_F); } if (MetatileBehavior_IsWaterfall(facingTile)) { @@ -161,10 +161,10 @@ void Fsys_MakeFieldMoveCheckData(FieldSystem *fsys, struct FieldMoveCheckData *c if (MetatileBehavior_IsWhirlpool(facingTile)) { checkData->flag |= (1 << FIELD_MOVE_CHECK_WHIRLPOOL_F); } - if (LocalFieldData_GetWeatherType(Save_LocalFieldData_Get(fsys->savedata)) == 11) { + if (LocalFieldData_GetWeatherType(Save_LocalFieldData_Get(fieldSystem->savedata)) == 11) { checkData->flag |= (1 << FIELD_MOVE_CHECK_FLASH_F); } - if (MetatileBehavior_IsHeadbutt(facingTile) || FieldSys_FacingModelIsHeadbuttTree(fsys)) { + if (MetatileBehavior_IsHeadbutt(facingTile) || FieldSystem_FacingModelIsHeadbuttTree(fieldSystem)) { checkData->flag |= (1 << FIELD_MOVE_CHECK_HEADBUTT_F); } } @@ -183,10 +183,10 @@ static void PartyMenuEnv_Delete(struct FieldUseMoveEnv *env) { } static u32 FieldMoveMenuCheck_Cut(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fsys->savedata), BADGE_HIVE)) { + if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_HIVE)) { return PARTY_MENU_RESPONSE_NEED_BADGE; } if (MoveUseCheck_FieldContextFlagCheck(checkData, FIELD_MOVE_CHECK_TREE_F)) { @@ -199,7 +199,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 FieldUseMoveEnv *useMoveEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); bagWork->atexit_TaskFunc = Task_UseCutInField; bagWork->atexit_TaskEnv = useMoveEnv; bagWork->state = 12; @@ -207,18 +207,18 @@ static void FieldMoveMenuUse_Cut(struct FieldMoveUseData *useData, const struct static BOOL Task_UseCutInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_cut, env->facingObject); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_Fly(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fsys->savedata), BADGE_STORM)) { + if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_STORM)) { return PARTY_MENU_RESPONSE_NEED_BADGE; } @@ -226,11 +226,11 @@ static u32 FieldMoveMenuCheck_Fly(const struct FieldMoveCheckData *checkData) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_HAVE_FOLLOWER; } - if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_NOT_NOW; } @@ -242,24 +242,24 @@ static u32 FieldMoveMenuCheck_Fly(const struct FieldMoveCheckData *checkData) { } static void FieldMoveMenuUse_Fly(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - FieldSystem *fsys = TaskManager_GetFieldSystem(useData->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(useData->taskManager); struct FlyTaskStruct *flyEnv = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct FlyTaskStruct)); flyEnv->partySlot = useData->partySlot; env->unk_0384 = flyEnv; - env->atexit_TaskEnv = TownMap_New(fsys, 0); + env->atexit_TaskEnv = TownMap_New(fieldSystem, 0); sub_0203C8F0(env, Task_UseFlyInField); } static u32 FieldMoveMenuCheck_Surf(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fsys->savedata), BADGE_FOG)) { + if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_FOG)) { return PARTY_MENU_RESPONSE_NEED_BADGE; } - if (PlayerAvatar_GetState(checkData->fsys->playerAvatar) == PLAYER_STATE_SURFING) { + if (PlayerAvatar_GetState(checkData->fieldSystem->playerAvatar) == PLAYER_STATE_SURFING) { return PARTY_MENU_RESPONSE_ALREADY_SURFING; } @@ -267,11 +267,11 @@ static u32 FieldMoveMenuCheck_Surf(const struct FieldMoveCheckData *checkData) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_HAVE_FOLLOWER; } - if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_NOT_NOW; } @@ -281,7 +281,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 FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseSurfInField; menuEnv->atexit_TaskEnv = retEnv; menuEnv->state = 12; @@ -289,18 +289,18 @@ static void FieldMoveMenuUse_Surf(struct FieldMoveUseData *useData, const struct static BOOL Task_UseSurfInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_surf, NULL); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_Strength(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fsys->savedata), BADGE_PLAIN)) { + if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_PLAIN)) { return PARTY_MENU_RESPONSE_NEED_BADGE; } @@ -317,7 +317,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 FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseStrengthInField; menuEnv->atexit_TaskEnv = retEnv; menuEnv->state = 12; @@ -325,18 +325,18 @@ static void FieldMoveMenuUse_Strength(struct FieldMoveUseData *useData, const st static BOOL Task_UseStrengthInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_strength, env->facingObject); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_RockSmash(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fsys->savedata), BADGE_ZEPHYR)) { + if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_ZEPHYR)) { return PARTY_MENU_RESPONSE_NEED_BADGE; } @@ -349,7 +349,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 FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseRockSmashInField; menuEnv->atexit_TaskEnv = retEnv; menuEnv->state = 12; @@ -357,21 +357,21 @@ static void FieldMoveMenuUse_RockSmash(struct FieldMoveUseData *useData, const s static BOOL Task_UseRockSmashInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_rock_smash, env->facingObject); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_Waterfall(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (PlayerAvatar_GetState(checkData->fsys->playerAvatar) != PLAYER_STATE_SURFING) { + if (PlayerAvatar_GetState(checkData->fieldSystem->playerAvatar) != PLAYER_STATE_SURFING) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fsys->savedata), BADGE_RISING)) { + if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_RISING)) { return PARTY_MENU_RESPONSE_NEED_BADGE; } @@ -384,7 +384,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 FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseWaterfallInField; menuEnv->atexit_TaskEnv = retEnv; menuEnv->state = 12; @@ -392,18 +392,18 @@ static void FieldMoveMenuUse_Waterfall(struct FieldMoveUseData *useData, const s static BOOL Task_UseWaterfallInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_waterfall, NULL); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_RockClimb(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fsys->savedata), BADGE_EARTH)) { + if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_EARTH)) { return PARTY_MENU_RESPONSE_NEED_BADGE; } @@ -411,11 +411,11 @@ static u32 FieldMoveMenuCheck_RockClimb(const struct FieldMoveCheckData *checkDa return PARTY_MENU_RESPONSE_NOT_HERE; } - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_HAVE_FOLLOWER; } - if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_NOT_NOW; } @@ -425,7 +425,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 FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseRockClimbInField; menuEnv->atexit_TaskEnv = retEnv; menuEnv->state = 12; @@ -433,19 +433,19 @@ static void FieldMoveMenuUse_RockClimb(struct FieldMoveUseData *useData, const s static BOOL Task_UseRockClimbInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_rock_climb, NULL); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_Flash(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (CheckUseFlashInAlphChamber(checkData->fsys)) { + if (CheckUseFlashInAlphChamber(checkData->fieldSystem)) { return PARTY_MENU_RESPONSE_OK; } @@ -459,7 +459,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 FieldUseMoveEnv *retEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseFlashInField; menuEnv->atexit_TaskEnv = retEnv; menuEnv->state = 12; @@ -467,30 +467,30 @@ static void FieldMoveMenuUse_Flash(struct FieldMoveUseData *useData, const struc static BOOL Task_UseFlashInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); - if (CheckUseFlashInAlphChamber(fsys)) { + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + if (CheckUseFlashInAlphChamber(fieldSystem)) { StartScriptFromMenu(taskManager, _EV_scr_seq_D24R0204_002 + 1, NULL); } else { StartScriptFromMenu(taskManager, std_menu_flash, NULL); } - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_Teleport(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } if (!MapHeader_IsOutdoors(checkData->mapId)) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_HAVE_FOLLOWER; } - if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_NOT_NOW; } @@ -502,10 +502,10 @@ static u32 FieldMoveMenuCheck_Teleport(const struct FieldMoveCheckData *checkDat } static void FieldMoveMenuUse_Teleport(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - FieldSystem *fsys = TaskManager_GetFieldSystem(useData->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); - sub_020505C0(fsys); - struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fsys->savedata); + 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)); retEnv->flySub = retSub; retSub->partySlot = useData->partySlot; @@ -515,9 +515,9 @@ static void FieldMoveMenuUse_Teleport(struct FieldMoveUseData *useData, const st } static BOOL Task_UseTeleportInField(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct TeleportFieldEnv *env = TaskManager_GetEnv(taskManager); - struct FieldLongWarpTaskData *newEnv = CreateFieldTeleportTaskEnv(fsys, env->mon, env->flySub->partySlot, HEAP_ID_4); + struct FieldLongWarpTaskData *newEnv = CreateFieldTeleportTaskEnv(fieldSystem, env->mon, env->flySub->partySlot, HEAP_ID_4); FreeToHeap(env->flySub); FreeToHeap(env); TaskManager_Jump(taskManager, Task_FieldTeleport, newEnv); @@ -525,18 +525,18 @@ static BOOL Task_UseTeleportInField(TaskManager *taskManager) { } static u32 FieldMoveMenuCheck_Dig(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } if (MapHeader_IsCave(checkData->mapId) != TRUE || MapHeader_IsEscapeRopeAllowed(checkData->mapId) != TRUE) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_HAVE_FOLLOWER; } - if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(checkData->fieldSystem->savedata)) == TRUE) { return PARTY_MENU_RESPONSE_NOT_NOW; } @@ -544,10 +544,10 @@ static u32 FieldMoveMenuCheck_Dig(const struct FieldMoveCheckData *checkData) { } static void FieldMoveMenuUse_Dig(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - FieldSystem *fsys = TaskManager_GetFieldSystem(useData->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); - sub_020505C0(fsys); - struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fsys->savedata); + 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)); retEnv->flySub = retSub; retSub->partySlot = useData->partySlot; @@ -557,9 +557,9 @@ static void FieldMoveMenuUse_Dig(struct FieldMoveUseData *useData, const struct } static BOOL Task_UseDigInField(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct TeleportFieldEnv *env = TaskManager_GetEnv(taskManager); - struct FieldLongWarpTaskData *newEnv = CreateFieldDigTaskEnv(fsys, env->mon, env->flySub->partySlot, HEAP_ID_FIELD); + struct FieldLongWarpTaskData *newEnv = CreateFieldDigTaskEnv(fieldSystem, env->mon, env->flySub->partySlot, HEAP_ID_FIELD); FreeToHeap(env->flySub); FreeToHeap(env); TaskManager_Jump(taskManager, Task_FieldDig, newEnv); @@ -567,7 +567,7 @@ static BOOL Task_UseDigInField(TaskManager *taskManager) { } static u32 FieldMoveMenuCheck_SweetScent(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } @@ -579,20 +579,20 @@ static u32 FieldMoveMenuCheck_SweetScent(const struct FieldMoveCheckData *checkD } static void FieldMoveMenuUse_SweetScent(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - FieldSystem *fsys = TaskManager_GetFieldSystem(useData->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); - struct TeleportFieldEnv *retEnv = sub_020689A4(HEAP_ID_FIELD, useData->partySlot, fsys->savedata); + 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; retSub->partySlot = useData->partySlot; - sub_020505C0(fsys); + sub_020505C0(fieldSystem); menuEnv->atexit_TaskFunc = Task_UseSweetScentInField; menuEnv->atexit_TaskEnv = retEnv; menuEnv->state = 12; } static u32 FieldMoveMenuCheck_Chatter(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } @@ -600,10 +600,10 @@ static u32 FieldMoveMenuCheck_Chatter(const struct FieldMoveCheckData *checkData } static void FieldMoveMenuUse_Chatter(struct FieldMoveUseData *useData, const struct FieldMoveCheckData *checkData) { - FieldSystem *fsys = TaskManager_GetFieldSystem(useData->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(useData->taskManager); struct BagViewAppWork *menuEnv = TaskManager_GetEnv(useData->taskManager); struct FieldUseMoveEnv *partyEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); menuEnv->atexit_TaskFunc = Task_UseChatterInField; menuEnv->atexit_TaskEnv = partyEnv; menuEnv->state = 12; @@ -611,23 +611,23 @@ static void FieldMoveMenuUse_Chatter(struct FieldMoveUseData *useData, const str static BOOL Task_UseChatterInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_chatter, NULL); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_Whirlpool(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (PlayerAvatar_GetState(checkData->fsys->playerAvatar) != PLAYER_STATE_SURFING) { + if (PlayerAvatar_GetState(checkData->fieldSystem->playerAvatar) != PLAYER_STATE_SURFING) { return PARTY_MENU_RESPONSE_NOT_HERE; } - if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fsys->savedata), BADGE_GLACIER)) { + if (!PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(checkData->fieldSystem->savedata), BADGE_GLACIER)) { return PARTY_MENU_RESPONSE_NEED_BADGE; } @@ -641,7 +641,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 FieldUseMoveEnv *partyEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseWhirlpoolInField; menuEnv->atexit_TaskEnv = partyEnv; menuEnv->state = 12; @@ -649,15 +649,15 @@ static void FieldMoveMenuUse_Whirlpool(struct FieldMoveUseData *useData, const s static BOOL Task_UseWhirlpoolInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_whirlpool, NULL); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } static u32 FieldMoveMenuCheck_Headbutt(const struct FieldMoveCheckData *checkData) { - if (checkData->fsys->unk70 == 2 || checkData->fsys->unk70 == 3) { + if (checkData->fieldSystem->unk70 == 2 || checkData->fieldSystem->unk70 == 3) { return PARTY_MENU_RESPONSE_NOT_HERE; } @@ -671,7 +671,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 FieldUseMoveEnv *partyEnv = PartyMenuEnv_create(useData, checkData); - sub_020505C0(checkData->fsys); + sub_020505C0(checkData->fieldSystem); menuEnv->atexit_TaskFunc = Task_UseHeadbuttInField; menuEnv->atexit_TaskEnv = partyEnv; menuEnv->state = 12; @@ -679,9 +679,9 @@ static void FieldMoveMenuUse_Headbutt(struct FieldMoveUseData *useData, const st static BOOL Task_UseHeadbuttInField(TaskManager *taskManager) { struct FieldUseMoveEnv *env = TaskManager_GetEnv(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); StartScriptFromMenu(taskManager, std_menu_headbutt, env->facingObject); - FieldMoveArgsSet(fsys, env->useData.partySlot, 0, 0, 0); + FieldMoveArgsSet(fieldSystem, env->useData.partySlot, 0, 0, 0); PartyMenuEnv_Delete(env); return FALSE; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 9683724fc..aecf2e1d3 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -631,8 +631,8 @@ u32 PlayerAvatar_GetTransitionBits(u32 unkA) { } } -PlayerAvatar* FieldSys_GetPlayerAvatar(FieldSystem* fsys) { - return fsys->playerAvatar; +PlayerAvatar* FieldSystem_GetPlayerAvatar(FieldSystem* fieldSystem) { + return fieldSystem->playerAvatar; } void sub_0205CA20(PlayerAvatar* avatar, BOOL unkA) { diff --git a/src/field_system.c b/src/field_system.c index f43f0a5e5..7cc5921f0 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -40,16 +40,16 @@ const OVY_MGR_TEMPLATE gApplication_ContinueFieldsys = { static FieldSystem *sFieldSysPtr; -typedef struct UnkFsysInit { +typedef struct UnkFieldSystemInit { int unk0; int unk4; -} FsysInitWork; +} FieldSystemInitWork; -static BOOL FieldSys_Main(FieldSystem *fsys); +static BOOL FieldSystem_Main(FieldSystem *fieldSystem); BOOL Field_Continue_AppInit(OVY_MANAGER *man, int *unused) { - FsysInitWork *args = OverlayManager_GetArgs(man); - sFieldSysPtr = FieldSys_New(man); + FieldSystemInitWork *args = OverlayManager_GetArgs(man); + sFieldSysPtr = FieldSystem_New(man); if (args->unk4) { CallFieldTask_ContinueGame_CommError(sFieldSysPtr); @@ -63,13 +63,13 @@ BOOL Field_Continue_AppInit(OVY_MANAGER *man, int *unused) { } BOOL Field_NewGame_AppInit(OVY_MANAGER *man, int *unused) { - sFieldSysPtr = FieldSys_New(man); + sFieldSysPtr = FieldSystem_New(man); CallFieldTask_NewGame(sFieldSysPtr); return TRUE; } BOOL Field_AppExec(OVY_MANAGER *man, int *unused) { - if (FieldSys_Main(OverlayManager_GetData(man))) { + if (FieldSystem_Main(OverlayManager_GetData(man))) { return TRUE; } return FALSE; @@ -78,89 +78,89 @@ BOOL Field_AppExec(OVY_MANAGER *man, int *unused) { extern OVY_MGR_TEMPLATE ov60_021EAFE0; BOOL Field_AppExit(OVY_MANAGER *man, int *unused) { - FieldSys_Delete(man); + FieldSystem_Delete(man); RegisterMainOverlay(FS_OVERLAY_ID(OVY_60), &ov60_021EAFE0); return TRUE; } extern OVY_MGR_TEMPLATE ov01_02206378; -void sub_0203DEF0(FieldSystem *fsys) { - GF_ASSERT(fsys->unk0->unk4 == NULL); - GF_ASSERT(fsys->unk0->unk0 == NULL); +void sub_0203DEF0(FieldSystem *fieldSystem) { + GF_ASSERT(fieldSystem->unk0->unk4 == NULL); + GF_ASSERT(fieldSystem->unk0->unk0 == NULL); HandleLoadOverlay(FS_OVERLAY_ID(field), OVY_LOAD_ASYNC); - fsys->unk6C = 0; - fsys->unk0->unk8 = FALSE; - fsys->unk0->unk0 = OverlayManager_New(&ov01_02206378, fsys, HEAP_ID_FIELD); + fieldSystem->unk6C = 0; + fieldSystem->unk0->unk8 = FALSE; + fieldSystem->unk0->unk0 = OverlayManager_New(&ov01_02206378, fieldSystem, HEAP_ID_FIELD); } -void sub_0203DF34(FieldSystem *fsys) { - fsys->unk6C = 0; +void sub_0203DF34(FieldSystem *fieldSystem) { + fieldSystem->unk6C = 0; } -u8 sub_0203DF3C(FieldSystem *fsys) { - GF_ASSERT(fsys->unk_110 == 0 || fsys->unk_110 == 1); +u8 sub_0203DF3C(FieldSystem *fieldSystem) { + GF_ASSERT(fieldSystem->unk_110 == 0 || fieldSystem->unk_110 == 1); - return fsys->unk_110; + return fieldSystem->unk_110; } -void sub_0203DF64(FieldSystem *fsys, int a1) { +void sub_0203DF64(FieldSystem *fieldSystem, int a1) { GF_ASSERT(a1 == 0 || a1 == 1); - fsys->unk_110 = a1; + fieldSystem->unk_110 = a1; } -BOOL sub_0203DF7C(FieldSystem *fsys) { - return (fsys->unk0->unk0 != NULL); +BOOL sub_0203DF7C(FieldSystem *fieldSystem) { + return (fieldSystem->unk0->unk0 != NULL); } -BOOL sub_0203DF8C(FieldSystem *fsys) { - return (fsys->unk0->unk0 && fsys->unk6C); +BOOL sub_0203DF8C(FieldSystem *fieldSystem) { + return (fieldSystem->unk0->unk0 && fieldSystem->unk6C); } -BOOL sub_0203DFA4(FieldSystem *fsys) { - return (fsys->unk0->unk4 != NULL); +BOOL sub_0203DFA4(FieldSystem *fieldSystem) { + return (fieldSystem->unk0->unk4 != NULL); } -void FieldSys_LaunchApplication(FieldSystem *fsys, const OVY_MGR_TEMPLATE *template, void *parentWork) { - GF_ASSERT(fsys->unk0->unk4 == NULL); +void FieldSystem_LaunchApplication(FieldSystem *fieldSystem, const OVY_MGR_TEMPLATE *template, void *parentWork) { + GF_ASSERT(fieldSystem->unk0->unk4 == NULL); - sub_0203DF34(fsys); + sub_0203DF34(fieldSystem); - fsys->unk0->unk4 = OverlayManager_New(template, parentWork, HEAP_ID_FIELD); + fieldSystem->unk0->unk4 = OverlayManager_New(template, parentWork, HEAP_ID_FIELD); } -FieldSystem *FieldSys_New(OVY_MANAGER *man) { +FieldSystem *FieldSystem_New(OVY_MANAGER *man) { CreateHeap(3, 11, 0x1C000); CreateHeap(3, 32, 0x4000); CreateHeap(0, 89, 0x570); - FieldSystem *fsys = OverlayManager_CreateAndGetData(man, sizeof(FieldSystem), HEAP_ID_FIELD); - MI_CpuFill8(fsys, 0, sizeof(FieldSystem)); - fsys->unk0 = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct FieldSystemUnkSub0)); + FieldSystem *fieldSystem = OverlayManager_CreateAndGetData(man, sizeof(FieldSystem), HEAP_ID_FIELD); + MI_CpuFill8(fieldSystem, 0, sizeof(FieldSystem)); + fieldSystem->unk0 = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct FieldSystemUnkSub0)); - fsys->unk0->unk0 = NULL; - fsys->unk0->unk4 = NULL; - fsys->unk0->unk8 = FALSE; - fsys->unk0->unkC = FALSE; + fieldSystem->unk0->unk0 = NULL; + fieldSystem->unk0->unk4 = NULL; + fieldSystem->unk0->unk8 = FALSE; + fieldSystem->unk0->unkC = FALSE; HandleLoadOverlay(FS_OVERLAY_ID(OVY_124), OVY_LOAD_ASYNC); - FieldSystem_Init(man, fsys); + FieldSystem_Init(man, fieldSystem); UnloadOverlayByID(FS_OVERLAY_ID(OVY_124)); - return fsys; + return fieldSystem; } -void FieldSys_Delete(OVY_MANAGER *man) { - FieldSystem *fsys = OverlayManager_GetData(man); - MapMatrix_Free(fsys->mapMatrix); - Field_FreeMapEvents(fsys); - FreeToHeap(fsys->unk94); - sub_02092BD0(fsys->unkA8); - sub_02092DD8(fsys->unk114); - FreeToHeap(fsys->unk0); +void FieldSystem_Delete(OVY_MANAGER *man) { + FieldSystem *fieldSystem = OverlayManager_GetData(man); + MapMatrix_Free(fieldSystem->mapMatrix); + Field_FreeMapEvents(fieldSystem); + FreeToHeap(fieldSystem->unk94); + sub_02092BD0(fieldSystem->unkA8); + sub_02092DD8(fieldSystem->unk114); + FreeToHeap(fieldSystem->unk0); OverlayManager_FreeData(man); DestroyHeap(HEAP_ID_89); DestroyHeap(HEAP_ID_FIELD); @@ -174,47 +174,47 @@ static void ppOverlayManager_RunFrame_DeleteIfFinished(OVY_MANAGER **man) { } } -static BOOL FieldSys_Main(FieldSystem *fsys) { - sub_0203E15C(fsys); - if (Fsys_RunTaskFrame(fsys) == TRUE) { - if (fsys->unk4) { - ov01_021F6830(fsys, 0, 0); +static BOOL FieldSystem_Main(FieldSystem *fieldSystem) { + sub_0203E15C(fieldSystem); + if (FieldSystem_RunTaskFrame(fieldSystem) == TRUE) { + if (fieldSystem->unk4) { + ov01_021F6830(fieldSystem, 0, 0); } } - if (fsys->unk0->unk0) { - ppOverlayManager_RunFrame_DeleteIfFinished(&fsys->unk0->unk0); - if (!fsys->unk0->unk0) { + if (fieldSystem->unk0->unk0) { + ppOverlayManager_RunFrame_DeleteIfFinished(&fieldSystem->unk0->unk0); + if (!fieldSystem->unk0->unk0) { UnloadOverlayByID(FS_OVERLAY_ID(field)); } - } else if (fsys->unk0->unk4) { - ppOverlayManager_RunFrame_DeleteIfFinished(&fsys->unk0->unk4); + } else if (fieldSystem->unk0->unk4) { + ppOverlayManager_RunFrame_DeleteIfFinished(&fieldSystem->unk0->unk4); } - if (fsys->unk0->unkC && !fsys->taskman && !fsys->unk0->unk0 && !fsys->unk0->unk4) { + if (fieldSystem->unk0->unkC && !fieldSystem->taskman && !fieldSystem->unk0->unk0 && !fieldSystem->unk0->unk4) { return TRUE; } return FALSE; } -BOOL sub_0203E13C(FieldSystem *fsys) { - if (!fsys->unk0->unk8 && fsys->unk6C && !Fsys_TaskIsRunning(fsys)) { +BOOL sub_0203E13C(FieldSystem *fieldSystem) { + if (!fieldSystem->unk0->unk8 && fieldSystem->unk6C && !FieldSystem_TaskIsRunning(fieldSystem)) { return TRUE; } return FALSE; } -void sub_0203E15C(FieldSystem *fsys) { +void sub_0203E15C(FieldSystem *fieldSystem) { Unk_0203E15C unkStruct; - BOOL flag = sub_0203E13C(fsys); + BOOL flag = sub_0203E13C(fieldSystem); if (flag) { - sub_0205CE68(fsys->playerAvatar); - ov01_021E6928(&unkStruct, fsys, gSystem.newKeys, gSystem.heldKeys); + sub_0205CE68(fieldSystem->playerAvatar); + ov01_021E6928(&unkStruct, fieldSystem, gSystem.newKeys, gSystem.heldKeys); } - int unkVar = fsys->unk70; + int unkVar = fieldSystem->unk70; - if (fsys->location->mapId == MAP_D31R0201) { + if (fieldSystem->location->mapId == MAP_D31R0201) { unkVar = 0; } @@ -222,60 +222,60 @@ void sub_0203E15C(FieldSystem *fsys) { case 3: if (flag) { if (sub_02057A0C()) { - if (ov01_021E6E00(&unkStruct, fsys) == TRUE) { + if (ov01_021E6E00(&unkStruct, fieldSystem) == TRUE) { flag = FALSE; } } else { flag = FALSE; } } - sub_020573F0(fsys, flag); + sub_020573F0(fieldSystem, flag); break; case 2: - if (flag && ov01_021E6EFC(&unkStruct, fsys) != TRUE) { - sub_0205CB48(fsys->playerAvatar, fsys->unk2C, -1, unkStruct.unk6, unkStruct.unk8, 0); + if (flag && ov01_021E6EFC(&unkStruct, fieldSystem) != TRUE) { + sub_0205CB48(fieldSystem->playerAvatar, fieldSystem->unk2C, -1, unkStruct.unk6, unkStruct.unk8, 0); } break; case 4: if (flag) { - if (ov01_021E6FD4(&unkStruct, fsys) == TRUE) { - ov01_021EFACC(fsys->unk4->unk8); - ov01_021F3DFC(fsys, 4); - ov01_021F2F24(fsys->playerAvatar); - ov01_021F6830(fsys, 0, 1); + if (ov01_021E6FD4(&unkStruct, fieldSystem) == TRUE) { + ov01_021EFACC(fieldSystem->unk4->unk8); + ov01_021F3DFC(fieldSystem, 4); + ov01_021F2F24(fieldSystem->playerAvatar); + ov01_021F6830(fieldSystem, 0, 1); break; } if (gSystem.newKeys & PAD_BUTTON_A) { - ov01_021EFACC(fsys->unk4->unk8); + ov01_021EFACC(fieldSystem->unk4->unk8); } flag = 0; if (sub_0203E324()) { flag = ov35_02259DB8(); } - sub_0205CB48(fsys->playerAvatar, fsys->unk2C, -1, unkStruct.unk6, unkStruct.unk8, flag); + sub_0205CB48(fieldSystem->playerAvatar, fieldSystem->unk2C, -1, unkStruct.unk6, unkStruct.unk8, flag); } break; default: if (flag) { - flag = ov01_021E6AF4(&unkStruct, fsys); + flag = ov01_021E6AF4(&unkStruct, fieldSystem); if (flag) { - ov01_021EFACC(fsys->unk4->unk8); - ov01_021F3DFC(fsys, 4); - sub_0205CF44(fsys->playerAvatar); - ov01_021F2F24(fsys->playerAvatar); - ov01_021F6830(fsys, 0, 1); + ov01_021EFACC(fieldSystem->unk4->unk8); + ov01_021F3DFC(fieldSystem, 4); + sub_0205CF44(fieldSystem->playerAvatar); + ov01_021F2F24(fieldSystem->playerAvatar); + ov01_021F6830(fieldSystem, 0, 1); if (flag != 2) { - sub_02092FA8(fsys->unk114); + sub_02092FA8(fieldSystem->unk114); } } else { if (gSystem.newKeys & PAD_BUTTON_A) { - ov01_021EFACC(fsys->unk4->unk8); + ov01_021EFACC(fieldSystem->unk4->unk8); } flag = 0; if (sub_0203E324()) { flag = ov35_02259DB8(); } - sub_0205CB48(fsys->playerAvatar, fsys->unk2C, -1, unkStruct.unk6, unkStruct.unk8, flag); + sub_0205CB48(fieldSystem->playerAvatar, fieldSystem->unk2C, -1, unkStruct.unk6, unkStruct.unk8, flag); } } break; @@ -299,16 +299,16 @@ int sub_0203E324() { return sFieldSysPtr->unk4->unk14; } -void sub_0203E33C(FieldSystem *fsys, int a1) { - fsys->unk1C = a1; +void sub_0203E33C(FieldSystem *fieldSystem, int a1) { + fieldSystem->unk1C = a1; } -BgConfig *FieldSys_GetBgConfigPtr(FieldSystem *fsys) { - return fsys->bgConfig; +BgConfig *FieldSystem_GetBgConfigPtr(FieldSystem *fieldSystem) { + return fieldSystem->bgConfig; } -SaveData *FieldSystem_GetSaveDataPtr(FieldSystem *fsys) { - return fsys->savedata; +SaveData *FieldSystem_GetSaveDataPtr(FieldSystem *fieldSystem) { + return fieldSystem->savedata; } void sub_0203E348() { diff --git a/src/field_use_item.c b/src/field_use_item.c index 9f50c478f..f1a957ccb 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -51,7 +51,7 @@ static enum ItemUseError ItemCheckUseFunc_Berry(const struct ItemCheckUseData *d static void ItemMenuUseFunc_Berry(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static void ItemMenuUseFunc_PalPad(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static BOOL ItemFieldUseFunc_PalPad(struct ItemFieldUseData *data); -static struct PalPadWork *_CreatePalPadWork(FieldSystem *fsys); +static struct PalPadWork *_CreatePalPadWork(FieldSystem *fieldSystem); static void ItemMenuUseFunc_Honey(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static void ItemMenuUseFunc_OldRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static BOOL ItemFieldUseFunc_OldRod(struct ItemFieldUseData *data); @@ -68,24 +68,24 @@ static enum ItemUseError ItemCheckUseFunc_EscapeRope(const struct ItemCheckUseDa static BOOL Task_JumpToFieldEscapeRope(TaskManager *taskManager); static void ItemMenuUseFunc_ApricornBox(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static BOOL ItemFieldUseFunc_ApricornBox(struct ItemFieldUseData *data); -static struct ApricornBoxWork *_CreateApricornBoxWork(FieldSystem *fsys); +static struct ApricornBoxWork *_CreateApricornBoxWork(FieldSystem *fieldSystem); static void ItemMenuUseFunc_BerryPots(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static BOOL ItemFieldUseFunc_BerryPots(struct ItemFieldUseData *data); -static struct BerryPotsArgs *_BerryPotsArgs_New(FieldSystem *fsys); +static struct BerryPotsArgs *_BerryPotsArgs_New(FieldSystem *fieldSystem); static void ItemMenuUseFunc_UnownReport(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static BOOL ItemFieldUseFunc_UnownReport(struct ItemFieldUseData *data); -static struct UnownReportWork *_CreateUnownReportWork(FieldSystem *fsys); +static struct UnownReportWork *_CreateUnownReportWork(FieldSystem *fieldSystem); static void ItemMenuUseFunc_DowsingMchn(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static BOOL ItemFieldUseFunc_DowsingMchn(struct ItemFieldUseData *data); static BOOL Task_ActivateDowsingMchnUI(TaskManager *taskManager); static BOOL ItemFieldUseFunc_GbSounds(struct ItemFieldUseData *data); static void ItemMenuUseFunc_Gracidea(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static BOOL ItemFieldUseFunc_Gracidea(struct ItemFieldUseData *data); -static struct GracideaWork *_CreateGracideaWork(FieldSystem *fsys); +static struct GracideaWork *_CreateGracideaWork(FieldSystem *fieldSystem); static void ItemMenuUseFunc_VSRecorder(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2); static BOOL ItemFieldUseFunc_VSRecorder(struct ItemFieldUseData *data); -static void *_VsRecorderInit(FieldSystem *fsys); -static BOOL KeyItemIdSpawnsSubprocess(FieldSystem *fsys, u16 itemId); +static void *_VsRecorderInit(FieldSystem *fieldSystem); +static BOOL KeyItemIdSpawnsSubprocess(FieldSystem *fieldSystem, u16 itemId); static void RegisteredItem_GoToPrintErrorTask(struct ItemFieldUseData *data, enum ItemUseError error); static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager); static void RegisteredItem_CreateGoToAppTask(struct ItemFieldUseData *data, FieldApplicationWorkCtor ctor, BOOL no_app); @@ -133,21 +133,21 @@ void *GetItemFieldUseFunc(int funcType, int itemType) { } } -void ItemCheckUseData_Init(FieldSystem *fsys, struct ItemCheckUseData *dat) { +void ItemCheckUseData_Init(FieldSystem *fieldSystem, struct ItemCheckUseData *dat) { int x, y; LocalMapObject *dummy; - dat->fsys = fsys; - dat->mapId = fsys->location->mapId; - dat->haveFollower = Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fsys->savedata)); - dat->haveRocketCostume = Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(fsys->savedata)); - dat->playerState = PlayerAvatar_GetState(fsys->playerAvatar); + dat->fieldSystem = fieldSystem; + dat->mapId = fieldSystem->location->mapId; + dat->haveFollower = Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->savedata)); + dat->haveRocketCostume = Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(fieldSystem->savedata)); + dat->playerState = PlayerAvatar_GetState(fieldSystem->playerAvatar); - x = GetPlayerXCoord(fsys->playerAvatar); - y = GetPlayerYCoord(fsys->playerAvatar); - dat->standingTile = GetMetatileBehaviorAt(fsys, x, y); + x = GetPlayerXCoord(fieldSystem->playerAvatar); + y = GetPlayerYCoord(fieldSystem->playerAvatar); + dat->standingTile = GetMetatileBehaviorAt(fieldSystem, x, y); - switch (PlayerAvatar_GetFacingDirection(fsys->playerAvatar)) { + switch (PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar)) { case DIR_NORTH: y--; break; @@ -161,10 +161,10 @@ void ItemCheckUseData_Init(FieldSystem *fsys, struct ItemCheckUseData *dat) { x--; break; } - dat->facingTile = GetMetatileBehaviorAt(fsys, x, y); + dat->facingTile = GetMetatileBehaviorAt(fieldSystem, x, y); - Fsys_GetFacingObject(fsys, &dummy); - dat->playerAvatar = fsys->playerAvatar; + FieldSystem_GetFacingObject(fieldSystem, &dummy); + dat->playerAvatar = fieldSystem->playerAvatar; } static struct AlphItemUseData *CreateAlphItemUseWork(int scriptNo, u16 var_8000, u16 var_8001, u16 var_8002, u16 var_8003) { @@ -180,28 +180,28 @@ 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 *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_UseItemInAlphChamber; env->atexit_TaskEnv = CreateAlphItemUseWork(scriptNo, data->itemId, 0, 0, 0); env->state = 12; } static BOOL Task_UseItemInAlphChamber(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct AlphItemUseData *env = TaskManager_GetEnv(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); LocalMapObject *sp0; switch (*state_p) { case 0: - Fsys_GetFacingObject(fsys, &sp0); + FieldSystem_GetFacingObject(fieldSystem, &sp0); QueueScript(taskManager, env->scriptNo, sp0, NULL); - *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8000) = env->var_8000; - *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8001) = env->var_8001; - *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8002) = env->var_8002; - *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8003) = env->var_8003; + *(u16 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8000) = env->var_8000; + *(u16 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8001) = env->var_8001; + *(u16 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8002) = env->var_8002; + *(u16 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8003) = env->var_8003; (*state_p)++; break; case 1: @@ -214,23 +214,23 @@ static BOOL Task_UseItemInAlphChamber(TaskManager *taskManager) { static void ItemMenuUseFunc_HealingItem(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { #pragma unused(dat2) - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); struct UseItemInPartyTaskEnv *usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); - usedat->party = SaveArray_Party_Get(fsys->savedata); - usedat->bag = Save_Bag_Get(fsys->savedata); - usedat->mailbox = Save_Mailbox_Get(fsys->savedata); - usedat->options = Save_PlayerData_GetOptionsAddr(fsys->savedata); - usedat->unk10 = sub_020270C4(fsys->savedata); + usedat->party = SaveArray_Party_Get(fieldSystem->savedata); + usedat->bag = Save_Bag_Get(fieldSystem->savedata); + usedat->mailbox = Save_Mailbox_Get(fieldSystem->savedata); + usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); + usedat->unk10 = sub_020270C4(fieldSystem->savedata); usedat->unk18 = &env->unk_0370; usedat->unk25 = 0; usedat->unk24 = 5; - usedat->fsys = fsys; + usedat->fieldSystem = fieldSystem; usedat->itemId = data->itemId; usedat->unk26 = data->unk6; - usedat->unk20 = &fsys->unk_10C; - FieldSys_LaunchApplication(fsys, &_0210159C, usedat); + usedat->unk20 = &fieldSystem->unk_10C; + FieldSystem_LaunchApplication(fieldSystem, &_0210159C, usedat); env->atexit_TaskEnv = usedat; sub_0203C8F0(env, sub_0203CA9C); } @@ -241,35 +241,35 @@ static enum ItemUseError ItemCheckUseFunc_Dummy(const struct ItemCheckUseData *d static void ItemMenuUseFunc_Bicycle(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { #pragma unused(dat2) - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_MountOrDismountBicycle; env->atexit_TaskEnv = NULL; env->state = 12; } static BOOL ItemFieldUseFunc_Bicycle(struct ItemFieldUseData *data) { - FieldSys_CreateTask(data->fsys, Task_MountOrDismountBicycle, NULL); - data->fsys->unkD2_7 = 1; + FieldSystem_CreateTask(data->fieldSystem, Task_MountOrDismountBicycle, NULL); + data->fieldSystem->unkD2_7 = 1; return FALSE; } static BOOL Task_MountOrDismountBicycle(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); int r6; switch (*state_p) { case 0: - if (FollowingPokemon_IsActive(fsys)) { - if (MapObject_IsMovementPaused(FollowingPokemon_GetMapObject(fsys))) { - if (PlayerAvatar_GetState(fsys->playerAvatar) == PLAYER_STATE_CYCLING) { + if (FollowingPokemon_IsActive(fieldSystem)) { + if (MapObject_IsMovementPaused(FollowingPokemon_GetMapObject(fieldSystem))) { + if (PlayerAvatar_GetState(fieldSystem->playerAvatar) == PLAYER_STATE_CYCLING) { r6 = 0x30; } else { r6 = 0x38; } - sub_0205FC94(FollowingPokemon_GetMapObject(fsys), r6); + sub_0205FC94(FollowingPokemon_GetMapObject(fieldSystem), r6); (*state_p)++; } } else { @@ -277,36 +277,36 @@ static BOOL Task_MountOrDismountBicycle(TaskManager *taskManager) { } break; case 1: - if (PlayerAvatar_GetState(fsys->playerAvatar) == PLAYER_STATE_CYCLING) { - MapObject_UnpauseMovement(PlayerAvatar_GetMapObject(fsys->playerAvatar)); - Field_PlayerAvatar_OrrTransitionFlags(fsys->playerAvatar, 1); - Field_PlayerAvatar_ApplyTransitionFlags(fsys->playerAvatar); - FieldSystem_SetSavedMusicId(fsys, 0); + if (PlayerAvatar_GetState(fieldSystem->playerAvatar) == PLAYER_STATE_CYCLING) { + MapObject_UnpauseMovement(PlayerAvatar_GetMapObject(fieldSystem->playerAvatar)); + Field_PlayerAvatar_OrrTransitionFlags(fieldSystem->playerAvatar, 1); + Field_PlayerAvatar_ApplyTransitionFlags(fieldSystem->playerAvatar); + FieldSystem_SetSavedMusicId(fieldSystem, 0); if (SndRadio_GetSeqNo() == 0) { - FieldSystem_PlayOrFadeToNewMusicId(fsys, FieldSystem_GetOverriddenMusicId(fsys, fsys->location->mapId), 1); + FieldSystem_PlayOrFadeToNewMusicId(fieldSystem, FieldSystem_GetOverriddenMusicId(fieldSystem, fieldSystem->location->mapId), 1); } - ov01_02205790(fsys, PlayerAvatar_GetFacingDirection(fsys->playerAvatar)); - if (FollowingPokemon_IsActive(fsys)) { - sub_02069E84(FollowingPokemon_GetMapObject(fsys), 1); - sub_02069DC8(FollowingPokemon_GetMapObject(fsys), TRUE); + ov01_02205790(fieldSystem, PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar)); + if (FollowingPokemon_IsActive(fieldSystem)) { + sub_02069E84(FollowingPokemon_GetMapObject(fieldSystem), 1); + sub_02069DC8(FollowingPokemon_GetMapObject(fieldSystem), TRUE); } } else { if (SndRadio_GetSeqNo() == 0) { - FieldSystem_SetSavedMusicId(fsys, SEQ_GS_BICYCLE); - FieldSystem_PlayOrFadeToNewMusicId(fsys, SEQ_GS_BICYCLE, 1); + FieldSystem_SetSavedMusicId(fieldSystem, SEQ_GS_BICYCLE); + FieldSystem_PlayOrFadeToNewMusicId(fieldSystem, SEQ_GS_BICYCLE, 1); } - MapObject_UnpauseMovement(PlayerAvatar_GetMapObject(fsys->playerAvatar)); - Field_PlayerAvatar_OrrTransitionFlags(fsys->playerAvatar, 2); - Field_PlayerAvatar_ApplyTransitionFlags(fsys->playerAvatar); - ov01_02205D68(fsys); - if (FollowingPokemon_IsActive(fsys)) { - sub_02069E84(FollowingPokemon_GetMapObject(fsys), FALSE); + MapObject_UnpauseMovement(PlayerAvatar_GetMapObject(fieldSystem->playerAvatar)); + Field_PlayerAvatar_OrrTransitionFlags(fieldSystem->playerAvatar, 2); + Field_PlayerAvatar_ApplyTransitionFlags(fieldSystem->playerAvatar); + ov01_02205D68(fieldSystem); + if (FollowingPokemon_IsActive(fieldSystem)) { + sub_02069E84(FollowingPokemon_GetMapObject(fieldSystem), FALSE); } } (*state_p)++; break; case 2: - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); return TRUE; } @@ -337,32 +337,32 @@ static enum ItemUseError ItemCheckUseFunc_Bicycle(const struct ItemCheckUseData static void ItemMenuUseFunc_TMHM(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { #pragma unused(dat2) - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); struct UseItemInPartyTaskEnv *usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); - usedat->party = SaveArray_Party_Get(fsys->savedata); - usedat->bag = Save_Bag_Get(fsys->savedata); - usedat->mailbox = Save_Mailbox_Get(fsys->savedata); - usedat->options = Save_PlayerData_GetOptionsAddr(fsys->savedata); + usedat->party = SaveArray_Party_Get(fieldSystem->savedata); + usedat->bag = Save_Bag_Get(fieldSystem->savedata); + usedat->mailbox = Save_Mailbox_Get(fieldSystem->savedata); + usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); usedat->unk18 = &env->unk_0370; usedat->unk25 = 0; usedat->unk24 = 6; - usedat->fsys = fsys; + usedat->fieldSystem = fieldSystem; usedat->itemId = data->itemId; usedat->unk26 = data->unk6; usedat->unk2A = TMHMGetMove(data->itemId); - usedat->unk20 = &fsys->unk_10C; - FieldSys_LaunchApplication(fsys, &_0210159C, usedat); + usedat->unk20 = &fieldSystem->unk_10C; + FieldSystem_LaunchApplication(fieldSystem, &_0210159C, usedat); env->atexit_TaskEnv = usedat; sub_0203C8F0(env, sub_0203CA9C); } static void ItemMenuUseFunc_Mail(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { #pragma unused(dat2) - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - struct UseMailWork *mailWork = CreateUseMailWork(fsys, 3, ItemToMailId(data->itemId), HEAP_ID_FIELD); + 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; sub_0203C8F0(env, sub_0203D830); @@ -373,7 +373,7 @@ static enum ItemUseError ItemCheckUseFunc_Berry(const struct ItemCheckUseData *d } static void ItemMenuUseFunc_Berry(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); ItemMenuUseFunc_HealingItem(data, dat2); } @@ -384,9 +384,9 @@ BOOL Leftover_CanPlantBerry(const struct ItemCheckUseData *data) { } static void ItemMenuUseFunc_PalPad(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - env->atexit_TaskEnv = CreatePalPadWork(fsys, fsys->savedata, HEAP_ID_FIELD); + env->atexit_TaskEnv = CreatePalPadWork(fieldSystem, fieldSystem->savedata, HEAP_ID_FIELD); sub_0203C8F0(env, sub_0203D718); } @@ -395,64 +395,64 @@ static BOOL ItemFieldUseFunc_PalPad(struct ItemFieldUseData *data) { return TRUE; } -static struct PalPadWork *_CreatePalPadWork(FieldSystem *fsys) { - return CreatePalPadWork(fsys, fsys->savedata, HEAP_ID_FIELD); +static struct PalPadWork *_CreatePalPadWork(FieldSystem *fieldSystem) { + return CreatePalPadWork(fieldSystem, fieldSystem->savedata, HEAP_ID_FIELD); } static void ItemMenuUseFunc_Honey(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { size_t size; void *honey_work; - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); size = GetHoneySweetScentWorkSize(); honey_work = AllocFromHeapAtEnd(HEAP_ID_FIELD, size); memset(honey_work, 0, size); env->atexit_TaskFunc = Task_HoneyOrSweetScent; env->atexit_TaskEnv = honey_work; env->state = 12; - Bag_TakeItem(Save_Bag_Get(fsys->savedata), data->itemId, 1, HEAP_ID_FIELD); + Bag_TakeItem(Save_Bag_Get(fieldSystem->savedata), data->itemId, 1, HEAP_ID_FIELD); } static void ItemMenuUseFunc_OldRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_OverworldFish; - env->atexit_TaskEnv = CreateFishingRodTaskEnv(fsys, HEAP_ID_FIELD, 0); + env->atexit_TaskEnv = CreateFishingRodTaskEnv(fieldSystem, HEAP_ID_FIELD, 0); env->state = 12; } static BOOL ItemFieldUseFunc_OldRod(struct ItemFieldUseData *data) { - FieldSys_CreateTask(data->fsys, Task_OverworldFish, CreateFishingRodTaskEnv(data->fsys, HEAP_ID_4, 0)); + FieldSystem_CreateTask(data->fieldSystem, Task_OverworldFish, CreateFishingRodTaskEnv(data->fieldSystem, HEAP_ID_4, 0)); return FALSE; } static void ItemMenuUseFunc_GoodRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_OverworldFish; - env->atexit_TaskEnv = CreateFishingRodTaskEnv(fsys, HEAP_ID_FIELD, 1); + env->atexit_TaskEnv = CreateFishingRodTaskEnv(fieldSystem, HEAP_ID_FIELD, 1); env->state = 12; } static BOOL ItemFieldUseFunc_GoodRod(struct ItemFieldUseData *data) { - FieldSys_CreateTask(data->fsys, Task_OverworldFish, CreateFishingRodTaskEnv(data->fsys, HEAP_ID_4, 1)); + FieldSystem_CreateTask(data->fieldSystem, Task_OverworldFish, CreateFishingRodTaskEnv(data->fieldSystem, HEAP_ID_4, 1)); return FALSE; } static void ItemMenuUseFunc_SuperRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_OverworldFish; - env->atexit_TaskEnv = CreateFishingRodTaskEnv(fsys, HEAP_ID_FIELD, 2); + env->atexit_TaskEnv = CreateFishingRodTaskEnv(fieldSystem, HEAP_ID_FIELD, 2); env->state = 12; } static BOOL ItemFieldUseFunc_SuperRod(struct ItemFieldUseData *data) { - FieldSys_CreateTask(data->fsys, Task_OverworldFish, CreateFishingRodTaskEnv(data->fsys, HEAP_ID_4, 2)); + FieldSystem_CreateTask(data->fieldSystem, Task_OverworldFish, CreateFishingRodTaskEnv(data->fieldSystem, HEAP_ID_4, 2)); return FALSE; } @@ -478,22 +478,22 @@ static BOOL ItemFieldUseFunc_Generic(struct ItemFieldUseData *data) { struct RegisteredKeyItemUseMessagePrintTaskData *env = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct RegisteredKeyItemUseMessagePrintTaskData)); env->state = 0; env->strbuf = String_New(128, HEAP_ID_FIELD); - TryFormatRegisteredKeyItemUseMessage(data->fsys->savedata, env->strbuf, data->itemId, HEAP_ID_FIELD); - FieldSys_CreateTask(data->fsys, Task_PrintRegisteredKeyItemUseMessage, env); + TryFormatRegisteredKeyItemUseMessage(data->fieldSystem->savedata, env->strbuf, data->itemId, HEAP_ID_FIELD); + FieldSystem_CreateTask(data->fieldSystem, Task_PrintRegisteredKeyItemUseMessage, env); return FALSE; } static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct RegisteredKeyItemUseMessagePrintTaskData *env = TaskManager_GetEnv(taskManager); OPTIONS *options; switch (env->state) { case 0: - fsys->unkD2_6 = TRUE; - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); - sub_0205B514(fsys->bgConfig, &env->window, 3); - options = Save_PlayerData_GetOptionsAddr(fsys->savedata); + fieldSystem->unkD2_6 = TRUE; + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + sub_0205B514(fieldSystem->bgConfig, &env->window, 3); + options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); sub_0205B564(&env->window, options); env->printerId = sub_0205B5B4(&env->window, env->strbuf, options, TRUE); env->state++; @@ -501,14 +501,14 @@ static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { case 1: if (IsPrintFinished(env->printerId) == TRUE) { if ((gSystem.newKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN | PAD_KEY_LEFT | PAD_KEY_RIGHT)) || (gSystem.simulatedInputs & PAD_BUTTON_A)) { - fsys->unkD2_6 = FALSE; + fieldSystem->unkD2_6 = FALSE; ClearFrameAndWindow2(&env->window, 0); env->state++; } } break; case 2: - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); RemoveWindow(&env->window); String_Delete(env->strbuf); FreeToHeap(env); @@ -519,51 +519,51 @@ static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { } static void ItemMenuUseFunc_EvoStone(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys; + FieldSystem *fieldSystem; struct BagViewAppWork *env; struct UseItemInPartyTaskEnv *usedat; - fsys = TaskManager_GetFieldSystem(data->taskManager); - if (data->itemId == ITEM_WATER_STONE && CheckUseWaterStoneInAlphChamber(fsys)) { + fieldSystem = TaskManager_GetFieldSystem(data->taskManager); + if (data->itemId == ITEM_WATER_STONE && CheckUseWaterStoneInAlphChamber(fieldSystem)) { ExitMenuAndJumpToAlphChamberReaction(data, dat2, _EV_scr_seq_D24R0206_002 + 1); return; } env = TaskManager_GetEnv(data->taskManager); usedat = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); - usedat->party = SaveArray_Party_Get(fsys->savedata); - usedat->bag = Save_Bag_Get(fsys->savedata); - usedat->mailbox = Save_Mailbox_Get(fsys->savedata); - usedat->options = Save_PlayerData_GetOptionsAddr(fsys->savedata); - usedat->unk10 = sub_020270C4(fsys->savedata); + usedat->party = SaveArray_Party_Get(fieldSystem->savedata); + usedat->bag = Save_Bag_Get(fieldSystem->savedata); + usedat->mailbox = Save_Mailbox_Get(fieldSystem->savedata); + usedat->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); + usedat->unk10 = sub_020270C4(fieldSystem->savedata); usedat->unk18 = &env->unk_0370; usedat->unk25 = 0; usedat->unk24 = 16; usedat->itemId = data->itemId; usedat->unk26 = data->unk6; - usedat->fsys = fsys; - usedat->unk20 = &fsys->unk_10C; - FieldSys_LaunchApplication(fsys, &_0210159C, usedat); + usedat->fieldSystem = fieldSystem; + usedat->unk20 = &fieldSystem->unk_10C; + FieldSystem_LaunchApplication(fieldSystem, &_0210159C, usedat); env->atexit_TaskEnv = usedat; sub_0203C8F0(env, sub_0203CA9C); } static void ItemMenuUseFunc_EscapeRope(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys; + FieldSystem *fieldSystem; struct BagViewAppWork *env; - if (CheckUseEscapeRopeInAlphChamber(dat2->fsys)) { + if (CheckUseEscapeRopeInAlphChamber(dat2->fieldSystem)) { ExitMenuAndJumpToAlphChamberReaction(data, dat2, _EV_scr_seq_D24R0202_002 + 1); return; } - fsys = TaskManager_GetFieldSystem(data->taskManager); + fieldSystem = TaskManager_GetFieldSystem(data->taskManager); env = TaskManager_GetEnv(data->taskManager); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_JumpToFieldEscapeRope; env->atexit_TaskEnv = NULL; env->state = 12; - Bag_TakeItem(Save_Bag_Get(fsys->savedata), data->itemId, 1, HEAP_ID_FIELD); + Bag_TakeItem(Save_Bag_Get(fieldSystem->savedata), data->itemId, 1, HEAP_ID_FIELD); } static enum ItemUseError ItemCheckUseFunc_EscapeRope(const struct ItemCheckUseData *data) { @@ -573,7 +573,7 @@ static enum ItemUseError ItemCheckUseFunc_EscapeRope(const struct ItemCheckUseDa if (data->haveRocketCostume == TRUE) { return ITEMUSEERROR_NOTNOW; } - if (CheckUseEscapeRopeInAlphChamber(data->fsys)) { + if (CheckUseEscapeRopeInAlphChamber(data->fieldSystem)) { return ITEMUSEERROR_OKAY; } if (MapHeader_IsCave(data->mapId) == TRUE && MapHeader_IsEscapeRopeAllowed(data->mapId) == TRUE) { @@ -588,9 +588,9 @@ static BOOL Task_JumpToFieldEscapeRope(TaskManager *taskManager) { } static void ItemMenuUseFunc_ApricornBox(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - env->atexit_TaskEnv = CreateApricornBoxWork(fsys, 1); + env->atexit_TaskEnv = CreateApricornBoxWork(fieldSystem, 1); sub_0203C8F0(env, sub_0203D718); } @@ -599,14 +599,14 @@ static BOOL ItemFieldUseFunc_ApricornBox(struct ItemFieldUseData *data) { return TRUE; } -static struct ApricornBoxWork *_CreateApricornBoxWork(FieldSystem *fsys) { - return CreateApricornBoxWork(fsys, 1); +static struct ApricornBoxWork *_CreateApricornBoxWork(FieldSystem *fieldSystem) { + return CreateApricornBoxWork(fieldSystem, 1); } static void ItemMenuUseFunc_BerryPots(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - env->atexit_TaskEnv = BerryPotsArgs_New(fsys); + env->atexit_TaskEnv = BerryPotsArgs_New(fieldSystem); sub_0203C8F0(env, sub_0203D718); } @@ -615,14 +615,14 @@ static BOOL ItemFieldUseFunc_BerryPots(struct ItemFieldUseData *data) { return TRUE; } -static struct BerryPotsArgs *_BerryPotsArgs_New(FieldSystem *fsys) { - return BerryPotsArgs_New(fsys); +static struct BerryPotsArgs *_BerryPotsArgs_New(FieldSystem *fieldSystem) { + return BerryPotsArgs_New(fieldSystem); } static void ItemMenuUseFunc_UnownReport(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - env->atexit_TaskEnv = CreateUnownReportWork(fsys); + env->atexit_TaskEnv = CreateUnownReportWork(fieldSystem); sub_0203C8F0(env, sub_0203D718); } @@ -631,37 +631,37 @@ static BOOL ItemFieldUseFunc_UnownReport(struct ItemFieldUseData *data) { return TRUE; } -static struct UnownReportWork *_CreateUnownReportWork(FieldSystem *fsys) { - return CreateUnownReportWork(fsys); +static struct UnownReportWork *_CreateUnownReportWork(FieldSystem *fieldSystem) { + return CreateUnownReportWork(fieldSystem); } static void ItemMenuUseFunc_DowsingMchn(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - sub_020505C0(fsys); + sub_020505C0(fieldSystem); env->atexit_TaskFunc = Task_ActivateDowsingMchnUI; env->atexit_TaskEnv = NULL; env->state = 12; } static BOOL ItemFieldUseFunc_DowsingMchn(struct ItemFieldUseData *data) { - FieldSys_CreateTask(data->fsys, Task_ActivateDowsingMchnUI, NULL); + FieldSystem_CreateTask(data->fieldSystem, Task_ActivateDowsingMchnUI, NULL); return FALSE; } static BOOL Task_ActivateDowsingMchnUI(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); switch (*state_p) { case 0: - ov01_021F6A9C(fsys, 4, NULL); - fsys->unkD2_7 = TRUE; + ov01_021F6A9C(fieldSystem, 4, NULL); + fieldSystem->unkD2_7 = TRUE; (*state_p)++; break; case 1: - if (ov01_021F6B10(fsys) == TRUE) { - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + if (ov01_021F6B10(fieldSystem) == TRUE) { + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); return TRUE; } break; @@ -681,14 +681,14 @@ static BOOL ItemFieldUseFunc_GbSounds(struct ItemFieldUseData *data) { } DestroyMsgData(msgData); SoundSys_ToggleGBSounds(); - FieldSys_CreateTask(data->fsys, Task_PrintRegisteredKeyItemUseMessage, env); + FieldSystem_CreateTask(data->fieldSystem, Task_PrintRegisteredKeyItemUseMessage, env); return FALSE; } static void ItemMenuUseFunc_Gracidea(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - env->atexit_TaskEnv = sub_0203FAE8(fsys, HEAP_ID_FIELD, ITEM_GRACIDEA); + env->atexit_TaskEnv = sub_0203FAE8(fieldSystem, HEAP_ID_FIELD, ITEM_GRACIDEA); sub_0203C8F0(env, sub_0203CA9C); } @@ -697,14 +697,14 @@ static BOOL ItemFieldUseFunc_Gracidea(struct ItemFieldUseData *data) { return TRUE; } -static struct GracideaWork *_CreateGracideaWork(FieldSystem *fsys) { - return sub_0203FAE8(fsys, HEAP_ID_FIELD, ITEM_GRACIDEA); +static struct GracideaWork *_CreateGracideaWork(FieldSystem *fieldSystem) { + return sub_0203FAE8(fieldSystem, HEAP_ID_FIELD, ITEM_GRACIDEA); } static void ItemMenuUseFunc_VSRecorder(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { - FieldSystem *fsys = TaskManager_GetFieldSystem(data->taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(data->taskManager); struct BagViewAppWork *env = TaskManager_GetEnv(data->taskManager); - sub_0203F570(fsys, fsys->savedata); + sub_0203F570(fieldSystem, fieldSystem->savedata); env->atexit_TaskEnv = NULL; sub_0203C8F0(env, sub_0203D9B4); } @@ -714,9 +714,9 @@ static BOOL ItemFieldUseFunc_VSRecorder(struct ItemFieldUseData *data) { return TRUE; } -static void *_VsRecorderInit(FieldSystem *fsys) { - ov01_021F4440(fsys); - sub_0203F570(fsys, fsys->savedata); +static void *_VsRecorderInit(FieldSystem *fieldSystem) { + ov01_021F4440(fieldSystem); + sub_0203F570(fieldSystem, fieldSystem->savedata); return NULL; } @@ -731,7 +731,7 @@ static u16 sStayInFieldItemIds[] = { ITEM_COIN_CASE, }; -static BOOL KeyItemIdSpawnsSubprocess(FieldSystem *fsys, u16 itemId) { +static BOOL KeyItemIdSpawnsSubprocess(FieldSystem *fieldSystem, u16 itemId) { int i; for (i = 0; i < NELEMS(sStayInFieldItemIds); i++) { @@ -743,7 +743,7 @@ static BOOL KeyItemIdSpawnsSubprocess(FieldSystem *fsys, u16 itemId) { return TRUE; } -int UseRegisteredItemButtonInField(FieldSystem *fsys, u8 slot) { +int UseRegisteredItemButtonInField(FieldSystem *fieldSystem, u8 slot) { struct ItemFieldUseData *data; u16 itemId; u16 funcType; @@ -753,24 +753,24 @@ int UseRegisteredItemButtonInField(FieldSystem *fsys, u8 slot) { enum ItemUseError error; GF_ASSERT(slot == 1 || slot == 2); - if (sub_02067584(fsys) == TRUE) { + if (sub_02067584(fieldSystem) == TRUE) { return 0; } - if (Save_VarsFlags_CheckPalParkSysFlag(Save_VarsFlags_Get(fsys->savedata)) == TRUE) { + if (Save_VarsFlags_CheckPalParkSysFlag(Save_VarsFlags_Get(fieldSystem->savedata)) == TRUE) { return 0; } - if (CheckFlag996(Save_VarsFlags_Get(fsys->savedata)) == TRUE) { + if (CheckFlag996(Save_VarsFlags_Get(fieldSystem->savedata)) == TRUE) { return 0; } - if (ov01_021F6B10(fsys) != TRUE) { + if (ov01_021F6B10(fieldSystem) != TRUE) { return 0; } if (slot == 1) { - itemId = Bag_GetRegisteredItem1(Save_Bag_Get(fsys->savedata)); + itemId = Bag_GetRegisteredItem1(Save_Bag_Get(fieldSystem->savedata)); } else { - itemId = Bag_GetRegisteredItem2(Save_Bag_Get(fsys->savedata)); + itemId = Bag_GetRegisteredItem2(Save_Bag_Get(fieldSystem->savedata)); } - if (itemId == ITEM_DOWSING_MCHN && ov01_021F6B00(fsys) == 4) { + if (itemId == ITEM_DOWSING_MCHN && ov01_021F6B00(fieldSystem) == 4) { return 0; } funcType = GetItemAttr(itemId, ITEMATTR_FIELDUSEFUNC, HEAP_ID_FIELD); @@ -781,9 +781,9 @@ int UseRegisteredItemButtonInField(FieldSystem *fsys, u8 slot) { } data = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct ItemFieldUseData)); memset(data, 0, sizeof(struct ItemFieldUseData)); - data->fsys = fsys; + data->fieldSystem = fieldSystem; data->itemId = itemId; - ItemCheckUseData_Init(fsys, &data->dat); + ItemCheckUseData_Init(fieldSystem, &data->dat); result = FALSE; if (checkUseFunc == NULL) { result = fieldUseFunc(data); @@ -797,7 +797,7 @@ int UseRegisteredItemButtonInField(FieldSystem *fsys, u8 slot) { } if (result == FALSE) { FreeToHeap(data); - } else if (KeyItemIdSpawnsSubprocess(fsys, data->itemId)) { + } else if (KeyItemIdSpawnsSubprocess(fieldSystem, data->itemId)) { return 1; } return 2; @@ -807,23 +807,23 @@ static void RegisteredItem_GoToPrintErrorTask(struct ItemFieldUseData *data, enu struct RegisteredKeyItemUseMessagePrintTaskData *env = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct RegisteredKeyItemUseMessagePrintTaskData)); env->state = 0; env->strbuf = String_New(128, HEAP_ID_FIELD); - GetItemUseErrorMessage(Save_PlayerData_GetProfileAddr(data->fsys->savedata), env->strbuf, data->itemId, error, HEAP_ID_FIELD); - FieldSys_CreateTask(data->fsys, Task_PrintRegisteredKeyItemUseMessage, env); + GetItemUseErrorMessage(Save_PlayerData_GetProfileAddr(data->fieldSystem->savedata), env->strbuf, data->itemId, error, HEAP_ID_FIELD); + FieldSystem_CreateTask(data->fieldSystem, Task_PrintRegisteredKeyItemUseMessage, env); } static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct ItemFieldUseData *env = TaskManager_GetEnv(taskManager); switch (env->state) { case 0: - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); ov01_021E636C(0); env->state = 1; break; case 1: if (IsPaletteFadeFinished()) { - env->work = env->ctor(fsys); + env->work = env->ctor(fieldSystem); if (env->no_app == FALSE) { env->state = 2; } else { @@ -832,7 +832,7 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { } break; case 2: - if (FieldSys_ApplicationIsRunning(fsys)) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { break; } // fallthrough @@ -840,19 +840,19 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { if (env->work != NULL) { FreeToHeap(env->work); } - sub_020505C0(fsys); + sub_020505C0(fieldSystem); env->state = 4; break; case 4: - if (sub_020505C8(fsys)) { - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); + if (sub_020505C8(fieldSystem)) { + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); ov01_021E636C(1); env->state = 5; } break; case 5: if (IsPaletteFadeFinished()) { - MapObjectManager_UnpauseAllMovement(fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectMan); FreeToHeap(env); return TRUE; } @@ -865,5 +865,5 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { static void RegisteredItem_CreateGoToAppTask(struct ItemFieldUseData *data, FieldApplicationWorkCtor ctor, BOOL no_app) { data->ctor = ctor; data->no_app = no_app; - FieldSys_CreateTask(data->fsys, Task_RegisteredItem_GoToApp, data); + FieldSystem_CreateTask(data->fieldSystem, Task_RegisteredItem_GoToApp, data); } diff --git a/src/field_warp_tasks.c b/src/field_warp_tasks.c index de32b14ab..69e163c91 100644 --- a/src/field_warp_tasks.c +++ b/src/field_warp_tasks.c @@ -65,16 +65,16 @@ struct UnkTaskEnv_02053E5C { Location location; }; -static void sub_02052F30(FieldSystem *fsys); -static void sub_02052F94(FieldSystem *fsys, Location *location); -static void sub_0205316C(FieldSystem *fsys); -static void sub_02053210(FieldSystem *fsys); -static void sub_0205323C(FieldSystem *fsys); -static void sub_02053284(FieldSystem *fsys); -static void sub_02053324(FieldSystem *fsys); -static void _CopyPlayerPosToLocationWorkFacingSouth(Location *location, FieldSystem *fsys); -static BOOL _IsPlayerStandingInFrontOfUnionRoomReception(FieldSystem *fsys); -static void _SetDynamicWarpToUnionRoomExit(FieldSystem *fsys); +static void sub_02052F30(FieldSystem *fieldSystem); +static void sub_02052F94(FieldSystem *fieldSystem, Location *location); +static void sub_0205316C(FieldSystem *fieldSystem); +static void sub_02053210(FieldSystem *fieldSystem); +static void sub_0205323C(FieldSystem *fieldSystem); +static void sub_02053284(FieldSystem *fieldSystem); +static void sub_02053324(FieldSystem *fieldSystem); +static void _CopyPlayerPosToLocationWorkFacingSouth(Location *location, FieldSystem *fieldSystem); +static BOOL _IsPlayerStandingInFrontOfUnionRoomReception(FieldSystem *fieldSystem); +static void _SetDynamicWarpToUnionRoomExit(FieldSystem *fieldSystem); static BOOL FieldTask_NewGame(TaskManager *taskManager); static BOOL FieldTask_ContinueGame_Normal(TaskManager *taskManager); static BOOL FieldTask_ContinueGame_CommError(TaskManager *taskManager); @@ -109,12 +109,12 @@ static const struct UnkStruct_020FC5CC _020FC5CC[] = { {6, 0, 0, 0, 0, 1, 0, 0, 64, 12}, }; -static void sub_02052F30(FieldSystem *fsys) { +static void sub_02052F30(FieldSystem *fieldSystem) { BOOL r2 = FALSE; - switch (fsys->location->mapId) { + switch (fieldSystem->location->mapId) { case MAP_D47R0102: - fsys->unk70 = 1; + fieldSystem->unk70 = 1; return; case MAP_D31R0201: case MAP_D31R0202: @@ -126,66 +126,66 @@ static void sub_02052F30(FieldSystem *fsys) { r2 = TRUE; break; } - if (fsys->unk70 == 1) { - fsys->unk70 = 0; + if (fieldSystem->unk70 == 1) { + fieldSystem->unk70 = 0; } - if (!r2 && fsys->unk70 == 4) { - fsys->unk70 = 0; + if (!r2 && fieldSystem->unk70 == 4) { + fieldSystem->unk70 = 0; } if (r2) { - fsys->unk70 = 4; + fieldSystem->unk70 = 4; } } -static void sub_02052F94(FieldSystem *fsys, Location *location) { - LocalFieldData *localFieldData = Save_LocalFieldData_Get(fsys->savedata); +static void sub_02052F94(FieldSystem *fieldSystem, Location *location) { + LocalFieldData *localFieldData = Save_LocalFieldData_Get(fieldSystem->savedata); Location *r2 = LocalFieldData_GetPreviousPosition(localFieldData); const WARP_EVENT *warp; if (location != NULL) { - *r2 = *fsys->location; - *fsys->location = *location; + *r2 = *fieldSystem->location; + *fieldSystem->location = *location; } - Field_InitMapEvents(fsys, fsys->location->mapId); - if (fsys->location->warpId != -1) { - warp = Field_GetWarpEventI(fsys, fsys->location->warpId); - fsys->location->x = warp->x; - fsys->location->y = warp->y; + Field_InitMapEvents(fieldSystem, fieldSystem->location->mapId); + if (fieldSystem->location->warpId != -1) { + warp = Field_GetWarpEventI(fieldSystem, fieldSystem->location->warpId); + fieldSystem->location->x = warp->x; + fieldSystem->location->y = warp->y; if (warp->anchor == 0x100) { *LocalFieldData_GetDynamicWarp(localFieldData) = *LocalFieldData_GetEntrancePosition(localFieldData); } } } -void sub_02053018(FieldSystem *fsys) { - GF_ASSERT(fsys->unk70 < 6); - gSystem.screensFlipped = fsys->unk74->unk0_0C; +void sub_02053018(FieldSystem *fieldSystem) { + GF_ASSERT(fieldSystem->unk70 < 6); + gSystem.screensFlipped = fieldSystem->unk74->unk0_0C; } -void sub_02053038(FieldSystem *fsys, BOOL isConnection) { - u32 mapId = fsys->location->mapId; - LocalFieldData *localFieldData = Save_LocalFieldData_Get(fsys->savedata); +void sub_02053038(FieldSystem *fieldSystem, BOOL isConnection) { + u32 mapId = fieldSystem->location->mapId; + LocalFieldData *localFieldData = Save_LocalFieldData_Get(fieldSystem->savedata); SaveVarsFlags *varsFlags; u16 weather; u16 spawnId; - Fsys_ClearSavedMusicId(fsys); - if (!fsys->unkAC) { - ClearTempFieldEventData(fsys); + FieldSystem_ClearSavedMusicId(fieldSystem); + if (!fieldSystem->unkAC) { + ClearTempFieldEventData(fieldSystem); } if (!isConnection) { - sub_02067AE4(fsys); + sub_02067AE4(fieldSystem); } else { - sub_02067A88(fsys); + sub_02067A88(fieldSystem); } - if (!fsys->unkAC && !isConnection) { - FieldSys_StartBugContestTimer(fsys); + if (!fieldSystem->unkAC && !isConnection) { + FieldSystem_StartBugContestTimer(fieldSystem); } if (!isConnection) { - SavGymmick_Clear(Save_GetGymmickPtr(fsys->savedata)); - SetLakeOfRageWaterLevel(fsys->mapMatrix, ShouldUseAlternateLakeOfRage(fsys->savedata, mapId)); + SavGymmick_Clear(Save_GetGymmickPtr(fieldSystem->savedata)); + SetLakeOfRageWaterLevel(fieldSystem->mapMatrix, ShouldUseAlternateLakeOfRage(fieldSystem->savedata, mapId)); } - varsFlags = Save_VarsFlags_Get(fsys->savedata); - weather = FieldSystem_GetWeather_HandleDiamondDust(fsys, mapId); + varsFlags = Save_VarsFlags_Get(fieldSystem->savedata); + weather = FieldSystem_GetWeather_HandleDiamondDust(fieldSystem, mapId); if (sub_02066C74(varsFlags, 1) && mapId == MAP_T29) { weather = 0; } @@ -207,131 +207,131 @@ void sub_02053038(FieldSystem *fsys, BOOL isConnection) { LocalFieldData_SetBlackoutSpawn(localFieldData, spawnId); } } - TryStartMapScriptByType(fsys, 2); - fsys->unk7E = 0; - fsys->unk7C = 0; - fsys->unk78 = 0; - SavFollowPoke_SetInhibitFlagState(Save_FollowPoke_Get(fsys->savedata), FALSE); - ClearFlag99A(Save_VarsFlags_Get(fsys->savedata)); + TryStartMapScriptByType(fieldSystem, 2); + fieldSystem->unk7E = 0; + fieldSystem->unk7C = 0; + fieldSystem->unk78 = 0; + SavFollowPoke_SetInhibitFlagState(Save_FollowPoke_Get(fieldSystem->savedata), FALSE); + ClearFlag99A(Save_VarsFlags_Get(fieldSystem->savedata)); } -static void sub_0205316C(FieldSystem *fsys) { +static void sub_0205316C(FieldSystem *fieldSystem) { u32 gender; struct PlayerSaveData *playerSaveData; - if (fsys->unkAC) { - gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fsys->savedata)); - playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fsys->savedata)); - fsys->playerAvatar = sub_0205C390(fsys->mapObjectMan, fsys->location->x, fsys->location->y, fsys->location->direction, playerSaveData->unk4, gender, 2, playerSaveData); + 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); } else { - fsys->mapObjectMan = sub_0205E0BC(fsys, 64, HEAP_ID_BATTLE); - gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fsys->savedata)); - playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fsys->savedata)); - fsys->playerAvatar = sub_0205C390(fsys->mapObjectMan, fsys->location->x, fsys->location->y, fsys->location->direction, playerSaveData->unk4, gender, 2, playerSaveData); - sub_020699F8(fsys->mapObjectMan, fsys->location->x, fsys->location->y, fsys->location->direction, fsys->location->mapId); - Field_InitMapObjectsFromZoneEventData(fsys); - sub_0205F55C(fsys->mapObjectMan); + fieldSystem->mapObjectMan = 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); + Field_InitMapObjectsFromZoneEventData(fieldSystem); + sub_0205F55C(fieldSystem->mapObjectMan); } } -static void sub_02053210(FieldSystem *fsys) { - if (fsys->unkAC) { - PlayerAvatar_DeleteFromMap(fsys->playerAvatar); +static void sub_02053210(FieldSystem *fieldSystem) { + if (fieldSystem->unkAC) { + PlayerAvatar_DeleteFromMap(fieldSystem->playerAvatar); } else { sub_02056E38(); - PlayerAvatar_FreeToHeap(fsys->playerAvatar); - MapObjectManager_RemoveAllActiveObjects(fsys->mapObjectMan); - MapObjectManager_Delete(fsys->mapObjectMan); + PlayerAvatar_FreeToHeap(fieldSystem->playerAvatar); + MapObjectManager_RemoveAllActiveObjects(fieldSystem->mapObjectMan); + MapObjectManager_Delete(fieldSystem->mapObjectMan); } } -static void sub_0205323C(FieldSystem *fsys) { +static void sub_0205323C(FieldSystem *fieldSystem) { u32 gender; struct PlayerSaveData *playerSaveData; - fsys->mapObjectMan = sub_0205E0BC(fsys, 64, HEAP_ID_BATTLE); - Fsys_RestoreMapObjectsFromSave(fsys); - playerSaveData = LocalFieldData_GetPlayer(Save_LocalFieldData_Get(fsys->savedata)); - gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fsys->savedata)); - fsys->playerAvatar = sub_0205C408(fsys->mapObjectMan, playerSaveData, gender); - sub_02069B74(fsys->mapObjectMan, fsys->location->mapId); - sub_0205F55C(fsys->mapObjectMan); + fieldSystem->mapObjectMan = 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); } -static void sub_02053284(FieldSystem *fsys) { +static void sub_02053284(FieldSystem *fieldSystem) { SaveVarsFlags *varsFlags; - sub_02052F30(fsys); - GF_ASSERT(fsys->unk60 == 0); - MapMatrix_Load(fsys->location->mapId, fsys->mapMatrix); - varsFlags = Save_VarsFlags_Get(fsys->savedata); + sub_02052F30(fieldSystem); + GF_ASSERT(fieldSystem->unk60 == 0); + MapMatrix_Load(fieldSystem->location->mapId, fieldSystem->mapMatrix); + varsFlags = Save_VarsFlags_Get(fieldSystem->savedata); if (sub_02066C74(varsFlags, 0)) { - RemoveMahoganyTownAntennaTree(fsys->mapMatrix); + RemoveMahoganyTownAntennaTree(fieldSystem->mapMatrix); } - SetLakeOfRageWaterLevel(fsys->mapMatrix, sub_02066C74(varsFlags, 1)); - PlaceSafariZoneAreas(fsys->mapMatrix, fsys->savedata); - GF_ASSERT(fsys->unk70 < 6); - fsys->unk74 = &_020FC5CC[fsys->unk70]; - fsys->unk64 = fsys->unk74->unk0_04; - fsys->unk18 = fsys->unk74->unk0_00; - sub_0205489C(&fsys->unk60, fsys->unk74->unk0_08); - if (fsys->unk74->unk0_10) { - sub_02054514(fsys, fsys->unk74->unk0_18); + SetLakeOfRageWaterLevel(fieldSystem->mapMatrix, sub_02066C74(varsFlags, 1)); + PlaceSafariZoneAreas(fieldSystem->mapMatrix, fieldSystem->savedata); + GF_ASSERT(fieldSystem->unk70 < 6); + fieldSystem->unk74 = &_020FC5CC[fieldSystem->unk70]; + fieldSystem->unk64 = fieldSystem->unk74->unk0_04; + fieldSystem->unk18 = fieldSystem->unk74->unk0_00; + sub_0205489C(&fieldSystem->unk60, fieldSystem->unk74->unk0_08); + if (fieldSystem->unk74->unk0_10) { + sub_02054514(fieldSystem, fieldSystem->unk74->unk0_18); } } -static void sub_02053324(FieldSystem *fsys) { - GF_ASSERT(fsys->unk60 != 0); - fsys->unk60 = 0; - fsys->unk18 = 7; - if (fsys->unk74->unk0_10) { - sub_0205453C(fsys); +static void sub_02053324(FieldSystem *fieldSystem) { + GF_ASSERT(fieldSystem->unk60 != 0); + fieldSystem->unk60 = 0; + fieldSystem->unk18 = 7; + if (fieldSystem->unk74->unk0_10) { + sub_0205453C(fieldSystem); } - fsys->unk74 = NULL; + fieldSystem->unk74 = NULL; } -static void _CopyPlayerPosToLocationWorkFacingSouth(Location *location, FieldSystem *fsys) { +static void _CopyPlayerPosToLocationWorkFacingSouth(Location *location, FieldSystem *fieldSystem) { int x, y; - y = GetPlayerYCoord(fsys->playerAvatar); - x = GetPlayerXCoord(fsys->playerAvatar); + y = GetPlayerYCoord(fieldSystem->playerAvatar); + x = GetPlayerXCoord(fieldSystem->playerAvatar); - InitLocation(location, fsys->location->mapId, -1, x, y, DIR_SOUTH); + InitLocation(location, fieldSystem->location->mapId, -1, x, y, DIR_SOUTH); } -static BOOL _IsPlayerStandingInFrontOfUnionRoomReception(FieldSystem *fsys) { - if (MapHeader_MapIsPokemonCenter(fsys->location->mapId) - && fsys->location->x == 6 && fsys->location->y == 6) { +static BOOL _IsPlayerStandingInFrontOfUnionRoomReception(FieldSystem *fieldSystem) { + if (MapHeader_MapIsPokemonCenter(fieldSystem->location->mapId) + && fieldSystem->location->x == 6 && fieldSystem->location->y == 6) { return TRUE; } - if (MapHeader_MapIsPokemonLeagueLobby(fsys->location->mapId) - && fsys->location->x == 3 && fsys->location->y == 15) { + if (MapHeader_MapIsPokemonLeagueLobby(fieldSystem->location->mapId) + && fieldSystem->location->x == 3 && fieldSystem->location->y == 15) { return TRUE; } return FALSE; } -static void _SetDynamicWarpToUnionRoomExit(FieldSystem *fsys) { - Location *dynamicWarp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fsys->savedata)); - SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fsys->savedata); // unused - if (MapHeader_MapIsPokemonLeagueLobby(fsys->location->mapId) == TRUE) { - InitLocation(dynamicWarp, fsys->location->mapId, -1, 4, 11, DIR_SOUTH); +static void _SetDynamicWarpToUnionRoomExit(FieldSystem *fieldSystem) { + Location *dynamicWarp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata)); + SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->savedata); // unused + if (MapHeader_MapIsPokemonLeagueLobby(fieldSystem->location->mapId) == TRUE) { + InitLocation(dynamicWarp, fieldSystem->location->mapId, -1, 4, 11, DIR_SOUTH); } else { - InitLocation(dynamicWarp, fsys->location->mapId, -1, 7, 2, DIR_SOUTH); + InitLocation(dynamicWarp, fieldSystem->location->mapId, -1, 7, 2, DIR_SOUTH); } } static BOOL FieldTask_NewGame(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); switch (*state_p) { case 0: - sub_02052F94(fsys, fsys->location); - sub_02053284(fsys); - sub_02053038(fsys, FALSE); - sub_0205316C(fsys); + sub_02052F94(fieldSystem, fieldSystem->location); + sub_02053284(fieldSystem); + sub_02053038(fieldSystem, FALSE); + sub_0205316C(fieldSystem); (*state_p)++; break; case 1: @@ -345,37 +345,37 @@ static BOOL FieldTask_NewGame(TaskManager *taskManager) { return FALSE; } -TaskManager *CallFieldTask_NewGame(FieldSystem *fsys) { - fsys->unk70 = 0; - RunInitScript(fsys); - return FieldSys_CreateTask(fsys, FieldTask_NewGame, NULL); +TaskManager *CallFieldTask_NewGame(FieldSystem *fieldSystem) { + fieldSystem->unk70 = 0; + RunInitScript(fieldSystem); + return FieldSystem_CreateTask(fieldSystem, FieldTask_NewGame, NULL); } static BOOL FieldTask_ContinueGame_Normal(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); - SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fsys->savedata); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->savedata); LocalFieldData *localFieldData; u32 *state_p = TaskManager_GetStatePtr(taskManager); switch (*state_p) { case 0: if (CheckFlag966(varsFlags)) { - localFieldData = Save_LocalFieldData_Get(fsys->savedata); - if (_IsPlayerStandingInFrontOfUnionRoomReception(fsys)) { - _SetDynamicWarpToUnionRoomExit(fsys); + localFieldData = Save_LocalFieldData_Get(fieldSystem->savedata); + if (_IsPlayerStandingInFrontOfUnionRoomReception(fieldSystem)) { + _SetDynamicWarpToUnionRoomExit(fieldSystem); } ClearFlag966(varsFlags); - sub_02052F94(fsys, LocalFieldData_GetDynamicWarp(localFieldData)); - sub_02053284(fsys); - sub_02053038(fsys, FALSE); - sub_0205316C(fsys); + sub_02052F94(fieldSystem, LocalFieldData_GetDynamicWarp(localFieldData)); + sub_02053284(fieldSystem); + sub_02053038(fieldSystem, FALSE); + sub_0205316C(fieldSystem); } else { - sub_02052F94(fsys, NULL); - sub_02053284(fsys); - FieldSys_StartBugContestTimer(fsys); - sub_0205323C(fsys); + sub_02052F94(fieldSystem, NULL); + sub_02053284(fieldSystem); + FieldSystem_StartBugContestTimer(fieldSystem); + sub_0205323C(fieldSystem); } - sub_02067BE8(fsys); + sub_02067BE8(fieldSystem); *state_p = 2; break; case 2: @@ -389,15 +389,15 @@ static BOOL FieldTask_ContinueGame_Normal(TaskManager *taskManager) { return FALSE; } -TaskManager *CallFieldTask_ContinueGame_Normal(FieldSystem *fsys) { - fsys->unk70 = 0; - return FieldSys_CreateTask(fsys, FieldTask_ContinueGame_Normal, NULL); +TaskManager *CallFieldTask_ContinueGame_Normal(FieldSystem *fieldSystem) { + fieldSystem->unk70 = 0; + return FieldSystem_CreateTask(fieldSystem, FieldTask_ContinueGame_Normal, NULL); } static BOOL FieldTask_ContinueGame_CommError(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct ErrorContinueEnv *env = TaskManager_GetEnv(taskManager); - SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fsys->savedata); + SaveVarsFlags *varsFlags = Save_VarsFlags_Get(fieldSystem->savedata); u32 *state_p = TaskManager_GetStatePtr(taskManager); switch (*state_p) { @@ -407,21 +407,21 @@ static BOOL FieldTask_ContinueGame_CommError(TaskManager *taskManager) { (*state_p)++; break; case 1: - sub_02052F94(fsys, &env->location); - sub_02053284(fsys); - sub_02053038(fsys, FALSE); - sub_0205316C(fsys); + sub_02052F94(fieldSystem, &env->location); + sub_02053284(fieldSystem); + sub_02053038(fieldSystem, FALSE); + sub_0205316C(fieldSystem); (*state_p)++; break; case 2: - fsys->unk80 = sub_02059DB0(fsys); - fsys->unk84 = sub_0205AC88(fsys->unk80); + fieldSystem->unk80 = sub_02059DB0(fieldSystem); + fieldSystem->unk84 = sub_0205AC88(fieldSystem->unk80); sub_020552A4(taskManager); (*state_p)++; break; case 3: env->state = 0; - ov01_021F35C4(fsys, 0, &env->state); + ov01_021F35C4(fieldSystem, 0, &env->state); (*state_p)++; break; case 4: @@ -437,33 +437,33 @@ static BOOL FieldTask_ContinueGame_CommError(TaskManager *taskManager) { return FALSE; } -TaskManager *CallFieldTask_ContinueGame_CommError(FieldSystem *fsys) { +TaskManager *CallFieldTask_ContinueGame_CommError(FieldSystem *fieldSystem) { SaveVarsFlags *varsFlags; struct ErrorContinueEnv *env; - if (!MapHeader_MapIsUnionRoom(fsys->location->mapId)) { - if (_IsPlayerStandingInFrontOfUnionRoomReception(fsys)) { - varsFlags = Save_VarsFlags_Get(fsys->savedata); - _SetDynamicWarpToUnionRoomExit(fsys); + if (!MapHeader_MapIsUnionRoom(fieldSystem->location->mapId)) { + if (_IsPlayerStandingInFrontOfUnionRoomReception(fieldSystem)) { + varsFlags = Save_VarsFlags_Get(fieldSystem->savedata); + _SetDynamicWarpToUnionRoomExit(fieldSystem); SetFlag966(varsFlags); } else { - return CallFieldTask_ContinueGame_Normal(fsys); + return CallFieldTask_ContinueGame_Normal(fieldSystem); } } env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct ErrorContinueEnv)); env->state = 0; InitLocation(&env->location, MAP_UNION, -1, 8, 14, DIR_NORTH); - fsys->unk70 = 2; - return FieldSys_CreateTask(fsys, FieldTask_ContinueGame_CommError, env); + fieldSystem->unk70 = 2; + return FieldSystem_CreateTask(fieldSystem, FieldTask_ContinueGame_CommError, env); } static BOOL sub_02053688(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053688 *env = TaskManager_GetEnv(taskManager); switch (env->unk0) { case 0: PlaySE(SEQ_SE_DP_KAIDAN2); - Fsys_BeginFadeOutMusic(fsys, env->location.mapId); + FieldSystem_BeginFadeOutMusic(fieldSystem, env->location.mapId); sub_020553B0(taskManager); env->unk0++; break; @@ -475,7 +475,7 @@ static BOOL sub_02053688(TaskManager *taskManager) { if (GF_SndGetFadeTimer() != 0) { break; } - sub_02055110(fsys, env->location.mapId, 0); + sub_02055110(fieldSystem, env->location.mapId, 0); sub_02055408(taskManager); env->unk0++; break; @@ -495,23 +495,23 @@ static void sub_02053710(TaskManager *taskManager, Location *location) { } static BOOL sub_02053740(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct ErrorContinueEnv *env = TaskManager_GetEnv(taskManager); switch (env->state) { case 0: - sub_02053210(fsys); - sub_02053324(fsys); + sub_02053210(fieldSystem); + sub_02053324(fieldSystem); env->state++; break; case 1: - sub_02052F94(fsys, &env->location); - sub_02053284(fsys); - sub_02053038(fsys, FALSE); + sub_02052F94(fieldSystem, &env->location); + sub_02053284(fieldSystem); + sub_02053038(fieldSystem, FALSE); env->state++; break; case 2: - sub_0205316C(fsys); + sub_0205316C(fieldSystem); FreeToHeap(env); return TRUE; } @@ -520,9 +520,9 @@ static BOOL sub_02053740(TaskManager *taskManager) { } void sub_020537A8(TaskManager *taskManager, Location *location) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct ErrorContinueEnv *env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct ErrorContinueEnv)); - if (sub_0203DF7C(fsys)) { + if (sub_0203DF7C(fieldSystem)) { GF_ASSERT(0); return; } @@ -544,12 +544,12 @@ void sub_020537F0(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, } static BOOL Task_ScriptWarp(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct ErrorContinueEnv *env = TaskManager_GetEnv(taskManager); switch (env->state) { case 0: - Fsys_BeginFadeOutMusic(fsys, env->location.mapId); + FieldSystem_BeginFadeOutMusic(fieldSystem, env->location.mapId); sub_0205525C(taskManager); env->state++; break; @@ -561,7 +561,7 @@ static BOOL Task_ScriptWarp(TaskManager *taskManager) { if (GF_SndGetFadeTimer() != 0) { break; } - sub_02055110(fsys, env->location.mapId, 0); + sub_02055110(fieldSystem, env->location.mapId, 0); sub_020552A4(taskManager); env->state++; break; @@ -580,7 +580,7 @@ void CallTask_ScriptWarp(TaskManager *taskManager, u32 mapId, int warpId, int x, TaskManager_Call(taskManager, Task_ScriptWarp, env); } -TaskManager *sub_020538C0(FieldSystem *fsys, u32 mapId, int warpId, int x, int y, int direction) { +TaskManager *sub_020538C0(FieldSystem *fieldSystem, u32 mapId, int warpId, int x, int y, int direction) { Location location = { mapId, warpId, @@ -592,7 +592,7 @@ TaskManager *sub_020538C0(FieldSystem *fsys, u32 mapId, int warpId, int x, int y env->unk0 = 0; env->unk4 = 0; env->location = location; - return FieldSys_CreateTask(fsys, sub_02053950, env); + return FieldSystem_CreateTask(fieldSystem, sub_02053950, env); } void sub_02053908(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, int direction) { @@ -611,17 +611,17 @@ void sub_02053908(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, } static BOOL sub_02053950(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053950 *env = TaskManager_GetEnv(taskManager); Location *location = &env->location; switch (env->unk0) { case 0: - Fsys_BeginFadeOutMusic(fsys, location->mapId); + FieldSystem_BeginFadeOutMusic(fieldSystem, location->mapId); sub_020539D8(taskManager); env->unk0++; break; case 1: - PlayerAvatar_SetState(fsys->playerAvatar, PLAYER_STATE_WALKING); + PlayerAvatar_SetState(fieldSystem->playerAvatar, PLAYER_STATE_WALKING); sub_020537A8(taskManager, &env->location); env->unk0++; break; @@ -629,7 +629,7 @@ static BOOL sub_02053950(TaskManager *taskManager) { if (GF_SndGetFadeTimer() != 0) { break; } - sub_02067B88(fsys); + sub_02067B88(fieldSystem); sub_02053A14(taskManager); env->unk0++; break; @@ -666,7 +666,7 @@ static void sub_02053A14(TaskManager *taskManager) { static BOOL sub_02053A2C(TaskManager *taskManager) { u32 *state_p = TaskManager_GetStatePtr(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); switch (*state_p) { case 0: sub_020552A4(taskManager); @@ -675,9 +675,9 @@ static BOOL sub_02053A2C(TaskManager *taskManager) { case 1: sub_0200615C(5, 10); GF_SndHandleMoveVolume(0, 128, 15); - fsys->unkC4 = -1; - sub_02055110(fsys, fsys->location->mapId, 1); - ov01_021EFAF8(fsys); + fieldSystem->unkC4 = -1; + sub_02055110(fieldSystem, fieldSystem->location->mapId, 1); + ov01_021EFAF8(fieldSystem); sub_02053AA0(taskManager); (*state_p)++; break; @@ -689,13 +689,13 @@ static BOOL sub_02053A2C(TaskManager *taskManager) { } static void sub_02053AA0(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053950 *env = TaskManager_GetEnv(taskManager); - if (!sub_0203DF7C(fsys)) { + if (!sub_0203DF7C(fieldSystem)) { GF_ASSERT(0); return; } - env->unk4 = ov02_0224B418(fsys, PlayerAvatar_GetGender(fsys->playerAvatar)); + env->unk4 = ov02_0224B418(fieldSystem, PlayerAvatar_GetGender(fieldSystem->playerAvatar)); TaskManager_Call(taskManager, sub_02053AE4, env); } @@ -719,18 +719,18 @@ void sub_02053B04(TaskManager *taskManager, Location *location, int a2) { } static BOOL sub_02053B3C(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnv(taskManager); Location *location = &env->location; switch (env->unk0) { case 0: - Fsys_BeginFadeOutMusic(fsys, location->mapId); + FieldSystem_BeginFadeOutMusic(fieldSystem, location->mapId); sub_02053BE8(taskManager); env->unk0++; break; case 1: - PlayerAvatar_SetState(fsys->playerAvatar, PLAYER_STATE_WALKING); + PlayerAvatar_SetState(fieldSystem->playerAvatar, PLAYER_STATE_WALKING); sub_020537A8(taskManager, &env->location); env->unk0++; break; @@ -738,11 +738,11 @@ static BOOL sub_02053B3C(TaskManager *taskManager) { if (GF_SndGetFadeTimer() != 0) { break; } - sub_02055110(fsys, location->mapId, 0); + sub_02055110(fieldSystem, location->mapId, 0); if (env->unk4 == 2) { - sub_02067BA4(fsys); + sub_02067BA4(fieldSystem); } else if (env->unk4 == 0 || env->unk4 == 1) { - sub_02067BC0(fsys); + sub_02067BC0(fieldSystem); } else { GF_ASSERT(0); } @@ -783,7 +783,7 @@ static void sub_02053C24(TaskManager *taskManager) { static BOOL sub_02053C3C(TaskManager *taskManager) { u32 *state_p = TaskManager_GetStatePtr(taskManager); - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnv(taskManager); // unused switch (*state_p) { @@ -792,7 +792,7 @@ static BOOL sub_02053C3C(TaskManager *taskManager) { (*state_p)++; break; case 1: - ov01_021EFAF8(fsys); + ov01_021EFAF8(fieldSystem); sub_02053C90(taskManager); (*state_p)++; break; @@ -804,18 +804,18 @@ static BOOL sub_02053C3C(TaskManager *taskManager) { } static void sub_02053C90(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053B3C *env = TaskManager_GetEnv(taskManager); - if (!sub_0203DF7C(fsys)) { + if (!sub_0203DF7C(fieldSystem)) { GF_ASSERT(0); return; } - TaskManager_Call(taskManager, ov02_0224C1F8, ov02_0224C1D8(fsys, 4, env->unk4)); + TaskManager_Call(taskManager, ov02_0224C1F8, ov02_0224C1D8(fieldSystem, 4, env->unk4)); } static BOOL sub_02053CCC(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053CCC *env = TaskManager_GetEnv(taskManager); Location *location = &env->location; struct LocalMapObject *follow_poke_obj; @@ -823,22 +823,22 @@ static BOOL sub_02053CCC(TaskManager *taskManager) { switch (env->unk0) { case 0: env->unk1C = 0; - if (FollowingPokemon_IsActive(fsys) - && !ov01_022057C4(fsys) - && PlayerAvatar_GetState(fsys->playerAvatar) != 1) { - env->unk1C = ov01_0220329C(FollowingPokemon_GetMapObject(fsys), 1); + if (FollowingPokemon_IsActive(fieldSystem) + && !ov01_022057C4(fieldSystem) + && PlayerAvatar_GetState(fieldSystem->playerAvatar) != 1) { + env->unk1C = ov01_0220329C(FollowingPokemon_GetMapObject(fieldSystem), 1); } env->unk0++; break; case 1: if (env->unk1C == 0 || !sub_02068CCC(env->unk1C)) { - ov01_021F35C4(fsys, 1, &env->unk4); + ov01_021F35C4(fieldSystem, 1, &env->unk4); env->unk0++; } break; case 2: if (env->unk4) { - Fsys_BeginFadeOutMusic(fsys, location->mapId); + FieldSystem_BeginFadeOutMusic(fieldSystem, location->mapId); sub_0205525C(taskManager); env->unk0++; } @@ -851,18 +851,18 @@ static BOOL sub_02053CCC(TaskManager *taskManager) { if (GF_SndGetFadeTimer() != 0) { break; } - sub_02055110(fsys, location->mapId, 0); + sub_02055110(fieldSystem, location->mapId, 0); sub_020552A4(taskManager); env->unk0++; break; case 5: env->unk4 = 0; - ov01_021F35C4(fsys, 0, &env->unk4); - if (FollowingPokemon_IsActive(fsys)) { - follow_poke_obj = FollowingPokemon_GetMapObject(fsys); + ov01_021F35C4(fieldSystem, 0, &env->unk4); + if (FollowingPokemon_IsActive(fieldSystem)) { + follow_poke_obj = FollowingPokemon_GetMapObject(fieldSystem); if (GetFollowPokePermissionBySpeciesAndMap(FollowPokeObj_GetSpecies(follow_poke_obj), location->mapId)) { sub_02069E84(follow_poke_obj, 1); - ov01_02205790(fsys, 1); + ov01_02205790(fieldSystem, 1); } } env->unk0++; @@ -880,29 +880,29 @@ static BOOL sub_02053CCC(TaskManager *taskManager) { return FALSE; } -TaskManager *sub_02053E08(FieldSystem *fsys, u32 mapId, int warpId) { +TaskManager *sub_02053E08(FieldSystem *fieldSystem, u32 mapId, int warpId) { struct UnkTaskEnv_02053CCC *env; Location location; int direction; env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct UnkTaskEnv_02053CCC)); MI_CpuClear8(env, sizeof(struct UnkTaskEnv_02053CCC)); - direction = PlayerAvatar_GetFacingDirection(fsys->playerAvatar); + direction = PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar); InitLocation(&location, mapId, warpId, 0, 0, direction); env->location = location; - return FieldSys_CreateTask(fsys, sub_02053CCC, env); + return FieldSystem_CreateTask(fieldSystem, sub_02053CCC, env); } static BOOL sub_02053E5C(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053E5C *env = TaskManager_GetEnv(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); Location *location = &env->location; switch (*state_p) { case 0: - Fsys_BeginFadeOutMusic(fsys, location->mapId); - ov01_021F35C4(fsys, 1, &env->unk4); + FieldSystem_BeginFadeOutMusic(fieldSystem, location->mapId); + ov01_021F35C4(fieldSystem, 1, &env->unk4); (*state_p)++; break; case 1: @@ -919,7 +919,7 @@ static BOOL sub_02053E5C(TaskManager *taskManager) { if (GF_SndGetFadeTimer() != 0) { break; } - sub_02055110(fsys, location->mapId, 0); + sub_02055110(fieldSystem, location->mapId, 0); sub_020552A4(taskManager); (*state_p)++; break; @@ -935,27 +935,27 @@ static BOOL sub_02053E5C(TaskManager *taskManager) { return FALSE; } -void sub_02053F14(FieldSystem *fsys) { - Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fsys->savedata)); +void sub_02053F14(FieldSystem *fieldSystem) { + Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata)); struct UnkTaskEnv_02053E5C *env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct UnkTaskEnv_02053E5C)); MI_CpuClear8(env, sizeof(struct UnkTaskEnv_02053E5C)); env->location = *location; - sub_02059E04(fsys); - sub_0205AD3C(fsys->unk84); - fsys->unk70 = 0; - FieldSys_CreateTask(fsys, sub_02053E5C, env); - fsys->unk80 = NULL; + sub_02059E04(fieldSystem); + sub_0205AD3C(fieldSystem->unk84); + fieldSystem->unk70 = 0; + FieldSystem_CreateTask(fieldSystem, sub_02053E5C, env); + fieldSystem->unk80 = NULL; } static BOOL sub_02053F70(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053E5C *env = TaskManager_GetEnv(taskManager); u32 *state_p = TaskManager_GetStatePtr(taskManager); Location *location = &env->location; switch (*state_p) { case 0: - Fsys_BeginFadeOutMusic(fsys, location->mapId); + FieldSystem_BeginFadeOutMusic(fieldSystem, location->mapId); PalleteFadeUntilFinished(taskManager); (*state_p)++; break; @@ -971,13 +971,13 @@ static BOOL sub_02053F70(TaskManager *taskManager) { if (GF_SndGetFadeTimer() != 0) { break; } - sub_02055110(fsys, location->mapId, 0); + sub_02055110(fieldSystem, location->mapId, 0); sub_020552A4(taskManager); (*state_p)++; break; case 4: env->unk4 = 0; - ov01_021F35C4(fsys, 0, &env->unk4); + ov01_021F35C4(fieldSystem, 0, &env->unk4); (*state_p)++; break; case 5: @@ -994,26 +994,26 @@ static BOOL sub_02053F70(TaskManager *taskManager) { } void sub_02054030(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); - Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fsys->savedata)); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata)); struct UnkTaskEnv_02053E5C *env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct UnkTaskEnv_02053E5C)); MI_CpuClear8(env, sizeof(struct UnkTaskEnv_02053E5C)); - _CopyPlayerPosToLocationWorkFacingSouth(location, fsys); + _CopyPlayerPosToLocationWorkFacingSouth(location, fieldSystem); InitLocation(&env->location, MAP_UNION, -1, 8, 14, DIR_NORTH); - fsys->unk80 = sub_02059DB0(fsys); - fsys->unk84 = sub_0205AC88(fsys->unk80); - fsys->unk70 = 2; + fieldSystem->unk80 = sub_02059DB0(fieldSystem); + fieldSystem->unk84 = sub_0205AC88(fieldSystem->unk80); + fieldSystem->unk70 = 2; TaskManager_Call(taskManager, sub_02053F70, env); } static BOOL sub_020540A4(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); struct UnkTaskEnv_02053688 *env = TaskManager_GetEnv(taskManager); switch (env->unk0) { case 0: PlaySE(SEQ_SE_DP_KAIDAN2); - Fsys_BeginFadeOutMusic(fsys, env->location.mapId); + FieldSystem_BeginFadeOutMusic(fieldSystem, env->location.mapId); sub_020553B0(taskManager); env->unk0++; break; @@ -1025,7 +1025,7 @@ static BOOL sub_020540A4(TaskManager *taskManager) { if (GF_SndGetFadeTimer() != 0) { break; } - sub_02055110(fsys, env->location.mapId, 0); + sub_02055110(fieldSystem, env->location.mapId, 0); sub_020552A4(taskManager); env->unk0++; break; @@ -1039,9 +1039,9 @@ static BOOL sub_020540A4(TaskManager *taskManager) { void sub_0205412C(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, int direction) { struct UnkTaskEnv_02053688 *env; - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); - _CopyPlayerPosToLocationWorkFacingSouth(LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fsys->savedata)), fsys); - fsys->unk70 = 3; + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + _CopyPlayerPosToLocationWorkFacingSouth(LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata)), fieldSystem); + fieldSystem->unk70 = 3; env = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct UnkTaskEnv_02053688)); { Location location = { @@ -1058,8 +1058,8 @@ void sub_0205412C(TaskManager *taskManager, u32 mapId, int warpId, int x, int y, } void sub_02054190(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); - Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fsys->savedata)); - fsys->unk70 = 0; - sub_02053710(fsys->taskman, location); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); + Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata)); + fieldSystem->unk70 = 0; + sub_02053710(fieldSystem->taskman, location); } diff --git a/src/fieldmap.c b/src/fieldmap.c index fb479140e..3e7d26b15 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -59,14 +59,14 @@ const struct ScriptBankMapping sScriptBankMapping[30] = { {_std_misc, NARC_scr_seq_scr_seq_0003_bin, NARC_msg_msg_0040_bin}, }; -void StartMapSceneScript(FieldSystem *fsys, u16 script, LocalMapObject *lastInteracted) { +void StartMapSceneScript(FieldSystem *fieldSystem, u16 script, LocalMapObject *lastInteracted) { ScriptEnvironment *r4 = ScriptEnvironment_New(); - SetupScriptEngine(fsys, r4, script, lastInteracted, NULL); - FieldSys_CreateTask(fsys, Task_RunScripts, r4); + SetupScriptEngine(fieldSystem, r4, script, lastInteracted, NULL); + FieldSystem_CreateTask(fieldSystem, Task_RunScripts, r4); } -void FieldSys_SetEngagedTrainer(FieldSystem *fsys, LocalMapObject *obj, int a2, int a3, int a4, int trainerId, int encounterType, int idx) { - ScriptEnvironment *env = TaskManager_GetEnv(fsys->taskman); +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); EngagedTrainer *r0 = &env->engagedTrainers[idx]; r0->unk0 = a2; r0->unk4 = a3; @@ -77,30 +77,30 @@ void FieldSys_SetEngagedTrainer(FieldSystem *fsys, LocalMapObject *obj, int a2, } void QueueScript(TaskManager *taskman, u16 script, LocalMapObject *lastInteracted, void *a3) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskman); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); ScriptEnvironment *env = ScriptEnvironment_New(); - SetupScriptEngine(fsys, env, script, lastInteracted, a3); + SetupScriptEngine(fieldSystem, env, script, lastInteracted, a3); TaskManager_Call(taskman, Task_RunScripts, env); } void StartScriptFromMenu(TaskManager *taskman, u16 script, LocalMapObject *lastInteracted) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskman); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); ScriptEnvironment *env = ScriptEnvironment_New(); - SetupScriptEngine(fsys, env, script, lastInteracted, NULL); + SetupScriptEngine(fieldSystem, env, script, lastInteracted, NULL); TaskManager_Jump(taskman, Task_RunScripts, env); } BOOL Task_RunScripts(TaskManager *taskman) { int i; - FieldSystem *fsys; + FieldSystem *fieldSystem; ScriptEnvironment *env; env = TaskManager_GetEnv(taskman); - fsys = TaskManager_GetFieldSystem(taskman); + fieldSystem = TaskManager_GetFieldSystem(taskman); switch (env->state) { case 0: - env->scriptContexts[0] = CreateScriptContext(fsys, env->activeScriptNumber); + env->scriptContexts[0] = CreateScriptContext(fieldSystem, env->activeScriptNumber); env->activeScriptContextCount = 1; env->msgfmt = MessageFormat_New_Custom(8, 64, HEAP_ID_FIELD); env->stringBuffer0 = String_New(1024, HEAP_ID_FIELD); @@ -129,7 +129,7 @@ BOOL Task_RunScripts(TaskManager *taskman) { env->check = 0; FreeToHeap(env); if (callback != NULL) { - (*callback)(fsys); + (*callback)(fieldSystem); return FALSE; } else { return TRUE; @@ -154,9 +154,9 @@ void DestroyScriptContext(ScriptContext *ctx) { FreeToHeap(ctx); } -void SetupScriptEngine(FieldSystem *fsys, ScriptEnvironment *env, u16 script, LocalMapObject *lastInteracted, void* a4) { +void SetupScriptEngine(FieldSystem *fieldSystem, ScriptEnvironment *env, u16 script, LocalMapObject *lastInteracted, void* a4) { u16 *varLastInteracted = FieldSysGetAttrAddrInternal(env, SCRIPTENV_SPECIAL_VAR_LAST_INTERACTED); - env->facingDirection = PlayerAvatar_GetFacingDirection(fsys->playerAvatar); + env->facingDirection = PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar); env->lastInteracted = lastInteracted; env->activeScriptNumber = script; env->unk_34 = a4; @@ -168,51 +168,51 @@ void SetupScriptEngine(FieldSystem *fsys, ScriptEnvironment *env, u16 script, Lo } } -ScriptContext *CreateScriptContext(FieldSystem *fsys, u16 script) { +ScriptContext *CreateScriptContext(FieldSystem *fieldSystem, u16 script) { ScriptContext *ctx = AllocFromHeap(HEAP_ID_FIELD, sizeof(ScriptContext)); GF_ASSERT(ctx != NULL); InitScriptContext(ctx, gScriptCmdTable, sNumScriptCmds); - SetUpScriptContextForMap(fsys, ctx, script, 0); + SetUpScriptContextForMap(fieldSystem, ctx, script, 0); return ctx; } -void SetUpScriptContextForMap(FieldSystem *fsys, ScriptContext *ctx, u16 scriptId, u32 unused_r3) { +void SetUpScriptContextForMap(FieldSystem *fieldSystem, ScriptContext *ctx, u16 scriptId, u32 unused_r3) { #pragma unused(unused_r3) u16 r6; - ctx->fsys = fsys; - r6 = LoadScriptsAndMessagesByMapId(fsys, ctx, scriptId); + ctx->fieldSystem = fieldSystem; + r6 = LoadScriptsAndMessagesByMapId(fieldSystem, ctx, scriptId); SetupBytecodeScript(ctx, ctx->mapScripts); ScriptRunByIndex(ctx, r6); - sub_0203FD68(ctx, fsys->taskman); + sub_0203FD68(ctx, fieldSystem->taskman); } -u16 LoadScriptsAndMessagesByMapId(FieldSystem *fsys, ScriptContext *ctx, u16 scriptId) { +u16 LoadScriptsAndMessagesByMapId(FieldSystem *fieldSystem, ScriptContext *ctx, u16 scriptId) { const struct ScriptBankMapping *mapping_p = sScriptBankMapping; int i; for (i = 0; i < NELEMS(sScriptBankMapping); i++) { if (scriptId >= mapping_p[i].scriptIdLo) { - LoadScriptsAndMessagesParameterized(fsys, ctx, mapping_p[i].scriptBank, mapping_p[i].msgBank); + LoadScriptsAndMessagesParameterized(fieldSystem, ctx, mapping_p[i].scriptBank, mapping_p[i].msgBank); return scriptId - mapping_p[i].scriptIdLo; } } if (scriptId >= 1) { - LoadScriptsAndMessagesForCurrentMap(fsys, ctx); + LoadScriptsAndMessagesForCurrentMap(fieldSystem, ctx); return scriptId - 1; } else { - LoadScriptsAndMessagesParameterized(fsys, ctx, NARC_scr_seq_scr_seq_0140_bin, NARC_msg_msg_0184_bin); + LoadScriptsAndMessagesParameterized(fieldSystem, ctx, NARC_scr_seq_scr_seq_0140_bin, NARC_msg_msg_0184_bin); return 0; } } -void LoadScriptsAndMessagesParameterized(FieldSystem *fsys, ScriptContext *ctx, int scriptBank, u32 msgBank) { +void LoadScriptsAndMessagesParameterized(FieldSystem *fieldSystem, ScriptContext *ctx, int scriptBank, u32 msgBank) { ctx->mapScripts = AllocAndReadWholeNarcMemberByIdPair(NARC_fielddata_script_scr_seq, scriptBank, HEAP_ID_FIELD); ctx->msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, msgBank, HEAP_ID_FIELD); } -void LoadScriptsAndMessagesForCurrentMap(FieldSystem *fsys, ScriptContext *ctx) { - ctx->mapScripts = LoadScriptsForCurrentMap(fsys->location->mapId); - ctx->msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, GetCurrentMapMessageBank(fsys->location->mapId), HEAP_ID_FIELD); +void LoadScriptsAndMessagesForCurrentMap(FieldSystem *fieldSystem, ScriptContext *ctx) { + ctx->mapScripts = LoadScriptsForCurrentMap(fieldSystem->location->mapId); + ctx->msgdata = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, GetCurrentMapMessageBank(fieldSystem->location->mapId), HEAP_ID_FIELD); } void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnvField field) { @@ -320,16 +320,16 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv } } -void* FieldSysGetAttrAddr(FieldSystem *fsys, enum ScriptEnvField field) { - ScriptEnvironment *unk = TaskManager_GetEnv(fsys->taskman); +void* FieldSysGetAttrAddr(FieldSystem *fieldSystem, enum ScriptEnvField field) { + ScriptEnvironment *unk = TaskManager_GetEnv(fieldSystem->taskman); GF_ASSERT(unk != NULL); GF_ASSERT(unk->check == Unk80_10_C_MAGIC); return FieldSysGetAttrAddrInternal(unk, field); } -void sub_0204031C(FieldSystem *fsys) { - ScriptEnvironment *unk = TaskManager_GetEnv(fsys->taskman); - if (sub_0203BC10(fsys) == TRUE) { +void sub_0204031C(FieldSystem *fieldSystem) { + ScriptEnvironment *unk = TaskManager_GetEnv(fieldSystem->taskman); + if (sub_0203BC10(fieldSystem) == TRUE) { unk->scrctx_end_cb = sub_0203BD64; } } @@ -347,27 +347,27 @@ u32 GetCurrentMapMessageBank(u32 mapno) { return MapHeader_GetMsgBank(mapno); } -u16 *GetVarPointer(FieldSystem *fsys, u16 varIdx) { - SaveVarsFlags *state = Save_VarsFlags_Get(fsys->savedata); +u16 *GetVarPointer(FieldSystem *fieldSystem, u16 varIdx) { + SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->savedata); if (varIdx < VAR_BASE) { return NULL; } else if (varIdx < SPECIAL_VAR_BASE) { return GetVarAddr(state, varIdx); } else { - return FieldSysGetAttrAddr(fsys, (enum ScriptEnvField)(SCRIPTENV_SPECIAL_VAR_8000 + varIdx - SPECIAL_VAR_BASE)); + return FieldSysGetAttrAddr(fieldSystem, (enum ScriptEnvField)(SCRIPTENV_SPECIAL_VAR_8000 + varIdx - SPECIAL_VAR_BASE)); } } -u16 VarGet(FieldSystem *fsys, u16 varIdx) { - u16 *ptr = GetVarPointer(fsys, varIdx); +u16 VarGet(FieldSystem *fieldSystem, u16 varIdx) { + u16 *ptr = GetVarPointer(fieldSystem, varIdx); if (ptr != NULL) { varIdx = *ptr; } return varIdx; } -BOOL VarSet(FieldSystem *fsys, u16 varIdx, u16 value) { - u16 *ptr = GetVarPointer(fsys, varIdx); +BOOL VarSet(FieldSystem *fieldSystem, u16 varIdx, u16 value) { + u16 *ptr = GetVarPointer(fieldSystem, varIdx); if (ptr == NULL) { return FALSE; } @@ -375,47 +375,47 @@ BOOL VarSet(FieldSystem *fsys, u16 varIdx, u16 value) { return TRUE; } -u16 VarGetObjectEventGraphicsId(FieldSystem *fsys, u16 varobjId) { +u16 VarGetObjectEventGraphicsId(FieldSystem *fieldSystem, u16 varobjId) { GF_ASSERT(varobjId < NUM_OBJ_GFX_VARS); - return VarGet(fsys, VAR_OBJ_GFX_BASE + varobjId); + return VarGet(fieldSystem, VAR_OBJ_GFX_BASE + varobjId); } -BOOL FlagGet(FieldSystem *fsys, u16 flagId) { - return CheckFlagInArray(Save_VarsFlags_Get(fsys->savedata), flagId); +BOOL FlagGet(FieldSystem *fieldSystem, u16 flagId) { + return CheckFlagInArray(Save_VarsFlags_Get(fieldSystem->savedata), flagId); } -void FlagSet(FieldSystem *fsys, u16 flagId) { - return SetFlagInArray(Save_VarsFlags_Get(fsys->savedata), flagId); +void FlagSet(FieldSystem *fieldSystem, u16 flagId) { + return SetFlagInArray(Save_VarsFlags_Get(fieldSystem->savedata), flagId); } -void FlagClear(FieldSystem *fsys, u16 flagId) { - return ClearFlagInArray(Save_VarsFlags_Get(fsys->savedata), flagId); +void FlagClear(FieldSystem *fieldSystem, u16 flagId) { + return ClearFlagInArray(Save_VarsFlags_Get(fieldSystem->savedata), flagId); } -void ClearTempFieldEventData(FieldSystem *fsys) { +void ClearTempFieldEventData(FieldSystem *fieldSystem) { u8 *flags; u16 *vars; - SaveVarsFlags *state = Save_VarsFlags_Get(fsys->savedata); + SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->savedata); flags = GetFlagAddr(state, MAPTEMP_FLAG_BASE); memset(flags, 0, NUM_MAPTEMP_FLAGS / 8); vars = GetVarAddr(state, TEMP_VAR_BASE); memset(vars, 0, NUM_TEMP_VARS * 2); } -void ClearDailyFlags(FieldSystem *fsys) { +void ClearDailyFlags(FieldSystem *fieldSystem) { u8 *flags; - SaveVarsFlags *state = Save_VarsFlags_Get(fsys->savedata); + SaveVarsFlags *state = Save_VarsFlags_Get(fieldSystem->savedata); flags = GetFlagAddr(state, DAILY_FLAG_BASE); memset(flags, 0, NUM_DAILY_FLAGS / 8); } -void FieldMoveArgsSet(FieldSystem *fsys, u16 v8000, u16 v8001, u16 v8002, u16 v8003) { - *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8000) = v8000; - *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8001) = v8001; - *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8002) = v8002; - *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8003) = v8003; +void FieldMoveArgsSet(FieldSystem *fieldSystem, u16 v8000, u16 v8001, u16 v8002, u16 v8003) { + *(u16 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8000) = v8000; + *(u16 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8001) = v8001; + *(u16 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8002) = v8002; + *(u16 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8003) = v8003; } u16 ScriptNumToTrainerNum(u16 script) { @@ -505,7 +505,7 @@ BOOL GetHiddenItemParams(ScriptEnvironment *env, u16 script) { return TRUE; } -HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fsys, HeapID heapId) { +HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fieldSystem, HeapID heapId) { HiddenItemResponse *ret; const BG_EVENT *bgEvents; int i; @@ -519,7 +519,7 @@ HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fsys, HeapID hea int bottom; j = 0; - num_bgs = Field_GetNumBgEvents(fsys); + num_bgs = Field_GetNumBgEvents(fieldSystem); num_bgs++; ret = AllocFromHeap(heapId, num_bgs * sizeof(HiddenItemResponse)); if (num_bgs == 1) { @@ -528,15 +528,15 @@ HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fsys, HeapID hea ret[0].y = -1; return ret; } - bgEvents = Field_GetBgEvents(fsys); + bgEvents = Field_GetBgEvents(fieldSystem); if (bgEvents == NULL) { ret[0].unk4 = 0xFF; ret[0].x = -1; ret[0].y = -1; return ret; } - x = GetPlayerXCoord(fsys->playerAvatar); - y = GetPlayerYCoord(fsys->playerAvatar); + x = GetPlayerXCoord(fieldSystem->playerAvatar); + y = GetPlayerYCoord(fieldSystem->playerAvatar); left = x - 17; right = x + 17; top = y - 17; @@ -551,7 +551,7 @@ HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fsys, HeapID 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(fsys, HiddenItemScriptNoToFlagId(bgEvents[i].scr))) { + && !FlagGet(fieldSystem, HiddenItemScriptNoToFlagId(bgEvents[i].scr))) { if (bgEvents[i].x >= left && bgEvents[i].x <= right && bgEvents[i].y >= top @@ -570,45 +570,45 @@ HiddenItemResponse* AllocAndFetchNearbyHiddenItems(FieldSystem *fsys, HeapID hea return ret; } -void RunInitScript(FieldSystem *fsys) { - StartMapLoadScript(fsys, _std_init); +void RunInitScript(FieldSystem *fieldSystem) { + StartMapLoadScript(fieldSystem, _std_init); } -void StartMapLoadScript(FieldSystem *fsys, u16 script) { - ScriptContext *ctx = CreateScriptContext(fsys, script); +void StartMapLoadScript(FieldSystem *fieldSystem, u16 script) { + ScriptContext *ctx = CreateScriptContext(fieldSystem, script); while (RunScriptCommand(ctx) == TRUE) {} DestroyScriptContext(ctx); } -BOOL TryStartMapScriptByType(FieldSystem *fsys, u8 type) { +BOOL TryStartMapScriptByType(FieldSystem *fieldSystem, u8 type) { u8 *header; u16 script; - if (fsys->unkAC != 0) { + if (fieldSystem->unkAC != 0) { return FALSE; } - header = MapEvents_GetScriptHeader(fsys); + header = MapEvents_GetScriptHeader(fieldSystem); if (header == NULL) { return FALSE; } - script = (type == 1) ? GetMapSceneScriptId(fsys, header, type) : GetMapLoadScriptId(header, type); + script = (type == 1) ? GetMapSceneScriptId(fieldSystem, header, type) : GetMapLoadScriptId(header, type); if (script == 0xFFFF) { return FALSE; } - (type == 1) ? StartMapSceneScript(fsys, script, NULL) : StartMapLoadScript(fsys, script); + (type == 1) ? StartMapSceneScript(fieldSystem, script, NULL) : StartMapLoadScript(fieldSystem, script); return TRUE; } -BOOL MapSceneScriptCheck(FieldSystem *fsys) { +BOOL MapSceneScriptCheck(FieldSystem *fieldSystem) { u8 *header; u16 script; - if (fsys->unkAC != 0) { + if (fieldSystem->unkAC != 0) { return FALSE; } - header = MapEvents_GetScriptHeader(fsys); + header = MapEvents_GetScriptHeader(fieldSystem); if (header == NULL) { return FALSE; } - script = GetMapSceneScriptId(fsys, header, 1); + script = GetMapSceneScriptId(fieldSystem, header, 1); return script != 0xFFFF; } @@ -624,7 +624,7 @@ u16 GetMapLoadScriptId(u8 *header, u8 type) { } } -u16 GetMapSceneScriptId(FieldSystem *fsys, u8 *header, u8 type) { +u16 GetMapSceneScriptId(FieldSystem *fieldSystem, u8 *header, u8 type) { u32 ofs; while (1) { if (header[0] == 0) { @@ -649,7 +649,7 @@ u16 GetMapSceneScriptId(FieldSystem *fsys, u8 *header, u8 type) { return 0xFFFF; } var2 = header[2] + (header[3] << 8); - if (VarGet(fsys, var1) == VarGet(fsys, var2)) { + if (VarGet(fieldSystem, var1) == VarGet(fieldSystem, var2)) { return header[4] + (header[5] << 8); } header += 6; diff --git a/src/game_clear.c b/src/game_clear.c index 68cdb9380..f656ee99c 100644 --- a/src/game_clear.c +++ b/src/game_clear.c @@ -83,24 +83,24 @@ static const BgTemplate sGameClearSaveBgTemplate = { }; BOOL Task_GameClear(TaskManager *taskman); -static void GameClearSave_InitGraphics(FieldSystem *fsys, GameClearWork *env); -static void GameClearSave_PrintSaving(FieldSystem *fsys, GameClearWork *env); +static void GameClearSave_InitGraphics(FieldSystem *fieldSystem, GameClearWork *env); +static void GameClearSave_PrintSaving(FieldSystem *fieldSystem, GameClearWork *env); static BOOL GameClearSave_IsPrintFinished(GameClearWork *env); static void sub_02052E70(GameClearWork *env); -static void GameClearSave_PrintSaveStatus(FieldSystem *fsys, GameClearWork *env, int a2); -static void GameClearSave_Free(FieldSystem *fsys, GameClearWork *env); +static void GameClearSave_PrintSaveStatus(FieldSystem *fieldSystem, GameClearWork *env, int a2); +static void GameClearSave_Free(FieldSystem *fieldSystem, GameClearWork *env); // Might be called as Lance escorts player out of Champion room and into // Hall of Fame? BOOL sub_0205298C(TaskManager *taskman) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskman); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); int *state = TaskManager_GetStatePtr(taskman); switch (*state) { case 0: - sub_0206DB58(taskman, fsys); - Fsys_ClearFollowingTrainer(fsys); - HealParty(SaveArray_Party_Get(fsys->savedata)); + sub_0206DB58(taskman, fieldSystem); + FieldSystem_ClearFollowingTrainer(fieldSystem); + HealParty(SaveArray_Party_Get(fieldSystem->savedata)); *state += 1; break; case 1: @@ -132,52 +132,52 @@ BOOL sub_0205298C(TaskManager *taskman) { return FALSE; } -static void AddHallOfFameEntry(FieldSystem *fsys, BOOL gameCleared) { +static void AddHallOfFameEntry(FieldSystem *fieldSystem, BOOL gameCleared) { int val; RTCDate date; - HALL_OF_FAME *hof = LoadHallOfFame(fsys->savedata, HEAP_ID_FIELD, &val); + HALL_OF_FAME *hof = LoadHallOfFame(fieldSystem->savedata, HEAP_ID_FIELD, &val); if (val != 1 || !gameCleared) { Save_HOF_Init(hof); } - Party *party = SaveArray_Party_Get(fsys->savedata); + Party *party = SaveArray_Party_Get(fieldSystem->savedata); GF_RTC_CopyDate(&date); Save_HOF_RecordParty(hof, party, &date); - SaveHallOfFame(fsys->savedata, hof); + SaveHallOfFame(fieldSystem->savedata, hof); FreeToHeap(hof); } // Launches the Hall of Fame Congratulations app if the player beat Lance. Saves // the game and launches the credits. static BOOL Task_GameClear(TaskManager *taskman) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskman); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); GameClearWork *env = TaskManager_GetEnv(taskman); int *state = TaskManager_GetStatePtr(taskman); switch (*state) { case 0: if (!env->vsTrainerRed) { - LaunchHOFCongratsApp(fsys, &env->hofCongratsArgs); + LaunchHOFCongratsApp(fieldSystem, &env->hofCongratsArgs); *state += 1; break; } - GameClearSave_InitGraphics(fsys, env); + GameClearSave_InitGraphics(fieldSystem, env); BeginNormalPaletteFade(3, 1, 1, RGB_BLACK, 8, 1, HEAP_ID_32); *state = 2; break; case 1: - if (!FieldSys_ApplicationIsRunning(fsys)) { + if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { CreateHeap(3, 4, 0x20000); - GameClearSave_InitGraphics(fsys, env); + GameClearSave_InitGraphics(fieldSystem, env); BeginNormalPaletteFade(3, 1, 1, RGB_BLACK, 8, 1, HEAP_ID_32); *state += 1; } break; case 2: if (IsPaletteFadeFinished()) { - if (!Save_FileDoesNotBelongToPlayer(fsys->savedata)) { - GameClearSave_PrintSaving(fsys, env); + if (!Save_FileDoesNotBelongToPlayer(fieldSystem->savedata)) { + GameClearSave_PrintSaving(fieldSystem, env); *state += 1; break; } @@ -190,13 +190,13 @@ static BOOL Task_GameClear(TaskManager *taskman) { } break; case 4: - HealParty(SaveArray_Party_Get(fsys->savedata)); - int writeStatus = SaveGameNormal(fsys->savedata); + HealParty(SaveArray_Party_Get(fieldSystem->savedata)); + int writeStatus = SaveGameNormal(fieldSystem->savedata); if (!env->vsTrainerRed) { - AddHallOfFameEntry(fsys, env->gameCleared); + AddHallOfFameEntry(fieldSystem, env->gameCleared); } sub_02052E70(env); - GameClearSave_PrintSaveStatus(fsys, env, writeStatus); + GameClearSave_PrintSaveStatus(fieldSystem, env, writeStatus); *state += 1; break; case 5: @@ -237,14 +237,14 @@ static BOOL Task_GameClear(TaskManager *taskman) { break; case 10: if (IsPaletteFadeFinished()) { - GameClearSave_Free(fsys, env); + GameClearSave_Free(fieldSystem, env); Sound_SetMasterVolume(127); - LaunchCreditsApp(fsys, &env->creditsArgs); + LaunchCreditsApp(fieldSystem, &env->creditsArgs); *state += 1; } break; case 11: - if (!FieldSys_ApplicationIsRunning(fsys)) { + if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { FreeToHeap(env); DestroyHeap(HEAP_ID_4); OS_ResetSystem(0); @@ -258,32 +258,32 @@ static BOOL Task_GameClear(TaskManager *taskman) { // Marks the game as cleared and launches Hall of Fame Congratulations and // Credits. void CallTask_GameClear(TaskManager *taskman, u16 vsTrainerRed) { - FieldSystem *fsys; + FieldSystem *fieldSystem; GameClearWork *env; SaveVarsFlags *varsFlags; Location *dynamicWarp; Location *spawnWarp; PlayerProfile *profile; - fsys = TaskManager_GetFieldSystem(taskman); + fieldSystem = TaskManager_GetFieldSystem(taskman); env = AllocFromHeap(HEAP_ID_32, sizeof(GameClearWork)); - varsFlags = Save_VarsFlags_Get(fsys->savedata); - profile = Save_PlayerData_GetProfileAddr(fsys->savedata); - dynamicWarp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fsys->savedata)); - spawnWarp = LocalFieldData_GetSpecialSpawnWarpPtr(Save_LocalFieldData_Get(fsys->savedata)); + varsFlags = Save_VarsFlags_Get(fieldSystem->savedata); + profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata); + dynamicWarp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->savedata)); + spawnWarp = LocalFieldData_GetSpecialSpawnWarpPtr(Save_LocalFieldData_Get(fieldSystem->savedata)); env->gameCleared = CheckGameClearFlag(varsFlags); - env->hofCongratsArgs.profile = Save_PlayerData_GetProfileAddr(fsys->savedata); - env->hofCongratsArgs.party = SaveArray_Party_Get(fsys->savedata); - env->hofCongratsArgs.igt = Save_PlayerData_GetIGTAddr(fsys->savedata); - env->creditsArgs.gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fsys->savedata)); + env->hofCongratsArgs.profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata); + env->hofCongratsArgs.party = SaveArray_Party_Get(fieldSystem->savedata); + env->hofCongratsArgs.igt = Save_PlayerData_GetIGTAddr(fieldSystem->savedata); + env->creditsArgs.gender = PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(fieldSystem->savedata)); env->creditsArgs.gameCleared = CheckGameClearFlag(varsFlags); env->vsTrainerRed = vsTrainerRed; if (!CheckGameClearFlag(varsFlags)) { - FieldSys_SetGameClearTime(fsys); + FieldSystem_SetGameClearTime(fieldSystem); } - SaveArray_Party_Get(fsys->savedata); + SaveArray_Party_Get(fieldSystem->savedata); LocationData_BackUp(dynamicWarp); LocationData_Restore(spawnWarp); SetFlag966(varsFlags); @@ -291,12 +291,12 @@ void CallTask_GameClear(TaskManager *taskman, u16 vsTrainerRed) { PlayerProfile_SetGameClearFlag(profile); if (!env->vsTrainerRed) { - GameStats_Inc(Save_GameStats_Get(fsys->savedata), 74); + GameStats_Inc(Save_GameStats_Get(fieldSystem->savedata), 74); } TaskManager_Call(taskman, Task_GameClear, env); } -static void GameClearSave_InitGraphics(FieldSystem *fsys, GameClearWork *env) { +static void GameClearSave_InitGraphics(FieldSystem *fieldSystem, GameClearWork *env) { env->bgConfig = BgConfig_Alloc(HEAP_ID_FIELD); env->windowText = NULL; env->waitingIcon = NULL; @@ -311,8 +311,8 @@ static void GameClearSave_InitGraphics(FieldSystem *fsys, GameClearWork *env) { BgCommitTilemapBufferToVram(env->bgConfig, 3); } -static void GameClearSave_PrintSaving(FieldSystem *fsys, GameClearWork *env) { - OPTIONS *options = Save_PlayerData_GetOptionsAddr(fsys->savedata); +static void GameClearSave_PrintSaving(FieldSystem *fieldSystem, GameClearWork *env) { + OPTIONS *options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); env->windowText = ReadMsgData_NewNarc_NewString(NARC_msgdata_msg, NARC_msg_msg_0040_bin, msg_0040_00015, HEAP_ID_32); sub_0205B514(env->bgConfig, &env->window, 3); sub_0205B564(&env->window, options); @@ -330,23 +330,23 @@ static void sub_02052E70(GameClearWork *env) { sub_0205B5A8(&env->window); } -static void GameClearSave_PrintSaveStatus(FieldSystem *fsys, GameClearWork *env, int writeStatus) { +static void GameClearSave_PrintSaveStatus(FieldSystem *fieldSystem, GameClearWork *env, int writeStatus) { MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0040_bin, HEAP_ID_4); if (writeStatus == 2) { MessageFormat *msgFmt = MessageFormat_New(HEAP_ID_4); - BufferPlayersName(msgFmt, 0, Save_PlayerData_GetProfileAddr(fsys->savedata)); + BufferPlayersName(msgFmt, 0, Save_PlayerData_GetProfileAddr(fieldSystem->savedata)); env->windowText = ReadMsgData_ExpandPlaceholders(msgFmt, msgData, msg_0040_00016, HEAP_ID_4); MessageFormat_Delete(msgFmt); } else { env->windowText = NewString_ReadMsgData(msgData, msg_0040_00018); } DestroyMsgData(msgData); - OPTIONS *options = Save_PlayerData_GetOptionsAddr(fsys->savedata); + OPTIONS *options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); env->printerId = sub_0205B5B4(&env->window, env->windowText, options, 1); } -static void GameClearSave_Free(FieldSystem *fsys, GameClearWork *env) { +static void GameClearSave_Free(FieldSystem *fieldSystem, GameClearWork *env) { if (env->windowText != NULL) { String_Delete(env->windowText); } diff --git a/src/get_egg.c b/src/get_egg.c index 3be2d5408..e181e7495 100644 --- a/src/get_egg.c +++ b/src/get_egg.c @@ -42,7 +42,7 @@ static u8 GetEggCyclesToSubtract(Party *party); static BOOL sub_0206CB88(const u16 *a0, const u16 *a1); static u8 ComputeCompatibilityBetweenBoxMons(BoxPokemon **parents); static u8 Save_Daycare_CalcCompatibilityInternal(Daycare *dayCare); -static u8 sub_0206CCD8(FieldSystem *fsys); +static u8 sub_0206CCD8(FieldSystem *fieldSystem); static u8 ConvertDaycareCompatibilityScore(u32 compatibility); static void sub_0206D038(Pokemon *mon, HeapID heapId); static BOOL Daycare_TryGetForcedInheritedIV(Daycare *dayCare, u8 *a1, u8 *a2); @@ -834,11 +834,11 @@ static const u16 _020FF490[] = { 1225, }; -static u8 sub_0206CCD8(FieldSystem *fsys) { +static u8 sub_0206CCD8(FieldSystem *fieldSystem) { int day, i; - day = Field_GetDay(fsys) + Field_GetMonth(fsys) * 100; - if (sub_02055670(fsys)) { + day = Field_GetDay(fieldSystem) + Field_GetMonth(fieldSystem) * 100; + if (sub_02055670(fieldSystem)) { return 255; } for (i = 0; i < NELEMS(_020FF490); i++) { @@ -849,7 +849,7 @@ static u8 sub_0206CCD8(FieldSystem *fsys) { return 255; } -BOOL HandleDaycareStep(Daycare *dayCare, Party *party, FieldSystem *fsys) { +BOOL HandleDaycareStep(Daycare *dayCare, Party *party, FieldSystem *fieldSystem) { u32 friendship; BoxPokemon *parents[2]; int cycle_ctr; @@ -873,13 +873,13 @@ BOOL HandleDaycareStep(Daycare *dayCare, Party *party, FieldSystem *fsys) { compat = Save_Daycare_CalcCompatibilityInternal(dayCare); if (compat > (LCRandom() * 100u / 0xFFFFu)) { GenerateEggPID(dayCare); - sub_0209316C(fsys); + sub_0209316C(fieldSystem); } } } cycle_ctr = Save_Daycare_GetEggCycleCounter(dayCare); Save_Daycare_SetEggCycleCounter(dayCare, cycle_ctr + 1); - if (cycle_ctr + 1 == sub_0206CCD8(fsys)) { + if (cycle_ctr + 1 == sub_0206CCD8(fieldSystem)) { Save_Daycare_SetEggCycleCounter(dayCare, 0); to_sub = GetEggCyclesToSubtract(party); for (i = 0; i < Party_GetCount(party); i++) { diff --git a/src/map_events.c b/src/map_events.c index d33307fc8..f9e0146b4 100644 --- a/src/map_events.c +++ b/src/map_events.c @@ -31,36 +31,36 @@ static void MapEvents_ReadFromNarc(MapEvents *events, u32 mapno) { ReadWholeNarcMemberByIdPair(events->event_data, NARC_fielddata_eventdata_zone_event, bank); } -void Field_InitMapObjectsFromZoneEventData(FieldSystem *fsys) { - u32 obj_count = fsys->mapEvents->num_object_events; - GF_ASSERT(fsys->mapEvents != NULL); +void Field_InitMapObjectsFromZoneEventData(FieldSystem *fieldSystem) { + u32 obj_count = fieldSystem->mapEvents->num_object_events; + GF_ASSERT(fieldSystem->mapEvents != NULL); if (obj_count != 0) { - InitMapObjectsFromEventTemplates(fsys->mapObjectMan, fsys->location->mapId, obj_count, fsys->mapEvents->object_events); + InitMapObjectsFromEventTemplates(fieldSystem->mapObjectMan, fieldSystem->location->mapId, obj_count, fieldSystem->mapEvents->object_events); } } -BG_EVENT *Field_GetBgEvents(FieldSystem *fsys) { - return fsys->mapEvents->bg_events; +BG_EVENT *Field_GetBgEvents(FieldSystem *fieldSystem) { + return fieldSystem->mapEvents->bg_events; } -u32 Field_GetNumBgEvents(const FieldSystem *fsys) { - return fsys->mapEvents->num_bg_events; +u32 Field_GetNumBgEvents(const FieldSystem *fieldSystem) { + return fieldSystem->mapEvents->num_bg_events; } -const WARP_EVENT *Field_GetWarpEventI(const FieldSystem *fsys, u32 warpno) { - MapEvents *events = fsys->mapEvents; - if (warpno >= fsys->mapEvents->num_warp_events) { +const WARP_EVENT *Field_GetWarpEventI(const FieldSystem *fieldSystem, u32 warpno) { + MapEvents *events = fieldSystem->mapEvents; + if (warpno >= fieldSystem->mapEvents->num_warp_events) { return NULL; } else { - return &fsys->mapEvents->warp_events[warpno]; + return &fieldSystem->mapEvents->warp_events[warpno]; } } -int Field_GetWarpEventAtXYPos(const FieldSystem *fsys, int x, int y) { +int Field_GetWarpEventAtXYPos(const FieldSystem *fieldSystem, int x, int y) { int i; - for (i = 0; i < fsys->mapEvents->num_warp_events; i++) { - if (x == fsys->mapEvents->warp_events[i].x && y == fsys->mapEvents->warp_events[i].y) { + for (i = 0; i < fieldSystem->mapEvents->num_warp_events; i++) { + if (x == fieldSystem->mapEvents->warp_events[i].x && y == fieldSystem->mapEvents->warp_events[i].y) { return i; } } @@ -68,26 +68,26 @@ int Field_GetWarpEventAtXYPos(const FieldSystem *fsys, int x, int y) { return -1; } -u32 Field_GetNumCoordEvents(const FieldSystem *fsys) { - return fsys->mapEvents->num_coord_events; +u32 Field_GetNumCoordEvents(const FieldSystem *fieldSystem) { + return fieldSystem->mapEvents->num_coord_events; } -const COORD_EVENT *Field_GetCoordEvents(const FieldSystem *fsys) { - return fsys->mapEvents->coord_events; +const COORD_EVENT *Field_GetCoordEvents(const FieldSystem *fieldSystem) { + return fieldSystem->mapEvents->coord_events; } -u32 Field_GetNumObjectEvents(const FieldSystem *fsys) { - return fsys->mapEvents->num_object_events; +u32 Field_GetNumObjectEvents(const FieldSystem *fieldSystem) { + return fieldSystem->mapEvents->num_object_events; } -const ObjectEvent *Field_GetObjectEvents(const FieldSystem *fsys) { - return fsys->mapEvents->object_events; +const ObjectEvent *Field_GetObjectEvents(const FieldSystem *fieldSystem) { + return fieldSystem->mapEvents->object_events; } -BOOL Field_SetEventDefaultXYPos(FieldSystem *fsys, int id, u16 x, u16 y) { +BOOL Field_SetEventDefaultXYPos(FieldSystem *fieldSystem, int id, u16 x, u16 y) { int i; - ObjectEvent *objs = fsys->mapEvents->object_events; - u32 num_objs = fsys->mapEvents->num_object_events; + ObjectEvent *objs = fieldSystem->mapEvents->object_events; + u32 num_objs = fieldSystem->mapEvents->num_object_events; for (i = 0; i < num_objs; i++) { if (objs[i].id == id) { @@ -101,10 +101,10 @@ BOOL Field_SetEventDefaultXYPos(FieldSystem *fsys, int id, u16 x, u16 y) { return FALSE; } -BOOL Field_SetEventDefaultDirection(FieldSystem *fsys, int id, u16 dirn) { +BOOL Field_SetEventDefaultDirection(FieldSystem *fieldSystem, int id, u16 dirn) { int i; - ObjectEvent *objs = fsys->mapEvents->object_events; - u32 num_objs = fsys->mapEvents->num_object_events; + ObjectEvent *objs = fieldSystem->mapEvents->object_events; + u32 num_objs = fieldSystem->mapEvents->num_object_events; for (i = 0; i < num_objs; i++) { if (objs[i].id == id) { @@ -117,10 +117,10 @@ BOOL Field_SetEventDefaultDirection(FieldSystem *fsys, int id, u16 dirn) { return FALSE; } -BOOL Field_SetEventDefaultMovement(FieldSystem *fsys, int id, u16 mvt) { +BOOL Field_SetEventDefaultMovement(FieldSystem *fieldSystem, int id, u16 mvt) { int i; - ObjectEvent *objs = fsys->mapEvents->object_events; - u32 num_objs = fsys->mapEvents->num_object_events; + ObjectEvent *objs = fieldSystem->mapEvents->object_events; + u32 num_objs = fieldSystem->mapEvents->num_object_events; for (i = 0; i < num_objs; i++) { if (objs[i].id == id) { @@ -133,15 +133,15 @@ BOOL Field_SetEventDefaultMovement(FieldSystem *fsys, int id, u16 mvt) { return FALSE; } -BOOL Field_SetWarpXYPos(FieldSystem *fsys, int warpno, u16 x, u16 y) { - WARP_EVENT *warps = fsys->mapEvents->warp_events; +BOOL Field_SetWarpXYPos(FieldSystem *fieldSystem, int warpno, u16 x, u16 y) { + WARP_EVENT *warps = fieldSystem->mapEvents->warp_events; warps[warpno].x = x; warps[warpno].y = y; return TRUE; } -BOOL Field_SetBgEventXYPos(FieldSystem *fsys, int bgno, u32 x, u32 y) { - BG_EVENT *bgs = Field_GetBgEvents(fsys); +BOOL Field_SetBgEventXYPos(FieldSystem *fieldSystem, int bgno, u32 x, u32 y) { + BG_EVENT *bgs = Field_GetBgEvents(fieldSystem); bgs[bgno].x = x; bgs[bgno].y = y; return TRUE; @@ -194,8 +194,8 @@ void WildEncounters_ReadFromNarc(ENC_DATA *encData, u32 mapno) { } } -ENC_DATA *MapEvents_GetLoadedEncTable(FieldSystem *fsys) { - return &fsys->mapEvents->wildEncounters; +ENC_DATA *MapEvents_GetLoadedEncTable(FieldSystem *fieldSystem) { + return &fieldSystem->mapEvents->wildEncounters; } static void MapScriptHeader_ReadFromNarc(MapEvents *events, u32 mapno) { @@ -205,7 +205,7 @@ static void MapScriptHeader_ReadFromNarc(MapEvents *events, u32 mapno) { ReadWholeNarcMemberByIdPair(events->script_header, NARC_fielddata_script_scr_seq, bank); } -u8 *MapEvents_GetScriptHeader(FieldSystem *fsys) { - GF_ASSERT(fsys->mapEvents != NULL); - return fsys->mapEvents->script_header; +u8 *MapEvents_GetScriptHeader(FieldSystem *fieldSystem) { + GF_ASSERT(fieldSystem->mapEvents != NULL); + return fieldSystem->mapEvents->script_header; } diff --git a/src/npc_trade.c b/src/npc_trade.c index 17f8abf1b..65cf0c075 100644 --- a/src/npc_trade.c +++ b/src/npc_trade.c @@ -48,7 +48,7 @@ void NPCTradeApp_Delete(NPCTradeAppData *work) { FreeToHeap(work); } -void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fsys, u8 tradeno, u8 level, u16 mapno) { +void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fieldSystem, u8 tradeno, u8 level, u16 mapno) { Party *party; Pokemon *mon; NPCTrade *trade_dat; @@ -60,8 +60,8 @@ void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fsys, u8 tradeno, u8 level, u16 ma mon = AllocMonZeroed(HEAP_ID_FIELD); trade_dat = GfGfxLoader_LoadFromNarc(NARC_a_1_1_2, tradeno, FALSE, HEAP_ID_FIELD, TRUE); _CreateTradeMon(mon, trade_dat, level, tradeno, mapno, 7, HEAP_ID_FIELD); - UpdatePokedexWithReceivedSpecies(fsys->savedata, mon); - party = SaveArray_Party_Get(fsys->savedata); + UpdatePokedexWithReceivedSpecies(fieldSystem->savedata, mon); + party = SaveArray_Party_Get(fieldSystem->savedata); Party_AddMon(party, mon); if (tradeno == 7) { kenya = Party_GetMonByIndex(party, Party_GetCount(party) - 1); @@ -95,14 +95,14 @@ Mail *NPCTrade_MakeKenyaMail(void) { return mail; } -int NPCTrade_CanGiveUpLoanMon(FieldSystem *fsys, u8 tradeno, u8 idx) { +int NPCTrade_CanGiveUpLoanMon(FieldSystem *fieldSystem, u8 tradeno, u8 idx) { Party *party; Pokemon *mon, *cur_poke; u8 capsule; u16 heldItem; int i, n, party_count; - party = SaveArray_Party_Get(fsys->savedata); + party = SaveArray_Party_Get(fieldSystem->savedata); mon = Party_GetMonByIndex(party, idx); if (!MonIsInGameTradePoke(mon, tradeno)) { return 1; @@ -145,25 +145,25 @@ int NPCTradeApp_GetUnusedFlag(NPCTradeAppData *work) { return work->trade_dat->unk_50; } -void NPCTrade_ReceiveMonToSlot(FieldSystem *fsys, NPCTradeAppData *work, int slot) { - Party_SafeCopyMonToSlot_ResetUnkSub(SaveArray_Party_Get(fsys->savedata), slot, work->mon); - UpdatePokedexWithReceivedSpecies(fsys->savedata, work->mon); +void NPCTrade_ReceiveMonToSlot(FieldSystem *fieldSystem, NPCTradeAppData *work, int slot) { + Party_SafeCopyMonToSlot_ResetUnkSub(SaveArray_Party_Get(fieldSystem->savedata), slot, work->mon); + UpdatePokedexWithReceivedSpecies(fieldSystem->savedata, work->mon); } -void NPCTrade_CreateTradeAnim(FieldSystem *fsys, NPCTradeAppData *work, int slot, TRADE_ANIM_WORK *anim_work, Pokemon *my_mon_buf, Pokemon *trade_mon_buf) { +void NPCTrade_CreateTradeAnim(FieldSystem *fieldSystem, NPCTradeAppData *work, int slot, TRADE_ANIM_WORK *anim_work, Pokemon *my_mon_buf, Pokemon *trade_mon_buf) { Pokemon *my_poke; u32 time_of_day; - my_poke = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); - _CreateTradeMon(work->mon, work->trade_dat, GetMonData(my_poke, MON_DATA_LEVEL, NULL), work->tradeno, fsys->location->mapId, 1, work->heapId); + my_poke = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); + _CreateTradeMon(work->mon, work->trade_dat, GetMonData(my_poke, MON_DATA_LEVEL, NULL), work->tradeno, fieldSystem->location->mapId, 1, work->heapId); CopyPokemonToPokemon(my_poke, my_mon_buf); CopyPokemonToPokemon(work->mon, trade_mon_buf); anim_work->my_boxmon = Mon_GetBoxMon(my_mon_buf); anim_work->trade_boxmon = Mon_GetBoxMon(trade_mon_buf); anim_work->trade_profile = work->profile; anim_work->is_ingame = 1; - anim_work->options = Save_PlayerData_GetOptionsAddr(fsys->savedata); - time_of_day = Field_GetTimeOfDay(fsys); + anim_work->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); + time_of_day = Field_GetTimeOfDay(fieldSystem); if (time_of_day == RTC_TIMEOFDAY_MORN || time_of_day == RTC_TIMEOFDAY_DAY) { anim_work->time_of_day = 0; } else if (time_of_day == RTC_TIMEOFDAY_EVE) { diff --git a/src/overlay_01_02204ED8.c b/src/overlay_01_02204ED8.c index ac36c74e6..d74adef55 100644 --- a/src/overlay_01_02204ED8.c +++ b/src/overlay_01_02204ED8.c @@ -89,24 +89,24 @@ const s8 ov01_0220969A[][5] = { { 0, 1, 0, 1, -1}, }; -void ov01_02204ED8(FieldSystem *fsys, u16 *varPointer) { +void ov01_02204ED8(FieldSystem *fieldSystem, u16 *varPointer) { u16 **didHeadbuttStartBattle = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(didHeadbuttStartBattle)); *didHeadbuttStartBattle = varPointer; *varPointer = FALSE; - TaskManager_Call(fsys->taskman, ov01_02204EFC, didHeadbuttStartBattle); + TaskManager_Call(fieldSystem->taskman, ov01_02204EFC, didHeadbuttStartBattle); } static BOOL ov01_02204EFC(TaskManager *taskManager) { UnkStruct_02204EFC *unk4; - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); u16 **didHeadbuttStartBattle = TaskManager_GetEnv(taskManager); - unk4 = AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_a_2_5_2, fsys->location->mapId, HEAP_ID_FIELD); + unk4 = AllocAtEndAndReadWholeNarcMemberByIdPair(NARC_a_2_5_2, fieldSystem->location->mapId, HEAP_ID_FIELD); if (unk4->unk00 != 0 || unk4->unk02 != 0) { BattleSetup *setup; u32 x; u32 y; - ov01_022050F8(fsys, &x, &y); - u32 trainerId = PlayerProfile_GetTrainerID(Save_PlayerData_GetProfileAddr(fsys->savedata)); + ov01_022050F8(fieldSystem, &x, &y); + u32 trainerId = PlayerProfile_GetTrainerID(Save_PlayerData_GetProfileAddr(fieldSystem->savedata)); s32 unk0 = ov01_02204FE0(unk4->unk00, unk4->unk02, trainerId, x, y, unk4->unk4c); if (unk0 == -1) { FreeToHeap(unk4); @@ -126,11 +126,11 @@ static BOOL ov01_02204EFC(TaskManager *taskManager) { FreeToHeap(didHeadbuttStartBattle); return TRUE; } - if (ov02_02247374(fsys, &setup, unk2)) { + if (ov02_02247374(fieldSystem, &setup, unk2)) { **didHeadbuttStartBattle = TRUE; FreeToHeap(unk4); FreeToHeap(didHeadbuttStartBattle); - sub_02050B90(fsys, taskManager, setup); + sub_02050B90(fieldSystem, taskManager, setup); return FALSE; } } @@ -177,11 +177,11 @@ static s8 ov01_02205074(u8 a0, u8 a1, u32 trainerId) { return unk7; } -static void ov01_022050F8(FieldSystem *fsys, u32 *x, u32 *y) { +static void ov01_022050F8(FieldSystem *fieldSystem, u32 *x, u32 *y) { u32 inFrontX, inFrontY; - PlayerAvatar_GetCoordsInFront(fsys->playerAvatar, &inFrontX, &inFrontY); - if (FollowingPokemon_IsActive(fsys)) { - LocalMapObject *object = FollowingPokemon_GetMapObject(fsys); + PlayerAvatar_GetCoordsInFront(fieldSystem->playerAvatar, &inFrontX, &inFrontY); + if (FollowingPokemon_IsActive(fieldSystem)) { + LocalMapObject *object = FollowingPokemon_GetMapObject(fieldSystem); u32 followingMonX = MapObject_GetCurrentX(object); u32 followingMonY = MapObject_GetCurrentY(object); if (inFrontX == followingMonX && inFrontY == followingMonY) { @@ -195,23 +195,23 @@ static void ov01_022050F8(FieldSystem *fsys, u32 *x, u32 *y) { } BOOL ScrCmd_795(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 x = ScriptGetVar(ctx); u8 y = ScriptGetVar(ctx); - Window **moneyBox = FieldSysGetAttrAddr(fsys, SCRIPTENV_MONEY_BOX); - *moneyBox = ov01_021EED60(ctx->fsys, x, y); + Window **moneyBox = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MONEY_BOX); + *moneyBox = ov01_021EED60(ctx->fieldSystem, x, y); return FALSE; } BOOL ScrCmd_796(ScriptContext *ctx) { - Window **moneyBox = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MONEY_BOX); + Window **moneyBox = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MONEY_BOX); ov01_021EEE30(*moneyBox); return FALSE; } // Unused BOOL ScrCmd_797(ScriptContext *ctx) { - Window **moneyBox = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MONEY_BOX); - ov01_021EEE44(ctx->fsys, *moneyBox); + Window **moneyBox = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MONEY_BOX); + ov01_021EEE44(ctx->fieldSystem, *moneyBox); return FALSE; } diff --git a/src/overlay_22.c b/src/overlay_22.c index 934d01446..40bb2b88f 100644 --- a/src/overlay_22.c +++ b/src/overlay_22.c @@ -6,62 +6,62 @@ #include "scrcmd.h" #include "overlay_01_021EDAFC.h" -extern Window *ov01_021EEC00(struct FieldSystem *fsys, u8 type, u8 x, u8 y); +extern Window *ov01_021EEC00(struct FieldSystem *fieldSystem, u8 type, u8 x, u8 y); BOOL ScrCmd_116(ScriptContext *ctx) { u8 type = ScriptReadByte(ctx); u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - Window **window = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_POINTS_BOX); - *window = ov01_021EEC00(ctx->fsys, type, x, y); + Window **window = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_POINTS_BOX); + *window = ov01_021EEC00(ctx->fieldSystem, type, x, y); return FALSE; } BOOL ScrCmd_117(ScriptContext *ctx) { - Window **window = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_POINTS_BOX); + Window **window = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_POINTS_BOX); ov01_021EEC68(*window); return FALSE; } BOOL ScrCmd_118(ScriptContext *ctx) { u8 type = ScriptReadByte(ctx); - Window **window = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_POINTS_BOX); - ov01_021EEC7C(ctx->fsys, *window, type); + Window **window = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_POINTS_BOX); + ov01_021EEC7C(ctx->fieldSystem, *window, type); return FALSE; } BOOL ScrCmd_GetCoinAmount(ScriptContext *ctx) { u16 *ptr = ScriptGetVarPointer(ctx); - *ptr = CheckCoins(Save_PlayerData_GetCoinsAddr(ctx->fsys->savedata)); + *ptr = CheckCoins(Save_PlayerData_GetCoinsAddr(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_GiveCoins(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 amount = ScriptGetVar(ctx); - GiveCoins(Save_PlayerData_GetCoinsAddr(fsys->savedata), amount); + GiveCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata), amount); return FALSE; } BOOL ScrCmd_TakeCoins(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 amount = ScriptGetVar(ctx); - TakeCoins(Save_PlayerData_GetCoinsAddr(fsys->savedata), amount); + TakeCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata), amount); return FALSE; } BOOL ScrCmd_569(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *ptr = ScriptGetVarPointer(ctx); - TakeCoins(Save_PlayerData_GetCoinsAddr(fsys->savedata), *ptr); + TakeCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata), *ptr); return FALSE; } BOOL ScrCmd_CheckCoinsImmediate(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *ptr = ScriptGetVarPointer(ctx); u32 amount = ScriptReadWord(ctx); - u16 coins = CheckCoins(Save_PlayerData_GetCoinsAddr(fsys->savedata)); + u16 coins = CheckCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata)); if (coins < amount) { *ptr = FALSE; } else { @@ -71,10 +71,10 @@ BOOL ScrCmd_CheckCoinsImmediate(ScriptContext *ctx) { } BOOL ScrCmd_CheckCoinsVar(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *resultPtr = ScriptGetVarPointer(ctx); u16 *amountPtr = ScriptGetVarPointer(ctx); - u16 coins = CheckCoins(Save_PlayerData_GetCoinsAddr(fsys->savedata)); + u16 coins = CheckCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata)); if (coins < *amountPtr) { *resultPtr = FALSE; } else { @@ -84,32 +84,32 @@ BOOL ScrCmd_CheckCoinsVar(ScriptContext *ctx) { } BOOL ScrCmd_CheckGiveCoins(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *ptr = ScriptGetVarPointer(ctx); u16 amount = ScriptGetVar(ctx); - *ptr = CanGiveCoins(Save_PlayerData_GetCoinsAddr(fsys->savedata), amount); + *ptr = CanGiveCoins(Save_PlayerData_GetCoinsAddr(fieldSystem->savedata), amount); return FALSE; } BOOL ScrCmd_GiveAthletePoints(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 amount = ScriptGetVar(ctx); - SavePokeathlon_AddAthletePoints(Save_Pokeathlon_Get(fsys->savedata), amount); + SavePokeathlon_AddAthletePoints(Save_Pokeathlon_Get(fieldSystem->savedata), amount); return FALSE; } BOOL ScrCmd_TakeAthletePoints(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 amount = ScriptGetVar(ctx); - SavePokeathlon_SubAthletePoints(Save_Pokeathlon_Get(fsys->savedata), amount); + SavePokeathlon_SubAthletePoints(Save_Pokeathlon_Get(fieldSystem->savedata), amount); return FALSE; } BOOL ScrCmd_CheckAthletePoints(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *ptr = ScriptGetVarPointer(ctx); u16 amount = ScriptGetVar(ctx); - u32 points = SavePokeathlon_GetAthletePoints(Save_Pokeathlon_Get(fsys->savedata)); + u32 points = SavePokeathlon_GetAthletePoints(Save_Pokeathlon_Get(fieldSystem->savedata)); if (points < amount) { *ptr = FALSE; } else { diff --git a/src/overlay_26_022599D0.c b/src/overlay_26_022599D0.c index 0ea0f5192..1400667b0 100644 --- a/src/overlay_26_022599D0.c +++ b/src/overlay_26_022599D0.c @@ -2,13 +2,13 @@ #include "map_events.h" #include "overlay_26.h" -static LocalMapObject* ov26_02259A24(FieldSystem* fsys, LocalMapObject* a1, BOOL a2); +static LocalMapObject* ov26_02259A24(FieldSystem* fieldSystem, LocalMapObject* a1, BOOL a2); static void ov26_022599D0(LocalMapObject* last_talked, u16 movement) { sub_0205FC94(last_talked, movement); } -void ov26_022599D8(FieldSystem* fsys, LocalMapObject* last_talked) { +void ov26_022599D8(FieldSystem* fieldSystem, LocalMapObject* last_talked) { if (last_talked == NULL) { return; } @@ -26,15 +26,15 @@ void ov26_022599D8(FieldSystem* fsys, LocalMapObject* last_talked) { movement = 17; } - LocalMapObject* unk_lmo = ov26_02259A24(fsys, last_talked, TRUE); + LocalMapObject* unk_lmo = ov26_02259A24(fieldSystem, last_talked, TRUE); if (unk_lmo != NULL) { ov26_022599D0(unk_lmo, movement); } ov26_022599D0(last_talked, movement); } -static LocalMapObject* ov26_02259A24(FieldSystem* fsys, LocalMapObject* a1, BOOL a2) { - u32 num_events = Field_GetNumObjectEvents(fsys); +static LocalMapObject* ov26_02259A24(FieldSystem* fieldSystem, LocalMapObject* a1, BOOL a2) { + u32 num_events = Field_GetNumObjectEvents(fieldSystem); u16 script = MapObject_GetScript(a1); u32 trainer = ScriptNumToTrainerNum(script); @@ -43,7 +43,7 @@ static LocalMapObject* ov26_02259A24(FieldSystem* fsys, LocalMapObject* a1, BOOL } for (int i = 0; i < num_events; i++) { - LocalMapObject* object = GetMapObjectByID(fsys->mapObjectMan, i); + LocalMapObject* object = GetMapObjectByID(fieldSystem->mapObjectMan, i); if (object == NULL) { continue; } diff --git a/src/overlay_94.c b/src/overlay_94.c index f9b276744..b2af94f00 100644 --- a/src/overlay_94.c +++ b/src/overlay_94.c @@ -65,7 +65,7 @@ BOOL PartyMenu_AnimateIconFormChange(PartyMenuStruct* unkPtr) { GF_ASSERT(FALSE); break; } - Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(FieldSystem_GetSaveDataPtr(unkPtr->unk654->fsys)), mon); + Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(FieldSystem_GetSaveDataPtr(unkPtr->unk654->fieldSystem)), mon); work->state++; break; case 1: diff --git a/src/overlay_bug_contest.c b/src/overlay_bug_contest.c index c1f922273..b9b4bd61c 100644 --- a/src/overlay_bug_contest.c +++ b/src/overlay_bug_contest.c @@ -31,13 +31,13 @@ void BugContest_InitEncounters(BUGCONTEST *bugContest); void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest); u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *mon); -BUGCONTEST *BugContest_New(FieldSystem *fsys, u32 weekday) { +BUGCONTEST *BugContest_New(FieldSystem *fieldSystem, u32 weekday) { BUGCONTEST *bugContest; bugContest = (BUGCONTEST *)AllocFromHeap(HEAP_ID_3, sizeof(BUGCONTEST)); MI_CpuClear8(bugContest, sizeof(BUGCONTEST)); bugContest->heapId = HEAP_ID_3; - bugContest->saveData = fsys->savedata; + bugContest->saveData = fieldSystem->savedata; bugContest->sport_balls = 20; bugContest->mon = AllocMonZeroed(bugContest->heapId); bugContest->national_dex = Pokedex_GetNatDexFlag(Save_Pokedex_Get(bugContest->saveData)); @@ -45,7 +45,7 @@ BUGCONTEST *BugContest_New(FieldSystem *fsys, u32 weekday) { BugContest_BackUpParty(bugContest); BugContest_InitOpponents(bugContest); BugContest_InitEncounters(bugContest); - FieldSys_StartBugContestTimer(fsys); + FieldSystem_StartBugContestTimer(fieldSystem); return bugContest; } diff --git a/src/pal_park.c b/src/pal_park.c index 5cabb8853..4ada7c6d1 100644 --- a/src/pal_park.c +++ b/src/pal_park.c @@ -33,19 +33,19 @@ struct PalParkLocal { static struct PalParkLocal sPalParkLocalState; static void LoadMonPalParkStats(u16 species, u8* dest); -static void InitPalParkMonsData(FieldSystem* fsys, struct PalParkLocal* palpark); +static void InitPalParkMonsData(FieldSystem* fieldSystem, struct PalParkLocal* palpark); static int CountCaughtMons(struct PalParkLocal* palpark); static void SetNumStepsUntilNextEncounterCheck(struct PalParkLocal* palpark); static BOOL ShouldTryEncounter(struct PalParkLocal* palpark); -static enum PalParkEncounterType GetEncounterTypeAt(FieldSystem* fsys, int x, int z); -static BOOL TryEncounter(FieldSystem* fsys, struct PalParkLocal* palpark, int x, int z); -static BattleSetup* SetupEncounter(FieldSystem* fsys, struct PalParkLocal* palpark); -static void HandleBattleEnd(FieldSystem *fsys, BattleSetup *setup, struct PalParkLocal* palpark); +static enum PalParkEncounterType GetEncounterTypeAt(FieldSystem* fieldSystem, int x, int z); +static BOOL TryEncounter(FieldSystem* fieldSystem, struct PalParkLocal* palpark, int x, int z); +static BattleSetup* SetupEncounter(FieldSystem* fieldSystem, struct PalParkLocal* palpark); +static void HandleBattleEnd(FieldSystem *fieldSystem, BattleSetup *setup, struct PalParkLocal* palpark); static int CalcSpeciesScore(struct PalParkLocal* palpark); static u32 CalcTypesScore(struct PalParkLocal* palpark); static int CalcTimeScore(struct PalParkLocal* palpark); -void PalPark_ClearState(FieldSystem* fsys) { +void PalPark_ClearState(FieldSystem* fieldSystem) { s32 i; struct PalParkLocal* local = &sPalParkLocalState; for (i = 0; i < PARTY_SIZE; ++i) { @@ -53,16 +53,16 @@ void PalPark_ClearState(FieldSystem* fsys) { } } -void PalPark_InitFromSave(FieldSystem* fsys) { +void PalPark_InitFromSave(FieldSystem* fieldSystem) { MI_CpuClearFast(&sPalParkLocalState, sizeof sPalParkLocalState); - InitPalParkMonsData(fsys, &sPalParkLocalState); + InitPalParkMonsData(fieldSystem, &sPalParkLocalState); SetNumStepsUntilNextEncounterCheck(&sPalParkLocalState); sPalParkLocalState.timestamp = GF_RTC_DateTimeToSec(); } -void PalPark_StopClock(FieldSystem* fsys) { +void PalPark_StopClock(FieldSystem* fieldSystem) { struct PalParkLocal* local = &sPalParkLocalState; - GAME_STATS* stats = Save_GameStats_Get(fsys->savedata); + GAME_STATS* stats = Save_GameStats_Get(fieldSystem->savedata); s64 elapsed = GF_RTC_TimeDelta(local->timestamp, GF_RTC_DateTimeToSec()); if (elapsed < 1000) { local->timeRemainingFactor = 2 * (1000 - elapsed); @@ -72,34 +72,34 @@ void PalPark_StopClock(FieldSystem* fsys) { GameStats_AddSpecial(stats, GAME_STAT_UNK17); } -BOOL PalPark_TryEncounter(FieldSystem* fsys, int x, int z) { +BOOL PalPark_TryEncounter(FieldSystem* fieldSystem, int x, int z) { if (ShouldTryEncounter(&sPalParkLocalState) == TRUE) { - return TryEncounter(fsys, &sPalParkLocalState, x, z); + return TryEncounter(fieldSystem, &sPalParkLocalState, x, z); } return FALSE; } -BattleSetup* PalPark_SetupEncounter(FieldSystem* fsys) { - return SetupEncounter(fsys, &sPalParkLocalState); +BattleSetup* PalPark_SetupEncounter(FieldSystem* fieldSystem) { + return SetupEncounter(fieldSystem, &sPalParkLocalState); } -void PalPark_HandleBattleEnd(FieldSystem *fsys, BattleSetup *setup) { - return HandleBattleEnd(fsys, setup, &sPalParkLocalState); +void PalPark_HandleBattleEnd(FieldSystem *fieldSystem, BattleSetup *setup) { + return HandleBattleEnd(fieldSystem, setup, &sPalParkLocalState); } -int PalPark_CountMonsNotCaught(FieldSystem* fsys) { +int PalPark_CountMonsNotCaught(FieldSystem* fieldSystem) { return 6 - CountCaughtMons(&sPalParkLocalState); } -int PalPark_CalcSpeciesScore(FieldSystem* fsys) { +int PalPark_CalcSpeciesScore(FieldSystem* fieldSystem) { return CalcSpeciesScore(&sPalParkLocalState); } -int PalPark_CalcTimeScore(FieldSystem *fsys) { +int PalPark_CalcTimeScore(FieldSystem *fieldSystem) { return CalcTimeScore(&sPalParkLocalState); } -u32 PalPark_CalcTypesScore(FieldSystem *fsys) { +u32 PalPark_CalcTypesScore(FieldSystem *fieldSystem) { return CalcTypesScore(&sPalParkLocalState); } @@ -110,8 +110,8 @@ static void LoadMonPalParkStats(u16 species, u8* dest) { ReadFromNarcMemberByIdPair(dest, NARC_arc_ppark, 0, (species - 1) * 6, 6); } -static void InitPalParkMonsData(FieldSystem* fsys, struct PalParkLocal* palpark) { - struct MigratedPokemonSav* migrated = Save_MigratedPokemon_Get(fsys->savedata); +static void InitPalParkMonsData(FieldSystem* fieldSystem, struct PalParkLocal* palpark) { + struct MigratedPokemonSav* migrated = Save_MigratedPokemon_Get(fieldSystem->savedata); Pokemon* mon = AllocMonZeroed(HEAP_ID_4); u8 narc_data[6]; u16 species; @@ -157,8 +157,8 @@ static BOOL ShouldTryEncounter(struct PalParkLocal* palpark) { return FALSE; } -static enum PalParkEncounterType GetEncounterTypeAt(FieldSystem* fsys, int x, int z) { - int behavior = GetMetatileBehaviorAt(fsys, x, z); +static enum PalParkEncounterType GetEncounterTypeAt(FieldSystem* fieldSystem, int x, int z) { + int behavior = GetMetatileBehaviorAt(fieldSystem, x, z); int quadrant = (x < 32 ? 0 : 1); quadrant += (z < 32 ? 0 : 2); if (MetatileBehavior_IsEncounterGrass(behavior)) { @@ -170,10 +170,10 @@ static enum PalParkEncounterType GetEncounterTypeAt(FieldSystem* fsys, int x, in return PP_ENCTYPE_NONE; } -static BOOL TryEncounter(FieldSystem* fsys, struct PalParkLocal* palpark, int x, int z) { +static BOOL TryEncounter(FieldSystem* fieldSystem, struct PalParkLocal* palpark, int x, int z) { int i; int rnd, total_rate = 0; - enum PalParkEncounterType area = GetEncounterTypeAt(fsys, x, z); + enum PalParkEncounterType area = GetEncounterTypeAt(fieldSystem, x, z); if (area == PP_ENCTYPE_NONE) { return FALSE; @@ -219,7 +219,7 @@ static BOOL TryEncounter(FieldSystem* fsys, struct PalParkLocal* palpark, int x, return FALSE; } -static void HandleBattleEnd(FieldSystem *fsys, BattleSetup *setup, struct PalParkLocal* palpark) { +static void HandleBattleEnd(FieldSystem *fieldSystem, BattleSetup *setup, struct PalParkLocal* palpark) { switch (setup->winFlag) { case BATTLE_OUTCOME_MON_CAUGHT: palpark->caught_order[palpark->encounterIndex] = CountCaughtMons(palpark) + 1; @@ -231,11 +231,11 @@ static void HandleBattleEnd(FieldSystem *fsys, BattleSetup *setup, struct PalPar } } -static BattleSetup* SetupEncounter(FieldSystem* fsys, struct PalParkLocal* palpark) { +static BattleSetup* SetupEncounter(FieldSystem* fieldSystem, struct PalParkLocal* palpark) { Pokemon* mon = AllocMonZeroed(HEAP_ID_32); - struct MigratedPokemonSav* migratedMons = Save_MigratedPokemon_Get(fsys->savedata); - BattleSetup* ret = BattleSetup_New_PalPark(HEAP_ID_FIELD, PalPark_CountMonsNotCaught(fsys)); - BattleSetup_InitFromFsys(ret, fsys); + struct MigratedPokemonSav* migratedMons = Save_MigratedPokemon_Get(fieldSystem->savedata); + BattleSetup* ret = BattleSetup_New_PalPark(HEAP_ID_FIELD, PalPark_CountMonsNotCaught(fieldSystem)); + BattleSetup_InitFromFieldSystem(ret, fieldSystem); GetMigratedPokemonByIndex(migratedMons, palpark->encounterIndex, mon); BattleSetup_AddMonToParty(ret, mon, BATTLER_ENEMY); FreeToHeap(mon); diff --git a/src/save_local_field_data.c b/src/save_local_field_data.c index c46e6a278..f5e000985 100644 --- a/src/save_local_field_data.c +++ b/src/save_local_field_data.c @@ -121,20 +121,20 @@ struct SavedMapObjectList *Save_MapObjects_Get(SaveData *saveData) { return SaveArray_Get(saveData, SAVE_MAP_OBJECTS); } -void Fsys_SyncMapObjectsToSave(FieldSystem *fsys) { - struct SavedMapObjectList *unk = Save_MapObjects_Get(fsys->savedata); - Fsys_SyncMapObjectsToSaveEx(fsys, fsys->mapObjectMan, unk->subs, 64); +void FieldSystem_SyncMapObjectsToSave(FieldSystem *fieldSystem) { + struct SavedMapObjectList *unk = Save_MapObjects_Get(fieldSystem->savedata); + FieldSystem_SyncMapObjectsToSaveEx(fieldSystem, fieldSystem->mapObjectMan, unk->subs, 64); } -void Fsys_RestoreMapObjectsFromSave(FieldSystem *fsys) { - struct SavedMapObjectList *unk = Save_MapObjects_Get(fsys->savedata); +void FieldSystem_RestoreMapObjectsFromSave(FieldSystem *fieldSystem) { + struct SavedMapObjectList *unk = Save_MapObjects_Get(fieldSystem->savedata); struct SavedMapObject *follower = SaveMapObjects_SearchSpriteId(unk->subs, 64, SPRITE_FOLLOWER_MON_SHAYMIN_SKY); Pokemon *mon; int species; int form; if (follower != NULL && follower->objId == obj_partner_poke) { - mon = GetFirstAliveMonInParty_CrashIfNone(SaveArray_Party_Get(fsys->savedata)); + mon = GetFirstAliveMonInParty_CrashIfNone(SaveArray_Party_Get(fieldSystem->savedata)); species = GetMonData(mon, MON_DATA_SPECIES, NULL); form = GetMonData(mon, MON_DATA_FORM, NULL); if (species != SPECIES_SHAYMIN) { @@ -143,5 +143,5 @@ void Fsys_RestoreMapObjectsFromSave(FieldSystem *fsys) { follower->gfxId = SPRITE_FOLLOWER_MON_SHAYMIN; } } - MapObjectManager_RestoreFromSave(fsys->mapObjectMan, unk->subs, 64); + MapObjectManager_RestoreFromSave(fieldSystem->mapObjectMan, unk->subs, 64); } diff --git a/src/scrcmd_12.c b/src/scrcmd_12.c index 102ae3d8f..487377848 100644 --- a/src/scrcmd_12.c +++ b/src/scrcmd_12.c @@ -12,7 +12,7 @@ BOOL ScrCmd_MomGiftCheck(ScriptContext *ctx) { u16 sp; u16 *retPtr = ScriptGetVarPointer(ctx); - MomsSavings *momsSavings = SaveData_GetMomsSavingsAddr(ctx->fsys->savedata); + MomsSavings *momsSavings = SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata); if (sub_0202F224(momsSavings, 0, &sp) == 0) { *retPtr = FALSE; } else { @@ -22,16 +22,16 @@ BOOL ScrCmd_MomGiftCheck(ScriptContext *ctx) { } BOOL ScrCmd_PalParkAction(ScriptContext *ctx) { - SaveVarsFlags *script = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *script = Save_VarsFlags_Get(ctx->fieldSystem->savedata); u16 var0 = ScriptGetVar(ctx); if (var0 == 2) { Save_VarsFlags_SetPalParkSysFlag(script); - PalPark_ClearState(ctx->fsys); + PalPark_ClearState(ctx->fieldSystem); } else if (var0 == 0) { - PalPark_InitFromSave(ctx->fsys); + PalPark_InitFromSave(ctx->fieldSystem); } else if (var0 == 1) { Save_VarsFlags_ClearPalParkSysFlag(script); - PalPark_StopClock(ctx->fsys); + PalPark_StopClock(ctx->fieldSystem); } else { GF_ASSERT(0); } @@ -40,7 +40,7 @@ BOOL ScrCmd_PalParkAction(ScriptContext *ctx) { } BOOL ScrCmd_509(ScriptContext *ctx) { - struct MigratedPokemonSav *unkStruct = Save_MigratedPokemon_Get(ctx->fsys->savedata); + struct MigratedPokemonSav *unkStruct = Save_MigratedPokemon_Get(ctx->fieldSystem->savedata); Pokemon *mon = AllocMonZeroed(HEAP_ID_32); u16 *retPtr = ScriptGetVarPointer(ctx); if (sub_0202EC98(unkStruct) == PARTY_SIZE) { @@ -53,23 +53,23 @@ BOOL ScrCmd_509(ScriptContext *ctx) { } BOOL ScrCmd_510(ScriptContext *ctx) { - struct MigratedPokemonSav *unkStruct = Save_MigratedPokemon_Get(ctx->fsys->savedata); - PC_STORAGE *storage = GetStoragePCPointer(ctx->fsys->savedata); + struct MigratedPokemonSav *unkStruct = Save_MigratedPokemon_Get(ctx->fieldSystem->savedata); + PC_STORAGE *storage = GetStoragePCPointer(ctx->fieldSystem->savedata); Pokemon *mon = AllocMonZeroed(HEAP_ID_32); - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(ctx->fsys->savedata); - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); int i; for (i = 0; i < PARTY_SIZE; i++) { GetMigratedPokemonByIndex(unkStruct, i, mon); MonSetTrainerMemo(mon, profile, 2, 0, HEAP_ID_32); GF_ASSERT(PCStorage_PlaceMonInFirstEmptySlotInAnyBox(storage, Mon_GetBoxMon(mon))); - UpdatePokedexWithReceivedSpecies(ctx->fsys->savedata, mon); + UpdatePokedexWithReceivedSpecies(ctx->fieldSystem->savedata, mon); } FreeToHeap(mon); sub_0202EB74(unkStruct); - sub_02093070(ctx->fsys); + sub_02093070(ctx->fieldSystem); return FALSE; } @@ -79,18 +79,18 @@ BOOL ScrCmd_PalParkScoreGet(ScriptContext *ctx) { switch (var0) { case 0: - *retPtr = PalPark_CalcSpeciesScore(ctx->fsys); + *retPtr = PalPark_CalcSpeciesScore(ctx->fieldSystem); break; case 1: - *retPtr = PalPark_CalcTimeScore(ctx->fsys); + *retPtr = PalPark_CalcTimeScore(ctx->fieldSystem); break; case 2: - *retPtr = PalPark_CalcTypesScore(ctx->fsys); + *retPtr = PalPark_CalcTypesScore(ctx->fieldSystem); break; case 3: { - int val0 = PalPark_CalcTimeScore(ctx->fsys); - int val1 = PalPark_CalcSpeciesScore(ctx->fsys); - int val2 = PalPark_CalcTypesScore(ctx->fsys); + int val0 = PalPark_CalcTimeScore(ctx->fieldSystem); + int val1 = PalPark_CalcSpeciesScore(ctx->fieldSystem); + int val2 = PalPark_CalcTypesScore(ctx->fieldSystem); *retPtr = val1 + val2 + val0; break; } diff --git a/src/scrcmd_17.c b/src/scrcmd_17.c index e0acaf579..6b0335942 100644 --- a/src/scrcmd_17.c +++ b/src/scrcmd_17.c @@ -4,28 +4,28 @@ #include "sys_flags.h" BOOL ScrCmd_CheckPokedex(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); u16 *retPtr = ScriptGetVarPointer(ctx); *retPtr = Pokedex_IsEnabled(pokedex); return FALSE; } BOOL ScrCmd_GivePokedex(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); Pokedex_Enable(pokedex); return FALSE; } BOOL ScrCmd_CheckRunningShoes(ScriptContext *ctx) { u16 *retPtr = ScriptGetVarPointer(ctx); - LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fsys->savedata); + LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fieldSystem->savedata); struct PlayerSaveData *sub = LocalFieldData_GetPlayer(localFieldData); *retPtr = PlayerSaveData_CheckRunningShoes(sub); return FALSE; } BOOL ScrCmd_GiveRunningShoes(ScriptContext *ctx) { - LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fsys->savedata); + LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fieldSystem->savedata); struct PlayerSaveData *sub = LocalFieldData_GetPlayer(localFieldData); PlayerSaveData_SetRunningShoesFlag(sub, TRUE); return FALSE; @@ -36,7 +36,7 @@ BOOL ScrCmd_CheckBadge(ScriptContext *ctx) { u16 *ret = ScriptGetVarPointer(ctx); GF_ASSERT(badgeIdx < 16); - *ret = PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(ctx->fsys->savedata), badgeIdx); + *ret = PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata), badgeIdx); return FALSE; } @@ -44,50 +44,50 @@ BOOL ScrCmd_GiveBadge(ScriptContext *ctx) { u16 badgeIdx = ScriptGetVar(ctx); GF_ASSERT(badgeIdx < 16); - PlayerProfile_SetBadgeFlag(Save_PlayerData_GetProfileAddr(ctx->fsys->savedata), badgeIdx); + PlayerProfile_SetBadgeFlag(Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata), badgeIdx); return FALSE; } BOOL ScrCmd_297(ScriptContext *ctx) { u16 *ret = ScriptGetVarPointer(ctx); - *ret = CheckFlag960(Save_VarsFlags_Get(ctx->fsys->savedata)); + *ret = CheckFlag960(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_CountBadges(ScriptContext *ctx) { u16 *ret = ScriptGetVarPointer(ctx); - *ret = PlayerProfile_CountBadges(Save_PlayerData_GetProfileAddr(ctx->fsys->savedata)); + *ret = PlayerProfile_CountBadges(Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_298(ScriptContext *ctx) { - SetFlag960(Save_VarsFlags_Get(ctx->fsys->savedata)); + SetFlag960(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_CheckEscortMode(ScriptContext *ctx) { u16 *ret = ScriptGetVarPointer(ctx); - *ret = Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(ctx->fsys->savedata)); + *ret = Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_SetEscortMode(ScriptContext *ctx) { - Save_VarsFlags_SetHaveFollowerFlag(Save_VarsFlags_Get(ctx->fsys->savedata)); + Save_VarsFlags_SetHaveFollowerFlag(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_ClearEscortMode(ScriptContext *ctx) { - Save_VarsFlags_ClearHaveFollowerFlag(Save_VarsFlags_Get(ctx->fsys->savedata)); + Save_VarsFlags_ClearHaveFollowerFlag(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_RocketCostumeFlagCheck(ScriptContext *ctx) { u16 *ret = ScriptGetVarPointer(ctx); - *ret = Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(ctx->fsys->savedata)); + *ret = Save_VarsFlags_CheckRocketCostumeFlag(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } @@ -95,9 +95,9 @@ BOOL ScrCmd_RocketCostumeFlagAction(ScriptContext *ctx) { u8 mode = ScriptReadByte(ctx); if (mode) { - Save_VarsFlags_SetRocketCostumeFlag(Save_VarsFlags_Get(ctx->fsys->savedata)); + Save_VarsFlags_SetRocketCostumeFlag(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); } else { - Save_VarsFlags_ClearRocketCostumeFlag(Save_VarsFlags_Get(ctx->fsys->savedata)); + Save_VarsFlags_ClearRocketCostumeFlag(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); } return FALSE; } @@ -105,34 +105,34 @@ BOOL ScrCmd_RocketCostumeFlagAction(ScriptContext *ctx) { BOOL ScrCmd_302(ScriptContext *ctx) { u16 *ret = ScriptGetVarPointer(ctx); - *ret = CheckFlag965(Save_VarsFlags_Get(ctx->fsys->savedata)); + *ret = CheckFlag965(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_303(ScriptContext *ctx) { - SetFlag965(Save_VarsFlags_Get(ctx->fsys->savedata)); + SetFlag965(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_304(ScriptContext *ctx) { - ClearFlag965(Save_VarsFlags_Get(ctx->fsys->savedata)); + ClearFlag965(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_305(ScriptContext *ctx) { u16 *ret = ScriptGetVarPointer(ctx); - *ret = CheckGameClearFlag(Save_VarsFlags_Get(ctx->fsys->savedata)); + *ret = CheckGameClearFlag(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_306(ScriptContext *ctx) { - SetGameClearFlag(Save_VarsFlags_Get(ctx->fsys->savedata)); + SetGameClearFlag(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_StrengthFlagAction(ScriptContext *ctx) { - SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fieldSystem->savedata); u8 mode = ScriptReadByte(ctx); switch (mode) { case FLAG_ACTION_SET: @@ -153,7 +153,7 @@ BOOL ScrCmd_StrengthFlagAction(ScriptContext *ctx) { } BOOL ScrCmd_FlashAction(ScriptContext *ctx) { - SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fieldSystem->savedata); u8 mode = ScriptReadByte(ctx); switch (mode) { case FLAG_ACTION_SET: @@ -175,7 +175,7 @@ BOOL ScrCmd_FlashAction(ScriptContext *ctx) { // Leftover from DPPt BOOL ScrCmd_DefogAction(ScriptContext *ctx) { - SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fieldSystem->savedata); u8 mode = ScriptReadByte(ctx); switch (mode) { case FLAG_ACTION_SET: diff --git a/src/scrcmd_20.c b/src/scrcmd_20.c index e968d6851..c708fde90 100644 --- a/src/scrcmd_20.c +++ b/src/scrcmd_20.c @@ -126,7 +126,7 @@ BOOL ScrCmd_491(ScriptContext *ctx) { BOOL ScrCmd_628(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); u16 r5 = ScriptGetVar(ctx); - u32 r0 = sub_02030AE8(ctx->fsys->savedata); + u32 r0 = sub_02030AE8(ctx->fieldSystem->savedata); u8 s = 0; sub_02030AA4(r0, 0xa, r5 * 4 + r4, &s); if (r4 == 3) { @@ -136,10 +136,10 @@ BOOL ScrCmd_628(ScriptContext *ctx) { } else { r7 = 0x68; } - sub_02031108(sub_0203107C(ctx->fsys->savedata), r7, sub_0205C268(r7), 0); + sub_02031108(sub_0203107C(ctx->fieldSystem->savedata), r7, sub_0205C268(r7), 0); } - sub_02031108(sub_0203107C(ctx->fsys->savedata), sub_0205BFF0(r5, r4), sub_0205C268(sub_0205BFF0(r5, r4)), 0); - sub_02031108(sub_0203107C(ctx->fsys->savedata), sub_0205C048(r5, r4), sub_0205C268(sub_0205C048(r5, r4)), 0); + sub_02031108(sub_0203107C(ctx->fieldSystem->savedata), sub_0205BFF0(r5, r4), sub_0205C268(sub_0205BFF0(r5, r4)), 0); + sub_02031108(sub_0203107C(ctx->fieldSystem->savedata), sub_0205C048(r5, r4), sub_0205C268(sub_0205C048(r5, r4)), 0); return FALSE; } @@ -147,25 +147,25 @@ BOOL ScrCmd_633(ScriptContext *ctx) { u16 r7 = ScriptReadHalfword(ctx); u16 r5 = ScriptGetVar(ctx); u16 *resultPtr = ScriptGetVarPointer(ctx); - sub_02030B04(ctx->fsys->savedata); - u32 sp04 = sub_02030C5C(ctx->fsys->savedata); - void *r1 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + sub_02030B04(ctx->fieldSystem->savedata); + u32 sp04 = sub_02030C5C(ctx->fieldSystem->savedata); + void *r1 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); switch (r7) { case 0: - *resultPtr = BattleHall_DoesPartyContainEligibleMons(r5, ctx->fsys->savedata); + *resultPtr = BattleHall_DoesPartyContainEligibleMons(r5, ctx->fieldSystem->savedata); break; case 1: if (r5 == 3) { - *resultPtr = sub_020310BC(sub_0203107C(ctx->fsys->savedata), 0x6a, sub_0205C268(0x6a)); + *resultPtr = sub_020310BC(sub_0203107C(ctx->fieldSystem->savedata), 0x6a, sub_0205C268(0x6a)); } else { *resultPtr = sub_02030CA0(sp04, 5, r5, 0, 0); } break; case 2: - *resultPtr = sub_020310BC(sub_0203107C(ctx->fsys->savedata), sub_0205C11C(r5), sub_0205C268(sub_0205C11C(r5))); + *resultPtr = sub_020310BC(sub_0203107C(ctx->fieldSystem->savedata), sub_0205C11C(r5), sub_0205C268(sub_0205C11C(r5))); break; case 3: - sub_0204F878(ctx->fsys->savedata, sp04, r5); + sub_0204F878(ctx->fieldSystem->savedata, sp04, r5); break; case 4: BattleHallChallengeType challengeType; @@ -228,8 +228,8 @@ static BOOL BattleHall_DoesPartyContainEligibleMons(s32 numRequiredMons, SaveDat // upon continuing battle hall challenge without previously saving BOOL ScrCmd_636(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); - u32 r1 = sub_02030C5C(ctx->fsys->savedata); - sub_0204F878(ctx->fsys->savedata, r1, r4); + u32 r1 = sub_02030C5C(ctx->fieldSystem->savedata); + sub_0204F878(ctx->fieldSystem->savedata, r1, r4); return FALSE; } @@ -276,29 +276,29 @@ static BOOL sub_0204F228(TaskManager *taskManager) { } static void sub_0204F284(TaskManager *taskManager, void *a1, BattleHallChallengeType challengeType) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); UnkStruct_0204F284 *r4 = AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0204F284)); MI_CpuFill8(r4, 0, sizeof(UnkStruct_0204F284)); r4->challengeType = challengeType; r4->unk08 = a1; - TaskManager_Call(fsys->taskman, sub_0204F2B8, r4); + TaskManager_Call(fieldSystem->taskman, sub_0204F2B8, r4); } static BOOL sub_0204F2B8(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); UnkStruct_0204F284 *r4 = TaskManager_GetEnv(taskManager); switch (r4->state) { case 0: - r4->state = sub_0204F320(r4, fsys, HEAP_ID_FIELD); + r4->state = sub_0204F320(r4, fieldSystem, HEAP_ID_FIELD); break; case 1: - r4->state = sub_0204F3F8(r4, fsys); + r4->state = sub_0204F3F8(r4, fieldSystem); break; case 2: - r4->state = sub_0204F448(r4, fsys, HEAP_ID_FIELD); + r4->state = sub_0204F448(r4, fieldSystem, HEAP_ID_FIELD); break; case 3: - r4->state = sub_0204F4D8(r4, fsys); + r4->state = sub_0204F4D8(r4, fieldSystem); break; case 4: FreeToHeap(r4); @@ -307,16 +307,16 @@ static BOOL sub_0204F2B8(TaskManager *taskManager) { return FALSE; } -static u32 sub_0204F320(UnkStruct_0204F284 *a0, FieldSystem *fsys, HeapID unused) { +static u32 sub_0204F320(UnkStruct_0204F284 *a0, FieldSystem *fieldSystem, HeapID unused) { PartyMenuAppData *partyMenu = AllocFromHeap(HEAP_ID_FIELD, sizeof(PartyMenuAppData)); MIi_CpuClearFast(0, (u32*)partyMenu, sizeof(PartyMenuAppData)); - partyMenu->party = SaveArray_Party_Get(fsys->savedata); - partyMenu->bag = Save_Bag_Get(fsys->savedata); - partyMenu->mailbox = Save_Mailbox_Get(fsys->savedata); - partyMenu->options = Save_PlayerData_GetOptionsAddr(fsys->savedata); + partyMenu->party = SaveArray_Party_Get(fieldSystem->savedata); + partyMenu->bag = Save_Bag_Get(fieldSystem->savedata); + partyMenu->mailbox = Save_Mailbox_Get(fieldSystem->savedata); + partyMenu->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); partyMenu->unk_25 = 0; partyMenu->unk_24 = 22; - partyMenu->fsys = fsys; + partyMenu->fieldSystem = fieldSystem; partyMenu->unk_26 = a0->unk05; for (u8 i = 0; i < 2; i++) { partyMenu->unk_30[i] = a0->unk06[i]; @@ -324,18 +324,18 @@ static u32 sub_0204F320(UnkStruct_0204F284 *a0, FieldSystem *fsys, HeapID unused partyMenu->unk_37 = 30; partyMenu->unk_36_0 = 1; partyMenu->unk_36_4 = 1; - partyMenu->fsys_unk_10C = &fsys->unk_10C; + partyMenu->fieldSystem_unk_10C = &fieldSystem->unk_10C; if (a0->challengeType == 1) { // doubles partyMenu->unk_36_0 = 2; partyMenu->unk_36_4 = 2; } - FieldSys_LaunchApplication(fsys, &_0210159C, partyMenu); + FieldSystem_LaunchApplication(fieldSystem, &_0210159C, partyMenu); *(a0->unk08) = partyMenu; return 1; } -static u32 sub_0204F3F8(UnkStruct_0204F284 *a0, FieldSystem *fsys) { - if (FieldSys_ApplicationIsRunning(fsys)) { +static u32 sub_0204F3F8(UnkStruct_0204F284 *a0, FieldSystem *fieldSystem) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return 1; } PartyMenuAppData *partyMenu = *(a0->unk08); @@ -353,8 +353,8 @@ static u32 sub_0204F3F8(UnkStruct_0204F284 *a0, FieldSystem *fsys) { } } -static u32 sub_0204F448(UnkStruct_0204F284 *a0, FieldSystem *fsys, HeapID heapId) { - SaveData *savedata = fsys->savedata; +static u32 sub_0204F448(UnkStruct_0204F284 *a0, FieldSystem *fieldSystem, HeapID heapId) { + SaveData *savedata = fieldSystem->savedata; UnkStruct_0204F448 *r4 = AllocFromHeapAtEnd(heapId, sizeof(UnkStruct_0204F448)); MI_CpuFill8(r4, 0, sizeof(UnkStruct_0204F448)); r4->options = Save_PlayerData_GetOptionsAddr(savedata); @@ -370,13 +370,13 @@ static u32 sub_0204F448(UnkStruct_0204F284 *a0, FieldSystem *fsys, HeapID heapId r4->isFlag982Set = sub_0208828C(savedata); sub_02089D40(r4, unk_020FC224); sub_0208AD34(r4, Save_PlayerData_GetProfileAddr(savedata)); - FieldSys_LaunchApplication(fsys, &_02103A1C, r4); + FieldSystem_LaunchApplication(fieldSystem, &_02103A1C, r4); *(a0->unk08) = r4; return 3; } -static u32 sub_0204F4D8(UnkStruct_0204F284 *a0, FieldSystem *fsys) { - if (FieldSys_ApplicationIsRunning(fsys)) { +static u32 sub_0204F4D8(UnkStruct_0204F284 *a0, FieldSystem *fieldSystem) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return 3; } UnkStruct_0204F448 *r0 = *(a0->unk08); @@ -389,8 +389,8 @@ static u32 sub_0204F4D8(UnkStruct_0204F284 *a0, FieldSystem *fsys) { BOOL ScrCmd_BufferBattleHallStreak(ScriptContext *ctx) { u32 i; void *unk0; - FieldSystem* fsys = ctx->fsys; - MessageFormat **messageFormat = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 strIdxWinStreak = ScriptReadByte(ctx); u8 strIdxCurrWinStreakTarget = ScriptReadByte(ctx); u8 strIdxNextWinStreakTarget = ScriptReadByte(ctx); @@ -399,16 +399,16 @@ BOOL ScrCmd_BufferBattleHallStreak(ScriptContext *ctx) { u16 *result = ScriptGetVarPointer(ctx); u32 winStreak = 0; u32 unk1 = 1; - if (Save_CheckExtraChunksExist(fsys->savedata) == FALSE) { + if (Save_CheckExtraChunksExist(fieldSystem->savedata) == FALSE) { *result = 0; return FALSE; } - unk0 = sub_020312C4(fsys->savedata, 0x20, &unk1); + unk0 = sub_020312C4(fieldSystem->savedata, 0x20, &unk1); if (unk1 != 1) { winStreak = 0; } else { for (i = 0; i < MAX_SPECIES; i++) { - winStreak += sub_020312E0(fsys->savedata, unk0, 0, i); + winStreak += sub_020312E0(fieldSystem->savedata, unk0, 0, i); } } if (unk0 != NULL) { @@ -425,9 +425,9 @@ BOOL ScrCmd_BufferBattleHallStreak(ScriptContext *ctx) { currWinStreakLevel = i; } } - GameStats_Add(Save_GameStats_Get(ctx->fsys->savedata), GAME_STAT_BATTLE_POINTS, bp); + GameStats_Add(Save_GameStats_Get(ctx->fieldSystem->savedata), GAME_STAT_BATTLE_POINTS, bp); if (bp != 0) { - FrontierData_BattlePointAction(Save_FrontierData_Get(ctx->fsys->savedata), bp, 5); + FrontierData_BattlePointAction(Save_FrontierData_Get(ctx->fieldSystem->savedata), bp, 5); } if (winStreak == 0) { *result = 0; @@ -451,23 +451,23 @@ BOOL ScrCmd_BufferBattleHallStreak(ScriptContext *ctx) { BOOL ScrCmd_BattleHallCountUsedSpecies(ScriptContext *ctx) { u32 i; - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16 *result = ScriptGetVarPointer(ctx); u32 numSpecies = 0; u32 unk0 = 1; - if (!Save_CheckExtraChunksExist(fsys->savedata)) { + if (!Save_CheckExtraChunksExist(fieldSystem->savedata)) { *result = 0; return FALSE; } - void *unk1 = sub_020312C4(fsys->savedata, 0x20, &unk0); + void *unk1 = sub_020312C4(fieldSystem->savedata, 0x20, &unk0); if (unk0 != 1) { numSpecies = 0; } else { for (i = 0; i < MAX_SPECIES; i++) { u32 winStreak = 0; - winStreak += sub_020312E0(fsys->savedata, unk1, 0, i); - winStreak += sub_020312E0(fsys->savedata, unk1, 1, i); - winStreak += sub_020312E0(fsys->savedata, unk1, 2, i); + winStreak += sub_020312E0(fieldSystem->savedata, unk1, 0, i); + winStreak += sub_020312E0(fieldSystem->savedata, unk1, 1, i); + winStreak += sub_020312E0(fieldSystem->savedata, unk1, 2, i); if (winStreak > 0) { numSpecies++; } @@ -483,18 +483,18 @@ BOOL ScrCmd_BattleHallCountUsedSpecies(ScriptContext *ctx) { #define BATTLE_HALL_MAX_WIN_STREAK (10000) BOOL ScrCmd_BattleHallGetTotalStreak(ScriptContext *ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16 *result = ScriptGetVarPointer(ctx); u32 winStreak = 0; u32 unk0 = 1; - if (!Save_CheckExtraChunksExist(fsys->savedata)) { + if (!Save_CheckExtraChunksExist(fieldSystem->savedata)) { *result = 0; return FALSE; } - void *unk1 = sub_020312C4(fsys->savedata, 0x20, &unk0); + void *unk1 = sub_020312C4(fieldSystem->savedata, 0x20, &unk0); if (unk0 == 1) { for (u32 i = 0; i < MAX_SPECIES; i++) { - winStreak += sub_020312E0(fsys->savedata, unk1, 0, i); + winStreak += sub_020312E0(fieldSystem->savedata, unk1, 0, i); } } if (unk1 != NULL) { @@ -510,8 +510,8 @@ BOOL ScrCmd_BattleHallGetTotalStreak(ScriptContext *ctx) { // Unused BOOL ScrCmd_697(ScriptContext *ctx) { u16 *result = ScriptGetVarPointer(ctx); - sub_020310BC(sub_0203107C(ctx->fsys->savedata), sub_0205C11C(0), 0xff); - u32 unk0 = sub_020310BC(sub_0203107C(ctx->fsys->savedata), sub_0205C0CC(0), 0xff); + sub_020310BC(sub_0203107C(ctx->fieldSystem->savedata), sub_0205C11C(0), 0xff); + u32 unk0 = sub_020310BC(sub_0203107C(ctx->fieldSystem->savedata), sub_0205C0CC(0), 0xff); *result = 0; if (unk0 == 50) { *result = 1; diff --git a/src/scrcmd_8.c b/src/scrcmd_8.c index 274a44e2e..a20380b43 100644 --- a/src/scrcmd_8.c +++ b/src/scrcmd_8.c @@ -6,16 +6,16 @@ #include "math_util.h" BOOL ScrCmd_GetStaticEncounterOutcomeFlag(ScriptContext *ctx) { - u32 *winFlag = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG); + u32 *winFlag = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); u16 *variable = ScriptGetVarPointer(ctx); *variable = *winFlag; return TRUE; } BOOL ScrCmd_465(ScriptContext *ctx) { - MessageFormat **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); - SAV_FRIEND_GRP *group = Save_FriendGroup_Get(ctx->fsys->savedata); - SaveData *save = ctx->fsys->savedata; + MessageFormat **msg = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + SAV_FRIEND_GRP *group = Save_FriendGroup_Get(ctx->fieldSystem->savedata); + SaveData *save = ctx->fieldSystem->savedata; u16 var = ScriptReadHalfword(ctx); switch (var) { @@ -57,7 +57,7 @@ BOOL ScrCmd_465(ScriptContext *ctx) { } case 6: { String *str = String_New(64, HEAP_ID_32); - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(ctx->fsys->savedata); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata); PlayerName_FlatToString(profile, str); sub_0202C7F8(group, 0, 1, str); sub_0202C824(group, 0, PlayerProfile_GetTrainerGender(profile)); diff --git a/src/scrcmd_apricorn.c b/src/scrcmd_apricorn.c index 00a8bd532..b407cad40 100644 --- a/src/scrcmd_apricorn.c +++ b/src/scrcmd_apricorn.c @@ -5,17 +5,17 @@ BOOL ScrCmd_AnimApricornTree(ScriptContext *ctx) { u16 varId = ScriptReadHalfword(ctx); - LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); - u16 *retPtr = GetVarPointer(ctx->fsys, varId); - FieldSys_AnimApricornTree(ctx->fsys, *lastInteracted, retPtr); + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); + u16 *retPtr = GetVarPointer(ctx->fieldSystem, varId); + FieldSystem_AnimApricornTree(ctx->fieldSystem, *lastInteracted, retPtr); return TRUE; } BOOL ScrCmd_ApricornTreeGetApricorn(ScriptContext *ctx) { u16 varId = ScriptReadHalfword(ctx); - LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); - u16 *retPtr = GetVarPointer(ctx->fsys, varId); - *retPtr = FieldSys_ApricornTree_GetApricorn(ctx->fsys, *lastInteracted); + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); + u16 *retPtr = GetVarPointer(ctx->fieldSystem, varId); + *retPtr = FieldSystem_ApricornTree_GetApricorn(ctx->fieldSystem, *lastInteracted); return FALSE; } @@ -23,7 +23,7 @@ BOOL ScrCmd_GiveApricornFromTree(ScriptContext *ctx) { u16 var0 = ScriptGetVar(ctx); u8 var1 = ScriptGetVar(ctx); u16 *retPtr = ScriptGetVarPointer(ctx); - SaveApricornBox *apricornBox = Save_ApricornBox_Get(ctx->fsys->savedata); + SaveApricornBox *apricornBox = Save_ApricornBox_Get(ctx->fieldSystem->savedata); u8 var2 = var0; int apricornCount = ApricornBox_CountApricorn(apricornBox, var2); diff --git a/src/scrcmd_battle.c b/src/scrcmd_battle.c index 87398447e..e85176516 100644 --- a/src/scrcmd_battle.c +++ b/src/scrcmd_battle.c @@ -15,28 +15,28 @@ BOOL ScrCmd_GetTrainerPathToPlayer(ScriptContext *ctx) { int *sp18, *encounterType, *sp10, *r7; LocalMapObject **localMapObject; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 trainerNum = ScriptGetVar(ctx); if (trainerNum == 0) { - sp18 = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_00); - sp10 = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_04); - FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_08); - FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_0_ID); - encounterType = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_0_ENCOUNTER_TYPE); - localMapObject = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_0_EVENT); - r7 = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_18); + sp18 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_00); + sp10 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_04); + FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_08); + FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_ID); + encounterType = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_ENCOUNTER_TYPE); + localMapObject = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_EVENT); + r7 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_18); } else { - sp18 = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_00); - sp10 = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_04); - FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_08); - FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_1_ID); - encounterType = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_1_ENCOUNTER_TYPE); - localMapObject = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_1_EVENT); - r7 = FieldSysGetAttrAddr(fsys, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_18); + sp18 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_00); + sp10 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_04); + FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_08); + FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_ID); + encounterType = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_ENCOUNTER_TYPE); + localMapObject = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_EVENT); + r7 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_18); } - *r7 = sub_0206457C(fsys, *localMapObject, fsys->playerAvatar, *sp10, *sp18, 0, *encounterType, trainerNum); + *r7 = sub_0206457C(fieldSystem, *localMapObject, fieldSystem->playerAvatar, *sp10, *sp18, 0, *encounterType, trainerNum); return FALSE; } @@ -47,9 +47,9 @@ BOOL ScrCmd_TrainerStepTowardsPlayer(ScriptContext *ctx) { *var1 = 0; if (trainerNum == 0) { - r5 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_18); + r5 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_FIELD_18); } else { - r5 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_18); + r5 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_FIELD_18); } if (*r5 == 0) { @@ -67,15 +67,15 @@ BOOL ScrCmd_TrainerStepTowardsPlayer(ScriptContext *ctx) { } BOOL ScrCmd_GetTrainerEyeType(ScriptContext *ctx) { - u16 *encounterType = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ENGAGED_TRAINER_0_ENCOUNTER_TYPE); + u16 *encounterType = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_ENCOUNTER_TYPE); u16 *retEncounterType = ScriptGetVarPointer(ctx); *retEncounterType = *encounterType; return FALSE; } BOOL ScrCmd_GetEyeTrainerNum(ScriptContext *ctx) { - u16 *trainerId0 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ENGAGED_TRAINER_0_ID); - u16 *trainerId1 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ENGAGED_TRAINER_1_ID); + u16 *trainerId0 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ENGAGED_TRAINER_0_ID); + u16 *trainerId1 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ENGAGED_TRAINER_1_ID); u16 trainerNum = ScriptGetVar(ctx); u16 *retTrainerId = ScriptGetVarPointer(ctx); @@ -89,24 +89,24 @@ BOOL ScrCmd_GetEyeTrainerNum(ScriptContext *ctx) { } BOOL ScrCmd_GetTrainerNum(ScriptContext *ctx) { - u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); + u16 *script = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u16 *retTrainerNum = ScriptGetVarPointer(ctx); *retTrainerNum = ScriptNumToTrainerNum(*script); return FALSE; } BOOL ScrCmd_TrainerBattle(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - u16 *script = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); - u32 *winFlag = FieldSysGetAttrAddr(fsys, SCRIPTENV_BATTLE_WIN_FLAG); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *script = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); + u32 *winFlag = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); u16 var0 = ScriptGetVar(ctx); u16 var1 = ScriptGetVar(ctx); u8 var2 = ScriptReadByte(ctx); u8 var3 = ScriptReadByte(ctx); u16 followerTrainerNum = 0; - if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(ctx->fsys->savedata)) == TRUE) { - followerTrainerNum = Save_VarsFlags_GetFollowerTrainerNum(Save_VarsFlags_Get(fsys->savedata)); + if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(ctx->fieldSystem->savedata)) == TRUE) { + followerTrainerNum = Save_VarsFlags_GetFollowerTrainerNum(Save_VarsFlags_Get(fieldSystem->savedata)); } SetupAndStartTrainerBattle(ctx->taskman, var0, var1, followerTrainerNum, var2, var3, HEAP_ID_FIELD, winFlag); @@ -114,7 +114,7 @@ BOOL ScrCmd_TrainerBattle(ScriptContext *ctx) { } BOOL ScrCmd_MultiBattle(ScriptContext *ctx) { - u32 *winFlag = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG); + u32 *winFlag = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); u16 var0 = ScriptGetVar(ctx); u16 var1 = ScriptGetVar(ctx); u16 var2 = ScriptGetVar(ctx); @@ -125,7 +125,7 @@ BOOL ScrCmd_MultiBattle(ScriptContext *ctx) { } BOOL ScrCmd_GetTrainerMsgParams(ScriptContext *ctx) { - u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); + u16 *script = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u16 *msgPtr0 = ScriptGetVarPointer(ctx); u16 *msgPtr1 = ScriptGetVarPointer(ctx); u16 *msgPtr2 = ScriptGetVarPointer(ctx); @@ -154,7 +154,7 @@ BOOL ScrCmd_GetTrainerMsgParams(ScriptContext *ctx) { } BOOL ScrCmd_GetRematchMsgParams(ScriptContext *ctx) { - u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); + u16 *script = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u16 *msgPtr0 = ScriptGetVarPointer(ctx); u16 *msgPtr1 = ScriptGetVarPointer(ctx); u16 *msgPtr2 = ScriptGetVarPointer(ctx); @@ -183,7 +183,7 @@ BOOL ScrCmd_GetRematchMsgParams(ScriptContext *ctx) { } BOOL ScrCmd_TrainerIsDoubleBattle(ScriptContext *ctx) { - u16 *script = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); + u16 *script = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u16 *retDoubleBattle = ScriptGetVarPointer(ctx); *retDoubleBattle = TrainerNumIsDouble(ScriptNumToTrainerNum(*script)); return FALSE; @@ -191,7 +191,7 @@ BOOL ScrCmd_TrainerIsDoubleBattle(ScriptContext *ctx) { BOOL ScrCmd_EncounterMusic(ScriptContext *ctx) { u16 var0 = ScriptGetVar(ctx); - BOOL isKanto = MapHeader_IsKanto(ctx->fsys->location->mapId); + BOOL isKanto = MapHeader_IsKanto(ctx->fieldSystem->location->mapId); BGM_SaveStateAndPlayNew(Trainer_GetEncounterMusic(var0, isKanto)); return TRUE; } @@ -202,7 +202,7 @@ BOOL ScrCmd_WhiteOut(ScriptContext *ctx) { } BOOL ScrCmd_CheckBattleWon(ScriptContext *ctx) { - u32 *winFlag = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG); + u32 *winFlag = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); u16 *retBattleWon = ScriptGetVarPointer(ctx); *retBattleWon = IsBattleResultWin(*winFlag); return TRUE; @@ -214,9 +214,9 @@ BOOL ScrCmd_221(ScriptContext *ctx) { int val; if (var0 == 1) { - val = sub_02052564(VarGet(ctx->fsys, VAR_BATTLE_RESULT)); + val = sub_02052564(VarGet(ctx->fieldSystem, VAR_BATTLE_RESULT)); } else { - val = sub_02052564(*(u32 *)FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG)); + val = sub_02052564(*(u32 *)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG)); } *retPtr = val; @@ -224,7 +224,7 @@ BOOL ScrCmd_221(ScriptContext *ctx) { } BOOL ScrCmd_588(ScriptContext *ctx) { - u32 *winFlag = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG); + u32 *winFlag = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); u16 *retPtr = ScriptGetVarPointer(ctx); *retPtr = sub_02052574(*winFlag); return TRUE; @@ -232,30 +232,30 @@ BOOL ScrCmd_588(ScriptContext *ctx) { BOOL ScrCmd_PartyCheckForDouble(ScriptContext *ctx) { u16 *doubleBattlePtr = ScriptGetVarPointer(ctx); - *doubleBattlePtr = HasEnoughAlivePokemonForDoubleBattle(SaveArray_Party_Get(ctx->fsys->savedata)); + *doubleBattlePtr = HasEnoughAlivePokemonForDoubleBattle(SaveArray_Party_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_223(ScriptContext *ctx) { - u32 *winFlag = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG); + u32 *winFlag = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); SetupAndStartTrainerBattle(ctx->taskman, 1, 0, 0, 0, 0, HEAP_ID_FIELD, winFlag); return TRUE; } BOOL ScrCmd_224(ScriptContext *ctx) { - LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u32 mapObjectId = MapObject_GetID(*lastInteracted); - TrainerFlagSet(ctx->fsys->savedata, (u16)mapObjectId); + TrainerFlagSet(ctx->fieldSystem->savedata, (u16)mapObjectId); return FALSE; } BOOL ScrCmd_GotoIfTrainerDefeated(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); + FieldSystem *fieldSystem = ctx->fieldSystem; + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u32 offset = ScriptReadWord(ctx); u32 mapObjectId = MapObject_GetID(*lastInteracted); - if (TrainerFlagCheck(fsys->savedata, (u16)mapObjectId) == TRUE) { + if (TrainerFlagCheck(fieldSystem->savedata, (u16)mapObjectId) == TRUE) { ScriptJump(ctx, ctx->script_ptr + offset); return TRUE; } diff --git a/src/scrcmd_battle_arcade.c b/src/scrcmd_battle_arcade.c index 930014c41..a25afc42b 100644 --- a/src/scrcmd_battle_arcade.c +++ b/src/scrcmd_battle_arcade.c @@ -60,22 +60,22 @@ BOOL ScrCmd_643(ScriptContext *ctx) { u16 arg0 = ScriptReadHalfword(ctx); u16 arg1 = ScriptGetVar(ctx); u16 *result = ScriptGetVarPointer(ctx); - sub_02030E88(ctx->fsys->savedata); - void *unk0 = sub_02030FA0(ctx->fsys->savedata); - void *unk1 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + sub_02030E88(ctx->fieldSystem->savedata); + void *unk0 = sub_02030FA0(ctx->fieldSystem->savedata); + void *unk1 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); switch (arg0) { case 0: - *result = sub_0204A5B0(arg1, ctx->fsys->savedata, 0); + *result = sub_0204A5B0(arg1, ctx->fieldSystem->savedata, 0); break; case 1: // Unused if (arg1 == 3) { - *result = sub_020310BC(sub_0203107C(ctx->fsys->savedata), 110, sub_0205C268(110)); + *result = sub_020310BC(sub_0203107C(ctx->fieldSystem->savedata), 110, sub_0205C268(110)); } else { *result = sub_02030FE4(unk0, 8, arg1, 0, 0); } break; case 3: // Unused - sub_0204FFB0(ctx->fsys->savedata, unk0, arg1); + sub_0204FFB0(ctx->fieldSystem->savedata, unk0, arg1); break; case 4: BattleArcadeChallengeType challengeType; @@ -98,7 +98,7 @@ BOOL ScrCmd_643(ScriptContext *ctx) { BOOL ScrCmd_646(ScriptContext *ctx) { u16 unk = ScriptGetVar(ctx); - sub_0204FFB0(ctx->fsys->savedata, sub_02030FA0(ctx->fsys->savedata), unk); + sub_0204FFB0(ctx->fieldSystem->savedata, sub_02030FA0(ctx->fieldSystem->savedata), unk); return FALSE; } @@ -158,29 +158,29 @@ static BOOL sub_020500A0(TaskManager *taskManager) { } static void sub_0205011C(TaskManager *taskManager, void *a1, BattleArcadeChallengeType challengeType) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); UnkStruct_0204FBDC *unk = AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0204FBDC)); MI_CpuFill8(unk, 0, sizeof(UnkStruct_0204FBDC)); unk->challengeType = challengeType; unk->unk0c = a1; - TaskManager_Call(fsys->taskman, sub_02050150, unk); + TaskManager_Call(fieldSystem->taskman, sub_02050150, unk); } static BOOL sub_02050150(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); UnkStruct_0204FBDC *unk = TaskManager_GetEnv(taskManager); switch (unk->state) { case 0: - unk->state = sub_020501B8(unk, fsys, HEAP_ID_FIELD); + unk->state = sub_020501B8(unk, fieldSystem, HEAP_ID_FIELD); break; case 1: - unk->state = sub_02050290(unk, fsys); + unk->state = sub_02050290(unk, fieldSystem); break; case 2: - unk->state = sub_020502E0(unk, fsys, HEAP_ID_FIELD); + unk->state = sub_020502E0(unk, fieldSystem, HEAP_ID_FIELD); break; case 3: - unk->state = sub_02050370(unk, fsys); + unk->state = sub_02050370(unk, fieldSystem); break; case 4: FreeToHeap(unk); @@ -189,16 +189,16 @@ static BOOL sub_02050150(TaskManager *taskManager) { return FALSE; } -static u32 sub_020501B8(UnkStruct_0204FBDC *a0, FieldSystem *fsys, u32 a2) { +static u32 sub_020501B8(UnkStruct_0204FBDC *a0, FieldSystem *fieldSystem, u32 a2) { PartyMenuAppData *partyMenu = AllocFromHeap(HEAP_ID_FIELD, sizeof(PartyMenuAppData)); MIi_CpuClearFast(0, (u32 *)partyMenu, sizeof(PartyMenuAppData)); - partyMenu->party = SaveArray_Party_Get(fsys->savedata); - partyMenu->bag = Save_Bag_Get(fsys->savedata); - partyMenu->mailbox = Save_Mailbox_Get(fsys->savedata); - partyMenu->options = Save_PlayerData_GetOptionsAddr(fsys->savedata); + partyMenu->party = SaveArray_Party_Get(fieldSystem->savedata); + partyMenu->bag = Save_Bag_Get(fieldSystem->savedata); + partyMenu->mailbox = Save_Mailbox_Get(fieldSystem->savedata); + partyMenu->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); partyMenu->unk_25 = 0; partyMenu->unk_24 = 0x17; - partyMenu->fsys = fsys; + partyMenu->fieldSystem = fieldSystem; partyMenu->unk_26 = a0->unk05; for (u8 i = 0; i < 3; i++) { partyMenu->unk_30[i] = a0->unk06[i]; @@ -206,18 +206,18 @@ static u32 sub_020501B8(UnkStruct_0204FBDC *a0, FieldSystem *fsys, u32 a2) { partyMenu->unk_37 = 100; partyMenu->unk_36_0 = 3; partyMenu->unk_36_4 = 3; - partyMenu->fsys_unk_10C = &(fsys->unk_10C); + partyMenu->fieldSystem_unk_10C = &(fieldSystem->unk_10C); if (a0->challengeType == BATTLE_ARCADE_CHALLENGE_TYPE_MULTI) { partyMenu->unk_36_0 = 2; partyMenu->unk_36_4 = 2; } - FieldSys_LaunchApplication(fsys, &_0210159C, partyMenu); + FieldSystem_LaunchApplication(fieldSystem, &_0210159C, partyMenu); *(a0->unk0c) = partyMenu; return 1; } -static u32 sub_02050290(UnkStruct_0204FBDC *a0, FieldSystem *fsys) { - if (FieldSys_ApplicationIsRunning(fsys)) { +static u32 sub_02050290(UnkStruct_0204FBDC *a0, FieldSystem *fieldSystem) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return TRUE; } PartyMenuAppData *partyMenu = *(a0->unk0c); @@ -234,8 +234,8 @@ static u32 sub_02050290(UnkStruct_0204FBDC *a0, FieldSystem *fsys) { return 2; } -static u32 sub_020502E0(UnkStruct_0204FBDC *a0, FieldSystem *fsys, HeapID heapId) { - SaveData *saveData = fsys->savedata; +static u32 sub_020502E0(UnkStruct_0204FBDC *a0, FieldSystem *fieldSystem, HeapID heapId) { + SaveData *saveData = fieldSystem->savedata; UnkStruct_0204F448 *unk = AllocFromHeapAtEnd(heapId, sizeof(UnkStruct_0204F448)); MI_CpuFill8(unk, 0, sizeof(UnkStruct_0204F448)); unk->options = Save_PlayerData_GetOptionsAddr(saveData); @@ -251,13 +251,13 @@ static u32 sub_020502E0(UnkStruct_0204FBDC *a0, FieldSystem *fsys, HeapID heapId unk->isFlag982Set = sub_0208828C(saveData); sub_02089D40(unk, unk_020FC3AC); sub_0208AD34(unk, Save_PlayerData_GetProfileAddr(saveData)); - FieldSys_LaunchApplication(fsys, &_02103A1C, unk); + FieldSystem_LaunchApplication(fieldSystem, &_02103A1C, unk); *(a0->unk0c) = unk; return 3; } -static u32 sub_02050370(UnkStruct_0204FBDC *a0, FieldSystem *fsys) { - if (FieldSys_ApplicationIsRunning(fsys)) { +static u32 sub_02050370(UnkStruct_0204FBDC *a0, FieldSystem *fieldSystem) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return 3; } UnkStruct_0204F448 *unk = *(a0->unk0c); diff --git a/src/scrcmd_battle_castle.c b/src/scrcmd_battle_castle.c index 45b59bafa..6c4f3f042 100644 --- a/src/scrcmd_battle_castle.c +++ b/src/scrcmd_battle_castle.c @@ -60,22 +60,22 @@ BOOL ScrCmd_637(ScriptContext *ctx) { u16 arg0 = ScriptReadHalfword(ctx); u16 arg1 = ScriptGetVar(ctx); u16 *result = ScriptGetVarPointer(ctx); - sub_02030CC8(ctx->fsys->savedata); - u32 unk0 = sub_02030E08(ctx->fsys->savedata); - void *unk1 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + sub_02030CC8(ctx->fieldSystem->savedata); + u32 unk0 = sub_02030E08(ctx->fieldSystem->savedata); + void *unk1 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); switch (arg0) { case 0: - *result = sub_0204A5B0(arg1, ctx->fsys->savedata, 0); + *result = sub_0204A5B0(arg1, ctx->fieldSystem->savedata, 0); break; case 1: // Unused if (arg1 == 3) { - *result = sub_020310BC(sub_0203107C(ctx->fsys->savedata), 108, sub_0205C268(108)); + *result = sub_020310BC(sub_0203107C(ctx->fieldSystem->savedata), 108, sub_0205C268(108)); } else { *result = sub_02030E58(unk0, 9, arg1, 0, 0); } break; case 3: // Unused - sub_0204FA14(ctx->fsys->savedata, unk0, arg1); + sub_0204FA14(ctx->fieldSystem->savedata, unk0, arg1); break; case 4: BattleCastleChallengeType challengeType; @@ -98,7 +98,7 @@ BOOL ScrCmd_637(ScriptContext *ctx) { BOOL ScrCmd_640(ScriptContext *ctx) { u16 unk = ScriptGetVar(ctx); - sub_0204FA14(ctx->fsys->savedata, sub_02030E08(ctx->fsys->savedata), unk); + sub_0204FA14(ctx->fieldSystem->savedata, sub_02030E08(ctx->fieldSystem->savedata), unk); return FALSE; } @@ -162,29 +162,29 @@ static BOOL sub_0204FB60(TaskManager *taskManager) { } static void sub_0204FBDC(TaskManager *taskManager, void *a1, BattleCastleChallengeType challengeType) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); UnkStruct_0204FBDC *unk = AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0204FBDC)); MI_CpuFill8(unk, 0, sizeof(UnkStruct_0204FBDC)); unk->challengeType = challengeType; unk->unk0c = a1; - TaskManager_Call(fsys->taskman, sub_0204FC10, unk); + TaskManager_Call(fieldSystem->taskman, sub_0204FC10, unk); } static BOOL sub_0204FC10(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); UnkStruct_0204FBDC *unk = TaskManager_GetEnv(taskManager); switch (unk->state) { case 0: - unk->state = sub_0204FC78(unk, fsys, HEAP_ID_FIELD); + unk->state = sub_0204FC78(unk, fieldSystem, HEAP_ID_FIELD); break; case 1: - unk->state = sub_0204FD50(unk, fsys); + unk->state = sub_0204FD50(unk, fieldSystem); break; case 2: - unk->state = sub_0204FDA0(unk, fsys, HEAP_ID_FIELD); + unk->state = sub_0204FDA0(unk, fieldSystem, HEAP_ID_FIELD); break; case 3: - unk->state = sub_0204FE30(unk, fsys); + unk->state = sub_0204FE30(unk, fieldSystem); break; case 4: FreeToHeap(unk); @@ -193,16 +193,16 @@ static BOOL sub_0204FC10(TaskManager *taskManager) { return FALSE; } -static u32 sub_0204FC78(UnkStruct_0204FBDC *a0, FieldSystem *fsys, HeapID unused) { +static u32 sub_0204FC78(UnkStruct_0204FBDC *a0, FieldSystem *fieldSystem, HeapID unused) { PartyMenuAppData *partyMenu = AllocFromHeap(HEAP_ID_FIELD, sizeof(PartyMenuAppData)); MIi_CpuClearFast(0, (u32 *)partyMenu, sizeof(PartyMenuAppData)); - partyMenu->party = SaveArray_Party_Get(fsys->savedata); - partyMenu->bag = Save_Bag_Get(fsys->savedata); - partyMenu->mailbox = Save_Mailbox_Get(fsys->savedata); - partyMenu->options = Save_PlayerData_GetOptionsAddr(fsys->savedata); + partyMenu->party = SaveArray_Party_Get(fieldSystem->savedata); + partyMenu->bag = Save_Bag_Get(fieldSystem->savedata); + partyMenu->mailbox = Save_Mailbox_Get(fieldSystem->savedata); + partyMenu->options = Save_PlayerData_GetOptionsAddr(fieldSystem->savedata); partyMenu->unk_25 = 0; partyMenu->unk_24 = 23; - partyMenu->fsys = fsys; + partyMenu->fieldSystem = fieldSystem; partyMenu->unk_26 = a0->unk05; for (u8 i = 0; i < 3; i++) { partyMenu->unk_30[i] = a0->unk06[i]; @@ -210,18 +210,18 @@ static u32 sub_0204FC78(UnkStruct_0204FBDC *a0, FieldSystem *fsys, HeapID unused partyMenu->unk_37 = 100; partyMenu->unk_36_0 = 3; partyMenu->unk_36_4 = 3; - partyMenu->fsys_unk_10C = &(fsys->unk_10C); + partyMenu->fieldSystem_unk_10C = &(fieldSystem->unk_10C); if (a0->challengeType == BATTLE_CASTLE_CHALLENGE_TYPE_MULTI) { partyMenu->unk_36_0 = 2; partyMenu->unk_36_4 = 2; } - FieldSys_LaunchApplication(fsys, &_0210159C, partyMenu); + FieldSystem_LaunchApplication(fieldSystem, &_0210159C, partyMenu); *(a0->unk0c) = partyMenu; return 1; } -static u32 sub_0204FD50(UnkStruct_0204FBDC *a0, FieldSystem *fsys) { - if (FieldSys_ApplicationIsRunning(fsys)) { +static u32 sub_0204FD50(UnkStruct_0204FBDC *a0, FieldSystem *fieldSystem) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return TRUE; } PartyMenuAppData *partyMenu = *(a0->unk0c); @@ -238,8 +238,8 @@ static u32 sub_0204FD50(UnkStruct_0204FBDC *a0, FieldSystem *fsys) { return 2; } -static u32 sub_0204FDA0(UnkStruct_0204FBDC *a0, FieldSystem *fsys, HeapID heapId) { - SaveData *saveData = fsys->savedata; +static u32 sub_0204FDA0(UnkStruct_0204FBDC *a0, FieldSystem *fieldSystem, HeapID heapId) { + SaveData *saveData = fieldSystem->savedata; UnkStruct_0204F448 *unk = AllocFromHeapAtEnd(heapId, sizeof(UnkStruct_0204F448)); MI_CpuFill8(unk, 0, sizeof(UnkStruct_0204F448)); unk->options = Save_PlayerData_GetOptionsAddr(saveData); @@ -255,13 +255,13 @@ static u32 sub_0204FDA0(UnkStruct_0204FBDC *a0, FieldSystem *fsys, HeapID heapId unk->isFlag982Set = sub_0208828C(saveData); sub_02089D40((void*)unk, unk_020FC3A4); sub_0208AD34((void*)unk, Save_PlayerData_GetProfileAddr(saveData)); - FieldSys_LaunchApplication(fsys, &_02103A1C, unk); + FieldSystem_LaunchApplication(fieldSystem, &_02103A1C, unk); *(a0->unk0c) = unk; return 3; } -static u32 sub_0204FE30(UnkStruct_0204FBDC *a0, FieldSystem *fsys) { - if (FieldSys_ApplicationIsRunning(fsys)) { +static u32 sub_0204FE30(UnkStruct_0204FBDC *a0, FieldSystem *fieldSystem) { + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return 3; } UnkStruct_0204F448 *unk = *(a0->unk0c); diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index f49692239..acc8dabe8 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -106,9 +106,9 @@ FS_EXTERN_OVERLAY(OVY_25); BOOL sub_020416E4(ScriptContext *ctx); BOOL sub_02042C78(ScriptContext *ctx); BOOL ScrNative_WaitApplication(ScriptContext *ctx); -LocalMapObject *sub_02041C70(FieldSystem *fsys, u16 person); -void _ScheduleObjectEventMovement(FieldSystem *fsys, EventObjectMovementMan *mvtMan, MovementScriptCommand *a2); -void Script_SetMonSeenFlagBySpecies(FieldSystem *fsys, u16 species); +LocalMapObject *sub_02041C70(FieldSystem *fieldSystem, u16 person); +void _ScheduleObjectEventMovement(FieldSystem *fieldSystem, EventObjectMovementMan *mvtMan, MovementScriptCommand *a2); +void Script_SetMonSeenFlagBySpecies(FieldSystem *fieldSystem, u16 species); #include "data/fieldmap.h" @@ -152,10 +152,10 @@ BOOL ScrCmd_End(ScriptContext* ctx) { static BOOL RunPauseTimer(ScriptContext* ctx); BOOL ScrCmd_Wait(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16 frames_to_wait = ScriptReadHalfword(ctx); u16 ptr_offset = ScriptReadHalfword(ctx); - u16* ret_ptr = GetVarPointer(fsys, ptr_offset); + u16* ret_ptr = GetVarPointer(fieldSystem, ptr_offset); *ret_ptr = frames_to_wait; ctx->data[0] = ptr_offset; @@ -165,7 +165,7 @@ BOOL ScrCmd_Wait(ScriptContext* ctx) { } static BOOL RunPauseTimer(ScriptContext* ctx) { - u16* frames_to_wait = GetVarPointer(ctx->fsys, ctx->data[0]); + u16* frames_to_wait = GetVarPointer(ctx->fieldSystem, ctx->data[0]); (*frames_to_wait)--; return (*frames_to_wait == 0); @@ -320,12 +320,12 @@ BOOL ScrCmd_CompareVarToVar(ScriptContext* ctx) { } BOOL ScrCmd_RunScript(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); - ScriptContext** new_context_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRIPT_CONTEXT_1); + FieldSystem* fieldSystem = ctx->fieldSystem; + u8* num_active_script_contexts = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); + ScriptContext** new_context_ptr = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SCRIPT_CONTEXT_1); u16 script_to_run = ScriptReadHalfword(ctx); - *new_context_ptr = CreateScriptContext(fsys, script_to_run); + *new_context_ptr = CreateScriptContext(fieldSystem, script_to_run); (*num_active_script_contexts)++; return TRUE; @@ -334,13 +334,13 @@ BOOL ScrCmd_RunScript(ScriptContext* ctx) { static BOOL ScrNative_WaitStd(ScriptContext* ctx); BOOL ScrCmd_CallStd(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); - ScriptContext** new_context_ptr = (ScriptContext**)FieldSysGetAttrAddr(fsys, (ScriptEnvField)(SCRIPTENV_SCRIPT_CONTEXT_0 + *num_active_script_contexts)); + FieldSystem* fieldSystem = ctx->fieldSystem; + u8* unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_FIELD_07); + u8* num_active_script_contexts = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); + ScriptContext** new_context_ptr = (ScriptContext**)FieldSysGetAttrAddr(fieldSystem, (ScriptEnvField)(SCRIPTENV_SCRIPT_CONTEXT_0 + *num_active_script_contexts)); u16 script_to_run = ScriptReadHalfword(ctx); - ScriptContext* new_context = CreateScriptContext(fsys, script_to_run); + ScriptContext* new_context = CreateScriptContext(fieldSystem, script_to_run); *new_context_ptr = new_context; new_context->id = *num_active_script_contexts; @@ -353,17 +353,17 @@ BOOL ScrCmd_CallStd(ScriptContext* ctx) { } static BOOL ScrNative_WaitStd(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); + FieldSystem* fieldSystem = ctx->fieldSystem; + u8* unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_FIELD_07); + u8* unused = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); return (*unk & (1 << ctx->id)) == 0; } BOOL ScrCmd_RestartCurrentScript(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_07); - u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); + FieldSystem* fieldSystem = ctx->fieldSystem; + u8* unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_FIELD_07); + u8* unused = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_CONTEXT_COUNT); *unk ^= (1 << (ctx->id - 1)); return FALSE; @@ -377,7 +377,7 @@ BOOL ScrCmd_GoTo(ScriptContext* ctx) { } BOOL ScrCmd_ObjectGoTo(ScriptContext* ctx) { - LocalMapObject** lmo = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); + LocalMapObject** lmo = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u8 id = ScriptReadByte(ctx); u32 offset_in_script = ScriptReadWord(ctx); @@ -401,7 +401,7 @@ BOOL ScrCmd_BgGoTo(ScriptContext* ctx) { } BOOL ScrCmd_DirectionGoTo(ScriptContext* ctx) { - u32* direction = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_FACING_DIRECTION); + u32* direction = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_FACING_DIRECTION); u8 required_direction = ScriptReadByte(ctx); u32 offset_in_script = ScriptReadWord(ctx); @@ -447,56 +447,56 @@ BOOL ScrCmd_CallIf(ScriptContext* ctx) { } BOOL ScrCmd_SetFlag(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16 flag_to_set = ScriptReadHalfword(ctx); - FlagSet(fsys, flag_to_set); + FlagSet(fieldSystem, flag_to_set); return FALSE; } BOOL ScrCmd_ClearFlag(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16 flag_to_clear = ScriptReadHalfword(ctx); - FlagClear(fsys, flag_to_clear); + FlagClear(fieldSystem, flag_to_clear); return FALSE; } BOOL ScrCmd_CheckFlag(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16 flag_to_check = ScriptReadHalfword(ctx); - ctx->comparisonResult = FlagGet(fsys, flag_to_check); + ctx->comparisonResult = FlagGet(fieldSystem, flag_to_check); return FALSE; } BOOL ScrCmd_CheckFlagVar(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16* flag_in_var_to_check = ScriptGetVarPointer(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); - *ret_ptr = FlagGet(fsys, *flag_in_var_to_check); + *ret_ptr = FlagGet(fieldSystem, *flag_in_var_to_check); return FALSE; } BOOL ScrCmd_SetFlagVar(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16* flag_in_var_to_set = ScriptGetVarPointer(ctx); - FlagSet(fsys, *flag_in_var_to_set); + FlagSet(fieldSystem, *flag_in_var_to_set); return FALSE; } BOOL ScrCmd_ClearFlagVar(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16* flag_in_var_to_clear = ScriptGetVarPointer(ctx); - FlagClear(fsys, *flag_in_var_to_clear); + FlagClear(fieldSystem, *flag_in_var_to_clear); return FALSE; } @@ -504,7 +504,7 @@ BOOL ScrCmd_ClearFlagVar(ScriptContext* ctx) { BOOL ScrCmd_SetTrainerFlag(ScriptContext* ctx) { u16 flag_to_set = ScriptGetVar(ctx); - TrainerFlagSet(ctx->fsys->savedata, flag_to_set); + TrainerFlagSet(ctx->fieldSystem->savedata, flag_to_set); return FALSE; } @@ -512,16 +512,16 @@ BOOL ScrCmd_SetTrainerFlag(ScriptContext* ctx) { BOOL ScrCmd_ClearTrainerFlag(ScriptContext* ctx) { u16 flag_to_clear = ScriptGetVar(ctx); - TrainerFlagClear(ctx->fsys->savedata, flag_to_clear); + TrainerFlagClear(ctx->fieldSystem->savedata, flag_to_clear); return FALSE; } BOOL ScrCmd_CheckTrainerFlag(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16 flag_to_check = ScriptGetVar(ctx); - ctx->comparisonResult = TrainerFlagCheck(fsys->savedata, flag_to_check); + ctx->comparisonResult = TrainerFlagCheck(fieldSystem->savedata, flag_to_check); return FALSE; } @@ -630,13 +630,13 @@ static BOOL sub_02041074(ScriptContext* ctx) { } if ((new_keys & PAD_KEY_UP) != 0) { - PlayerAvatar_SetFacingDirection(ctx->fsys->playerAvatar, DIR_NORTH); + PlayerAvatar_SetFacingDirection(ctx->fieldSystem->playerAvatar, DIR_NORTH); } else if ((new_keys & PAD_KEY_DOWN) != 0) { - PlayerAvatar_SetFacingDirection(ctx->fsys->playerAvatar, DIR_SOUTH); + PlayerAvatar_SetFacingDirection(ctx->fieldSystem->playerAvatar, DIR_SOUTH); } else if ((new_keys & PAD_KEY_LEFT) != 0) { - PlayerAvatar_SetFacingDirection(ctx->fsys->playerAvatar, DIR_WEST); + PlayerAvatar_SetFacingDirection(ctx->fieldSystem->playerAvatar, DIR_WEST); } else if ((new_keys & PAD_KEY_RIGHT) != 0) { - PlayerAvatar_SetFacingDirection(ctx->fsys->playerAvatar, DIR_EAST); + PlayerAvatar_SetFacingDirection(ctx->fieldSystem->playerAvatar, DIR_EAST); } else { return FALSE; } @@ -664,40 +664,40 @@ static BOOL sub_020410F0(ScriptContext* ctx) { } BOOL ScrCmd_OpenMsg(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_08); + FieldSystem* fieldSystem = ctx->fieldSystem; + u8* unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_FIELD_08); - sub_0205B514(fsys->bgConfig, FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW), 3); - sub_0205B564(FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW), Save_PlayerData_GetOptionsAddr(ctx->fsys->savedata)); + sub_0205B514(fieldSystem->bgConfig, FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW), 3); + sub_0205B564(FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW), Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->savedata)); - fsys->unkD2_6 = 1; + fieldSystem->unkD2_6 = 1; *unk = 1; return FALSE; } BOOL ScrCmd_CloseMsg(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - Window* window = FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW); - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_08); + FieldSystem* fieldSystem = ctx->fieldSystem; + Window* window = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW); + u8* unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_FIELD_08); ClearFrameAndWindow2(window, 0); RemoveWindow(window); - fsys->unkD2_6 = 0; + fieldSystem->unkD2_6 = 0; *unk = 0; return FALSE; } BOOL ScrCmd_HoldMsg(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - Window* window = FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW); - u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_FIELD_08); + FieldSystem* fieldSystem = ctx->fieldSystem; + Window* window = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW); + u8* unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_FIELD_08); RemoveWindow(window); - fsys->unkD2_6 = 0; + fieldSystem->unkD2_6 = 0; *unk = 0; return FALSE; @@ -706,13 +706,13 @@ BOOL ScrCmd_HoldMsg(ScriptContext* ctx) { static BOOL sub_02041270(ScriptContext* ctx); BOOL ScrCmd_062(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u16* var_8008 = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8008); - u16* var_8004 = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8004); - u16* var_8009 = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8009); - u16* var_800A = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_800A); - u16* var_8005 = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8005); - u16* var_800B = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_800B); + FieldSystem* fieldSystem = ctx->fieldSystem; + u16* var_8008 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8008); + u16* var_8004 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8004); + u16* var_8009 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8009); + u16* var_800A = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_800A); + u16* var_8005 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8005); + u16* var_800B = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_800B); *var_8008 = ScriptReadByte(ctx); *var_8004 = ScriptReadByte(ctx); @@ -726,13 +726,13 @@ BOOL ScrCmd_062(ScriptContext* ctx) { } static BOOL sub_02041270(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u16* var_8008 = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8008); - u16* var_8009 = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8009); - u16* var_800A = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_800A); - u16* var_800B = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_800B); - u16* var_8004 = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8004); - u16* var_8005 = FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8005); + FieldSystem* fieldSystem = ctx->fieldSystem; + u16* var_8008 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8008); + u16* var_8009 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8009); + u16* var_800A = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_800A); + u16* var_800B = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_800B); + u16* var_8004 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8004); + u16* var_8005 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8005); if (*var_8004 == 0 && *var_8005 == 0) { return TRUE; @@ -740,17 +740,17 @@ static BOOL sub_02041270(ScriptContext* ctx) { if (*var_8008 != 0) { if (*var_8009 == 0) { - BgSetPosTextAndCommit(fsys->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_ADD_X, *var_8008); + BgSetPosTextAndCommit(fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_ADD_X, *var_8008); } else { - BgSetPosTextAndCommit(fsys->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_SUB_X, *var_8008); + BgSetPosTextAndCommit(fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_SUB_X, *var_8008); } } if (*var_800A != 0) { if (*var_800B == 0) { - BgSetPosTextAndCommit(fsys->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_ADD_Y, *var_800A); + BgSetPosTextAndCommit(fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_ADD_Y, *var_800A); } else { - BgSetPosTextAndCommit(fsys->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_SUB_Y, *var_800A); + BgSetPosTextAndCommit(fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, BG_POS_OP_SUB_Y, *var_800A); } } @@ -768,52 +768,52 @@ static BOOL sub_02041270(ScriptContext* ctx) { BOOL ScrCmd_DirectionSignpost(ScriptContext* ctx) { u8 unk2; - FieldSystem* fsys = ctx->fsys; - String** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_1); - String** unk1 = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0); - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + String** tmp_str = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_1); + String** unk1 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_0); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 msg_no = ScriptReadByte(ctx); unk2 = ScriptReadByte(ctx); u16 arrow = ScriptReadHalfword(ctx); u16 unused_result_var_id = ScriptReadHalfword(ctx); - fsys->unkD2_6 = 1; + fieldSystem->unkD2_6 = 1; - ov01_021F3D68(fsys->unk68, unk2, arrow); - ov01_021F3D70(fsys->unk68, 1); - ov01_021F3D98(fsys); + ov01_021F3D68(fieldSystem->unk68, unk2, arrow); + ov01_021F3D70(fieldSystem->unk68, 1); + ov01_021F3D98(fieldSystem); ReadMsgDataIntoString(ctx->msgdata, msg_no, *tmp_str); StringExpandPlaceholders(*msg_fmt, *unk1, *tmp_str); - Window* window = ov01_021F3D80(fsys->unk68); + Window* window = ov01_021F3D80(fieldSystem->unk68); AddTextPrinterParameterized2(window, 1, *unk1, 0, 0, 0, MakeTextColor(2, 10, 15), NULL); return TRUE; } BOOL ScrCmd_055(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u8 unk1 = ScriptReadByte(ctx); u16 unk2 = ScriptReadHalfword(ctx); - fsys->unkD2_6 = 1; + fieldSystem->unkD2_6 = 1; - ov01_021F3D68(fsys->unk68, unk1, unk2); - ov01_021F3D70(fsys->unk68, 1); + ov01_021F3D68(fieldSystem->unk68, unk1, unk2); + ov01_021F3D70(fieldSystem->unk68, 1); return TRUE; } BOOL ScrCmd_057(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - ov01_021F3D70(fsys->unk68, ScriptReadByte(ctx)); + FieldSystem* fieldSystem = ctx->fieldSystem; + ov01_021F3D70(fieldSystem->unk68, ScriptReadByte(ctx)); return TRUE; } static BOOL sub_02041454(ScriptContext* ctx); BOOL ScrCmd_058(ScriptContext* ctx) { - if (ov01_021F3D88(ctx->fsys->unk68) == TRUE) { + if (ov01_021F3D88(ctx->fieldSystem->unk68) == TRUE) { return FALSE; } @@ -822,17 +822,17 @@ BOOL ScrCmd_058(ScriptContext* ctx) { } static BOOL sub_02041454(ScriptContext* ctx) { - return ov01_021F3D88(ctx->fsys->unk68) == TRUE; + return ov01_021F3D88(ctx->fieldSystem->unk68) == TRUE; } static BOOL sub_02041520(ScriptContext* ctx); BOOL ScrCmd_TrainerTips(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); - String** tmp_str = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_1); - String** unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0); - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + u8* printer_id_ptr = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); + String** tmp_str = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_1); + String** unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_0); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 msg_no = ScriptReadByte(ctx); u16 result_var_id = ScriptReadHalfword(ctx); @@ -843,8 +843,8 @@ BOOL ScrCmd_TrainerTips(ScriptContext* ctx) { sub_02002B50(FALSE); sub_02002B8C(FALSE); - Window* window = ov01_021F3D80(fsys->unk68); - u8 text_speed = Options_GetTextFrameDelay(Save_PlayerData_GetOptionsAddr(fsys->savedata)); + Window* window = ov01_021F3D80(fieldSystem->unk68); + u8 text_speed = Options_GetTextFrameDelay(Save_PlayerData_GetOptionsAddr(fieldSystem->savedata)); *printer_id_ptr = AddTextPrinterParameterized2(window, 1, *unk, 0, 0, text_speed, MakeTextColor(2, 10, 15), NULL); ctx->data[0] = result_var_id; @@ -853,10 +853,10 @@ BOOL ScrCmd_TrainerTips(ScriptContext* ctx) { } static BOOL sub_02041520(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u8* printer_id_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); - u16* ret_ptr = GetVarPointer(fsys, ctx->data[0]); - u8 unused = ov01_021F3D84(fsys->unk68); + FieldSystem* fieldSystem = ctx->fieldSystem; + u8* printer_id_ptr = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); + u16* ret_ptr = GetVarPointer(fieldSystem, ctx->data[0]); + u8 unused = ov01_021F3D84(fieldSystem->unk68); u16 direction = 0xFFFF; @@ -878,9 +878,9 @@ static BOOL sub_02041520(ScriptContext* ctx) { if (direction != 0xFFFF) { sub_020200A0(*printer_id_ptr); - PlayerAvatar_SetFacingDirection(ctx->fsys->playerAvatar, direction); + PlayerAvatar_SetFacingDirection(ctx->fieldSystem->playerAvatar, direction); *ret_ptr = 0; - ctx->fsys->unkD2_6 = 0; + ctx->fieldSystem->unkD2_6 = 0; return TRUE; } @@ -896,14 +896,14 @@ BOOL ScrCmd_060(ScriptContext* ctx) { } static BOOL sub_020415E0(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - u16* ret_ptr = GetVarPointer(fsys, ctx->data[0]); + FieldSystem* fieldSystem = ctx->fieldSystem; + u16* ret_ptr = GetVarPointer(fieldSystem, ctx->data[0]); u16 direction = 0xFFFF; int new_keys = gSystem.newKeys; if ((new_keys & (PAD_BUTTON_A | PAD_BUTTON_B)) != 0) { *ret_ptr = 0; - fsys->unkD2_6 = 0; + fieldSystem->unkD2_6 = 0; return TRUE; } @@ -918,9 +918,9 @@ static BOOL sub_020415E0(ScriptContext* ctx) { } if (direction != 0xFFFF) { - PlayerAvatar_SetFacingDirection(ctx->fsys->playerAvatar, direction); + PlayerAvatar_SetFacingDirection(ctx->fieldSystem->playerAvatar, direction); *ret_ptr = 0; - fsys->unkD2_6 = 0; + fieldSystem->unkD2_6 = 0; return TRUE; } @@ -928,25 +928,25 @@ static BOOL sub_020415E0(ScriptContext* ctx) { } BOOL ScrCmd_061(ScriptContext* ctx) { - sub_0204031C(ctx->fsys); + sub_0204031C(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_YesNo(ScriptContext* ctx) { - FieldSystem *fsys = ctx->fsys; - struct ListMenu2D **listMenu2D = FieldSysGetAttrAddr(fsys, SCRIPTENV_LIST_MENU_2D); + FieldSystem *fieldSystem = ctx->fieldSystem; + struct ListMenu2D **listMenu2D = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LIST_MENU_2D); u16 data = ScriptReadHalfword(ctx); - LoadUserFrameGfx1(fsys->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4); - *listMenu2D = Std_CreateYesNoMenu(fsys->bgConfig, &_020FAC94, 0x3D9, 11, HEAP_ID_4); + LoadUserFrameGfx1(fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 11, 0, HEAP_ID_4); + *listMenu2D = Std_CreateYesNoMenu(fieldSystem->bgConfig, &_020FAC94, 0x3D9, 11, HEAP_ID_4); ctx->data[0] = data; SetupNativeScript(ctx, sub_020416E4); return TRUE; } BOOL sub_020416E4(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - struct ListMenu2D **listMenu2D = FieldSysGetAttrAddr(fsys, SCRIPTENV_LIST_MENU_2D); - u16 *ret_p = GetVarPointer(fsys, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + struct ListMenu2D **listMenu2D = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LIST_MENU_2D); + u16 *ret_p = GetVarPointer(fieldSystem, ctx->data[0]); int selection = Handle2dMenuInput_DeleteOnFinish(*listMenu2D, HEAP_ID_4); if (selection == LIST_NOTHING_CHOSEN) { return FALSE; @@ -961,42 +961,42 @@ BOOL sub_020416E4(ScriptContext *ctx) { } BOOL ScrCmd_AddWaitingIcon(ScriptContext *ctx) { - Window *window = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_WINDOW); - WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_WAITING_ICON); + Window *window = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WINDOW); + WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WAITING_ICON); *waitingIcon = WaitingIcon_New(window, 0x3E2); return FALSE; } BOOL ScrCmd_RemoveWaitingIcon(ScriptContext *ctx) { - WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_WAITING_ICON); + WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WAITING_ICON); sub_0200F450(*waitingIcon); return FALSE; } static void sub_02041770(ScriptContext *ctx, struct UnkStruct_ov01_021EDC28 **a1, MsgData *msgData) { - FieldSystem *fsys = ctx->fsys; - MessageFormat **msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem *fieldSystem = ctx->fieldSystem; + MessageFormat **msgFmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); u8 initCursorPos = ScriptReadByte(ctx); u8 cancellable = ScriptReadByte(ctx); u16 var = ScriptReadHalfword(ctx); - *a1 = ov01_021EDF78(fsys, x, y, initCursorPos, cancellable, GetVarPointer(fsys, var), *msgFmt, FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_WINDOW), msgData); + *a1 = ov01_021EDF78(fieldSystem, x, y, initCursorPos, cancellable, GetVarPointer(fieldSystem, var), *msgFmt, FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WINDOW), msgData); ctx->data[0] = var; } BOOL ScrCmd_064(ScriptContext *ctx) { - sub_02041770(ctx, FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW), NULL); + sub_02041770(ctx, FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW), NULL); return TRUE; } BOOL ScrCmd_065(ScriptContext *ctx) { - sub_02041770(ctx, FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW), ctx->msgdata); + sub_02041770(ctx, FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW), ctx->msgdata); return TRUE; } BOOL ScrCmd_066(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u8 msgId = ScriptReadByte(ctx); u8 value = ScriptReadByte(ctx); ov01_021EDC7C(*pp_menu, msgId, value); @@ -1004,7 +1004,7 @@ BOOL ScrCmd_066(ScriptContext *ctx) { } BOOL ScrCmd_559(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u16 msgId = ScriptGetVar(ctx); u16 value = ScriptGetVar(ctx); ov01_021EDC7C(*pp_menu, msgId, value); @@ -1014,31 +1014,31 @@ BOOL ScrCmd_559(ScriptContext *ctx) { BOOL sub_020418B4(ScriptContext *ctx); BOOL ScrCmd_067(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); ov01_021EDC84(*pp_menu); SetupNativeScript(ctx, sub_020418B4); return TRUE; } BOOL sub_020418B4(ScriptContext *ctx) { - return *GetVarPointer(ctx->fsys, ctx->data[0]) != 0xEEEE; + return *GetVarPointer(ctx->fieldSystem, ctx->data[0]) != 0xEEEE; } BOOL sub_02041900(ScriptContext *ctx); BOOL ScrCmd_585(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); ov01_021EDC84(*pp_menu); SetupNativeScript(ctx, sub_02041900); return TRUE; } BOOL sub_02041900(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - u16 *p_var = GetVarPointer(fsys, ctx->data[0]); - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(fsys, SCRIPTENV_MENU_WINDOW); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *p_var = GetVarPointer(fieldSystem, ctx->data[0]); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MENU_WINDOW); if (*p_var == 0xEEEE) { - if (sub_0205A478(fsys->unk80)) { + if (sub_0205A478(fieldSystem->unk80)) { *p_var = 8; ov01_021EDF38(*pp_menu); return TRUE; @@ -1051,17 +1051,17 @@ BOOL sub_02041900(ScriptContext *ctx) { } BOOL ScrCmd_068(ScriptContext *ctx) { - sub_02041770(ctx, FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW), NULL); + sub_02041770(ctx, FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW), NULL); return TRUE; } BOOL ScrCmd_069(ScriptContext *ctx) { - sub_02041770(ctx, FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW), ctx->msgdata); + sub_02041770(ctx, FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW), ctx->msgdata); return TRUE; } BOOL ScrCmd_070(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u16 r6 = ScriptGetVar(ctx); u16 r7 = ScriptGetVar(ctx); u16 r3 = ScriptGetVar(ctx); @@ -1070,14 +1070,14 @@ BOOL ScrCmd_070(ScriptContext *ctx) { } BOOL ScrCmd_071(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); ov01_021EDFA4(*pp_menu); SetupNativeScript(ctx, sub_020418B4); return TRUE; } BOOL ScrCmd_695(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u16 var = ScriptGetVar(ctx); ov01_021EE014(*pp_menu, var); SetupNativeScript(ctx, sub_020418B4); @@ -1085,7 +1085,7 @@ BOOL ScrCmd_695(ScriptContext *ctx) { } BOOL ScrCmd_677(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u16 *var1 = ScriptGetVarPointer(ctx); u16 *var2 = ScriptGetVarPointer(ctx); ov01_021EE0EC(*pp_menu, var1, var2); @@ -1094,7 +1094,7 @@ BOOL ScrCmd_677(ScriptContext *ctx) { } BOOL ScrCmd_072(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u8 val = ScriptReadByte(ctx); ov01_021EE974(*pp_menu, val); SetupNativeScript(ctx, sub_020418B4); @@ -1102,14 +1102,14 @@ BOOL ScrCmd_072(ScriptContext *ctx) { } BOOL ScrCmd_841(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u8 val = ScriptReadByte(ctx); ov01_021EF018(*pp_menu, val); return TRUE; } BOOL ScrCmd_842(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MENU_WINDOW); + struct UnkStruct_ov01_021EDC28 **pp_menu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u8 val = ScriptReadByte(ctx); ov01_021EF034(*pp_menu, val); return TRUE; @@ -1118,7 +1118,7 @@ BOOL ScrCmd_842(ScriptContext *ctx) { BOOL ScrCmd_ApplyMovement(ScriptContext *ctx) { u16 person = ScriptGetVar(ctx); u32 offset = ScriptReadWord(ctx); - LocalMapObject *object = sub_02041C70(ctx->fsys, person); + LocalMapObject *object = sub_02041C70(ctx->fieldSystem, person); EventObjectMovementMan *mvtMan; u8 *mvtCounter; @@ -1130,9 +1130,9 @@ BOOL ScrCmd_ApplyMovement(ScriptContext *ctx) { ov01_021F7704(object); } mvtMan = EventObjectMovementMan_Create(object, (const MovementScriptCommand *)(ctx->script_ptr + offset)); - mvtCounter = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); + mvtCounter = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); (*mvtCounter)++; - _ScheduleObjectEventMovement(ctx->fsys, mvtMan, NULL); + _ScheduleObjectEventMovement(ctx->fieldSystem, mvtMan, NULL); return FALSE; } @@ -1142,7 +1142,7 @@ BOOL ScrCmd_563(ScriptContext *ctx) { u16 y = ScriptGetVar(ctx); u16 now_x, now_y; int i; - LocalMapObject *object = sub_02041C70(ctx->fsys, person); + LocalMapObject *object = sub_02041C70(ctx->fieldSystem, person); MovementScriptCommand *cmd; EventObjectMovementMan *mvtMan; u8 *mvtCounter; @@ -1174,20 +1174,20 @@ BOOL ScrCmd_563(ScriptContext *ctx) { cmd[i].length = 0; mvtMan = EventObjectMovementMan_Create(object, cmd); - mvtCounter = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); + mvtCounter = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); (*mvtCounter)++; - _ScheduleObjectEventMovement(ctx->fsys, mvtMan, cmd); + _ScheduleObjectEventMovement(ctx->fieldSystem, mvtMan, cmd); return FALSE; } -LocalMapObject *sub_02041C70(FieldSystem *fsys, u16 person) { +LocalMapObject *sub_02041C70(FieldSystem *fieldSystem, u16 person) { if (person == 0xF2) { - return sub_0205EEB4(fsys->mapObjectMan, 0x30); + return sub_0205EEB4(fieldSystem->mapObjectMan, 0x30); } else if (person == 0xF1) { - LocalMapObject **attr = FieldSysGetAttrAddr(fsys, SCRIPTENV_CAMERA_TARGET); + LocalMapObject **attr = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_CAMERA_TARGET); return *attr; } else { - return GetMapObjectByID(fsys->mapObjectMan, person); + return GetMapObjectByID(fieldSystem->mapObjectMan, person); } } @@ -1199,7 +1199,7 @@ BOOL ScrCmd_WaitMovement(ScriptContext *ctx) { } static BOOL IsAllMovementFinished(ScriptContext *ctx) { - u8 *movCounter = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); + u8 *movCounter = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); return *movCounter == 0; } @@ -1207,25 +1207,25 @@ struct ObjectMovementTaskEnv { SysTask *task; EventObjectMovementMan *mvtMan; struct MovementScriptCommand *cmd; - FieldSystem *fsys; + FieldSystem *fieldSystem; }; void _RunObjectEventMovement(SysTask *task, struct ObjectMovementTaskEnv *env); -void _ScheduleObjectEventMovement(FieldSystem *fsys, EventObjectMovementMan *mvtMan, MovementScriptCommand *a2) { +void _ScheduleObjectEventMovement(FieldSystem *fieldSystem, EventObjectMovementMan *mvtMan, MovementScriptCommand *a2) { struct ObjectMovementTaskEnv *env = AllocFromHeap(HEAP_ID_4, sizeof(struct ObjectMovementTaskEnv)); if (env == NULL) { GF_ASSERT(0); return; } - env->fsys = fsys; + env->fieldSystem = fieldSystem; env->mvtMan = mvtMan; env->cmd = a2; env->task = CreateSysTask((SysTaskFunc)_RunObjectEventMovement, env, 0); } void _RunObjectEventMovement(SysTask *task, struct ObjectMovementTaskEnv *env) { - u8 *mvtCnt = FieldSysGetAttrAddr(env->fsys, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); + u8 *mvtCnt = FieldSysGetAttrAddr(env->fieldSystem, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); if (EventObjectMovementMan_IsFinish(env->mvtMan) == TRUE) { EventObjectMovementMan_Delete(env->mvtMan); DestroySysTask(env->task); @@ -1246,13 +1246,13 @@ BOOL _WaitFollowPokePaused(ScriptContext *ctx); BOOL ScrCmd_LockAll(ScriptContext *ctx) { LocalMapObject **p_lastInteracted; LocalMapObject *followingPoke; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; - p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); + p_lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); if (*p_lastInteracted == NULL) { - MapObjectManager_PauseAllMovement(fsys->mapObjectMan); - followingPoke = FollowingPokemon_GetMapObject(fsys); - if (FollowingPokemon_IsActive(fsys) && MapObject_IsSingleMovementActive(followingPoke)) { + MapObjectManager_PauseAllMovement(fieldSystem->mapObjectMan); + followingPoke = FollowingPokemon_GetMapObject(fieldSystem); + if (FollowingPokemon_IsActive(fieldSystem) && MapObject_IsSingleMovementActive(followingPoke)) { MapObject_UnpauseMovement(followingPoke); SetupNativeScript(ctx, _WaitFollowPokePaused); return TRUE; @@ -1284,9 +1284,9 @@ static inline void _ResetMovementPauseWaitFlags(void) { } static BOOL _WaitMovementPauseBeforeMsg(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); - LocalMapObject *playerObj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + FieldSystem *fieldSystem = ctx->fieldSystem; + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); + LocalMapObject *playerObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); LocalMapObject *unk; if (_CheckMovementPauseWaitFlag(1)) { @@ -1304,7 +1304,7 @@ static BOOL _WaitMovementPauseBeforeMsg(ScriptContext *ctx) { } if (_CheckMovementPauseWaitFlag(2)) { - unk = sub_0205EEB4(fsys->mapObjectMan, 0x30); + unk = sub_0205EEB4(fieldSystem->mapObjectMan, 0x30); if (MapObject_IsSingleMovementActive(unk) == FALSE) { MapObject_PauseMovement(unk); _ClearMovementPauseWaitFlag(2); @@ -1323,7 +1323,7 @@ static BOOL _WaitMovementPauseBeforeMsg(ScriptContext *ctx) { } BOOL _WaitFollowPokePaused(ScriptContext *ctx) { - LocalMapObject *tsurePoke = FollowingPokemon_GetMapObject(ctx->fsys); + LocalMapObject *tsurePoke = FollowingPokemon_GetMapObject(ctx->fieldSystem); if (MapObject_IsSingleMovementActive(tsurePoke) == FALSE) { MapObject_PauseMovement(tsurePoke); return TRUE; @@ -1333,12 +1333,12 @@ BOOL _WaitFollowPokePaused(ScriptContext *ctx) { } BOOL ScrCmd_LockLastTalked(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); - LocalMapObject *playerObject = PlayerAvatar_GetMapObject(fsys->playerAvatar); - LocalMapObject *unk = sub_0205EEB4(fsys->mapObjectMan, 0x30); + 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 *unk2 = sub_020660C0(*p_lastInteracted); - MapObjectManager *mapObjectMan = fsys->mapObjectMan; + MapObjectManager *mapObjectMan = fieldSystem->mapObjectMan; _ResetMovementPauseWaitFlags(); @@ -1354,7 +1354,7 @@ BOOL ScrCmd_LockLastTalked(ScriptContext *ctx) { MapObject_UnpauseMovement(*p_lastInteracted); } - if (unk != NULL && FollowingPokemon_IsActive(fsys) && MapObject_IsSingleMovementActive(unk) == FALSE) { + if (unk != NULL && FollowingPokemon_IsActive(fieldSystem) && MapObject_IsSingleMovementActive(unk) == FALSE) { _SetMovementPauseWaitFlag(2); MapObject_UnpauseMovement(unk); } @@ -1369,14 +1369,14 @@ BOOL ScrCmd_LockLastTalked(ScriptContext *ctx) { } BOOL ScrCmd_ReleaseAll(ScriptContext *ctx) { - MapObjectManager_UnpauseAllMovement(ctx->fsys->mapObjectMan); + MapObjectManager_UnpauseAllMovement(ctx->fieldSystem->mapObjectMan); return TRUE; } BOOL ScrCmd_098(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 objectId = ScriptReadHalfword(ctx); - LocalMapObject *object = GetMapObjectByID(fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objectId); if (object != NULL) { MapObject_PauseMovement(object); } else { @@ -1386,9 +1386,9 @@ BOOL ScrCmd_098(ScriptContext *ctx) { } BOOL ScrCmd_099(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 objectId = ScriptReadHalfword(ctx); - LocalMapObject *object = GetMapObjectByID(fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objectId); if (object != NULL) { MapObject_UnpauseMovement(object); } else { @@ -1398,18 +1398,18 @@ BOOL ScrCmd_099(ScriptContext *ctx) { } BOOL ScrCmd_ShowPerson(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 objectId = ScriptGetVar(ctx); - u32 nobjs = Field_GetNumObjectEvents(fsys); - const ObjectEvent *objectEvents = Field_GetObjectEvents(fsys); - GF_ASSERT(CreateMapObjectFromTemplate(fsys->mapObjectMan, objectId, nobjs, fsys->location->mapId, objectEvents)); + u32 nobjs = Field_GetNumObjectEvents(fieldSystem); + const ObjectEvent *objectEvents = Field_GetObjectEvents(fieldSystem); + GF_ASSERT(CreateMapObjectFromTemplate(fieldSystem->mapObjectMan, objectId, nobjs, fieldSystem->location->mapId, objectEvents)); return FALSE; } BOOL ScrCmd_HidePerson(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 objectId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objectId); if (object == NULL) { GF_ASSERT(0); } else { @@ -1421,33 +1421,33 @@ BOOL ScrCmd_HidePerson(ScriptContext *ctx) { BOOL ScrCmd_102(ScriptContext *ctx) { u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET); + LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET); VecFx32 *pos; - *p_cameraObj = CreateSpecialFieldObject(ctx->fsys->mapObjectMan, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fsys->location->mapId); + *p_cameraObj = CreateSpecialFieldObject(ctx->fieldSystem->mapObjectMan, 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); pos = MapObject_GetPositionVecPtr(*p_cameraObj); - ov01_021F62E8(pos, ctx->fsys->unk2C); - Camera_SetFixedTarget(pos, ctx->fsys->camera); + ov01_021F62E8(pos, ctx->fieldSystem->unk2C); + Camera_SetFixedTarget(pos, ctx->fieldSystem->camera); return FALSE; } BOOL ScrCmd_103(ScriptContext *ctx) { - LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET); + LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET); VecFx32 *pos; MapObject_Remove(*p_cameraObj); - pos = MapObject_GetPositionVecPtr(GetMapObjectByID(ctx->fsys->mapObjectMan, obj_player)); - ov01_021F62E8(pos, ctx->fsys->unk2C); - Camera_SetFixedTarget(pos, ctx->fsys->camera); + pos = MapObject_GetPositionVecPtr(GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_player)); + ov01_021F62E8(pos, ctx->fieldSystem->unk2C); + Camera_SetFixedTarget(pos, ctx->fieldSystem->camera); return FALSE; } BOOL ScrCmd_678(ScriptContext *ctx) { u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET); - *p_cameraObj = CreateSpecialFieldObject(ctx->fsys->mapObjectMan, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fsys->location->mapId); + 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); sub_02061070(*p_cameraObj); MapObject_SetVisible(*p_cameraObj, TRUE); MapObject_ClearFlag18(*p_cameraObj, FALSE); @@ -1455,15 +1455,15 @@ BOOL ScrCmd_678(ScriptContext *ctx) { } BOOL ScrCmd_679(ScriptContext *ctx) { - LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET); + LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET); MapObject_Remove(*p_cameraObj); return FALSE; } BOOL ScrCmd_FacePlayer(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - u32 rvsDir = sub_020611F4(PlayerAvatar_GetFacingDirection(fsys->playerAvatar)); - LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); + FieldSystem *fieldSystem = ctx->fieldSystem; + u32 rvsDir = sub_020611F4(PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar)); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); u32 oldDir; int x, y; int metatile; @@ -1476,7 +1476,7 @@ BOOL ScrCmd_FacePlayer(ScriptContext *ctx) { if (MapObject_GetID(*p_lastInteracted) == obj_partner_poke) { if (ov01_022055DC(*p_lastInteracted) && oldDir != rvsDir) { ov01_02205604(*p_lastInteracted, &x, &y); - metatile = GetMetatileBehaviorAt(fsys, x, y); + metatile = GetMetatileBehaviorAt(fieldSystem, x, y); if (rvsDir == 2 || rvsDir == 3) { if (MetatileBehavior_IsEncounterGrass(metatile) == TRUE) { ov01_021FF0E4(*p_lastInteracted, 0, x, y, 1); @@ -1501,19 +1501,19 @@ BOOL ScrCmd_FacePlayer(ScriptContext *ctx) { } BOOL ScrCmd_GetPlayerCoords(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_x = ScriptGetVarPointer(ctx); u16 *p_y = ScriptGetVarPointer(ctx); - *p_x = GetPlayerXCoord(fsys->playerAvatar); - *p_y = GetPlayerYCoord(fsys->playerAvatar); + *p_x = GetPlayerXCoord(fieldSystem->playerAvatar); + *p_y = GetPlayerYCoord(fieldSystem->playerAvatar); return FALSE; } BOOL ScrCmd_GetPersonCoords(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 personId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(fsys->mapObjectMan, personId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, personId); u16 *p_x = ScriptGetVarPointer(ctx); u16 *p_y = ScriptGetVarPointer(ctx); @@ -1530,7 +1530,7 @@ BOOL ScrCmd_GetPersonCoords(ScriptContext *ctx) { BOOL ScrCmd_GetPlayerFacing(ScriptContext *ctx) { u16 *p_direction = ScriptGetVarPointer(ctx); - *p_direction = PlayerAvatar_GetFacingDirection(ctx->fsys->playerAvatar); + *p_direction = PlayerAvatar_GetFacingDirection(ctx->fieldSystem->playerAvatar); return FALSE; } @@ -1545,14 +1545,14 @@ BOOL ScrCmd_107(ScriptContext *ctx) { shift_v.y = FX32_CONST(y); shift_v.z = FX32_CONST(z); - sub_0205F9A0(PlayerAvatar_GetMapObject(ctx->fsys->playerAvatar), &shift_v); - Camera_OffsetLookAtPosAndTarget(&shift_v, ctx->fsys->camera); + sub_0205F9A0(PlayerAvatar_GetMapObject(ctx->fieldSystem->playerAvatar), &shift_v); + Camera_OffsetLookAtPosAndTarget(&shift_v, ctx->fieldSystem->camera); return FALSE; } BOOL ScrCmd_108(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, 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->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, 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->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); if (object != NULL) { *p_dest = MapObject_GetMovement(object); } @@ -1582,33 +1582,33 @@ BOOL ScrCmd_574(ScriptContext *ctx) { BOOL ScrCmd_136(ScriptContext *ctx) { u16 partyIdx = ScriptGetVar(ctx); u16 *p_dest = ScriptGetVarPointer(ctx); - *p_dest = GetMonUnownLetter(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), partyIdx)); + *p_dest = GetMonUnownLetter(Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), partyIdx)); return FALSE; } BOOL ScrCmd_PartySelectUI(ScriptContext *ctx) { - PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *partyMenu = sub_0203E580(HEAP_ID_32, ctx->fsys); + PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *partyMenu = sub_0203E580(HEAP_ID_32, ctx->fieldSystem); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } BOOL ScrCmd_566(ScriptContext *ctx) { //todo: trade screen - PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *partyMenu = sub_0203E5A4(HEAP_ID_32, ctx->fsys); + PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *partyMenu = sub_0203E5A4(HEAP_ID_32, ctx->fieldSystem); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } BOOL ScrCmd_350(ScriptContext *ctx) { //todo: union pokemon selection - PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *partyMenu = sub_0203E6D4(ctx->fsys->taskman, HEAP_ID_32); + PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *partyMenu = sub_0203E6D4(ctx->fieldSystem->taskman, HEAP_ID_32); return TRUE; } BOOL ScrCmd_PartySelect(ScriptContext *ctx) { //todo: get selected pokemon slot u16 *dest_p = ScriptGetVarPointer(ctx); - PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); GF_ASSERT(*partyMenu != NULL); *dest_p = sub_0203E5C8(*partyMenu); if (*dest_p == 7) { @@ -1622,7 +1622,7 @@ BOOL ScrCmd_PartySelect(ScriptContext *ctx) { //todo: get selected pokemon slot BOOL ScrCmd_635(ScriptContext *ctx) { u16 *r5 = ScriptGetVarPointer(ctx); u16 *r6 = ScriptGetVarPointer(ctx); - PartyMenuAppData **partyMenuPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + PartyMenuAppData **partyMenuPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); PartyMenuAppData *partyMenu; int r0; partyMenu = *partyMenuPtr; @@ -1647,7 +1647,7 @@ BOOL ScrCmd_639(ScriptContext *ctx) { u16 *r5 = ScriptGetVarPointer(ctx); u16 *sp0 = ScriptGetVarPointer(ctx); u16 *r7 = ScriptGetVarPointer(ctx); - struct PartyMenuAppData **partyMenuPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + struct PartyMenuAppData **partyMenuPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); struct PartyMenuAppData *partyMenu = *partyMenuPtr; GF_ASSERT(partyMenu != NULL); int r0 = sub_0203E5C8(*partyMenuPtr); @@ -1672,7 +1672,7 @@ BOOL ScrCmd_645(ScriptContext *ctx) { u16 *r5 = ScriptGetVarPointer(ctx); u16 *sp0 = ScriptGetVarPointer(ctx); u16 *r7 = ScriptGetVarPointer(ctx); - struct PartyMenuAppData **partyMenuPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + struct PartyMenuAppData **partyMenuPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); struct PartyMenuAppData *partyMenu = *partyMenuPtr; GF_ASSERT(partyMenu != NULL); int r0 = sub_0203E5C8(*partyMenuPtr); @@ -1696,7 +1696,7 @@ BOOL ScrCmd_645(ScriptContext *ctx) { BOOL ScrCmd_GetMoveSelection(ScriptContext *ctx) { u8 r6 = ScriptReadByte(ctx); u16 *r5 = ScriptGetVarPointer(ctx); - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); //presumably move selection data? + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //presumably move selection data? GF_ASSERT(*p_work != NULL); if (r6 == 1) { *r5 = sub_0203E864(*p_work); @@ -1709,14 +1709,14 @@ BOOL ScrCmd_GetMoveSelection(ScriptContext *ctx) { } BOOL ScrCmd_ChooseMoveUI(ScriptContext *ctx) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u8 r6 = ScriptReadByte(ctx); u16 r7 = ScriptGetVar(ctx); u16 r3 = ScriptGetVar(ctx); if (r6 == 1) { - *p_work = sub_0203E7F4(HEAP_ID_32, ctx->fsys, r7, r3); + *p_work = sub_0203E7F4(HEAP_ID_32, ctx->fieldSystem, r7, r3); } else { - *p_work = sub_0203FB94(HEAP_ID_32, ctx->fsys, r7, r3); + *p_work = sub_0203FB94(HEAP_ID_32, ctx->fieldSystem, r7, r3); } SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; @@ -1727,7 +1727,7 @@ BOOL ScrCmd_GetPhoneBookRematch(ScriptContext *ctx) { u16 *r6 = ScriptGetVarPointer(ctx); struct PhoneBook *phoneBook = AllocAndReadPhoneBook(HEAP_ID_32); HandleLoadOverlay(FS_OVERLAY_ID(OVY_26), OVY_LOAD_ASYNC); - *r6 = PhoneBookTrainerGetRematchInfo(r4, ctx->fsys->savedata, phoneBook, (TimeOfDayWildParam)(u8)Field_GetTimeOfDayWildParam(ctx->fsys)); + *r6 = PhoneBookTrainerGetRematchInfo(r4, ctx->fieldSystem->savedata, phoneBook, (TimeOfDayWildParam)(u8)Field_GetTimeOfDayWildParam(ctx->fieldSystem)); UnloadOverlayByID(FS_OVERLAY_ID(OVY_26)); FreePhoneBook(phoneBook); return FALSE; @@ -1735,14 +1735,14 @@ BOOL ScrCmd_GetPhoneBookRematch(ScriptContext *ctx) { BOOL ScrCmd_684(ScriptContext *ctx) { u16 *p_dest = ScriptGetVarPointer(ctx); - *p_dest = LocalFieldData_GetWeatherType(Save_LocalFieldData_Get(ctx->fsys->savedata)); + *p_dest = LocalFieldData_GetWeatherType(Save_LocalFieldData_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrNative_WaitApplication_DestroyTaskData(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - void **p_work = FieldSysGetAttrAddr(fsys, SCRIPTENV_RUNNING_APP_DATA); - if (FieldSys_ApplicationIsRunning(fsys)) { + FieldSystem *fieldSystem = ctx->fieldSystem; + void **p_work = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return FALSE; } FreeToHeap(*p_work); @@ -1751,20 +1751,20 @@ BOOL ScrNative_WaitApplication_DestroyTaskData(ScriptContext *ctx) { } static BOOL sub_020429A0(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - void **p_work = FieldSysGetAttrAddr(fsys, SCRIPTENV_RUNNING_APP_DATA); - if (FieldSys_ApplicationIsRunning(fsys)) { + FieldSystem *fieldSystem = ctx->fieldSystem; + void **p_work = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + if (FieldSystem_ApplicationIsRunning(fieldSystem)) { return FALSE; } - sub_02093070(fsys); + sub_02093070(fieldSystem); FreeToHeap(*p_work); *p_work = NULL; return TRUE; } static BOOL sub_020429D4(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - void **p_work = FieldSysGetAttrAddr(fsys, SCRIPTENV_RUNNING_APP_DATA); + FieldSystem *fieldSystem = ctx->fieldSystem; + void **p_work = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_RUNNING_APP_DATA); if (!sub_020970C0(*p_work)) { return FALSE; } @@ -1773,7 +1773,7 @@ static BOOL sub_020429D4(ScriptContext *ctx) { } BOOL ScrNative_WaitApplication(ScriptContext *ctx) { - if (!FieldSys_ApplicationIsRunning(ctx->fsys)) { + if (!FieldSystem_ApplicationIsRunning(ctx->fieldSystem)) { return TRUE; } else { return FALSE; @@ -1781,17 +1781,17 @@ BOOL ScrNative_WaitApplication(ScriptContext *ctx) { } BOOL ScrCmd_150(ScriptContext *ctx) { - sub_020552A4(ctx->fsys->taskman); + sub_020552A4(ctx->fieldSystem->taskman); return TRUE; } BOOL ScrCmd_436(ScriptContext *ctx) { - sub_0205525C(ctx->fsys->taskman); + sub_0205525C(ctx->fieldSystem->taskman); return TRUE; } -static BOOL sub_02042A30(FieldSystem *fsys, int a1, int a2) { - SaveFashionData *fashionData = Save_FashionData_Get(fsys->savedata); +static BOOL sub_02042A30(FieldSystem *fieldSystem, int a1, int a2) { + SaveFashionData *fashionData = Save_FashionData_Get(fieldSystem->savedata); if (a1 == 0) { if (!sub_0202B9EC(fashionData, a2)) { return FALSE; @@ -1804,10 +1804,10 @@ static BOOL sub_02042A30(FieldSystem *fsys, int a1, int a2) { return TRUE; } -static FashionAppData *sub_02042A60(HeapID heapId, FieldSystem *fsys, int a2, int a3) { - SaveFashionData *saveFashionData = Save_FashionData_Get(fsys->savedata); +static FashionAppData *sub_02042A60(HeapID heapId, FieldSystem *fieldSystem, int a2, int a3) { + SaveFashionData *saveFashionData = Save_FashionData_Get(fieldSystem->savedata); FashionAppData *fashionAppData; - if (!sub_02042A30(fsys, a2, a3)) { + if (!sub_02042A30(fieldSystem, a2, a3)) { return NULL; } fashionAppData = AllocFromHeap(heapId, sizeof(FashionAppData)); @@ -1819,7 +1819,7 @@ static FashionAppData *sub_02042A60(HeapID heapId, FieldSystem *fsys, int a2, in } BOOL ScrCmd_151(ScriptContext *ctx) { - ov01_021F729C(ctx->fsys); + ov01_021F729C(ctx->fieldSystem); return TRUE; } @@ -1829,7 +1829,7 @@ BOOL ScrCmd_152(ScriptContext *ctx) { } BOOL ScrCmd_153(ScriptContext *ctx) { - struct FashionAppData **p_data = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + struct FashionAppData **p_data = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u16 *p_dest = ScriptGetVarPointer(ctx); *p_dest = (*p_data)->unk_4; FreeToHeap(*p_data); @@ -1843,32 +1843,32 @@ BOOL ScrCmd_451(ScriptContext *ctx) { } BOOL ScrCmd_452(ScriptContext *ctx) { - struct PokepicManager **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + struct PokepicManager **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 species = ScriptGetVar(ctx); u16 gender = ScriptGetVar(ctx); - LoadUserFrameGfx1(ctx->fsys->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 0xB, 0, HEAP_ID_4); - *p_work = DrawPokemonPicFromSpecies(ctx->fsys->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, species, gender, HEAP_ID_4); - Script_SetMonSeenFlagBySpecies(ctx->fsys, species); + LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 0xB, 0, HEAP_ID_4); + *p_work = DrawPokemonPicFromSpecies(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, species, gender, HEAP_ID_4); + Script_SetMonSeenFlagBySpecies(ctx->fieldSystem, species); return FALSE; } BOOL ScrCmd_547(ScriptContext *ctx) { - struct PokepicManager **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + struct PokepicManager **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 partyIdx = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), partyIdx); - LoadUserFrameGfx1(ctx->fsys->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 0xB, 0, HEAP_ID_4); - *p_work = DrawPokemonPicFromMon(ctx->fsys->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, mon, HEAP_ID_4); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), partyIdx); + LoadUserFrameGfx1(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 0x3D9, 0xB, 0, HEAP_ID_4); + *p_work = DrawPokemonPicFromMon(ctx->fieldSystem->bgConfig, GF_BG_LYR_MAIN_3, 10, 5, 11, 0x3D9, mon, HEAP_ID_4); return FALSE; } BOOL ScrCmd_453(ScriptContext *ctx) { - u8 **r0 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + u8 **r0 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); **r0 = 1; return TRUE; } BOOL ScrCmd_548(ScriptContext *ctx) { - u8 **r0 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + u8 **r0 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); **r0 = 2; return TRUE; } @@ -1880,16 +1880,16 @@ BOOL ScrCmd_549(ScriptContext *ctx) { } BOOL sub_02042C78(ScriptContext *ctx) { - u8 **r0 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); - u16 *dest_p = GetVarPointer(ctx->fsys, ctx->data[0]); + u8 **r0 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); + u16 *dest_p = GetVarPointer(ctx->fieldSystem, ctx->data[0]); return **r0 != 3; } BOOL ScrCmd_454(ScriptContext *ctx) { - LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); HandleLoadOverlay(FS_OVERLAY_ID(OVY_26), OVY_LOAD_ASYNC); if (*p_lastInteracted != NULL) { - ov26_022599D8(ctx->fsys, *p_lastInteracted); + ov26_022599D8(ctx->fieldSystem, *p_lastInteracted); } UnloadOverlayByID(FS_OVERLAY_ID(OVY_26)); return FALSE; @@ -1905,21 +1905,21 @@ BOOL ScrCmd_154(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); u16 *r6 = ScriptGetVarPointer(ctx); u16 sp0 = ScriptGetVar(ctx); - sub_0203F198(ctx->fsys->taskman, r6, ctx->fsys->savedata, r4, sp0); + sub_0203F198(ctx->fieldSystem->taskman, r6, ctx->fieldSystem->savedata, r4, sp0); return TRUE; } BOOL ScrCmd_155(ScriptContext *ctx) { - struct FashionAppData **fashionAppData = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + struct FashionAppData **fashionAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u16 r7 = ScriptReadHalfword(ctx); u16 *r6 = ScriptGetVarPointer(ctx); - *fashionAppData = sub_02042A60(HEAP_ID_FIELD, ctx->fsys, 0, r7); + *fashionAppData = sub_02042A60(HEAP_ID_FIELD, ctx->fieldSystem, 0, r7); if (*fashionAppData == NULL) { *r6 = 1; return TRUE; } else { *r6 = 0; - sub_0203F204(ctx->fsys, *fashionAppData); + sub_0203F204(ctx->fieldSystem, *fashionAppData); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } @@ -1928,7 +1928,7 @@ BOOL ScrCmd_155(ScriptContext *ctx) { BOOL ScrCmd_255(ScriptContext *ctx) { u16 r6 = ScriptReadHalfword(ctx); u16 *r4 = ScriptGetVarPointer(ctx); - if (sub_02042A30(ctx->fsys, 0, r6) == TRUE) { + if (sub_02042A30(ctx->fieldSystem, 0, r6) == TRUE) { *r4 = 1; return TRUE; } else { @@ -1939,24 +1939,24 @@ BOOL ScrCmd_255(ScriptContext *ctx) { BOOL ScrCmd_256(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); - sub_0202BD7C(sub_0202B9B8(Save_FashionData_Get(ctx->fsys->savedata), 0), r4); + sub_0202BD7C(sub_0202B9B8(Save_FashionData_Get(ctx->fieldSystem->savedata), 0), r4); return TRUE; } BOOL ScrCmd_450(ScriptContext *ctx) { - sub_0203F964(ctx->fsys); + sub_0203F964(ctx->fieldSystem); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } BOOL ScrCmd_156(ScriptContext *ctx) { - sub_0206B910(ctx->taskman, ctx->fsys->savedata); + sub_0206B910(ctx->taskman, ctx->fieldSystem->savedata); return TRUE; } BOOL ScrCmd_TownMap(ScriptContext *ctx) { - TownMap **p_townMap = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *p_townMap = TownMap_New(ctx->fsys, 1); + TownMap **p_townMap = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *p_townMap = TownMap_New(ctx->fieldSystem, 1); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } @@ -1964,10 +1964,10 @@ BOOL ScrCmd_TownMap(ScriptContext *ctx) { BOOL ScrCmd_408(ScriptContext *ctx) { u16 r7 = ScriptGetVar(ctx); u16 sp0 = ScriptGetVar(ctx); - struct UnkStruct_ScrCmd408 **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + struct UnkStruct_ScrCmd408 **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); *p_work = AllocFromHeap(HEAP_ID_FIELD, sizeof(struct UnkStruct_ScrCmd408)); InitUnkStructScrCmd408(*p_work, r7, sp0, ctx); - sub_0203F0A8(ctx->fsys, *p_work); + sub_0203F0A8(ctx->fieldSystem, *p_work); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } @@ -1975,52 +1975,52 @@ BOOL ScrCmd_408(ScriptContext *ctx) { BOOL ScrCmd_158(ScriptContext *ctx) { //todo: PC box screen struct PCBoxAppData **p_work; - p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); *p_work = PCBoxAppData_New(ctx); - sub_0203E868(ctx->fsys, *p_work); + sub_0203E868(ctx->fieldSystem, *p_work); SetupNativeScript(ctx, sub_020429A0); return TRUE; } BOOL ScrCmd_159(ScriptContext *ctx) { - sub_0203F4C8(ctx->fsys); + sub_0203F4C8(ctx->fieldSystem); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } BOOL ScrCmd_160(ScriptContext *ctx) { - sub_02069464(ctx->fsys); + sub_02069464(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_161(ScriptContext *ctx) { - sub_0203F4A8(ctx->fsys->taskman); + sub_0203F4A8(ctx->fieldSystem->taskman); return TRUE; } BOOL ScrCmd_162(ScriptContext *ctx) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *p_work = sub_0203F4F8(ctx->fsys); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *p_work = sub_0203F4F8(ctx->fieldSystem); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } BOOL ScrCmd_HOF_Credits(ScriptContext *ctx) { u16 vsTrainerRed = ScriptReadHalfword(ctx); - CallTask_GameClear(ctx->fsys->taskman, vsTrainerRed); + CallTask_GameClear(ctx->fieldSystem->taskman, vsTrainerRed); return TRUE; } BOOL ScrCmd_164(ScriptContext *ctx) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); //todo: hall of fame data - *p_work = sub_0203F984(ctx->fsys); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //todo: hall of fame data + *p_work = sub_0203F984(ctx->fieldSystem); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } BOOL ScrCmd_706(ScriptContext *ctx) { int saveOk; - HALL_OF_FAME *hof = LoadHallOfFame(ctx->fsys->savedata, HEAP_ID_4, &saveOk); + HALL_OF_FAME *hof = LoadHallOfFame(ctx->fieldSystem->savedata, HEAP_ID_4, &saveOk); u16 *p_var = ScriptGetVarPointer(ctx); *p_var = 0; if (saveOk == 2) { @@ -2033,9 +2033,9 @@ BOOL ScrCmd_706(ScriptContext *ctx) { BOOL ScrCmd_165(ScriptContext *ctx) { u16 r6 = ScriptGetVar(ctx); u16 *r4 = ScriptGetVarPointer(ctx); - if (sub_0203A05C(ctx->fsys->savedata)) { + if (sub_0203A05C(ctx->fieldSystem->savedata)) { *r4 = 1; - sub_0203F844(ctx->fsys, r6); + sub_0203F844(ctx->fieldSystem, r6); SetupNativeScript(ctx, ScrNative_WaitApplication); } else { *r4 = 0; @@ -2050,23 +2050,23 @@ BOOL ScrCmd_166(ScriptContext *ctx) { } BOOL ScrCmd_ChooseStarter(ScriptContext *ctx) { - LaunchStarterChoiceScene(ctx->fsys); + LaunchStarterChoiceScene(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_333(ScriptContext *ctx) { //todo: bag select screen void **p_work; u8 r4 = ScriptReadByte(ctx) != 0 ? 1 : 0; - p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); GF_ASSERT(*p_work == NULL); - *p_work = sub_0203E460(ctx->fsys, r4); + *p_work = sub_0203E460(ctx->fieldSystem, r4); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } BOOL ScrCmd_334(ScriptContext *ctx) { //todo: bag select screen result u16 *r5 = ScriptGetVarPointer(ctx); - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); GF_ASSERT(*p_work != NULL); *r5 = sub_0203E4CC(*p_work); FreeToHeap(*p_work); @@ -2077,9 +2077,9 @@ BOOL ScrCmd_334(ScriptContext *ctx) { //todo: bag select screen result BOOL ScrCmd_370(ScriptContext *ctx) { //unknown? possibly daycare select screen?? void **p_work; u8 r4 = ScriptReadByte(ctx) != 0 ? 1 : 0; - p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); GF_ASSERT(*p_work == NULL); - *p_work = sub_0203E460(ctx->fsys, r4); + *p_work = sub_0203E460(ctx->fieldSystem, r4); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } @@ -2097,7 +2097,7 @@ BOOL ScrCmd_NameRival(ScriptContext *ctx) { } BOOL ScrCmd_NicknameInput(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 partyPos = ScriptGetVar(ctx); BUGCONTEST *contest; Pokemon *mon; @@ -2106,13 +2106,13 @@ BOOL ScrCmd_NicknameInput(ScriptContext *ctx) { int species; if (partyPos == 255) { - contest = FieldSys_BugContest_Get(fsys); + contest = FieldSystem_BugContest_Get(fieldSystem); if (!contest->caught_poke) { return TRUE; } mon = contest->mon; } else { - mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), partyPos); + mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), partyPos); } GetMonData(mon, MON_DATA_NICKNAME, nickname); var_ret = ScriptGetVarPointer(ctx); @@ -2122,8 +2122,8 @@ BOOL ScrCmd_NicknameInput(ScriptContext *ctx) { } BOOL ScrCmd_629(ScriptContext *ctx) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *p_work = sub_0209707C(ctx->fsys); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *p_work = sub_0209707C(ctx->fieldSystem); SetupNativeScript(ctx, sub_020429D4); return TRUE; } @@ -2146,7 +2146,7 @@ BOOL ScrCmd_492(ScriptContext *ctx) { u16 *r3 = ScriptGetVarPointer(ctx); *r3 = 0xFFFF; - sub_0203E960(ctx->fsys->taskman, r4, r6, r3, NULL); + sub_0203E960(ctx->fieldSystem->taskman, r4, r6, r3, NULL); return TRUE; } @@ -2157,12 +2157,12 @@ BOOL ScrCmd_PromptEasyChat(ScriptContext *ctx) { *r4 = 0xFFFF; *r0 = 0xFFFF; - sub_0203E960(ctx->fsys->taskman, 1, r6, r4, r0); + sub_0203E960(ctx->fieldSystem->taskman, 1, r6, r4, r0); return TRUE; } BOOL ScrCmd_494(ScriptContext *ctx) { - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u16 idx = ScriptGetVar(ctx); u16 word = ScriptGetVar(ctx); BufferECWord(*p_msgFmt, idx, word); @@ -2207,17 +2207,17 @@ BOOL ScrCmd_448(ScriptContext *ctx) { u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); u16 direction = ScriptReadHalfword(ctx); - sub_0205412C(ctx->fsys->taskman, mapId, -1, x, y, direction); + sub_0205412C(ctx->fieldSystem->taskman, mapId, -1, x, y, direction); return TRUE; } BOOL ScrCmd_449(ScriptContext *ctx) { - sub_02054190(ctx->fsys->taskman); + sub_02054190(ctx->fieldSystem->taskman); return TRUE; } BOOL ScrCmd_445(ScriptContext *ctx) { - Location *location = LocalFieldData_GetPreviousPosition(Save_LocalFieldData_Get(ctx->fsys->savedata)); + Location *location = LocalFieldData_GetPreviousPosition(Save_LocalFieldData_Get(ctx->fieldSystem->savedata)); u16 *ret_p = ScriptGetVarPointer(ctx); *ret_p = location->mapId; return FALSE; @@ -2225,7 +2225,7 @@ BOOL ScrCmd_445(ScriptContext *ctx) { BOOL ScrCmd_446(ScriptContext *ctx) { u16 *ret_p = ScriptGetVarPointer(ctx); - *ret_p = ctx->fsys->location->mapId; + *ret_p = ctx->fieldSystem->location->mapId; return FALSE; } @@ -2245,21 +2245,21 @@ BOOL ScrCmd_840(ScriptContext *ctx) { BOOL ScrCmd_RockClimb(ScriptContext *ctx) { u16 partySlot = ScriptGetVar(ctx); - int playerDirection = PlayerAvatar_GetFacingDirection(ctx->fsys->playerAvatar); + int playerDirection = PlayerAvatar_GetFacingDirection(ctx->fieldSystem->playerAvatar); CallFieldTask_RockClimb(ctx->taskman, playerDirection, partySlot); return TRUE; } BOOL ScrCmd_Surf(ScriptContext *ctx) { u16 partySlot = ScriptGetVar(ctx); - int playerDirection = PlayerAvatar_GetFacingDirection(ctx->fsys->playerAvatar); + int playerDirection = PlayerAvatar_GetFacingDirection(ctx->fieldSystem->playerAvatar); CallFieldTask_Surf(ctx->taskman, playerDirection, partySlot); return TRUE; } BOOL ScrCmd_Waterfall(ScriptContext *ctx) { u16 partySlot = ScriptGetVar(ctx); - int playerDirection = PlayerAvatar_GetFacingDirection(ctx->fsys->playerAvatar); + int playerDirection = PlayerAvatar_GetFacingDirection(ctx->fieldSystem->playerAvatar); CallFieldTask_Waterfall(ctx->taskman, playerDirection, partySlot); return TRUE; } @@ -2268,20 +2268,20 @@ BOOL ScrCmd_180(ScriptContext *ctx) { u16 mapId = ScriptReadHalfword(ctx); u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - sub_020538C0(ctx->fsys, mapId, -1, x, y, DIR_SOUTH); + sub_020538C0(ctx->fieldSystem, mapId, -1, x, y, DIR_SOUTH); return TRUE; } BOOL ScrCmd_FlashEffect(ScriptContext *ctx) { - LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fsys->savedata); + LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fieldSystem->savedata); LocalFieldData_SetWeatherType(localFieldData, 12); - FieldWeatherUpdate_UsedFlash(ctx->fsys->unk4->unk_0C, LocalFieldData_GetWeatherType(localFieldData)); //CallFieldTask_Flash? + FieldWeatherUpdate_UsedFlash(ctx->fieldSystem->unk4->unk_0C, LocalFieldData_GetWeatherType(localFieldData)); //CallFieldTask_Flash? return TRUE; } BOOL ScrCmd_Whirlpool(ScriptContext *ctx) { u16 partySlot = ScriptGetVar(ctx); - int playerDirection = PlayerAvatar_GetFacingDirection(ctx->fsys->playerAvatar); + int playerDirection = PlayerAvatar_GetFacingDirection(ctx->fieldSystem->playerAvatar); CallFieldTask_Whirlpool(ctx->taskman, playerDirection, partySlot); return TRUE; } @@ -2289,17 +2289,17 @@ BOOL ScrCmd_Whirlpool(ScriptContext *ctx) { BOOL sub_0204378C(ScriptContext *ctx); BOOL ScrCmd_183(ScriptContext *ctx) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 partyIdx = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), partyIdx); - int playerGender = PlayerAvatar_GetGender(ctx->fsys->playerAvatar); - *p_work = ov02_02249458(ctx->fsys, 0, mon, playerGender); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), partyIdx); + int playerGender = PlayerAvatar_GetGender(ctx->fieldSystem->playerAvatar); + *p_work = ov02_02249458(ctx->fieldSystem, 0, mon, playerGender); SetupNativeScript(ctx, sub_0204378C); return TRUE; } BOOL sub_0204378C(ScriptContext *ctx) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); if (ov02_0224953C(*p_work) == TRUE) { ov02_02249548(*p_work); return TRUE; @@ -2310,7 +2310,7 @@ BOOL sub_0204378C(ScriptContext *ctx) { BOOL ScrCmd_PlayerOnBikeCheck(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - if (PlayerAvatar_GetState(ctx->fsys->playerAvatar) == PLAYER_STATE_CYCLING) { + if (PlayerAvatar_GetState(ctx->fieldSystem->playerAvatar) == PLAYER_STATE_CYCLING) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -2321,49 +2321,49 @@ BOOL ScrCmd_PlayerOnBikeCheck(ScriptContext *ctx) { BOOL ScrCmd_PlayerOnBikeSet(ScriptContext *ctx) { u8 flag = ScriptReadByte(ctx); if (flag == TRUE) { - FieldSystem_SetSavedMusicId(ctx->fsys, SEQ_GS_BICYCLE); - FieldSystem_PlayOrFadeToNewMusicId(ctx->fsys, SEQ_GS_BICYCLE, 1); - Field_PlayerAvatar_OrrTransitionFlags(ctx->fsys->playerAvatar, PLAYER_TRANSITION_CYCLING); - Field_PlayerAvatar_ApplyTransitionFlags(ctx->fsys->playerAvatar); + FieldSystem_SetSavedMusicId(ctx->fieldSystem, SEQ_GS_BICYCLE); + FieldSystem_PlayOrFadeToNewMusicId(ctx->fieldSystem, SEQ_GS_BICYCLE, 1); + Field_PlayerAvatar_OrrTransitionFlags(ctx->fieldSystem->playerAvatar, PLAYER_TRANSITION_CYCLING); + Field_PlayerAvatar_ApplyTransitionFlags(ctx->fieldSystem->playerAvatar); } else { - Field_PlayerAvatar_OrrTransitionFlags(ctx->fsys->playerAvatar, PLAYER_TRANSITION_WALKING); - Field_PlayerAvatar_ApplyTransitionFlags(ctx->fsys->playerAvatar); - FieldSystem_SetSavedMusicId(ctx->fsys, 0); - FieldSystem_PlayOrFadeToNewMusicId(ctx->fsys, FieldSystem_GetOverriddenMusicId(ctx->fsys, ctx->fsys->location->mapId), 1); + Field_PlayerAvatar_OrrTransitionFlags(ctx->fieldSystem->playerAvatar, PLAYER_TRANSITION_WALKING); + Field_PlayerAvatar_ApplyTransitionFlags(ctx->fieldSystem->playerAvatar); + FieldSystem_SetSavedMusicId(ctx->fieldSystem, 0); + FieldSystem_PlayOrFadeToNewMusicId(ctx->fieldSystem, FieldSystem_GetOverriddenMusicId(ctx->fieldSystem, ctx->fieldSystem->location->mapId), 1); } return FALSE; } BOOL ScrCmd_591(ScriptContext *ctx) { - FieldSystem_SetSavedMusicId(ctx->fsys, SEQ_PL_BICYCLE); + FieldSystem_SetSavedMusicId(ctx->fieldSystem, SEQ_PL_BICYCLE); return FALSE; } BOOL ScrCmd_186(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); - sub_0205CAA4(ctx->fsys->playerAvatar, r1); + sub_0205CAA4(ctx->fieldSystem->playerAvatar, r1); return FALSE; } BOOL ScrCmd_GetPlayerState(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = PlayerAvatar_GetState(ctx->fsys->playerAvatar); + *p_ret = PlayerAvatar_GetState(ctx->fieldSystem->playerAvatar); return FALSE; } BOOL ScrCmd_SetAvatarBits(ScriptContext *ctx) { u16 flags = ScriptReadHalfword(ctx); - PlayerAvatar_OrrTransitionFlags(ctx->fsys->playerAvatar, flags); + PlayerAvatar_OrrTransitionFlags(ctx->fieldSystem->playerAvatar, flags); return TRUE; } BOOL ScrCmd_UpdateAvatarState(ScriptContext *ctx) { - Field_PlayerAvatar_ApplyTransitionFlags(ctx->fsys->playerAvatar); + Field_PlayerAvatar_ApplyTransitionFlags(ctx->fieldSystem->playerAvatar); return FALSE; } BOOL ScrCmd_211(ScriptContext *ctx) { - RoamerSaveData *roamerSave = Save_Roamers_Get(ctx->fsys->savedata); + RoamerSaveData *roamerSave = Save_Roamers_Get(ctx->fieldSystem->savedata); u16 *r6 = ScriptGetVarPointer(ctx); u16 *r4 = ScriptGetVarPointer(ctx); GetSwarmInfoFromRand(Roamers_GetRand(roamerSave, 2), r6, r4); @@ -2372,31 +2372,31 @@ BOOL ScrCmd_211(ScriptContext *ctx) { BOOL ScrCmd_GetStarterChoice(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Save_VarsFlags_GetStarter(Save_VarsFlags_Get(ctx->fsys->savedata)); + *p_ret = Save_VarsFlags_GetStarter(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_SetStarterChoice(ScriptContext *ctx) { u16 choice = ScriptGetVar(ctx); - Save_VarsFlags_SetStarter(Save_VarsFlags_Get(ctx->fsys->savedata), choice); + Save_VarsFlags_SetStarter(Save_VarsFlags_Get(ctx->fieldSystem->savedata), choice); return FALSE; } BOOL ScrCmd_TrainerMessage(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; - u16 *p_scripno = FieldSysGetAttrAddr(fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); - String **p_strbuf1 = FieldSysGetAttrAddr(fsys, SCRIPTENV_STRING_BUFFER_0); - u8 *p_printerno = FieldSysGetAttrAddr(fsys, SCRIPTENV_TEXT_PRINTER_NUMBER); + u16 *p_scripno = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); + String **p_strbuf1 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_0); + u8 *p_printerno = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); u16 trainerno = ScriptGetVar(ctx); u16 msgno = ScriptGetVar(ctx); GetTrainerMessageByIdPair(trainerno, msgno, *p_strbuf1, HEAP_ID_FIELD); - FillWindowPixelBuffer(FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW), 15); + FillWindowPixelBuffer(FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW), 15); *p_printerno = sub_0205B5B4( - FieldSysGetAttrAddr(fsys, SCRIPTENV_WINDOW), + FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW), *p_strbuf1, - Save_PlayerData_GetOptionsAddr(ctx->fsys->savedata), + Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->savedata), TRUE ); SetupNativeScript(ctx, ov01_021EF348); @@ -2406,19 +2406,19 @@ BOOL ScrCmd_TrainerMessage(ScriptContext *ctx) { BOOL sub_02043A98(ScriptContext *ctx); BOOL ScrCmd_226(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 r7 = ScriptGetVar(ctx); u16 sp0 = ScriptGetVar(ctx); u16 sp4 = ScriptGetVar(ctx); u16 r6 = ScriptReadHalfword(ctx); - ov03_02255BB0(fsys, r7, sp0, sp4); + ov03_02255BB0(fieldSystem, r7, sp0, sp4); ctx->data[0] = r6; SetupNativeScript(ctx, sub_02043A98); return TRUE; } BOOL sub_02043A98(ScriptContext *ctx) { - u16 *p_ret = GetVarPointer(ctx->fsys, ctx->data[0]); + u16 *p_ret = GetVarPointer(ctx->fieldSystem, ctx->data[0]); int result = ov03_02255BFC(); if (result == 0) { return FALSE; @@ -2431,19 +2431,19 @@ BOOL sub_02043A98(ScriptContext *ctx) { BOOL sub_02043B30(ScriptContext *ctx); BOOL ScrCmd_227(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 r7 = ScriptGetVar(ctx); u16 sp0 = ScriptGetVar(ctx); u16 sp4 = ScriptGetVar(ctx); u16 r6 = ScriptReadHalfword(ctx); - ov03_02255C18(fsys, r7, sp0, sp4); + ov03_02255C18(fieldSystem, r7, sp0, sp4); ctx->data[0] = r6; SetupNativeScript(ctx, sub_02043B30); return TRUE; } BOOL sub_02043B30(ScriptContext *ctx) { - u16 *p_ret = GetVarPointer(ctx->fsys, ctx->data[0]); + u16 *p_ret = GetVarPointer(ctx->fieldSystem, ctx->data[0]); int result = ov03_02255C64(); if (result == 0) { return FALSE; @@ -2464,9 +2464,9 @@ BOOL ScrCmd_229(ScriptContext *ctx) { } BOOL ScrCmd_230(ScriptContext *ctx) { - struct UnkStruct_ScrCmd230 **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + struct UnkStruct_ScrCmd230 **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); struct UnkStruct_ScrCmd230 *work = *p_work; - sub_02051428(ctx->fsys->taskman, &work->unk_30, 5); + sub_02051428(ctx->fieldSystem->taskman, &work->unk_30, 5); FreeToHeap(work); *p_work = NULL; return TRUE; @@ -2484,51 +2484,51 @@ BOOL ScrCmd_SetDynamicWarp(ScriptContext *ctx) { warp.x = ScriptGetVar(ctx); warp.y = ScriptGetVar(ctx); warp.direction = ScriptGetVar(ctx); - LocalFieldData_SetDynamicWarp(Save_LocalFieldData_Get(ctx->fsys->savedata), &warp); + LocalFieldData_SetDynamicWarp(Save_LocalFieldData_Get(ctx->fieldSystem->savedata), &warp); return FALSE; } BOOL ScrCmd_GetDynamicWarpFloorNo(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - Location *warp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(ctx->fsys->savedata)); + Location *warp = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(ctx->fieldSystem->savedata)); *p_ret = MapNumToFloorNo(warp->mapId); return FALSE; } BOOL ScrCmd_ElevatorCurFloorBox(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem *fieldSystem = ctx->fieldSystem; + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); u16 floor = ScriptGetVar(ctx); - PrintCurFloorInNewWindow(fsys, x, y, p_ret, *p_msgFmt, floor); + PrintCurFloorInNewWindow(fieldSystem, x, y, p_ret, *p_msgFmt, floor); return FALSE; } BOOL ScrCmd_CountJohtoDexSeen(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = Pokedex_CountJohtoDexSeen(pokedex); return FALSE; } BOOL ScrCmd_CountJohtoDexOwned(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = Pokedex_CountJohtoDexOwned(pokedex); return FALSE; } BOOL ScrCmd_CountNationalDexSeen(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = Pokedex_CountNationalDexSeen(pokedex); return FALSE; } BOOL ScrCmd_CountNationalDexOwned(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = Pokedex_CountNationalDexOwned(pokedex); return FALSE; @@ -2540,8 +2540,8 @@ BOOL ScrCmd_247(ScriptContext *ctx) { } BOOL ScrCmd_GetDexEvalResult(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata); u8 kind = ScriptReadByte(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); u16 *p_ret2 = ScriptGetVarPointer(ctx); @@ -2555,7 +2555,7 @@ BOOL ScrCmd_GetDexEvalResult(ScriptContext *ctx) { } BOOL ScrCmd_RocketTrapBattle(ScriptContext *ctx) { - u32 *winFlag = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG); + u32 *winFlag = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); u16 species = ScriptGetVar(ctx); u16 level = ScriptGetVar(ctx); SetupAndStartWildBattle(ctx->taskman, species, level, winFlag, FALSE, FALSE); @@ -2563,7 +2563,7 @@ BOOL ScrCmd_RocketTrapBattle(ScriptContext *ctx) { } BOOL ScrCmd_WildBattle(ScriptContext *ctx) { - u32 *winFlag = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG); + u32 *winFlag = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_BATTLE_WIN_FLAG); u16 species = ScriptGetVar(ctx); u16 level = ScriptGetVar(ctx); u8 shiny = ScriptReadByte(ctx); @@ -2572,7 +2572,7 @@ BOOL ScrCmd_WildBattle(ScriptContext *ctx) { } BOOL ScrCmd_686(ScriptContext *ctx) { - u32 *winFlag = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_BATTLE_WIN_FLAG); + 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); @@ -2592,13 +2592,13 @@ BOOL ScrCmd_CatchingTutorial(ScriptContext *ctx) { } BOOL ScrCmd_252(ScriptContext *ctx) { - sub_0203F818(ctx->fsys); + sub_0203F818(ctx->fieldSystem); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } BOOL ScrCmd_GetSaveFileState(ScriptContext *ctx) { - SaveData *saveData = ctx->fsys->savedata; + SaveData *saveData = ctx->fieldSystem->savedata; u16 *p_ret = ScriptGetVarPointer(ctx); if (Save_FileDoesNotBelongToPlayer(saveData)) { @@ -2614,21 +2614,21 @@ BOOL ScrCmd_GetSaveFileState(ScriptContext *ctx) { } BOOL ScrCmd_SaveGameNormal(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Field_SaveGameNormal(fsys); + *p_ret = Field_SaveGameNormal(fieldSystem); return FALSE; } BOOL ScrCmd_SaveWipeExtraChunks(ScriptContext *ctx) { - Save_WipeExtraChunks(ctx->fsys->savedata); + Save_WipeExtraChunks(ctx->fieldSystem->savedata); return FALSE; } BOOL ScrCmd_642(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Save_CheckExtraChunksExist(ctx->fsys->savedata); + *p_ret = Save_CheckExtraChunksExist(ctx->fieldSystem->savedata); return FALSE; } @@ -2656,7 +2656,7 @@ BOOL ScrCmd_258(ScriptContext *ctx) { } BOOL ScrCmd_259(ScriptContext *ctx) { - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = sub_0205A6AC(*p_msgFmt); @@ -2665,9 +2665,9 @@ BOOL ScrCmd_259(ScriptContext *ctx) { BOOL ScrCmd_260(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); - *p_ret = sub_0205A9A0(ctx->fsys->unk80, *p_msgFmt); + *p_ret = sub_0205A9A0(ctx->fieldSystem->unk80, *p_msgFmt); return FALSE; } @@ -2685,11 +2685,11 @@ BOOL ScrCmd_261(ScriptContext *ctx) { } BOOL ScrCmd_264(ScriptContext *ctx) { - LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u16 r4 = ScriptReadHalfword(ctx); - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys)); - SaveEasyChat *easyChat = Save_EasyChat_Get(FieldSystem_GetSaveDataPtr(ctx->fsys)); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + SaveEasyChat *easyChat = Save_EasyChat_Get(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u16 objId; if (r4 == 0) { @@ -2702,14 +2702,14 @@ BOOL ScrCmd_264(ScriptContext *ctx) { } BOOL ScrCmd_265(ScriptContext *ctx) { - sub_02091574(ctx->fsys); + sub_02091574(ctx->fieldSystem); return FALSE; } BOOL sub_020441C4(ScriptContext *ctx); BOOL ScrCmd_266(ScriptContext *ctx) { - sub_0205AD0C(ctx->fsys->unk84); + sub_0205AD0C(ctx->fieldSystem->unk84); sub_02037FF0(); SetupNativeScript(ctx, sub_020441C4); return TRUE; @@ -2720,38 +2720,38 @@ BOOL sub_020441C4(ScriptContext *ctx) { } BOOL ScrCmd_267(ScriptContext *ctx) { - LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_INTERACTED); + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u16 sp0 = ScriptReadHalfword(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); - *p_ret = sub_0205A750(ctx->fsys->unk80, MapObject_GetID(*p_lastInteracted), sp0, *p_msgFmt); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + *p_ret = sub_0205A750(ctx->fieldSystem->unk80, MapObject_GetID(*p_lastInteracted), sp0, *p_msgFmt); return FALSE; } BOOL ScrCmd_586(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0205A4D8(ctx->fsys->unk80); + *p_ret = sub_0205A4D8(ctx->fieldSystem->unk80); if (*p_ret) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); FreeToHeap(*p_work); } return FALSE; } BOOL ScrCmd_268(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); + FieldSystem *fieldSystem = ctx->fieldSystem; + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0205A200(fsys->unk80, MapObject_GetID(*p_lastInteracted)); + *p_ret = sub_0205A200(fieldSystem->unk80, MapObject_GetID(*p_lastInteracted)); return FALSE; } BOOL ScrCmd_274(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fsys, SCRIPTENV_LAST_INTERACTED); + FieldSystem *fieldSystem = ctx->fieldSystem; + LocalMapObject **p_lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); u16 r7 = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0205A284(fsys->unk80, MapObject_GetID(*p_lastInteracted), r7); + *p_ret = sub_0205A284(fieldSystem->unk80, MapObject_GetID(*p_lastInteracted), r7); return FALSE; } @@ -2765,9 +2765,9 @@ BOOL ScrCmd_269(ScriptContext *ctx) { } BOOL sub_02044318(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - int result = sub_0205A358(fsys->unk80); - u16 *p_ret = GetVarPointer(fsys, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + int result = sub_0205A358(fieldSystem->unk80); + u16 *p_ret = GetVarPointer(fieldSystem, ctx->data[0]); if (result == 0) { return FALSE; } else { @@ -2777,7 +2777,7 @@ BOOL sub_02044318(ScriptContext *ctx) { } BOOL ScrCmd_270(ScriptContext *ctx) { - sub_0205B27C(ctx->fsys->mapObjectMan, ctx->fsys->unk84); + sub_0205B27C(ctx->fieldSystem->mapObjectMan, ctx->fieldSystem->unk84); return FALSE; } @@ -2795,10 +2795,10 @@ BOOL ScrCmd_263(ScriptContext *ctx) { } BOOL ScrCmd_271(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 r6 = ScriptGetVar(ctx); u16 r2 = ScriptGetVar(ctx); - sub_0205A3B0(fsys->unk80, r6, r2); + sub_0205A3B0(fieldSystem->unk80, r6, r2); return FALSE; } @@ -2812,11 +2812,11 @@ BOOL ScrCmd_272(ScriptContext *ctx) { } BOOL sub_020443D8(ScriptContext *ctx) { - u16 *p_ret = GetVarPointer(ctx->fsys, ctx->data[0]); - u32 r0 = sub_0205A35C(ctx->fsys->unk80); + u16 *p_ret = GetVarPointer(ctx->fieldSystem, ctx->data[0]); + u32 r0 = sub_0205A35C(ctx->fieldSystem->unk80); if (r0 >= 1) { *p_ret = r0; - sub_0205ABB0(ctx->fsys->unk80); + sub_0205ABB0(ctx->fieldSystem->unk80); return TRUE; } else { *p_ret = 0; @@ -2834,10 +2834,10 @@ BOOL ScrCmd_273(ScriptContext *ctx) { } BOOL sub_02044434(ScriptContext *ctx) { - u16 *p_ret = GetVarPointer(ctx->fsys, ctx->data[0]); - int r0 = sub_0205A39C(ctx->fsys->unk80); + u16 *p_ret = GetVarPointer(ctx->fieldSystem, ctx->data[0]); + int r0 = sub_0205A39C(ctx->fieldSystem->unk80); if (gSystem.newKeys & PAD_BUTTON_B) { - r0 = sub_0205A47C(ctx->fsys->unk80, 8); + r0 = sub_0205A47C(ctx->fieldSystem->unk80, 8); } if (r0 != 0) { *p_ret = r0; @@ -2848,13 +2848,13 @@ BOOL sub_02044434(ScriptContext *ctx) { } BOOL ScrCmd_286(ScriptContext *ctx) { - sub_02054030(ctx->fsys->taskman); + sub_02054030(ctx->fieldSystem->taskman); return TRUE; } BOOL ScrCmd_287(ScriptContext *ctx) { - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys)); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); sub_0205B3DC( PlayerProfile_GetTrainerID(profile), PlayerProfile_GetTrainerGender(profile), @@ -2864,7 +2864,7 @@ BOOL ScrCmd_287(ScriptContext *ctx) { } BOOL ScrCmd_288(ScriptContext *ctx) { - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys)); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u16 choice = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = sub_0205B418( @@ -2881,7 +2881,7 @@ BOOL ScrCmd_288(ScriptContext *ctx) { } BOOL ScrCmd_558(ScriptContext *ctx) { - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys)); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u16 choice = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = sub_0205B418( @@ -2893,7 +2893,7 @@ BOOL ScrCmd_558(ScriptContext *ctx) { } BOOL ScrCmd_289(ScriptContext *ctx) { - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys)); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u16 choice = ScriptGetVar(ctx); PlayerProfile_SetAvatar(profile, choice); return FALSE; @@ -2906,21 +2906,21 @@ BOOL ScrCmd_OverworldWhiteOut(ScriptContext *ctx) { BOOL ScrCmd_SetSpawn(ScriptContext *ctx) { u16 spawnPoint = ScriptGetVar(ctx); - LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fsys->savedata); + LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fieldSystem->savedata); LocalFieldData_SetBlackoutSpawn(localFieldData, spawnPoint); return FALSE; } BOOL ScrCmd_GetPlayerGender(ScriptContext *ctx) { - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys)); + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = PlayerProfile_GetTrainerGender(profile); return FALSE; } BOOL ScrCmd_HealParty(ScriptContext *ctx) { - FieldSystem *fsys = TaskManager_GetFieldSystem(ctx->taskman); // ??? - HealParty(SaveArray_Party_Get(fsys->savedata)); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(ctx->taskman); // ??? + HealParty(SaveArray_Party_Get(fieldSystem->savedata)); return FALSE; } @@ -2947,7 +2947,7 @@ BOOL ScrCmd_587(ScriptContext *ctx) { } BOOL ScrCmd_284(ScriptContext *ctx) { - sub_02058190(ctx->fsys); + sub_02058190(ctx->fieldSystem); return FALSE; } @@ -2960,7 +2960,7 @@ BOOL ScrCmd_285(ScriptContext *ctx) { BOOL ScrCmd_335(ScriptContext *ctx) { u16 pocket = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Bag_PocketNotEmpty(Save_Bag_Get(ctx->fsys->savedata), pocket); + *p_ret = Bag_PocketNotEmpty(Save_Bag_Get(ctx->fieldSystem->savedata), pocket); return FALSE; } @@ -2968,7 +2968,7 @@ BOOL ScrCmd_MovePerson(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - Field_SetEventDefaultXYPos(ctx->fsys, objectId, x, y); + Field_SetEventDefaultXYPos(ctx->fieldSystem, objectId, x, y); 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->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); sub_0205FC2C(object, x, height, y, direction); sub_02061070(object); return FALSE; @@ -2987,14 +2987,14 @@ BOOL ScrCmd_MovePersonFacing(ScriptContext *ctx) { BOOL ScrCmd_SetObjectMovementType(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u16 movementType = ScriptGetVar(ctx); - Field_SetEventDefaultMovement(ctx->fsys, objectId, movementType); + Field_SetEventDefaultMovement(ctx->fieldSystem, objectId, movementType); return FALSE; } BOOL ScrCmd_SetObjectFacing(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u16 facing = ScriptGetVar(ctx); - Field_SetEventDefaultDirection(ctx->fsys, objectId, facing); + Field_SetEventDefaultDirection(ctx->fieldSystem, objectId, facing); return FALSE; } @@ -3002,7 +3002,7 @@ BOOL ScrCmd_MoveWarp(ScriptContext *ctx) { u16 warpId = ScriptGetVar(ctx); u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - Field_SetWarpXYPos(ctx->fsys, warpId, x, y); + Field_SetWarpXYPos(ctx->fieldSystem, warpId, x, y); return FALSE; } @@ -3010,21 +3010,21 @@ BOOL ScrCmd_MoveBgEvent(ScriptContext *ctx) { u16 bgId = ScriptGetVar(ctx); u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - Field_SetBgEventXYPos(ctx->fsys, bgId, x, y); + Field_SetBgEventXYPos(ctx->fieldSystem, bgId, x, y); return FALSE; } BOOL ScrCmd_344(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u16 dir = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); GF_ASSERT(object != NULL); ov01_021F9408(object, dir); return FALSE; } BOOL ScrCmd_347(ScriptContext *ctx) { - u16 **r5 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_FIELD_34); + u16 **r5 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_FIELD_34); u16 r0 = ScriptGetVar(ctx); if (*r5 != NULL) { **r5 = r0; @@ -3038,155 +3038,155 @@ BOOL ScrCmd_307(ScriptContext *ctx) { u16 r7 = ScriptGetVar(ctx); u16 r2 = ScriptGetVar(ctx); u8 r3 = ScriptReadByte(ctx); - ov01_021E9AE8(ctx->fsys, r7 + 32 * r4, r2 + 32 * r6, r3); + ov01_021E9AE8(ctx->fieldSystem, r7 + 32 * r4, r2 + 32 * r6, r3); return FALSE; } BOOL ScrCmd_308(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); - ov01_021E9C00(ctx->fsys, r1); + ov01_021E9C00(ctx->fieldSystem, r1); return TRUE; } BOOL ScrCmd_309(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); - ov01_021E9C20(ctx->fsys, r1); + ov01_021E9C20(ctx->fieldSystem, r1); return FALSE; } BOOL ScrCmd_310(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); - ov01_021E9BB8(ctx->fsys, r1); + ov01_021E9BB8(ctx->fieldSystem, r1); return FALSE; } BOOL ScrCmd_311(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); - ov01_021E9BDC(ctx->fsys, r1); + ov01_021E9BDC(ctx->fieldSystem, r1); return FALSE; } BOOL ScrCmd_EcruteakGymInit(ScriptContext *ctx) { - InitEcruteakGym(ctx->fsys); + InitEcruteakGym(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_315(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - if (SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fsys))) != GYMMICK_ECRUTEAK) { + FieldSystem *fieldSystem = ctx->fieldSystem; + if (SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fieldSystem))) != GYMMICK_ECRUTEAK) { return FALSE; } - ov04_02254D98(fsys); + ov04_02254D98(fieldSystem); return FALSE; } BOOL ScrCmd_316(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - if (SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fsys))) != GYMMICK_ECRUTEAK) { + FieldSystem *fieldSystem = ctx->fieldSystem; + if (SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fieldSystem))) != GYMMICK_ECRUTEAK) { return FALSE; } - ov04_02254DD0(fsys); + ov04_02254DD0(fieldSystem); return FALSE; } BOOL ScrCmd_317(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 r5 = ScriptReadByte(ctx); - if (SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fsys))) != GYMMICK_ECRUTEAK) { + if (SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fieldSystem))) != GYMMICK_ECRUTEAK) { return TRUE; } - ov04_02254DE0(fsys, (r5 != 0) ? 10 : 30); + ov04_02254DE0(fieldSystem, (r5 != 0) ? 10 : 30); return TRUE; } BOOL ScrCmd_CianwoodGymInit(ScriptContext *ctx) { - InitCianwoodGym(ctx->fsys); + InitCianwoodGym(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_CianwoodGymTurnWinch(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = ov04_02256058(fsys); + *p_ret = ov04_02256058(fieldSystem); return TRUE; } BOOL ScrCmd_VermilionGymInit(ScriptContext *ctx) { - InitVermilionGym(ctx->fsys); + InitVermilionGym(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_VermilionGymLockAction(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 lockno = ScriptReadByte(ctx); u8 relock = ScriptReadByte(ctx); - ov04_0225640C(fsys, lockno, relock); + ov04_0225640C(fieldSystem, lockno, relock); return TRUE; } BOOL ScrCmd_VermilionGymCanCheck(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 canId = ScriptReadByte(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = ov04_022563C4(fsys, canId); + *p_ret = ov04_022563C4(fieldSystem, canId); return FALSE; } BOOL ScrCmd_ResampleVermilionGymCans(ScriptContext *ctx) { - PlaceVermilionGymSwitches(ctx->fsys); + PlaceVermilionGymSwitches(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_VioletGymInit(ScriptContext *ctx) { - InitVioletGym(ctx->fsys); + InitVioletGym(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_VioletGymElevator(ScriptContext *ctx) { - ov04_02253ED4(ctx->fsys); + ov04_02253ED4(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_AzaleaGymInit(ScriptContext *ctx) { - InitAzaleaGym(ctx->fsys); + InitAzaleaGym(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_AzaleaGymSpinarak(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 spinarakNo = ScriptReadByte(ctx); - BeginAzaleaGymSpinarakRide(fsys, spinarakNo); + BeginAzaleaGymSpinarakRide(fieldSystem, spinarakNo); return TRUE; } BOOL ScrCmd_AzaleaGymSwitch(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 switchNo = ScriptReadByte(ctx); - FlipAzaleaGymSwitch(fsys, switchNo); + FlipAzaleaGymSwitch(fieldSystem, switchNo); return TRUE; } BOOL ScrCmd_BlackthornGymInit(ScriptContext *ctx) { - InitBlackthornGym(ctx->fsys); + InitBlackthornGym(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_FuchsiaGymInit(ScriptContext *ctx) { - InitFuchsiaGym(ctx->fsys); + InitFuchsiaGym(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_ViridianGymInit(ScriptContext *ctx) { - InitViridianGym(ctx->fsys); + InitViridianGym(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_GetPlayerXYZ(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_x = ScriptGetVarPointer(ctx); u16 *p_h = ScriptGetVarPointer(ctx); u16 *p_y = ScriptGetVarPointer(ctx); - LocalMapObject *playerObj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + LocalMapObject *playerObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); *p_x = MapObject_GetCurrentX(playerObj); *p_h = MapObject_GetCurrentHeight(playerObj) / 2; *p_y = MapObject_GetCurrentY(playerObj); @@ -3194,52 +3194,52 @@ BOOL ScrCmd_GetPlayerXYZ(ScriptContext *ctx) { } BOOL ScrCmd_EggHatchAnim(ScriptContext *ctx) { - HatchEggInParty(ctx->fsys); + HatchEggInParty(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_374(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 objId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(fsys->mapObjectMan, objId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objId); GF_ASSERT(object != NULL); MapObject_SetVisible(object, FALSE); return FALSE; } BOOL ScrCmd_375(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 objId = ScriptGetVar(ctx); - LocalMapObject *object = GetMapObjectByID(fsys->mapObjectMan, objId); + LocalMapObject *object = GetMapObjectByID(fieldSystem->mapObjectMan, objId); GF_ASSERT(object != NULL); MapObject_SetVisible(object, TRUE); return FALSE; } BOOL ScrCmd_376(ScriptContext *ctx) { //todo: mail screen - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); //MailAppData - *p_work = sub_0203F074(ctx->fsys, HEAP_ID_FIELD); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //MailAppData + *p_work = sub_0203F074(ctx->fieldSystem, HEAP_ID_FIELD); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } BOOL ScrCmd_377(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Mailbox_CountMessages(Save_Mailbox_Get(fsys->savedata), 0); + *p_ret = Mailbox_CountMessages(Save_Mailbox_Get(fieldSystem->savedata), 0); return FALSE; } BOOL ScrCmd_378(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); u16 r2 = ScriptGetVar(ctx); - sub_02097D3C(ctx->fsys, r4, r2); + sub_02097D3C(ctx->fieldSystem, r4, r2); return TRUE; } BOOL ScrCmd_379(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Field_GetTimeOfDay(ctx->fsys); + *p_ret = Field_GetTimeOfDay(ctx->fieldSystem); return FALSE; } @@ -3260,7 +3260,7 @@ BOOL ScrCmd_381(ScriptContext *ctx) { BOOL ScrCmd_403(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); u16 r6 = ScriptGetVar(ctx); - sub_0202BB08(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r4, r6); + sub_0202BB08(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fieldSystem->savedata)), r4, r6); return FALSE; } @@ -3268,7 +3268,7 @@ BOOL ScrCmd_404(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); u16 r6 = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0202BA2C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r4, r6); + *p_ret = sub_0202BA2C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fieldSystem->savedata)), r4, r6); return FALSE; } @@ -3276,25 +3276,25 @@ BOOL ScrCmd_405(ScriptContext *ctx) { u16 r7 = ScriptGetVar(ctx); u16 r6 = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = r6 <= sub_0202BA70(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r7); + *p_ret = r6 <= sub_0202BA70(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fieldSystem->savedata)), r7); return FALSE; } BOOL ScrCmd_406(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); - sub_0202BBD8(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r4); + sub_0202BBD8(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fieldSystem->savedata)), r4); return FALSE; } BOOL ScrCmd_407(ScriptContext *ctx) { u16 r6 = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0202BA5C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r6); + *p_ret = sub_0202BA5C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fieldSystem->savedata)), r6); return FALSE; } BOOL ScrCmd_CheckJohtoDexComplete(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = FALSE; if (Pokedex_JohtoDexIsComplete(pokedex) == TRUE) { @@ -3304,7 +3304,7 @@ BOOL ScrCmd_CheckJohtoDexComplete(ScriptContext *ctx) { } BOOL ScrCmd_CheckNationalDexComplete(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = FALSE; if (Pokedex_NationalDexIsComplete(pokedex) == TRUE) { @@ -3314,9 +3314,9 @@ BOOL ScrCmd_CheckNationalDexComplete(ScriptContext *ctx) { } BOOL ScrCmd_425(ScriptContext *ctx) { //todo: pokedex screen - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); //PokedexAppData + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //PokedexAppData u16 r2 = ScriptGetVar(ctx); - *p_work = sub_0203FA8C(ctx->fsys, HEAP_ID_32, r2); + *p_work = sub_0203FA8C(ctx->fieldSystem, HEAP_ID_32, r2); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } @@ -3329,7 +3329,7 @@ BOOL ScrCmd_427(ScriptContext *ctx) { BOOL ScrCmd_420(ScriptContext *ctx) { u16 statno = ScriptReadHalfword(ctx); - GameStats_Inc(Save_GameStats_Get(ctx->fsys->savedata), statno); + GameStats_Inc(Save_GameStats_Get(ctx->fieldSystem->savedata), statno); return FALSE; } @@ -3337,9 +3337,9 @@ BOOL ScrCmd_421(ScriptContext *ctx) { u16 r7 = ScriptReadHalfword(ctx); u16 r4 = ScriptReadHalfword(ctx); u16 r6 = ScriptReadHalfword(ctx); - u16 *p_ret_hi = GetVarPointer(ctx->fsys, r4); - u16 *p_ret_lo = GetVarPointer(ctx->fsys, r6); - u32 statval = GameStats_GetCapped(Save_GameStats_Get(ctx->fsys->savedata), r7); + u16 *p_ret_hi = GetVarPointer(ctx->fieldSystem, r4); + u16 *p_ret_lo = GetVarPointer(ctx->fieldSystem, r6); + u32 statval = GameStats_GetCapped(Save_GameStats_Get(ctx->fieldSystem->savedata), r7); *p_ret_hi = (statval & 0xFFFF0000) >> 16; *p_ret_lo = statval & 0x0000FFFF; return FALSE; @@ -3354,13 +3354,13 @@ BOOL ScrCmd_422(ScriptContext *ctx) { u32 value = (value_hi << 16) | value_lo; switch (action) { case 0: - GameStats_Add(Save_GameStats_Get(ctx->fsys->savedata), statIdx, value); + GameStats_Add(Save_GameStats_Get(ctx->fieldSystem->savedata), statIdx, value); break; case 1: - GameStats_SetCapped(Save_GameStats_Get(ctx->fsys->savedata), statIdx, value); + GameStats_SetCapped(Save_GameStats_Get(ctx->fieldSystem->savedata), statIdx, value); break; case 2: - GameStats_UpdateBounded(Save_GameStats_Get(ctx->fsys->savedata), statIdx, value); + GameStats_UpdateBounded(Save_GameStats_Get(ctx->fieldSystem->savedata), statIdx, value); break; } return FALSE; @@ -3369,21 +3369,21 @@ BOOL ScrCmd_422(ScriptContext *ctx) { BOOL ScrCmd_704(ScriptContext *ctx) { u16 statIdx = ScriptReadHalfword(ctx); u16 value = ScriptGetVar(ctx); - GameStats_Add(Save_GameStats_Get(ctx->fsys->savedata), statIdx, value); + GameStats_Add(Save_GameStats_Get(ctx->fieldSystem->savedata), statIdx, value); return FALSE; } BOOL ScrCmd_705(ScriptContext *ctx) { u16 statIdx = ScriptReadHalfword(ctx); u32 value = ScriptReadWord(ctx); - GameStats_Add(Save_GameStats_Get(ctx->fsys->savedata), statIdx, value); + GameStats_Add(Save_GameStats_Get(ctx->fieldSystem->savedata), statIdx, value); return FALSE; } BOOL ScrCmd_SafariZoneAction(ScriptContext *ctx) { - LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fsys->savedata); - SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fsys->savedata); - SafariZone *safariZone = Save_SafariZone_Get(ctx->fsys->savedata); + LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fieldSystem->savedata); + SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fieldSystem->savedata); + SafariZone *safariZone = Save_SafariZone_Get(ctx->fieldSystem->savedata); u8 action = ScriptReadByte(ctx); u8 areaSet = ScriptReadByte(ctx); u16 *p_nSafariBall = LocalFieldData_GetSafariBallsCounter(localFieldData); @@ -3402,7 +3402,7 @@ BOOL ScrCmd_SafariZoneAction(ScriptContext *ctx) { sub_0202F5F8(safariZone, 1); r1 = sub_0202F6AC(safariZone); if (r1 != 0) { - sub_0209730C(ctx->fsys->savedata, r1); + sub_0209730C(ctx->fieldSystem->savedata, r1); sub_0202F6A0(safariZone, 0); } *p_nSafariBall = 0; @@ -3419,23 +3419,23 @@ BOOL ScrCmd_459(ScriptContext *ctx) { BOOL ScrCmd_456(ScriptContext *ctx) { u8 arg = ScriptReadByte(ctx); - PlayerAvatar_ToggleAutomaticHeightUpdating(ctx->fsys->playerAvatar, arg); + PlayerAvatar_ToggleAutomaticHeightUpdating(ctx->fieldSystem->playerAvatar, arg); return TRUE; } BOOL ScrCmd_EnableMassOutbreaks(ScriptContext *ctx) { - RoamerSave_SetOutbreakActive(ctx->fsys->savedata); + RoamerSave_SetOutbreakActive(ctx->fieldSystem->savedata); return FALSE; } BOOL ScrCmd_CreateRoamer(ScriptContext *ctx) { u8 roamerNo = ScriptReadByte(ctx); - Save_CreateRoamerByID(ctx->fsys->savedata, roamerNo); + Save_CreateRoamerByID(ctx->fieldSystem->savedata, roamerNo); return FALSE; } BOOL ScrCmd_LoadNPCTrade(ScriptContext *ctx) { - NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u8 tradeNo = ScriptReadByte(ctx); HandleLoadOverlay(FS_OVERLAY_ID(npc_trade), OVY_LOAD_ASYNC); @@ -3444,35 +3444,35 @@ BOOL ScrCmd_LoadNPCTrade(ScriptContext *ctx) { } BOOL ScrCmd_GetOfferedSpecies(ScriptContext *ctx) { - NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = NPCTradeApp_GetOfferedSpecies(*p_tradeWork); return FALSE; } BOOL ScrCmd_NPCTradeGetReqSpecies(ScriptContext *ctx) { - NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = NPCTradeApp_GetRequestedSpecies(*p_tradeWork); return FALSE; } BOOL ScrCmd_GetNpcTradeUnusedFlag(ScriptContext *ctx) { - NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = NPCTradeApp_GetUnusedFlag(*p_tradeWork); return FALSE; } BOOL ScrCmd_NPCTradeExec(ScriptContext *ctx) { - NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 arg = ScriptGetVar(ctx); CallTask_NPCTrade(ctx->taskman, *p_tradeWork, arg, HEAP_ID_FIELD); return TRUE; } BOOL ScrCmd_NPCTradeEnd(ScriptContext *ctx) { - NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + NPCTradeAppData **p_tradeWork = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); NPCTradeApp_Delete(*p_tradeWork); UnloadOverlayByID(FS_OVERLAY_ID(npc_trade)); return FALSE; @@ -3483,7 +3483,7 @@ BOOL ScrCmd_GiveLoanMon(ScriptContext *ctx) { u8 level = ScriptReadByte(ctx); u16 mapno = ScriptReadHalfword(ctx); HandleLoadOverlay(FS_OVERLAY_ID(npc_trade), OVY_LOAD_ASYNC); - NPCTrade_MakeAndGiveLoanMon(ctx->fsys, tradeno, level, mapno); + NPCTrade_MakeAndGiveLoanMon(ctx->fieldSystem, tradeno, level, mapno); UnloadOverlayByID(FS_OVERLAY_ID(npc_trade)); return FALSE; } @@ -3493,7 +3493,7 @@ BOOL ScrCmd_CheckReturnLoanMon(ScriptContext *ctx) { u16 idx = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); HandleLoadOverlay(FS_OVERLAY_ID(npc_trade), OVY_LOAD_ASYNC); - *p_ret = NPCTrade_CanGiveUpLoanMon(ctx->fsys, tradeno, idx); + *p_ret = NPCTrade_CanGiveUpLoanMon(ctx->fieldSystem, tradeno, idx); UnloadOverlayByID(FS_OVERLAY_ID(npc_trade)); return FALSE; } @@ -3504,7 +3504,7 @@ BOOL ScrCmd_475(ScriptContext *ctx) { } BOOL ScrCmd_476(ScriptContext *ctx) { - sub_0202A57C(Save_Pokedex_Get(ctx->fsys->savedata)); + sub_0202A57C(Save_Pokedex_Get(ctx->fieldSystem->savedata)); return FALSE; } @@ -3513,10 +3513,10 @@ BOOL ScrCmd_NatDexFlagAction(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = 0; if (action == 1) { - Pokedex_SetNatDexFlag(Save_Pokedex_Get(ctx->fsys->savedata)); - PlayerProfile_SetNatDexFlag(Save_PlayerData_GetProfileAddr(ctx->fsys->savedata)); + Pokedex_SetNatDexFlag(Save_Pokedex_Get(ctx->fieldSystem->savedata)); + PlayerProfile_SetNatDexFlag(Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata)); } else if (action == 2) { - *p_ret = Pokedex_GetNatDexFlag(Save_Pokedex_Get(ctx->fsys->savedata)); + *p_ret = Pokedex_GetNatDexFlag(Save_Pokedex_Get(ctx->fieldSystem->savedata)); } else { GF_ASSERT(0); } @@ -3526,7 +3526,7 @@ BOOL ScrCmd_NatDexFlagAction(ScriptContext *ctx) { BOOL ScrCmd_GetEVTotal(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); u16 partyIdx = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), partyIdx); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), partyIdx); int hpEv = GetMonData(mon, MON_DATA_HP_EV, NULL); int atkEv = GetMonData(mon, MON_DATA_ATK_EV, NULL); @@ -3554,14 +3554,14 @@ BOOL ScrCmd_485(ScriptContext *ctx) { BOOL ScrCmd_PokeCenAnim(ScriptContext *ctx) { u16 kind = ScriptGetVar(ctx); - PokecenterAnimCreate(ctx->fsys, kind); + PokecenterAnimCreate(ctx->fieldSystem, kind); return TRUE; } BOOL ScrCmd_ElevatorAnim(ScriptContext *ctx) { u16 direction = ScriptGetVar(ctx); u16 length = ScriptGetVar(ctx); - ov02_0224BDE8(ctx->fsys, direction, length); + ov02_0224BDE8(ctx->fieldSystem, direction, length); return TRUE; } @@ -3572,10 +3572,10 @@ BOOL ScrCmd_GetGameVersion(ScriptContext *ctx) { } BOOL ScrCmd_PrimoPasswordCheck1(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fsys)); + FieldSystem *fieldSystem = ctx->fieldSystem; + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fieldSystem)); u16 *p_ret = ScriptGetVarPointer(ctx); - PC_STORAGE *pcStorage = GetStoragePCPointer(fsys->savedata); + PC_STORAGE *pcStorage = GetStoragePCPointer(fieldSystem->savedata); u16 a = ScriptGetVar(ctx); u16 b = ScriptGetVar(ctx); u16 c = ScriptGetVar(ctx); @@ -3594,10 +3594,10 @@ BOOL ScrCmd_PrimoPasswordCheck1(ScriptContext *ctx) { } BOOL ScrCmd_PrimoPasswordCheck2(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fsys)); + FieldSystem *fieldSystem = ctx->fieldSystem; + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fieldSystem)); u16 *p_ret = ScriptGetVarPointer(ctx); - PC_STORAGE *pcStorage = GetStoragePCPointer(fsys->savedata); + PC_STORAGE *pcStorage = GetStoragePCPointer(fieldSystem->savedata); u16 a = ScriptGetVar(ctx); u16 b = ScriptGetVar(ctx); u16 c = ScriptGetVar(ctx); @@ -3613,28 +3613,28 @@ BOOL ScrCmd_PrimoPasswordCheck2(ScriptContext *ctx) { } BOOL ScrCmd_500(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 r1 = ScriptReadByte(ctx); - ov02_0224BF58(fsys, r1); + ov02_0224BF58(fieldSystem, r1); return FALSE; } BOOL ScrCmd_501(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 r1 = ScriptReadByte(ctx); - ov02_0224BFC0(fsys, r1); + ov02_0224BFC0(fieldSystem, r1); return FALSE; } BOOL ScrCmd_502(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 r1 = ScriptReadByte(ctx); - ov02_0224BFCC(fsys, r1); + ov02_0224BFCC(fieldSystem, r1); return FALSE; } -void Script_SetMonSeenFlagBySpecies(FieldSystem *fsys, u16 species) { - Pokedex *pokedex = Save_Pokedex_Get(fsys->savedata); +void Script_SetMonSeenFlagBySpecies(FieldSystem *fieldSystem, u16 species) { + Pokedex *pokedex = Save_Pokedex_Get(fieldSystem->savedata); Pokemon *mon = AllocMonZeroed(HEAP_ID_32); ZeroMonData(mon); CreateMon(mon, species, 50, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); @@ -3644,53 +3644,53 @@ void Script_SetMonSeenFlagBySpecies(FieldSystem *fsys, u16 species) { BOOL ScrCmd_687(ScriptContext *ctx) { u16 species = ScriptGetVar(ctx); - Script_SetMonSeenFlagBySpecies(ctx->fsys, species); + Script_SetMonSeenFlagBySpecies(ctx->fieldSystem, species); return FALSE; } BOOL ScrCmd_CountPCEmptySpace(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = PCStorage_CountEmptySpotsInAllBoxes(GetStoragePCPointer(ctx->fsys->savedata)); + *p_ret = PCStorage_CountEmptySpotsInAllBoxes(GetStoragePCPointer(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_PlayerMovementSavingSet(ScriptContext *ctx) { - s32 *r4 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_FIELD_B8); + s32 *r4 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_FIELD_B8); *r4 = PLAYER_STATE_WALKING; - *r4 = Field_PlayerMovementSavingSet(ctx->fsys); + *r4 = Field_PlayerMovementSavingSet(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_PlayerMovementSavingClear(ScriptContext *ctx) { - s32 *r4 = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_FIELD_B8); + s32 *r4 = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_FIELD_B8); Field_PlayerMovementSavingClear(*r4); return TRUE; } BOOL ScrCmd_HallOfFameAnim(ScriptContext *ctx) { u16 kind = ScriptGetVar(ctx); - ov02_0224CDB0(ctx->fsys, kind); + ov02_0224CDB0(ctx->fieldSystem, kind); return TRUE; } BOOL ScrCmd_AddSpecialGameStat(ScriptContext *ctx) { u16 statno = ScriptReadHalfword(ctx); - GameStats_AddSpecial(Save_GameStats_Get(ctx->fsys->savedata), statno); + GameStats_AddSpecial(Save_GameStats_Get(ctx->fieldSystem->savedata), statno); return FALSE; } BOOL ScrCmd_517(ScriptContext *ctx) { u16 species = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Party_HasMon(SaveArray_Party_Get(ctx->fsys->savedata), species); + *p_ret = Party_HasMon(SaveArray_Party_Get(ctx->fieldSystem->savedata), species); return TRUE; } BOOL ScrCmd_518(ScriptContext *ctx) { u16 form = ScriptGetVar(ctx); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); int partyCount = Party_GetCount(party); - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); int i; for (i = 0; i < partyCount; i++) { @@ -3706,7 +3706,7 @@ BOOL ScrCmd_518(ScriptContext *ctx) { BOOL ScrCmd_519(ScriptContext *ctx) { u16 *sp0 = ScriptGetVarPointer(ctx); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); int partyCount = Party_GetCount(party); int sp18[PARTY_SIZE] = { @@ -3743,18 +3743,18 @@ BOOL ScrCmd_519(ScriptContext *ctx) { } BOOL ScrCmd_520(ScriptContext *ctx) { - SetFlag975(Save_VarsFlags_Get(ctx->fsys->savedata)); + SetFlag975(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_521(ScriptContext *ctx) { - ClearFlag975(Save_VarsFlags_Get(ctx->fsys->savedata)); + ClearFlag975(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_522(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Field_GetHour(ctx->fsys); + *p_ret = Field_GetHour(ctx->fieldSystem); return FALSE; } @@ -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->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, 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->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); GF_ASSERT(object != NULL); sub_0205BFB4(ctx->taskman, object, r7, r6); return TRUE; @@ -3782,13 +3782,13 @@ BOOL ScrCmd_524(ScriptContext *ctx) { BOOL ScrCmd_525(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Save_PlayerHasAllRegisInParty(ctx->fsys->savedata); + *p_ret = Save_PlayerHasAllRegisInParty(ctx->fieldSystem->savedata); return FALSE; } BOOL ScrCmd_526(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - FashionCase *fashionCase = Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)); + FashionCase *fashionCase = Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fieldSystem->savedata)); int i, k, n = 0; u16 sp4[16]; @@ -3828,7 +3828,7 @@ BOOL ScrCmd_528(ScriptContext *ctx) { BOOL ScrCmd_530(ScriptContext *ctx) { u16 r6 = ScriptGetVar(ctx); u8 action = ScriptReadByte(ctx); - SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fieldSystem->savedata); if (action) { sub_02066C1C(varsFlags, r6); } else { @@ -3838,7 +3838,7 @@ BOOL ScrCmd_530(ScriptContext *ctx) { } BOOL ScrCmd_BufferBackgroundName(ScriptContext *ctx) { - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 bufferId = ScriptReadByte(ctx); u16 backgroundId = ScriptGetVar(ctx); BufferContestBackgroundName(*p_msgFmt, bufferId, backgroundId); @@ -3847,27 +3847,27 @@ BOOL ScrCmd_BufferBackgroundName(ScriptContext *ctx) { BOOL ScrCmd_534(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Save_VarsFlags_GetVar4041(Save_VarsFlags_Get(ctx->fsys->savedata)); + *p_ret = Save_VarsFlags_GetVar4041(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_536(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); u16 r6 = ScriptGetVar(ctx); - sub_0202BB7C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r4, r6); + sub_0202BB7C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fieldSystem->savedata)), r4, r6); return FALSE; } BOOL ScrCmd_537(ScriptContext *ctx) { - sub_02066D60(ctx->fsys->savedata); + sub_02066D60(ctx->fieldSystem->savedata); return FALSE; } BOOL ScrCmd_538(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); u16 wordIdx = ScriptGetVar(ctx); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); - int trendy = Save_EasyChat_SetRandomTrendySaying(Save_EasyChat_Get(ctx->fsys->savedata)); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + int trendy = Save_EasyChat_SetRandomTrendySaying(Save_EasyChat_Get(ctx->fieldSystem->savedata)); if (trendy == 32) { *p_ret = 0xFFFF; return FALSE; @@ -3879,12 +3879,12 @@ BOOL ScrCmd_538(ScriptContext *ctx) { BOOL ScrCmd_540(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Save_EasyChat_TrendySayingsUnlockedAllCheck(Save_EasyChat_Get(ctx->fsys->savedata)) == TRUE; + *p_ret = Save_EasyChat_TrendySayingsUnlockedAllCheck(Save_EasyChat_Get(ctx->fieldSystem->savedata)) == TRUE; return FALSE; } BOOL ScrCmd_539(ScriptContext *ctx) { - SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = Save_VarsFlags_GetVar4042(varsFlags) >= 5; return FALSE; @@ -3892,9 +3892,9 @@ BOOL ScrCmd_539(ScriptContext *ctx) { BOOL ScrCmd_543(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - FieldSystem *fsys = ctx->fsys; - SysInfo *sysInfo = Save_SysInfo_Get(fsys->savedata); - if (Save_SysInfo_GetBirthMonth(sysInfo) == Field_GetMonth(fsys) && Save_SysInfo_GetBirthDay(sysInfo) == Field_GetDay(fsys)) { + FieldSystem *fieldSystem = ctx->fieldSystem; + SysInfo *sysInfo = Save_SysInfo_Get(fieldSystem->savedata); + if (Save_SysInfo_GetBirthMonth(sysInfo) == Field_GetMonth(fieldSystem) && Save_SysInfo_GetBirthDay(sysInfo) == Field_GetDay(fieldSystem)) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -3903,7 +3903,7 @@ BOOL ScrCmd_543(ScriptContext *ctx) { } BOOL ScrCmd_545(ScriptContext *ctx) { - Pokedex *pokedex = Save_Pokedex_Get(ctx->fsys->savedata); + Pokedex *pokedex = Save_Pokedex_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); *p_ret = Pokedex_GetSeenFormNum_Unown(pokedex, TRUE); return FALSE; @@ -3912,7 +3912,7 @@ BOOL ScrCmd_545(ScriptContext *ctx) { BOOL ScrCmd_546(ScriptContext *ctx) { u8 mode = ScriptReadByte(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *varsFlags = Save_VarsFlags_Get(ctx->fieldSystem->savedata); GF_ASSERT(mode <= 1); *p_ret = sub_02066BC0(varsFlags, mode); return FALSE; @@ -3921,7 +3921,7 @@ BOOL ScrCmd_546(ScriptContext *ctx) { BOOL ScrCmd_550(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); int loadResult; - HALL_OF_FAME *hof = LoadHallOfFame(ctx->fsys->savedata, HEAP_ID_32, &loadResult); + HALL_OF_FAME *hof = LoadHallOfFame(ctx->fieldSystem->savedata, HEAP_ID_32, &loadResult); if (loadResult == 0) { *p_ret = 0; FreeToHeap(hof); @@ -3942,8 +3942,8 @@ BOOL ScrCmd_550(ScriptContext *ctx) { BOOL ScrCmd_551(ScriptContext *ctx) { u16 r6 = ScriptGetVar(ctx); - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *p_work = sub_0203E5D0(HEAP_ID_32, ctx->fsys, r6); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *p_work = sub_0203E5D0(HEAP_ID_32, ctx->fieldSystem, r6); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } @@ -3951,7 +3951,7 @@ BOOL ScrCmd_551(ScriptContext *ctx) { BOOL ScrCmd_552(ScriptContext *ctx) { u16 *r6 = ScriptGetVarPointer(ctx); u16 *r5 = ScriptGetVarPointer(ctx); - struct PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + struct PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); GF_ASSERT(*partyMenu != NULL); *r6 = sub_0203E5C8(*partyMenu); if (*r6 == 7) { @@ -3983,25 +3983,25 @@ BOOL ScrCmd_553(ScriptContext *ctx) { BOOL ScrCmd_560(ScriptContext *ctx) { u16 my_case = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; switch (my_case) { case 0: - ov02_0224E074(fsys, p_ret, 0, HEAP_ID_32); + ov02_0224E074(fieldSystem, p_ret, 0, HEAP_ID_32); break; case 1: - ov02_0224E074(fsys, p_ret, 1, HEAP_ID_32); + ov02_0224E074(fieldSystem, p_ret, 1, HEAP_ID_32); break; case 2: - ov02_0224E074(fsys, p_ret, 2, HEAP_ID_32); + ov02_0224E074(fieldSystem, p_ret, 2, HEAP_ID_32); break; case 3: - ov02_0224E074(fsys, p_ret, 3, HEAP_ID_32); + ov02_0224E074(fieldSystem, p_ret, 3, HEAP_ID_32); break; case 4: - ov02_0224E074(fsys, p_ret, 4, HEAP_ID_32); + ov02_0224E074(fieldSystem, p_ret, 4, HEAP_ID_32); break; case 5: - ov02_0224E074(fsys, p_ret, 5, HEAP_ID_32); + ov02_0224E074(fieldSystem, p_ret, 5, HEAP_ID_32); break; default: GF_ASSERT(0); @@ -4012,13 +4012,13 @@ BOOL ScrCmd_560(ScriptContext *ctx) { BOOL ScrCmd_564(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0203A05C(ctx->fsys->savedata); + *p_ret = sub_0203A05C(ctx->fieldSystem->savedata); return FALSE; } BOOL ScrCmd_565(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_0202C2F8(sub_0202C6F4(ctx->fsys->savedata)); + *p_ret = sub_0202C2F8(sub_0202C6F4(ctx->fieldSystem->savedata)); return FALSE; } @@ -4057,14 +4057,14 @@ BOOL ScrCmd_571(ScriptContext *ctx) { } BOOL ScrCmd_573(ScriptContext *ctx) { - Save_SysInfo_SetMysteryGiftActive(Save_SysInfo_Get(ctx->fsys->savedata), 1); + Save_SysInfo_SetMysteryGiftActive(Save_SysInfo_Get(ctx->fieldSystem->savedata), 1); return FALSE; } BOOL ScrCmd_576(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_ret = ScriptGetVarPointer(ctx); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); *p_ret = sub_0205A6AC(*p_msgFmt); return FALSE; } @@ -4080,7 +4080,7 @@ BOOL ScrCmd_578(ScriptContext *ctx) { } BOOL ScrCmd_579(ScriptContext *ctx) { - Fsys_SyncMapObjectsToSave(ctx->fsys); + FieldSystem_SyncMapObjectsToSave(ctx->fieldSystem); return FALSE; } @@ -4088,7 +4088,7 @@ BOOL ScrCmd_582(ScriptContext *ctx) { u16 mapId = ScriptGetVar(ctx); u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); - Location *specialSpawn = LocalFieldData_GetSpecialSpawnWarpPtr(Save_LocalFieldData_Get(ctx->fsys->savedata)); + Location *specialSpawn = LocalFieldData_GetSpecialSpawnWarpPtr(Save_LocalFieldData_Get(ctx->fieldSystem->savedata)); specialSpawn->mapId = mapId; specialSpawn->x = x; specialSpawn->y = y; @@ -4100,33 +4100,33 @@ BOOL ScrCmd_582(ScriptContext *ctx) { BOOL ScrCmd_583(ScriptContext *ctx) { u16 objectId = ScriptGetVar(ctx); u8 r4 = ScriptReadByte(ctx); - LocalMapObject *object = GetMapObjectByID(ctx->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); GF_ASSERT(object != NULL); MapObject_ClearFlag18(object, r4); return FALSE; } BOOL ScrCmd_GetTrcardStars(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = sub_020691E8(fsys); + *p_ret = sub_020691E8(fieldSystem); return FALSE; } BOOL ScrCmd_ShowSaveStats(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - struct SaveStatsPrinter **saveStatsPrinter = FieldSysGetAttrAddr(fsys, SCRIPTENV_SAVE_STATS_PRINTER); - if (!Save_FileDoesNotBelongToPlayer(fsys->savedata)) { - *saveStatsPrinter = Field_SaveStatsPrinter_New(fsys, HEAP_ID_4, 3); + FieldSystem *fieldSystem = ctx->fieldSystem; + struct SaveStatsPrinter **saveStatsPrinter = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SAVE_STATS_PRINTER); + if (!Save_FileDoesNotBelongToPlayer(fieldSystem->savedata)) { + *saveStatsPrinter = Field_SaveStatsPrinter_New(fieldSystem, HEAP_ID_4, 3); Field_SaveStatsPrinter_Print(*saveStatsPrinter); } return FALSE; } BOOL ScrCmd_HideSaveStats(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - struct SaveStatsPrinter **saveStatsPrinter = FieldSysGetAttrAddr(fsys, SCRIPTENV_SAVE_STATS_PRINTER); - if (!Save_FileDoesNotBelongToPlayer(fsys->savedata)) { + FieldSystem *fieldSystem = ctx->fieldSystem; + struct SaveStatsPrinter **saveStatsPrinter = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SAVE_STATS_PRINTER); + if (!Save_FileDoesNotBelongToPlayer(fieldSystem->savedata)) { Field_SaveStatsPrinter_RemoveFromScreen(*saveStatsPrinter); Field_SaveStatsPrinter_Delete(*saveStatsPrinter); } @@ -4135,51 +4135,51 @@ BOOL ScrCmd_HideSaveStats(ScriptContext *ctx) { BOOL ScrCmd_595(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); - sub_02067A80(ctx->fsys, r1); + sub_02067A80(ctx->fieldSystem, r1); return FALSE; } BOOL ScrCmd_627(ScriptContext *ctx) { - struct UnkStruct_ScrCmd627 **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + struct UnkStruct_ScrCmd627 **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u8 r6 = ScriptReadByte(ctx); struct UnkStruct_ScrCmd627 *work = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(struct UnkStruct_ScrCmd627)); MI_CpuClear8(work, sizeof(struct UnkStruct_ScrCmd627)); *p_work = work; if (r6 == 5 || r6 == 6) { - work->unk_0 = ctx->fsys->unkA0; + work->unk_0 = ctx->fieldSystem->unkA0; } else { work->unk_0 = NULL; } - work->options = Save_PlayerData_GetOptionsAddr(ctx->fsys->savedata); + work->options = Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->savedata); work->unk_20 = r6; - work->saveData = ctx->fsys->savedata; - work->mapId = ctx->fsys->location->mapId; - work->unk_0C = ctx->fsys->unk94; - work->unk_1C = ctx->fsys->unkB0; + work->saveData = ctx->fieldSystem->savedata; + work->mapId = ctx->fieldSystem->location->mapId; + work->unk_0C = ctx->fieldSystem->unk94; + work->unk_1C = ctx->fieldSystem->unkB0; CallApplicationAsTask(ctx->taskman, &_02108584, work); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } BOOL ScrCmd_631(ScriptContext *ctx) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u16 r6 = ScriptGetVar(ctx); u16 r7 = ScriptGetVar(ctx); u16 r3 = ScriptGetVar(ctx); - *p_work = sub_0203FAB4(ctx->fsys, r6, r7, r3, HEAP_ID_32); + *p_work = sub_0203FAB4(ctx->fieldSystem, r6, r7, r3, HEAP_ID_32); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } BOOL ScrCmd_ScratchOffCard(ScriptContext *ctx) { - ScratchCardAppData **scratchCardData = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *scratchCardData = ScratchOffCards_Create(ctx->fsys, HEAP_ID_32); + ScratchCardAppData **scratchCardData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *scratchCardData = ScratchOffCards_Create(ctx->fieldSystem, HEAP_ID_32); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } BOOL ScrCmd_ScratchOffCardEnd(ScriptContext *ctx) { - ScratchCardAppData **scratchCardData = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + ScratchCardAppData **scratchCardData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); FreeToHeap(*scratchCardData); *scratchCardData = NULL; return TRUE; @@ -4189,7 +4189,7 @@ BOOL ScrCmd_GetScratchOffPrize(ScriptContext *ctx) { u16 cardno = ScriptGetVar(ctx); u16 *p_ret1 = ScriptGetVarPointer(ctx); u16 *p_ret2 = ScriptGetVarPointer(ctx); - ScratchCardAppData **scratchCardDataPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + ScratchCardAppData **scratchCardDataPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); ScratchCardAppData *scratchCardData = *scratchCardDataPtr; *p_ret1 = scratchCardData->unk_08[cardno]; *p_ret2 = scratchCardData->unk_0E[cardno]; @@ -4200,9 +4200,9 @@ BOOL ScrCmd_662(ScriptContext *ctx) { u16 r6 = ScriptGetVar(ctx); u16 r7 = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - if (sub_0203A05C(ctx->fsys->savedata)) { + if (sub_0203A05C(ctx->fieldSystem->savedata)) { *p_ret = 1; - sub_0203FC14(ctx->fsys, r7, r6); + sub_0203FC14(ctx->fieldSystem, r7, r6); SetupNativeScript(ctx, ScrNative_WaitApplication); } else { *p_ret = 0; @@ -4212,7 +4212,7 @@ BOOL ScrCmd_662(ScriptContext *ctx) { BOOL ScrCmd_663(ScriptContext *ctx) { u16 *p_var = ScriptGetVarPointer(ctx); - if (sub_0203A05C(ctx->fsys->savedata)) { + if (sub_0203A05C(ctx->fieldSystem->savedata)) { sub_02056D00(ctx->taskman, *p_var); } return TRUE; @@ -4233,7 +4233,7 @@ BOOL ScrCmd_667(ScriptContext *ctx) { u32 sub_020467A8(SaveData *saveData); BOOL ScrCmd_GetOwnedRotomForms(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *hasHeat = ScriptGetVarPointer(ctx); u16 *hasWash = ScriptGetVarPointer(ctx); u16 *hasFrost = ScriptGetVarPointer(ctx); @@ -4247,7 +4247,7 @@ BOOL ScrCmd_GetOwnedRotomForms(ScriptContext *ctx) { *hasFan = FALSE; *hasMow = FALSE; - flag = sub_020467A8(fsys->savedata); + flag = sub_020467A8(fieldSystem->savedata); if (((flag >> ROTOM_HEAT) & 1) == 1) { *hasHeat = TRUE; } @@ -4312,7 +4312,7 @@ u32 sub_020467A8(SaveData *saveData) { BOOL ScrCmd_AddSpecialGameStat2(ScriptContext *ctx) { u16 statno = ScriptReadHalfword(ctx); - GameStats_AddSpecial(Save_GameStats_Get(ctx->fsys->savedata), statno); + GameStats_AddSpecial(Save_GameStats_Get(ctx->fieldSystem->savedata), statno); return FALSE; } @@ -4338,9 +4338,9 @@ BOOL ScrCmd_682(ScriptContext *ctx) { } BOOL ScrCmd_691(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_ret = ScriptGetVarPointer(ctx); - if (GF_RTC_DateTimeToSec() - fsys->unkB4 >= 120) { + if (GF_RTC_DateTimeToSec() - fieldSystem->unkB4 >= 120) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -4349,9 +4349,9 @@ BOOL ScrCmd_691(ScriptContext *ctx) { } BOOL ScrCmd_696(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 r5 = ScriptGetVar(ctx); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); int i, partyCount; Pokemon *mon; @@ -4360,7 +4360,7 @@ BOOL ScrCmd_696(ScriptContext *ctx) { for (i = 0; i < partyCount; i++) { mon = Party_GetMonByIndex(party, i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { - Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(fsys->savedata), mon); + Pokedex_SetMonCaughtFlag(Save_Pokedex_Get(fieldSystem->savedata), mon); } } return FALSE; @@ -4374,7 +4374,7 @@ BOOL ScrCmd_FollowerPokeIsEventTrigger(ScriptContext *ctx) { int species; *r6 = 0; - mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), r7); + mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), r7); if (r4 >= 4) { return FALSE; @@ -4383,7 +4383,7 @@ BOOL ScrCmd_FollowerPokeIsEventTrigger(ScriptContext *ctx) { return FALSE; } if (!sub_0208E9E0(r4, mon, GetMonData(mon, MON_DATA_OTID, NULL) == PlayerProfile_GetTrainerID( - Save_PlayerData_GetProfileAddr(ctx->fsys->savedata)))) { + Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata)))) { return FALSE; } @@ -4411,28 +4411,28 @@ BOOL ScrCmd_FollowerPokeIsEventTrigger(ScriptContext *ctx) { } BOOL ScrCmd_596(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = ov01_022055DC(GetMapObjectByID(fsys->mapObjectMan, obj_partner_poke)); + *p_ret = ov01_022055DC(GetMapObjectByID(fieldSystem->mapObjectMan, obj_partner_poke)); return FALSE; } BOOL ScrCmd_597(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - ov01_02203AB4(fsys, GetMapObjectByID(fsys->mapObjectMan, obj_partner_poke), 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + ov01_02203AB4(fieldSystem, GetMapObjectByID(fieldSystem->mapObjectMan, obj_partner_poke), 0); return TRUE; } BOOL ScrCmd_598(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 mode = ScriptReadHalfword(ctx); LocalMapObject *obj1, *obj2; if (mode == 1) { - obj1 = PlayerAvatar_GetMapObject(fsys->playerAvatar); - obj2 = FollowingPokemon_GetMapObject(fsys); + obj1 = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); + obj2 = FollowingPokemon_GetMapObject(fieldSystem); } else if (mode == 2) { - obj1 = FollowingPokemon_GetMapObject(fsys); - obj2 = PlayerAvatar_GetMapObject(fsys->playerAvatar); + obj1 = FollowingPokemon_GetMapObject(fieldSystem); + obj2 = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); } else { GF_ASSERT(0); return FALSE; @@ -4442,12 +4442,12 @@ BOOL ScrCmd_598(ScriptContext *ctx) { } BOOL ScrCmd_599(ScriptContext *ctx) { - ov01_02205AEC(ctx->fsys); + ov01_02205AEC(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_600(ScriptContext *ctx) { - if (ov01_02205D68(ctx->fsys)) { + if (ov01_02205D68(ctx->fieldSystem)) { return TRUE; } else { return FALSE; @@ -4456,19 +4456,19 @@ BOOL ScrCmd_600(ScriptContext *ctx) { BOOL ScrCmd_FollowPokeFacePlayer(ScriptContext *ctx) { BOOL doFace = TRUE; - if (FollowingPokemon_IsActive(ctx->fsys)) { - if (ov01_022055DC(FollowingPokemon_GetMapObject(ctx->fsys))) { - LocalMapObject *myObject = PlayerAvatar_GetMapObject(FieldSys_GetPlayerAvatar(ctx->fsys)); - int facingDirection = PlayerAvatar_GetFacingDirection(FieldSys_GetPlayerAvatar(ctx->fsys)); + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { + if (ov01_022055DC(FollowingPokemon_GetMapObject(ctx->fieldSystem))) { + LocalMapObject *myObject = PlayerAvatar_GetMapObject(FieldSystem_GetPlayerAvatar(ctx->fieldSystem)); + int facingDirection = PlayerAvatar_GetFacingDirection(FieldSystem_GetPlayerAvatar(ctx->fieldSystem)); int playerX = MapObject_GetCurrentX(myObject); int deltaX = GetDeltaXByFacingDirection(facingDirection) * 2; int playerElev = MapObject_GetCurrentHeight(myObject); int playerY = MapObject_GetCurrentY(myObject); int deltaY = GetDeltaYByFacingDirection(facingDirection) * 2; - u8 facingTile = GetMetatileBehaviorAt(ctx->fsys, playerX + deltaX, playerY + deltaY); + u8 facingTile = GetMetatileBehaviorAt(ctx->fieldSystem, playerX + deltaX, playerY + deltaY); VecFx32 posVec; MapObject_GetPositionVec(myObject, &posVec); - if (sub_020549A8(ctx->fsys, &posVec, playerX + deltaX, playerY + deltaY, 0) || MetatileBehavior_IsSurfableWater(facingTile) || sub_02060BFC(myObject, playerX + deltaX, playerElev, playerY + deltaY)) { + if (sub_020549A8(ctx->fieldSystem, &posVec, playerX + deltaX, playerY + deltaY, 0) || MetatileBehavior_IsSurfableWater(facingTile) || sub_02060BFC(myObject, playerX + deltaX, playerElev, playerY + deltaY)) { doFace = FALSE; } } @@ -4481,11 +4481,11 @@ BOOL ScrCmd_FollowPokeFacePlayer(ScriptContext *ctx) { BOOL ScrCmd_602(ScriptContext *ctx) { u16 mode = ScriptReadHalfword(ctx); - if (FollowingPokemon_IsActive(ctx->fsys)) { + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { if (mode) { - MapObject_PauseMovement(FollowingPokemon_GetMapObject(ctx->fsys)); + MapObject_PauseMovement(FollowingPokemon_GetMapObject(ctx->fieldSystem)); } else { - MapObject_UnpauseMovement(FollowingPokemon_GetMapObject(ctx->fsys)); + MapObject_UnpauseMovement(FollowingPokemon_GetMapObject(ctx->fieldSystem)); } } return FALSE; @@ -4494,7 +4494,7 @@ BOOL ScrCmd_602(ScriptContext *ctx) { BOOL sub_02046D40(ScriptContext *ctx); BOOL ScrCmd_603(ScriptContext *ctx) { - if (FollowingPokemon_IsActive(ctx->fsys)) { + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { SetupNativeScript(ctx, sub_02046D40); } return TRUE; @@ -4502,14 +4502,14 @@ BOOL ScrCmd_603(ScriptContext *ctx) { BOOL ScrCmd_604(ScriptContext *ctx) { u16 movement = ScriptReadHalfword(ctx); - if (FollowingPokemon_IsActive(ctx->fsys)) { - sub_0205FC94(GetMapObjectByID(ctx->fsys->mapObjectMan, obj_partner_poke), movement); + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { + sub_0205FC94(GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_partner_poke), movement); } return TRUE; } BOOL sub_02046D40(ScriptContext *ctx) { - if (MapObject_IsMovementPaused(FollowingPokemon_GetMapObject(ctx->fsys))) { + if (MapObject_IsMovementPaused(FollowingPokemon_GetMapObject(ctx->fieldSystem))) { return TRUE; } else { return FALSE; @@ -4519,47 +4519,47 @@ BOOL sub_02046D40(ScriptContext *ctx) { BOOL ScrCmd_605(ScriptContext *ctx) { u8 r6 = ScriptReadByte(ctx); u8 r4 = ScriptReadByte(ctx); - if (FollowingPokemon_IsActive(ctx->fsys)) { - LocalMapObject *playerObj = PlayerAvatar_GetMapObject(ctx->fsys->playerAvatar); - LocalMapObject *tsurePokeObj = GetMapObjectByID(ctx->fsys->mapObjectMan, obj_partner_poke); + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { + LocalMapObject *playerObj = PlayerAvatar_GetMapObject(ctx->fieldSystem->playerAvatar); + LocalMapObject *tsurePokeObj = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_partner_poke); ov01_02205720(playerObj, tsurePokeObj, r6, r4); } return FALSE; } BOOL ScrCmd_606(ScriptContext *ctx) { - if (FollowingPokemon_IsActive(ctx->fsys)) { - LocalMapObject *object = FollowingPokemon_GetMapObject(ctx->fsys); - if (GetFollowPokePermissionBySpeciesAndMap(FollowPokeObj_GetSpecies(object), ctx->fsys->location->mapId)) { + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { + LocalMapObject *object = FollowingPokemon_GetMapObject(ctx->fieldSystem); + if (GetFollowPokePermissionBySpeciesAndMap(FollowPokeObj_GetSpecies(object), ctx->fieldSystem->location->mapId)) { sub_02069E84(object, 1); sub_02069DEC(object, TRUE); - ov01_02205790(ctx->fsys, 1); + ov01_02205790(ctx->fieldSystem, 1); } } return FALSE; } BOOL ScrCmd_607(ScriptContext *ctx) { - if (FollowingPokemon_IsActive(ctx->fsys)) { - LocalMapObject *object = FollowingPokemon_GetMapObject(ctx->fsys); - if (GetFollowPokePermissionBySpeciesAndMap(FollowPokeObj_GetSpecies(object), ctx->fsys->location->mapId)) { - ov01_02205790(ctx->fsys, 1); + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { + LocalMapObject *object = FollowingPokemon_GetMapObject(ctx->fieldSystem); + if (GetFollowPokePermissionBySpeciesAndMap(FollowPokeObj_GetSpecies(object), ctx->fieldSystem->location->mapId)) { + ov01_02205790(ctx->fieldSystem, 1); } } return FALSE; } BOOL ScrCmd_608(ScriptContext *ctx) { - if (FollowingPokemon_IsActive(ctx->fsys)) { - LocalMapObject *object = GetMapObjectByID(ctx->fsys->mapObjectMan, obj_partner_poke); + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_partner_poke); ov01_02205784(object); } return FALSE; } BOOL ScrCmd_609(ScriptContext *ctx) { - if (FollowingPokemon_IsActive(ctx->fsys)) { - LocalMapObject *object = GetMapObjectByID(ctx->fsys->mapObjectMan, obj_partner_poke); + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, obj_partner_poke); sub_020659CC(object); } return TRUE; @@ -4567,7 +4567,7 @@ BOOL ScrCmd_609(ScriptContext *ctx) { BOOL ScrCmd_610(ScriptContext *ctx) { u16 r1 = ScriptReadHalfword(ctx); - ov01_021EACBC(ctx->fsys->unk28, r1); + ov01_021EACBC(ctx->fieldSystem->unk28, r1); return TRUE; } @@ -4579,13 +4579,13 @@ BOOL ScrCmd_Pokeathlon(ScriptContext *ctx) { u16 *sp14 = ScriptGetVarPointer(ctx); u16 *sp18 = ScriptGetVarPointer(ctx); u16 *spC = ScriptGetVarPointer(ctx); - sub_02095DF4(ctx->fsys, r6, r4, r7, sp10, sp14, sp18, spC); + sub_02095DF4(ctx->fieldSystem, r6, r4, r7, sp10, sp14, sp18, spC); return TRUE; } BOOL ScrCmd_GetFriendSprite(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - if (PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys))) != PLAYER_GENDER_MALE) { + if (PlayerProfile_GetTrainerGender(Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem))) != PLAYER_GENDER_MALE) { *p_ret = SPRITE_HERO; } else { *p_ret = SPRITE_HEROINE; @@ -4594,7 +4594,7 @@ BOOL ScrCmd_GetFriendSprite(ScriptContext *ctx) { } BOOL ScrCmd_RegisterPokegearCard(ScriptContext *ctx) { - SavePokegear *pokegear = SaveData_GSPlayerMisc_Get(FieldSystem_GetSaveDataPtr(ctx->fsys)); + SavePokegear *pokegear = SaveData_GSPlayerMisc_Get(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u8 card = ScriptReadByte(ctx); switch (card) { case 1: @@ -4612,12 +4612,12 @@ BOOL ScrCmd_RegisterPokegearCard(ScriptContext *ctx) { } BOOL ScrCmd_804(ScriptContext *ctx) { - sub_0202EE58(SaveData_GSPlayerMisc_Get(ctx->fsys->savedata), ScriptReadByte(ctx)); + sub_0202EE58(SaveData_GSPlayerMisc_Get(ctx->fieldSystem->savedata), ScriptReadByte(ctx)); return FALSE; } BOOL ScrCmd_RegisterGearNumber(ScriptContext *ctx) { - SavePokegear *pokegear = SaveData_GSPlayerMisc_Get(FieldSystem_GetSaveDataPtr(ctx->fsys)); + SavePokegear *pokegear = SaveData_GSPlayerMisc_Get(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u8 number = ScriptGetVar(ctx); if (number < NUM_PHONE_CONTACTS) { RegisterPhoneNumberInPokeGear(pokegear, number); @@ -4626,7 +4626,7 @@ BOOL ScrCmd_RegisterGearNumber(ScriptContext *ctx) { } BOOL ScrCmd_CheckRegisteredPhoneNumber(ScriptContext *ctx) { - SavePokegear *pokegear = SaveData_GSPlayerMisc_Get(FieldSystem_GetSaveDataPtr(ctx->fsys)); + SavePokegear *pokegear = SaveData_GSPlayerMisc_Get(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); u8 number = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); if (number < NUM_PHONE_CONTACTS) { @@ -4646,16 +4646,16 @@ BOOL ScrCmd_SetPhoneCall(ScriptContext *ctx) { u16 r4 = ScriptGetVar(ctx); u16 r6 = ScriptGetVar(ctx); u16 r7 = ScriptGetVar(ctx); - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); //PhoneCallAppData - sub_02092DF4(Fsys_GetGearPhoneRingManager(ctx->fsys)); - ctx->fsys->unkD2_7 = TRUE; - ov02_02251EB8(Fsys_GetGearPhoneRingManager(ctx->fsys), r4, 0xFF, 0, r6, r7); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //PhoneCallAppData + sub_02092DF4(FieldSystem_GetGearPhoneRingManager(ctx->fieldSystem)); + ctx->fieldSystem->unkD2_7 = TRUE; + ov02_02251EB8(FieldSystem_GetGearPhoneRingManager(ctx->fieldSystem), r4, 0xFF, 0, r6, r7); return TRUE; } BOOL ScrCmd_RunPhoneCall(ScriptContext *ctx) { - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); - *p_work = PhoneUI_New(ctx->fsys); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + *p_work = PhoneUI_New(ctx->fieldSystem); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } @@ -4663,16 +4663,16 @@ BOOL ScrCmd_RunPhoneCall(ScriptContext *ctx) { BOOL ScrCmd_LoadPhoneDat(ScriptContext *ctx) { u16 idx = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = LoadPhoneBookEntryI(idx, sub_02092E10(Fsys_GetGearPhoneRingManager(ctx->fsys)), HEAP_ID_32); + *p_ret = LoadPhoneBookEntryI(idx, sub_02092E10(FieldSystem_GetGearPhoneRingManager(ctx->fieldSystem)), HEAP_ID_32); return FALSE; } BOOL ScrCmd_GetPhoneContactMsgIds(ScriptContext *ctx) { - u16 *p_scriptno = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); + u16 *p_scriptno = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_SCRIPT_NUMBER); u8 r6 = ScriptReadByte(ctx); u16 *sp0 = ScriptGetVarPointer(ctx); u16 *p_ret_msg = ScriptGetVarPointer(ctx); - PhoneBookEntry *entry = sub_02092E10(Fsys_GetGearPhoneRingManager(ctx->fsys)); + PhoneBookEntry *entry = sub_02092E10(FieldSystem_GetGearPhoneRingManager(ctx->fieldSystem)); *sp0 = GetPhoneMessageGmm(entry->unk0); u16 r5, p_ret_gmm; @@ -4698,13 +4698,13 @@ BOOL ScrCmd_GetPhoneContactMsgIds(ScriptContext *ctx) { BOOL ScrCmd_462(ScriptContext *ctx) { u16 idx = ScriptGetVar(ctx); - PhoneRematches_SetSeeking(SaveData_GetMomsSavingsAddr(ctx->fsys->savedata), idx, FALSE); + PhoneRematches_SetSeeking(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata), idx, FALSE); return FALSE; } BOOL ScrCmd_GetPhoneContactRandomGiftBerry(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - PhoneBookEntry *entry = sub_02092E10(Fsys_GetGearPhoneRingManager(ctx->fsys)); + PhoneBookEntry *entry = sub_02092E10(FieldSystem_GetGearPhoneRingManager(ctx->fieldSystem)); if (entry->gift == ITEM_CHERI_BERRY) { *p_ret = ITEM_CHERI_BERRY + (LCRandom() % 10); } else { @@ -4715,8 +4715,8 @@ BOOL ScrCmd_GetPhoneContactRandomGiftBerry(ScriptContext *ctx) { BOOL ScrCmd_GetPhoneContactGiftItem(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - PhoneBookEntry *entry = sub_02092E10(Fsys_GetGearPhoneRingManager(ctx->fsys)); - MomsSavings *momsSavings = SaveData_GetMomsSavingsAddr(ctx->fsys->savedata); + PhoneBookEntry *entry = sub_02092E10(FieldSystem_GetGearPhoneRingManager(ctx->fieldSystem)); + MomsSavings *momsSavings = SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata); *p_ret = PhoneRematches_GiftItemIdGet(momsSavings, entry->unk0); PhoneRematches_GiftItemIdSet(momsSavings, entry->unk0, ITEM_NONE); return FALSE; @@ -4724,34 +4724,34 @@ BOOL ScrCmd_GetPhoneContactGiftItem(ScriptContext *ctx) { BOOL ScrCmd_148(ScriptContext *ctx) { u8 r4 = ScriptReadByte(ctx); - sub_02092E14(Fsys_GetGearPhoneRingManager(ctx->fsys), r4, ScriptReadByte(ctx)); + sub_02092E14(FieldSystem_GetGearPhoneRingManager(ctx->fieldSystem), r4, ScriptReadByte(ctx)); return FALSE; } BOOL ScrCmd_149(ScriptContext *ctx) { - sub_0202F050(SaveData_GetMomsSavingsAddr(ctx->fsys->savedata), ScriptReadByte(ctx)); + sub_0202F050(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata), ScriptReadByte(ctx)); return FALSE; } BOOL ScrCmd_CameronPhoto(ScriptContext *ctx) { u16 photo_num = ScriptReadHalfword(ctx); - FieldSys_TakePhoto(ctx->fsys, photo_num); + FieldSystem_TakePhoto(ctx->fieldSystem, photo_num); return TRUE; } BOOL ScrCmd_616(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = PhotoAlbum_GetNumSaved(Save_PhotoAlbum_Get(ctx->fsys->savedata)); + *p_ret = PhotoAlbum_GetNumSaved(Save_PhotoAlbum_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_617(ScriptContext *ctx) { - sub_0206A860(ctx->fsys); + sub_0206A860(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_621(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; const struct UnkStruct_020FACDC sp4[3] = { {0x00083000, 0x00000000, 0x00041000}, {0x0008D000, 0x00000000, 0x00041000}, @@ -4759,10 +4759,10 @@ BOOL ScrCmd_621(ScriptContext *ctx) { }; int n, i; - int partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); - if (FlagGet(fsys, FLAG_GOT_TM51_FROM_FALKNER)) { + int partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); + if (FlagGet(fieldSystem, FLAG_GOT_TM51_FROM_FALKNER)) { n = 0; - } else if (FlagGet(fsys, FLAG_MET_PASSERBY_BOY)) { + } else if (FlagGet(fieldSystem, FLAG_MET_PASSERBY_BOY)) { n = 1; } else if (partyCount > 0) { n = 2; @@ -4770,7 +4770,7 @@ BOOL ScrCmd_621(ScriptContext *ctx) { n = 3; } for (i = 0; i < n; i++) { - ov01_021F3C0C(fsys->unk9C, 0x8D, &sp4[i], 0, fsys->unk54); + ov01_021F3C0C(fieldSystem->unk9C, 0x8D, &sp4[i], 0, fieldSystem->unk54); } return FALSE; } @@ -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->fsys->mapObjectMan, objectId); + LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectMan, objectId); if (object != NULL) { *p_ret = MapObject_GetFacingDirection(object); } else { @@ -4788,26 +4788,26 @@ BOOL ScrCmd_622(ScriptContext *ctx) { } BOOL ScrCmd_FollowPokeInteract(ScriptContext *ctx) { - Fsys_FollowPokeInteract(ctx->fsys); + FieldSystem_FollowPokeInteract(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_712(ScriptContext *ctx) { //smth creating alph puzzle screen? - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u8 action = ScriptReadByte(ctx); switch (action) { case 1: - *p_work = sub_0203EEE4(ctx->fsys); + *p_work = sub_0203EEE4(ctx->fieldSystem); break; case 2: - *p_work = sub_0203EF40(ctx->fsys); + *p_work = sub_0203EF40(ctx->fieldSystem); break; case 3: - *p_work = sub_0203EFA0(ctx->fsys); + *p_work = sub_0203EFA0(ctx->fieldSystem); break; default: case 0: - *p_work = sub_0203EEA0(ctx->fsys); + *p_work = sub_0203EEA0(ctx->fieldSystem); break; } SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); @@ -4815,12 +4815,12 @@ BOOL ScrCmd_712(ScriptContext *ctx) { //smth creating alph puzzle screen? } BOOL ScrCmd_AlphPuzzle(ScriptContext *ctx) { //this just loads a different puzzle with another ID - void **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + void **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u8 puzzle = ScriptReadByte(ctx); if (puzzle > 4) { puzzle = 0; } - *p_work = Fsys_CreateApplication_AlphPuzzle(ctx->fsys, puzzle); + *p_work = FieldSystem_CreateApplication_AlphPuzzle(ctx->fieldSystem, puzzle); SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData); return TRUE; } @@ -4831,7 +4831,7 @@ BOOL ScrCmd_722(ScriptContext *ctx) { u16 sp8 = ScriptReadHalfword(ctx); u16 r4 = ScriptReadHalfword(ctx); u16 sp4 = ScriptReadHalfword(ctx); - sub_020977CC(ctx->fsys, r7, r6, sp8, r4, sp4); + sub_020977CC(ctx->fieldSystem, r7, r6, sp8, r4, sp4); return TRUE; } @@ -4841,26 +4841,26 @@ BOOL ScrCmd_723(ScriptContext *ctx) { u16 sp8 = ScriptReadHalfword(ctx); u16 r4 = ScriptReadHalfword(ctx); u16 sp4 = ScriptReadHalfword(ctx); - sub_020979A8(ctx->fsys, r7, r6, sp8, r4, sp4); + sub_020979A8(ctx->fieldSystem, r7, r6, sp8, r4, sp4); return TRUE; } BOOL ScrCmd_Cinematic(ScriptContext *ctx) { u16 scene = ScriptReadHalfword(ctx); - sub_02097BE0(ctx->fsys, scene); + sub_02097BE0(ctx->fieldSystem, scene); return TRUE; } BOOL ScrCmd_727(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = GetIdxOfFirstAliveMonInParty_CrashIfNone(SaveArray_Party_Get(ctx->fsys->savedata)); + *p_ret = GetIdxOfFirstAliveMonInParty_CrashIfNone(SaveArray_Party_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_728(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); u8 r2 = ScriptReadByte(ctx); - if (ov01_022060B8(ctx->fsys, r1, r2)) { + if (ov01_022060B8(ctx->fieldSystem, r1, r2)) { return TRUE; } else { return FALSE; @@ -4869,7 +4869,7 @@ BOOL ScrCmd_728(ScriptContext *ctx) { BOOL ScrCmd_729(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - if (FollowingPokemon_IsActive(ctx->fsys)) { + if (FollowingPokemon_IsActive(ctx->fieldSystem)) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -4879,9 +4879,9 @@ BOOL ScrCmd_729(ScriptContext *ctx) { BOOL ScrCmd_730(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - if (!FollowingPokemon_IsActive(ctx->fsys)) { + if (!FollowingPokemon_IsActive(ctx->fieldSystem)) { *p_ret = TRUE; - } else if (ov01_022057C4(ctx->fsys)) { + } else if (ov01_022057C4(ctx->fieldSystem)) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -4890,20 +4890,20 @@ BOOL ScrCmd_730(ScriptContext *ctx) { } BOOL ScrCmd_731(ScriptContext *ctx) { - ov02_022508B4(ctx->fsys); + ov02_022508B4(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_732(ScriptContext *ctx) { s8 mood = ScriptReadByte(ctx); - FsysUnkSub108_AddMonMood(ctx->fsys->unk108, mood); + FieldSystemUnkSub108_AddMonMood(ctx->fieldSystem->unk108, mood); return FALSE; } BOOL ScrCmd_733(ScriptContext *ctx) { u8 r6 = ScriptReadByte(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - if (ov02_02250780(ctx->fsys, r6)) { + if (ov02_02250780(ctx->fieldSystem, r6)) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -4913,28 +4913,28 @@ BOOL ScrCmd_733(ScriptContext *ctx) { BOOL ScrCmd_734(ScriptContext *ctx) { u8 r1 = ScriptReadByte(ctx); - ov02_022507B4(ctx->fsys, r1); + ov02_022507B4(ctx->fieldSystem, r1); return TRUE; } BOOL sub_020476E8(ScriptContext *ctx); BOOL ScrCmd_TouchscreenMenuHide(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - if (ov01_021F6B00(fsys) == 3) { + FieldSystem *fieldSystem = ctx->fieldSystem; + if (ov01_021F6B00(fieldSystem) == 3) { return FALSE; } - ov01_021F6A9C(fsys, 3, 0); + ov01_021F6A9C(fieldSystem, 3, 0); SetupNativeScript(ctx, sub_020476E8); - fsys->unk1C = 3; + fieldSystem->unk1C = 3; return TRUE; } BOOL sub_020476E8(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - u16 *p_ret = GetVarPointer(fsys, ctx->data[0]); - int r5 = ov01_021F6B00(fsys); - int r0 = ov01_021F6B10(fsys); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *p_ret = GetVarPointer(fieldSystem, ctx->data[0]); + int r5 = ov01_021F6B00(fieldSystem); + int r0 = ov01_021F6B10(fieldSystem); if (r5 == 3 && r0 == 1) { return TRUE; } else { @@ -4945,18 +4945,18 @@ BOOL sub_020476E8(ScriptContext *ctx) { BOOL sub_02047744(ScriptContext *ctx); BOOL ScrCmd_TouchscreenMenuShow(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - ov01_021F6A9C(fsys, 0, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + ov01_021F6A9C(fieldSystem, 0, 0); SetupNativeScript(ctx, sub_02047744); - fsys->unk1C = 0; + fieldSystem->unk1C = 0; return TRUE; } BOOL sub_02047744(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - u16 *p_ret = GetVarPointer(fsys, ctx->data[0]); - int r5 = ov01_021F6B00(fsys); - int r0 = ov01_021F6B10(fsys); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *p_ret = GetVarPointer(fieldSystem, ctx->data[0]); + int r5 = ov01_021F6B00(fieldSystem); + int r0 = ov01_021F6B10(fieldSystem); if (r5 == 0 && r0 == 1) { return TRUE; } else { @@ -4965,28 +4965,28 @@ BOOL sub_02047744(ScriptContext *ctx) { } BOOL ScrCmd_815(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 r1 = ScriptReadHalfword(ctx); - sub_0203E33C(fsys, r1); + sub_0203E33C(fieldSystem, r1); return FALSE; } BOOL sub_020477C0(ScriptContext *ctx); BOOL ScrCmd_GetMenuChoice(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 var_ret = ScriptReadHalfword(ctx); ctx->data[0] = var_ret; - ov01_021F6ABC(fsys, 3, 3, &ctx->data[1]); + ov01_021F6ABC(fieldSystem, 3, 3, &ctx->data[1]); SetupNativeScript(ctx, sub_020477C0); return TRUE; } BOOL sub_020477C0(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - u16 *p_ret = GetVarPointer(fsys, ctx->data[0]); - int r7 = ov01_021F6B00(fsys); - int r0 = ov01_021F6AEC(fsys); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *p_ret = GetVarPointer(fieldSystem, ctx->data[0]); + int r7 = ov01_021F6B00(fieldSystem); + int r0 = ov01_021F6AEC(fieldSystem); if (r7 == 3 && r0 == 6) { *p_ret = ctx->data[1]; return TRUE; @@ -4996,17 +4996,17 @@ BOOL sub_020477C0(ScriptContext *ctx) { } BOOL ScrCmd_MenuInitStdGmm(ScriptContext *ctx) { - sub_02041770(ctx, ov01_021F6B20(ctx->fsys), NULL); + sub_02041770(ctx, ov01_021F6B20(ctx->fieldSystem), NULL); return TRUE; } BOOL ScrCmd_MenuInit(ScriptContext *ctx) { - sub_02041770(ctx, ov01_021F6B20(ctx->fsys), ctx->msgdata); + sub_02041770(ctx, ov01_021F6B20(ctx->fieldSystem), ctx->msgdata); return TRUE; } BOOL ScrCmd_MenuItemAdd(ScriptContext *ctx) { - struct UnkStruct_ov01_021EDC28 **p_menu = ov01_021F6B20(ctx->fsys); + struct UnkStruct_ov01_021EDC28 **p_menu = ov01_021F6B20(ctx->fieldSystem); u16 msgId = ScriptGetVar(ctx); u16 where = ScriptGetVar(ctx); u16 value = ScriptGetVar(ctx); @@ -5018,19 +5018,19 @@ BOOL sub_020478D0(ScriptContext *ctx); BOOL sub_02047908(struct UnkStruct_ov01_021EDC28 *menu, int idx); BOOL ScrCmd_MenuExec(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - struct UnkStruct_ov01_021EDC28 **p_menu = ov01_021F6B20(fsys); - u16 *p_ret = GetVarPointer(fsys, ctx->data[0]); - ov01_021F6ABC(fsys, 3, 7, p_ret); - ov01_021F6B34(fsys, sub_02047908, *p_menu); + FieldSystem *fieldSystem = ctx->fieldSystem; + struct UnkStruct_ov01_021EDC28 **p_menu = ov01_021F6B20(fieldSystem); + u16 *p_ret = GetVarPointer(fieldSystem, ctx->data[0]); + ov01_021F6ABC(fieldSystem, 3, 7, p_ret); + ov01_021F6B34(fieldSystem, sub_02047908, *p_menu); SetupNativeScript(ctx, sub_020478D0); return TRUE; } BOOL sub_020478D0(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - struct UnkStruct_ov01_021EDC28 **p_menu = ov01_021F6B20(fsys); - u16 *p_ret = GetVarPointer(fsys, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + struct UnkStruct_ov01_021EDC28 **p_menu = ov01_021F6B20(fieldSystem); + u16 *p_ret = GetVarPointer(fieldSystem, ctx->data[0]); if (*p_ret == 0xEEEE) { return FALSE; } else { @@ -5044,10 +5044,10 @@ BOOL sub_02047908(struct UnkStruct_ov01_021EDC28 *menu, int idx) { return FALSE; } -static u32 GetMaxBankTransactionAmount(FieldSystem *fsys, int action) { +static u32 GetMaxBankTransactionAmount(FieldSystem *fieldSystem, int action) { u32 ret; - u32 wallet = PlayerProfile_GetMoney(Save_PlayerData_GetProfileAddr(fsys->savedata)); - u32 bank = MomSavingsBalanceAction(SaveData_GetMomsSavingsAddr(fsys->savedata), MOMS_BALANCE_GET, 0); + u32 wallet = PlayerProfile_GetMoney(Save_PlayerData_GetProfileAddr(fieldSystem->savedata)); + u32 bank = MomSavingsBalanceAction(SaveData_GetMomsSavingsAddr(fieldSystem->savedata), MOMS_BALANCE_GET, 0); switch (action) { case 0: ret = MAX_MONEY - bank; @@ -5070,30 +5070,30 @@ static u32 GetMaxBankTransactionAmount(FieldSystem *fsys, int action) { BOOL sub_020479D4(ScriptContext *ctx); BOOL ScrCmd_BankTransaction(ScriptContext *ctx) { - struct BankTransactionWork **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); + struct BankTransactionWork **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 mode = ScriptReadHalfword(ctx); u16 var_ret = ScriptReadHalfword(ctx); struct BankTransactionWork *work = *p_work = AllocFromHeap(HEAP_ID_4, sizeof(struct BankTransactionWork)); // statement must be this way to match work->sub = AllocFromHeap(HEAP_ID_4, sizeof(struct BankTransactionWorkSub)); work->mode = mode; - work->sub->max = GetMaxBankTransactionAmount(ctx->fsys, mode); + work->sub->max = GetMaxBankTransactionAmount(ctx->fieldSystem, mode); work->sub->selected = -1; - ov01_021F6A9C(ctx->fsys, 5, work->sub); + ov01_021F6A9C(ctx->fieldSystem, 5, work->sub); ctx->data[0] = var_ret; SetupNativeScript(ctx, sub_020479D4); return TRUE; } BOOL sub_020479D4(ScriptContext *ctx) { - struct BankTransactionWork **p_work = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MISC_DATA_PTR); - u16 *p_ret = GetVarPointer(ctx->fsys, ctx->data[0]); + struct BankTransactionWork **p_work = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); + u16 *p_ret = GetVarPointer(ctx->fieldSystem, ctx->data[0]); struct BankTransactionWork *work = *p_work; if (work->sub->selected == -1) { return FALSE; } else if (work->sub->selected == 0) { *p_ret = 1; } else { - SaveData *saveData = ctx->fsys->savedata; + SaveData *saveData = ctx->fieldSystem->savedata; switch (work->mode) { case 0: PlayerProfile_SubMoney(Save_PlayerData_GetProfileAddr(saveData), work->sub->selected); @@ -5118,13 +5118,13 @@ BOOL ScrCmd_BankOrWalletIsFull(ScriptContext *ctx) { u16 action = ScriptReadHalfword(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); if (action == 0) { - if (MomSavingsBalanceAction(SaveData_GetMomsSavingsAddr(ctx->fsys->savedata), MOMS_BALANCE_GET, 0) == MAX_MONEY) { + if (MomSavingsBalanceAction(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata), MOMS_BALANCE_GET, 0) == MAX_MONEY) { *p_ret = TRUE; } else { *p_ret = FALSE; } } else { - if (PlayerProfile_GetMoney(Save_PlayerData_GetProfileAddr(ctx->fsys->savedata)) == MAX_MONEY) { + if (PlayerProfile_GetMoney(Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata)) == MAX_MONEY) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -5137,96 +5137,96 @@ BOOL ScrCmd_RockSmashItemCheck(ScriptContext *ctx) { u16 followMonKnowsHm = ScriptGetVar(ctx); u16 *itemFound = ScriptGetVarPointer(ctx); u16 *item = ScriptGetVarPointer(ctx); - FieldSys_RockSmashItemCheck(ctx->fsys, (u8)followMonKnowsHm, itemFound, item); + FieldSystem_RockSmashItemCheck(ctx->fieldSystem, (u8)followMonKnowsHm, itemFound, item); return TRUE; } BOOL ScrCmd_754(ScriptContext *ctx) { u16 *r1 = ScriptGetVarPointer(ctx); - ov01_02204ED8(ctx->fsys, r1); + ov01_02204ED8(ctx->fieldSystem, r1); return TRUE; } BOOL ScrCmd_755(ScriptContext *ctx) { - ov02_02250A60(ctx->fsys); + ov02_02250A60(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_756(ScriptContext *ctx) { - ov02_02250AC8(ctx->fsys); + ov02_02250AC8(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_757(ScriptContext *ctx) { - ov02_02250AE8(ctx->fsys); + ov02_02250AE8(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_758(ScriptContext *ctx) { u8 r1 = ScriptReadHalfword(ctx); - ov02_02250AFC(ctx->fsys, r1); + ov02_02250AFC(ctx->fieldSystem, r1); return TRUE; } BOOL ScrCmd_759(ScriptContext *ctx) { - ov02_02250B80(ctx->fsys); + ov02_02250B80(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_760(ScriptContext *ctx) { - ov02_02250B30(ctx->fsys); + ov02_02250B30(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_761(ScriptContext *ctx) { u8 r1 = ScriptReadHalfword(ctx); - ov02_02251424(ctx->fsys, r1); + ov02_02251424(ctx->fieldSystem, r1); return FALSE; } BOOL ScrCmd_762(ScriptContext *ctx) { u8 r1 = ScriptReadHalfword(ctx); - ov02_022514C8(ctx->fsys, r1); + ov02_022514C8(ctx->fieldSystem, r1); return FALSE; } BOOL ScrCmd_763(ScriptContext *ctx) { - ov02_02251554(ctx->fsys); + ov02_02251554(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_764(ScriptContext *ctx) { - ov02_022515A4(ctx->fsys); + ov02_022515A4(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_765(ScriptContext *ctx) { - ov02_022518E0(ctx->fsys); + ov02_022518E0(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_766(ScriptContext *ctx) { - ov02_02251B14(ctx->fsys); + ov02_02251B14(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_767(ScriptContext *ctx) { - ov02_02251CF0(ctx->fsys); + ov02_02251CF0(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_768(ScriptContext *ctx) { - ov02_02251DC4(ctx->fsys); + ov02_02251DC4(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_769(ScriptContext *ctx) { - ov02_02251DE8(ctx->fsys); + ov02_02251DE8(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_SetFollowPokeInhibitState(ScriptContext *ctx) { - SavFollowPoke_SetInhibitFlagState(Save_FollowPoke_Get(ctx->fsys->savedata), ScriptReadByte(ctx)); + SavFollowPoke_SetInhibitFlagState(Save_FollowPoke_Get(ctx->fieldSystem->savedata), ScriptReadByte(ctx)); return FALSE; } @@ -5259,7 +5259,7 @@ BOOL ScrCmd_ScriptOverlayCmd(ScriptContext *ctx) { BOOL ScrCmd_CheckBankBalance(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); u32 check_amt = ScriptReadWord(ctx); - if (MomSavingsBalanceAction(SaveData_GetMomsSavingsAddr(ctx->fsys->savedata), MOMS_BALANCE_GET, 0) >= check_amt) { + if (MomSavingsBalanceAction(SaveData_GetMomsSavingsAddr(ctx->fieldSystem->savedata), MOMS_BALANCE_GET, 0) >= check_amt) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -5269,33 +5269,33 @@ BOOL ScrCmd_CheckBankBalance(ScriptContext *ctx) { BOOL ScrCmd_BufferRulesetName(ScriptContext *ctx) { u16 ruleset = ScriptReadHalfword(ctx); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); - ov03_022566D0(ctx->fsys, *p_msgFmt, ruleset); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + ov03_022566D0(ctx->fieldSystem, *p_msgFmt, ruleset); return FALSE; } BOOL ScrCmd_799(ScriptContext *ctx) { u16 *p_var = ScriptGetVarPointer(ctx); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); - ov03_022566D0(ctx->fsys, *p_msgFmt, *p_var); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + ov03_022566D0(ctx->fieldSystem, *p_msgFmt, *p_var); return FALSE; } BOOL ScrCmd_800(ScriptContext *ctx) { u16 *p_var = ScriptGetVarPointer(ctx); - ov03_02256710(ctx->fsys, *p_var); + ov03_02256710(ctx->fieldSystem, *p_var); return FALSE; } BOOL ScrCmd_801(ScriptContext *ctx) { - Window **p_moneyBox = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MONEY_BOX); + Window **p_moneyBox = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MONEY_BOX); u16 *p_var = ScriptGetVarPointer(ctx); - *p_moneyBox = ov01_021EEF68(ctx->fsys, *p_var); + *p_moneyBox = ov01_021EEF68(ctx->fieldSystem, *p_var); return FALSE; } BOOL ScrCmd_802(ScriptContext *ctx) { - Window **p_moneyBox = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MONEY_BOX); + Window **p_moneyBox = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MONEY_BOX); ov01_021EEF88(*p_moneyBox); return FALSE; } @@ -5303,8 +5303,8 @@ BOOL ScrCmd_802(ScriptContext *ctx) { BOOL ScrCmd_803(ScriptContext *ctx) { u16 *r4 = ScriptGetVarPointer(ctx); u16 *r6 = ScriptGetVarPointer(ctx); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); - *r6 = ov03_02256A2C(ctx->fsys, *p_msgFmt, *r4); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + *r6 = ov03_02256A2C(ctx->fieldSystem, *p_msgFmt, *r4); return FALSE; } @@ -5314,62 +5314,62 @@ BOOL ScrCmd_805(ScriptContext *ctx) { } BOOL ScrCmd_806(ScriptContext *ctx) { - ov02_022523B4(ctx->fsys->taskman); + ov02_022523B4(ctx->fieldSystem->taskman); return TRUE; } BOOL ScrCmd_810(ScriptContext *ctx) { - ov02_02252534(ctx->fsys); + ov02_02252534(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_814(ScriptContext *ctx) { - SetFlag99A(Save_VarsFlags_Get(ctx->fsys->savedata)); + SetFlag99A(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_UnownCircle(ScriptContext *ctx) { - ov02_022529FC(ctx->fsys); + ov02_022529FC(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_817(ScriptContext *ctx) { - ov02_02252EE4(ctx->fsys, ScriptReadByte(ctx)); + ov02_02252EE4(ctx->fieldSystem, ScriptReadByte(ctx)); return TRUE; } BOOL ScrCmd_MystriStageGymmickInit(ScriptContext *ctx) { - Fsys_InitMystriStageGymmick(ctx->fsys); + FieldSystem_InitMystriStageGymmick(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_819(ScriptContext *ctx) { - ov04_02256ED8(ctx->fsys); + ov04_02256ED8(ctx->fieldSystem); return FALSE; } BOOL ScrCmd_820(ScriptContext *ctx) { - ov04_02256F00(ctx->fsys, ScriptReadByte(ctx)); + ov04_02256F00(ctx->fieldSystem, ScriptReadByte(ctx)); return TRUE; } BOOL ScrCmd_822(ScriptContext *ctx) { - ov03_02258910(ctx->fsys); + ov03_02258910(ctx->fieldSystem); return TRUE; } BOOL ScrCmd_823(ScriptContext *ctx) { u16 *p_var = ScriptGetVarPointer(ctx); - MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat **p_msgFmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); PlayerProfile *profile = PlayerProfile_New(HEAP_ID_4); - SafariZone_GetLinkLeaderToProfile(Save_SafariZone_Get(ctx->fsys->savedata), profile); + SafariZone_GetLinkLeaderToProfile(Save_SafariZone_Get(ctx->fieldSystem->savedata), profile); BufferPlayersName(*p_msgFmt, *p_var, profile); FreeToHeap(profile); return FALSE; } BOOL ScrCmd_824(ScriptContext *ctx) { - SafariZone *safariZone = Save_SafariZone_Get(ctx->fsys->savedata); + SafariZone *safariZone = Save_SafariZone_Get(ctx->fieldSystem->savedata); u16 *p_ret = ScriptGetVarPointer(ctx); SafariZone_DeactivateLinkIfExpired(safariZone); if (SafariZone_IsCurrentlyLinked(safariZone)) { @@ -5382,7 +5382,7 @@ BOOL ScrCmd_824(ScriptContext *ctx) { BOOL ScrCmd_829(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - if (ov01_02206268(ctx->fsys)) { + if (ov01_02206268(ctx->fieldSystem)) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -5392,7 +5392,7 @@ BOOL ScrCmd_829(ScriptContext *ctx) { BOOL ScrCmd_830(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - if (ov02_02253134(ctx->fsys->savedata) == TRUE) { + if (ov02_02253134(ctx->fieldSystem->savedata) == TRUE) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -5408,7 +5408,7 @@ BOOL ScrCmd_831(ScriptContext *ctx) { BOOL ScrCmd_832(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - if (ov02_02253188(ctx->fsys->savedata) == TRUE) { + if (ov02_02253188(ctx->fieldSystem->savedata) == TRUE) { *p_ret = TRUE; } else { *p_ret = FALSE; @@ -5418,13 +5418,13 @@ BOOL ScrCmd_832(ScriptContext *ctx) { BOOL ScrCmd_833(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = ov02_022531B4(ctx->fsys->savedata); + *p_ret = ov02_022531B4(ctx->fieldSystem->savedata); return FALSE; } BOOL ScrCmd_837(ScriptContext *ctx) { u16 *p_ret = ScriptGetVarPointer(ctx); - if (sub_020291A4(ctx->fsys->savedata, 0)) { + if (sub_020291A4(ctx->fieldSystem->savedata, 0)) { *p_ret = TRUE; } else { *p_ret = FALSE; diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index a87a0efad..6bb1072f8 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -13,8 +13,8 @@ extern u32 FollowingPokemon_GetSpriteID(int species, u16 form, u32 gender); static LocalMapObject* CreateDaycareMonSpriteInternal(MapObjectManager* object_man, u8 dc_mon_idx, u16 species, u8 form, u32 gender, u32 direction, u32 x, u32 y, u32 map_no, BOOL shiny); BOOL ScrCmd_BufferDaycareMonNicks(ScriptContext* ctx) { - SaveData* savedata = ctx->fsys->savedata; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + SaveData* savedata = ctx->fieldSystem->savedata; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); Daycare* daycare = Save_Daycare_Get(savedata); Save_Daycare_BufferStoredMonNicks(daycare, *msg_fmt); @@ -23,7 +23,7 @@ BOOL ScrCmd_BufferDaycareMonNicks(ScriptContext* ctx) { } BOOL ScrCmd_GetDaycareState(ScriptContext* ctx) { - SaveData* savedata = ctx->fsys->savedata; + SaveData* savedata = ctx->fieldSystem->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); Daycare* daycare = SaveArray_Get(savedata, SAVE_DAYCARE); @@ -33,7 +33,7 @@ BOOL ScrCmd_GetDaycareState(ScriptContext* ctx) { } BOOL ScrCmd_ResetDaycareEgg(ScriptContext* ctx) { - Daycare* daycare = SaveArray_Get(ctx->fsys->savedata, SAVE_DAYCARE); + Daycare* daycare = SaveArray_Get(ctx->fieldSystem->savedata, SAVE_DAYCARE); Save_Daycare_ResetEggStats(daycare); @@ -41,10 +41,10 @@ BOOL ScrCmd_ResetDaycareEgg(ScriptContext* ctx) { } BOOL ScrCmd_GiveDaycareEgg(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - Daycare* daycare = SaveArray_Get(fsys->savedata, SAVE_DAYCARE); - Party* party = SaveArray_Party_Get(fsys->savedata); - SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fsys); + FieldSystem* fieldSystem = ctx->fieldSystem; + Daycare* daycare = SaveArray_Get(fieldSystem->savedata, SAVE_DAYCARE); + Party* party = SaveArray_Party_Get(fieldSystem->savedata); + SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); PlayerProfile* profile = Save_PlayerData_GetProfileAddr(savedata); GiveEggToPlayer(daycare, party, profile); @@ -53,13 +53,13 @@ BOOL ScrCmd_GiveDaycareEgg(ScriptContext* ctx) { } BOOL ScrCmd_RetrieveDaycareMon(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); - SaveData* savedata = fsys->savedata; + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + SaveData* savedata = fieldSystem->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); Daycare* daycare = SaveArray_Get(savedata, SAVE_DAYCARE); - Party* party = SaveArray_Party_Get(fsys->savedata); + Party* party = SaveArray_Party_Get(fieldSystem->savedata); *ret_ptr = Save_Daycare_RetrieveMon(party, *msg_fmt, daycare, (u8)daycare_mon_idx); @@ -67,9 +67,9 @@ BOOL ScrCmd_RetrieveDaycareMon(ScriptContext* ctx) { } BOOL ScrCmd_BufferDaycareWithdrawCost(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); - SaveData* savedata = fsys->savedata; + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + SaveData* savedata = fieldSystem->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); Daycare* daycare = SaveArray_Get(savedata, SAVE_DAYCARE); @@ -80,8 +80,8 @@ BOOL ScrCmd_BufferDaycareWithdrawCost(ScriptContext* ctx) { } BOOL ScrCmd_BufferDaycareMonGrowth(ScriptContext* ctx) { - SaveData* savedata = ctx->fsys->savedata; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + SaveData* savedata = ctx->fieldSystem->savedata; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); Daycare* daycare = SaveArray_Get(savedata, SAVE_DAYCARE); @@ -92,10 +92,10 @@ BOOL ScrCmd_BufferDaycareMonGrowth(ScriptContext* ctx) { } BOOL ScrCmd_GetTailDaycareMonSpeciesAndNick(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u16* ret_ptr = ScriptGetVarPointer(ctx); - Daycare* daycare = Save_Daycare_Get(fsys->savedata); + Daycare* daycare = Save_Daycare_Get(fieldSystem->savedata); *ret_ptr = Save_Daycare_BufferTailMonNick(daycare, *msg_fmt); @@ -103,10 +103,10 @@ BOOL ScrCmd_GetTailDaycareMonSpeciesAndNick(ScriptContext* ctx) { } BOOL ScrCmd_PutMonInDaycare(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - SaveData* savedata = fsys->savedata; + FieldSystem* fieldSystem = ctx->fieldSystem; + SaveData* savedata = fieldSystem->savedata; u16 slot = ScriptGetVar(ctx); - Party* party = SaveArray_Party_Get(fsys->savedata); + Party* party = SaveArray_Party_Get(fieldSystem->savedata); Daycare* daycare = SaveArray_Get(savedata, SAVE_DAYCARE); Save_Daycare_PutMonIn(party, (u8)slot, daycare, savedata); @@ -115,8 +115,8 @@ BOOL ScrCmd_PutMonInDaycare(ScriptContext* ctx) { } BOOL ScrCmd_BufferDaycareMonStats(ScriptContext* ctx) { - SaveData* savedata = ctx->fsys->savedata; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + SaveData* savedata = ctx->fieldSystem->savedata; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u16 nickname_idx = ScriptGetVar(ctx); u16 level_idx = ScriptGetVar(ctx); u16 gender_idx = ScriptGetVar(ctx); @@ -129,7 +129,7 @@ BOOL ScrCmd_BufferDaycareMonStats(ScriptContext* ctx) { } BOOL ScrCmd_GetDaycareCompatibility(ScriptContext* ctx) { - SaveData* savedata = ctx->fsys->savedata; + SaveData* savedata = ctx->fieldSystem->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); Daycare* daycare = SaveArray_Get(savedata, SAVE_DAYCARE); @@ -139,7 +139,7 @@ BOOL ScrCmd_GetDaycareCompatibility(ScriptContext* ctx) { } BOOL ScrCmd_CheckDaycareEgg(ScriptContext* ctx) { - SaveData* savedata = ctx->fsys->savedata; + SaveData* savedata = ctx->fieldSystem->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); Daycare* daycare = SaveArray_Get(savedata, SAVE_DAYCARE); @@ -153,11 +153,11 @@ BOOL ScrCmd_UpdateDaycareMonObjects(ScriptContext* ctx) { u8 form; u16 species; - FieldSystem* fsys = ctx->fsys; - daycare = Save_Daycare_Get(fsys->savedata); + FieldSystem* fieldSystem = ctx->fieldSystem; + 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(fsys->mapObjectMan, obj_daycare_poke_1 + dc_mon_idx); + LocalMapObject* mon_map_object = GetMapObjectByID(fieldSystem->mapObjectMan, 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(fsys->mapObjectMan, (u8)dc_mon_idx, species, form, gender, 1, x, y, fsys->location->mapId, shiny); + CreateDaycareMonSpriteInternal(fieldSystem->mapObjectMan, (u8)dc_mon_idx, species, form, gender, 1, x, y, fieldSystem->location->mapId, shiny); } return FALSE; @@ -202,10 +202,10 @@ static LocalMapObject* CreateDaycareMonSpriteInternal(MapObjectManager* object_m BOOL ScrCmd_DaycareSanitizeMon(ScriptContext* ctx) { Pokemon *mon; - FieldSystem* fsys = ctx->fsys; + FieldSystem* fieldSystem = ctx->fieldSystem; u16 party_slot = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); - Party* party = SaveArray_Party_Get(fsys->savedata); + Party* party = SaveArray_Party_Get(fieldSystem->savedata); mon = Party_GetMonByIndex(party, party_slot); *ret_ptr = 0; @@ -216,7 +216,7 @@ BOOL ScrCmd_DaycareSanitizeMon(ScriptContext* ctx) { u32 held_item = GetMonData(mon, MON_DATA_HELD_ITEM, NULL); if (held_item == ITEM_GRISEOUS_ORB) { - Bag* bag = Save_Bag_Get(fsys->savedata); + Bag* bag = Save_Bag_Get(fieldSystem->savedata); if (!Bag_AddItem(bag, ITEM_GRISEOUS_ORB, 1, HEAP_ID_FIELD)) { *ret_ptr = 0xFF; return FALSE; diff --git a/src/scrcmd_fossils.c b/src/scrcmd_fossils.c index 30d630cb3..9b122627f 100644 --- a/src/scrcmd_fossils.c +++ b/src/scrcmd_fossils.c @@ -14,7 +14,7 @@ static const u16 sFossilPokemonMap[7][2] = { }; BOOL ScrCmd_CountFossils(ScriptContext* ctx) { - FieldSystem* sav_ptr = ctx->fsys; + FieldSystem* sav_ptr = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); u8 i; @@ -43,7 +43,7 @@ BOOL ScrCmd_GetFossilPokemon(ScriptContext* ctx) { } BOOL ScrCmd_GetFossilMinimumAmount(ScriptContext* ctx) { - FieldSystem* sav_ptr = ctx->fsys; + FieldSystem* sav_ptr = ctx->fieldSystem; u16* ret_ptr1 = ScriptGetVarPointer(ctx); u16* ret_ptr2 = ScriptGetVarPointer(ctx); u16 needed_amount = ScriptGetVar(ctx); diff --git a/src/scrcmd_items.c b/src/scrcmd_items.c index cf40c4c14..b06609c7c 100644 --- a/src/scrcmd_items.c +++ b/src/scrcmd_items.c @@ -5,7 +5,7 @@ extern BOOL ItemIsTMOrHM(u16 item_id); BOOL ScrCmd_GiveItem(ScriptContext* ctx) { - FieldSystem* sav_ptr = ctx->fsys; + FieldSystem* sav_ptr = ctx->fieldSystem; u16 item_id = ScriptGetVar(ctx); u16 quantity = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -17,7 +17,7 @@ BOOL ScrCmd_GiveItem(ScriptContext* ctx) { } BOOL ScrCmd_TakeItem(ScriptContext* ctx) { - FieldSystem* sav_ptr = ctx->fsys; + FieldSystem* sav_ptr = ctx->fieldSystem; u16 item_id = ScriptGetVar(ctx); u16 quantity = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -29,7 +29,7 @@ BOOL ScrCmd_TakeItem(ScriptContext* ctx) { } BOOL ScrCmd_HasSpaceForItem(ScriptContext* ctx) { - FieldSystem* sav_ptr = ctx->fsys; + FieldSystem* sav_ptr = ctx->fieldSystem; u16 item_id = ScriptGetVar(ctx); u16 quantity = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -41,7 +41,7 @@ BOOL ScrCmd_HasSpaceForItem(ScriptContext* ctx) { } BOOL ScrCmd_HasItem(ScriptContext* ctx) { - FieldSystem* sav_ptr = ctx->fsys; + FieldSystem* sav_ptr = ctx->fieldSystem; u16 item_id = ScriptGetVar(ctx); u16 quantity = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -53,7 +53,7 @@ BOOL ScrCmd_HasItem(ScriptContext* ctx) { } BOOL ScrCmd_GetItemQuantity(ScriptContext* ctx) { - FieldSystem* sav_ptr = ctx->fsys; + FieldSystem* sav_ptr = ctx->fieldSystem; u16 item_id = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); diff --git a/src/scrcmd_lottery.c b/src/scrcmd_lottery.c index 0aed50452..7999996e9 100644 --- a/src/scrcmd_lottery.c +++ b/src/scrcmd_lottery.c @@ -6,7 +6,7 @@ u8 LotoId_CountDigitsMatched(u16 lotoId, u16 otid); BOOL ScrCmd_BufferDeptStoreFloorNo(ScriptContext *ctx) { - MessageFormat **msg = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat **msg = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 fieldno = ScriptReadByte(ctx); u8 floor = ScriptReadByte(ctx); BufferDeptStoreFloorNo(*msg, fieldno, floor); @@ -14,7 +14,7 @@ BOOL ScrCmd_BufferDeptStoreFloorNo(ScriptContext *ctx) { } BOOL ScrCmd_LotoIdGet(ScriptContext *ctx) { - SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fieldSystem->savedata); u16 *retPtr = ScriptGetVarPointer(ctx); u32 lotoId = Save_VarsFlags_GetLotoId(state); *retPtr = lotoId; @@ -22,8 +22,8 @@ BOOL ScrCmd_LotoIdGet(ScriptContext *ctx) { } BOOL ScrCmd_LotoIdSearch(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - PC_STORAGE *storage = GetStoragePCPointer(fsys->savedata); + FieldSystem *fieldSystem = ctx->fieldSystem; + PC_STORAGE *storage = GetStoragePCPointer(fieldSystem->savedata); u16 *retPtr0 = ScriptGetVarPointer(ctx); u16 *retPtr1 = ScriptGetVarPointer(ctx); u16 *retPtr2 = ScriptGetVarPointer(ctx); @@ -41,9 +41,9 @@ BOOL ScrCmd_LotoIdSearch(ScriptContext *ctx) { u32 ii; u32 j; - partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (monDigit = 0, monPosition = 0, i = 0; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { otid = GetMonData(mon, MON_DATA_OTID, NULL) & 0xffff; digitCount = LotoId_CountDigitsMatched(lotoId, otid); @@ -86,7 +86,7 @@ BOOL ScrCmd_LotoIdSearch(ScriptContext *ctx) { } BOOL ScrCmd_LotoIdSet(ScriptContext *ctx) { - SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fsys->savedata); + SaveVarsFlags *state = Save_VarsFlags_Get(ctx->fieldSystem->savedata); Save_VarsFlags_RollLotoId(state); return FALSE; } diff --git a/src/scrcmd_mart.c b/src/scrcmd_mart.c index 185a11ddc..b2d7bbe91 100644 --- a/src/scrcmd_mart.c +++ b/src/scrcmd_mart.c @@ -47,7 +47,7 @@ BOOL ScrCmd_MartBuy(ScriptContext *ctx) { nitems = 0; badge_count = 0; for (i = 0; i < 16; i++) { - if (PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(ctx->fsys->savedata), i) == TRUE) { + if (PlayerProfile_TestBadgeFlag(Save_PlayerData_GetProfileAddr(ctx->fieldSystem->savedata), i) == TRUE) { badge_count++; } } @@ -84,7 +84,7 @@ BOOL ScrCmd_MartBuy(ScriptContext *ctx) { } } items[nitems] = 0xFFFF; - InitMartUI(ctx->taskman, ctx->fsys, items, 0, 0, 0, 0); + InitMartUI(ctx->taskman, ctx->fieldSystem, items, 0, 0, 0, 0); return TRUE; } @@ -92,7 +92,7 @@ BOOL ScrCmd_MartSell(ScriptContext *ctx) { u16 dummy[1]; dummy[0] = 0xFFFF; - InitMartUI(ctx->taskman, ctx->fsys, dummy, 0, 1, 0, 0); + InitMartUI(ctx->taskman, ctx->fieldSystem, dummy, 0, 1, 0, 0); return TRUE; } @@ -164,7 +164,7 @@ BOOL ScrCmd_SpecialMartBuy(ScriptContext *ctx) { u16 which; which = ScriptGetVar(ctx); - InitMartUI(ctx->taskman, ctx->fsys, _0210FA3C[which], 0, 0, 0, NULL); + InitMartUI(ctx->taskman, ctx->fieldSystem, _0210FA3C[which], 0, 0, 0, NULL); return TRUE; } @@ -185,7 +185,7 @@ BOOL ScrCmd_DecorationMart(ScriptContext *ctx) { u16 which; which = ScriptGetVar(ctx); - InitMartUI(ctx->taskman, ctx->fsys, _0210F9CC[which], 1, 0, which <= 1 ? 1 : 0, NULL); + InitMartUI(ctx->taskman, ctx->fieldSystem, _0210F9CC[which], 1, 0, which <= 1 ? 1 : 0, NULL); return TRUE; } @@ -211,7 +211,7 @@ BOOL ScrCmd_SealMart(ScriptContext *ctx) { u16 which; which = ScriptGetVar(ctx); - InitMartUI(ctx->taskman, ctx->fsys, _0210F9E8[which], 2, 0, 0, NULL); + InitMartUI(ctx->taskman, ctx->fieldSystem, _0210F9E8[which], 2, 0, 0, NULL); return TRUE; } @@ -405,14 +405,14 @@ BOOL ScrCmd_771(ScriptContext *ctx) { SaveVarsFlags *flagsys; RTCDate date; - flagsys = Save_VarsFlags_Get(ctx->fsys->savedata); + flagsys = Save_VarsFlags_Get(ctx->fieldSystem->savedata); GF_RTC_CopyDate(&date); // UB: Possibly illegal access to _0210F9CC between Tuesday and Saturday, inclusive - if (Pokedex_GetNatDexFlag(Save_Pokedex_Get(ctx->fsys->savedata))) { - InitMartUI(ctx->taskman, ctx->fsys, _0210F9CC[date.week], 3, 0, 0, _0210FA04[date.week + 7]); + if (Pokedex_GetNatDexFlag(Save_Pokedex_Get(ctx->fieldSystem->savedata))) { + InitMartUI(ctx->taskman, ctx->fieldSystem, _0210F9CC[date.week], 3, 0, 0, _0210FA04[date.week + 7]); } else { - InitMartUI(ctx->taskman, ctx->fsys, _0210F9CC[date.week], 3, 0, 0, _0210FA04[date.week]); + InitMartUI(ctx->taskman, ctx->fieldSystem, _0210F9CC[date.week], 3, 0, 0, _0210FA04[date.week]); } return TRUE; } @@ -472,13 +472,13 @@ BOOL ScrCmd_772(ScriptContext *ctx) { POKEATHLON_SAV *pokeathlon; int i; - pokeathlon = Save_Pokeathlon_Get(ctx->fsys->savedata); + pokeathlon = Save_Pokeathlon_Get(ctx->fieldSystem->savedata); for (i = 0; i < 27; i++) { if (!sub_02031A78(pokeathlon, i)) { break; } } - InitMartUI(ctx->taskman, ctx->fsys, _0210F9CC[0], 4, 0, 0, _0210F9D4[i / 6]); + InitMartUI(ctx->taskman, ctx->fieldSystem, _0210F9CC[0], 4, 0, 0, _0210F9D4[i / 6]); return TRUE; } @@ -493,12 +493,12 @@ BOOL ScrCmd_834(ScriptContext *ctx) { int i; sp0 = ScriptGetVarPointer(ctx); - pokeathlon = Save_Pokeathlon_Get(ctx->fsys->savedata); + pokeathlon = Save_Pokeathlon_Get(ctx->fieldSystem->savedata); r6 = 0; r4 = 0; - varsFlags = Save_VarsFlags_Get(ctx->fsys->savedata); + varsFlags = Save_VarsFlags_Get(ctx->fieldSystem->savedata); GF_RTC_CopyDate(&date); - if (Pokedex_GetNatDexFlag(Save_Pokedex_Get(ctx->fsys->savedata))) { + if (Pokedex_GetNatDexFlag(Save_Pokedex_Get(ctx->fieldSystem->savedata))) { r3 = _0210FA04[date.week + 7]; } else { r3 = _0210FA04[date.week]; @@ -528,7 +528,7 @@ BOOL ScrCmd_835(ScriptContext *ctx) { POKEATHLON_SAV *pokeathlon; ret_ptr = ScriptGetVarPointer(ctx); - pokeathlon = Save_Pokeathlon_Get(ctx->fsys->savedata); + pokeathlon = Save_Pokeathlon_Get(ctx->fieldSystem->savedata); for (i = 0; i < 27; i++) { if (!sub_02031A78(pokeathlon, i)) { break; diff --git a/src/scrcmd_money.c b/src/scrcmd_money.c index c317b2a44..18928baa1 100644 --- a/src/scrcmd_money.c +++ b/src/scrcmd_money.c @@ -2,7 +2,7 @@ #include "player_data.h" BOOL ScrCmd_AddMoney(ScriptContext* ctx) { - SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fsys); + SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); PlayerProfile* profile = Save_PlayerData_GetProfileAddr(savedata); u32 amount = ScriptReadWord(ctx); @@ -12,7 +12,7 @@ BOOL ScrCmd_AddMoney(ScriptContext* ctx) { } BOOL ScrCmd_SubMoneyImmediate(ScriptContext* ctx) { - SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fsys); + SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); PlayerProfile* profile = Save_PlayerData_GetProfileAddr(savedata); u32 amount = ScriptReadWord(ctx); @@ -22,7 +22,7 @@ BOOL ScrCmd_SubMoneyImmediate(ScriptContext* ctx) { } BOOL ScrCmd_SubMoneyVar(ScriptContext* ctx) { - SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fsys); + SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); PlayerProfile* profile = Save_PlayerData_GetProfileAddr(savedata); u16 amount = ScriptGetVar(ctx); @@ -32,7 +32,7 @@ BOOL ScrCmd_SubMoneyVar(ScriptContext* ctx) { } BOOL ScrCmd_HasEnoughMoneyImmediate(ScriptContext* ctx) { - SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fsys); + SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); PlayerProfile* profile = Save_PlayerData_GetProfileAddr(savedata); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -48,7 +48,7 @@ BOOL ScrCmd_HasEnoughMoneyImmediate(ScriptContext* ctx) { } BOOL ScrCmd_HasEnoughMoneyVar(ScriptContext* ctx) { - SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fsys); + SaveData* savedata = FieldSystem_GetSaveDataPtr(ctx->fieldSystem); PlayerProfile* profile = Save_PlayerData_GetProfileAddr(savedata); u16* ret_ptr = ScriptGetVarPointer(ctx); diff --git a/src/scrcmd_move_relearner.c b/src/scrcmd_move_relearner.c index c151ffe94..109acb78c 100644 --- a/src/scrcmd_move_relearner.c +++ b/src/scrcmd_move_relearner.c @@ -6,15 +6,15 @@ BOOL ScrNative_WaitApplication(ScriptContext *ctx); BOOL ScrCmd_394(ScriptContext *ctx) { u16 var0 = ScriptGetVar(ctx); - void **runningAppData = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); //*could* be MoveRelearner, not sure - *runningAppData = sub_0203E7F4(HEAP_ID_32, ctx->fsys, var0, 0); + void **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //*could* be MoveRelearner, not sure + *runningAppData = sub_0203E7F4(HEAP_ID_32, ctx->fieldSystem, var0, 0); SetupNativeScript(ctx, ScrNative_WaitApplication); return TRUE; } BOOL ScrCmd_395(ScriptContext *ctx) { u16 *retPtr = ScriptGetVarPointer(ctx); - void **runningAppData = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); //*could* be MoveRelearner, not sure + void **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); //*could* be MoveRelearner, not sure GF_ASSERT(*runningAppData != NULL); *retPtr = sub_0203E864(*runningAppData); @@ -30,7 +30,7 @@ BOOL ScrCmd_395(ScriptContext *ctx) { BOOL ScrCmd_466(ScriptContext *ctx) { u16 *retPtr = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); Pokemon *mon = Party_GetMonByIndex(party, slot); u16 *eligibleMoves = GetEligibleLevelUpMoves(mon, HEAP_ID_32); *retPtr = sub_0209186C(eligibleMoves); @@ -39,24 +39,24 @@ BOOL ScrCmd_466(ScriptContext *ctx) { } static void CreateMoveRelearner(ScriptContext *ctx, int a1, Pokemon *mon, u16 *eligibleMoves) { - MoveRelearner **moveRelearnerPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + MoveRelearner **moveRelearnerPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); MoveRelearner *moveRelearner = MoveRelearner_New(HEAP_ID_32); *moveRelearnerPtr = moveRelearner; moveRelearner->mon = mon; - moveRelearner->profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fsys)); - moveRelearner->options = Save_PlayerData_GetOptionsAddr(ctx->fsys->savedata); + moveRelearner->profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem)); + moveRelearner->options = Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->savedata); moveRelearner->eligibleMoves = eligibleMoves; moveRelearner->unk_19 = a1; - sub_0203F9C4(ctx->fsys, moveRelearner); + sub_0203F9C4(ctx->fieldSystem, moveRelearner); SetupNativeScript(ctx, ScrNative_WaitApplication); FreeToHeap(eligibleMoves); } BOOL ScrCmd_MoveRelearnerInit(ScriptContext *ctx) { u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); u16 *eligibleMoves = GetEligibleLevelUpMoves(mon, HEAP_ID_32); CreateMoveRelearner(ctx, 1, mon, eligibleMoves); return TRUE; @@ -65,7 +65,7 @@ BOOL ScrCmd_MoveRelearnerInit(ScriptContext *ctx) { BOOL ScrCmd_MoveTutorInit(ScriptContext *ctx) { u16 slot = ScriptGetVar(ctx); u16 move = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); u16 *eligibleMoves = AllocFromHeap(HEAP_ID_32, 2 * sizeof(u16)); eligibleMoves[0] = move; eligibleMoves[1] = 0xffff; @@ -75,7 +75,7 @@ BOOL ScrCmd_MoveTutorInit(ScriptContext *ctx) { BOOL ScrCmd_MoveRelearnerGetResult(ScriptContext *ctx) { u16 *retPtr = ScriptGetVarPointer(ctx); - MoveRelearner **moveRelearnerPtr = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA); + MoveRelearner **moveRelearnerPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); MoveRelearner *moveRelearner = *moveRelearnerPtr; GF_ASSERT(moveRelearner != NULL); diff --git a/src/scrcmd_move_tutor.c b/src/scrcmd_move_tutor.c index 4107603b3..a0af34507 100644 --- a/src/scrcmd_move_tutor.c +++ b/src/scrcmd_move_tutor.c @@ -97,7 +97,7 @@ BOOL ScrCmd_652(ScriptContext *ctx) { u16 slot = ScriptGetVar(ctx); u16 moveTutorNpc = ScriptGetVar(ctx); u16 *result = ScriptGetVarPointer(ctx); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); Pokemon *mon = Party_GetMonByIndex(party, slot); u32 numLearnableMoves = GetLearnableTutorMoves(mon, moveTutorNpc, NULL); if (numLearnableMoves == 0) { @@ -114,7 +114,7 @@ BOOL ScrCmd_TutorMoveTeachInSlot(ScriptContext *ctx) { u16 partySlot = ScriptGetVar(ctx); u16 moveSlot = ScriptGetVar(ctx); u16 move = ScriptGetVar(ctx); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); PartyMonSetMoveInSlot(party, partySlot, moveSlot, move); return FALSE; } @@ -137,7 +137,7 @@ BOOL ScrCmd_TutorMoveGetPrice(ScriptContext *ctx) { BOOL ScrCmd_656(ScriptContext *ctx) { u16 slot = ScriptGetVar(ctx); u16 *result = ScriptGetVarPointer(ctx); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); Pokemon *mon = Party_GetMonByIndex(party, slot); u32 numLearnableMoves = GetLearnableTutorMoves(mon, MOVE_TUTOR_NPC_HEADBUTT, NULL); *result = numLearnableMoves > 0 ? TRUE : FALSE; @@ -248,7 +248,7 @@ BOOL ScrCmd_MoveTutorChooseMove(ScriptContext *ctx) { s32 i; s32 numLearnableMoves; BOOL showNextButton; - FieldSystem *fieldSystem = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; struct UnkStruct_ov01_021EDC28 **unk = ov01_021F6B20(fieldSystem); u16 resultVarId; MsgData *messageData; @@ -259,7 +259,7 @@ BOOL ScrCmd_MoveTutorChooseMove(ScriptContext *ctx) { u16 pageNum = ScriptGetVar(ctx); resultVarId = ScriptReadHalfword(ctx); ctx->data[0] = resultVarId; - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); numLearnableMoves = GetLearnableTutorMoves(mon, moveTutorNpc, learnableMoves); s32 numMovesToSkip; if (numLearnableMoves <= 7) { @@ -281,7 +281,7 @@ BOOL ScrCmd_MoveTutorChooseMove(ScriptContext *ctx) { numMovesToSkip = 0; } u16 *result = GetVarPointer(fieldSystem, resultVarId); - Window *window = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_WINDOW); + Window *window = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WINDOW); *unk = ov01_021EDF78(fieldSystem, 1, 1, 0, 1, result, *messageFormat, window, ctx->msgdata); messageData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, NARC_msg_msg_0750_bin, HEAP_ID_32); String *string = String_New(0x10, HEAP_ID_32); @@ -305,7 +305,7 @@ BOOL ScrCmd_MoveTutorChooseMove(ScriptContext *ctx) { } static BOOL ov01_0220305C(ScriptContext *ctx) { - FieldSystem *fieldSystem = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; struct UnkStruct_ov01_021EDC28 **unk = ov01_021F6B20(fieldSystem); u16 *result = GetVarPointer(fieldSystem, ctx->data[0]); if (*result == 0xeeee) { @@ -321,7 +321,7 @@ BOOL ScrCmd_742(ScriptContext *ctx) { u16 move = ScriptGetVar(ctx); u16 *result = ScriptGetVarPointer(ctx); *result = FALSE; - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); Pokemon *mon = Party_GetMonByIndex(party, slot); u16 *unk = AllocFromHeapAtEnd(HEAP_ID_FIELD, 0x2c); u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL); diff --git a/src/scrcmd_party.c b/src/scrcmd_party.c index 077905a15..7a84160c0 100644 --- a/src/scrcmd_party.c +++ b/src/scrcmd_party.c @@ -14,9 +14,9 @@ FS_EXTERN_OVERLAY(npc_trade); BOOL ScrCmd_GiveMon(ScriptContext *ctx) { - u16 map = MapHeader_GetMapSec(ctx->fsys->location->mapId); - FieldSystem *fsys = ctx->fsys; - Pokedex *pokedex = Save_Pokedex_Get(fsys->savedata); + u16 map = MapHeader_GetMapSec(ctx->fieldSystem->location->mapId); + FieldSystem *fieldSystem = ctx->fieldSystem; + Pokedex *pokedex = Save_Pokedex_Get(fieldSystem->savedata); u16 species = ScriptGetVar(ctx); u8 level = ScriptGetVar(ctx); @@ -25,25 +25,25 @@ BOOL ScrCmd_GiveMon(ScriptContext *ctx) { u16 ability = ScriptGetVar(ctx); u16 *retPtr = ScriptGetVarPointer(ctx); - Party *party = SaveArray_Party_Get(fsys->savedata); - *retPtr = GiveMon(HEAP_ID_FIELD, fsys->savedata, species, level, form, ability, heldItem, map, 24); + Party *party = SaveArray_Party_Get(fieldSystem->savedata); + *retPtr = GiveMon(HEAP_ID_FIELD, fieldSystem->savedata, species, level, form, ability, heldItem, map, 24); return FALSE; } BOOL ScrCmd_TakeMon(ScriptContext *ctx) { u8 slot = ScriptGetVar(ctx); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); Party_RemoveMon(party, slot); return FALSE; } BOOL ScrCmd_GetPartyMonSpecies(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 slot = ScriptGetVar(ctx); u16 *species = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { *species = GetMonData(mon, MON_DATA_SPECIES, NULL); } @@ -55,14 +55,14 @@ BOOL ScrCmd_GetPartyMonSpecies(ScriptContext *ctx) { } BOOL ScrCmd_PartymonIsMine(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - SaveData *save = FieldSystem_GetSaveDataPtr(fsys); + FieldSystem *fieldSystem = ctx->fieldSystem; + SaveData *save = FieldSystem_GetSaveDataPtr(fieldSystem); PlayerProfile *profile = Save_PlayerData_GetProfileAddr(save); u16 *slot = ScriptGetVarPointer(ctx); u16 *mine = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), *slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), *slot); u16 pokemonID = GetMonData(mon, MON_DATA_OTID, NULL); u16 playerID = PlayerProfile_GetTrainerID(profile); @@ -77,13 +77,13 @@ BOOL ScrCmd_PartymonIsMine(ScriptContext *ctx) { } BOOL ScrCmd_GiveEgg(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; - PlayerProfile *profile = Save_PlayerData_GetProfileAddr(fsys->savedata); + FieldSystem *fieldSystem = ctx->fieldSystem; + PlayerProfile *profile = Save_PlayerData_GetProfileAddr(fieldSystem->savedata); u16 species = ScriptGetVar(ctx); u16 offset = ScriptGetVar(ctx); - Party *party = SaveArray_Party_Get(fsys->savedata); + Party *party = SaveArray_Party_Get(fieldSystem->savedata); u8 partyCount = Party_GetCount(party); if (partyCount < PARTY_SIZE) { Pokemon *mon = AllocMonZeroed(HEAP_ID_FIELD); @@ -102,18 +102,18 @@ BOOL ScrCmd_SetMonMove(ScriptContext *ctx) { u16 moveSlot = ScriptGetVar(ctx); u16 moveId = ScriptGetVar(ctx); - PartyMonSetMoveInSlot(SaveArray_Party_Get(ctx->fsys->savedata), monSlot, moveSlot, moveId); + PartyMonSetMoveInSlot(SaveArray_Party_Get(ctx->fieldSystem->savedata), monSlot, moveSlot, moveId); return FALSE; } BOOL ScrCmd_MonHasMove(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *hasMove = ScriptGetVarPointer(ctx); u16 move = ScriptGetVar(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); *hasMove = FALSE; if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { return FALSE; @@ -128,14 +128,14 @@ BOOL ScrCmd_MonHasMove(ScriptContext *ctx) { } BOOL ScrCmd_GetPartySlotWithMove(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *slot = ScriptGetVarPointer(ctx); u16 move = ScriptGetVar(ctx); u8 i; - u8 partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + u8 partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, *slot = PARTY_SIZE; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { continue; } @@ -154,21 +154,21 @@ BOOL ScrCmd_SurvivePoisoning(ScriptContext *ctx) { u16 *poison = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); *poison = SurvivePoisoning(mon); return FALSE; } BOOL ScrCmd_PartyCountMonsAtOrBelowLevel(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *levelCount = ScriptGetVarPointer(ctx); u16 level = ScriptGetVar(ctx); u8 i, count; - u8 partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + u8 partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, count = 0, *levelCount = 0; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, MON_DATA_LEVEL, NULL) <= level) { count++; } @@ -179,11 +179,11 @@ BOOL ScrCmd_PartyCountMonsAtOrBelowLevel(ScriptContext *ctx) { } BOOL ScrCmd_MonGetLevel(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *level = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); *level = 0; if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { *level = GetMonData(mon, MON_DATA_LEVEL, NULL); @@ -193,17 +193,17 @@ BOOL ScrCmd_MonGetLevel(ScriptContext *ctx) { } BOOL ScrCmd_MonGetNature(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *nature = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - u8 partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + u8 partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); if (slot >= partyCount) { *nature = 0; return FALSE; } - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { *nature = 0; return FALSE; @@ -214,14 +214,14 @@ BOOL ScrCmd_MonGetNature(ScriptContext *ctx) { } BOOL ScrCmd_GetPartySlotWithNature(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *slot = ScriptGetVarPointer(ctx); u16 nature = ScriptGetVar(ctx); u8 i; - u8 partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + u8 partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon , MON_DATA_IS_EGG, NULL) && GetMonNature(mon) == nature) { *slot = i; break; @@ -232,23 +232,23 @@ BOOL ScrCmd_GetPartySlotWithNature(ScriptContext *ctx) { } BOOL ScrCmd_MonGetFriendship(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *friendship = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); *friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); return FALSE; } BOOL ScrCmd_MonAddFriendship(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 friendshipModifier = ScriptGetVar(ctx); u16 slot = ScriptGetVar(ctx); - u16 map = MapHeader_GetMapSec(ctx->fsys->location->mapId); + u16 map = MapHeader_GetMapSec(ctx->fieldSystem->location->mapId); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); u16 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); if (friendshipModifier != 0) { if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == BALL_LUXURY) { @@ -274,11 +274,11 @@ BOOL ScrCmd_MonAddFriendship(ScriptContext *ctx) { } BOOL ScrCmd_MonSubtractFriendship(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 friendshipModifier = ScriptGetVar(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); u16 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL); if (friendshipModifier > friendship) { friendship = 0; @@ -296,7 +296,7 @@ BOOL ScrCmd_MonGetContestValue(ScriptContext *ctx) { u16 contestAttribute = ScriptGetVar(ctx); u16 *contestValue = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); *contestValue = GetMonData(mon, contestAttribute + MON_DATA_COOL, NULL); return FALSE; @@ -304,23 +304,23 @@ BOOL ScrCmd_MonGetContestValue(ScriptContext *ctx) { BOOL ScrCmd_GetPartyLead(ScriptContext *ctx) { u16 *slot = ScriptGetVarPointer(ctx); - *slot = Save_GetPartyLead(ctx->fsys->savedata); + *slot = Save_GetPartyLead(ctx->fieldSystem->savedata); return FALSE; } BOOL ScrCmd_GetPartyLeadAlive(ScriptContext *ctx) { u16 *slot = ScriptGetVarPointer(ctx); - *slot = Save_GetPartyLeadAlive(ctx->fsys->savedata); + *slot = Save_GetPartyLeadAlive(ctx->fieldSystem->savedata); return FALSE; } BOOL ScrCmd_GetMonTypes(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *type1 = ScriptGetVarPointer(ctx); u16 *type2 = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); *type1 = GetMonData(mon, MON_DATA_TYPE_1, NULL); *type2 = GetMonData(mon, MON_DATA_TYPE_2, NULL); @@ -328,20 +328,20 @@ BOOL ScrCmd_GetMonTypes(ScriptContext *ctx) { } BOOL ScrCmd_Party_GetCount(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *count = ScriptGetVarPointer(ctx); - *count = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + *count = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); return FALSE; } BOOL ScrCmd_PartyCountNotEgg(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *eggCount = ScriptGetVarPointer(ctx); int count, i; - int partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + int partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { count++; } @@ -352,15 +352,15 @@ BOOL ScrCmd_PartyCountNotEgg(ScriptContext *ctx) { } BOOL ScrCmd_CountAliveMons(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *aliveCount = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); int count, i; - int partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + int partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, count = 0; i < partyCount; i++) { if (i != slot) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, MON_DATA_HP, NULL) != 0) { count++; } @@ -373,13 +373,13 @@ BOOL ScrCmd_CountAliveMons(ScriptContext *ctx) { BOOL ScrCmd_CountAliveMonsAndPC(ScriptContext *ctx) { int partyCount, count, i; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *pokemonCount = ScriptGetVarPointer(ctx); - PC_STORAGE *pc = GetStoragePCPointer(fsys->savedata); + PC_STORAGE *pc = GetStoragePCPointer(fieldSystem->savedata); - partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && GetMonData(mon, MON_DATA_HP, NULL) != 0) { count++; } @@ -391,12 +391,12 @@ BOOL ScrCmd_CountAliveMonsAndPC(ScriptContext *ctx) { BOOL ScrCmd_PartyCountEgg(ScriptContext *ctx) { int partyCount, count, i; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *eggCount = ScriptGetVarPointer(ctx); - partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, count = 0; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { count++; } @@ -408,12 +408,12 @@ BOOL ScrCmd_PartyCountEgg(ScriptContext *ctx) { BOOL ScrCmd_PartyHasPokerus(ScriptContext *ctx) { u16 i, partyCount; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *pokerus = ScriptGetVarPointer(ctx); - partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, *pokerus = FALSE; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (GetMonData(mon, MON_DATA_POKERUS, NULL)) { *pokerus = TRUE; break; @@ -427,18 +427,18 @@ BOOL ScrCmd_MonGetGender(ScriptContext *ctx) { u16 slot = ScriptGetVar(ctx); u16 *gender = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); *gender = GetMonData(mon, MON_DATA_GENDER, NULL); return FALSE; } BOOL ScrCmd_CountMonMoves(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *moveCount = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); if (GetMonData(mon, MON_DATA_IS_EGG, NULL)) { *moveCount = 0; return FALSE; @@ -466,35 +466,35 @@ BOOL ScrCmd_CountMonMoves(ScriptContext *ctx) { } BOOL ScrCmd_MonForgetMove(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 pokemonSlot = ScriptGetVar(ctx); u16 moveSlot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), pokemonSlot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), pokemonSlot); MonDeleteMoveSlot(mon, moveSlot); return FALSE; } BOOL ScrCmd_MonGetMove(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *move = ScriptGetVarPointer(ctx); u16 pokemonSlot = ScriptGetVar(ctx); u16 moveSlot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), pokemonSlot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), pokemonSlot); *move = GetMonData(mon, moveSlot + MON_DATA_MOVE1, NULL); return FALSE; } BOOL ScrCmd_KenyaCheck(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *kenya = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); u8 val = ScriptReadByte(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); if (!ItemIdIsMail(GetMonData(mon, MON_DATA_HELD_ITEM, NULL))) { *kenya = FALSE; return FALSE; @@ -518,12 +518,12 @@ BOOL ScrCmd_KenyaCheck(ScriptContext *ctx) { } BOOL ScrCmd_KenyaCheckPartyOrMailbox(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *kenya = ScriptGetVarPointer(ctx); *kenya = FALSE; int i; - Party *party = SaveArray_Party_Get(fsys->savedata); + Party *party = SaveArray_Party_Get(fieldSystem->savedata); HandleLoadOverlay(FS_OVERLAY_ID(npc_trade), OVY_LOAD_ASYNC); Mail *kenyaMail = NPCTrade_MakeKenyaMail(); Mail *mail = Mail_New(HEAP_ID_FIELD); @@ -542,7 +542,7 @@ BOOL ScrCmd_KenyaCheckPartyOrMailbox(ScriptContext *ctx) { } } - MAILBOX *mailbox = Save_Mailbox_Get(fsys->savedata); + MAILBOX *mailbox = Save_Mailbox_Get(fieldSystem->savedata); i = 0; while (TRUE) { Mailbox_FetchMailToBuffer(mailbox->msgs, 0, i, mail); @@ -563,11 +563,11 @@ BOOL ScrCmd_KenyaCheckPartyOrMailbox(ScriptContext *ctx) { } BOOL ScrCmd_MonGiveMail(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 slot = ScriptGetVar(ctx); u16 item; - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); if (!ItemIdIsMail(GetMonData(mon, MON_DATA_HELD_ITEM, NULL))) { return FALSE; } @@ -583,14 +583,14 @@ BOOL ScrCmd_MonGiveMail(ScriptContext *ctx) { } BOOL ScrCmd_PlayerHasSpecies(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *playerHasSpecies = ScriptGetVarPointer(ctx); u16 species = ScriptGetVar(ctx); u8 i; - u8 partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + u8 partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, *playerHasSpecies = FALSE; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && (u16)GetMonData(mon, MON_DATA_SPECIES, NULL) == species) { *playerHasSpecies = TRUE; break; @@ -601,7 +601,7 @@ BOOL ScrCmd_PlayerHasSpecies(ScriptContext *ctx) { } BOOL ScrCmd_CountPartyMonsOfSpecies(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *speciesCount = ScriptGetVarPointer(ctx); u16 species = ScriptGetVar(ctx); u16 array[6]; @@ -611,9 +611,9 @@ BOOL ScrCmd_CountPartyMonsOfSpecies(ScriptContext *ctx) { array[i] = 0; } - u8 partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + u8 partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, *speciesCount = 0; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { u16 monSpecies = GetMonData(mon, MON_DATA_SPECIES, NULL); if (species == 0) { @@ -635,14 +635,14 @@ BOOL ScrCmd_CountPartyMonsOfSpecies(ScriptContext *ctx) { } BOOL ScrCmd_GetPartySlotWithSpecies(ScriptContext *ctx) { - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *slot = ScriptGetVarPointer(ctx); u16 species = ScriptGetVar(ctx); u8 i; - u8 partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + u8 partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL) && (u16)GetMonData(mon, MON_DATA_SPECIES, NULL) == species) { *slot = i; break; @@ -655,7 +655,7 @@ BOOL ScrCmd_GetPartySlotWithSpecies(ScriptContext *ctx) { BOOL ScrCmd_MonGetRibbonCount(ScriptContext *ctx) { u16 *ribbons = ScriptGetVarPointer(ctx); u16 slot = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); u16 i, count; for (i = 0, count = 0; i < RIBBON_MAX; i++) { @@ -673,8 +673,8 @@ BOOL ScrCmd_GetPartyRibbonCount(ScriptContext *ctx) { u16 i, j, count; u16 *ribbons = ScriptGetVarPointer(ctx); - u16 partyCount = Party_GetCount(SaveArray_Party_Get(ctx->fsys->savedata)); - party = SaveArray_Party_Get(ctx->fsys->savedata); + u16 partyCount = Party_GetCount(SaveArray_Party_Get(ctx->fieldSystem->savedata)); + party = SaveArray_Party_Get(ctx->fieldSystem->savedata); for (i = 0, count = 0; i < RIBBON_MAX; i++) { for (j = 0; j < partyCount; j++) { @@ -695,7 +695,7 @@ BOOL ScrCmd_MonHasRibbon(ScriptContext *ctx) { u16 slot = ScriptGetVar(ctx); u16 ribbon = ScriptGetVar(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); *hasRibbon = GetMonData(mon, GetRibbonAttr(ribbon, RIBBONDAT_MONDATNO), NULL); return FALSE; @@ -706,7 +706,7 @@ BOOL ScrCmd_GiveRibbon(ScriptContext *ctx) { u16 ribbon = ScriptGetVar(ctx); u8 hasRibbon = TRUE; - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); SetMonData(mon, GetRibbonAttr(ribbon, RIBBONDAT_MONDATNO), &hasRibbon); return FALSE; @@ -716,8 +716,8 @@ BOOL ScrCmd_PartyLegalCheck(ScriptContext *ctx) { u16 i, j; u16 *legal = ScriptGetVarPointer(ctx); - u16 partyCount = Party_GetCount(SaveArray_Party_Get(ctx->fsys->savedata)); - Party *party = SaveArray_Party_Get(ctx->fsys->savedata); + u16 partyCount = Party_GetCount(SaveArray_Party_Get(ctx->fieldSystem->savedata)); + Party *party = SaveArray_Party_Get(ctx->fieldSystem->savedata); for (i = 0; i < RIBBON_MAX; i++) { for (j = 0; j < partyCount; j++) { @@ -735,13 +735,13 @@ BOOL ScrCmd_PartyLegalCheck(ScriptContext *ctx) { BOOL ScrCmd_GetPartySlotWithFatefulEncounter(ScriptContext *ctx) { u8 partyCount, i; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 *slot = ScriptGetVarPointer(ctx); u16 species = ScriptGetVar(ctx); - partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, *slot = 255; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (!GetMonData(mon, MON_DATA_IS_EGG, NULL)) { if ((u16)GetMonData(mon, MON_DATA_SPECIES, NULL) == species && GetMonData(mon, MON_DATA_FATEFUL_ENCOUNTER, NULL) == TRUE) { *slot = i; @@ -755,13 +755,13 @@ BOOL ScrCmd_GetPartySlotWithFatefulEncounter(ScriptContext *ctx) { BOOL ScrCmd_MonHasItem(ScriptContext *ctx) { int i; - FieldSystem *fsys = ctx->fsys; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 item = ScriptGetVar(ctx); u16 *hasItem = ScriptGetVarPointer(ctx); - int partyCount = Party_GetCount(SaveArray_Party_Get(fsys->savedata)); + int partyCount = Party_GetCount(SaveArray_Party_Get(fieldSystem->savedata)); for (i = 0, *hasItem = FALSE; i < partyCount; i++) { - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), i); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), i); if (GetMonData(mon, MON_DATA_HELD_ITEM, NULL) == item) { *hasItem = TRUE; break; @@ -775,7 +775,7 @@ BOOL ScrCmd_GetPartymonForm(ScriptContext *ctx) { u16 slot = ScriptGetVar(ctx); u16 *form = ScriptGetVarPointer(ctx); - Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + Pokemon *mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); *form = GetMonData(mon, MON_DATA_FORM, NULL); return FALSE; @@ -793,7 +793,7 @@ BOOL ScrCmd_MonAddContestValue(ScriptContext *ctx) { return FALSE; } - mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fsys->savedata), slot); + mon = Party_GetMonByIndex(SaveArray_Party_Get(ctx->fieldSystem->savedata), slot); if (GetMonData(mon, MON_DATA_SHEEN, NULL) == 255) { return FALSE; } diff --git a/src/scrcmd_size_record.c b/src/scrcmd_size_record.c index 60a6002f5..55b61683c 100644 --- a/src/scrcmd_size_record.c +++ b/src/scrcmd_size_record.c @@ -66,12 +66,12 @@ static u32 GetMonSize(int species, int rand) { return r6 * ((u64)sBigMonSizeTable[r4][0] + ((u64)rand - (u64)sBigMonSizeTable[r4][2]) / (u64)sBigMonSizeTable[r4][1]) / 10; } -static void FormatSizeRecord(FieldSystem *fsys, u8 idx0, u8 idx1, u16 species, u16 rand) { +static void FormatSizeRecord(FieldSystem *fieldSystem, u8 idx0, u8 idx1, u16 species, u16 rand) { MessageFormat ** msgFmt; u32 score; u32 r4; - msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + msgFmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); score = GetMonSize(species, rand); r4 = LengthConvertToImperial(score); BufferIntegerAsString(*msgFmt, idx0, r4 / 10, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); @@ -86,16 +86,16 @@ BOOL ScrCmd_SizeRecordCompare(ScriptContext *ctx) { u16 *ret_p; u32 cm1; u32 cm2; - FieldSystem *fsys; + FieldSystem *fieldSystem; - fsys = ctx->fsys; + fieldSystem = ctx->fieldSystem; ret_p = ScriptGetVarPointer(ctx); slot = ScriptGetVar(ctx); - mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); + mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); species = GetMonData(mon, MON_DATA_SPECIES, NULL); rand = GetMonSizeHash(mon); cm1 = GetMonSize(species, rand); - record = Save_VarsFlags_GetFishingCompetitionLengthRecord(Save_VarsFlags_Get(fsys->savedata)); + record = Save_VarsFlags_GetFishingCompetitionLengthRecord(Save_VarsFlags_Get(fieldSystem->savedata)); cm2 = GetMonSize(species, record); { u32 in1 = LengthConvertToImperial(cm1); @@ -117,43 +117,43 @@ BOOL ScrCmd_SizeRecordCompare(ScriptContext *ctx) { BOOL ScrCmd_SizeRecordUpdate(ScriptContext *ctx) { Pokemon *mon; u16 slot; - FieldSystem *fsys; + FieldSystem *fieldSystem; - fsys = ctx->fsys; + fieldSystem = ctx->fieldSystem; slot = ScriptGetVar(ctx); - mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); - Save_VarsFlags_SetFishingCompetitionLengthRecord(Save_VarsFlags_Get(fsys->savedata), GetMonSizeHash(mon)); + mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); + Save_VarsFlags_SetFishingCompetitionLengthRecord(Save_VarsFlags_Get(fieldSystem->savedata), GetMonSizeHash(mon)); return FALSE; } BOOL ScrCmd_BufferRecordSize(ScriptContext *ctx) { - FieldSystem *fsys; + FieldSystem *fieldSystem; u16 idx0; u16 idx1; u16 species; vu16 rand; - fsys = ctx->fsys; + fieldSystem = ctx->fieldSystem; idx0 = ScriptGetVar(ctx); idx1 = ScriptGetVar(ctx); species = ScriptGetVar(ctx); - rand = Save_VarsFlags_GetFishingCompetitionLengthRecord(Save_VarsFlags_Get(fsys->savedata)); - FormatSizeRecord(fsys, idx0, idx1, species, rand); + rand = Save_VarsFlags_GetFishingCompetitionLengthRecord(Save_VarsFlags_Get(fieldSystem->savedata)); + FormatSizeRecord(fieldSystem, idx0, idx1, species, rand); return FALSE; } BOOL ScrCmd_BufferMonSize(ScriptContext *ctx) { Pokemon *mon; - FieldSystem *fsys; + FieldSystem *fieldSystem; u16 idx0; u16 idx1; u16 slot; - fsys = ctx->fsys; + fieldSystem = ctx->fieldSystem; idx0 = ScriptGetVar(ctx); idx1 = ScriptGetVar(ctx); slot = ScriptGetVar(ctx); - mon = Party_GetMonByIndex(SaveArray_Party_Get(fsys->savedata), slot); - FormatSizeRecord(fsys, idx0, idx1, GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonSizeHash(mon)); + mon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->savedata), slot); + FormatSizeRecord(fieldSystem, idx0, idx1, GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonSizeHash(mon)); return FALSE; } diff --git a/src/scrcmd_sound.c b/src/scrcmd_sound.c index 47436fe0a..88e71d019 100644 --- a/src/scrcmd_sound.c +++ b/src/scrcmd_sound.c @@ -31,14 +31,14 @@ BOOL ScrCmd_StopBGM(ScriptContext *ctx) { } BOOL ScrCmd_ResetBGM(ScriptContext *ctx) { - u16 seqno = GetMapMusic(ctx->fsys, ctx->fsys->location->mapId); + u16 seqno = GetMapMusic(ctx->fieldSystem, ctx->fieldSystem->location->mapId); PlayBGM(seqno); return FALSE; } BOOL ScrCmd_083(ScriptContext *ctx) { u16 seqno = ScriptReadHalfword(ctx); - FieldSystem_SetSavedMusicId(ctx->fsys, seqno); + FieldSystem_SetSavedMusicId(ctx->fieldSystem, seqno); return FALSE; } @@ -152,7 +152,7 @@ BOOL ScrNative_WaitFanfare(ScriptContext *ctx) { BOOL ScrCmd_ChatotHasCry(ScriptContext *ctx) { u16 *retPtr = ScriptGetVarPointer(ctx); - SOUND_CHATOT *chatot = Save_Chatot_Get(ctx->fsys->savedata); + SOUND_CHATOT *chatot = Save_Chatot_Get(ctx->fieldSystem->savedata); if (Chatot_CheckCry(chatot) == TRUE) { *retPtr = TRUE; return FALSE; @@ -180,7 +180,7 @@ BOOL ScrCmd_ChatotStopRecording(ScriptContext *ctx) { } BOOL ScrCmd_ChatotSaveRecording(ScriptContext *ctx) { - SOUND_CHATOT *chatot = Save_Chatot_Get(ctx->fsys->savedata); + SOUND_CHATOT *chatot = Save_Chatot_Get(ctx->fieldSystem->savedata); Chatot_SaveRecording(chatot); return TRUE; } @@ -203,7 +203,7 @@ BOOL ScrCmd_664(ScriptContext *ctx) { BOOL ScrCmd_665(ScriptContext *ctx) { u16 var0 = ScriptGetVar(ctx); - sub_02055198(ctx->fsys, var0); + sub_02055198(ctx->fieldSystem, var0); return TRUE; } diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index 73419d48a..4285c5d68 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -17,7 +17,7 @@ static String* _get_species_name(u16 species, HeapID heapId); BOOL ScrCmd_BufferStatName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u8 stat_id = ScriptGetVar(ctx); @@ -27,10 +27,10 @@ BOOL ScrCmd_BufferStatName(ScriptContext* ctx) { } BOOL ScrCmd_BufferPlayersName(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); - PlayerProfile* profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fsys)); + PlayerProfile* profile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(fieldSystem)); BufferPlayersName(*msg_fmt, idx, profile); @@ -38,32 +38,32 @@ BOOL ScrCmd_BufferPlayersName(ScriptContext* ctx) { } BOOL ScrCmd_BufferRivalsName(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); - BufferRivalsName(*msg_fmt, idx, fsys->savedata); + BufferRivalsName(*msg_fmt, idx, fieldSystem->savedata); return FALSE; } BOOL ScrCmd_BufferFriendsName(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); - BufferFriendsName(*msg_fmt, idx, fsys->savedata); + BufferFriendsName(*msg_fmt, idx, fieldSystem->savedata); return FALSE; } BOOL ScrCmd_BufferMonSpeciesName(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 party_mon_idx = ScriptGetVar(ctx); - Party* party = SaveArray_Party_Get(fsys->savedata); + Party* party = SaveArray_Party_Get(fieldSystem->savedata); Pokemon *mon = Party_GetMonByIndex(party, party_mon_idx); BufferBoxMonSpeciesName(*msg_fmt, idx, &mon->box); @@ -71,7 +71,7 @@ BOOL ScrCmd_BufferMonSpeciesName(ScriptContext* ctx) { } BOOL ScrCmd_BufferTypeName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 type_id = ScriptGetVar(ctx); @@ -81,7 +81,7 @@ BOOL ScrCmd_BufferTypeName(ScriptContext* ctx) { } BOOL ScrCmd_BufferItemName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -91,7 +91,7 @@ BOOL ScrCmd_BufferItemName(ScriptContext* ctx) { } BOOL ScrCmd_BufferPocketName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 pocket_id = ScriptGetVar(ctx); @@ -101,7 +101,7 @@ BOOL ScrCmd_BufferPocketName(ScriptContext* ctx) { } BOOL ScrCmd_BufferTMHMMoveName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 move_id = ScriptGetVar(ctx); @@ -111,7 +111,7 @@ BOOL ScrCmd_BufferTMHMMoveName(ScriptContext* ctx) { } BOOL ScrCmd_BufferMoveName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 move_id = ScriptGetVar(ctx); @@ -121,7 +121,7 @@ BOOL ScrCmd_BufferMoveName(ScriptContext* ctx) { } BOOL ScrCmd_BufferInt(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 number = ScriptGetVar(ctx); @@ -131,7 +131,7 @@ BOOL ScrCmd_BufferInt(ScriptContext* ctx) { } BOOL ScrCmd_BufferIntEx(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 number = ScriptGetVar(ctx); u8 str_conv_mode = ScriptReadByte(ctx); @@ -148,7 +148,7 @@ BOOL ScrCmd_BufferIntEx(ScriptContext* ctx) { } BOOL ScrCmd_661(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u32 number = ScriptReadWord(ctx); u8 str_conv_mode = ScriptReadByte(ctx); @@ -165,12 +165,12 @@ BOOL ScrCmd_661(ScriptContext* ctx) { } BOOL ScrCmd_BufferPartyMonNick(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 party_mon_idx = ScriptGetVar(ctx); - Party* party = SaveArray_Party_Get(fsys->savedata); + Party* party = SaveArray_Party_Get(fieldSystem->savedata); Pokemon *mon = Party_GetMonByIndex(party, party_mon_idx); BufferBoxMonNickname(*msg_fmt, idx, &mon->box); @@ -178,9 +178,9 @@ BOOL ScrCmd_BufferPartyMonNick(ScriptContext* ctx) { } BOOL ScrCmd_BufferBoxMonNick(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - PC_STORAGE* pc = GetStoragePCPointer(fsys->savedata); - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + PC_STORAGE* pc = GetStoragePCPointer(fieldSystem->savedata); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 box_mon_slot = ScriptGetVar(ctx); @@ -191,7 +191,7 @@ BOOL ScrCmd_BufferBoxMonNick(ScriptContext* ctx) { } BOOL ScrCmd_BufferTrainerClassName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 trainer_class_id = ScriptGetVar(ctx); @@ -201,10 +201,10 @@ BOOL ScrCmd_BufferTrainerClassName(ScriptContext* ctx) { } BOOL ScrCmd_BufferPlayerUnionAvatarClassName(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - SaveData* savedata = FieldSystem_GetSaveDataPtr(fsys); + FieldSystem* fieldSystem = ctx->fieldSystem; + SaveData* savedata = FieldSystem_GetSaveDataPtr(fieldSystem); PlayerProfile* profile = Save_PlayerData_GetProfileAddr(savedata); - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u32 gender = PlayerProfile_GetTrainerGender(profile); u8 avatar = PlayerProfile_GetAvatar(profile); @@ -215,7 +215,7 @@ BOOL ScrCmd_BufferPlayerUnionAvatarClassName(ScriptContext* ctx) { } BOOL ScrCmd_BufferSpeciesName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 species = ScriptGetVar(ctx); u16 unk2 = ScriptReadHalfword(ctx); @@ -236,9 +236,9 @@ String* _get_species_name(u16 species, HeapID heapId) { } BOOL ScrCmd_BufferStarterSpeciesName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); - u16 species = Save_VarsFlags_GetStarter(Save_VarsFlags_Get(ctx->fsys->savedata)); + u16 species = Save_VarsFlags_GetStarter(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); String* species_name = _get_species_name(species, HEAP_ID_4); BufferString(*msg_fmt, idx, species_name, 0, 1, 2); @@ -248,9 +248,9 @@ BOOL ScrCmd_BufferStarterSpeciesName(ScriptContext* ctx) { } BOOL ScrCmd_BufferDPPtRivalStarterSpeciesName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); - u16 species = DPPtLeftover_GetRivalSpecies(Save_VarsFlags_Get(ctx->fsys->savedata)); + u16 species = DPPtLeftover_GetRivalSpecies(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); String* species_name = _get_species_name(species, HEAP_ID_4); BufferString(*msg_fmt, idx, species_name, 0, 1, 2); @@ -260,9 +260,9 @@ BOOL ScrCmd_BufferDPPtRivalStarterSpeciesName(ScriptContext* ctx) { } BOOL ScrCmd_BufferDPPtFriendStarterSpeciesName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); - u16 species = DPPtLeftover_GetFriendStarterSpecies(Save_VarsFlags_Get(ctx->fsys->savedata)); + u16 species = DPPtLeftover_GetFriendStarterSpecies(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); String* species_name = _get_species_name(species, HEAP_ID_4); BufferString(*msg_fmt, idx, species_name, 0, 1, 2); @@ -272,7 +272,7 @@ BOOL ScrCmd_BufferDPPtFriendStarterSpeciesName(ScriptContext* ctx) { } BOOL ScrCmd_BufferDecorationName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 decoration_id = ScriptGetVar(ctx); @@ -283,7 +283,7 @@ BOOL ScrCmd_BufferDecorationName(ScriptContext* ctx) { // This may be what's left of ScrCmd_GetUndergroundTrapName from D/P/Pt. BOOL ScrCmd_208(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 unused_id = ScriptGetVar(ctx); @@ -292,7 +292,7 @@ BOOL ScrCmd_208(ScriptContext* ctx) { // This may be what's left of ScrCmd_GetUndergroundItemName from D/P/Pt. BOOL ScrCmd_209(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 unused_id = ScriptGetVar(ctx); @@ -301,7 +301,7 @@ BOOL ScrCmd_209(ScriptContext* ctx) { BOOL ScrCmd_BufferMapSecName(ScriptContext* ctx) { String* str = String_New(22, HEAP_ID_4); - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 mapno = ScriptGetVar(ctx); @@ -313,7 +313,7 @@ BOOL ScrCmd_BufferMapSecName(ScriptContext* ctx) { } BOOL ScrCmd_BufferBerryName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 berry_id = ScriptGetVar(ctx); u16 unk = ScriptGetVar(ctx); @@ -326,7 +326,7 @@ BOOL ScrCmd_BufferBerryName(ScriptContext* ctx) { } BOOL ScrCmd_BufferNatureName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 nature_id = ScriptGetVar(ctx); @@ -336,7 +336,7 @@ BOOL ScrCmd_BufferNatureName(ScriptContext* ctx) { } BOOL ScrCmd_BufferFashionName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 fashion_id = ScriptGetVar(ctx); @@ -346,13 +346,13 @@ BOOL ScrCmd_BufferFashionName(ScriptContext* ctx) { } BOOL ScrCmd_BufferPartyMonMoveName(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 party_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); - Party* party = SaveArray_Party_Get(fsys->savedata); + Party* party = SaveArray_Party_Get(fieldSystem->savedata); Pokemon *mon = Party_GetMonByIndex(party, party_slot); u16 move_id = GetMonData(mon, MON_DATA_MOVE1 + move_slot, NULL); BufferMoveName(*msg_fmt, idx, move_id); @@ -361,7 +361,7 @@ BOOL ScrCmd_BufferPartyMonMoveName(ScriptContext* ctx) { } BOOL ScrCmd_BufferRibbonName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u8 unk = ScriptGetVar(ctx); @@ -372,7 +372,7 @@ BOOL ScrCmd_BufferRibbonName(ScriptContext* ctx) { } BOOL ScrCmd_BufferSealName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 seal_id = ScriptGetVar(ctx); @@ -382,7 +382,7 @@ BOOL ScrCmd_BufferSealName(ScriptContext* ctx) { } BOOL ScrCmd_BufferTrainerName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 trainer_id = ScriptGetVar(ctx); @@ -392,7 +392,7 @@ BOOL ScrCmd_BufferTrainerName(ScriptContext* ctx) { } BOOL ScrCmd_BufferApricornName(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u8 apricorn_id = ScriptGetVar(ctx); @@ -402,7 +402,7 @@ BOOL ScrCmd_BufferApricornName(ScriptContext* ctx) { } BOOL ScrCmd_BufferItemNameIndef(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -412,7 +412,7 @@ BOOL ScrCmd_BufferItemNameIndef(ScriptContext* ctx) { } BOOL ScrCmd_BufferItemNamePlural(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -422,12 +422,12 @@ BOOL ScrCmd_BufferItemNamePlural(ScriptContext* ctx) { } BOOL ScrCmd_BufferPartyMonSpeciesNameIndef(ScriptContext* ctx) { - FieldSystem* fsys = ctx->fsys; - MessageFormat** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MESSAGE_FORMAT); + FieldSystem* fieldSystem = ctx->fieldSystem; + MessageFormat** msg_fmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 party_mon_slot = ScriptGetVar(ctx); - Party* party = SaveArray_Party_Get(fsys->savedata); + Party* party = SaveArray_Party_Get(fieldSystem->savedata); Pokemon *mon = Party_GetMonByIndex(party, party_mon_slot); BufferBoxMonSpeciesNameWithArticle(*msg_fmt, idx, &mon->box); @@ -435,7 +435,7 @@ BOOL ScrCmd_BufferPartyMonSpeciesNameIndef(ScriptContext* ctx) { } BOOL ScrCmd_BufferSpeciesNameIndef(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); u16 unused1 = ScriptReadHalfword(ctx); @@ -447,9 +447,9 @@ BOOL ScrCmd_BufferSpeciesNameIndef(ScriptContext* ctx) { } BOOL ScrCmd_BufferDPPtFriendStarterSpeciesNameIndef(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); - u16 species = DPPtLeftover_GetFriendStarterSpecies(Save_VarsFlags_Get(ctx->fsys->savedata)); + u16 species = DPPtLeftover_GetFriendStarterSpecies(Save_VarsFlags_Get(ctx->fieldSystem->savedata)); BufferSpeciesNameWithArticle(*msg_fmt, idx, species); @@ -457,7 +457,7 @@ BOOL ScrCmd_BufferDPPtFriendStarterSpeciesNameIndef(ScriptContext* ctx) { } BOOL ScrCmd_BufferFashionNameIndef(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 fashion_id = ScriptGetVar(ctx); @@ -467,7 +467,7 @@ BOOL ScrCmd_BufferFashionNameIndef(ScriptContext* ctx) { } BOOL ScrCmd_BufferTrainerClassNameIndef(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 trainer_class_id = ScriptGetVar(ctx); @@ -477,7 +477,7 @@ BOOL ScrCmd_BufferTrainerClassNameIndef(ScriptContext* ctx) { } BOOL ScrCmd_BufferSealNamePlural(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 seal_id = ScriptGetVar(ctx); @@ -487,7 +487,7 @@ BOOL ScrCmd_BufferSealNamePlural(ScriptContext* ctx) { } BOOL ScrCmd_Capitalize(ScriptContext* ctx) { - MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MESSAGE_FORMAT); + MessageFormat** msg_fmt = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); MessageFormat_UpperFirstChar(*msg_fmt, idx); diff --git a/src/task.c b/src/task.c index 28df1e8c4..389df6dea 100644 --- a/src/task.c +++ b/src/task.c @@ -1,7 +1,7 @@ #include "task.h" #include "unk_0203DFA4.h" -static TaskManager *Task_New(FieldSystem *fsys, TaskFunc taskFunc, void *env) { +static TaskManager *Task_New(FieldSystem *fieldSystem, TaskFunc taskFunc, void *env) { TaskManager *taskman; taskman = AllocFromHeapAtEnd((HeapID)32, sizeof(TaskManager)); @@ -11,16 +11,16 @@ static TaskManager *Task_New(FieldSystem *fsys, TaskFunc taskFunc, void *env) { taskman->env = env; taskman->unk10 = 0; taskman->unk14 = NULL; - taskman->fsys = fsys; + taskman->fieldSystem = fieldSystem; taskman->unk1C = AllocFromHeapAtEnd((HeapID)32, sizeof(TaskManagerUnkSub1C)); return taskman; } -TaskManager *FieldSys_CreateTask(FieldSystem *fsys, TaskFunc taskFunc, void *env) { +TaskManager *FieldSystem_CreateTask(FieldSystem *fieldSystem, TaskFunc taskFunc, void *env) { TaskManager *ret; - GF_ASSERT(fsys->taskman == NULL); - ret = Task_New(fsys, taskFunc, env); - fsys->taskman = ret; + GF_ASSERT(fieldSystem->taskman == NULL); + ret = Task_New(fieldSystem, taskFunc, env); + fieldSystem->taskman = ret; return ret; } @@ -40,25 +40,25 @@ void TaskManager_Jump(TaskManager *taskman, TaskFunc taskFunc, void *env) { void TaskManager_Call(TaskManager *taskman, TaskFunc taskFunc, void *env) { TaskManager *newman; - newman = Task_New(taskman->fsys, taskFunc, env); + newman = Task_New(taskman->fieldSystem, taskFunc, env); newman->prev = taskman; - taskman->fsys->taskman = newman; + taskman->fieldSystem->taskman = newman; } -BOOL Fsys_RunTaskFrame(FieldSystem *fsys) { +BOOL FieldSystem_RunTaskFrame(FieldSystem *fieldSystem) { TaskManager *prevTask; - if (fsys->taskman == 0) { + if (fieldSystem->taskman == 0) { return FALSE; } - while (fsys->taskman->func(fsys->taskman) == TRUE) { - prevTask = fsys->taskman->prev; - if (fsys->taskman->unk14 != NULL) { - FreeToHeap(fsys->taskman->unk14); + while (fieldSystem->taskman->func(fieldSystem->taskman) == TRUE) { + prevTask = fieldSystem->taskman->prev; + if (fieldSystem->taskman->unk14 != NULL) { + FreeToHeap(fieldSystem->taskman->unk14); } - FreeToHeap(fsys->taskman->unk1C); - FreeToHeap(fsys->taskman); - fsys->taskman = prevTask; + FreeToHeap(fieldSystem->taskman->unk1C); + FreeToHeap(fieldSystem->taskman); + fieldSystem->taskman = prevTask; if (prevTask == NULL) { return TRUE; } @@ -66,36 +66,36 @@ BOOL Fsys_RunTaskFrame(FieldSystem *fsys) { return FALSE; } -BOOL Fsys_TaskIsRunning(FieldSystem *fsys) { - return fsys->taskman != NULL; +BOOL FieldSystem_TaskIsRunning(FieldSystem *fieldSystem) { + return fieldSystem->taskman != NULL; } -BOOL FieldSys_ApplicationIsRunning(FieldSystem *fsys) { - return sub_0203DF7C(fsys) || sub_0203DFA4(fsys); +BOOL FieldSystem_ApplicationIsRunning(FieldSystem *fieldSystem) { + return sub_0203DF7C(fieldSystem) || sub_0203DFA4(fieldSystem); } -void sub_020505C0(FieldSystem *fsys) { - sub_0203DEF0(fsys); +void sub_020505C0(FieldSystem *fieldSystem) { + sub_0203DEF0(fieldSystem); } -BOOL sub_020505C8(FieldSystem *fsys) { - return sub_0203DF8C(fsys) != FALSE; +BOOL sub_020505C8(FieldSystem *fieldSystem) { + return sub_0203DF8C(fieldSystem) != FALSE; } static BOOL Task_RunApplicationUntilComplete(TaskManager *taskManager) { - FieldSystem *fsys; + FieldSystem *fieldSystem; struct UnkTaskEnv *env; - fsys = TaskManager_GetFieldSystem(taskManager); + fieldSystem = TaskManager_GetFieldSystem(taskManager); env = TaskManager_GetEnv(taskManager); switch (env->state) { case 0: - FieldSys_LaunchApplication(fsys, env->template, env->work); + FieldSystem_LaunchApplication(fieldSystem, env->template, env->work); env->state++; break; case 1: - if (!FieldSys_ApplicationIsRunning(fsys)) { + if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { FreeToHeap(env); return TRUE; } @@ -115,7 +115,7 @@ void CallApplicationAsTask(TaskManager *taskManager, const OVY_MGR_TEMPLATE *tem } FieldSystem *TaskManager_GetFieldSystem(TaskManager *taskManager) { - return taskManager->fsys; + return taskManager->fieldSystem; } void *TaskManager_GetEnv(TaskManager *taskManager) { diff --git a/src/unk_02055418.c b/src/unk_02055418.c index 626d31c53..8f32ce60b 100644 --- a/src/unk_02055418.c +++ b/src/unk_02055418.c @@ -21,19 +21,19 @@ #include "unk_0201F4C4.h" #include "field_map_object.h" -void FieldSys_StartBugContestTimer(FieldSystem* fsys) { +void FieldSystem_StartBugContestTimer(FieldSystem* fieldSystem) { RTCDate date; RTCTime time; - SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fsys->savedata); + SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fieldSystem->savedata); if (!sysinfo->initialized) { return; } GF_RTC_CopyDateTime(&date, &time); - sub_02055450(fsys, sysinfo, &date); - sub_02055478(fsys, sysinfo, &date, &time); + sub_02055450(fieldSystem, sysinfo, &date); + sub_02055478(fieldSystem, sysinfo, &date, &time); } -void sub_02055450(FieldSystem* fsys, SysInfo_RTC *sysinfo, RTCDate* date) { +void sub_02055450(FieldSystem* fieldSystem, SysInfo_RTC *sysinfo, RTCDate* date) { u32 day = RTC_ConvertDateToDay(date); if (day < (u32)(sysinfo->days_since_nitro_epoch)) { sysinfo->days_since_nitro_epoch = day; @@ -42,11 +42,11 @@ void sub_02055450(FieldSystem* fsys, SysInfo_RTC *sysinfo, RTCDate* date) { if (day <= sysinfo->days_since_nitro_epoch) { return; } - sub_02055508(fsys, day - sysinfo->days_since_nitro_epoch); + sub_02055508(fieldSystem, day - sysinfo->days_since_nitro_epoch); sysinfo->days_since_nitro_epoch = day; } -void sub_02055478(FieldSystem* fsys, SysInfo_RTC *sysinfo, RTCDate* date, RTCTime* time) { +void sub_02055478(FieldSystem* fieldSystem, SysInfo_RTC *sysinfo, RTCDate* date, RTCTime* time) { s64 seconds = RTC_ConvertDateTimeToSecond(date, time); s64 sys_seconds = RTC_ConvertDateTimeToSecond(&sysinfo->date, &sysinfo->time); if (seconds < sys_seconds) { @@ -56,90 +56,90 @@ void sub_02055478(FieldSystem* fsys, SysInfo_RTC *sysinfo, RTCDate* date, RTCTim } s32 delta_seconds = seconds - sys_seconds; if (delta_seconds > 0) { - sub_02092F30(Fsys_GetGearPhoneRingManager(fsys), seconds); + sub_02092F30(FieldSystem_GetGearPhoneRingManager(fieldSystem), seconds); } s32 minutes = delta_seconds / 60; if (minutes <= 0) { return; } Save_SysInfo_RTC_SubField34(sysinfo, minutes); - sub_020555B4(fsys, minutes, time); + sub_020555B4(fieldSystem, minutes, time); sysinfo->date = *date; sysinfo->time = *time; } -void sub_02055508(FieldSystem* fsys, int unkA) { - BOOL unkFlag = sub_02055670(fsys); - ClearDailyFlags(fsys); - sub_0206759C(fsys->savedata, unkA); //reset badge shininess..? - sub_0202C78C(Save_FriendGroup_Get(fsys->savedata), unkA); - Roamers_SetRand(Save_Roamers_Get(fsys->savedata), sub_0202C7DC(Save_FriendGroup_Get(fsys->savedata))); - Party_UpdatePokerus(SaveArray_Party_Get(fsys->savedata), unkA); - Save_LCRNGAdvanceLotoID(fsys->savedata, (u16) unkA); - sub_02066D60(fsys->savedata); - sub_020674BC(fsys->savedata); - sub_0202CB6C(sub_0202CA44(fsys->savedata)); - sub_020556B8(fsys); - sub_0202F294(SaveData_GetMomsSavingsAddr(fsys->savedata), unkA); +void sub_02055508(FieldSystem* fieldSystem, int unkA) { + BOOL unkFlag = sub_02055670(fieldSystem); + ClearDailyFlags(fieldSystem); + sub_0206759C(fieldSystem->savedata, unkA); //reset badge shininess..? + sub_0202C78C(Save_FriendGroup_Get(fieldSystem->savedata), unkA); + Roamers_SetRand(Save_Roamers_Get(fieldSystem->savedata), sub_0202C7DC(Save_FriendGroup_Get(fieldSystem->savedata))); + Party_UpdatePokerus(SaveArray_Party_Get(fieldSystem->savedata), unkA); + Save_LCRNGAdvanceLotoID(fieldSystem->savedata, (u16) unkA); + sub_02066D60(fieldSystem->savedata); + sub_020674BC(fieldSystem->savedata); + sub_0202CB6C(sub_0202CA44(fieldSystem->savedata)); + sub_020556B8(fieldSystem); + sub_0202F294(SaveData_GetMomsSavingsAddr(fieldSystem->savedata), unkA); if (!unkFlag) { - sub_02031CCC(Save_ApricornBox_Get(fsys->savedata), unkA); - sub_0209730C(fsys->savedata, unkA); + sub_02031CCC(Save_ApricornBox_Get(fieldSystem->savedata), unkA); + sub_0209730C(fieldSystem->savedata, unkA); } - sub_02031AE4(Save_Pokeathlon_Get(fsys->savedata)); - Save_VarsFlags_UpdateBuenasPasswordSet(Save_VarsFlags_Get(fsys->savedata)); + sub_02031AE4(Save_Pokeathlon_Get(fieldSystem->savedata)); + Save_VarsFlags_UpdateBuenasPasswordSet(Save_VarsFlags_Get(fieldSystem->savedata)); } -void sub_020555B4(FieldSystem* fsys, u32 unkA, RTCTime* time) { - sub_02092E34(Fsys_GetGearPhoneRingManager(fsys), unkA, 0); - FieldSys_IncrementBugContestTimer(fsys, unkA); - Party_TryResetShaymin(SaveArray_Party_Get(fsys->savedata), unkA, time); +void sub_020555B4(FieldSystem* fieldSystem, u32 unkA, RTCTime* time) { + sub_02092E34(FieldSystem_GetGearPhoneRingManager(fieldSystem), unkA, 0); + FieldSystem_IncrementBugContestTimer(fieldSystem, unkA); + Party_TryResetShaymin(SaveArray_Party_Get(fieldSystem->savedata), unkA, time); } -TIMEOFDAY Field_GetTimeOfDay(FieldSystem* fsys) { - return GF_RTC_GetTimeOfDayByHour(Save_SysInfo_RTC_Get(fsys->savedata)->time.hour); +TIMEOFDAY Field_GetTimeOfDay(FieldSystem* fieldSystem) { + return GF_RTC_GetTimeOfDayByHour(Save_SysInfo_RTC_Get(fieldSystem->savedata)->time.hour); } -TimeOfDayWildParam Field_GetTimeOfDayWildParam(FieldSystem* fsys) { - return GF_RTC_GetTimeOfDayWildParamByHour(Save_SysInfo_RTC_Get(fsys->savedata)->time.hour); +TimeOfDayWildParam Field_GetTimeOfDayWildParam(FieldSystem* fieldSystem) { + return GF_RTC_GetTimeOfDayWildParamByHour(Save_SysInfo_RTC_Get(fieldSystem->savedata)->time.hour); } -u32 Field_GetMonth(FieldSystem* fsys) { - return Save_SysInfo_RTC_Get(fsys->savedata)->date.month; +u32 Field_GetMonth(FieldSystem* fieldSystem) { + return Save_SysInfo_RTC_Get(fieldSystem->savedata)->date.month; } -u32 Field_GetDay(FieldSystem* fsys) { - return Save_SysInfo_RTC_Get(fsys->savedata)->date.day; +u32 Field_GetDay(FieldSystem* fieldSystem) { + return Save_SysInfo_RTC_Get(fieldSystem->savedata)->date.day; } -u32 Field_GetHour(FieldSystem* fsys) { - return Save_SysInfo_RTC_Get(fsys->savedata)->time.hour; +u32 Field_GetHour(FieldSystem* fieldSystem) { + return Save_SysInfo_RTC_Get(fieldSystem->savedata)->time.hour; } -void sub_02055624(FieldSystem* fsys, RTCDate* date, RTCTime* time) { - SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fsys->savedata); +void sub_02055624(FieldSystem* fieldSystem, RTCDate* date, RTCTime* time) { + SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fieldSystem->savedata); RTC_ConvertSecondToDateTime(date, time, sysinfo->seconds_since_nitro_epoch); } -void FieldSys_GetGameClearTime(FieldSystem* fsys, RTCDate* date, RTCTime* time) { - SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fsys->savedata); +void FieldSystem_GetGameClearTime(FieldSystem* fieldSystem, RTCDate* date, RTCTime* time) { + SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fieldSystem->savedata); RTC_ConvertSecondToDateTime(date, time, sysinfo->seconds_at_game_clear); } -void FieldSys_SetGameClearTime(FieldSystem* fsys) { - SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fsys->savedata); +void FieldSystem_SetGameClearTime(FieldSystem* fieldSystem) { + SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fieldSystem->savedata); sysinfo->seconds_at_game_clear = GF_RTC_DateTimeToSec(); } -BOOL sub_02055670(FieldSystem* fsys) { - SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fsys->savedata); +BOOL sub_02055670(FieldSystem* fieldSystem) { + SysInfo_RTC *sysinfo = Save_SysInfo_RTC_Get(fieldSystem->savedata); return sub_02028E1C(sysinfo); } -UnkStruct_020556FC * sub_02055680(FieldSystem *fsys, HeapID heapID) { +UnkStruct_020556FC * sub_02055680(FieldSystem *fieldSystem, HeapID heapID) { UnkStruct_020556FC* unkPtr = AllocFromHeap(heapID, sizeof(UnkStruct_020556FC)); MI_CpuClear8(unkPtr, sizeof(UnkStruct_020556FC)); unkPtr->heapID = heapID; - sub_020556C8(fsys, unkPtr); + sub_020556C8(fieldSystem, unkPtr); return unkPtr; } @@ -148,13 +148,13 @@ void sub_020556A8(UnkStruct_020556FC *unkPtr) { FreeToHeap(unkPtr); } -void sub_020556B8(FieldSystem* fsys) { - APRICORN_TREE* trees = Save_FieldApricornTrees_Get(fsys->savedata); +void sub_020556B8(FieldSystem* fieldSystem) { + APRICORN_TREE* trees = Save_FieldApricornTrees_Get(fieldSystem->savedata); sub_0202AE74(trees); } -void sub_020556C8(FieldSystem *fsys, UnkStruct_020556FC *unkPtrB) { - void* unkB = fsys->unk_44; +void sub_020556C8(FieldSystem *fieldSystem, UnkStruct_020556FC *unkPtrB) { + void* unkB = fieldSystem->unk_44; unkPtrB->unk5c = AllocFromHeap(unkPtrB->heapID, ov01_021F149C(unkB, 31)); ov01_021F14A8(unkB, 31, unkPtrB->unk5c); sub_0201F51C(&unkPtrB->unk4, &unkPtrB->unk58, &unkPtrB->unk5c); @@ -164,7 +164,7 @@ void sub_020556FC(struct UnkStruct_020556FC *unkPtr) { ov01_021F1448(unkPtr->unk5c); //function frees unk5c to heap } -BOOL sub_02055708(FieldSystem* fsys, LocalMapObject* mapObject) { +BOOL sub_02055708(FieldSystem* fieldSystem, LocalMapObject* mapObject) { if (mapObject == NULL) { return FALSE; } @@ -178,27 +178,27 @@ BOOL sub_02055708(FieldSystem* fsys, LocalMapObject* mapObject) { id != SPRITE_BONGURI_BK) { return FALSE; } - if (sub_02055780(fsys, mapObject) != TRUE) { + if (sub_02055780(fieldSystem, mapObject) != TRUE) { return FALSE; } return TRUE; } -BOOL sub_02055760(FieldSystem* fsys, LocalMapObject* mapObj) { - sub_0202AE68(Save_FieldApricornTrees_Get(fsys->savedata), MapObject_GetParam(mapObj, 0)); +BOOL sub_02055760(FieldSystem* fieldSystem, LocalMapObject* mapObj) { + sub_0202AE68(Save_FieldApricornTrees_Get(fieldSystem->savedata), MapObject_GetParam(mapObj, 0)); return TRUE; } -BOOL sub_02055780(FieldSystem* fsys, LocalMapObject* mapObj) { - APRICORN_TREE* trees = Save_FieldApricornTrees_Get(fsys->savedata); +BOOL sub_02055780(FieldSystem* fieldSystem, LocalMapObject* mapObj) { + APRICORN_TREE* trees = Save_FieldApricornTrees_Get(fieldSystem->savedata); int idx = MapObject_GetParam(mapObj, 0); return sub_0202AE38(trees, idx); } -u32 FieldSys_ApricornTree_TryGetApricorn(FieldSystem* fsys, LocalMapObject* mapObject) { - return ApricornTrees_TryGetApricorn(Save_FieldApricornTrees_Get(fsys->savedata), MapObject_GetParam(mapObject, 0)); +u32 FieldSystem_ApricornTree_TryGetApricorn(FieldSystem* fieldSystem, LocalMapObject* mapObject) { + return ApricornTrees_TryGetApricorn(Save_FieldApricornTrees_Get(fieldSystem->savedata), MapObject_GetParam(mapObject, 0)); } -int FieldSys_ApricornTree_GetApricorn(FieldSystem* fsys, LocalMapObject* mapObject) { - return ApricornTrees_GetApricorn(Save_FieldApricornTrees_Get(fsys->savedata), MapObject_GetParam(mapObject, 0)); +int FieldSystem_ApricornTree_GetApricorn(FieldSystem* fieldSystem, LocalMapObject* mapObject) { + return ApricornTrees_GetApricorn(Save_FieldApricornTrees_Get(fieldSystem->savedata), MapObject_GetParam(mapObject, 0)); } diff --git a/src/unk_02055BF0.c b/src/unk_02055BF0.c index c814d22d1..22ecc433b 100644 --- a/src/unk_02055BF0.c +++ b/src/unk_02055BF0.c @@ -26,14 +26,14 @@ #include "unk_02055244.h" #include "constants/sndseq.h" -typedef void (*FsysFunc)(FieldSystem*); +typedef void (*FieldSystemFunc)(FieldSystem*); BOOL sub_02055DBC(TaskManager *man); BOOL RoutineFieldFade(TaskManager *man); extern TaskFunc sMapEnterRoutines[9]; extern TaskFunc sMapExitRoutines[9]; -extern FsysFunc _020FC76C[9]; +extern FieldSystemFunc _020FC76C[9]; void NewFieldFadeEnvironment(TaskManager *man, int pattern, int typeTop, int typeBottom, u16 colour, int duration, int framesPer, HeapID heapID) { FieldFadeEnvironment *sfenv = AllocFromHeap(heapID, sizeof(FieldFadeEnvironment)); @@ -49,17 +49,17 @@ void NewFieldFadeEnvironment(TaskManager *man, int pattern, int typeTop, int typ } BOOL RoutineFieldFade(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldFadeEnvironment *fenv = TaskManager_GetEnv(man); switch (fenv->state) { case 0: - ov01_021FB514(fsys->unk4->unk1c); + ov01_021FB514(fieldSystem->unk4->unk1c); BeginNormalPaletteFade(fenv->pattern, fenv->typeTop, fenv->typeBottom, fenv->colour, fenv->duration, fenv->framesPer, fenv->heapID); fenv->state++; break; case 1: if (IsPaletteFadeFinished()) { - ov01_021FB4F4(fsys->unk4->unk1c); + ov01_021FB4F4(fieldSystem->unk4->unk1c); FreeToHeap(fenv); return TRUE; } @@ -68,7 +68,7 @@ BOOL RoutineFieldFade(TaskManager *man) { return FALSE; } -void NewFieldTransitionEnvironment(FieldSystem *fsys, int mapID, int warpID, int x, int y, int dir, u32 transNo) { +void NewFieldTransitionEnvironment(FieldSystem *fieldSystem, int mapID, int warpID, int x, int y, int dir, u32 transNo) { FieldTransitionEnvironment *fenv = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(FieldTransitionEnvironment)); fenv->state = 0; fenv->transitionState = 0; @@ -79,10 +79,10 @@ void NewFieldTransitionEnvironment(FieldSystem *fsys, int mapID, int warpID, int fenv->location.y = y; fenv->location.direction = dir; fenv->transitionNo = transNo; - FieldSys_CreateTask(fsys, sub_02055DBC, fenv); + FieldSystem_CreateTask(fieldSystem, sub_02055DBC, fenv); } -void sub_02055CD8(FieldSystem *fsys, int mapID, int warpID, int x, int y, int dir) { +void sub_02055CD8(FieldSystem *fieldSystem, int mapID, int warpID, int x, int y, int dir) { FieldTransitionEnvironment *fenv = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(FieldTransitionEnvironment)); fenv->state = 0; fenv->transitionState = 0; @@ -93,7 +93,7 @@ void sub_02055CD8(FieldSystem *fsys, int mapID, int warpID, int x, int y, int di fenv->location.y = y; fenv->location.direction = dir; int var = 0; - int otherID = fsys->location->mapId; + int otherID = fieldSystem->location->mapId; if (MapHeader_IsCave(otherID)) { if (MapHeader_IsCave(mapID)) { var = 6; @@ -129,25 +129,25 @@ void sub_02055CD8(FieldSystem *fsys, int mapID, int warpID, int x, int y, int di } } fenv->transitionNo = var; - FieldSys_CreateTask(fsys, sub_02055DBC, fenv); + FieldSystem_CreateTask(fieldSystem, sub_02055DBC, fenv); } //this function handles transition routines between maps BOOL sub_02055DBC(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *env = TaskManager_GetEnv(man); switch (env->state) { case 0: env->transitionState = 0; env->unk24 = NULL; env->unk1 = 0; - if (FollowingPokemon_IsActive(fsys) && ov01_022057C4(fsys) && PlayerAvatar_GetState(fsys->playerAvatar) != PLAYER_STATE_CYCLING) { + if (FollowingPokemon_IsActive(fieldSystem) && ov01_022057C4(fieldSystem) && PlayerAvatar_GetState(fieldSystem->playerAvatar) != PLAYER_STATE_CYCLING) { env->state = 9; break; } case 1: - if (FollowingPokemon_IsActive(fsys) && !ov01_022057C4(fsys) && PlayerAvatar_GetState(fsys->playerAvatar) != PLAYER_STATE_CYCLING) { - LocalMapObject *followMon = FollowingPokemon_GetMapObject(fsys); + if (FollowingPokemon_IsActive(fieldSystem) && !ov01_022057C4(fieldSystem) && PlayerAvatar_GetState(fieldSystem->playerAvatar) != PLAYER_STATE_CYCLING) { + LocalMapObject *followMon = FollowingPokemon_GetMapObject(fieldSystem); int species = FollowPokeObj_GetSpecies(followMon); if(!GetFollowPokePermissionBySpeciesAndMap(species, env->location.mapId)) { env->unk24 = ov01_0220329C(followMon, 1); @@ -159,13 +159,13 @@ BOOL sub_02055DBC(TaskManager *man) { if (env->unk24 && sub_02068CCC(env->unk24)) { break; } - Fsys_BeginFadeOutMusic(fsys, env->location.mapId); + FieldSystem_BeginFadeOutMusic(fieldSystem, env->location.mapId); TaskManager_Call(man, sMapExitRoutines[env->transitionNo], env); - if (FollowingPokemon_IsActive(fsys) && ov01_022057C4(fsys) && !GetFollowPokePermission(fsys)) { - ov01_022057D0(fsys); + if (FollowingPokemon_IsActive(fieldSystem) && ov01_022057C4(fieldSystem) && !GetFollowPokePermission(fieldSystem)) { + ov01_022057D0(fieldSystem); } - SavFollowPoke_SetMapId(fsys->location->mapId, Save_FollowPoke_Get(fsys->savedata)); - env->destinationMapID = fsys->location->mapId; + SavFollowPoke_SetMapId(fieldSystem->location->mapId, Save_FollowPoke_Get(fieldSystem->savedata)); + env->destinationMapID = fieldSystem->location->mapId; env->state++; break; case 3: @@ -182,14 +182,14 @@ BOOL sub_02055DBC(TaskManager *man) { break; case 6: if(_020FC76C[env->transitionNo]) { - Camera_SetHistoryUnk24(fsys->camera, 0); - _020FC76C[env->transitionNo](fsys); + Camera_SetHistoryUnk24(fieldSystem->camera, 0); + _020FC76C[env->transitionNo](fieldSystem); } env->state++; break; case 7: if(GF_SndGetFadeTimer() == 0) { - sub_02055110(fsys, env->location.mapId, 1); + sub_02055110(fieldSystem, env->location.mapId, 1); if(!MapHeader_IsCave(env->destinationMapID)) { //this has gotta be for the pre-entering images right? int index = sub_0206A360(env->location.mapId); //this gets the index of the location in the list of maps that have map icons if (index != 255) { @@ -200,24 +200,24 @@ BOOL sub_02055DBC(TaskManager *man) { TIMEOFDAY time = GF_RTC_GetTimeOfDay(); sub_0206A388(man, index, time, parity); //this should set the specific map icon based on time? env->state++; - ov01_021EFAF8(fsys); //<= this func specifically gets and displays the area's icon and text + ov01_021EFAF8(fieldSystem); //<= this func specifically gets and displays the area's icon and text break; } } - ov01_021EFAF8(fsys); + ov01_021EFAF8(fieldSystem); env->transitionState = 0; TaskManager_Call(man, sMapEnterRoutines[env->transitionNo], env); - LocalMapObject *followerMon = FollowingPokemon_GetMapObject(fsys); - if(FollowingPokemon_IsActive(fsys) && !GetFollowPokePermission(fsys)) { + LocalMapObject *followerMon = FollowingPokemon_GetMapObject(fieldSystem); + if(FollowingPokemon_IsActive(fieldSystem) && !GetFollowPokePermission(fieldSystem)) { sub_02069E84(followerMon, 1); - ov01_02205790(fsys, (u8) PlayerAvatar_GetFacingDirection(fsys->playerAvatar)); + ov01_02205790(fieldSystem, (u8) PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar)); } env->state++; break; } break; case 8: - Camera_SetHistoryUnk24(fsys->camera, 1); + Camera_SetHistoryUnk24(fieldSystem->camera, 1); FreeToHeap(env); return TRUE; case 9: @@ -231,7 +231,7 @@ BOOL sub_02055DBC(TaskManager *man) { } BOOL sub_02056004(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); switch (fenv->transitionState) { case 0: @@ -246,16 +246,16 @@ BOOL sub_02056004(TaskManager *man) { } BOOL sub_02056040(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); switch (fenv->transitionState) { case 0: fenv->unk18 = ov01_021E90C0(); - ov01_021E90DC(GetPlayerXCoord(fsys->playerAvatar), GetPlayerYCoord(fsys->playerAvatar), fenv->unk18); + ov01_021E90DC(GetPlayerXCoord(fieldSystem->playerAvatar), GetPlayerYCoord(fieldSystem->playerAvatar), fenv->unk18); fenv->transitionState++; break; case 1: - if (ov01_021E90E4(fsys, fenv->unk18)) { + if (ov01_021E90E4(fieldSystem, fenv->unk18)) { ov01_021E90D4(fenv->unk18); fenv->transitionState++; } @@ -271,17 +271,17 @@ BOOL sub_02056040(TaskManager *man) { } BOOL sub_020560C4(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); switch (fenv->transitionState) { case 0: fenv->unk18 = ov01_021E90C0(); - ov01_021E90DC(GetPlayerXCoord(fsys->playerAvatar), GetPlayerYCoord(fsys->playerAvatar), fenv->unk18); + ov01_021E90DC(GetPlayerXCoord(fieldSystem->playerAvatar), GetPlayerYCoord(fieldSystem->playerAvatar), fenv->unk18); fenv->transitionState++; break; case 1: FieldEnvSubUnk18 *info = fenv->unk18; - if (ov01_021E98F0(fsys, info, PlayerAvatar_GetFacingDirection(fsys->playerAvatar))) { + if (ov01_021E98F0(fieldSystem, info, PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar))) { ov01_021E90D4(fenv->unk18); fenv->transitionState++; } @@ -293,14 +293,14 @@ BOOL sub_020560C4(TaskManager *man) { } BOOL sub_0205613C(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); LocalMapObject *obj; switch (fenv->transitionState) { case 0: - if (FollowingPokemon_IsActive(fsys) && sub_02069FB0(fsys)) { - if (MapObject_IsMovementPaused(FollowingPokemon_GetMapObject(fsys))) { - sub_0205FC94(FollowingPokemon_GetMapObject(fsys), 55); + if (FollowingPokemon_IsActive(fieldSystem) && sub_02069FB0(fieldSystem)) { + if (MapObject_IsMovementPaused(FollowingPokemon_GetMapObject(fieldSystem))) { + sub_0205FC94(FollowingPokemon_GetMapObject(fieldSystem), 55); fenv->transitionState++; } } else { @@ -308,8 +308,8 @@ BOOL sub_0205613C(TaskManager *man) { } break; case 1: - int dir = PlayerAvatar_GetFacingDirection(fsys->playerAvatar); - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + int dir = PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar); + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); if (dir == DIR_WEST) { MapObject_SetHeldMovement(obj, 10); } else if (dir == DIR_EAST) { @@ -320,7 +320,7 @@ BOOL sub_0205613C(TaskManager *man) { fenv->transitionState++; break; case 2: - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); if (MapObject_IsMovementPaused(obj) == TRUE) { MapObject_ClearHeldMovementIfActive(obj); fenv->transitionState++; @@ -340,9 +340,9 @@ BOOL sub_0205613C(TaskManager *man) { } BOOL sub_02056220(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); - PlayerAvatar_GetMapObject(fsys->playerAvatar); + PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); switch (fenv->transitionState) { case 0: TaskManager_Call(man, ov01_021E9F78, ov01_021E9C30()); @@ -355,9 +355,9 @@ BOOL sub_02056220(TaskManager *man) { } BOOL sub_02056268(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); - PlayerAvatar_GetMapObject(fsys->playerAvatar); + PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); switch (fenv->transitionState) { case 0: TaskManager_Call(man, ov01_021E9EEC, ov01_021E9C30()); @@ -370,27 +370,27 @@ BOOL sub_02056268(TaskManager *man) { } BOOL sub_020562B0(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); LocalMapObject *obj; FieldEnvSubUnk18 *fenv18; switch (fenv->transitionState) { case 0: - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); MapObject_ClearHeldMovementIfActive(obj); - Field_PlayerAvatar_OrrTransitionFlags(fsys->playerAvatar, 512); - Field_PlayerAvatar_ApplyTransitionFlags(fsys->playerAvatar); + Field_PlayerAvatar_OrrTransitionFlags(fieldSystem->playerAvatar, 512); + Field_PlayerAvatar_ApplyTransitionFlags(fieldSystem->playerAvatar); sub_0205F328(obj, FALSE); fenv->unk18 = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(FieldEnvSubUnk18)); fenv18 = fenv->unk18; fenv18->state = 0; - fenv18->direction = PlayerAvatar_GetFacingDirection(fsys->playerAvatar); - PlayerAvatar_ToggleAutomaticHeightUpdating(fsys->playerAvatar, FALSE); - ov01_021F6304(fsys->unk2C); - if (FollowingPokemon_IsActive(fsys)) { + fenv18->direction = PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar); + PlayerAvatar_ToggleAutomaticHeightUpdating(fieldSystem->playerAvatar, FALSE); + ov01_021F6304(fieldSystem->unk2C); + if (FollowingPokemon_IsActive(fieldSystem)) { BOOL flag = TRUE; int var; - switch (MapObject_GetFacingDirection(FollowingPokemon_GetMapObject(fsys))) { + switch (MapObject_GetFacingDirection(FollowingPokemon_GetMapObject(fieldSystem))) { case DIR_NORTH: var = 12; break; @@ -409,13 +409,13 @@ BOOL sub_020562B0(TaskManager *man) { break; } if (flag) { - ov01_02205990(var, MapObject_GetPrevX(obj), MapObject_GetPrevY(obj), &fsys->followMon); + ov01_02205990(var, MapObject_GetPrevX(obj), MapObject_GetPrevY(obj), &fieldSystem->followMon); } } fenv->transitionState++; break; case 1: - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); VecFx32 pos; fenv18 = fenv->unk18; u32 state = fenv18->state; @@ -439,7 +439,7 @@ BOOL sub_020562B0(TaskManager *man) { break; case 3: if (IsPaletteFadeFinished()) { - PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(fsys->playerAvatar, TRUE); + PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(fieldSystem->playerAvatar, TRUE); FreeToHeap(fenv->unk18); return TRUE; } @@ -448,33 +448,33 @@ BOOL sub_020562B0(TaskManager *man) { } BOOL sub_02056424(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); LocalMapObject *obj; FieldEnvSubUnk18 *fenv18; switch (fenv->transitionState) { case 0: - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); if (MapObject_AreBitsSetForMovementScriptInit(obj)) { MapObject_SetHeldMovement(obj, 0); fenv->transitionState++; } break; case 1: - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); if (MapObject_AreBitsSetForMovementScriptInit(obj)) { MapObject_ClearHeldMovementIfActive(obj); - Field_PlayerAvatar_OrrTransitionFlags(fsys->playerAvatar, 512); - Field_PlayerAvatar_ApplyTransitionFlags(fsys->playerAvatar); + Field_PlayerAvatar_OrrTransitionFlags(fieldSystem->playerAvatar, 512); + Field_PlayerAvatar_ApplyTransitionFlags(fieldSystem->playerAvatar); sub_0205F328(obj, 0); fenv->unk18 = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(FieldEnvSubUnk18)); fenv->unk18->state = 0; - PlayerAvatar_ToggleAutomaticHeightUpdating(fsys->playerAvatar, FALSE); + PlayerAvatar_ToggleAutomaticHeightUpdating(fieldSystem->playerAvatar, FALSE); fenv->transitionState++; } break; case 2: - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); fenv18 = fenv->unk18; fenv18->state++; VecFx32 pos; @@ -492,7 +492,7 @@ BOOL sub_02056424(TaskManager *man) { break; case 4: if (IsPaletteFadeFinished()) { - PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(fsys->playerAvatar, TRUE); + PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(fieldSystem->playerAvatar, TRUE); FreeToHeap(fenv->unk18); return TRUE; } @@ -501,13 +501,13 @@ BOOL sub_02056424(TaskManager *man) { } BOOL sub_02056530(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); LocalMapObject *obj; switch (fenv->transitionState) { case 0: - obj = PlayerAvatar_GetMapObject(fsys->playerAvatar); - if (sub_0205B70C(GetMetatileBehaviorAt(fsys, GetPlayerXCoord(fsys->playerAvatar), GetPlayerYCoord(fsys->playerAvatar)))) { + obj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); + if (sub_0205B70C(GetMetatileBehaviorAt(fieldSystem, GetPlayerXCoord(fieldSystem->playerAvatar), GetPlayerYCoord(fieldSystem->playerAvatar)))) { MapObject_SetVisible(obj, TRUE); fenv->transitionState = 1; break; @@ -517,14 +517,14 @@ BOOL sub_02056530(TaskManager *man) { break; case 1: fenv->unk18 = ov01_021E90C0(); - ov01_021E90DC(GetPlayerXCoord(fsys->playerAvatar), GetPlayerYCoord(fsys->playerAvatar), fenv->unk18); + ov01_021E90DC(GetPlayerXCoord(fieldSystem->playerAvatar), GetPlayerYCoord(fieldSystem->playerAvatar), fenv->unk18); fenv->transitionState++; break; case 2: FieldEnvSubUnk18 *unk = fenv->unk18; - if (ov01_021E9374(fsys, unk)) { + if (ov01_021E9374(fieldSystem, unk)) { ov01_021E90D4(unk); - MapObject_SetVisible(PlayerAvatar_GetMapObject(fsys->playerAvatar), FALSE); + MapObject_SetVisible(PlayerAvatar_GetMapObject(fieldSystem->playerAvatar), FALSE); return TRUE; } break; @@ -535,12 +535,12 @@ BOOL sub_02056530(TaskManager *man) { } BOOL sub_020565FC(TaskManager *man) { - FieldSystem *fsys = TaskManager_GetFieldSystem(man); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(man); FieldTransitionEnvironment *fenv = TaskManager_GetEnv(man); switch (fenv->transitionState) { case 0: - LocalMapObject *mapObj = PlayerAvatar_GetMapObject(fsys->playerAvatar); - if (sub_0205B70C(GetMetatileBehaviorAt(fsys, GetPlayerXCoord(fsys->playerAvatar), GetPlayerYCoord(fsys->playerAvatar)))) { + LocalMapObject *mapObj = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar); + if (sub_0205B70C(GetMetatileBehaviorAt(fieldSystem, GetPlayerXCoord(fieldSystem->playerAvatar), GetPlayerYCoord(fieldSystem->playerAvatar)))) { MapObject_SetVisible(mapObj, TRUE); fenv->transitionState = 1; TaskManager_Jump(man, sub_02056530, fenv); diff --git a/src/unk_020648EC.c b/src/unk_020648EC.c index 90c896716..cbd13b2e5 100644 --- a/src/unk_020648EC.c +++ b/src/unk_020648EC.c @@ -13,30 +13,30 @@ static const FieldSystemFunc1 _020FE214[]; static const FieldSystemFunc1 _020FE1EC[]; static const FieldSystemFunc2 _020FE23C[]; -void sub_020648EC(FieldSystem* fsys) { - int gymmickType = SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fsys))); +void sub_020648EC(FieldSystem* fieldSystem) { + int gymmickType = SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fieldSystem))); if (gymmickType != GYMMICK_NONE) { - _020FE214[gymmickType](fsys); + _020FE214[gymmickType](fieldSystem); } } -void sub_02064910(FieldSystem* fsys) { - int gymmickType = SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fsys))); +void sub_02064910(FieldSystem* fieldSystem) { + int gymmickType = SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fieldSystem))); if (gymmickType) { FieldSystemFunc1 func = _020FE1EC[gymmickType]; if (func != NULL) { - func(fsys); + func(fieldSystem); } } } -BOOL sub_02064938(FieldSystem *fsys, u32 a1, u32 a2, u32 a3, u32 a4) { - int gymmickType = SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fsys))); +BOOL sub_02064938(FieldSystem *fieldSystem, u32 a1, u32 a2, u32 a3, u32 a4) { + int gymmickType = SavGymmick_GetType(Save_GetGymmickPtr(FieldSystem_GetSaveDataPtr(fieldSystem))); if (gymmickType == GYMMICK_NONE) return FALSE; FieldSystemFunc2 func = _020FE23C[gymmickType]; if (func != NULL) { - return func(fsys, a1, a2, a3, a4); + return func(fieldSystem, a1, a2, a3, a4); } return FALSE; } diff --git a/src/unk_02092BE8.c b/src/unk_02092BE8.c index a0743f064..16bcbf4ec 100644 --- a/src/unk_02092BE8.c +++ b/src/unk_02092BE8.c @@ -27,7 +27,7 @@ static void sub_02092BE8(FieldSystem* sys, Unk_PokegearSTRUCT_2C* ptr, BOOL a2) LocalFieldData *points = Save_LocalFieldData_Get(sys->savedata); Location *warpPtr = LocalFieldData_GetSpecialSpawnWarpPtr(points); Location *PosPtr = LocalFieldData_GetCurrentPosition(points); - GearPhoneRingManager* phoneRingMgr = Fsys_GetGearPhoneRingManager(sys); + GearPhoneRingManager* phoneRingMgr = FieldSystem_GetGearPhoneRingManager(sys); ptr->saveData = sys->savedata; ptr->mapID = PosPtr->mapId; if (MapHeader_MapIsOnMainMatrix(ptr->mapID)) { @@ -109,7 +109,7 @@ void sub_02092DD8(GearPhoneRingManager * ptr) { FreeToHeap(ptr); } -GearPhoneRingManager* Fsys_GetGearPhoneRingManager(FieldSystem* sys) { +GearPhoneRingManager* FieldSystem_GetGearPhoneRingManager(FieldSystem* sys) { return sys->unk114; } @@ -281,7 +281,7 @@ BOOL sub_02093070(FieldSystem* sys) { if (PCStorage_CountEmptySpotsInAllBoxes(GetStoragePCPointer(sys->savedata)) != 0) { return FALSE; } - sub_02092E14(Fsys_GetGearPhoneRingManager(sys), 3, TRUE); + sub_02092E14(FieldSystem_GetGearPhoneRingManager(sys), 3, TRUE); return TRUE; } @@ -299,7 +299,7 @@ BOOL sub_020930C4(FieldSystem* sys) { var = 9; // unreachable } if (!CheckFlagInArray(state, var + FLAG_UNK_988)) { - sub_02092E14(Fsys_GetGearPhoneRingManager(sys), 4, FALSE); + sub_02092E14(FieldSystem_GetGearPhoneRingManager(sys), 4, FALSE); return TRUE; } return FALSE; @@ -309,7 +309,7 @@ BOOL sub_02093134(FieldSystem* sys, Pokemon *mon) { if (sub_0206D8D0(mon, sys->savedata) == 0) { return FALSE; } - sub_02092E14(Fsys_GetGearPhoneRingManager(sys), 0, 1); + sub_02092E14(FieldSystem_GetGearPhoneRingManager(sys), 0, 1); SetFlagInArray(Save_VarsFlags_Get(sys->savedata), FLAG_UNK_983); return TRUE; } @@ -322,6 +322,6 @@ BOOL sub_0209316C(FieldSystem* sys) { if (CheckFlagInArray(state, FLAG_UNK_992) && !CheckFlagInArray(state, FLAG_UNK_99E)) { return FALSE; } - sub_02092E14(Fsys_GetGearPhoneRingManager(sys), 5, 1); + sub_02092E14(FieldSystem_GetGearPhoneRingManager(sys), 5, 1); return TRUE; } diff --git a/src/unk_02097720.c b/src/unk_02097720.c index 9796ad074..47247342f 100644 --- a/src/unk_02097720.c +++ b/src/unk_02097720.c @@ -5,7 +5,7 @@ static BOOL sub_02097754(TaskManager *taskManager); void sub_02097720(TaskManager *taskManager, u16* unknownPtr) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); UnkStruct_02097720 *data = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_02097720)); MI_CpuClear8(data, sizeof(UnkStruct_02097720)); data->unknown_0 = 0; @@ -14,16 +14,16 @@ void sub_02097720(TaskManager *taskManager, u16* unknownPtr) { } BOOL sub_02097754(TaskManager *taskManager) { - FieldSystem *fsys = TaskManager_GetFieldSystem(taskManager); + FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager); UnkStruct_02097720* env = TaskManager_GetEnv(taskManager); switch (env->unknown_0) { case 0: - env->unknown_8 = sub_0203EB64(fsys); + env->unknown_8 = sub_0203EB64(fieldSystem); env->unknown_0++; break; case 1: - if (FieldSys_ApplicationIsRunning(fsys) == FALSE) { + if (FieldSystem_ApplicationIsRunning(fieldSystem) == FALSE) { *env->unknown_4 = env->unknown_8->unk1C; FreeToHeap(env->unknown_8); env->unknown_0++;