Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-09-11 02:05:28 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fsys to fieldSystem

Browse Source
This commit is contained in:
red031000
2023-08-20 18:52:40 +01:00
parent a98f738351
commit e36deb2333
222 changed files with 3672 additions and 3672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
asm/battle_setup.s
View File

@@ -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:

8
asm/field_take_photo.s
View File

@@ -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

6
asm/include/battle_setup.inc
View File

@@ -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

4
asm/include/field_take_photo.inc
View File

@@ -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

4
asm/include/overlay_01_021E5900.inc
View File

@@ -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

12
asm/include/overlay_01_021E6880.inc
View File

@@ -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

2
asm/include/overlay_01_021EDAFC.inc
View File

@@ -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

4
asm/include/overlay_01_021F1AFC.inc
View File

@@ -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

2
asm/include/overlay_01_021F3114.inc
View File

@@ -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

2
asm/include/overlay_01_021F3F50.inc
View File

@@ -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

2
asm/include/overlay_01_021F6CFC.inc
View File

@@ -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

4
asm/include/overlay_01_021F72DC.inc
View File

@@ -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

4
asm/include/overlay_01_021FC66C.inc
View File

@@ -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

2
asm/include/overlay_01_021FCE98.inc
View File

@@ -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

12
asm/include/overlay_02.inc
View File

@@ -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

2
asm/include/overlay_04.inc
View File

@@ -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

2
asm/include/overlay_124.inc
View File

@@ -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

10
asm/include/overlay_27.inc
View File

@@ -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

6
asm/include/overlay_28.inc
View File

@@ -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

2
asm/include/overlay_30.inc
View File

@@ -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

2
asm/include/overlay_34.inc
View File

@@ -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

8
asm/include/unk_0203BC10.inc
View File

@@ -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

2
asm/include/unk_0203DB6C.inc
View File

@@ -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

10
asm/include/unk_0203E348.inc
View File

@@ -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

4
asm/include/unk_02054E00.inc
View File

@@ -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

2
asm/include/unk_020557E0.inc
View File

@@ -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

2
asm/include/unk_02056D7C.inc
View File

@@ -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

8
asm/include/unk_02058AEC.inc
View File

@@ -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

2
asm/include/unk_0205AC88.inc
View File

@@ -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

2
asm/include/unk_0205CB48.inc
View File

@@ -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

2
asm/include/unk_02061284.inc
View File

@@ -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

4
asm/include/unk_020632B0.inc
View File

@@ -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

2
asm/include/unk_020658D4.inc
View File

@@ -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

4
asm/include/unk_02066EDC.inc
View File

@@ -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

4
asm/include/unk_02067A60.inc
View File

@@ -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

2
asm/include/unk_02068DE0.inc
View File

@@ -17,5 +17,5 @@
.public InitBlackthornGym
.public InitFuchsiaGym
.public InitViridianGym
.public Fsys_IsSavGymmickTypeEqualTo
.public FieldSystem_IsSavGymmickTypeEqualTo
.public _s32_div_f

4
asm/include/unk_02068FC8.inc
View File

@@ -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

2
asm/include/unk_0206A360.inc
View File

@@ -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

10
asm/include/unk_0206D494.inc
View File

@@ -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

4
asm/include/unk_02078834.inc
View File

@@ -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

2
asm/include/unk_02092B04.inc
View File

@@ -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

4
asm/include/unk_02095DF4.inc
View File

@@ -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

2
asm/include/unk_020961D8.inc
View File

@@ -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

2
asm/include/unk_020968B0.inc
View File

@@ -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

4
asm/include/unk_02097024.inc
View File

@@ -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

2
asm/include/unk_020977CC.inc
View File

@@ -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

2
asm/include/unk_020979A8.inc
View File

@@ -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

2
asm/include/unk_02097BE0.inc
View File

@@ -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

2
asm/include/unk_02097D3C.inc
View File

@@ -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

4
asm/overlay_01_021E5900.s
View File

@@ -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

20
asm/overlay_01_021E6880.s
View File

@@ -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

6
asm/overlay_01_021EDAFC.s
View File

@@ -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

10
asm/overlay_01_021F1AFC.s
View File

@@ -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

2
asm/overlay_01_021F3114.s
View File

@@ -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

2
asm/overlay_01_021F3F50.s
View File

@@ -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

2
asm/overlay_01_021F6CFC.s
View File

@@ -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

4
asm/overlay_01_021F72DC.s
View File

@@ -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

4
asm/overlay_01_021FC66C.s
View File

@@ -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

2
asm/overlay_01_021FCE98.s
View File

@@ -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

36
asm/overlay_02.s
View File

@@ -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

6
asm/overlay_04.s
View File

@@ -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

2
asm/overlay_124.s
View File

@@ -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]

22
asm/overlay_27.s
View File

@@ -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]

14
asm/overlay_28.s
View File

@@ -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]

2
asm/overlay_30.s
View File

@@ -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

6
asm/overlay_34.s
View File

@@ -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

90
asm/scrcmd_11.s
View File

@@ -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

20
asm/unk_0203BC10.s
View File

@@ -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]

8
asm/unk_0203DB6C.s
View File

@@ -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

184
asm/unk_0203E348.s
View File

@@ -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

22
asm/unk_02054E00.s
View File

@@ -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

2
asm/unk_02056D7C.s
View File

@@ -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

16
asm/unk_02058AEC.s
View File

@@ -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

2
asm/unk_0205AC88.s
View File

@@ -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

2
asm/unk_0205CB48.s
View File

@@ -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

4
asm/unk_02061284.s
View File

@@ -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]

14
asm/unk_020632B0.s
View File

@@ -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}

22
asm/unk_020658D4.s
View File

@@ -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

10
asm/unk_02066EDC.s
View File

@@ -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

8
asm/unk_02067A60.s
View File

@@ -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

6
asm/unk_02068DE0.s
View File

@@ -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

4
asm/unk_02068FC8.s
View File

@@ -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

2
asm/unk_0206A360.s
View File

@@ -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]

26
asm/unk_0206D494.s
View File

@@ -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

22
asm/unk_02078834.s
View File

@@ -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

2
asm/unk_02092B04.s
View File

@@ -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

4
asm/unk_02095DF4.s
View File

@@ -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

2
asm/unk_020961D8.s
View File

@@ -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]

2
asm/unk_020968B0.s
View File

@@ -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

12
asm/unk_02097024.s
View File

@@ -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

2
asm/unk_020977CC.s
View File

@@ -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

2
asm/unk_020979A8.s
View File

@@ -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

2
asm/unk_02097BE0.s
View File

@@ -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]

2
asm/unk_02097D3C.s
View File

@@ -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]

12
include/battle/battle_setup.h
View File

@@ -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);

4
include/bug_contest.h
View File

@@ -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);

2
include/choose_starter.h
View File

@@ -3,6 +3,6 @@
#include "script.h"
void LaunchStarterChoiceScene(FieldSystem *fsys);
void LaunchStarterChoiceScene(FieldSystem *fieldSystem);
#endif //POKEHEARTGOLD_CHOOSE_STARTER_H

12
include/encounter.h
View File

@@ -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

6
include/field_alph_checks.h
View File

@@ -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

24
include/field_follow_poke.h
View File

@@ -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);

Some files were not shown because too many files have changed in this diff Show More