Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-05-23 20:56:40 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into farfetchd-puzzle

Browse Source
This commit is contained in:
Adrienn Tindall 2023-09-30 13:32:20 -05:00 committed by GitHub
commit f7beb045b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
151 changed files with 1237 additions and 1258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
README.md
View File

@ -7,29 +7,4 @@ This repository builds the following ROMs:
* [**pokeheartgold.us.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=4787) `sha1: 4fcded0e2713dc03929845de631d0932ea2b5a37`
* [**pokesoulsilver.us.nds**](https://datomatic.no-intro.org/index.php?page=show_record&s=28&n=4788) `sha1: f8dc38ea20c17541a43b58c5e6d18c1732c7e582`
Other disassembly and/or decompilation projects:
* [**Pokémon Red and Blue**](https://github.com/pret/pokered)
* [**Pokémon Gold and Silver (Space World '97 demo)**](https://github.com/pret/pokegold-spaceworld)
* [**Pokémon Yellow**](https://github.com/pret/pokeyellow)
* [**Pokémon Trading Card Game**](https://github.com/pret/poketcg)
* [**Pokémon Pinball**](https://github.com/pret/pokepinball)
* [**Pokémon Stadium**](https://github.com/pret/pokestadium)
* [**Pokémon Gold and Silver**](https://github.com/pret/pokegold)
* [**Pokémon Crystal**](https://github.com/pret/pokecrystal)
* [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby)
* [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs)
* [**Pokémon FireRed and LeafGreen**](https://github.com/pret/pokefirered)
* [**Pokémon Emerald**](https://github.com/pret/pokeemerald)
* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
Gen 4 decompilation projects:
* [**Pokémon Diamond and Pearl**](https://github.com/pret/pokediamond)
* [**Pokémon Platinum**](https://github.com/pret/pokeplatinum)
* [**Pokémon Mystery Dungeon: Explorers of Sky**](https://github.com/pret/pmd-sky)
## Contacts
You can find us on:
* [Discord (VoidMatrix, #decomp)](https://discord.gg/prUAgd5).
* [Discord (PRET, #pokeheartgold)](https://discord.gg/d5dubZ3)
For contacts and other pret projects, see [pret.github.io](https://pret.github.io/).

14
asm/field_take_photo.s
View File

@ -180,7 +180,7 @@ sub_0206A8E4: ; 0x0206A8E4
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #8
@ -581,7 +581,7 @@ sub_0206ABB0: ; 0x0206ABB0
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r7, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #8]
ldr r1, [r4]
@ -635,7 +635,7 @@ _0206ABF2:
b _0206AEA2
_0206AC28:
add r0, r7, #0
bl sub_020552A4
bl CallTask_RestoreOverworld
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]
@ -1413,7 +1413,7 @@ sub_0206B270: ; 0x0206B270
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #0x14]
cmp r1, #0x14
@ -1485,7 +1485,7 @@ _0206B2DC:
b _0206B824
_0206B30A:
add r0, r6, #0
bl sub_020552A4
bl CallTask_RestoreOverworld
mov r0, #4
strb r0, [r4, #0x14]
b _0206B824
@ -1806,7 +1806,7 @@ _0206B5A0:
mov r1, #4
bl sub_0206B8AC
add r0, r6, #0
bl sub_0205532C
bl CallTask_FadeFromBlack
add r0, r4, #0
mov r1, #0
add r0, #0xca
@ -2043,7 +2043,7 @@ _0206B768:
b _0206B824
_0206B794:
add r0, r6, #0
bl sub_020552A4
bl CallTask_RestoreOverworld
mov r0, #0x13
strb r0, [r4, #0x14]
b _0206B824

6
asm/include/field_take_photo.inc
View File

@ -37,14 +37,14 @@
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_020537A8
.public GetFirstAliveMonInParty_CrashIfNone
.public sub_02054EB0
.public sub_0205525C
.public sub_020552A4
.public CallTask_RestoreOverworld
.public PalleteFadeUntilFinished
.public sub_0205532C
.public CallTask_FadeFromBlack
.public PlayerAvatar_GetFacingDirection
.public GetPlayerXCoord
.public GetPlayerYCoord

2
asm/include/overlay_01_021E90C0.inc
View File

@ -25,7 +25,7 @@
.public sub_0203B58C
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02054A60
.public sub_02054AE4
.public sub_02054B74

6
asm/include/overlay_01_021F1AFC.inc
View File

@ -12,13 +12,13 @@
.public sub_0201F988
.public GF_AssertFail
.public StartScriptFromMenu
.public FlagSet
.public FlagClear
.public FieldSystem_FlagSet
.public FieldSystem_FlagClear
.public Save_VarsFlags_Get
.public FieldSystem_CreateTask
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02054790
.public FieldSystem_SetSavedMusicId
.public GetMapMusic

2
asm/include/overlay_01_021F3114.inc
View File

@ -6,7 +6,7 @@
.public FreeToHeapExplicit
.public GF_AssertFail
.public FieldSystem_CreateTask
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_0205B9DC
.public sub_0205B9E8
.public sub_0205B9F4

2
asm/include/overlay_01_021F6CFC.inc
View File

@ -35,7 +35,7 @@
.public FieldSystem_CreateTask
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_0205B514
.public sub_0205B564
.public sub_0205B5B4

2
asm/include/overlay_01_021F72DC.inc
View File

@ -40,7 +40,7 @@
.public sub_02064084
.public FollowingPokemon_GetSpriteID
.public FollowPokeMapObjectSetParams
.public FieldSystem_SetFollowPokeParam
.public FieldSystem_SetFollowerPokeParam
.public FieldSystemUnkSub108_Set
.public GetMonData
.public GetMonGender

2
asm/include/overlay_01_021FC05C.inc
View File

@ -14,7 +14,7 @@
.public MapHeader_HasWildEncounters
.public QueueScript
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public GetMetatileBehaviorAt
.public GetPlayerXCoord
.public GetPlayerYCoord

2
asm/include/overlay_01_021FC66C.inc
View File

@ -22,7 +22,7 @@
.public Save_GameStats_Get
.public GameStats_Inc
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02050B90
.public BattleSetup_Delete
.public GetFirstAliveMonInParty_CrashIfNone

2
asm/include/overlay_01_021FCE98.inc
View File

@ -5,7 +5,7 @@
.public GF_ExpHeap_FndInitAllocator
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public PlayerAvatar_GetState
.public PlayerAvatar_GetGender

2
asm/include/overlay_01_02203A18.inc
View File

@ -15,7 +15,7 @@
.public GF_AssertFail
.public sub_02026E18
.public TaskManager_Call
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public sub_0205F0A8
.public MapObject_GetID

4
asm/include/overlay_01_022053EC.inc
View File

@ -23,10 +23,10 @@
.public GF_AssertFail
.public sub_02026E18
.public ScriptReadHalfword
.public VarGet
.public FieldSystem_VarGet
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public GetIdxOfFirstAliveMonInParty_CrashIfNone
.public GetMetatileBehaviorAt

4
asm/include/overlay_02.inc
View File

@ -204,13 +204,13 @@
.public FieldSystem_GetSaveData
.public StartMapSceneScript
.public QueueScript
.public FlagGet
.public FieldSystem_FlagGet
.public HiddenItemScriptNoToFlagId
.public Save_VarsFlags_Get
.public CheckFlagInArray
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public sub_02050B08
.public sub_02050B90

4
asm/include/overlay_03.inc
View File

@ -170,13 +170,13 @@
.public ScriptReadHalfword
.public FieldSysGetAttrAddr
.public GetVarPointer
.public VarGet
.public FieldSystem_VarGet
.public ScrNative_WaitApplication_DestroyTaskData
.public Save_VarsFlags_Get
.public TaskManager_Jump
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_020580E4
.public sub_02058124
.public sub_02058164

2
asm/include/overlay_04.inc
View File

@ -27,7 +27,7 @@
.public FieldSystem_CreateTask
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public sub_020548C0
.public GetMetatileBehaviorAt

4
asm/include/overlay_25.inc
View File

@ -18,8 +18,8 @@
.public SetupNativeScript
.public ScriptReadHalfword
.public FieldSysGetAttrAddr
.public VarGet
.public sub_02050AAC
.public FieldSystem_VarGet
.public CallTask_020509F0
.public sub_020517E8
.public sub_020517FC
.public BattleSetup_New

2
asm/include/scrcmd_9.inc
View File

@ -60,7 +60,7 @@
.public ScriptReadHalfword
.public FieldSysGetAttrAddr
.public GetVarPointer
.public VarGet
.public FieldSystem_VarGet
.public sub_0204A5B0
.public sub_0204A68C
.public sub_0204A824

2
asm/include/unk_0203BC10.inc
View File

@ -88,7 +88,7 @@
.public sub_020505C0
.public sub_020505C8
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02055164
.public sub_0205A904
.public sub_0205AA6C

4
asm/include/unk_0203DB6C.inc
View File

@ -8,8 +8,8 @@
.public GetInteractedBackgroundEventScript
.public sub_0203DDA4
.public sub_0203DE04
.public VarGet
.public FlagGet
.public FieldSystem_VarGet
.public FieldSystem_FlagGet
.public HiddenItemScriptNoToFlagId
.public GetMetatileBehaviorAt
.public sub_0205B700

4
asm/include/unk_0203E348.inc
View File

@ -145,11 +145,11 @@
.public FieldSystem_ApplicationIsRunning
.public CallApplicationAsTask
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public FieldSystem_GetOverriddenMusicId
.public sub_0205525C
.public sub_020552A4
.public CallTask_RestoreOverworld
.public Field_GetTimeOfDay
.public sub_0205A508
.public PlayerAvatar_GetState

2
asm/include/unk_020551B8.inc
View File

@ -5,7 +5,7 @@
.public FreeToHeap
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02055218
.public ov01_021EFB64
.public ov01_021EFC04

4
asm/include/unk_02055244.inc
View File

@ -11,9 +11,9 @@
.public TaskManager_GetFieldSystem
.public TaskManager_GetStatePtr
.public sub_0205525C
.public sub_020552A4
.public CallTask_RestoreOverworld
.public PalleteFadeUntilFinished
.public sub_0205532C
.public CallTask_FadeFromBlack
.public sub_020553B0
.public sub_02055408
.public ov01_021EFAF8

2
asm/include/unk_02056680.inc
View File

@ -12,7 +12,7 @@
.public TaskManager_Call
.public CallApplicationAsTask
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public GetMetatileBehaviorAt
.public sub_02054940
.public sub_02056680

2
asm/include/unk_02058AEC.inc
View File

@ -84,7 +84,7 @@
.public sub_020505C0
.public sub_020505C8
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02056E60
.public sub_02057A34
.public sub_02057A88

2
asm/include/unk_0205BB1C.inc
View File

@ -5,7 +5,7 @@
.public GF_SinDegNoWrap
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public CountDigits
.public ItemIsTMOrHM
.public sub_0205BBD0

2
asm/include/unk_02066EDC.inc
View File

@ -36,7 +36,7 @@
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02067118
.public sub_02067200
.public sub_020672A4

6
asm/include/unk_0206793C.inc
View File

@ -5,11 +5,11 @@
.public TaskManager_Call
.public CallApplicationAsTask
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_0205525C
.public sub_020552A4
.public CallTask_RestoreOverworld
.public PalleteFadeUntilFinished
.public sub_0205532C
.public CallTask_FadeFromBlack
.public CallTask_NPCTrade
.public AllocMonZeroed
.public memset

2
asm/include/unk_02067A60.inc
View File

@ -20,7 +20,7 @@
.public Save_VarsFlags_Get
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02053908
.public GetIdxOfFirstAliveMonInParty_CrashIfNone
.public PlayerAvatar_GetMapObject

2
asm/include/unk_02068FC8.inc
View File

@ -34,7 +34,7 @@
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02055624
.public FieldSystem_GetGameClearTime
.public sub_0205ABD8

2
asm/include/unk_0206A360.inc
View File

@ -21,7 +21,7 @@
.public FieldSystem_GetBgConfigPtr
.public TaskManager_Call
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public PlayerAvatar_GetMapObject
.public PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply
.public MapObject_GetPositionVec

6
asm/include/unk_0206B910.inc
View File

@ -21,13 +21,13 @@
.public ScriptReadHalfword
.public FieldSysGetAttrAddr
.public GetVarPointer
.public VarGet
.public FieldSystem_VarGet
.public TaskManager_Call
.public CallApplicationAsTask
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_0205525C
.public sub_020552A4
.public CallTask_RestoreOverworld
.public sub_0206B910
.public SetMonData
.public Party_GetCount

4
asm/include/unk_0206D494.inc
View File

@ -29,13 +29,13 @@
.public sub_0203EDDC
.public ScriptReadHalfword
.public GetVarPointer
.public VarGet
.public FieldSystem_VarGet
.public Save_VarsFlags_Get
.public FieldSystem_CreateTask
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public sub_020537A8
.public GetMetatileBehaviorAt

4
asm/include/unk_02078834.inc
View File

@ -16,8 +16,8 @@
.public FieldSystem_ApplicationIsRunning
.public CallApplicationAsTask
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public sub_020514A4
.public TaskManager_GetEnvironment
.public CallTask_02050960
.public SetFlag970
.public sub_02078B58
.public sub_02078B78

4
asm/include/unk_020910D8.inc
View File

@ -10,9 +10,9 @@
.public TaskManager_Call
.public CallApplicationAsTask
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_0205525C
.public sub_020552A4
.public CallTask_RestoreOverworld
.public sub_0206D328
.public GetMonData
.public SetMonData

2
asm/include/unk_02092B04.inc
View File

@ -6,7 +6,7 @@
.public sub_020505C0
.public sub_020505C8
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_0207791C
.public sub_02092B04
.public ov01_021E636C

2
asm/include/unk_02095DF4.inc
View File

@ -10,5 +10,5 @@
.public sub_020505C0
.public sub_020505C8
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02095DF4

2
asm/include/unk_020961D8.inc
View File

@ -15,7 +15,7 @@
.public sub_020505C0
.public sub_020505C8
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02090C94
.public sub_02090D0C
.public sub_02090D20

2
asm/include/unk_020977CC.inc
View File

@ -15,7 +15,7 @@
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public sub_020537F0
.public sub_02055110

2
asm/include/unk_020979A8.inc
View File

@ -13,7 +13,7 @@
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public TaskManager_GetStatePtr
.public sub_020537F0
.public sub_02055110

4
asm/include/unk_02097BE0.inc
View File

@ -7,8 +7,8 @@
.public TaskManager_Call
.public FieldSystem_ApplicationIsRunning
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_0205525C
.public sub_020552A4
.public CallTask_RestoreOverworld
.public Field_GetTimeOfDay
.public sub_02097BE0

2
asm/include/unk_02097D3C.inc
View File

@ -12,5 +12,5 @@
.public sub_020505C0
.public sub_020505C8
.public TaskManager_GetFieldSystem
.public TaskManager_GetEnv
.public TaskManager_GetEnvironment
.public sub_02097D3C

12
asm/overlay_01_021E90C0.s
View File

@ -1282,7 +1282,7 @@ ov01_021E9ABC: ; 0x021E9ABC
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4]
ldr r0, [r5, #0x58]
@ -1486,7 +1486,7 @@ ov01_021E9C40: ; 0x021E9C40
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r6, r0, #0
ldr r0, [r6]
cmp r0, #8
@ -1800,7 +1800,7 @@ ov01_021E9EEC: ; 0x021E9EEC
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
ldrb r0, [r5]
cmp r0, #0
@ -1868,7 +1868,7 @@ ov01_021E9F78: ; 0x021E9F78
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r0, [r4]
cmp r0, #0
@ -1932,7 +1932,7 @@ ov01_021E9FF8: ; 0x021E9FF8
bl TaskManager_GetFieldSystem
add r5, r0, #0
ldr r0, [sp, #0x10]
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r0, [r4]
cmp r0, #3
@ -2084,7 +2084,7 @@ ov01_021EA128: ; 0x021EA128
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r7, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r0, [r4]
cmp r0, #3

16
asm/overlay_01_021F1AFC.s
View File

@ -522,7 +522,7 @@ _021F1EC8: .word ov01_021F1ECC
ov01_021F1ECC: ; 0x021F1ECC
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0xc]
bl PlayerAvatar_GetMapObject
@ -641,7 +641,7 @@ _021F1F96:
lsl r1, r1, #0x10
add r0, r7, #0
lsr r1, r1, #0x10
bl FlagSet
bl FieldSystem_FlagSet
add r0, r5, #0
bl DeleteMapObject
mov r1, #0xa
@ -651,7 +651,7 @@ _021F1F96:
add r0, r7, #0
add r1, r1, r2
ldrh r1, [r1, #8]
bl FlagClear
bl FieldSystem_FlagClear
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
_021F1FF4:
@ -810,7 +810,7 @@ _021F2112:
ov01_021F2118: ; 0x021F2118
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #9
@ -1129,7 +1129,7 @@ _021F23B4: .word ov01_021F23B8
thumb_func_start ov01_021F23B8
ov01_021F23B8: ; 0x021F23B8
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r0, [r4]
cmp r0, #0
@ -1436,7 +1436,7 @@ _021F2622:
ov01_021F2628: ; 0x021F2628
push {r3, r4, r5, r6, r7, lr}
add r6, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r7, _021F268C ; =ov01_022069D0
add r4, r0, #0
_021F2634:
@ -1850,7 +1850,7 @@ _021F2940: .word ov01_021F2944
thumb_func_start ov01_021F2944
ov01_021F2944: ; 0x021F2944
push {r4, r5, r6, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r6, _021F2990 ; =ov01_022069BC
ldr r4, _021F2994 ; =ov01_022069A8
add r5, r0, #0
@ -2449,7 +2449,7 @@ CallFieldTask_Whirlpool: ; 0x021F2DA4
thumb_func_start ov01_021F2DD0
ov01_021F2DD0: ; 0x021F2DD0
push {r4, r5, r6, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r6, _021F2E04 ; =ov01_02206994
add r5, r0, #0
_021F2DDA:

2
asm/overlay_01_021F3114.s
View File

@ -121,7 +121,7 @@ _021F31C8:
thumb_func_start ov01_021F31CC
ov01_021F31CC: ; 0x021F31CC
push {r4, r5, r6, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0x10]
bl PlayerAvatar_GetMapObject

2
asm/overlay_01_021F6CFC.s
View File

@ -554,7 +554,7 @@ _021F70FA:
ov01_021F7100: ; 0x021F7100
push {r3, r4, r5, lr}
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetFieldSystem

2
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 FieldSystem_SetFollowPokeParam
bl FieldSystem_SetFollowerPokeParam
add r0, r5, #0
mov r1, #1
bl MapObject_ForceSetFacingDirection

2
asm/overlay_01_021FC05C.s
View File

@ -407,7 +407,7 @@ Task_HoneyOrSweetScent: ; 0x021FC310
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r1, [r4, #8]
cmp r1, #9

2
asm/overlay_01_021FC66C.s
View File

@ -46,7 +46,7 @@ Task_OverworldFish: ; 0x021FC698
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r0, [r5]
cmp r0, #0

4
asm/overlay_01_021FCE98.s
View File

@ -21,7 +21,7 @@ Task_UseSweetScentInField: ; 0x021FCE98
bl TaskManager_GetFieldSystem
add r6, r0, #0
ldr r0, [sp]
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r7, r0, #0
ldr r0, [sp]
bl TaskManager_GetStatePtr
@ -203,7 +203,7 @@ _021FD010: .word ov01_021FD014
ov01_021FD014: ; 0x021FD014
push {r3, r4, r5, lr}
add r4, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetStatePtr

2
asm/overlay_01_02203A18.s
View File

@ -120,7 +120,7 @@ ov01_02203AD8: ; 0x02203AD8
bl TaskManager_GetStatePtr
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r5]
cmp r0, #0

10
asm/overlay_01_022053EC.s
View File

@ -23,7 +23,7 @@ ScrCmd_808: ; 0x022053EC
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
ldr r6, _02205420 ; =FS_OVERLAY_ID(OVY_25)
add r4, r0, #0
add r0, r6, #0
@ -993,7 +993,7 @@ ov01_02205B14: ; 0x02205B14
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4]
cmp r1, #7
@ -1317,7 +1317,7 @@ ov01_02205DB4: ; 0x02205DB4
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetStatePtr
@ -1468,7 +1468,7 @@ ov01_02205F00: ; 0x02205F00
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetStatePtr
@ -1728,7 +1728,7 @@ ov01_0220610C: ; 0x0220610C
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetStatePtr

50
asm/overlay_02.s
View File

@ -53,7 +53,7 @@ _02245BB4:
ov02_02245BC8: ; 0x02245BC8
push {r3, r4, lr}
sub sp, #0xc
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r1, [r4, #8]
cmp r1, #4
@ -718,7 +718,7 @@ _022460E6:
ov02_022460FC: ; 0x022460FC
push {r3, r4, lr}
sub sp, #0xc
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r0, [r4, #0xc]
cmp r0, #0
@ -832,7 +832,7 @@ ov02_022461DC: ; 0x022461DC
push {r4, r5, lr}
sub sp, #0xc
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r0, [r4, #0x12]
cmp r0, #4
@ -997,7 +997,7 @@ _0224631C:
thumb_func_start ov02_02246330
ov02_02246330: ; 0x02246330
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #8]
cmp r1, #0
@ -1556,7 +1556,7 @@ _02246766:
thumb_func_start ov02_02246798
ov02_02246798: ; 0x02246798
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #8]
bl ov02_0224663C
@ -1622,7 +1622,7 @@ _02246802:
thumb_func_start ov02_02246818
ov02_02246818: ; 0x02246818
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #0x18]
cmp r1, #0
@ -1879,7 +1879,7 @@ _022469F8:
thumb_func_start ov02_02246A34
ov02_02246A34: ; 0x02246A34
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #4]
cmp r0, #0
@ -12741,7 +12741,7 @@ PokecenterAnimRun: ; 0x0224BB90
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #0xf]
cmp r1, #5
@ -13065,7 +13065,7 @@ ov02_0224BE24: ; 0x0224BE24
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #2]
cmp r1, #4
@ -13327,7 +13327,7 @@ Task_FieldEscapeRope: ; 0x0224C020
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
_0224C032:
ldr r3, [r5]
@ -13563,7 +13563,7 @@ ov02_0224C1F8: ; 0x0224C1F8
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r7, _0224C230 ; =ov02_022536F0
add r4, r0, #0
_0224C20C:
@ -13787,7 +13787,7 @@ Task_FieldDig: ; 0x0224C3AC
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r7, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r7, #0
bl TaskManager_GetStatePtr
@ -14010,7 +14010,7 @@ Task_FieldTeleport: ; 0x0224C558
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r7, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r7, #0
bl TaskManager_GetStatePtr
@ -15156,7 +15156,7 @@ ov02_0224CE28: ; 0x0224CE28
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #0xf]
cmp r1, #5
@ -17740,7 +17740,7 @@ ov02_0224E0EC: ; 0x0224E0EC
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
mov r5, #0
@ -20433,7 +20433,7 @@ _0224F5A4:
bl HiddenItemScriptNoToFlagId
add r1, r0, #0
ldr r0, [sp]
bl FlagGet
bl FieldSystem_FlagGet
cmp r0, #0
bne _0224F5BE
add r4, r4, #1
@ -22894,7 +22894,7 @@ ov02_022507E8: ; 0x022507E8
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetStatePtr
@ -23019,7 +23019,7 @@ ov02_022508D8: ; 0x022508D8
bl TaskManager_GetStatePtr
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r1, [r5]
add r4, r0, #0
cmp r1, #3
@ -24226,7 +24226,7 @@ ov02_02251280: ; 0x02251280
ov02_022512AC: ; 0x022512AC
push {r3, r4, r5, lr}
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetStatePtr
@ -24631,7 +24631,7 @@ ov02_022515D0: ; 0x022515D0
bl TaskManager_GetFieldSystem
str r0, [sp, #8]
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetStatePtr
@ -25658,7 +25658,7 @@ _02251E40: .word ov02_02251E44
thumb_func_start ov02_02251E44
ov02_02251E44: ; 0x02251E44
push {r4, r5, r6, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #4]
ldr r5, [r0, #0x24]
@ -26394,7 +26394,7 @@ ov02_022523D0: ; 0x022523D0
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r6, r0, #0
ldr r0, [r5]
cmp r0, #4
@ -26584,7 +26584,7 @@ ov02_0225255C: ; 0x0225255C
add r0, r4, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r1, [r5]
add r4, r0, #0
cmp r1, #5
@ -27216,7 +27216,7 @@ ov02_02252A28: ; 0x02252A28
add r0, r4, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r5]
cmp r0, #5
@ -27848,7 +27848,7 @@ ov02_02252F14: ; 0x02252F14
add r0, r5, #0
bl TaskManager_GetFieldSystem
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r1, [r4]
add r5, r0, #0
cmp r1, #4

14
asm/overlay_03.s
View File

@ -4769,7 +4769,7 @@ ov03_022564A8: ; 0x022564A8
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #0x7c]
cmp r1, #0xb
@ -5995,7 +5995,7 @@ ov03_02256E2C: ; 0x02256E2C
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r1, _02257064 ; =0x00000272
add r4, r0, #0
ldrb r2, [r4, r1]
@ -9232,7 +9232,7 @@ ov03_02258764: ; 0x02258764
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r5, #0xc]
bl Save_Bag_Get
@ -9398,7 +9398,7 @@ _02258890: .word 0x000005D8
thumb_func_start ov03_02258894
ov03_02258894: ; 0x02258894
push {r3, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
ldr r1, [r0]
cmp r1, #0
bne _022588A8
@ -9544,7 +9544,7 @@ ScrCmd_718: ; 0x02258998
add r5, #0x80
add r1, r0, #0
ldr r0, [r5]
bl VarGet
bl FieldSystem_VarGet
add r2, r0, #0
lsl r2, r2, #0x18
ldr r0, [r6]
@ -9603,7 +9603,7 @@ ScrCmd_720: ; 0x02258A18
add r4, #0x80
add r1, r0, #0
ldr r0, [r4]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp]
ldr r0, [r5, #0x40]
bl PlayerAvatar_GetFacingDirection
@ -9978,7 +9978,7 @@ ov03_02258D3C: ; 0x02258D3C
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4]
cmp r1, #0

18
asm/overlay_04.s
View File

@ -145,7 +145,7 @@ ov04_02253F38: ; 0x02253F38
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4]
cmp r1, #0
@ -192,7 +192,7 @@ ov04_02253F94: ; 0x02253F94
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4]
cmp r1, #0
@ -995,7 +995,7 @@ ov04_0225463C: ; 0x0225463C
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4]
cmp r1, #0
@ -2009,7 +2009,7 @@ ov04_02254E20: ; 0x02254E20
thumb_func_start ov04_02254E50
ov04_02254E50: ; 0x02254E50
push {r4, r5, r6, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #0xc]
ldr r0, [r1, #4]
@ -3585,7 +3585,7 @@ ov04_022559C8: ; 0x022559C8
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r6, #4]
ldr r5, [r0, #0x24]
@ -3705,7 +3705,7 @@ ov04_02255AC4: ; 0x02255AC4
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r5, #4]
ldr r6, [r0, #0x24]
@ -4469,7 +4469,7 @@ ov04_022560D4: ; 0x022560D4
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r6, #0x40]
bl PlayerAvatar_GetMapObject
@ -4947,7 +4947,7 @@ ov04_022564A0: ; 0x022564A0
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetStatePtr
@ -6853,7 +6853,7 @@ ov04_02257308: ; 0x02257308
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
mov r1, #0x23
lsl r1, r1, #4
ldr r0, [r0, r1]

4
asm/overlay_25.s
View File

@ -70,7 +70,7 @@ _0225990E:
add r1, r6, #0
add r2, r4, #0
add r3, r7, #0
bl sub_02050AAC
bl CallTask_020509F0
add sp, #0x184
pop {r4, r5, r6, r7, pc}
.balign 4, 0
@ -196,7 +196,7 @@ ScrCmd_809: ; 0x02259A30
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r4, r0, #0
add r0, r5, #0
add r0, #0x80

18
asm/scrcmd_9.s
View File

@ -124,7 +124,7 @@ ScrCmd_412: ; 0x02049D04
add r0, r7, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0
add r0, r7, #0
bl ScriptReadHalfword
@ -483,7 +483,7 @@ ScrCmd_413: ; 0x02049FC8
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
@ -491,7 +491,7 @@ ScrCmd_413: ; 0x02049FC8
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
@ -581,7 +581,7 @@ ScrCmd_416: ; 0x0204A098
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
@ -589,7 +589,7 @@ ScrCmd_416: ; 0x0204A098
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp, #4]
add r0, r5, #0
bl ScriptReadHalfword
@ -699,7 +699,7 @@ ScrCmd_417: ; 0x0204A184
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
@ -912,7 +912,7 @@ ScrCmd_555: ; 0x0204A31C
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r5, #0x80
add r6, r0, #0
ldr r0, [r5]
@ -944,7 +944,7 @@ ScrCmd_556: ; 0x0204A360
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r5, #0x80
add r6, r0, #0
ldr r0, [r5]
@ -976,7 +976,7 @@ ScrCmd_CheckBattlePoints: ; 0x0204A3A4
add r0, r4, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0
add r0, r4, #0
bl ScriptReadHalfword

84
asm/unk_0203BC10.s
View File

@ -423,7 +423,7 @@ sub_0203BEF0: ; 0x0203BEF0
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
ldrh r1, [r5, #0x26]
cmp r1, #0x14
@ -711,7 +711,7 @@ sub_0203C14C: ; 0x0203C14C
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
add r1, r5, #0
add r2, r5, #0
@ -1128,7 +1128,7 @@ sub_0203C47C: ; 0x0203C47C
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl ov01_021F6B00
@ -1634,7 +1634,7 @@ sub_0203C870: ; 0x0203C870
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r1, r6, #0
add r4, r0, #0
bl sub_0203C38C
@ -1663,7 +1663,7 @@ sub_0203C8B0: ; 0x0203C8B0
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl FieldSystem_ApplicationIsRunning
@ -1702,7 +1702,7 @@ sub_0203C8F0: ; 0x0203C8F0
thumb_func_start sub_0203C8FC
sub_0203C8FC: ; 0x0203C8FC
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0
bl ov01_021E636C
@ -1726,7 +1726,7 @@ sub_0203C920: ; 0x0203C920
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
str r0, [sp]
ldr r0, [r4, #0xc]
bl Save_LocalFieldData_Get
@ -1839,7 +1839,7 @@ sub_0203CA14: ; 0x0203CA14
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl sub_020505C0
@ -1860,7 +1860,7 @@ _0203CA3C:
thumb_func_start sub_0203CA44
sub_0203CA44: ; 0x0203CA44
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0
bl ov01_021E636C
@ -1883,7 +1883,7 @@ sub_0203CA68: ; 0x0203CA68
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
mov r1, #0x37
add r4, r0, #0
lsl r1, r1, #4
@ -1911,7 +1911,7 @@ sub_0203CA9C: ; 0x0203CA9C
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r7, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xb
mov r1, #0x44
@ -2420,7 +2420,7 @@ _0203CEFE:
thumb_func_start sub_0203CF0C
sub_0203CF0C: ; 0x0203CF0C
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0
bl ov01_021E636C
@ -2443,7 +2443,7 @@ sub_0203CF30: ; 0x0203CF30
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
mov r1, #0xd6
add r4, r0, #0
lsl r1, r1, #2
@ -2513,7 +2513,7 @@ sub_0203CFC0: ; 0x0203CFC0
bl TaskManager_GetFieldSystem
str r0, [sp, #8]
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xb
bl BagView_New
@ -2728,7 +2728,7 @@ _0203D1A4: .word sub_0203D830
thumb_func_start sub_0203D1A8
sub_0203D1A8: ; 0x0203D1A8
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0
bl ov01_021E636C
@ -2752,7 +2752,7 @@ sub_0203D1CC: ; 0x0203D1CC
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xb
bl sub_020691C4
@ -2788,7 +2788,7 @@ sub_0203D218: ; 0x0203D218
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xe
lsl r0, r0, #6
@ -2807,7 +2807,7 @@ sub_0203D218: ; 0x0203D218
sub_0203D244: ; 0x0203D244
push {r3, r4, r5, lr}
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetFieldSystem
@ -2827,7 +2827,7 @@ sub_0203D264: ; 0x0203D264
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl ov01_021F6B00
@ -2847,7 +2847,7 @@ sub_0203D288: ; 0x0203D288
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl ov01_021F6B00
@ -2880,7 +2880,7 @@ _0203D2C8:
sub_0203D2CC: ; 0x0203D2CC
push {r3, r4, r5, lr}
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetFieldSystem
@ -2897,7 +2897,7 @@ sub_0203D2CC: ; 0x0203D2CC
sub_0203D2EC: ; 0x0203D2EC
push {r3, r4, r5, lr}
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetFieldSystem
@ -2913,7 +2913,7 @@ sub_0203D304: ; 0x0203D304
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
mov r1, #0x10
strh r1, [r0, #0x26]
pop {r4, pc}
@ -2922,7 +2922,7 @@ sub_0203D304: ; 0x0203D304
thumb_func_start sub_0203D318
sub_0203D318: ; 0x0203D318
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0
bl ov01_021E636C
@ -2945,7 +2945,7 @@ sub_0203D33C: ; 0x0203D33C
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl sub_0203EE24
@ -2968,7 +2968,7 @@ sub_0203D368: ; 0x0203D368
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xe
lsl r0, r0, #6
@ -2986,7 +2986,7 @@ sub_0203D368: ; 0x0203D368
thumb_func_start sub_0203D394
sub_0203D394: ; 0x0203D394
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0
bl ov01_021E636C
@ -3010,7 +3010,7 @@ sub_0203D3B8: ; 0x0203D3B8
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xb
str r0, [sp]
@ -3056,7 +3056,7 @@ sub_0203D418: ; 0x0203D418
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
mov r0, #0xe
lsl r0, r0, #6
@ -3108,7 +3108,7 @@ sub_0203D488: ; 0x0203D488
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r1, r4, #0
add r6, r0, #0
bl sub_0203C38C
@ -3159,7 +3159,7 @@ _0203D4FC: .word 0x000028A4
thumb_func_start sub_0203D500
sub_0203D500: ; 0x0203D500
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0
bl ov01_021E636C
@ -3182,7 +3182,7 @@ sub_0203D524: ; 0x0203D524
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl PhoneUI_New
@ -3205,7 +3205,7 @@ sub_0203D550: ; 0x0203D550
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl sub_020505C0
@ -3230,7 +3230,7 @@ sub_0203D580: ; 0x0203D580
bl TaskManager_GetFieldSystem
str r0, [sp]
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xb
mov r1, #0x3c
@ -3338,7 +3338,7 @@ sub_0203D664: ; 0x0203D664
bl TaskManager_GetFieldSystem
str r0, [sp, #4]
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
str r0, [sp]
ldr r0, [sp, #4]
ldr r0, [r0, #0xc]
@ -3385,7 +3385,7 @@ sub_0203D6C8: ; 0x0203D6C8
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
add r0, #0x94
@ -3423,7 +3423,7 @@ sub_0203D718: ; 0x0203D718
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
mov r1, #0xe
add r4, r0, #0
lsl r1, r1, #6
@ -3455,7 +3455,7 @@ Task_UseFlyInField: ; 0x0203D758
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xe1
lsl r0, r0, #2
@ -3558,7 +3558,7 @@ sub_0203D830: ; 0x0203D830
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xe1
lsl r0, r0, #2
@ -3739,7 +3739,7 @@ sub_0203D9B4: ; 0x0203D9B4
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
mov r1, #0xd6
add r4, r0, #0
lsl r1, r1, #2
@ -3766,7 +3766,7 @@ sub_0203D9E8: ; 0x0203D9E8
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r6, r0, #0
mov r0, #0xe
lsl r0, r0, #6
@ -3877,7 +3877,7 @@ sub_0203DAE4: ; 0x0203DAE4
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #0xe
lsl r0, r0, #6

4
asm/unk_0203DB6C.s
View File

@ -262,7 +262,7 @@ _0203DD1E:
bl HiddenItemScriptNoToFlagId
add r1, r0, #0
add r0, r4, #0
bl FlagGet
bl FieldSystem_FlagGet
cmp r0, #1
beq _0203DD34
mov r0, #1
@ -430,7 +430,7 @@ _0203DE2A:
bge _0203DE5E
ldrh r1, [r5, #0xe]
ldr r0, [sp]
bl VarGet
bl FieldSystem_VarGet
ldrh r1, [r5, #0xc]
cmp r1, r0
bne _0203DE5E

14
asm/unk_0203E348.s
View File

@ -516,7 +516,7 @@ sub_0203E604: ; 0x0203E604
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetStatePtr
@ -826,7 +826,7 @@ sub_0203E878: ; 0x0203E878
bl TaskManager_GetStatePtr
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r6, #0
bl TaskManager_GetFieldSystem
@ -1967,7 +1967,7 @@ sub_0203F134: ; 0x0203F134
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r0, [r5]
cmp r0, #0
@ -2172,7 +2172,7 @@ sub_0203F2C8: ; 0x0203F2C8
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #7
@ -2516,7 +2516,7 @@ sub_0203F580: ; 0x0203F580
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #3
@ -2550,7 +2550,7 @@ _0203F5BA:
b _0203F648
_0203F5CC:
add r0, r5, #0
bl sub_020552A4
bl CallTask_RestoreOverworld
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]
@ -2621,7 +2621,7 @@ NamingScreen_SetName: ; 0x0203F650
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0xc]
ldr r0, [r0]

2
asm/unk_020551B8.s
View File

@ -11,7 +11,7 @@ sub_020551B8: ; 0x020551B8
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #0

16
asm/unk_02055244.s
View File

@ -57,8 +57,8 @@ _0205529E:
.balign 4, 0
thumb_func_end sub_0205528C
thumb_func_start sub_020552A4
sub_020552A4: ; 0x020552A4
thumb_func_start CallTask_RestoreOverworld
CallTask_RestoreOverworld: ; 0x020552A4
push {r3, r4, r5, lr}
add r5, r0, #0
bl TaskManager_GetFieldSystem
@ -78,7 +78,7 @@ _020552BC:
pop {r3, r4, r5, pc}
nop
_020552D0: .word sub_0205528C
thumb_func_end sub_020552A4
thumb_func_end CallTask_RestoreOverworld
thumb_func_start sub_020552D4
sub_020552D4: ; 0x020552D4
@ -128,8 +128,8 @@ _02055302:
_02055328: .word sub_020552D4
thumb_func_end PalleteFadeUntilFinished
thumb_func_start sub_0205532C
sub_0205532C: ; 0x0205532C
thumb_func_start CallTask_FadeFromBlack
CallTask_FadeFromBlack: ; 0x0205532C
push {r3, r4, lr}
sub sp, #0xc
add r4, r0, #0
@ -159,7 +159,7 @@ _02055346:
pop {r3, r4, pc}
nop
_0205536C: .word sub_020552D4
thumb_func_end sub_0205532C
thumb_func_end CallTask_FadeFromBlack
thumb_func_start sub_02055370
sub_02055370: ; 0x02055370
@ -227,7 +227,7 @@ sub_020553C0: ; 0x020553C0
b _02055404
_020553E0:
add r0, r5, #0
bl sub_020552A4
bl CallTask_RestoreOverworld
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]
@ -235,7 +235,7 @@ _020553E0:
_020553EE:
bl ov01_021EFAF8
add r0, r5, #0
bl sub_0205532C
bl CallTask_FadeFromBlack
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]

12
asm/unk_02056680.s
View File

@ -16,7 +16,7 @@ sub_02056680: ; 0x02056680
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r0, [r4, #2]
cmp r0, #0
@ -75,7 +75,7 @@ sub_020566F8: ; 0x020566F8
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r0, [r4, #2]
cmp r0, #3
@ -168,7 +168,7 @@ sub_020567B4: ; 0x020567B4
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r5, #0x40]
bl PlayerAvatar_GetMapObject
@ -219,7 +219,7 @@ sub_0205681C: ; 0x0205681C
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r0, [r4, #2]
cmp r0, #5
@ -351,7 +351,7 @@ sub_02056938: ; 0x02056938
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r0, [r4, #2]
cmp r0, #5
@ -807,7 +807,7 @@ sub_02056D30: ; 0x02056D30
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r1, [r4]
cmp r1, #0

8
asm/unk_02058AEC.s
View File

@ -332,7 +332,7 @@ sub_02058D4C: ; 0x02058D4C
push {r3, r4, r5, lr}
sub sp, #8
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetFieldSystem
@ -1476,11 +1476,11 @@ _02059672:
thumb_func_start sub_0205969C
sub_0205969C: ; 0x0205969C
ldr r3, _020596A4 ; =TaskManager_GetEnv
ldr r3, _020596A4 ; =TaskManager_GetEnvironment
ldr r0, [r0, #0x10]
bx r3
nop
_020596A4: .word TaskManager_GetEnv
_020596A4: .word TaskManager_GetEnvironment
thumb_func_end sub_0205969C
thumb_func_start sub_020596A8
@ -2135,7 +2135,7 @@ sub_02059B64: ; 0x02059B64
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r1, #0
ldr r0, [r4, #0x24]

4
asm/unk_0205BB1C.s
View File

@ -461,7 +461,7 @@ sub_0205BE28: ; 0x0205BE28
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
mov r0, #2
lsl r0, r0, #0xe
@ -613,7 +613,7 @@ sub_0205BF6C: ; 0x0205BF6C
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #9]
ldr r0, [r4]

6
asm/unk_02066EDC.s
View File

@ -249,7 +249,7 @@ sub_020670B0: ; 0x020670B0
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #4]
cmp r1, #4
@ -386,7 +386,7 @@ sub_020671B0: ; 0x020671B0
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #4]
cmp r1, #0
@ -456,7 +456,7 @@ sub_02067238: ; 0x02067238
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
bl sub_0203769C
mov r1, #1

8
asm/unk_0206793C.s
View File

@ -20,7 +20,7 @@ sub_0206793C: ; 0x0206793C
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r2, r0, #0
ldr r1, _02067958 ; =_020FE79C
add r0, r4, #0
@ -39,7 +39,7 @@ Task_NPCTrade: ; 0x0206795C
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #4]
cmp r0, #6
@ -100,14 +100,14 @@ _020679D4:
b _02067A16
_020679E2:
add r0, r5, #0
bl sub_020552A4
bl CallTask_RestoreOverworld
ldr r0, [r4, #4]
add r0, r0, #1
str r0, [r4, #4]
b _02067A16
_020679F0:
add r0, r5, #0
bl sub_0205532C
bl CallTask_FadeFromBlack
ldr r0, [r4, #4]
add r0, r0, #1
str r0, [r4, #4]

2
asm/unk_02067A60.s
View File

@ -259,7 +259,7 @@ sub_02067C30: ; 0x02067C30
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r0, [r4, #4]
cmp r0, #6

2
asm/unk_02068FC8.s
View File

@ -612,7 +612,7 @@ sub_02069498: ; 0x02069498
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r0, [r5]
cmp r0, #0xa

2
asm/unk_0206A360.s
View File

@ -121,7 +121,7 @@ sub_0206A410: ; 0x0206A410
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #3

18
asm/unk_0206B910.s
View File

@ -70,7 +70,7 @@ sub_0206B984: ; 0x0206B984
push {r4, r5, r6, r7, lr}
sub sp, #0xc
str r0, [sp]
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r7, r0, #0
ldr r0, [sp]
ldr r6, [r7, #4]
@ -249,7 +249,7 @@ _0206BAF2:
b _0206BB1C
_0206BAF8:
ldr r0, [sp]
bl sub_020552A4
bl CallTask_RestoreOverworld
mov r0, #6
str r0, [r7, #0x10]
b _0206BB1C
@ -286,7 +286,7 @@ ScrCmd_232: ; 0x0206BB2C
add r5, #0x80
add r1, r0, #0
ldr r0, [r5]
bl VarGet
bl FieldSystem_VarGet
add r1, r0, #0
lsl r1, r1, #0x18
ldr r0, [r4]
@ -310,7 +310,7 @@ ScrCmd_233: ; 0x0206BB5C
add r0, r4, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
str r0, [r4, #0x64]
ldr r1, _0206BB8C ; =sub_0206BB90
add r0, r4, #0
@ -353,7 +353,7 @@ ScrCmd_234: ; 0x0206BBAC
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
@ -361,7 +361,7 @@ ScrCmd_234: ; 0x0206BBAC
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0
add r0, r5, #0
bl ScriptReadHalfword
@ -369,7 +369,7 @@ ScrCmd_234: ; 0x0206BBAC
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp]
add r0, r5, #0
bl ScriptReadHalfword
@ -377,7 +377,7 @@ ScrCmd_234: ; 0x0206BBAC
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r1, sp, #4
strb r7, [r1]
ldr r0, [sp]
@ -410,7 +410,7 @@ ScrCmd_235: ; 0x0206BC2C
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r5, #0x80
ldr r0, [r5]
ldr r0, [r0, #0x20]

6
asm/unk_0206D494.s
View File

@ -54,7 +54,7 @@ sub_0206D4E4: ; 0x0206D4E4
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetStatePtr
@ -928,7 +928,7 @@ sub_0206DBC0: ; 0x0206DBC0
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r7, #0
bl FieldSystem_BugContest_Get
@ -1004,7 +1004,7 @@ ScrCmd_807: ; 0x0206DC50
add r0, r4, #0
add r0, #0x80
ldr r0, [r0]
bl VarGet
bl FieldSystem_VarGet
add r5, r0, #0
add r0, r4, #0
bl ScriptReadHalfword

4
asm/unk_02078834.s
View File

@ -20,7 +20,7 @@ sub_02078834: ; 0x02078834
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #4]
cmp r1, #0x19
@ -218,7 +218,7 @@ _0207899C:
ldrb r3, [r4, #0xd]
ldr r1, [r1, #8]
add r0, r6, #0
bl sub_020514A4
bl CallTask_02050960
ldr r0, [r4, #4]
add r0, r0, #1
str r0, [r4, #4]

4
asm/unk_020910D8.s
View File

@ -17,7 +17,7 @@ sub_020910D8: ; 0x020910D8
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x10
add r5, r0, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4]
cmp r1, #6
@ -162,7 +162,7 @@ _0209120C:
b _02091232
_0209121A:
add r0, r5, #0
bl sub_020552A4
bl CallTask_RestoreOverworld
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]

4
asm/unk_02092B04.s
View File

@ -16,7 +16,7 @@ sub_02092B04: ; 0x02092B04
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, _02092B3C ; =0x00000272
ldrb r0, [r4, r0]
@ -81,7 +81,7 @@ sub_02092B7C: ; 0x02092B7C
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
add r0, r6, #0
bl sub_020505C8

2
asm/unk_02095DF4.s
View File

@ -48,7 +48,7 @@ sub_02095E30: ; 0x02095E30
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #3

2
asm/unk_020961D8.s
View File

@ -75,7 +75,7 @@ sub_02096248: ; 0x02096248
thumb_func_start sub_02096260
sub_02096260: ; 0x02096260
push {r4, lr}
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #0x18]
cmp r1, #4

4
asm/unk_020977CC.s
View File

@ -104,7 +104,7 @@ sub_02097878: ; 0x02097878
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetStatePtr
@ -151,7 +151,7 @@ sub_020978D0: ; 0x020978D0
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4]
cmp r1, #5

4
asm/unk_020979A8.s
View File

@ -100,7 +100,7 @@ sub_02097A48: ; 0x02097A48
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetStatePtr
@ -147,7 +147,7 @@ sub_02097AA0: ; 0x02097AA0
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4]
cmp r1, #5

6
asm/unk_02097BE0.s
View File

@ -78,7 +78,7 @@ sub_02097C50: ; 0x02097C50
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #0x50]
cmp r1, #3
@ -111,7 +111,7 @@ _02097C8A:
b _02097CB0
_02097C9A:
add r0, r5, #0
bl sub_020552A4
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x50]
add r0, r0, #1
str r0, [r4, #0x50]
@ -152,7 +152,7 @@ sub_02097CD8: ; 0x02097CD8
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #8]
ldr r1, [r4]

2
asm/unk_02097D3C.s
View File

@ -50,7 +50,7 @@ sub_02097D80: ; 0x02097D80
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl TaskManager_GetEnv
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #4

4
include/battle/battle.h
View File

@ -531,7 +531,7 @@ struct BattleSystem {
Bag *bag;
BagCursor *bagCursor;
Pokedex *pokedex;
PC_STORAGE *storage;
PCStorage *storage;
Party *trainerParty[4];
SOUND_CHATOT *chatotVoice[4];
u32 *unk88;
@ -542,7 +542,7 @@ struct BattleSystem {
u32 *unk9C;
u16 trainerId[4];
u8 trainerGender[4];
TRAINER trainers[4];
Trainer trainers[4];
UnkBattleSystemSub17C unk17C[2]; //Battle Background..?
u32 *unk19C;
u32 *unk1A0[2];

4
include/battle/battle_setup.h
View File

@ -27,12 +27,12 @@ struct BattleSetup { //declared in trainer_data.h
Party* party[BATTLER_MAX]; // 4
int winFlag; // 14
int trainerId[BATTLER_MAX]; // 18
TRAINER trainer[BATTLER_MAX]; // 28
Trainer trainer[BATTLER_MAX]; // 28
PlayerProfile *profile[BATTLER_MAX]; // f8
Bag* bag; // 108
void* unk_10C;
Pokedex* pokedex; // 110
PC_STORAGE* storagePC; // 114
PCStorage* storagePC; // 114
SOUND_CHATOT* chatot[BATTLER_MAX]; // 118
void* unk_128;
void* unk_12C;

4
include/battle/battle_system.h
View File

@ -41,7 +41,7 @@ UnkBattleSystemSub1D0 *ov12_0223A99C(BattleSystem *bsys);
u32 *ov12_0223A9A4(BattleSystem *bsys);
String *BattleSystem_GetMessageBuffer(BattleSystem *bsys);
u16 BattleSystem_GetTrainerIndex(BattleSystem *bsys, int battlerId);
TRAINER *BattleSystem_GetTrainer(BattleSystem *bsys, int battlerId);
Trainer *BattleSystem_GetTrainer(BattleSystem *bsys, int battlerId);
PlayerProfile *BattleSystem_GetPlayerProfile(BattleSystem *bsys, int a1);
Bag *BattleSystem_GetBag(BattleSystem *bsys);
BagCursor *BattleSystem_GetBagCursor(BattleSystem *bsys);
@ -52,7 +52,7 @@ int ov12_0223AAD8(BattleSystem *bsys, int a1);
u8 ov12_0223AB0C(BattleSystem *bsys, int battlerId);
u8 BattleSystem_GetFieldSide(BattleSystem *bsys, int battlerId);
void *BattleSystem_GetMessageIcon(BattleSystem *bsys);
PC_STORAGE *BattleSystem_GetPcStorage(BattleSystem *bsys);
PCStorage *BattleSystem_GetPcStorage(BattleSystem *bsys);
Terrain BattleSystem_GetTerrainId(BattleSystem *bsys);
int ov12_0223AB54(BattleSystem *bsys);
int BattleSystem_GetLocation(BattleSystem *bsys);

26
include/bug_contest.h
View File

@ -5,18 +5,18 @@
#include "script.h"
void FieldSystem_StartBugContestTimer(FieldSystem *fieldSystem);
BUGCONTEST *BugContest_New(FieldSystem *fieldSystem, u32 weekday);
void BugContest_Delete(BUGCONTEST *bugContest);
void BugContest_Judge(BUGCONTEST *bugContest);
void BugContest_BufferContestWinnerNames(BUGCONTEST *bugContest, MsgData *msgData, MessageFormat *msgFmt, u8 place);
BOOL BugContest_ContestantIsRegistered(BUGCONTEST *bugContest, u8 id);
BOOL BugContest_BufferCaughtMonNick(BUGCONTEST *bugContest, MessageFormat *msgFmt, u8 slot);
void BugContest_BackUpParty(BUGCONTEST *bugContest);
void BugContest_RestoreParty_RetrieveCaughtPokemon(BUGCONTEST *bugContest);
BOOL BugContest_ContestantIsRegisteredN(BUGCONTEST *bugContest, u8 id, u8 n);
void BugContest_InitOpponents(BUGCONTEST *bugContest);
void BugContest_InitEncounters(BUGCONTEST *bugContest);
u16 BugContest_JudgePlayerMon(BUGCONTEST *bugContest, Pokemon *pokemon);
ENC_SLOT *BugContest_GetEncounterSlot(BUGCONTEST *bugContest, HeapID heapId);
BugContest *BugContest_New(FieldSystem *fieldSystem, u32 weekday);
void BugContest_Delete(BugContest *bugContest);
void BugContest_Judge(BugContest *bugContest);
void BugContest_BufferContestWinnerNames(BugContest *bugContest, MsgData *msgData, MessageFormat *msgFmt, u8 place);
BOOL BugContest_ContestantIsRegistered(BugContest *bugContest, u8 id);
BOOL BugContest_BufferCaughtMonNick(BugContest *bugContest, MessageFormat *msgFmt, u8 slot);
void BugContest_BackUpParty(BugContest *bugContest);
void BugContest_RestoreParty_RetrieveCaughtPokemon(BugContest *bugContest);
BOOL BugContest_ContestantIsRegisteredN(BugContest *bugContest, u8 id, u8 n);
void BugContest_InitOpponents(BugContest *bugContest);
void BugContest_InitEncounters(BugContest *bugContest);
u16 BugContest_JudgePlayerMon(BugContest *bugContest, Pokemon *pokemon);
ENC_SLOT *BugContest_GetEncounterSlot(BugContest *bugContest, HeapID heapId);
#endif //POKEHEARTGOLD_BUG_CONTEST_H

16
include/bug_contest_internal.h
View File

@ -16,25 +16,25 @@ typedef struct BUGMON {
#define BUGMON_COUNT 10
typedef struct BUGCONTESTANT_BIN {
typedef struct BugContestantData {
u8 national;
u8 day;
u16 species;
u16 score;
u16 randmod;
} BUGCONTESTANT_BIN;
} BugContestantData;
typedef struct BUGCONTESTANT {
typedef struct BugContestant {
u8 id;
u16 score;
BUGCONTESTANT_BIN data;
} BUGCONTESTANT;
BugContestantData data;
} BugContestant;
#define BUGCONTESTANT_NPC_COUNT 5
#define BUGCONTESTANT_PLAYER BUGCONTESTANT_NPC_COUNT
#define BUGCONTESTANT_COUNT (BUGCONTESTANT_NPC_COUNT+1)
typedef struct BUGCONTEST {
typedef struct BugContest {
HeapID heapId; // Always set to 3
SaveData *saveData; // Pointer to save data
Party *party_bak; // Player's party is held for the contest
@ -50,8 +50,8 @@ typedef struct BUGCONTEST {
u16 prize; // Item ID
u32 elapsed_time; // Used to determine when the contest ends
BUGMON encounters[BUGMON_COUNT]; // Which wild Pokemon you can find
BUGCONTESTANT contestants[BUGCONTESTANT_COUNT]; // 5 NPCs + player
BugContestant contestants[BUGCONTESTANT_COUNT]; // 5 NPCs + player
u8 ranking[BUGCONTESTANT_COUNT]; // Index sorting by score at the end
} BUGCONTEST;
} BugContest;
#endif //POKEHEARTGOLD_BUG_CONTEST_INTERNAL_H

2
include/constants/battle.h
View File

@ -64,6 +64,7 @@ typedef enum Terrain {
// Battle outcome
// Used with BattleSetup::winFlag
#define BATTLE_OUTCOME_NONE 0
#define BATTLE_OUTCOME_WIN 1
#define BATTLE_OUTCOME_LOSE 2
#define BATTLE_OUTCOME_DRAW 3
@ -72,6 +73,7 @@ typedef enum Terrain {
#define BATTLE_OUTCOME_FOE_FLED 6
//Battle Type
#define BATTLE_TYPE_NONE 0
#define BATTLE_TYPE_TRAINER (1 << 0)
#define BATTLE_TYPE_DOUBLES (1 << 1)
#define BATTLE_TYPE_LINK (1 << 2)

9
include/constants/game_stat.h → include/constants/game_stats.h
View File

@ -1,10 +1,11 @@
#ifndef POKEHEARTGOLD_CONSTANTS_GAME_STAT_H
#define POKEHEARTGOLD_CONSTANTS_GAME_STAT_H
#ifndef POKEHEARTGOLD_CONSTANTS_GAME_STATS_H
#define POKEHEARTGOLD_CONSTANTS_GAME_STATS_H
#define GAME_STAT_APRICORN_GET 1
#define GAME_STAT_UNK2 2
#define GAME_STAT_UNK6 6
#define GAME_STAT_UNK9 9
#define GAME_STAT_UNK8 8 //wild battles?
#define GAME_STAT_UNK9 9 //trainer battles?
#define GAME_STAT_UNK10 10
#define GAME_STAT_UNK11 11
#define GAME_STAT_UNK12 12
@ -15,4 +16,4 @@
#define GAME_STAT_UNK46 46
#define GAME_STAT_BATTLE_POINTS 69
#endif //POKEHEARTGOLD_CONSTANTS_GAME_STAT_H
#endif //POKEHEARTGOLD_CONSTANTS_GAME_STATS_H

3
include/constants/std_script.h
View File

@ -3,6 +3,9 @@
#include "constants/trainers.h"
// TODO: decide whether we want to keep this case
// or whether we want to capitalise this file.
// The _std_XXX constants are group thresholds for
// use in fieldmap.c (sScriptBankMapping).
// The std_XXX constants (no leading underscore)

43
include/encounter.h
View File

@ -5,35 +5,34 @@
#include "field_player_avatar.h"
#include "task.h"
typedef struct EncounterWork {
typedef struct Encounter {
u32 *winFlag;
int effect;
int bgm;
int unkC;
s32 effect;
s32 bgm;
s32 unkC;
BattleSetup *setup;
} ENCOUNTER;
} Encounter;
typedef struct WildEncounterWork {
int state;
int effect;
int bgm;
int *winFlag;
typedef struct WildEncounter {
s32 state;
s32 effect;
s32 bgm;
u32 *winFlag;
BattleSetup *setup;
} WILD_ENCOUNTER;
} WildEncounter;
void CallTask_020509F0(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag);
void sub_02050B08(FieldSystem *fieldSystem, BattleSetup *setup);
void sub_02051428(TaskManager *taskManager, void *a1, int a2);
void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canRun, BOOL shiny);
void sub_02051090(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canRun);
void sub_02051228(TaskManager *taskManager, u16 species, u8 level);
void sub_02050B90(FieldSystem *fieldSystem, TaskManager *taskManager, BattleSetup *setup);
void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canFlee, BOOL shiny);
void SetupAndStartFatefulWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canRun);
void sub_020511F8(FieldSystem *fieldSystem, BattleSetup *setup);
void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level);
void SetupAndStartTutorialBattle(TaskManager *taskManager);
void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, HeapID heapId, u32 *winFlag);
void sub_02050B90(FieldSystem *fieldSystem, TaskManager *taskManager, BattleSetup *setup);
void sub_0205239C(BattleSetup *setup, FieldSystem *fieldSystem);
void sub_02050AAC(TaskManager *man, BattleSetup *setup, int effect, int bgm, u32 *winFlag);
void sub_020511F8(FieldSystem *fieldSystem, BattleSetup *setup);
void sub_020515FC(FieldSystem *fieldSystem, Party *party, int battleFlags);
void sub_02051598(FieldSystem *fieldSystem, void *a1, int battleFlags);
void sub_020514A4(TaskManager *man, int target, int maxLevel, int flag);
void CallTask_020508B8(TaskManager *taskManager, void *param1, u32 battleType);
void CallTask_02050960(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag);
void sub_02051598(FieldSystem *fieldSystem, void *param1, s32 battleType);
void sub_020515FC(FieldSystem *fieldSystem, Party *party, s32 battleType);
#endif //POKEHEARTGOLD_ENCOUNTER_H

6
include/field_follow_poke.h
View File

@ -5,8 +5,8 @@
#include "heap.h"
#include "map_object_manager.h"
LocalMapObject *sub_020699F8(MapObjectManager *mapObjectMan, int x, int y, int direction, u32 mapno);
void sub_02069B74(MapObjectManager *mapObjectMan, u32 mapno);
LocalMapObject *sub_020699F8(MapObjectManager *mapObjectManager, int x, int y, int direction, u32 mapno);
void sub_02069B74(MapObjectManager *mapObjectManager, u32 mapno);
LocalMapObject *FollowingPokemon_GetMapObject(FieldSystem *fieldSystem);
u32 FollowingPokemon_GetSpriteID(int species, u16 form, u32 gender);
void sub_02069DC8(LocalMapObject *mapObject, BOOL enable_bit);
@ -20,7 +20,7 @@ u8 sub_02069EC0(LocalMapObject *mapObject);
u8 sub_02069ED4(LocalMapObject *mapObject);
void FollowPokeMapObjectSetParams(LocalMapObject *mapObject, int species, u8 form, BOOL shiny);
void sub_02069F0C(LocalMapObject *mapObject, int species, u8 form, BOOL shiny, int a4);
void FieldSystem_SetFollowPokeParam(FieldSystem *fieldSystem, int species, u8 form, BOOL shiny, u8 gender);
void FieldSystem_SetFollowerPokeParam(FieldSystem *fieldSystem, int species, u8 form, BOOL shiny, u8 gender);
u8 GetFollowPokeSizeParamBySpecies(int species);
int FollowPokeObj_GetSpecies(LocalMapObject *mapObject);
BOOL FollowingPokemon_IsActive(FieldSystem *fieldSystem);

10
include/field_map_object.h
View File

@ -160,8 +160,8 @@ void sub_0205E104(MapObjectManager* manager, u32 a1, u32 a2, u32 num_object_even
MapObjectManager* MapObjectManager_New(u32 count);
LocalMapObject* sub_0205E1D0(MapObjectManager* manager, ObjectEvent* object_events, u32 map_no);
LocalMapObject *CreateSpecialFieldObject(MapObjectManager *objectMan, u32 x, u32 z, u32 direction, u32 sprite, u32 movement, u32 mapNo);
LocalMapObject *CreateSpecialFieldObjectEx(MapObjectManager *mapObjectMan, u32 x, u32 y, u32 direction, u32 a4, u32 a5, u32 mapNo, u32 a7, u32 a8, u32 spriteId);
LocalMapObject* CreateMapObjectFromTemplate(MapObjectManager *mapObjectMan, u16 objectId, u32 numObjects, u32 mapId, const ObjectEvent *templates);
LocalMapObject *CreateSpecialFieldObjectEx(MapObjectManager *mapObjectManager, u32 x, u32 y, u32 direction, u32 a4, u32 a5, u32 mapNo, u32 a7, u32 a8, u32 spriteId);
LocalMapObject* CreateMapObjectFromTemplate(MapObjectManager *mapObjectManager, u16 objectId, u32 numObjects, u32 mapId, const ObjectEvent *templates);
void sub_0205E38C(LocalMapObject* object, u32 sprite_id);
void sub_0205E3AC(LocalMapObject* object, u32 sprite_id);
void MapObject_Remove(LocalMapObject *object);
@ -171,8 +171,8 @@ void MapObjectManager_RemoveAllActiveObjects(MapObjectManager *man);
void sub_0205E4C8(MapObjectManager* manager);
void sub_0205E520(MapObjectManager* manager);
void sub_0205E580(MapObjectManager* manager);
void FieldSystem_SyncMapObjectsToSaveEx(FieldSystem *fieldSystem, MapObjectManager *mapObjectMan, struct SavedMapObject *saveObj, int objNum);
void MapObjectManager_RestoreFromSave(MapObjectManager *mapObjectMan, SavedMapObject *list, u32 numObj);
void FieldSystem_SyncMapObjectsToSaveEx(FieldSystem *fieldSystem, MapObjectManager *mapObjectManager, struct SavedMapObject *saveObj, int objNum);
void MapObjectManager_RestoreFromSave(MapObjectManager *mapObjectManager, SavedMapObject *list, u32 numObj);
void sub_0205E680(FieldSystem* fieldSystem, LocalMapObject* local_object, SavedMapObject* saved_object);
void sub_0205E7C4(LocalMapObject* local_object, SavedMapObject* saved_object);
void sub_0205E8EC(MapObjectManager* manager, LocalMapObject* object);
@ -354,7 +354,7 @@ MapObjectManager* MapObject_GetManager(LocalMapObject* object);
MapObjectManager* sub_0205F364(LocalMapObject* object);
ObjectEvent* sub_0205FA98(u16 id, int num_templates, ObjectEvent* templates);
void sub_0205F338(LocalMapObject* object, SysTask* a1);
BOOL FlagGet(FieldSystem*, u16);
BOOL FieldSystem_FlagGet(FieldSystem*, u16);
u16 ObjectEventTemplate_GetXCoord(ObjectEvent* template);
u32 ObjectEventTemplate_GetHeight(ObjectEvent* template);
u16 ObjectEventTemplate_GetYCoord(ObjectEvent* template);

4
include/field_system.h
View File

@ -123,7 +123,7 @@ struct FieldSystem {
FieldSystemUnkSub2C *unk2C;
MAPMATRIX *mapMatrix;
u8 filler34[0x8];
MapObjectManager *mapObjectMan;
MapObjectManager *mapObjectManager;
PlayerAvatar *playerAvatar;
void *unk_44;
u8 filler48[0xC];
@ -165,7 +165,7 @@ struct FieldSystem {
u8 unk_110;
u8 unk_111[3];
GearPhoneRingManager *unk114;
BUGCONTEST *bugContest;
BugContest *bugContest;
u8 unk11C[0x8];
u32 judgeStatPosition;
}; // size: 0x128

12
include/fieldmap.h
View File

@ -31,12 +31,12 @@ void ScriptRunByIndex(ScriptContext *ctx, int idx);
u8 *LoadScriptsForCurrentMap(u32 mapId);
u32 GetCurrentMapMessageBank(u32 mapId);
u16* GetVarPointer(FieldSystem* fieldSystem, u16 varId);
u16 VarGet(FieldSystem* fieldSystem, u16 varId);
BOOL VarSet(FieldSystem* fieldSystem, u16 varId, u16 value);
u16 VarGetObjectEventGraphicsId(FieldSystem* fieldSystem, u16 objId);
BOOL FlagGet(FieldSystem *fieldSystem, u16 flagId);
void FlagSet(FieldSystem *fieldSystem, u16 flagId);
void FlagClear(FieldSystem *fieldSystem, u16 flagId);
u16 FieldSystem_VarGet(FieldSystem* fieldSystem, u16 varId);
BOOL FieldSystem_VarSet(FieldSystem* fieldSystem, u16 varId, u16 value);
u16 FieldSystem_VarGetObjectEventGraphicsId(FieldSystem* fieldSystem, u16 objId);
BOOL FieldSystem_FlagGet(FieldSystem *fieldSystem, u16 flagId);
void FieldSystem_FlagSet(FieldSystem *fieldSystem, u16 flagId);
void FieldSystem_FlagClear(FieldSystem *fieldSystem, u16 flagId);
void ClearTempFieldEventData(FieldSystem *fieldSystem);
void ClearDailyFlags(FieldSystem *fieldSystem);
void FieldMoveArgsSet(FieldSystem *fieldSystem, u16 v8000, u16 v8001, u16 v8002, u16 v8003);

2
include/map_object_manager.h
View File

@ -3,6 +3,6 @@
#include "field_system.h"
FieldSystem *MapObjectManager_GetFieldSysPtr(MapObjectManager *mapObjectMan);
FieldSystem *MapObjectManager_GetFieldSysPtr(MapObjectManager *mapObjectManager);
#endif //POKEHEARTGOLD_MAP_OBJECT_MANAGER_H

6
include/message_format.h
View File

@ -57,13 +57,13 @@ void BufferStatusName(MessageFormat *messageFormat, u32 fieldno, u32 statusId);
void BufferFlavorDislikeText(MessageFormat *messageFormat, u32 fieldno, u32 flavorId);
void BufferLandmarkName(MessageFormat *messageFormat, u32 fieldno, u32 landmarkId);
void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 fieldno, u32 trainerClassId);
void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, TRAINER *trainer);
void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, Trainer *trainer);
void BufferTrainerName(MessageFormat *messageFormat, u32 fieldno, u32 trainerId);
void BufferFrontierOpponentName(MessageFormat *messageFormat, u32 fieldno, u32 opponentId);
void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, TRAINER *trainer);
void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 fieldno, Trainer *trainer);
void BufferDecorationName(MessageFormat *messageFormat, u32 fieldno, u32 decorationId);
void BufferGenderSymbol(MessageFormat *messageFormat, u32 fieldno, u8 gender);
void BufferPCBoxName(MessageFormat *messageFormat, u32 fieldno, PC_STORAGE *pcStorage, u32 boxno);
void BufferPCBoxName(MessageFormat *messageFormat, u32 fieldno, PCStorage *pcStorage, u32 boxno);
void BufferCountryName(MessageFormat *messageFormat, u32 fieldno, u32 countryId);
void BufferCityName(MessageFormat *messageFormat, u32 fieldno, u32 countryId, u32 cityId);
void BufferSealName(MessageFormat *messageFormat, u32 fieldno, u32 sealId);

2
include/overlay_01_021E90C0.h
View File

@ -16,4 +16,4 @@ void ov01_021E90DC(u32 x, u32 y, FieldEnvSubUnk18 *a2);
BOOL ov01_021E90E4(FieldSystem *fieldSystem, FieldEnvSubUnk18 *a1);
BOOL ov01_021E9374(FieldSystem *fieldSystem, FieldEnvSubUnk18 *a1);
#endif //POKEHEARTGOLD_OVERLAY_01_021E90C0_H
#endif //POKEHEARTGOLD_OVERLAY_01_021E90C0_H

2
include/overlay_02.h
View File

@ -95,7 +95,7 @@ BOOL ov02_02253134(SaveData *saveData);
int ov02_0225316C(void);
BOOL ov02_02253188(SaveData *saveData);
int ov02_022531B4(SaveData *saveData);
BOOL ov02_022470A0(FieldSystem *fieldSystem, BattleSetup **a1);
BOOL ov02_022470A0(FieldSystem *fieldSystem, BattleSetup **setupPtr);
void ov02_BattleExit_HandleRoamerAction(FieldSystem *fieldSystem, BattleSetup *setup);
BOOL ov02_02247374(FieldSystem *fieldSystem, BattleSetup **setup, void *arg2);
void ov02_02247F30(FieldSystem *fieldSystem, u16 mon, u8 level, BOOL shiny, BattleSetup *setup);

2
include/overlay_03.h
View File

@ -19,6 +19,6 @@ u16 ov03_02256A2C(FieldSystem *fieldSystem, MessageFormat *msgFmt, u16 a2);
void ov03_02256710(FieldSystem *fieldSystem, u16 a1);
void ov03_02258910(FieldSystem *fieldSystem);
void ov03_02258CFC(TaskManager *taskManager, enum PokeathlonData data);
int ov03_02256B40(int);
u32 ov03_02256B40(int);
#endif //POKEHEARTGOLD_OVERLAY_03_H

60
include/pokemon_storage_system.h
View File

@ -6,7 +6,7 @@
#include "constants/pokemon.h"
#include "constants/box_wallpaper.h"
typedef struct PokemonStorageSystem PC_STORAGE;
typedef struct PokemonStorageSystem PCStorage;
typedef struct PC_Box {
BoxPokemon mons[MONS_PER_BOX];
@ -25,37 +25,37 @@ struct PokemonStorageSystem {
#define BOX_ALL_MODIFIED_FLAG ((u32)((1<<NUM_BOXES)-1))
void PCStorage_GetBoxName(PC_STORAGE *pcStorage, u32 boxno, String *dest);
BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PC_STORAGE *storage, BoxPokemon *boxMon);
void PCStorage_Init(PC_STORAGE *storage);
void PCStorage_GetBoxName(PCStorage *pcStorage, u32 boxno, String *dest);
BOOL PCStorage_PlaceMonInFirstEmptySlotInAnyBox(PCStorage *storage, BoxPokemon *boxMon);
void PCStorage_Init(PCStorage *storage);
u32 PCStorage_sizeof(void);
void PCStorage_InitializeBoxes(PC_STORAGE *storage);
BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PC_STORAGE* storage, u32 boxno, BoxPokemon *boxMon);
BOOL PCStorage_PlaceMonInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, BoxPokemon *boxMon);
void PCStorage_SwapMonsInBoxByIndexPair(PC_STORAGE* storage, u32 boxno, u32 from, u32 to);
void PCStorage_DeleteBoxMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno);
int PCStorage_GetActiveBox(PC_STORAGE *storage);
int PCStorage_FindFirstBoxWithEmptySlot(PC_STORAGE *storage);
BOOL PCStorage_FindFirstEmptySlot(PC_STORAGE* storage, int* boxno_p, int* slotno_p);
int PCStorage_CountEmptySpotsInAllBoxes(PC_STORAGE* storage);
int PCStorage_CountEmptySpotsInBox(PC_STORAGE* storage, u32 boxno);
void PCStorage_SetActiveBox(PC_STORAGE* storage, u32 boxno);
u8 PCStorage_GetBoxWallpaper(PC_STORAGE* storage, u32 boxno);
void PCStorage_InitializeBoxes(PCStorage *storage);
BOOL PCStorage_PlaceMonInBoxFirstEmptySlot(PCStorage* storage, u32 boxno, BoxPokemon *boxMon);
BOOL PCStorage_PlaceMonInBoxByIndexPair(PCStorage* storage, u32 boxno, u32 slotno, BoxPokemon *boxMon);
void PCStorage_SwapMonsInBoxByIndexPair(PCStorage* storage, u32 boxno, u32 from, u32 to);
void PCStorage_DeleteBoxMonByIndexPair(PCStorage* storage, u32 boxno, u32 slotno);
int PCStorage_GetActiveBox(PCStorage *storage);
int PCStorage_FindFirstBoxWithEmptySlot(PCStorage *storage);
BOOL PCStorage_FindFirstEmptySlot(PCStorage* storage, int* boxno_p, int* slotno_p);
int PCStorage_CountEmptySpotsInAllBoxes(PCStorage* storage);
int PCStorage_CountEmptySpotsInBox(PCStorage* storage, u32 boxno);
void PCStorage_SetActiveBox(PCStorage* storage, u32 boxno);
u8 PCStorage_GetBoxWallpaper(PCStorage* storage, u32 boxno);
BOOL PCStorage_IsValidWallpaperId(u8 wallpaperno);
void PCStorage_SetBoxWallpaper(PC_STORAGE* storage, u32 boxno, u8 wallpaperno);
void PCStorage_SetBoxName(PC_STORAGE* storage, u32 boxno, const String* src);
int PCStorage_CountMonsAndEggsInBox(PC_STORAGE* storage, u32 boxno);
int PCStorage_CountMonsInBox(PC_STORAGE* storage, u32 boxno);
int PCStorage_CountMonsInAllBoxes(PC_STORAGE* storage);
u32 PCStorage_GetMonDataByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno, int attr, void *ptr);
BoxPokemon *PCStorage_GetMonByIndexPair(PC_STORAGE* storage, u32 boxno, u32 slotno);
void PCStorage_UnlockBonusWallpaper(PC_STORAGE* storage, u32 wallpaper);
BOOL PCStorage_IsBonusWallpaperUnlocked(PC_STORAGE* storage, u32 wallpaper);
void PCStorage_SetBoxModified(PC_STORAGE* storage, u8 boxno);
void PCStorage_SetAllBoxesModified(PC_STORAGE* storage);
void PCStorage_ResetBoxModifiedFlags(PC_STORAGE* storage);
u32 PCStorage_GetBoxModifiedFlags(PC_STORAGE* storage);
void PCStorage_SetBoxWallpaper(PCStorage* storage, u32 boxno, u8 wallpaperno);
void PCStorage_SetBoxName(PCStorage* storage, u32 boxno, const String* src);
int PCStorage_CountMonsAndEggsInBox(PCStorage* storage, u32 boxno);
int PCStorage_CountMonsInBox(PCStorage* storage, u32 boxno);
int PCStorage_CountMonsInAllBoxes(PCStorage* storage);
u32 PCStorage_GetMonDataByIndexPair(PCStorage* storage, u32 boxno, u32 slotno, int attr, void *ptr);
BoxPokemon *PCStorage_GetMonByIndexPair(PCStorage* storage, u32 boxno, u32 slotno);
void PCStorage_UnlockBonusWallpaper(PCStorage* storage, u32 wallpaper);
BOOL PCStorage_IsBonusWallpaperUnlocked(PCStorage* storage, u32 wallpaper);
void PCStorage_SetBoxModified(PCStorage* storage, u8 boxno);
void PCStorage_SetAllBoxesModified(PCStorage* storage);
void PCStorage_ResetBoxModifiedFlags(PCStorage* storage);
u32 PCStorage_GetBoxModifiedFlags(PCStorage* storage);
u32 sub_02074120(void);
void sub_02074128(PC_STORAGE* storage);
void sub_02074128(PCStorage* storage);
#endif //POKEHEARTGOLD_POKEMON_STORAGE_SYSTEM_H

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