Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-08 17:16:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #513 from red031000/master

Browse Source 
scrcmd
This commit is contained in:
Akira Akashi
2023-06-22 14:10:06 +01:00
committed by GitHub
parent bcad0c707a 3634c7f807
commit e3bd5535ea
79 changed files with 982 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/asm/scrcmd_10.s
View File

@@ -49,7 +49,7 @@ ScrCmd_Unk01DB: ; 0x02042364
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r1, r4, #0x0
add r2, r6, #0x0
bl ov06_022434D0

2
arm9/asm/scrcmd_3.s
View File

@@ -78,7 +78,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
add r4, r0, #0x0
add r0, r5, #0x0

8
arm9/asm/scrcmd_7.s
View File

@@ -366,7 +366,7 @@ ScrCmd_Unk00E7: ; 0x02041970
add r5, r0, #0x0
ldrh r0, [r4, #0x0]
bl sub_020395F4
bl Field_TrainerIsDoubleBattle
bl TrainerIsDoubleBattle
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bne _020419D2
@@ -430,7 +430,7 @@ ScrCmd_Unk00E8: ; 0x020419F8
add r5, r0, #0x0
ldrh r0, [r4, #0x0]
bl sub_020395F4
bl Field_TrainerIsDoubleBattle
bl TrainerIsDoubleBattle
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bne _02041A5A
@@ -478,7 +478,7 @@ ScrCmd_Unk00E9: ; 0x02041A80
add r5, r0, #0x0
ldrh r0, [r4, #0x0]
bl sub_020395F4
bl Field_TrainerIsDoubleBattle
bl TrainerIsDoubleBattle
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -503,7 +503,7 @@ ScrCmd_Unk00EA: ; 0x02041AB4
ScrCmd_Unk00EB: ; 0x02041AD4
push {r3, lr}
ldr r0, [r0, #0x74]
bl sub_02048498
bl CallFieldTask_BlackOut
mov r0, #0x1
pop {r3, pc}

782
arm9/asm/scrcmd_asm.s
View File

@@ -9,772 +9,6 @@
.text
thumb_func_start ScrCmd_Unk013D
ScrCmd_Unk013D: ; 0x0203D448
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
bl sub_0208881C
mov r0, #0x0
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk013E
ScrCmd_Unk013E: ; 0x0203D458
push {r4, lr}
add r4, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x7c]
bl sub_02052F74
bl sub_02031B50
ldr r1, _0203D478 ; =sub_0203D47C
add r0, r4, #0x0
bl SetupNativeScript
mov r0, #0x1
pop {r4, pc}
nop
_0203D478: .word sub_0203D47C
thumb_func_start sub_0203D47C
sub_0203D47C: ; 0x0203D47C
push {r3, lr}
bl sub_02030F20
cmp r0, #0x2
bge _0203D48A
mov r0, #0x1
pop {r3, pc}
_0203D48A:
mov r0, #0x0
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk013F
ScrCmd_Unk013F: ; 0x0203D490
push {r3-r7, lr}
add r5, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
mov r1, #0xa
bl FieldSysGetAttrAddr
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
str r0, [sp, #0x0]
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl GetVarPointer
add r6, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
mov r1, #0xf
bl FieldSysGetAttrAddr
add r7, r0, #0x0
ldr r0, [r4, #0x0]
bl MapObject_GetID
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
ldr r2, [sp, #0x0]
ldr r0, [r0, #0x78]
ldr r3, [r7, #0x0]
bl sub_02052A10
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
thumb_func_start ScrCmd_Unk02BA
ScrCmd_Unk02BA: ; 0x0203D4E8
push {r3-r5, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl GetVarPointer
add r4, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x78]
bl sub_020527A8
strh r0, [r4, #0x0]
ldrh r0, [r4, #0x0]
cmp r0, #0x0
beq _0203D522
add r5, #0x80
ldr r0, [r5, #0x0]
mov r1, #0x13
bl FieldSysGetAttrAddr
ldr r0, [r0, #0x0]
bl FreeToHeap
_0203D522:
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
thumb_func_start ScrCmd_Unk0140
ScrCmd_Unk0140: ; 0x0203D528
push {r4-r6, lr}
add r4, r0, #0x0
add r0, #0x80
ldr r5, [r0, #0x0]
mov r1, #0xa
add r0, r5, #0x0
bl FieldSysGetAttrAddr
add r6, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
bl GetVarPointer
add r4, r0, #0x0
ldr r0, [r6, #0x0]
bl MapObject_GetID
add r1, r0, #0x0
ldr r0, [r5, #0x78]
bl sub_020524CC
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
thumb_func_start ScrCmd_Unk0146
ScrCmd_Unk0146: ; 0x0203D560
push {r3-r7, lr}
add r4, r0, #0x0
add r0, #0x80
ldr r5, [r0, #0x0]
mov r1, #0xa
add r0, r5, #0x0
bl FieldSysGetAttrAddr
add r6, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r7, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
bl GetVarPointer
add r4, r0, #0x0
ldr r0, [r6, #0x0]
bl MapObject_GetID
add r1, r0, #0x0
ldr r0, [r5, #0x78]
add r2, r7, #0x0
bl sub_02052544
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
thumb_func_start ScrCmd_Unk0141
ScrCmd_Unk0141: ; 0x0203D5B0
push {r4, lr}
add r4, r0, #0x0
bl ScriptReadHalfword
str r0, [r4, #0x64]
ldr r1, _0203D5C8 ; =sub_0203D5CC
add r0, r4, #0x0
bl SetupNativeScript
mov r0, #0x1
pop {r4, pc}
nop
_0203D5C8: .word sub_0203D5CC
thumb_func_start sub_0203D5CC
sub_0203D5CC: ; 0x0203D5CC
push {r4-r6, lr}
add r6, r0, #0x0
add r0, #0x80
ldr r5, [r0, #0x0]
ldr r0, [r5, #0x78]
bl sub_02052604
ldr r1, [r6, #0x64]
add r4, r0, #0x0
lsl r1, r1, #0x10
add r0, r5, #0x0
lsr r1, r1, #0x10
bl GetVarPointer
cmp r4, #0x0
bne _0203D5F0
mov r0, #0x0
pop {r4-r6, pc}
_0203D5F0:
strh r4, [r0, #0x0]
mov r0, #0x1
pop {r4-r6, pc}
.balign 4
thumb_func_start ScrCmd_Unk0142
ScrCmd_Unk0142: ; 0x0203D5F8
push {r3, lr}
add r0, #0x80
ldr r1, [r0, #0x0]
ldr r0, [r1, #0x34]
ldr r1, [r1, #0x7c]
bl sub_020534DC
mov r0, #0x0
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk013A
ScrCmd_Unk013A: ; 0x0203D60C
push {r3, lr}
mov r0, #0x4
bl sub_02052B74
bl sub_02031C2C
mov r0, #0x0
pop {r3, pc}
thumb_func_start ScrCmd_Unk013B
ScrCmd_Unk013B: ; 0x0203D61C
push {r3, lr}
bl sub_02031C64
bl sub_02031B50
mov r0, #0x0
bl sub_02052B74
mov r0, #0x0
pop {r3, pc}
thumb_func_start ScrCmd_Unk0143
ScrCmd_Unk0143: ; 0x0203D630
push {r4-r6, lr}
add r5, r0, #0x0
add r1, r5, #0x0
add r1, #0x80
ldr r4, [r1, #0x0]
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
add r2, r0, #0x0
ldr r0, [r4, #0x78]
add r1, r6, #0x0
bl sub_0205265C
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
thumb_func_start ScrCmd_Unk0144
ScrCmd_Unk0144: ; 0x0203D66C
push {r4, lr}
add r4, r0, #0x0
bl ScriptReadHalfword
str r0, [r4, #0x64]
ldr r1, _0203D684 ; =sub_0203D688
add r0, r4, #0x0
bl SetupNativeScript
mov r0, #0x1
pop {r4, pc}
nop
_0203D684: .word sub_0203D688
thumb_func_start sub_0203D688
sub_0203D688: ; 0x0203D688
push {r3-r5, lr}
add r5, r0, #0x0
ldr r1, [r5, #0x64]
add r0, #0x80
lsl r1, r1, #0x10
ldr r0, [r0, #0x0]
lsr r1, r1, #0x10
bl GetVarPointer
add r4, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x78]
bl sub_02052608
cmp r0, #0x1
blo _0203D6BC
add r5, #0x80
strh r0, [r4, #0x0]
ldr r0, [r5, #0x0]
ldr r0, [r0, #0x78]
bl sub_02052E10
mov r0, #0x1
pop {r3-r5, pc}
_0203D6BC:
mov r0, #0x0
strh r0, [r4, #0x0]
pop {r3-r5, pc}
.balign 4
thumb_func_start ScrCmd_Unk0145
ScrCmd_Unk0145: ; 0x0203D6C4
push {r4, lr}
add r4, r0, #0x0
bl ScriptReadHalfword
str r0, [r4, #0x64]
ldr r1, _0203D6DC ; =sub_0203D6E0
add r0, r4, #0x0
bl SetupNativeScript
mov r0, #0x1
pop {r4, pc}
nop
_0203D6DC: .word sub_0203D6E0
thumb_func_start sub_0203D6E0
sub_0203D6E0: ; 0x0203D6E0
push {r3-r5, lr}
add r5, r0, #0x0
ldr r1, [r5, #0x64]
add r0, #0x80
lsl r1, r1, #0x10
ldr r0, [r0, #0x0]
lsr r1, r1, #0x10
bl GetVarPointer
add r4, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x78]
bl sub_02052648
ldr r1, _0203D724 ; =gSystem
ldr r2, [r1, #0x48]
mov r1, #0x2
tst r1, r2
beq _0203D716
add r5, #0x80
ldr r0, [r5, #0x0]
mov r1, #0x8
ldr r0, [r0, #0x78]
bl sub_02052718
_0203D716:
cmp r0, #0x0
beq _0203D720
strh r0, [r4, #0x0]
mov r0, #0x1
pop {r3-r5, pc}
_0203D720:
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
_0203D724: .word gSystem
thumb_func_start ScrCmd_Unk0153
ScrCmd_Unk0153: ; 0x0203D728
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x10]
bl sub_02049EA4
mov r0, #0x1
pop {r3, pc}
thumb_func_start ScrCmd_Unk0154
ScrCmd_Unk0154: ; 0x0203D738
push {r4-r6, lr}
add r4, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl ScriptEnvironment_GetSavePtr
bl Save_PlayerData_GetProfileAddr
add r4, #0x80
add r5, r0, #0x0
ldr r0, [r4, #0x0]
mov r1, #0xf
bl FieldSysGetAttrAddr
add r4, r0, #0x0
add r0, r5, #0x0
bl PlayerProfile_GetTrainerID
add r6, r0, #0x0
add r0, r5, #0x0
bl PlayerProfile_GetTrainerGender
add r1, r0, #0x0
ldr r2, [r4, #0x0]
add r0, r6, #0x0
bl sub_0205363C
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
thumb_func_start ScrCmd_Unk0155
ScrCmd_Unk0155: ; 0x0203D774
push {r3-r7, lr}
add r4, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl ScriptEnvironment_GetSavePtr
bl Save_PlayerData_GetProfileAddr
add r5, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r7, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
bl GetVarPointer
add r4, r0, #0x0
add r0, r5, #0x0
bl PlayerProfile_GetTrainerID
add r6, r0, #0x0
add r0, r5, #0x0
bl PlayerProfile_GetTrainerGender
add r1, r0, #0x0
add r0, r6, #0x0
add r2, r7, #0x0
bl sub_02053678
strh r0, [r4, #0x0]
add r0, r5, #0x0
bl PlayerProfile_GetTrainerGender
ldrh r1, [r4, #0x0]
mov r2, #0x2
bl sub_020536D0
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
thumb_func_start ScrCmd_Unk029C
ScrCmd_Unk029C: ; 0x0203D7DC
push {r3-r7, lr}
add r4, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl ScriptEnvironment_GetSavePtr
bl Save_PlayerData_GetProfileAddr
add r5, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r7, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
bl GetVarPointer
add r4, r0, #0x0
add r0, r5, #0x0
bl PlayerProfile_GetTrainerID
add r6, r0, #0x0
add r0, r5, #0x0
bl PlayerProfile_GetTrainerGender
add r1, r0, #0x0
add r0, r6, #0x0
add r2, r7, #0x0
bl sub_02053678
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
thumb_func_start ScrCmd_Unk0156
ScrCmd_Unk0156: ; 0x0203D834
push {r3-r5, lr}
add r5, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl ScriptEnvironment_GetSavePtr
bl Save_PlayerData_GetProfileAddr
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
add r1, r0, #0x0
lsl r1, r1, #0x18
add r0, r4, #0x0
lsr r1, r1, #0x18
bl PlayerProfile_SetAvatar
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
thumb_func_start ScrCmd_Unk014B
ScrCmd_Unk014B: ; 0x0203D868
push {r3, lr}
ldr r0, [r0, #0x74]
bl sub_02048498
mov r0, #0x1
pop {r3, pc}
thumb_func_start ScrCmd_Unk014C
ScrCmd_Unk014C: ; 0x0203D874
push {r3-r5, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r5, #0x80
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl Save_LocalFieldData_Get
add r1, r4, #0x0
bl sub_02034E04
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
thumb_func_start ScrCmd_GetPlayerGender
ScrCmd_GetPlayerGender: ; 0x0203D8A0
push {r3-r5, lr}
add r5, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl ScriptEnvironment_GetSavePtr
bl Save_PlayerData_GetProfileAddr
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl GetVarPointer
add r5, r0, #0x0
add r0, r4, #0x0
bl PlayerProfile_GetTrainerGender
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
thumb_func_start ScrCmd_HealParty
ScrCmd_HealParty: ; 0x0203D8D0
push {r3, lr}
ldr r0, [r0, #0x74]
bl sub_02046528
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl HealParty
mov r0, #0x0
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk014F
ScrCmd_Unk014F: ; 0x0203D8E8
mov r0, #0x0
bx lr
thumb_func_start ScrCmd_Unk0150
ScrCmd_Unk0150: ; 0x0203D8EC
push {r4, lr}
add r4, r0, #0x0
bl sub_02050024
ldr r1, _0203D900 ; =sub_0203D904
add r0, r4, #0x0
bl SetupNativeScript
mov r0, #0x1
pop {r4, pc}
.balign 4
_0203D900: .word sub_0203D904
thumb_func_start sub_0203D904
sub_0203D904: ; 0x0203D904
push {r3, lr}
bl sub_02031810
cmp r0, #0x1
beq _0203D91A
bl sub_0202EDF8
cmp r0, #0x1
beq _0203D91A
mov r0, #0x1
pop {r3, pc}
_0203D91A:
mov r0, #0x0
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk02BB
ScrCmd_Unk02BB: ; 0x0203D920
push {r4, lr}
add r4, r0, #0x0
bl sub_02050048
ldr r1, _0203D934 ; =sub_0203D904
add r0, r4, #0x0
bl SetupNativeScript
mov r0, #0x1
pop {r4, pc}
.balign 4
_0203D934: .word sub_0203D904
thumb_func_start ScrCmd_Unk0151
ScrCmd_Unk0151: ; 0x0203D938
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
bl sub_0204FF5C
mov r0, #0x0
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk0152
ScrCmd_Unk0152: ; 0x0203D948
push {r3, lr}
bl ScriptReadHalfword
bl sub_0204F6DC
mov r0, #0x0
pop {r3, pc}
.balign 4
thumb_func_start ScrCmd_Unk017A
ScrCmd_Unk017A: ; 0x0203D958
push {r4-r6, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl GetVarPointer
add r5, #0x80
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl Save_Bag_Get
add r1, r6, #0x0
bl Bag_PocketNotEmpty
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
thumb_func_start ScrCmd_Unk0186
ScrCmd_Unk0186: ; 0x0203D998
push {r4-r6, lr}
add r5, r0, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r5, #0x80
add r3, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r4, #0x0
add r2, r6, #0x0
bl sub_02034B74
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
thumb_func_start ScrCmd_Unk0187
ScrCmd_Unk0187: ; 0x0203D9E8
push {r4-r7, lr}
sub sp, #0xc
add r5, r0, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
str r0, [sp, #0x4]
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
str r0, [sp, #0x8]
add r0, r5, #0x0
bl ScriptReadHalfword
add r1, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
add r5, #0x80
add r4, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r6, #0x0
ldr r0, [r0, #0x34]
bl sub_02058060
ldr r2, [sp, #0x4]
ldr r3, [sp, #0x8]
add r5, r0, #0x0
add r1, r7, #0x0
str r4, [sp, #0x0]
bl sub_02058E28
add r0, r5, #0x0
bl sub_02059D1C
mov r0, #0x0
add sp, #0xc
pop {r4-r7, pc}
.balign 4
thumb_func_start ScrCmd_Unk0188
ScrCmd_Unk0188: ; 0x0203DA78
push {r3-r5, lr}
@@ -797,7 +31,7 @@ ScrCmd_Unk0188: ; 0x0203DA78
add r2, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r4, #0x0
bl sub_02034BDC
bl SetObjectEventMovement
mov r0, #0x0
pop {r3-r5, pc}
@@ -922,7 +156,7 @@ ScrCmd_Unk018C: ; 0x0203DB88
ldr r0, [r5, #0x0]
add r1, r6, #0x0
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r5, r0, #0x0
bne _0203DBC6
bl GF_AssertFail
@@ -1345,7 +579,7 @@ ScrCmd_Unk01B1: ; 0x0203DEC4
bl VarGet
add r1, r0, #0x0
ldr r0, [r5, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r4, r0, #0x0
bne _0203DEEC
bl GF_AssertFail
@@ -1370,7 +604,7 @@ ScrCmd_Unk01B2: ; 0x0203DEF8
bl VarGet
add r1, r0, #0x0
ldr r0, [r5, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r4, r0, #0x0
bne _0203DF20
bl GF_AssertFail
@@ -2952,7 +2186,7 @@ ScrCmd_GiveWallpaper: ; 0x0203EBE4
add r0, #0x80
ldr r6, [r0, #0x0]
add r0, r6, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
str r0, [sp, #0x4]
add r0, r5, #0x0
@@ -3582,7 +2816,7 @@ ScrCmd_Unk0269: ; 0x0203F07C
ldr r0, [r0, #0x0]
add r1, r7, #0x0
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r7, r0, #0x0
bne _0203F0FA
bl GF_AssertFail
@@ -3630,7 +2864,7 @@ ScrCmd_Unk026A: ; 0x0203F110
ldr r0, [r0, #0x0]
add r1, r5, #0x0
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r5, r0, #0x0
bne _0203F164
bl GF_AssertFail
@@ -4994,7 +4228,7 @@ ScrCmd_Unk02B6: ; 0x0203FC1C
ldr r0, [r5, #0x0]
ldrb r4, [r2, #0x0]
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r5, r0, #0x0
bne _0203FC4C
bl GF_AssertFail

8
arm9/asm/unk_02034A28.s
View File

@@ -203,8 +203,8 @@ sub_02034B6C: ; 0x02034B6C
bx lr
.balign 4
thumb_func_start sub_02034B74
sub_02034B74: ; 0x02034B74
thumb_func_start SetObjectEventXYPos
SetObjectEventXYPos: ; 0x02034B74
push {r3-r7, lr}
ldr r0, [r0, #0x14]
add r4, r1, #0x0
@@ -265,8 +265,8 @@ _02034BD4:
mov r0, #0x0
pop {r4-r6, pc}
thumb_func_start sub_02034BDC
sub_02034BDC: ; 0x02034BDC
thumb_func_start SetObjectEventMovement
SetObjectEventMovement: ; 0x02034BDC
push {r4-r6, lr}
ldr r0, [r0, #0x14]
mov r3, #0x0

4
arm9/asm/unk_02034D7C.s
View File

@@ -109,8 +109,8 @@ sub_02034DFC: ; 0x02034DFC
bx lr
.balign 4
thumb_func_start sub_02034E04
sub_02034E04: ; 0x02034E04
thumb_func_start LocalFieldData_SetBlackoutSpawn
LocalFieldData_SetBlackoutSpawn: ; 0x02034E04
add r0, #0x68
strh r1, [r0, #0x0]
bx lr

66
arm9/asm/unk_02035068.s
View File

@@ -387,7 +387,7 @@ _020352E0: .word 0x00000191
sub_020352E4: ; 0x020352E4
push {r4-r6, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -588,7 +588,7 @@ sub_0203549C: ; 0x0203549C
push {r3-r7, lr}
sub sp, #0x30
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp, #0x1c]
add r0, r4, #0x0
bl sub_0204652C
@@ -912,7 +912,7 @@ sub_02035734: ; 0x02035734
push {r3-r7, lr}
sub sp, #0x20
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1071,7 +1071,7 @@ _0203589C: .word 0x00000143
sub_020358A0: ; 0x020358A0
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1102,7 +1102,7 @@ _020358E0:
sub_020358E4: ; 0x020358E4
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -1581,7 +1581,7 @@ sub_02035CA0: ; 0x02035CA0
cmp r0, #0x0
beq _02035CD8
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
add r4, r0, #0x0
@@ -1605,7 +1605,7 @@ _02035CD8:
sub_02035CDC: ; 0x02035CDC
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1654,7 +1654,7 @@ sub_02035D34: ; 0x02035D34
push {r3-r7, lr}
sub sp, #0x8
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -1718,7 +1718,7 @@ _02035DC4: .word sub_02035DC8
sub_02035DC8: ; 0x02035DC8
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -1760,7 +1760,7 @@ _02035E18: .word sub_02035E1C
sub_02035E1C: ; 0x02035E1C
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -1787,7 +1787,7 @@ sub_02035E50: ; 0x02035E50
push {r4-r7, lr}
sub sp, #0xc
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -2290,7 +2290,7 @@ _020362A4: .word sub_020362A8
sub_020362A8: ; 0x020362A8
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2320,7 +2320,7 @@ sub_020362E4: ; 0x020362E4
push {r3-r7, lr}
sub sp, #0x18
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -2586,7 +2586,7 @@ sub_02036534: ; 0x02036534
push {r3-r5, lr}
sub sp, #0x8
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2623,7 +2623,7 @@ _02036580: .word sub_02036584
sub_02036584: ; 0x02036584
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2675,7 +2675,7 @@ sub_020365F0: ; 0x020365F0
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
ldr r0, [r0, #0xc]
bl Save_FileDoesNotBelongToPlayer
cmp r0, #0x0
@@ -2712,7 +2712,7 @@ _02036640: .word 0x000007D5
sub_02036644: ; 0x02036644
push {r4-r6, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2764,7 +2764,7 @@ _020366A4: .word sub_020366A8
sub_020366A8: ; 0x020366A8
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2786,7 +2786,7 @@ _020366D0: .word sub_020366D4
sub_020366D4: ; 0x020366D4
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2826,7 +2826,7 @@ sub_02036724: ; 0x02036724
push {r3-r5, lr}
sub sp, #0x8
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2867,7 +2867,7 @@ sub_0203677C: ; 0x0203677C
push {r3-r5, lr}
sub sp, #0x8
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -2916,7 +2916,7 @@ _020367CA:
sub_020367E8: ; 0x020367E8
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -2959,7 +2959,7 @@ _02036848: .word 0x00002275
sub_0203684C: ; 0x0203684C
push {r3-r7, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -3086,7 +3086,7 @@ sub_0203695C: ; 0x0203695C
sub sp, #0xc
add r5, r0, #0x0
add r4, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp, #0x4]
add r0, r5, #0x0
bl sub_0204652C
@@ -3169,7 +3169,7 @@ _02036A10: .word sub_02036A14
sub_02036A14: ; 0x02036A14
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -3214,7 +3214,7 @@ _02036A74: .word sub_020362E4
sub_02036A78: ; 0x02036A78
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -3245,7 +3245,7 @@ sub_02036AB8: ; 0x02036AB8
push {r3-r7, lr}
sub sp, #0x8
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -3343,7 +3343,7 @@ _02036B8C: .word sub_020638BC
sub_02036B90: ; 0x02036B90
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -3382,7 +3382,7 @@ sub_02036BC4: ; 0x02036BC4
sub_02036BDC: ; 0x02036BDC
push {r4-r6, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -3582,7 +3582,7 @@ _02036D90: .word sub_02035E50
sub_02036D94: ; 0x02036D94
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -3611,7 +3611,7 @@ _02036DD0: .word sub_020362E4
sub_02036DD4: ; 0x02036DD4
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -3637,7 +3637,7 @@ sub_02036E08: ; 0x02036E08
push {r3-r7, lr}
sub sp, #0x48
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -3757,7 +3757,7 @@ _02036EF2:
sub_02036F1C: ; 0x02036F1C
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C

4
arm9/asm/unk_020372D4.s
View File

@@ -632,7 +632,7 @@ sub_020377A8: ; 0x020377A8
ldr r0, [r0, #0x8]
bx lr
thumb_func_start ScriptEnvironment_GetSavePtr
ScriptEnvironment_GetSavePtr: ; 0x020377AC
thumb_func_start FieldSystem_GetSaveDataPtr
FieldSystem_GetSaveDataPtr: ; 0x020377AC
ldr r0, [r0, #0xc]
bx lr

50
arm9/asm/unk_020377F0.s
View File

@@ -554,7 +554,7 @@ sub_02037A78: ; 0x02037A78
sub_02037A7C: ; 0x02037A7C
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -654,7 +654,7 @@ sub_02037B44: ; 0x02037B44
push {r3-r7, lr}
add r5, r1, #0x0
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0xc
@@ -696,7 +696,7 @@ sub_02037B44: ; 0x02037B44
ldr r1, _02037BAC ; =sub_02037A7C
add r0, r7, #0x0
str r5, [r4, #0x4]
bl sub_0204640C
bl TaskManager_Call
add r0, r5, #0x0
pop {r3-r7, pc}
.balign 4
@@ -921,7 +921,7 @@ sub_02037D70: ; 0x02037D70
bl sub_0204652C
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
ldr r1, [r4, #0x0]
cmp r1, #0x0
beq _02037D9A
@@ -1002,7 +1002,7 @@ sub_02037E18: ; 0x02037E18
str r1, [sp, #0x4]
add r5, r2, #0x0
add r6, r3, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
mov r0, #0x20
mov r1, #0x10
@@ -1037,7 +1037,7 @@ _02037E6C:
ldr r0, [sp, #0x0]
ldr r1, _02037E7C ; =sub_02037D70
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
add sp, #0x8
pop {r3-r7, pc}
nop
@@ -1115,7 +1115,7 @@ sub_02037EF8: ; 0x02037EF8
bl AllocFromHeapAtEnd
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetOptionsAddr
add r1, r0, #0x0
add r0, r5, #0x0
@@ -1140,7 +1140,7 @@ sub_02037F2C: ; 0x02037F2C
add r4, r1, #0x0
add r6, r2, #0x0
add r7, r3, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
mov r1, #0xb
str r1, [sp, #0x0]
add r1, r4, #0x0
@@ -1164,13 +1164,13 @@ sub_02037F58: ; 0x02037F58
add r6, r3, #0x0
cmp r5, #0x3
bne _02037F74
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r1, r4, #0x0
add r2, r6, #0x0
bl sub_020855B0
b _02037F82
_02037F74:
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r1, r5, #0x0
add r2, r4, #0x0
add r3, r6, #0x0
@@ -1189,7 +1189,7 @@ sub_02037F90: ; 0x02037F90
add r4, r1, #0x0
add r6, r2, #0x0
add r5, r0, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r1, r4, #0x0
add r2, r6, #0x0
bl sub_02085578
@@ -1216,7 +1216,7 @@ sub_02037FC4: ; 0x02037FC4
push {r3-r5, lr}
add r5, r1, #0x0
add r4, r0, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r1, r5, #0x0
bl sub_02087D00
add r5, r0, #0x0
@@ -1295,7 +1295,7 @@ sub_0203800C: ; 0x0203800C
sub_02038070: ; 0x02038070
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1373,7 +1373,7 @@ _020380E8:
add r0, r6, #0x0
add r2, r4, #0x0
str r5, [r4, #0x4]
bl sub_0204640C
bl TaskManager_Call
add sp, #0x8
pop {r3-r7, pc}
nop
@@ -1490,7 +1490,7 @@ sub_020381FC: ; 0x020381FC
push {r4-r7, lr}
sub sp, #0x34
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -1725,7 +1725,7 @@ sub_020383D8: ; 0x020383D8
str r0, [r2, #0x0]
ldr r1, _020383F4 ; =sub_020381FC
add r0, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
.balign 4
_020383F4: .word sub_020381FC
@@ -1800,7 +1800,7 @@ _02038478: .word UNK_020F2D54
sub_0203847C: ; 0x0203847C
push {r3-r7, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1904,7 +1904,7 @@ _02038548: .word UNK_020FA5FC
sub_0203854C: ; 0x0203854C
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -1971,7 +1971,7 @@ CreateNamingScreen: ; 0x020385CC
str r2, [sp, #0x8]
str r3, [sp, #0xc]
ldr r5, [sp, #0x2c]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
mov r0, #0xb
mov r1, #0x14
@@ -2040,7 +2040,7 @@ _0203866E:
ldr r0, [sp, #0x4]
ldr r1, _0203867C ; =sub_0203847C
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
add sp, #0x10
pop {r3-r7, pc}
.balign 4
@@ -2373,7 +2373,7 @@ sub_02038914: ; 0x02038914
push {r4-r7, lr}
sub sp, #0xc
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
@@ -2455,7 +2455,7 @@ sub_020389CC: ; 0x020389CC
push {r3-r7, lr}
add r7, r0, #0x0
add r6, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetOptionsAddr
@@ -2492,7 +2492,7 @@ sub_020389CC: ; 0x020389CC
ldr r1, _02038A38 ; =sub_02038914
add r0, r7, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
.balign 4
_02038A38: .word sub_02038914
@@ -2574,7 +2574,7 @@ _02038ACA:
sub_02038AD0: ; 0x02038AD0
push {r4, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r2, r0, #0x0
ldr r1, [r2, #0xc]
ldr r2, [r2, #0x8]
@@ -2583,7 +2583,7 @@ sub_02038AD0: ; 0x02038AD0
add r2, r0, #0x0
ldr r1, _02038AF0 ; =sub_02038AB0
add r0, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
.balign 4
_02038AF0: .word sub_02038AB0

38
arm9/asm/unk_02038C78.s
View File

@@ -249,17 +249,17 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_ReleaseAllEvents
.word ScrCmd_LockEvent
.word ScrCmd_ReleaseEvent
.word ScrCmd_AddOverworldEvent
.word ScrCmd_RemoveOverworldEvent
.word ScrCmd_AddObjectEvent
.word ScrCmd_RemoveObjectEvent
.word ScrCmd_LockCamera
.word ScrCmd_ReleaseCamera
.word ScrCmd_FacePlayer
.word ScrCmd_GetPlayerPosition
.word ScrCmd_GetOverworldEventPosition
.word ScrCmd_GetObjectEventPosition
.word ScrCmd_Unk006B
.word ScrCmd_KeepOverworldEvent
.word ScrCmd_SetOverworldEventMovement
.word ScrCmd_OverworldEventStopFollowing
.word ScrCmd_KeepObjectEvent
.word ScrCmd_SetObjectEventMovement
.word ScrCmd_ObjectEventStopFollowing
.word ScrCmd_GiveMoney
.word ScrCmd_TakeMoneyImmediate
.word ScrCmd_HasEnoughMoneyImmediate
@@ -480,8 +480,8 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_SpecialMart
.word ScrCmd_GoodsMart
.word ScrCmd_SealsMart
.word ScrCmd_Unk014B
.word ScrCmd_Unk014C
.word ScrCmd_DummyBlackOut
.word ScrCmd_SetSpawn
.word ScrCmd_GetPlayerGender
.word ScrCmd_HealParty
.word ScrCmd_Unk014F
@@ -491,7 +491,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0153
.word ScrCmd_Unk0154
.word ScrCmd_Unk0155
.word ScrCmd_Unk0156
.word ScrCmd_SetPlayerAvatar
.word ScrCmd_HasSinnohDex
.word ScrCmd_GiveSinnohDex
.word ScrCmd_HasRunningShoes
@@ -527,7 +527,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_CountPartyMons
.word ScrCmd_ShowBagScreen
.word ScrCmd_GetBagScreenSelection
.word ScrCmd_Unk017A
.word ScrCmd_CheckPocketNotEmpty
.word ScrCmd_GetBerryName
.word ScrCmd_GetNatureName
.word ScrCmd_GetBerryTreeGrowth
@@ -539,8 +539,8 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_SetBerryTreeType
.word ScrCmd_Unk0184
.word ScrCmd_TakeBerryTreeBerries
.word ScrCmd_Unk0186
.word ScrCmd_Unk0187
.word ScrCmd_SetObjectEventSpawnPosition
.word ScrCmd_MoveObjectEvent
.word ScrCmd_Unk0188
.word ScrCmd_Unk0189
.word ScrCmd_Unk018A
@@ -834,7 +834,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk02AA
.word ScrCmd_Unk02AB
.word ScrCmd_Unk02AC
.word ScrCmd_GetOverworldEventMovement
.word ScrCmd_GetObjectEventMovement
.word ScrCmd_Unk02AE
.word ScrCmd_Unk02AF
.word ScrCmd_Unk02B0
@@ -930,7 +930,7 @@ sub_02038CD8: ; 0x02038CD8
add r7, r1, #0x0
str r2, [sp, #0x4]
add r5, r3, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp, #0x8]
bl CreateFieldContext
add r4, r0, #0x0
@@ -943,7 +943,7 @@ sub_02038CD8: ; 0x02038CD8
ldr r1, _02038D0C ; =sub_02038D48
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
add sp, #0xc
pop {r4-r7, pc}
.balign 4
@@ -956,7 +956,7 @@ sub_02038D10: ; 0x02038D10
add r5, r0, #0x0
add r6, r1, #0x0
add r7, r2, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp, #0x4]
bl CreateFieldContext
add r4, r0, #0x0
@@ -984,7 +984,7 @@ sub_02038D48: ; 0x02038D48
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
ldrb r1, [r4, #0x4]
str r0, [sp, #0x0]
cmp r1, #0x0
@@ -2139,8 +2139,8 @@ _02039622:
nop
_02039628: .word 0x00001388
thumb_func_start Field_TrainerIsDoubleBattle
Field_TrainerIsDoubleBattle: ; 0x0203962C
thumb_func_start TrainerIsDoubleBattle
TrainerIsDoubleBattle: ; 0x0203962C
push {r3, lr}
mov r1, #0x9
bl TrainerData_GetAttr

4
arm9/asm/unk_02046030.s
View File

@@ -28,7 +28,7 @@ sub_02046030: ; 0x02046030
strb r0, [r2, #0xb]
ldr r0, [r4, #0x10]
ldr r1, _02046064 ; =sub_02046068
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
nop
_02046064: .word sub_02046068
@@ -38,7 +38,7 @@ sub_02046068: ; 0x02046068
push {r4-r6, lr}
sub sp, #0x38
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C

56
arm9/asm/unk_0204653C.s
View File

@@ -7,7 +7,7 @@
sub_0204653C: ; 0x0204653C
push {r4-r6, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -42,12 +42,12 @@ _02046580:
thumb_func_start sub_02046584
sub_02046584: ; 0x02046584
ldr r3, _0204658C ; =sub_0204640C
ldr r3, _0204658C ; =TaskManager_Call
add r2, r1, #0x0
ldr r1, _02046590 ; =sub_0204653C
bx r3
.balign 4
_0204658C: .word sub_0204640C
_0204658C: .word TaskManager_Call
_02046590: .word sub_0204653C
thumb_func_start sub_02046594
@@ -115,7 +115,7 @@ _020465F4:
sub_020465F8: ; 0x020465F8
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -247,7 +247,7 @@ sub_020466FC: ; 0x020466FC
add r2, r0, #0x0
ldr r1, _02046718 ; =sub_020465F8
add r0, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
.balign 4
_02046718: .word sub_020465F8
@@ -291,7 +291,7 @@ _02046754:
sub_02046758: ; 0x02046758
push {r3-r7, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -371,7 +371,7 @@ _020467F6:
sub_020467FC: ; 0x020467FC
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -430,7 +430,7 @@ _02046874:
sub_02046878: ; 0x02046878
push {r3-r7, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -525,7 +525,7 @@ sub_02046928: ; 0x02046928
add r2, r0, #0x0
ldr r1, _02046944 ; =sub_02046878
add r0, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
.balign 4
_02046944: .word sub_02046878
@@ -536,7 +536,7 @@ sub_02046948: ; 0x02046948
add r4, r1, #0x0
add r7, r0, #0x0
add r5, r2, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r1, r0, #0x0
add r0, r4, #0x0
bl ov06_02244558
@@ -682,7 +682,7 @@ _02046A84: .word sub_02046A88
sub_02046A88: ; 0x02046A88
push {r4-r6, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -757,7 +757,7 @@ _02046AFE:
add r5, #0x90
ldr r0, [r5, #0x0]
bl sub_0205DD40
ldr r1, _02046C18 ; =sub_0204837C
ldr r1, _02046C18 ; =FieldTask_BlackOut
add r0, r6, #0x0
mov r2, #0x0
bl sub_020463EC
@@ -862,14 +862,14 @@ _02046C12:
mov r0, #0x0
pop {r4-r6, pc}
nop
_02046C18: .word sub_0204837C
_02046C18: .word FieldTask_BlackOut
thumb_func_start sub_02046C1C
sub_02046C1C: ; 0x02046C1C
push {r4-r7, lr}
sub sp, #0xc
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -1058,7 +1058,7 @@ SetupAndStartHoneyTreeBattle: ; 0x02046DB4
push {r3-r7, lr}
add r7, r0, #0x0
add r6, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, #0x90
ldr r0, [r0, #0x0]
@@ -1104,7 +1104,7 @@ SetupAndStartWildBattle: ; 0x02046E18
add r7, r1, #0x0
str r2, [sp, #0x8]
add r6, r3, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, #0x90
ldr r0, [r0, #0x0]
@@ -1152,7 +1152,7 @@ _02046E60:
sub_02046E8C: ; 0x02046E8C
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -1287,7 +1287,7 @@ SetupAndStartFirstBattle: ; 0x02046FA0
str r0, [sp, #0x4]
add r6, r1, #0x0
add r7, r2, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
mov r0, #0xb
mov r1, #0x0
@@ -1331,7 +1331,7 @@ sub_02047004: ; 0x02047004
bl sub_0204652C
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02046530
@@ -1413,7 +1413,7 @@ _020470A6:
SetupAndStartTutorialBattle: ; 0x020470AC
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r1, r0, #0x0
mov r0, #0xb
bl sub_02047814
@@ -1430,7 +1430,7 @@ SetupAndStartTutorialBattle: ; 0x020470AC
add r2, r0, #0x0
ldr r1, _020470E4 ; =sub_02047004
add r0, r5, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
nop
_020470E4: .word sub_02047004
@@ -1443,7 +1443,7 @@ sub_020470E8: ; 0x020470E8
add r6, r1, #0x0
add r5, r2, #0x0
str r3, [sp, #0x8]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
cmp r5, #0x0
beq _02047110
@@ -1508,7 +1508,7 @@ sub_02047174: ; 0x02047174
add r5, r2, #0x0
add r7, r0, #0x0
add r4, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
mov r0, #0xb
add r1, r5, #0x0
@@ -1530,7 +1530,7 @@ sub_02047174: ; 0x02047174
add r2, r0, #0x0
ldr r1, _020471BC ; =sub_02046758
add r0, r7, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
nop
_020471BC: .word sub_02046758
@@ -1542,7 +1542,7 @@ sub_020471C0: ; 0x020471C0
add r5, r1, #0x0
add r6, r2, #0x0
add r4, r3, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
cmp r4, #0x0
beq _020471DE
@@ -1574,7 +1574,7 @@ _020471E6:
ldr r0, [sp, #0x0]
ldr r1, _0204721C ; =sub_020467FC
str r5, [r2, #0xc]
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
nop
_0204721C: .word sub_020467FC
@@ -1583,7 +1583,7 @@ _0204721C: .word sub_020467FC
sub_02047220: ; 0x02047220
push {r3-r7, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1601,7 +1601,7 @@ _02047246:
ldr r1, _02047268 ; =sub_02046758
add r0, r5, #0x0
add r2, r7, #0x0
bl sub_0204640C
bl TaskManager_Call
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]

22
arm9/asm/unk_02048120.s
View File

@@ -96,7 +96,7 @@ _0204817A:
add r1, #0xc
bl AddWindow
add r0, r5, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
add r2, r0, #0x0
ldr r0, [r4, #0x20]
@@ -126,7 +126,7 @@ _020481F2:
ldr r1, _02048210 ; =sub_02048214
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
nop
_02048208: .word UNK_020F4628
@@ -305,12 +305,12 @@ sub_020482F4: ; 0x020482F4
.balign 4
_02048378: .word 0x000F0200
thumb_func_start sub_0204837C
sub_0204837C: ; 0x0204837C
thumb_func_start FieldTask_BlackOut
FieldTask_BlackOut: ; 0x0204837C
push {r3-r7, lr}
sub sp, #0x18
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02046530
@@ -437,12 +437,12 @@ _02048488:
_02048490: .word 0x000007E4
_02048494: .word 0x000007E5
thumb_func_start sub_02048498
sub_02048498: ; 0x02048498
ldr r3, _020484A0 ; =sub_0204640C
ldr r1, _020484A4 ; =sub_0204837C
thumb_func_start CallFieldTask_BlackOut
CallFieldTask_BlackOut: ; 0x02048498
ldr r3, _020484A0 ; =TaskManager_Call
ldr r1, _020484A4 ; =FieldTask_BlackOut
mov r2, #0x0
bx r3
.balign 4
_020484A0: .word sub_0204640C
_020484A4: .word sub_0204837C
_020484A0: .word TaskManager_Call
_020484A4: .word FieldTask_BlackOut

6
arm9/asm/unk_020484A8.s
View File

@@ -63,7 +63,7 @@ sub_020484F8: ; 0x020484F8
push {r4-r7, lr}
sub sp, #0xc
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -258,7 +258,7 @@ CallTask_GameClear: ; 0x02048694
push {r4-r7, lr}
sub sp, #0xc
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
mov r0, #0x20
mov r1, #0x3c
@@ -327,7 +327,7 @@ _0204871E:
ldr r1, _02048760 ; =sub_020484F8
add r0, r7, #0x0
add r2, r5, #0x0
bl sub_0204640C
bl TaskManager_Call
add sp, #0xc
pop {r4-r7, pc}
.balign 4

80
arm9/asm/unk_02048904.s
View File

@@ -243,7 +243,7 @@ _02048AB4:
lsr r1, r0, #0x10
beq _02048ACA
ldr r0, [sp, #0x4]
bl sub_02034E04
bl LocalFieldData_SetBlackoutSpawn
_02048ACA:
add r0, r5, #0x0
mov r1, #0x2
@@ -551,7 +551,7 @@ sub_02048D04: ; 0x02048D04
sub_02048D34: ; 0x02048D34
push {r4-r6, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_02046530
@@ -612,7 +612,7 @@ _02048DA8: .word sub_02048D34
sub_02048DAC: ; 0x02048DAC
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_Flags_Get
@@ -749,7 +749,7 @@ _02048ED8: .word sub_02048DAC
sub_02048EDC: ; 0x02048EDC
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -909,7 +909,7 @@ _02049034: .word sub_02048EDC
sub_02049038: ; 0x02049038
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -991,7 +991,7 @@ sub_020490C0: ; 0x020490C0
ldr r1, _020490EC ; =sub_02049038
str r0, [r3, #0x0]
add r0, r5, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r5, pc}
.balign 4
_020490EC: .word sub_02049038
@@ -1000,7 +1000,7 @@ _020490EC: .word sub_02049038
sub_020490F0: ; 0x020490F0
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -1054,7 +1054,7 @@ sub_02049160: ; 0x02049160
push {r3-r7, lr}
add r6, r0, #0x0
add r5, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
mov r0, #0xb
mov r1, #0x18
@@ -1079,7 +1079,7 @@ _02049186:
str r0, [r2, #0x0]
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
.balign 4
_020491A4: .word sub_020490F0
@@ -1104,7 +1104,7 @@ sub_020491A8: ; 0x020491A8
sub_020491C4: ; 0x020491C4
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1184,7 +1184,7 @@ CallTask_ScriptWarp: ; 0x02049240
ldr r1, _02049270 ; =sub_020491C4
str r0, [r2, #0x14]
add r0, r7, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
.balign 4
_02049270: .word sub_020491C4
@@ -1265,7 +1265,7 @@ _02049300: .word sub_02049304
sub_02049304: ; 0x02049304
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -1333,12 +1333,12 @@ _02049390:
thumb_func_start sub_02049394
sub_02049394: ; 0x02049394
ldr r3, _0204939C ; =sub_0204640C
ldr r3, _0204939C ; =TaskManager_Call
ldr r1, _020493A0 ; =sub_020493A4
mov r2, #0x0
bx r3
.balign 4
_0204939C: .word sub_0204640C
_0204939C: .word TaskManager_Call
_020493A0: .word sub_020493A4
thumb_func_start sub_020493A4
@@ -1375,7 +1375,7 @@ sub_020493D0: ; 0x020493D0
add r2, r0, #0x0
ldr r1, _020493E4 ; =sub_020493E8
add r0, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
.balign 4
_020493E4: .word sub_020493E8
@@ -1387,7 +1387,7 @@ sub_020493E8: ; 0x020493E8
bl sub_02046530
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
ldr r1, [r4, #0x0]
cmp r1, #0x0
beq _02049408
@@ -1422,7 +1422,7 @@ _0204942C:
sub_02049430: ; 0x02049430
push {r4-r6, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -1443,7 +1443,7 @@ _02049452:
ldr r1, _02049470 ; =sub_02049474
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
nop
_02049470: .word sub_02049474
@@ -1498,7 +1498,7 @@ _020494C8: .word sub_020494CC
sub_020494CC: ; 0x020494CC
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -1579,12 +1579,12 @@ _02049570:
thumb_func_start sub_02049574
sub_02049574: ; 0x02049574
ldr r3, _0204957C ; =sub_0204640C
ldr r3, _0204957C ; =TaskManager_Call
ldr r1, _02049580 ; =sub_02049584
mov r2, #0x0
bx r3
.balign 4
_0204957C: .word sub_0204640C
_0204957C: .word TaskManager_Call
_02049580: .word sub_02049584
thumb_func_start sub_02049584
@@ -1621,7 +1621,7 @@ sub_020495B0: ; 0x020495B0
add r2, r0, #0x0
ldr r1, _020495C4 ; =sub_020495C8
add r0, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
.balign 4
_020495C4: .word sub_020495C8
@@ -1633,7 +1633,7 @@ sub_020495C8: ; 0x020495C8
bl sub_02046530
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1673,7 +1673,7 @@ _02049616:
sub_0204961C: ; 0x0204961C
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1692,7 +1692,7 @@ _0204963E:
add r2, r0, #0x0
ldr r1, _02049654 ; =ov06_0224C8E8
add r0, r5, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
.balign 4
_02049654: .word ov06_0224C8E8
@@ -1701,7 +1701,7 @@ _02049654: .word ov06_0224C8E8
sub_02049658: ; 0x02049658
push {r3-r7, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -1953,7 +1953,7 @@ sub_02049844: ; 0x02049844
push {r4-r6, lr}
sub sp, #0x8
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -2251,7 +2251,7 @@ sub_02049ACC: ; 0x02049ACC
push {r4-r6, lr}
sub sp, #0x8
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -2407,7 +2407,7 @@ sub_02049C0C: ; 0x02049C0C
push {r3-r7, lr}
add r4, r0, #0x0
add r6, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2445,7 +2445,7 @@ _02049C4E:
sub_02049C54: ; 0x02049C54
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2492,7 +2492,7 @@ sub_02049CB0: ; 0x02049CB0
push {r3-r7, lr}
add r6, r0, #0x0
add r5, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
mov r0, #0xb
mov r1, #0x18
@@ -2517,7 +2517,7 @@ _02049CD6:
str r0, [r2, #0x0]
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
.balign 4
_02049CF4: .word sub_02049C54
@@ -2526,7 +2526,7 @@ _02049CF4: .word sub_02049C54
sub_02049CF8: ; 0x02049CF8
push {r3-r7, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -2648,7 +2648,7 @@ _02049DF0: .word sub_02049CF8
sub_02049DF4: ; 0x02049DF4
push {r3-r7, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -2738,7 +2738,7 @@ _02049E9E:
sub_02049EA4: ; 0x02049EA4
push {r3-r7, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_LocalFieldData_Get
@@ -2775,7 +2775,7 @@ sub_02049EA4: ; 0x02049EA4
ldr r1, _02049F0C ; =sub_02049DF4
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
.balign 4
_02049F08: .word 0x000001D2
@@ -2785,7 +2785,7 @@ _02049F0C: .word sub_02049DF4
sub_02049F10: ; 0x02049F10
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -2855,7 +2855,7 @@ sub_02049F98: ; 0x02049F98
add r5, r1, #0x0
add r6, r2, #0x0
add r7, r3, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl Save_LocalFieldData_Get
@@ -2887,7 +2887,7 @@ sub_02049F98: ; 0x02049F98
ldr r1, _02049FF8 ; =sub_02049F10
str r0, [r3, #0x0]
ldr r0, [sp, #0x0]
bl sub_0204640C
bl TaskManager_Call
add sp, #0x18
pop {r3-r7, pc}
nop
@@ -2896,7 +2896,7 @@ _02049FF8: .word sub_02049F10
thumb_func_start sub_02049FFC
sub_02049FFC: ; 0x02049FFC
push {r4, lr}
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl Save_LocalFieldData_Get

4
arm9/asm/unk_0204B34C.s
View File

@@ -654,7 +654,7 @@ sub_0204B800: ; 0x0204B800
sub_0204B818: ; 0x0204B818
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -854,7 +854,7 @@ sub_0204B9A0: ; 0x0204B9A0
ldr r0, [r5, #0x10]
ldr r1, _0204B9C8 ; =sub_0204B818
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r5, pc}
.balign 4
_0204B9C8: .word sub_0204B818

42
arm9/asm/unk_0204C1B4.s
View File

@@ -47,7 +47,7 @@ sub_0204C1B4: ; 0x0204C1B4
mov r0, #0x0
str r0, [r2, #0x0]
add r0, r7, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
nop
_0204C1F0: .word sub_0204C1F4
@@ -57,7 +57,7 @@ sub_0204C1F4: ; 0x0204C1F4
push {r4-r5, lr}
sub sp, #0xc
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -248,7 +248,7 @@ _0204C37C: .word sub_0204C380
sub_0204C380: ; 0x0204C380
push {r3-r7, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -284,7 +284,7 @@ _0204C3B6:
ldr r1, _0204C45C ; =UNK_020F4894
ldr r1, [r1, r2]
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -342,7 +342,7 @@ _0204C41E:
ldr r1, _0204C464 ; =UNK_020F4878
ldr r1, [r1, r2]
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -363,7 +363,7 @@ _0204C464: .word UNK_020F4878
sub_0204C468: ; 0x0204C468
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
add r4, r0, #0x0
@@ -395,7 +395,7 @@ _0204C4A0: .word 0x00000603
sub_0204C4A4: ; 0x0204C4A4
push {r4-r6, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -461,7 +461,7 @@ _0204C522:
sub_0204C528: ; 0x0204C528
push {r4-r6, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -519,7 +519,7 @@ _0204C59C:
sub_0204C5A0: ; 0x0204C5A0
push {r4-r6, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -600,7 +600,7 @@ _0204C640: .word 0x00000603
sub_0204C644: ; 0x0204C644
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -618,7 +618,7 @@ _0204C668:
add r2, r0, #0x0
ldr r1, _0204C688 ; =ov05_021DB1D0
add r0, r5, #0x0
bl sub_0204640C
bl TaskManager_Call
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -636,7 +636,7 @@ _0204C688: .word ov05_021DB1D0
sub_0204C68C: ; 0x0204C68C
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -654,7 +654,7 @@ _0204C6B0:
add r2, r0, #0x0
ldr r1, _0204C6D0 ; =ov05_021DB144
add r0, r5, #0x0
bl sub_0204640C
bl TaskManager_Call
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -672,7 +672,7 @@ _0204C6D0: .word ov05_021DB144
sub_0204C6D4: ; 0x0204C6D4
push {r3-r7, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -718,7 +718,7 @@ _0204C736:
add r2, r0, #0x0
ldr r1, _0204C79C ; =ov05_021DB250
add r0, r6, #0x0
bl sub_0204640C
bl TaskManager_Call
mov r0, #0x3
str r0, [r5, #0x4]
b _0204C798
@@ -766,7 +766,7 @@ _0204C79C: .word ov05_021DB250
sub_0204C7A0: ; 0x0204C7A0
push {r3-r7, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -808,7 +808,7 @@ _0204C7FE:
add r2, r0, #0x0
ldr r1, _0204C820 ; =ov05_021DB380
add r0, r6, #0x0
bl sub_0204640C
bl TaskManager_Call
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -827,7 +827,7 @@ _0204C820: .word ov05_021DB380
sub_0204C824: ; 0x0204C824
push {r4-r6, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -885,7 +885,7 @@ _0204C898:
sub_0204C89C: ; 0x0204C89C
push {r4-r6, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -965,7 +965,7 @@ _0204C936:
sub_0204C93C: ; 0x0204C93C
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -983,7 +983,7 @@ _0204C960:
add r2, r0, #0x0
ldr r1, _0204C980 ; =ov05_021DB040
add r0, r5, #0x0
bl sub_0204640C
bl TaskManager_Call
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]

14
arm9/asm/unk_0204CB20.s
View File

@@ -1101,7 +1101,7 @@ sub_0204D328: ; 0x0204D328
ldr r0, [r0, #0x54]
add r1, r5, r1
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
cmp r0, #0x0
beq _0204D37C
bl sub_02057654
@@ -2315,13 +2315,13 @@ sub_0204DCB4: ; 0x0204DCB4
ldr r0, _0204DD10 ; =UNK_021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x54]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r4, r0, #0x0
ldr r0, _0204DD10 ; =UNK_021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x54]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
ldr r0, _0204DD10 ; =UNK_021C5A68
ldr r1, [r0, #0x0]
@@ -4108,7 +4108,7 @@ _0204E9B8:
cmp r0, #0x0
bne _0204EA7C
ldr r0, [r1, #0x54]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
add r1, r4, #0x0
bl sub_02026908
@@ -4644,7 +4644,7 @@ _0204EE36:
str r2, [r3, r0]
ldr r5, [r1, #0x0]
ldr r0, [r5, #0x54]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
mov r1, #0x29
add r2, r5, r4
@@ -5229,7 +5229,7 @@ sub_0204F2D8: ; 0x0204F2D8
add r5, r2, #0x0
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x54]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
add r4, r0, #0x0
ldrb r0, [r5, #0x0]
@@ -5466,7 +5466,7 @@ _0204F4D2:
ldr r0, _0204F5E0 ; =UNK_021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x54]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
add r4, r0, #0x0
bl sub_020269A0

6
arm9/asm/unk_0204FBA8.s
View File

@@ -146,7 +146,7 @@ sub_0204FC5C: ; 0x0204FC5C
ldr r1, [r1, #0x0]
cmp r1, #0x0
bne _0204FC9A
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02031824
add r0, r4, #0x0
bl sub_0204FBB0
@@ -444,7 +444,7 @@ sub_0204FEB0: ; 0x0204FEB0
cmp r0, #0x0
bne _0204FEE8
add r0, r5, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
mov r1, #0x0
add r3, r5, #0x0
str r1, [sp, #0x0]
@@ -475,7 +475,7 @@ sub_0204FEF0: ; 0x0204FEF0
cmp r0, #0x0
bne _0204FF28
add r0, r5, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
mov r1, #0x0
add r3, r5, #0x0
str r1, [sp, #0x0]

4
arm9/asm/unk_02050E48.s
View File

@@ -314,7 +314,7 @@ sub_02051094: ; 0x02051094
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
ldr r1, [r4, #0x34]
cmp r1, #0x2c
bls _020510AE
@@ -2092,7 +2092,7 @@ _02051EAC:
sub_02051EB0: ; 0x02051EB0
push {r4-r6, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C

2
arm9/asm/unk_020520AC.s
View File

@@ -181,7 +181,7 @@ sub_02052110: ; 0x02052110
mov r0, #0x0
pop {r4-r6, pc}
_0205211E:
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r6, r0, #0x0
bl sub_02031A7C
mov r1, #0x19

8
arm9/asm/unk_02052EE8.s
View File

@@ -423,7 +423,7 @@ sub_020531E4: ; 0x020531E4
_02053206:
ldr r0, [sp, #0x4]
add r1, r7, #0x1
bl sub_02058060
bl GetMapObjectByID
add r5, r0, #0x0
bne _02053216
bl GF_AssertFail
@@ -758,7 +758,7 @@ sub_020534A0: ; 0x020534A0
_020534AC:
add r0, r7, #0x0
add r1, r5, #0x0
bl sub_02058060
bl GetMapObjectByID
add r4, r0, #0x0
bne _020534BC
bl GF_AssertFail
@@ -784,7 +784,7 @@ sub_020534DC: ; 0x020534DC
add r5, r1, #0x0
mov r1, #0x0
add r7, r0, #0x0
bl sub_02058060
bl GetMapObjectByID
add r4, r0, #0x0
bne _020534F0
bl GF_AssertFail
@@ -808,7 +808,7 @@ _0205350E:
bne _02053578
add r0, r7, #0x0
add r1, r6, #0x1
bl sub_02058060
bl GetMapObjectByID
add r4, r0, #0x0
bne _02053524
bl GF_AssertFail

12
arm9/asm/unk_02054C14.s
View File

@@ -386,7 +386,7 @@ sub_02054EA0: ; 0x02054EA0
push {r4-r5, lr}
sub sp, #0xc
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r4, #0x0
bl sub_0204652C
add r4, r0, #0x0
@@ -471,7 +471,7 @@ sub_02054F50: ; 0x02054F50
add r5, r1, #0x0
add r6, r2, #0x0
add r7, r3, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp, #0x0]
mov r0, #0xb
mov r1, #0x14
@@ -527,7 +527,7 @@ _02054FC6:
ldr r0, [r0, #0x10]
ldr r1, _02054FE0 ; =sub_02054EA0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
.balign 4
_02054FE0: .word sub_02054EA0
@@ -536,7 +536,7 @@ _02054FE0: .word sub_02054EA0
sub_02054FE4: ; 0x02054FE4
push {r4, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r4, #0x0
bl sub_0204652C
add r4, r0, #0x0
@@ -574,7 +574,7 @@ sub_0205502C: ; 0x0205502C
add r5, r1, #0x0
add r6, r2, #0x0
add r7, r3, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp, #0x0]
mov r0, #0xb
mov r1, #0xc
@@ -592,7 +592,7 @@ sub_0205502C: ; 0x0205502C
ldr r1, _02055064 ; =sub_02054FE4
ldr r0, [r0, #0x10]
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
.balign 4
_02055064: .word sub_02054FE4

4
arm9/asm/unk_02057380.s
View File

@@ -1505,8 +1505,8 @@ _02058058:
pop {r3-r7, pc}
.balign 4
thumb_func_start sub_02058060
sub_02058060: ; 0x02058060
thumb_func_start GetMapObjectByID
GetMapObjectByID: ; 0x02058060
push {r3-r7, lr}
add r5, r0, #0x0
add r6, r1, #0x0

2
arm9/asm/unk_0205C598.s
View File

@@ -241,7 +241,7 @@ sub_0205C73C: ; 0x0205C73C
str r0, [r5, #0xc]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl Field_TrainerIsDoubleBattle
bl TrainerIsDoubleBattle
str r0, [r5, #0x10]
str r4, [r5, #0x14]
pop {r3-r5, pc}

6
arm9/asm/unk_0205CDB4.s
View File

@@ -24,7 +24,7 @@ UNK_020F7240: ; 0x020F7240
sub_0205CDB4: ; 0x0205CDB4
push {r4, lr}
add r4, r0, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
bl sub_020254B4
add r1, r0, #0x0
@@ -43,7 +43,7 @@ _0205CDD4: .word UNK_020F7220
sub_0205CDD8: ; 0x0205CDD8
push {r4, lr}
add r4, r0, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
bl sub_020254B4
cmp r0, #0x0
@@ -68,7 +68,7 @@ sub_0205CE00: ; 0x0205CE00
add r4, r1, #0x0
add r7, r2, #0x0
str r3, [sp, #0x4]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
bl sub_020254B4
cmp r0, #0x0

46
arm9/asm/unk_0205CE48.s
View File

@@ -162,7 +162,7 @@ sub_0205CF34: ; 0x0205CF34
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r2, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
@@ -212,7 +212,7 @@ _0205CF9C: .word sub_0205CFA0
sub_0205CFA0: ; 0x0205CFA0
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
@@ -275,7 +275,7 @@ sub_0205D024: ; 0x0205D024
push {r3-r7, lr}
add r6, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_0204652C
@@ -341,7 +341,7 @@ sub_0205D0BC: ; 0x0205D0BC
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -380,7 +380,7 @@ sub_0205D104: ; 0x0205D104
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -517,7 +517,7 @@ sub_0205D21C: ; 0x0205D21C
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -553,7 +553,7 @@ _0205D260: .word sub_0205D264
sub_0205D264: ; 0x0205D264
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046530
@@ -720,7 +720,7 @@ sub_0205D3B8: ; 0x0205D3B8
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -758,7 +758,7 @@ sub_0205D400: ; 0x0205D400
push {r3-r7, lr}
add r6, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_0204652C
@@ -824,7 +824,7 @@ sub_0205D498: ; 0x0205D498
push {r4-r6, lr}
add r5, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
@@ -864,7 +864,7 @@ sub_0205D4E8: ; 0x0205D4E8
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r4, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
ldr r0, [r5, #0x0]
bl sub_0204652C
ldrh r1, [r4, #0x10]
@@ -899,7 +899,7 @@ sub_0205D528: ; 0x0205D528
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -940,7 +940,7 @@ sub_0205D574: ; 0x0205D574
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -982,7 +982,7 @@ sub_0205D5C4: ; 0x0205D5C4
push {r4-r6, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -1121,7 +1121,7 @@ sub_0205D6BC: ; 0x0205D6BC
push {r3-r7, lr}
add r5, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
@@ -1194,7 +1194,7 @@ sub_0205D74C: ; 0x0205D74C
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -1240,7 +1240,7 @@ sub_0205D7A8: ; 0x0205D7A8
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -1286,7 +1286,7 @@ sub_0205D804: ; 0x0205D804
push {r3-r5, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
@@ -1412,7 +1412,7 @@ _0205D900: .word sub_0205D904
sub_0205D904: ; 0x0205D904
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -1489,7 +1489,7 @@ sub_0205D9A8: ; 0x0205D9A8
push {r3-r7, lr}
add r6, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_0204652C
@@ -1554,7 +1554,7 @@ sub_0205DA3C: ; 0x0205DA3C
push {r4-r6, lr}
add r5, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
@@ -1609,7 +1609,7 @@ _0205DAA6:
sub_0205DAAC: ; 0x0205DAAC
push {r4, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
mov r1, #0xb
bl ov06_0224C700
add r2, r0, #0x0
@@ -1806,7 +1806,7 @@ _0205DC34: .word sub_0205D904
sub_0205DC38: ; 0x0205DC38
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C

2
arm9/asm/unk_0205DD18.s
View File

@@ -833,7 +833,7 @@ _0205E308: .word UNK_020F7374
sub_0205E30C: ; 0x0205E30C
push {r3-r7, lr}
add r7, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C

2
arm9/asm/unk_0205F7A0.s
View File

@@ -70,7 +70,7 @@ _0205F806:
str r0, [r5, #0x4]
_0205F812:
ldr r0, [sp, #0x0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
bl PlayerProfile_GetTrainerGender
str r0, [r5, #0xc]

6
arm9/asm/unk_020606B0.s
View File

@@ -13,7 +13,7 @@ UNK_020F7630: ; 0x020F7630
sub_020606B0: ; 0x020606B0
push {r4, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r4, #0x0
bl sub_0204652C
add r2, r0, #0x0
@@ -30,7 +30,7 @@ sub_020606D0: ; 0x020606D0
push {r4-r6, lr}
sub sp, #0x8
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -148,7 +148,7 @@ sub_02060790: ; 0x02060790
ldr r1, _020607D0 ; =sub_020606D0
add r0, r7, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r7, pc}
.balign 4
_020607D0: .word sub_020606D0

8
arm9/asm/unk_020607D4.s
View File

@@ -161,7 +161,7 @@ _0206090A:
ldr r0, [r5, #0x10]
ldr r1, _02060920 ; =sub_020609A0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
add sp, #0x28
pop {r3-r7, pc}
.balign 4
@@ -183,7 +183,7 @@ sub_02060924: ; 0x02060924
strb r4, [r2, #0x0]
ldr r0, [r5, #0x10]
ldr r1, _02060944 ; =sub_02060948
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
.balign 4
_02060944: .word sub_02060948
@@ -192,7 +192,7 @@ _02060944: .word sub_02060948
sub_02060948: ; 0x02060948
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -238,7 +238,7 @@ sub_020609A0: ; 0x020609A0
push {r3-r6, lr}
sub sp, #0xc
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C

6
arm9/asm/unk_020625EC.s
View File

@@ -1960,7 +1960,7 @@ sub_020634DC: ; 0x020634DC
sub_02063524: ; 0x02063524
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2108,7 +2108,7 @@ _0206364C: .word gSystem
sub_02063650: ; 0x02063650
push {r3-r5, lr}
add r5, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
mov r0, #0xb
mov r1, #0xc
@@ -2120,7 +2120,7 @@ sub_02063650: ; 0x02063650
str r0, [r2, #0x8]
ldr r0, [r4, #0x10]
ldr r1, _02063678 ; =sub_02063524
bl sub_0204640C
bl TaskManager_Call
pop {r3-r5, pc}
nop
_02063678: .word sub_02063524

2
arm9/asm/unk_02063888.s
View File

@@ -37,7 +37,7 @@ sub_020638BC: ; 0x020638BC
push {r3-r6, lr}
sub sp, #0x1c
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
add r4, r0, #0x0

32
arm9/asm/unk_02063948.s
View File

@@ -261,7 +261,7 @@ sub_02063B04: ; 0x02063B04
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _02063B3C ; =0x00002718
ldr r2, [r4, #0x4]
@@ -350,7 +350,7 @@ sub_02063BBC: ; 0x02063BBC
push {r4-r6, lr}
add r5, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
@@ -468,7 +468,7 @@ sub_02063CA4: ; 0x02063CA4
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _02063CDC ; =0x0000271C
add r0, r5, #0x0
@@ -554,7 +554,7 @@ sub_02063D4C: ; 0x02063D4C
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _02063D84 ; =0x0000271A
ldr r2, [r4, #0x4]
@@ -640,7 +640,7 @@ sub_02063DF4: ; 0x02063DF4
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _02063E2C ; =0x0000271E
add r0, r5, #0x0
@@ -726,7 +726,7 @@ sub_02063E9C: ; 0x02063E9C
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _02063ED4 ; =0x00002719
ldr r2, [r4, #0x4]
@@ -812,7 +812,7 @@ sub_02063F44: ; 0x02063F44
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _02063F7C ; =0x0000271D
add r0, r5, #0x0
@@ -907,7 +907,7 @@ sub_02064000: ; 0x02064000
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _02064038 ; =0x0000271B
add r0, r5, #0x0
@@ -982,7 +982,7 @@ sub_02064090: ; 0x02064090
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _020640C8 ; =0x0000271F
add r0, r5, #0x0
@@ -1062,7 +1062,7 @@ sub_02064134: ; 0x02064134
push {r4-r6, lr}
add r5, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
@@ -1091,7 +1091,7 @@ _02064170: .word sub_02064174
sub_02064174: ; 0x02064174
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1154,7 +1154,7 @@ sub_020641F0: ; 0x020641F0
push {r4-r6, lr}
add r5, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
@@ -1183,7 +1183,7 @@ _0206422C: .word sub_02064230
sub_02064230: ; 0x02064230
push {r3-r7, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -1250,7 +1250,7 @@ sub_020642B4: ; 0x020642B4
push {r4-r6, lr}
add r6, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_0204652C
@@ -1308,7 +1308,7 @@ sub_02064324: ; 0x02064324
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
@@ -1339,7 +1339,7 @@ sub_02064360: ; 0x02064360
bl sub_0204652C
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r1, _02064398 ; =0x000022C4
add r0, r5, #0x0

16
arm9/asm/unk_020647A4.s
View File

@@ -47,7 +47,7 @@ sub_020647A4: ; 0x020647A4
push {r3-r7, lr}
sub sp, #0x30
add r4, r0, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #0x7
bl sub_020254A0
@@ -137,7 +137,7 @@ _02064868: .word UNK_020F7D4C
sub_0206486C: ; 0x0206486C
push {r3-r5, lr}
add r4, r0, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
add r5, r0, #0x0
mov r1, #0x7
@@ -325,7 +325,7 @@ _020649AC: .word 0x00000125
thumb_func_start sub_020649B0
sub_020649B0: ; 0x020649B0
push {r3, lr}
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #0x7
bl sub_020254A0
@@ -346,7 +346,7 @@ _020649CC:
sub_020649D4: ; 0x020649D4
push {r3-r5, lr}
add r5, r0, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #0x7
bl sub_020254A0
@@ -389,7 +389,7 @@ _020649FE:
ldr r0, [r0, r3]
str r0, [r2, #0x4]
ldr r0, [r5, #0x10]
bl sub_0204640C
bl TaskManager_Call
mov r0, #0x1
strh r0, [r4, #0x0]
pop {r3-r5, pc}
@@ -401,7 +401,7 @@ _02064A3E:
ldr r0, [r0, r3]
str r0, [r2, #0x4]
ldr r0, [r5, #0x10]
bl sub_0204640C
bl TaskManager_Call
mov r0, #0x0
strh r0, [r4, #0x0]
_02064A54:
@@ -419,7 +419,7 @@ sub_02064A70: ; 0x02064A70
push {r4-r5, lr}
sub sp, #0x1c
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -543,7 +543,7 @@ sub_02064B70: ; 0x02064B70
push {r4-r5, lr}
sub sp, #0x1c
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C

10
arm9/asm/unk_02064CA8.s
View File

@@ -17,7 +17,7 @@ UNK_020F7E54: ; 0x020F7E54
thumb_func_start sub_02064CA8
sub_02064CA8: ; 0x02064CA8
push {r4, lr}
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x1
@@ -33,7 +33,7 @@ sub_02064CA8: ; 0x02064CA8
sub_02064CC8: ; 0x02064CC8
push {r3-r5, lr}
add r5, r0, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x2
@@ -67,7 +67,7 @@ _02064D08:
thumb_func_start sub_02064D10
sub_02064D10: ; 0x02064D10
push {r4-r6, lr}
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x3
@@ -95,7 +95,7 @@ _02064D48: .word UNK_020F7E54
thumb_func_start sub_02064D4C
sub_02064D4C: ; 0x02064D4C
push {r4-r6, lr}
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x4
@@ -130,7 +130,7 @@ sub_02064D88: ; 0x02064D88
bl GF_AssertFail
_02064D96:
add r0, r7, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x5

8
arm9/asm/unk_02064E90.s
View File

@@ -14,7 +14,7 @@ sub_02064E90: ; 0x02064E90
add r0, r6, #0x0
str r3, [sp, #0x1c]
ldr r5, [sp, #0xbc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
str r0, [sp, #0x20]
bl Save_PlayerData_GetProfileAddr
add r7, r0, #0x0
@@ -218,7 +218,7 @@ _02065074: .word FreeToHeap
thumb_func_start sub_02065078
sub_02065078: ; 0x02065078
push {r3-r7, lr}
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r7, r0, #0x0
bl Save_GameStats_Get
add r6, r0, #0x0
@@ -597,7 +597,7 @@ sub_02065344: ; 0x02065344
ldr r0, [r5, #0x10]
ldr r1, _0206536C ; =sub_02065370
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r5, pc}
nop
_0206536C: .word sub_02065370
@@ -606,7 +606,7 @@ _0206536C: .word sub_02065370
sub_02065370: ; 0x02065370
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C

16
arm9/asm/unk_020653EC.s
View File

@@ -55,7 +55,7 @@ sub_020653EC: ; 0x020653EC
bl MI_CpuFill8
add r0, r5, #0x0
str r6, [r4, #0x4]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
mov r1, #0x5b
lsl r1, r1, #0x2
str r5, [r4, r1]
@@ -1807,7 +1807,7 @@ sub_020661F8: ; 0x020661F8
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl SaveArray_PlayerParty_Get
add r1, r7, #0x0
bl GetPartyMonByIndex
@@ -2376,19 +2376,19 @@ _02066676:
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl SaveArray_PlayerParty_Get
str r0, [r4, #0x0]
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_Bag_Get
str r0, [r4, #0x4]
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetOptionsAddr
str r0, [r4, #0xc]
mov r0, #0x5b
@@ -2541,7 +2541,7 @@ _020667D0:
sub_020667D4: ; 0x020667D4
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
@@ -2577,7 +2577,7 @@ _02066814:
thumb_func_start sub_02066818
sub_02066818: ; 0x02066818
push {r4, lr}
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
mov r0, #0xb
mov r1, #0x8
@@ -2588,7 +2588,7 @@ sub_02066818: ; 0x02066818
str r0, [r2, #0x4]
ldr r0, [r4, #0x10]
ldr r1, _0206683C ; =sub_020667D4
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
nop
_0206683C: .word sub_020667D4

6
arm9/asm/unk_0206F1F0.s
View File

@@ -13,7 +13,7 @@ UNK_020F943C: ; 0x020F943C
sub_0206F1F0: ; 0x0206F1F0
push {r4-r6, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
@@ -262,7 +262,7 @@ sub_0206F3B8: ; 0x0206F3B8
str r1, [r0, #0x4]
ldr r1, _0206F3D4 ; =sub_0206F1F0
add r0, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
nop
_0206F3D4: .word sub_0206F1F0
@@ -280,7 +280,7 @@ sub_0206F3D8: ; 0x0206F3D8
ldr r1, _0206F3F8 ; =sub_0206F1F0
add r0, r5, #0x0
str r4, [r2, #0x8]
bl sub_0204640C
bl TaskManager_Call
pop {r3-r5, pc}
nop
_0206F3F8: .word sub_0206F1F0

14
arm9/asm/unk_02080C38.s
View File

@@ -55,7 +55,7 @@ sub_02080C38: ; 0x02080C38
ldr r1, _02080C5C ; =sub_02080C60
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r5, pc}
nop
_02080C5C: .word sub_02080C60
@@ -65,7 +65,7 @@ sub_02080C60: ; 0x02080C60
push {r3-r7, lr}
sub sp, #0x28
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -111,7 +111,7 @@ _02080CB4:
bl GetPartyMonByIndex
add r7, r0, #0x0
add r0, r6, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
mov r1, #0xb
str r0, [sp, #0x0]
@@ -289,13 +289,13 @@ _02080E36:
ldr r1, _02080E54 ; =sub_02080E5C
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
_02080E42:
ldr r1, _02080E58 ; =sub_02081000
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
nop
_02080E50: .word 0x00000121
@@ -306,7 +306,7 @@ _02080E58: .word sub_02081000
sub_02080E5C: ; 0x02080E5C
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
add r4, r0, #0x0
@@ -521,7 +521,7 @@ sub_02081000: ; 0x02081000
push {r3-r7, lr}
sub sp, #0x10
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
add r4, r0, #0x0

4
arm9/asm/unk_020859C0.s
View File

@@ -631,7 +631,7 @@ sub_02085DA4: ; 0x02085DA4
add r6, r0, #0x0
add r0, r5, #0x0
ldr r7, [r6, #0x8]
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp, #0x4]
ldr r0, [r6, #0x14]
cmp r0, #0x6
@@ -862,7 +862,7 @@ _02085F5E:
ldr r1, _02085FA8 ; =sub_02085DA4
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
nop
_02085FA8: .word sub_02085DA4

12
arm9/asm/unk_02086084.s
View File

@@ -271,10 +271,10 @@ _020862C4:
b _020863CE
_020862D6:
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r5, [r4, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
add r7, r0, #0x0
ldr r0, [r6, #0x1c]
@@ -299,7 +299,7 @@ _020862D6:
mov r2, #0x0
bl SetMonData
add r0, r6, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
ldr r1, [r4, #0xc]
bl sub_0202C144
ldr r0, [r4, #0x4]
@@ -314,7 +314,7 @@ _02086334:
b _020863CE
_0208633A:
add r0, r5, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r4, #0xc]
mov r1, #0x5
@@ -322,7 +322,7 @@ _0208633A:
bl GetMonData
add r7, r0, #0x0
add r0, r6, #0x0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetOptionsAddr
str r0, [sp, #0x0]
mov r0, #0xb
@@ -412,7 +412,7 @@ _020863F2:
stmia r3!, {r0-r1}
ldr r1, _02086410 ; =sub_02086280
add r0, r5, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r3-r5, pc}
.balign 4
_02086410: .word sub_02086280

4
arm9/asm/unk_0208A258.s
View File

@@ -7,7 +7,7 @@
sub_0208A258: ; 0x0208A258
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
@@ -63,7 +63,7 @@ _0208A2A6:
sub_0208A2C4: ; 0x0208A2C4
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C

4
arm9/asm/unk_0208A338.s
View File

@@ -9,7 +9,7 @@
sub_0208A338: ; 0x0208A338
push {r4-r6, lr}
add r6, r0, #0x0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
mov r0, #0x20
mov r1, #0x6c
@@ -60,7 +60,7 @@ sub_0208A338: ; 0x0208A338
ldr r1, _0208A3C4 ; =sub_0208A458
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_0204640C
bl TaskManager_Call
pop {r4-r6, pc}
.balign 4
_0208A3C0: .word 0x00000171

46
arm9/global.inc
View File

@@ -2533,9 +2533,9 @@
.extern sub_02034B5C
.extern sub_02034B64
.extern sub_02034B6C
.extern sub_02034B74
.extern SetObjectEventXYPos
.extern sub_02034BAC
.extern sub_02034BDC
.extern SetObjectEventMovement
.extern sub_02034C0C
.extern sub_02034C24
.extern sub_02034C34
@@ -2557,7 +2557,7 @@
.extern LocalFieldData_GetWeatherType
.extern LocalFieldData_SetWeatherType
.extern sub_02034DFC
.extern sub_02034E04
.extern LocalFieldData_SetBlackoutSpawn
.extern sub_02034E0C
.extern sub_02034E10
.extern sub_02034E18
@@ -2612,7 +2612,7 @@
.extern sub_02037778
.extern sub_02037790
.extern sub_020377A8
.extern ScriptEnvironment_GetSavePtr
.extern FieldSystem_GetSaveDataPtr
.extern sub_020377B0
.extern sub_020377C8
.extern sub_020377E0
@@ -2689,7 +2689,7 @@
.extern sub_020395BC
.extern sub_020395F4
.extern sub_02039618
.extern Field_TrainerIsDoubleBattle
.extern TrainerIsDoubleBattle
.extern TrainerFlagCheck
.extern TrainerFlagSet
.extern TrainerFlagClear
@@ -2794,19 +2794,19 @@
.extern ScrCmd_ReleaseAllEvents
.extern ScrCmd_LockEvent
.extern ScrCmd_ReleaseEvent
.extern ScrCmd_AddOverworldEvent
.extern ScrCmd_RemoveOverworldEvent
.extern ScrCmd_AddObjectEvent
.extern ScrCmd_RemoveObjectEvent
.extern ScrCmd_LockCamera
.extern ScrCmd_ReleaseCamera
.extern ScrCmd_FacePlayer
.extern ScrCmd_GetPlayerPosition
.extern ScrCmd_GetOverworldEventPosition
.extern ScrCmd_GetObjectEventPosition
.extern ScrCmd_GetPlayerDirection
.extern ScrCmd_Unk006B
.extern ScrCmd_KeepOverworldEvent
.extern ScrCmd_SetOverworldEventMovement
.extern ScrCmd_GetOverworldEventMovement
.extern ScrCmd_OverworldEventStopFollowing
.extern ScrCmd_KeepObjectEvent
.extern ScrCmd_SetObjectEventMovement
.extern ScrCmd_GetObjectEventMovement
.extern ScrCmd_ObjectEventStopFollowing
.extern ScrCmd_Unk02AB
.extern ScrCmd_GetSealCountFromId
.extern ScrCmd_GiveSeals
@@ -2948,9 +2948,9 @@
.extern ScrCmd_Unk0154
.extern ScrCmd_Unk0155
.extern ScrCmd_Unk029C
.extern ScrCmd_Unk0156
.extern ScrCmd_Unk014B
.extern ScrCmd_Unk014C
.extern ScrCmd_SetPlayerAvatar
.extern ScrCmd_DummyBlackOut
.extern ScrCmd_SetSpawn
.extern ScrCmd_GetPlayerGender
.extern ScrCmd_HealParty
.extern ScrCmd_Unk014F
@@ -2958,9 +2958,9 @@
.extern ScrCmd_Unk02BB
.extern ScrCmd_Unk0151
.extern ScrCmd_Unk0152
.extern ScrCmd_Unk017A
.extern ScrCmd_Unk0186
.extern ScrCmd_Unk0187
.extern ScrCmd_CheckPocketNotEmpty
.extern ScrCmd_SetObjectEventSpawnPosition
.extern ScrCmd_MoveObjectEvent
.extern ScrCmd_Unk0188
.extern ScrCmd_Unk0189
.extern ScrCmd_Unk018A
@@ -3430,14 +3430,14 @@
.extern GetVarAddr
.extern sub_020463CC
.extern sub_020463EC
.extern sub_0204640C
.extern TaskManager_Call
.extern sub_02046420
.extern sub_0204646C
.extern sub_0204647C
.extern sub_0204649C
.extern sub_020464A4
.extern sub_02046500
.extern sub_02046528
.extern TaskManager_GetFieldSystem
.extern sub_0204652C
.extern sub_02046530
.extern sub_02046534
@@ -3474,8 +3474,8 @@
.extern sub_020480C8
.extern sub_020480D8
.extern sub_020480E4
.extern sub_0204837C
.extern sub_02048498
.extern FieldTask_BlackOut
.extern CallFieldTask_BlackOut
.extern CallTask_GameClear
.extern sub_020489DC
.extern sub_020489FC
@@ -3999,7 +3999,7 @@
.extern sub_02057800
.extern sub_0205785C
.extern sub_02057BAC
.extern sub_02058060
.extern GetMapObjectByID
.extern sub_020580B4
.extern sub_020580F4
.extern sub_0205829C

14
arm9/overlays/05/asm/ov05_021DA5B8.s
View File

@@ -1069,7 +1069,7 @@ _021DAE10: .word 0x00000615
ov05_021DAE14: ; 0x021DAE14
push {r3, r4, r5, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -1255,7 +1255,7 @@ ov05_021DAF78: ; 0x021DAF78
strb r4, [r2]
ldr r0, [r5, #0x10]
ldr r1, _021DAF94 ; =ov05_021DAE14
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, pc}
.balign 4, 0
_021DAF94: .word ov05_021DAE14
@@ -1348,7 +1348,7 @@ ov05_021DB040: ; 0x021DB040
push {r3, r4, r5, r6, lr}
sub sp, #0xc
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -1469,7 +1469,7 @@ ov05_021DB144: ; 0x021DB144
push {r4, r5, lr}
sub sp, #0xc
add r5, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl sub_0204652C
@@ -1536,7 +1536,7 @@ ov05_021DB1D0: ; 0x021DB1D0
push {r4, r5, r6, lr}
sub sp, #0x10
add r5, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl sub_0204652C
@@ -1599,7 +1599,7 @@ ov05_021DB250: ; 0x021DB250
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x18
str r0, [sp, #0x10]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
ldr r0, [sp, #0x10]
bl sub_0204652C
@@ -1750,7 +1750,7 @@ ov05_021DB380: ; 0x021DB380
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x10
add r7, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r7, #0
bl sub_0204652C

14
arm9/overlays/05/asm/ov05_021E1374.s
View File

@@ -9,7 +9,7 @@ ov05_021E1374: ; 0x021E1374
str r0, [sp]
add r5, r1, #0
add r6, r2, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
mov r1, #0x47
add r7, r0, #0
mov r0, #4
@@ -36,7 +36,7 @@ _021E1396:
ldr r0, [sp]
ldr r1, _021E13C0 ; =ov05_021E13C4
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
_021E13C0: .word ov05_021E13C4
@@ -295,7 +295,7 @@ _021E15A6:
add r1, r6, #0
ldr r0, [r0, #4]
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r4, r0, #0
beq _021E161A
bl sub_02058488
@@ -447,7 +447,7 @@ ov05_021E16C8: ; 0x021E16C8
_021E16D6:
ldr r0, [r6, #0x34]
add r1, r5, #0
bl sub_02058060
bl GetMapObjectByID
add r4, r0, #0
beq _021E16F2
bl sub_02058480
@@ -869,7 +869,7 @@ ov05_021E19E0: ; 0x021E19E0
_021E19F0:
ldr r0, [r6, #0x34]
add r1, r5, #0
bl sub_02058060
bl GetMapObjectByID
add r4, r0, #0
beq _021E1A16
bl sub_02058854
@@ -915,7 +915,7 @@ ov05_021E1A30: ; 0x021E1A30
str r0, [sp, #0xc]
bl sub_020395F4
str r0, [sp, #8]
bl Field_TrainerIsDoubleBattle
bl TrainerIsDoubleBattle
cmp r0, #0
bne _021E1A60
add sp, #0x10
@@ -929,7 +929,7 @@ _021E1A66:
ldr r0, [sp]
add r1, r4, #0
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r5, r0, #0
beq _021E1ACC
ldr r1, [sp, #4]

4
arm9/overlays/05/asm/ov05_021E3340.s
View File

@@ -8,7 +8,7 @@ ov05_021E3340: ; 0x021E3340
push {r3, r4, r5, r6, lr}
sub sp, #4
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -122,7 +122,7 @@ Field_GivePoketch: ; 0x021E3424
str r0, [r2]
ldr r1, _021E3440 ; =ov05_021E3340
add r0, r4, #0
bl sub_0204640C
bl TaskManager_Call
pop {r4, pc}
.balign 4, 0
_021E3440: .word ov05_021E3340

18
arm9/overlays/05/asm/ov05_021E5FD8.s
View File

@@ -530,7 +530,7 @@ ov05_021E63D4: ; 0x021E63D4
ldr r0, [r6, #0x10]
ldr r1, _021E640C ; =ov05_021E6484
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, r6, r7, pc}
nop
_021E640C: .word ov05_021E6484
@@ -541,7 +541,7 @@ CallFieldTask_Surf: ; 0x021E6410
sub sp, #0x10
add r6, r2, #0
add r5, r1, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r1, r6, #0
bl ov05_021E72E8
@@ -1076,7 +1076,7 @@ _021E682A:
cmp r0, #1
bne _021E68A2
add r0, r6, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r1, sp, #8
str r0, [sp, #4]
bl ov06_0223C08C
@@ -1207,7 +1207,7 @@ ov05_021E6954: ; 0x021E6954
ldr r0, [r6, #0x10]
ldr r1, _021E698C ; =ov05_021E69FC
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, r6, r7, pc}
nop
_021E698C: .word ov05_021E69FC
@@ -1218,7 +1218,7 @@ CallFieldTask_RockClimb: ; 0x021E6990
sub sp, #0x10
add r6, r2, #0
add r5, r1, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r1, r6, #0
bl ov05_021E72E8
@@ -1539,7 +1539,7 @@ CallFieldTask_Waterfall: ; 0x021E6BF4
add r7, r2, #0
add r5, r0, #0
add r6, r1, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r1, r7, #0
bl ov05_021E72E8
@@ -1554,7 +1554,7 @@ CallFieldTask_Waterfall: ; 0x021E6BF4
add r2, r0, #0
ldr r1, _021E6C2C ; =ov05_021E6C30
add r0, r5, #0
bl sub_0204640C
bl TaskManager_Call
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
@@ -2082,7 +2082,7 @@ _021E7004:
thumb_func_start ov05_021E7030
ov05_021E7030: ; 0x021E7030
push {r3, lr}
bl sub_02046528
bl TaskManager_GetFieldSystem
bl ov05_021E703C
pop {r3, pc}
@@ -2104,7 +2104,7 @@ ov05_021E703C: ; 0x021E703C
ldr r0, [r5, #0x10]
ldr r1, _021E7068 ; =ov05_021E706C
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, pc}
.balign 4, 0
_021E7068: .word ov05_021E706C

4
arm9/overlays/05/asm/ov05_021EFBF8.s
View File

@@ -659,7 +659,7 @@ ov05_021F0128: ; 0x021F0128
ov05_021F0130: ; 0x021F0130
add r4, r0, #0
add r0, r5, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
ldr r0, [r4, #0x48]
cmp r0, #0xc
bhi _021F01E8
@@ -876,7 +876,7 @@ _021F02F2:
ldr r1, _021F0300 ; =ov05_021F0128
add r0, r5, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
pop {r4, r5, r6, pc}
nop
_021F0300: .word ov05_021F0128

2
arm9/overlays/05/asm/ov05_021F5518.s
View File

@@ -392,7 +392,7 @@ ov05_021F57EC: ; 0x021F57EC
ov05_021F57F0: ; 0x021F57F0
push {r4, r5, r6, lr}
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl sub_0204652C

2
arm9/overlays/05/asm/ov05_021F5C44.s
View File

@@ -31,7 +31,7 @@ _021F5C58:
ov05_021F5C70: ; 0x021F5C70
push {r3, r4, r5, r6, r7, lr}
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r6, #0
bl sub_0204652C

4
arm9/overlays/05/asm/ov05_021F6360.s
View File

@@ -7,7 +7,7 @@
ov05_021F6360: ; 0x021F6360
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp]
add r0, r7, #0
bl sub_0204652C
@@ -84,7 +84,7 @@ _021F6402:
ldr r1, _021F6428 ; =ov05_021F57F0
ldr r2, [r5, #4]
add r0, r7, #0
bl sub_0204640C
bl TaskManager_Call
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]

148
arm9/overlays/06/asm/overlay_06.s
View File

@@ -309,7 +309,7 @@ ov06_022398D8: ; 0x022398D8
push {r4, lr}
ldr r0, [r0, #0x34]
add r4, r2, #0
bl sub_02058060
bl GetMapObjectByID
cmp r4, #1
bne _022398F0
mov r1, #1
@@ -327,7 +327,7 @@ _022398F0:
ov06_022398FC: ; 0x022398FC
push {r4, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl sub_0204652C
add r4, r0, #0
@@ -364,7 +364,7 @@ ov06_02239944: ; 0x02239944
push {r4, r5, r6, lr}
sub sp, #8
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
mov r0, #4
mov r1, #0x10
@@ -393,7 +393,7 @@ _02239960:
ldr r1, _02239994 ; =ov06_022398FC
add r0, r6, #0
add r2, r5, #0
bl sub_0204640C
bl TaskManager_Call
add sp, #8
pop {r4, r5, r6, pc}
nop
@@ -427,7 +427,7 @@ _022399C4:
ov06_022399C8: ; 0x022399C8
push {r4, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl sub_0204652C
add r4, r0, #0
@@ -542,7 +542,7 @@ ov06_02239AAC: ; 0x02239AAC
push {r4, r5, r6, lr}
sub sp, #8
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
mov r0, #4
mov r1, #0x10
@@ -575,7 +575,7 @@ _02239AC8:
ldr r1, _02239B04 ; =ov06_022399C8
add r0, r6, #0
add r2, r5, #0
bl sub_0204640C
bl TaskManager_Call
add sp, #8
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1121,7 +1121,7 @@ ov06_02239F04: ; 0x02239F04
ldr r0, [r1, #0x34]
mov r1, #5
add r4, r2, #0
bl sub_02058060
bl GetMapObjectByID
add r5, r0, #0
bne _02239F18
bl GF_AssertFail
@@ -3115,7 +3115,7 @@ ov06_0223ADB4: ; 0x0223ADB4
add r4, r0, #0
ldr r0, [r1, #0x34]
add r1, r2, #0
bl sub_02058060
bl GetMapObjectByID
str r0, [r4]
cmp r0, #0
bne _0223ADCA
@@ -4672,7 +4672,7 @@ ov06_0223B8EC: ; 0x0223B8EC
add r0, #0xd8
ldr r0, [r0]
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
add r1, sp, #0
bl sub_02058B5C
ldr r1, [sp]
@@ -5042,7 +5042,7 @@ _0223BBDA:
cmp r0, #0xc
blt _0223BBDA
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_Pokedex_Get
bl Pokedex_GetNatDexFlag
add r6, r0, #0
@@ -5479,7 +5479,7 @@ _0223BF7E:
cmp r0, #0xc
blt _0223BF7E
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_Pokedex_Get
bl Pokedex_GetNatDexFlag
add r6, r0, #0
@@ -5789,7 +5789,7 @@ _0223C222:
cmp r0, #0xc
blt _0223C222
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_Pokedex_Get
bl Pokedex_GetNatDexFlag
add r6, r0, #0
@@ -5930,7 +5930,7 @@ _0223C350:
cmp r0, #1
bne _0223C38C
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
bl PlayerProfile_GetTrainerID
str r0, [sp]
@@ -8188,7 +8188,7 @@ _0223D472:
ldr r1, _0223D48C ; =ov06_0223D4AC
add r0, r7, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, r6, r7, pc}
nop
_0223D488: .word 0x0000023E
@@ -8216,7 +8216,7 @@ _0223D4A8:
ov06_0223D4AC: ; 0x0223D4AC
push {r4, r5, r6, lr}
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl sub_0204652C
@@ -11153,7 +11153,7 @@ ov06_0223ECF0: ; 0x0223ECF0
cmp r0, #0
beq _0223ED46
add r0, r6, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl sub_0204652C
@@ -11442,7 +11442,7 @@ _0223EF28:
str r0, [r2, #0x74]
ldr r0, [r1]
ldr r0, [r0, #0x68]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
ldr r1, _0223EFF4 ; =0x02252420
ldr r1, [r1]
@@ -15378,7 +15378,7 @@ _02240FE8: .word 0x000005F3
ov06_02240FEC: ; 0x02240FEC
push {r4, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl sub_0204652C
add r4, r0, #0
@@ -15630,13 +15630,13 @@ ov06_022411F4: ; 0x022411F4
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
bl ov06_02241188
add r2, r0, #0
ldr r1, _02241210 ; =ov06_02240FEC
add r0, r5, #0
str r4, [r2, #0x70]
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, pc}
.align 2, 0
_02241210: .word ov06_02240FEC
@@ -15699,7 +15699,7 @@ ov06_02241230: ; 0x02241230
cmp r0, #0
beq _022412E0
add r0, r4, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #1
bl sub_020254A0
@@ -15715,7 +15715,7 @@ ov06_02241230: ; 0x02241230
bne _022412B4
ldr r0, [r4, #0x10]
ldr r1, _022412E8 ; =ov06_0224158C
bl sub_0204640C
bl TaskManager_Call
mov r0, #2
add sp, #0x2c
strb r0, [r5]
@@ -15725,7 +15725,7 @@ _022412B4:
bne _022412C8
ldr r0, [r4, #0x10]
ldr r1, _022412EC ; =ov06_02241428
bl sub_0204640C
bl TaskManager_Call
mov r0, #1
add sp, #0x2c
strb r0, [r5]
@@ -15735,7 +15735,7 @@ _022412C8:
bne _022412DC
ldr r0, [r4, #0x10]
ldr r1, _022412F0 ; =ov06_02241348
bl sub_0204640C
bl TaskManager_Call
mov r0, #0
add sp, #0x2c
strb r0, [r5]
@@ -15800,7 +15800,7 @@ ov06_02241348: ; 0x02241348
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x10
add r5, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl sub_0204652C
@@ -15907,7 +15907,7 @@ ov06_02241428: ; 0x02241428
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x28
add r5, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl sub_0204652C
@@ -16079,7 +16079,7 @@ ov06_0224158C: ; 0x0224158C
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x10
add r5, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl sub_0204652C
@@ -16188,7 +16188,7 @@ ov06_02241670: ; 0x02241670
push {r4, r5, r6, r7, lr}
sub sp, #0x2c
add r4, r0, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #1
bl sub_020254A0
@@ -16412,7 +16412,7 @@ ov06_0224186C: ; 0x0224186C
push {r3, r4, r5, r6, lr}
sub sp, #0x24
add r5, r0, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #2
bl sub_020254A0
@@ -16499,7 +16499,7 @@ ov06_02241914: ; 0x02241914
mov r0, #0
str r0, [r6]
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #2
bl sub_020254A0
@@ -16513,7 +16513,7 @@ ov06_02241914: ; 0x02241914
bne _0224195A
ldr r1, _0224196C ; =ov06_02241974
add r2, r6, #0
bl sub_0204640C
bl TaskManager_Call
mov r0, #1
add sp, #0xc
strb r0, [r4]
@@ -16521,7 +16521,7 @@ ov06_02241914: ; 0x02241914
_0224195A:
ldr r1, _02241970 ; =ov06_02241A44
add r2, r6, #0
bl sub_0204640C
bl TaskManager_Call
mov r0, #0
strb r0, [r4]
add sp, #0xc
@@ -16535,7 +16535,7 @@ ov06_02241974: ; 0x02241974
push {r3, r4, r5, r6, lr}
sub sp, #0xc
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -16634,7 +16634,7 @@ ov06_02241A44: ; 0x02241A44
push {r3, r4, r5, r6, lr}
sub sp, #0xc
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -16820,7 +16820,7 @@ ov06_02241BB0: ; 0x02241BB0
add r5, r0, #0
ldr r0, [r5]
add r4, r1, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #3
bl sub_020254A0
@@ -17142,7 +17142,7 @@ ov06_02241E58: ; 0x02241E58
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -17282,7 +17282,7 @@ ov06_02241F7C: ; 0x02241F7C
push {r4, r5, r6, r7, lr}
sub sp, #0x1c
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -17441,7 +17441,7 @@ ov06_022420CC: ; 0x022420CC
push {r4, r5, r6, r7, lr}
sub sp, #0x1c
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -17604,7 +17604,7 @@ ov06_02242224: ; 0x02242224
push {r4, r5, r6, r7, lr}
sub sp, #0x5c
add r6, r0, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #3
bl sub_020254A0
@@ -17830,7 +17830,7 @@ _02242400: .word 0x000076A0
ov06_02242404: ; 0x02242404
push {r4, lr}
add r4, r0, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
bl sub_020254B4
cmp r0, #3
@@ -17989,7 +17989,7 @@ ov06_0224252C: ; 0x0224252C
add r5, r0, #0
ldr r0, [r5]
add r4, r1, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #4
bl sub_020254A0
@@ -18060,7 +18060,7 @@ ov06_022425C8: ; 0x022425C8
push {r4, r5, r6, r7, lr}
sub sp, #0x24
str r0, [sp, #8]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #4
bl sub_020254A0
@@ -18173,7 +18173,7 @@ ov06_02242698: ; 0x02242698
ov06_022426AC: ; 0x022426AC
push {r3, r4, r5, lr}
add r5, r0, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
bl sub_020254B4
cmp r0, #4
@@ -18257,7 +18257,7 @@ ov06_02242744: ; 0x02242744
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -18472,7 +18472,7 @@ ov06_022428D8: ; 0x022428D8
push {r4, r5, r6, r7, lr}
sub sp, #0x2c
add r5, r0, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #5
bl sub_020254A0
@@ -18652,7 +18652,7 @@ ov06_02242A38: ; 0x02242A38
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
add r5, r1, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #5
bl sub_020254A0
@@ -18729,7 +18729,7 @@ _02242ACE:
ldr r0, [r7, #0x10]
ldr r1, _02242AE8 ; =ov06_02242AEC
ldr r2, [sp]
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02242AE4: .word 0x0000063F
@@ -18740,7 +18740,7 @@ ov06_02242AEC: ; 0x02242AEC
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x10
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp, #8]
add r0, r4, #0
bl sub_0204652C
@@ -18875,7 +18875,7 @@ ov06_02242BE0: ; 0x02242BE0
add r5, r0, #0
add r6, r1, #0
str r3, [sp, #4]
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0
ldr r0, _02242C70 ; =0x0000067C
bl PlaySE
@@ -18926,7 +18926,7 @@ _02242C0E:
ldr r1, _02242C74 ; =ov06_02242EC0
add r0, r5, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -23652,7 +23652,7 @@ _02245098:
cmp r0, #0xc
blo _02245098
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_Pokedex_Get
bl Pokedex_GetNatDexFlag
add r6, r0, #0
@@ -23816,7 +23816,7 @@ ov06_022451F4: ; 0x022451F4
push {r3, r4, lr}
sub sp, #0x14
add r4, r0, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #6
bl sub_020254A0
@@ -23871,7 +23871,7 @@ ov06_0224525C: ; 0x0224525C
add r7, r0, #0
add r6, r1, #0
str r2, [sp]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #6
bl sub_020254A0
@@ -23978,7 +23978,7 @@ _02245326:
ldr r0, [r7, #0x10]
ldr r1, _0224533C ; =ov06_02245360
add r2, r5, #0
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02245334: .word ov06_02245478
@@ -23989,7 +23989,7 @@ _0224533C: .word ov06_02245360
ov06_02245340: ; 0x02245340
push {r4, lr}
add r4, r1, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02024ED8
mov r1, #6
bl sub_020254A0
@@ -24007,7 +24007,7 @@ ov06_02245360: ; 0x02245360
push {r4, r5, r6, r7, lr}
sub sp, #0x24
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -38569,7 +38569,7 @@ ov06_0224C27C: ; 0x0224C27C
str r0, [r4, #8]
ldr r0, [r5, #0x10]
ldr r1, _0224C2F0 ; =ov06_0224C2F4
bl sub_0204640C
bl TaskManager_Call
add sp, #0x20
pop {r4, r5, r6, pc}
_0224C2E8:
@@ -38584,7 +38584,7 @@ ov06_0224C2F4: ; 0x0224C2F4
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x38
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -38862,7 +38862,7 @@ ov06_0224C520: ; 0x0224C520
strb r0, [r2, #2]
ldr r0, [r5, #0x10]
ldr r1, _0224C55C ; =ov06_0224C560
bl sub_0204640C
bl TaskManager_Call
pop {r4, r5, r6, pc}
_0224C552:
bl GF_AssertFail
@@ -38876,7 +38876,7 @@ ov06_0224C560: ; 0x0224C560
push {r4, r5, r6, r7, lr}
sub sp, #0x1c
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -39095,7 +39095,7 @@ ov06_0224C700: ; 0x0224C700
ov06_0224C720: ; 0x0224C720
push {r3, r4, r5, r6, r7, lr}
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r6, #0
bl sub_0204652C
@@ -39320,7 +39320,7 @@ ov06_0224C8C8: ; 0x0224C8C8
ov06_0224C8E8: ; 0x0224C8E8
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl sub_0204652C
@@ -39547,7 +39547,7 @@ ov06_0224CA88: ; 0x0224CA88
ov06_0224CAAC: ; 0x0224CAAC
push {r3, r4, r5, r6, r7, lr}
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r6, #0
bl sub_0204652C
@@ -39636,7 +39636,7 @@ ov06_0224CB30: ; 0x0224CB30
ov06_0224CB54: ; 0x0224CB54
push {r3, r4, r5, r6, r7, lr}
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r6, #0
bl sub_0204652C
@@ -40785,7 +40785,7 @@ ov06_0224D3E8: ; 0x0224D3E8
ldr r1, _0224D40C ; =ov06_0224D410
add r0, r5, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
pop {r3, r4, r5, pc}
nop
_0224D40C: .word ov06_0224D410
@@ -40794,7 +40794,7 @@ _0224D40C: .word ov06_0224D410
ov06_0224D410: ; 0x0224D410
push {r3, r4, r5, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -40845,7 +40845,7 @@ ov06_0224D46C: ; 0x0224D46C
bl sub_020377A8
add r5, r0, #0
add r0, r4, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
str r0, [sp, #0x1c]
mov r0, #0xb
mov r1, #0x18
@@ -42968,7 +42968,7 @@ ov06_0224E554: ; 0x0224E554
str r0, [r4, #8]
ldr r0, [r5, #0x10]
ldr r1, _0224E5CC ; =ov06_0224E5D0
bl sub_0204640C
bl TaskManager_Call
add sp, #0x20
pop {r4, r5, r6, pc}
_0224E5C0:
@@ -42984,7 +42984,7 @@ ov06_0224E5D0: ; 0x0224E5D0
push {r4, r5, r6, lr}
sub sp, #0x30
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -43222,20 +43222,20 @@ _0224E794:
thumb_func_start ov06_0224E7C4
ov06_0224E7C4: ; 0x0224E7C4
ldr r3, _0224E7D0 ; =sub_0204640C
ldr r3, _0224E7D0 ; =TaskManager_Call
ldr r0, [r0, #0x10]
ldr r1, _0224E7D4 ; =ov06_0224E7D8
mov r2, #0
bx r3
nop
_0224E7D0: .word sub_0204640C
_0224E7D0: .word TaskManager_Call
_0224E7D4: .word ov06_0224E7D8
thumb_func_start ov06_0224E7D8
ov06_0224E7D8: ; 0x0224E7D8
push {r3, r4, r5, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_02046530
@@ -43298,7 +43298,7 @@ ov06_0224E858: ; 0x0224E858
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r7, r2, #0
bl sub_02058060
bl GetMapObjectByID
add r6, r0, #0
add r1, sp, #0
bl sub_02058B5C

130
arm9/overlays/18/asm/overlay_18.s
View File

@@ -2199,7 +2199,7 @@ _0223A7EA:
ldr r0, _0223AB04 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r5, r0, #0
bl ov18_0223D638
@@ -3021,7 +3021,7 @@ ov18_0223AE88: ; 0x0223AE88
ldr r0, _0223AED0 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r6, r0, #0
bl sub_02026CC4
bl sub_02025C38
@@ -3153,7 +3153,7 @@ ov18_0223AF48: ; 0x0223AF48
ldr r0, [r0]
str r2, [sp, #8]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
str r0, [sp, #0x38]
bl ov18_0223AED4
@@ -5023,12 +5023,12 @@ ov18_0223BD94: ; 0x0223BD94
add r4, r1, #0
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
ldr r0, _0223BDDC ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r6, r0, #0
add r0, r5, #0
@@ -5057,7 +5057,7 @@ ov18_0223BDE0: ; 0x0223BDE0
ldr r0, _0223BE24 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r5, r0, #0
add r0, r4, #0
@@ -5583,7 +5583,7 @@ ov18_0223C1F0: ; 0x0223C1F0
ldr r0, _0223C338 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r6, r0, #0
ldr r0, _0223C338 ; =0x02251380
@@ -6847,7 +6847,7 @@ ov18_0223CB94: ; 0x0223CB94
ldr r0, _0223CC28 ; =0x000004C8
str r4, [r1, r0]
add r0, r4, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
mov r4, #0
ldr r7, _0223CC20 ; =0x02251384
@@ -6910,7 +6910,7 @@ ov18_0223CC2C: ; 0x0223CC2C
ldr r1, [r0]
ldr r0, _0223CC74 ; =0x000004C8
ldr r0, [r1, r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
mov r4, #0
ldr r7, _0223CC70 ; =0x02251384
@@ -7769,7 +7769,7 @@ ov18_0223D298: ; 0x0223D298
ldr r1, [r0]
ldr r0, _0223D2E8 ; =0x000004C8
ldr r0, [r1, r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r4, r0, #0
mov r5, #0
@@ -9566,17 +9566,17 @@ ov18_0223E060: ; 0x0223E060
bl AllocFromHeap
add r4, r0, #0
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
add r6, r0, #0
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
bl ov18_0224D2F0
add r0, r5, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
bl ov18_022492F8
_0223E110:
@@ -10646,7 +10646,7 @@ ov18_0223E8A8: ; 0x0223E8A8
ldr r0, _0223E948 ; =0x022513A0
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
mov r4, #0
ldr r7, _0223E948 ; =0x022513A0
@@ -10739,7 +10739,7 @@ ov18_0223E958: ; 0x0223E958
ldr r0, [r0, #4]
str r4, [r0, #0x40]
add r0, r4, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
ldr r2, _0223E9B0 ; =0x022513A0
mov r1, #0xa3
@@ -11874,7 +11874,7 @@ ov18_0223F1DC: ; 0x0223F1DC
ldr r0, _0223F228 ; =0x022513A0
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
mov r4, #0
add r7, r0, #0
@@ -12305,7 +12305,7 @@ ov18_0223F50C: ; 0x0223F50C
add r6, r2, #0
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r7, r0, #0
add r0, r5, #0
@@ -12817,7 +12817,7 @@ ov18_0223F918: ; 0x0223F918
b _0223FA5E
_0223F926:
ldr r0, [r0, #0x40]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
add r6, r0, #0
ldr r0, _0223FA64 ; =0x00000622
@@ -15123,7 +15123,7 @@ ov18_02240A44: ; 0x02240A44
add r4, r2, #0
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
add r5, r0, #0
ldrb r0, [r4, #1]
@@ -24144,7 +24144,7 @@ _02245050: .word ov18_02246338
ov18_02245054: ; 0x02245054
push {r4, r5, r6, lr}
add r5, r0, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CA8
add r4, r0, #0
bl sub_02026CC0
@@ -26730,7 +26730,7 @@ _02246488: .word ov18_022513EC
ov18_0224648C: ; 0x0224648C
push {r3, r4, r5, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -26767,7 +26767,7 @@ _022464CA:
ov18_022464D0: ; 0x022464D0
push {r3, r4, r5, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -26805,7 +26805,7 @@ ov18_02246514: ; 0x02246514
push {r4, r5, r6, lr}
sub sp, #0x20
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl sub_0204652C
@@ -27700,7 +27700,7 @@ ov18_02246C94: ; 0x02246C94
add r5, r2, #0
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
ldrb r4, [r5]
add r7, r0, #0
@@ -28092,13 +28092,13 @@ ov18_02246FB4: ; 0x02246FB4
ldr r0, _02247108 ; =0x022513EC
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CA8
str r0, [sp, #0xc]
ldr r0, _02247108 ; =0x022513EC
ldr r0, [r0]
ldr r0, [r0]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r4, r0, #0
mov r0, #0
@@ -30029,7 +30029,7 @@ ov18_02247EA0: ; 0x02247EA0
add r3, r2, #0
bl ov18_0224DCB8
ldr r0, [r4, #8]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
bl sub_02026940
add r4, #0x2a
@@ -31041,7 +31041,7 @@ ov18_022486B8: ; 0x022486B8
cmp r0, #0
beq _02248704
ldr r0, [r4, #4]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CB4
bl sub_02026B90
ldr r0, _0224873C ; =0x000005E3
@@ -32640,7 +32640,7 @@ _02249334: .word FreeToHeap
ov18_02249338: ; 0x02249338
push {r3, lr}
ldr r0, [r0, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
bl sub_0202623C
pop {r3, pc}
@@ -32651,7 +32651,7 @@ ov18_02249338: ; 0x02249338
ov18_0224934C: ; 0x0224934C
push {r3, lr}
ldr r0, [r0, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
bl sub_02025DB0
pop {r3, pc}
@@ -32663,7 +32663,7 @@ ov18_02249360: ; 0x02249360
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r1, r4, #0
bl sub_02025DC8
@@ -32675,7 +32675,7 @@ ov18_02249360: ; 0x02249360
ov18_02249378: ; 0x02249378
push {r3, lr}
ldr r0, [r0, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
bl sub_02025F80
pop {r3, pc}
@@ -32687,7 +32687,7 @@ ov18_0224938C: ; 0x0224938C
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r1, r4, #0
bl sub_02025F98
@@ -32719,7 +32719,7 @@ _022493C4: .word ov18_022513F8
ov18_022493C8: ; 0x022493C8
push {r3, lr}
ldr r0, [r0, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
bl sub_02026050
pop {r3, pc}
@@ -32731,7 +32731,7 @@ ov18_022493DC: ; 0x022493DC
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r1, r4, #0
bl sub_02026258
@@ -32744,7 +32744,7 @@ ov18_022493F4: ; 0x022493F4
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r1, r4, #0
bl sub_02026068
@@ -32757,7 +32757,7 @@ ov18_0224940C: ; 0x0224940C
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r1, r4, #0
bl sub_02026074
@@ -32769,7 +32769,7 @@ ov18_0224940C: ; 0x0224940C
ov18_02249424: ; 0x02249424
push {r3, lr}
ldr r0, [r0, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
bl sub_0202616C
pop {r3, pc}
@@ -32781,7 +32781,7 @@ ov18_02249438: ; 0x02249438
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r1, r4, #0
bl sub_02026188
@@ -32977,7 +32977,7 @@ _022495BA:
cmp r6, #4
bne _022495E2
ldr r0, [r5, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
mov r1, #4
bl PlayerProfile_GetPlayerName_NewString
@@ -35134,7 +35134,7 @@ ov18_0224A78C: ; 0x0224A78C
bl ov18_022498EC
bl ov18_0224D704
ldr r0, [r4, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
add r1, r0, #0
mov r0, #1
@@ -35433,7 +35433,7 @@ ov18_0224A9EC: ; 0x0224A9EC
add r5, r0, #0
bl ListMenuGetTemplateField
ldr r0, [r0, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r1, r4, #0
bl sub_02025F0C
@@ -36386,7 +36386,7 @@ ov18_0224B190: ; 0x0224B190
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r1, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r4, r0, #0
add r1, r5, #0
@@ -36412,7 +36412,7 @@ ov18_0224B1C4: ; 0x0224B1C4
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r1, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r1, r5, #0
add r4, r0, #0
@@ -37222,7 +37222,7 @@ ov18_0224B84C: ; 0x0224B84C
push {r3, r4, r5, r6, lr}
sub sp, #0xc
add r6, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r6, #0
bl sub_0204652C
@@ -37482,11 +37482,11 @@ _0224BA70:
bl ov18_0223D658
bl ov18_0224DD94
ldr r0, [r4, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl Save_PlayerData_GetProfileAddr
add r5, r0, #0
ldr r0, [r4, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
mov r3, #0
str r3, [sp]
@@ -38088,7 +38088,7 @@ ov18_0224BFAC: ; 0x0224BFAC
add r6, r0, #0
ldr r0, [r6, #0xc]
add r4, r1, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
bl sub_02025D40
add r7, r4, r0
@@ -38223,7 +38223,7 @@ ov18_0224C0AC: ; 0x0224C0AC
add r6, r0, #0
ldr r0, [r6, #0xc]
add r4, r1, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
add r5, r0, #0
bl sub_02026CC4
add r7, r0, #0
@@ -38366,7 +38366,7 @@ ov18_0224C1C0: ; 0x0224C1C0
ldr r0, [r5, #0xc]
add r7, r2, #0
add r4, r1, #0
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
add r6, r0, #0
add r0, r7, #0
@@ -38749,7 +38749,7 @@ ov18_0224C510: ; 0x0224C510
bl ListMenuGetTemplateField
add r4, r0, #0
ldr r0, [r4, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
str r0, [sp, #0x2c]
add r0, r4, #0
@@ -39310,7 +39310,7 @@ ov18_0224C9C4: ; 0x0224C9C4
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r5, #0xc]
bl ScriptEnvironment_GetSavePtr
bl FieldSystem_GetSaveDataPtr
bl sub_02026CC4
ldr r1, _0224CA24 ; =0x00000215
add r4, r0, #0
@@ -40405,7 +40405,7 @@ _0224D2AE:
ldr r0, [r6, #0xc]
add r1, r4, #0
ldr r0, [r0, #0x34]
bl sub_02058060
bl GetMapObjectByID
ldr r1, [sp]
bl sub_020584AC
_0224D2CE:
@@ -43200,7 +43200,7 @@ _0224E80A:
ov18_0224E824: ; 0x0224E824
push {r4, r5, r6, lr}
add r5, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl sub_0204652C
@@ -43266,31 +43266,31 @@ _0224E8B4:
ldr r1, _0224E948 ; =ov18_0224E960
add r0, r5, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
b _0224E93C
_0224E8C0:
ldr r1, _0224E94C ; =ov18_0224EAD4
add r0, r5, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
b _0224E93C
_0224E8CC:
ldr r1, _0224E950 ; =ov18_0224EDDC
add r0, r5, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
b _0224E93C
_0224E8D8:
ldr r1, _0224E954 ; =ov18_0224F258
add r0, r5, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
b _0224E93C
_0224E8E4:
ldr r1, _0224E958 ; =ov18_0224F528
add r0, r5, #0
add r2, r4, #0
bl sub_0204640C
bl TaskManager_Call
b _0224E93C
_0224E8F0:
ldr r0, [r4, #8]
@@ -43343,7 +43343,7 @@ _0224E95C: .word 0x0000050C
ov18_0224E960: ; 0x0224E960
push {r3, r4, r5, lr}
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -43497,7 +43497,7 @@ ov18_0224EA74: ; 0x0224EA74
str r0, [r4, r1]
ldr r1, _0224EAD0 ; =ov18_0224E824
add r0, r6, #0
bl sub_0204640C
bl TaskManager_Call
pop {r4, r5, r6, pc}
nop
_0224EAC0: .word 0x00000528
@@ -43512,7 +43512,7 @@ ov18_0224EAD4: ; 0x0224EAD4
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x28
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -43883,7 +43883,7 @@ ov18_0224EDDC: ; 0x0224EDDC
push {r4, r5, r6, r7, lr}
sub sp, #0x24
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -44439,7 +44439,7 @@ ov18_0224F258: ; 0x0224F258
push {r4, r5, r6, r7, lr}
sub sp, #0x24
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r4, #0
bl sub_0204652C
@@ -44783,7 +44783,7 @@ ov18_0224F528: ; 0x0224F528
push {r4, r5, r6, r7, lr}
sub sp, #0x24
add r4, r0, #0
bl sub_02046528
bl TaskManager_GetFieldSystem
str r0, [sp]
add r0, r4, #0
bl sub_0204652C

4
arm9/overlays/59/include/ov59_Intro.h
View File

@@ -12,7 +12,7 @@
struct ov59_UnkPlayerStruct
{
u8 padding[0x4];
GenderEnum gender;
PlayerGender gender;
u8 padding2[0x10];
struct String *name;
};
@@ -46,7 +46,7 @@ typedef struct ov59_IntroOverlayData
u32 fadeCounter;
fx32 alphaBlend1;
fx32 alphaBlend2;
GenderEnum selectedGender;
PlayerGender selectedGender;
u8 scrnDataIndexMain;
u8 spriteDataIndex0;
u8 spriteDataIndex1;

22
arm9/overlays/59/src/ov59_Intro.c
View File

@@ -1335,7 +1335,7 @@ void ov59_ResetPlayerAnimation(ov59_IntroOverlayData *data)
void ov59_AnimatePlayerSprite(ov59_IntroOverlayData *data)
{
u32 timer;
if (data->selectedGender == Male)
if (data->selectedGender == PLAYER_GENDER_MALE)
{
if (data->maleAnimTimer != 0)
{
@@ -1400,7 +1400,7 @@ BOOL ov59_PlayerShrinkAnimation(ov59_IntroOverlayData *data)
struct ov59_CharStruct021D9E70 charStruct;
struct ov59_CharStruct021D9E70 charStruct2;
const struct ov59_CharStruct021D9E70 *addr;
if (data->selectedGender == Male)
if (data->selectedGender == PLAYER_GENDER_MALE)
{
charStruct = ov59_021D9E88;
addr = &charStruct;
@@ -2487,7 +2487,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
{
break;
}
data->selectedGender = Male;
data->selectedGender = PLAYER_GENDER_MALE;
data->controllerCounter = 67;
break;
@@ -2497,7 +2497,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
data->alphaBlend1 = 6;
data->alphaBlend2 = 10;
data->fadeCounter = 2;
if (data->selectedGender == Male)
if (data->selectedGender == PLAYER_GENDER_MALE)
{
data->controllerCounter = 68;
}
@@ -2509,7 +2509,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
}
if ((gSystem.newKeys & PAD_KEY_LEFT) == 0x20 || (gSystem.newKeys & PAD_KEY_RIGHT) == 0x10)
{
data->selectedGender = (data->selectedGender == Male ? Female : Male);
data->selectedGender = (data->selectedGender == PLAYER_GENDER_MALE ? PLAYER_GENDER_FEMALE : PLAYER_GENDER_MALE);
PlaySE(SEQ_SE_DP_SELECT);
}
ov59_AnimatePlayerSprite(data); //animate sprite
@@ -2550,7 +2550,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 72: //All right, so you’re a boy/girl?
u32 msgNo = data->selectedGender == Male ? narc_0341_00022 : narc_0341_00023;
u32 msgNo = data->selectedGender == PLAYER_GENDER_MALE ? narc_0341_00022 : narc_0341_00023;
if (ov59_DisplayMessage(data, msgNo, TRUE) != TRUE)
{
break;
@@ -2578,7 +2578,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 74: //reset blend
enum GFBgLayer layer = ((data->selectedGender == Male) ? GF_BG_LYR_MAIN_1 : GF_BG_LYR_MAIN_2);
enum GFBgLayer layer = ((data->selectedGender == PLAYER_GENDER_MALE) ? GF_BG_LYR_MAIN_1 : GF_BG_LYR_MAIN_2);
if (ov59_FadeController(data, layer, 1) != TRUE)
{
break;
@@ -2604,7 +2604,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
ToggleBgLayer(GF_BG_LYR_MAIN_0, GX_LAYER_TOGGLE_ON);
ToggleBgLayer(GF_BG_LYR_MAIN_3, GX_LAYER_TOGGLE_ON);
ToggleBgLayer(GF_BG_LYR_SUB_3, GX_LAYER_TOGGLE_ON);
if (data->selectedGender == Male)
if (data->selectedGender == PLAYER_GENDER_MALE)
{
ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_LAYER_TOGGLE_ON);
BgSetPosTextAndCommit(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_X, 0);
@@ -2627,7 +2627,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 79: //Your name is {STRVAR_1 3, 0}?
u32 messageNumber = (data->selectedGender == Male ? narc_0341_00025 : narc_0341_00026); //no idea why these are different strings, they contain the same thing
u32 messageNumber = (data->selectedGender == PLAYER_GENDER_MALE ? narc_0341_00025 : narc_0341_00026); //no idea why these are different strings, they contain the same thing
if (ov59_DisplayMessage(data, messageNumber, TRUE) != TRUE)
{
break;
@@ -2658,7 +2658,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 81: //blend adjust
enum GFBgLayer layer2 = ((data->selectedGender == Male) ? GF_BG_LYR_MAIN_1 : GF_BG_LYR_MAIN_2);
enum GFBgLayer layer2 = ((data->selectedGender == PLAYER_GENDER_MALE) ? GF_BG_LYR_MAIN_1 : GF_BG_LYR_MAIN_2);
if (ov59_FadeController(data, layer2, 1) != TRUE)
{
break;
@@ -2886,7 +2886,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data)
break;
case 104: //load sprite
if (data->selectedGender == Male)
if (data->selectedGender == PLAYER_GENDER_MALE)
{
data->spriteDataIndex0 = 2;
data->spriteDataIndex1 = 0;

2
arm9/src/message_format.c
View File

@@ -139,7 +139,7 @@ void BufferFriendsName(MessageFormat *messageFormat, u32 idx, struct SaveData *
{
PlayerProfile *profile = Save_PlayerData_GetProfileAddr(save);
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0497_bin, messageFormat->heap_id);
if (PlayerProfile_GetTrainerGender(profile) == Male)
if (PlayerProfile_GetTrainerGender(profile) == PLAYER_GENDER_MALE)
{
ReadMsgDataIntoString(msgData, narc_0497_00001, messageFormat->buffer); //Dawn
}

6
arm9/src/player_data.c
View File

@@ -109,14 +109,14 @@ u16 PlayerProfile_GetTrainerID_VisibleHalf(PlayerProfile * data)
return (u16)data->playerId;
}
void PlayerProfile_SetTrainerGender(PlayerProfile * data, GenderEnum gender)
void PlayerProfile_SetTrainerGender(PlayerProfile * data, PlayerGender gender)
{
data->gender = gender;
}
GenderEnum PlayerProfile_GetTrainerGender(PlayerProfile * data)
PlayerGender PlayerProfile_GetTrainerGender(PlayerProfile * data)
{
return (GenderEnum)data->gender;
return (PlayerGender)data->gender;
}
BOOL PlayerProfile_TestBadgeFlag(PlayerProfile * data, u32 badgeno)

359
arm9/src/scrcmd.c
View File

@@ -73,23 +73,23 @@ extern void ov05_021E2B9C(u32 param0, u8 param1);
extern u32 sub_0205AEA4(LocalMapObject *event, const void *ptr);
extern u32 sub_02058B2C(LocalMapObject *event);
extern u32 sub_02058B4C(LocalMapObject *event);
extern LocalMapObject *sub_020580B4(u32 param0, u32 param1);
extern LocalMapObject *sub_02058060(u32 param0, u16 eventId);
extern LocalMapObject *sub_020580B4(MapObjectManager *mapObjectManager, u32 param1);
extern LocalMapObject *GetMapObjectByID(MapObjectManager *mapObjectManager, u16 eventId);
extern BOOL sub_0205AEF0(u32 param0);
extern void sub_0205AEFC(u32 param0);
extern void sub_02058780(u32 param0);
extern void sub_02058780(MapObjectManager *mapObjectManager);
extern LocalMapObject *PlayerAvatar_GetMapObject(PlayerAvatar *playerAvatar);
extern u32 sub_0205AE28(LocalMapObject *event);
extern void sub_02058908(LocalMapObject *event);
extern u32 sub_02058854(LocalMapObject *event);
extern LocalMapObject *sub_0205E7C4(LocalMapObject *event);
extern void sub_02058914(LocalMapObject *event);
extern void sub_020587B0(u32 param0);
extern void sub_020587B0(MapObjectManager *mapObjectManager);
extern u32 sub_02034B64(FieldSystem *fieldSystem);
extern u32 sub_02034B6C(FieldSystem *fieldSystem);
extern u32 sub_020575D4(u32 param0, u16 eventVar, u32 param2, u32 mapId, u32 param4);
extern u32 sub_020575D4(MapObjectManager *mapObjectManager, u16 eventVar, u32 param2, u32 mapId, u32 param4);
extern void sub_02057688(LocalMapObject *event);
extern LocalMapObject *sub_0205753C(u32 param0, u16 x, u16 y, u16 z, u32 param4, u32 param5, u32 mapId);
extern LocalMapObject *sub_0205753C(MapObjectManager *mapObjectManager, u16 x, u16 y, u16 z, u32 param4, u32 param5, u32 mapId);
extern u32 sub_02059D1C(LocalMapObject *target);
extern LocalMapObject *sub_0205889C(LocalMapObject *target, u32 param1);
extern LocalMapObject *sub_020588B8(LocalMapObject *target, u32 param1);
@@ -221,6 +221,36 @@ extern void sub_02031C54(void);
extern void sub_02031C64(void);
extern void sub_02052B74(u16 param0);
extern void sub_02052D08(MessageFormat *messageFormat, u32 unk0, u16 objId, PlayerProfile *playerProfile, SaveEasyChat *easyChat);
extern void sub_0208881C(FieldSystem *fieldSystem);
extern void sub_02052F74(u32 param0);
extern void sub_02031B50(void);
extern u16 sub_020527A8(u32 param0);
extern u16 sub_02052A10(u32 param0, u32 objectId, u32 param2, MessageFormat *messageFormat);
extern u16 sub_020524CC(u32 param0, u32 objectId);
extern u16 sub_02052544(u32 param0, u32 objectId, u32 param2);
extern u32 sub_02052604(u32 param0);
extern void sub_020534DC(MapObjectManager *mapObjectManager, u32 param1);
extern void sub_02031C2C(void);
extern void sub_0205265C(u32 param0, u32 param1, u32 param2);
extern u32 sub_02052608(u32 param0);
extern void sub_02052E10(u32 param0);
extern u32 sub_02052648(u32 param0);
extern u32 sub_02052718(u32 param0, u32 param1);
extern void sub_0205363C(u32 trainerId, PlayerGender playerGender, MessageFormat *messageFormat);
extern u16 sub_02053678(u32 trainerId, PlayerGender playerGender, u32 param2);
extern u16 sub_020536D0(PlayerGender playerGender, u16 param1, u16 param2);
extern void sub_02049EA4(TaskManager *taskManager);
extern void LocalFieldData_SetBlackoutSpawn(LocalFieldData *localFieldData, u16 spawnPoint);
extern void CallFieldTask_BlackOut(TaskManager *taskManager);
extern void HealParty(PlayerParty *playerParty);
extern void sub_02050024(void);
extern u32 sub_02031810(void);
extern u32 sub_0202EDF8(void);
extern void sub_02050048(void);
extern void sub_0204FF5C(FieldSystem *fieldSystem);
extern void sub_0204F6DC(u16 param0);
extern void SetObjectEventXYPos(FieldSystem *fieldSystem, u16 objectId, u16 x, u16 y);
extern void sub_02058E28(LocalMapObject *object, u16 x, u16 z, u16 y, u16 direction);
u8 UNK_021C5A0C[4];
@@ -257,6 +287,11 @@ static BOOL sub_0203C9F8(ScriptContext *ctx);
static BOOL sub_0203CCF8(ScriptContext *ctx);
static BOOL sub_0203CD90(ScriptContext *ctx);
static BOOL sub_0203D314(ScriptContext *ctx);
static BOOL sub_0203D47C(ScriptContext *ctx);
static BOOL sub_0203D5CC(ScriptContext *ctx);
static BOOL sub_0203D688(ScriptContext *ctx);
static BOOL sub_0203D6E0(ScriptContext *ctx);
static BOOL sub_0203D904(ScriptContext *ctx);
extern u8 sScriptConditionTable[6][3];
@@ -1476,12 +1511,12 @@ BOOL ScrCmd_Unk02A1(ScriptContext *ctx) { //02A1
static LocalMapObject *sub_0203B120(FieldSystem *fieldSystem, u16 eventId) {
if (eventId == 242) {
return sub_020580B4(fieldSystem->unk34, 48);
return sub_020580B4(fieldSystem->mapObjectManager, 48);
} else if (eventId == 241) {
LocalMapObject **cameraTarget = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_CAMERA_TARGET);
return *cameraTarget;
} else {
return sub_02058060(fieldSystem->unk34, eventId);
return GetMapObjectByID(fieldSystem->mapObjectManager, eventId);
}
}
@@ -1538,7 +1573,7 @@ BOOL ScrCmd_LockAllEvents(ScriptContext *ctx) { //0060
LocalMapObject **lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED);
if (*lastInteracted == NULL) {
sub_02058780(fieldSystem->unk34);
sub_02058780(fieldSystem->mapObjectManager);
} else {
ScrCmd_LockAllEvents2(ctx);
}
@@ -1562,7 +1597,7 @@ static BOOL sub_0203B218(ScriptContext *ctx) {
}
}
if (UNK_021C5A0C[0] & 2) {
LocalMapObject *unk1 = sub_020580B4(fieldSystem->unk34, 48);
LocalMapObject *unk1 = sub_020580B4(fieldSystem->mapObjectManager, 48);
if (sub_02058854(unk1) == 0) {
sub_02058908(unk1);
UNK_021C5A0C[0] &= 0xfd;
@@ -1587,12 +1622,12 @@ BOOL ScrCmd_LockAllEvents2(ScriptContext *ctx) { //02B4
FieldSystem *fieldSystem = ctx->fieldSystem;
LocalMapObject **lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED);
LocalMapObject *playerAvatar = PlayerAvatar_GetMapObject(fieldSystem->playerAvatar);
LocalMapObject *unk1 = sub_020580B4(fieldSystem->unk34, 48);
LocalMapObject *unk1 = sub_020580B4(fieldSystem->mapObjectManager, 48);
LocalMapObject *unk2 = sub_0205E7C4(*lastInteracted);
u32 unk34 = fieldSystem->unk34;
MapObjectManager *mapObjectManager = fieldSystem->mapObjectManager;
UNK_021C5A0C[0] = 0;
sub_02058780(unk34);
sub_02058780(mapObjectManager);
if (sub_0205AE28(playerAvatar) == 0) {
UNK_021C5A0C[0] |= 1;
sub_02058914(playerAvatar);
@@ -1621,39 +1656,39 @@ BOOL ScrCmd_LockAllEvents2(ScriptContext *ctx) { //02B4
}
BOOL ScrCmd_ReleaseAllEvents(ScriptContext *ctx) { //0061
sub_020587B0(ctx->fieldSystem->unk34);
sub_020587B0(ctx->fieldSystem->mapObjectManager);
return TRUE;
}
BOOL ScrCmd_LockEvent(ScriptContext *ctx) { //0062
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 eventId = ScriptReadHalfword(ctx);
sub_02058908(sub_02058060(fieldSystem->unk34, eventId));
sub_02058908(GetMapObjectByID(fieldSystem->mapObjectManager, eventId));
return FALSE;
}
BOOL ScrCmd_ReleaseEvent(ScriptContext *ctx) { //0063
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 eventId = ScriptReadHalfword(ctx);
sub_02058914(sub_02058060(fieldSystem->unk34, eventId));
sub_02058914(GetMapObjectByID(fieldSystem->mapObjectManager, eventId));
return FALSE;
}
BOOL ScrCmd_AddOverworldEvent(ScriptContext *ctx) { //0064
BOOL ScrCmd_AddObjectEvent(ScriptContext *ctx) { //0064
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 eventId = ScriptGetVar(ctx);
u32 unk0 = sub_02034B64(fieldSystem);
u32 unk1 = sub_02034B6C(fieldSystem);
u32 res = sub_020575D4(fieldSystem->unk34, eventId, unk0, fieldSystem->location->mapId, unk1);
u32 res = sub_020575D4(fieldSystem->mapObjectManager, eventId, unk0, fieldSystem->location->mapId, unk1);
GF_ASSERT(res);
return FALSE;
}
BOOL ScrCmd_RemoveOverworldEvent(ScriptContext *ctx) { //0065
BOOL ScrCmd_RemoveObjectEvent(ScriptContext *ctx) { //0065
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 eventId = ScriptGetVar(ctx);
sub_02057688(sub_02058060(fieldSystem->unk34, eventId));
sub_02057688(GetMapObjectByID(fieldSystem->mapObjectManager, eventId));
return FALSE;
}
@@ -1661,7 +1696,7 @@ BOOL ScrCmd_LockCamera(ScriptContext *ctx) { //0066
u16 x = ScriptGetVar(ctx);
u16 y = ScriptGetVar(ctx);
LocalMapObject **targetPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET);
*targetPtr = sub_0205753C(ctx->fieldSystem->unk34, x, y, 0, 0x2000, 0, ctx->fieldSystem->location->mapId);
*targetPtr = sub_0205753C(ctx->fieldSystem->mapObjectManager, x, y, 0, 0x2000, 0, ctx->fieldSystem->location->mapId);
sub_02059D1C(*targetPtr);
sub_0205889C(*targetPtr, 1);
sub_020588B8(*targetPtr, 0);
@@ -1674,7 +1709,7 @@ BOOL ScrCmd_LockCamera(ScriptContext *ctx) { //0066
BOOL ScrCmd_ReleaseCamera(ScriptContext *ctx) { //0067
LocalMapObject **targetPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET);
sub_02057654(*targetPtr);
VecFx32 *position = sub_02058B7C(sub_02058060(ctx->fieldSystem->unk34, 0xff));
VecFx32 *position = sub_02058B7C(GetMapObjectByID(ctx->fieldSystem->mapObjectManager, 0xff));
ov05_021EF5E0(position, ctx->fieldSystem->unk24);
Camera_SetFixedTarget(position, ctx->fieldSystem->camera);
return FALSE;
@@ -1705,10 +1740,10 @@ BOOL ScrCmd_GetPlayerPosition(ScriptContext *ctx) { //0069
return FALSE;
}
BOOL ScrCmd_GetOverworldEventPosition(ScriptContext *ctx) { //006A
BOOL ScrCmd_GetObjectEventPosition(ScriptContext *ctx) { //006A
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 eventId = ScriptGetVar(ctx);
LocalMapObject *event = sub_02058060(fieldSystem->unk34, eventId);
LocalMapObject *event = GetMapObjectByID(fieldSystem->mapObjectManager, eventId);
u16 *xVar = ScriptGetVarPointer(ctx);
u16 *yVar = ScriptGetVarPointer(ctx);
@@ -1740,35 +1775,35 @@ BOOL ScrCmd_Unk006B(ScriptContext *ctx) { //006B - todo: CheckPersonPosition?
return FALSE;
}
BOOL ScrCmd_KeepOverworldEvent(ScriptContext *ctx) { //006C
BOOL ScrCmd_KeepObjectEvent(ScriptContext *ctx) { //006C
u16 eventId = ScriptGetVar(ctx);
LocalMapObject *event = sub_02058060(ctx->fieldSystem->unk34, eventId);
LocalMapObject *event = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, eventId);
sub_02058994(event, ScriptReadByte(ctx));
return FALSE;
}
BOOL ScrCmd_SetOverworldEventMovement(ScriptContext *ctx) { //006D
BOOL ScrCmd_SetObjectEventMovement(ScriptContext *ctx) { //006D
u16 eventId = ScriptGetVar(ctx);
LocalMapObject *event = sub_02058060(ctx->fieldSystem->unk34, eventId);
LocalMapObject *event = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, eventId);
u16 movement = ScriptReadHalfword(ctx);
sub_02058E90(event, movement);
return FALSE;
}
BOOL ScrCmd_GetOverworldEventMovement(ScriptContext *ctx) { //02AD
BOOL ScrCmd_GetObjectEventMovement(ScriptContext *ctx) { //02AD
u16 *variable = ScriptGetVarPointer(ctx);
*variable = 0;
u16 eventId = ScriptGetVar(ctx);
LocalMapObject *event = sub_02058060(ctx->fieldSystem->unk34, eventId);
LocalMapObject *event = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, eventId);
if (event != NULL) {
*variable = sub_02058480(event);
}
return FALSE;
}
BOOL ScrCmd_OverworldEventStopFollowing(ScriptContext *ctx) { //006E
LocalMapObject *event = sub_020580B4(ctx->fieldSystem->unk34, 0x30);
BOOL ScrCmd_ObjectEventStopFollowing(ScriptContext *ctx) { //006E
LocalMapObject *event = sub_020580B4(ctx->fieldSystem->mapObjectManager, 0x30);
sub_02058EB0(event, 0xFE);
return FALSE;
}
@@ -2887,8 +2922,8 @@ BOOL ScrCmd_Unk013C(ScriptContext *ctx) { //013C
LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED);
MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT);
u16 unk0 = ScriptReadHalfword(ctx);
PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(ScriptEnvironment_GetSavePtr(ctx->fieldSystem));
SaveEasyChat *easyChat = Save_EasyChat_Get(ScriptEnvironment_GetSavePtr(ctx->fieldSystem));
PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem));
SaveEasyChat *easyChat = Save_EasyChat_Get(FieldSystem_GetSaveDataPtr(ctx->fieldSystem));
u16 objId;
if (unk0 == 0) {
@@ -2899,3 +2934,259 @@ BOOL ScrCmd_Unk013C(ScriptContext *ctx) { //013C
sub_02052D08(*messageFormat, unk0, objId, playerProfile, easyChat);
return FALSE;
}
BOOL ScrCmd_Unk013D(ScriptContext *ctx) { //013D
sub_0208881C(ctx->fieldSystem);
return FALSE;
}
BOOL ScrCmd_Unk013E(ScriptContext *ctx) { //013E
sub_02052F74(ctx->fieldSystem->unk7C);
sub_02031B50();
SetupNativeScript(ctx, sub_0203D47C);
return TRUE;
}
static BOOL sub_0203D47C(ScriptContext *ctx) {
return sub_02030F20() < 2;
}
BOOL ScrCmd_Unk013F(ScriptContext *ctx) { //013F
LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED);
u16 unk0 = ScriptReadHalfword(ctx);
u16 *var = ScriptGetVarPointer(ctx);
MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT);
*var = sub_02052A10(ctx->fieldSystem->unk78, MapObject_GetID(*lastInteracted), unk0, *messageFormat);
return FALSE;
}
BOOL ScrCmd_Unk02BA(ScriptContext *ctx) { //02BA
u16 *var = ScriptGetVarPointer(ctx);
*var = sub_020527A8(ctx->fieldSystem->unk78);
if (*var) {
void **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA);
FreeToHeap(*runningAppData);
}
return FALSE;
}
BOOL ScrCmd_Unk0140(ScriptContext *ctx) { //0140
FieldSystem *fieldSystem = ctx->fieldSystem;
LocalMapObject **lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED);
u16 *var = ScriptGetVarPointer(ctx);
*var = sub_020524CC(fieldSystem->unk78, MapObject_GetID(*lastInteracted));
return FALSE;
}
BOOL ScrCmd_Unk0146(ScriptContext *ctx) { //0146
FieldSystem *fieldSystem = ctx->fieldSystem;
LocalMapObject **lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED);
u16 unk0 = ScriptGetVar(ctx);
u16 *var = ScriptGetVarPointer(ctx);
*var = sub_02052544(fieldSystem->unk78, MapObject_GetID(*lastInteracted), unk0);
return FALSE;
}
BOOL ScrCmd_Unk0141(ScriptContext *ctx) { //0141
ctx->data[0] = ScriptReadHalfword(ctx);
SetupNativeScript(ctx, sub_0203D5CC);
return TRUE;
}
static BOOL sub_0203D5CC(ScriptContext *ctx) {
FieldSystem *fieldSystem = ctx->fieldSystem;
u32 unk0 = sub_02052604(fieldSystem->unk78);
u16 *var = GetVarPointer(fieldSystem, ctx->data[0]);
if (unk0 == 0) {
return FALSE;
} else {
*var = unk0;
return TRUE;
}
}
BOOL ScrCmd_Unk0142(ScriptContext *ctx) { //0142
sub_020534DC(ctx->fieldSystem->mapObjectManager, ctx->fieldSystem->unk7C);
return FALSE;
}
BOOL ScrCmd_Unk013A(ScriptContext *ctx) { //013A
sub_02052B74(4);
sub_02031C2C();
return FALSE;
}
BOOL ScrCmd_Unk013B(ScriptContext *ctx) { //013B
sub_02031C64();
sub_02031B50();
sub_02052B74(0);
return FALSE;
}
BOOL ScrCmd_Unk0143(ScriptContext *ctx) { //0143
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 unk0 = ScriptGetVar(ctx);
u16 unk1 = ScriptGetVar(ctx);
sub_0205265C(fieldSystem->unk78, unk0, unk1);
return FALSE;
}
BOOL ScrCmd_Unk0144(ScriptContext *ctx) { //0144
ctx->data[0] = ScriptReadHalfword(ctx);
SetupNativeScript(ctx, sub_0203D688);
return TRUE;
}
static BOOL sub_0203D688(ScriptContext *ctx) {
u16 *var = GetVarPointer(ctx->fieldSystem, ctx->data[0]);
u32 unk0 = sub_02052608(ctx->fieldSystem->unk78);
if (unk0 >= 1) {
*var = unk0;
sub_02052E10(ctx->fieldSystem->unk78);
return TRUE;
}
*var = 0;
return FALSE;
}
BOOL ScrCmd_Unk0145(ScriptContext *ctx) { //0145
ctx->data[0] = ScriptReadHalfword(ctx);
SetupNativeScript(ctx, sub_0203D6E0);
return TRUE;
}
static BOOL sub_0203D6E0(ScriptContext *ctx) {
u16 *var = GetVarPointer(ctx->fieldSystem, ctx->data[0]);
u32 unk0 = sub_02052648(ctx->fieldSystem->unk78);
if (gSystem.newKeys & PAD_BUTTON_B) {
unk0 = sub_02052718(ctx->fieldSystem->unk78, 8);
}
if (unk0 != 0) {
*var = unk0;
return TRUE;
}
return FALSE;
}
BOOL ScrCmd_Unk0153(ScriptContext *ctx) { //0153
sub_02049EA4(ctx->fieldSystem->taskManager);
return TRUE;
}
BOOL ScrCmd_Unk0154(ScriptContext *ctx) { //0154
PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem));
MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT);
sub_0205363C(PlayerProfile_GetTrainerID(playerProfile), PlayerProfile_GetTrainerGender(playerProfile), *messageFormat);
return FALSE;
}
BOOL ScrCmd_Unk0155(ScriptContext *ctx) { //0155
PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem));
u16 unk0 = ScriptGetVar(ctx);
u16 *var = ScriptGetVarPointer(ctx);
*var = sub_02053678(PlayerProfile_GetTrainerID(playerProfile), PlayerProfile_GetTrainerGender(playerProfile), unk0);
*var = sub_020536D0(PlayerProfile_GetTrainerGender(playerProfile), *var, 2);
return FALSE;
}
BOOL ScrCmd_Unk029C(ScriptContext *ctx) { //029C
PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem));
u16 unk0 = ScriptGetVar(ctx);
u16 *var = ScriptGetVarPointer(ctx);
*var = sub_02053678(PlayerProfile_GetTrainerID(playerProfile), PlayerProfile_GetTrainerGender(playerProfile), unk0);
return FALSE;
}
BOOL ScrCmd_SetPlayerAvatar(ScriptContext *ctx) { //0156
PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem));
u16 avatar = ScriptGetVar(ctx);
PlayerProfile_SetAvatar(playerProfile, avatar);
return FALSE;
}
BOOL ScrCmd_DummyBlackOut(ScriptContext *ctx) { //014B
CallFieldTask_BlackOut(ctx->taskManager);
return TRUE;
}
BOOL ScrCmd_SetSpawn(ScriptContext *ctx) { //014C
u16 spawnPoint = ScriptGetVar(ctx);
LocalFieldData *localFieldData = Save_LocalFieldData_Get(ctx->fieldSystem->saveData);
LocalFieldData_SetBlackoutSpawn(localFieldData, spawnPoint);
return FALSE;
}
BOOL ScrCmd_GetPlayerGender(ScriptContext *ctx) { //014D
PlayerProfile *playerProfile = Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveDataPtr(ctx->fieldSystem));
u16 *var = ScriptGetVarPointer(ctx);
*var = PlayerProfile_GetTrainerGender(playerProfile);
return FALSE;
}
BOOL ScrCmd_HealParty(ScriptContext *ctx) { //014E
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(ctx->taskManager);
HealParty(SaveArray_PlayerParty_Get(fieldSystem->saveData));
return FALSE;
}
BOOL ScrCmd_Unk014F(ScriptContext *ctx) { //014F
return FALSE;
}
BOOL ScrCmd_Unk0150(ScriptContext *ctx) { //0150
sub_02050024();
SetupNativeScript(ctx, sub_0203D904);
return TRUE;
}
static BOOL sub_0203D904(ScriptContext *ctx) {
if (sub_02031810() != 1 && sub_0202EDF8() != 1) {
return TRUE;
}
return FALSE;
}
BOOL ScrCmd_Unk02BB(ScriptContext *ctx) { //02BB
sub_02050048();
SetupNativeScript(ctx, sub_0203D904);
return TRUE;
}
BOOL ScrCmd_Unk0151(ScriptContext *ctx) { //0151
sub_0204FF5C(ctx->fieldSystem);
return FALSE;
}
BOOL ScrCmd_Unk0152(ScriptContext *ctx) { //0152
u16 unk0 = ScriptReadHalfword(ctx);
sub_0204F6DC(unk0);
return FALSE;
}
BOOL ScrCmd_CheckPocketNotEmpty(ScriptContext *ctx) { //017A
u16 pocket = ScriptGetVar(ctx);
u16 *var = ScriptGetVarPointer(ctx);
Bag *bag = Save_Bag_Get(ctx->fieldSystem->saveData);
*var = Bag_PocketNotEmpty(bag, pocket);
return FALSE;
}
BOOL ScrCmd_SetObjectEventSpawnPosition(ScriptContext *ctx) { //0186
u16 eventId = ScriptGetVar(ctx);
u16 xVar = ScriptGetVar(ctx);
u16 yVar = ScriptGetVar(ctx);
SetObjectEventXYPos(ctx->fieldSystem, eventId, xVar, yVar);
return FALSE;
}
BOOL ScrCmd_MoveObjectEvent(ScriptContext *ctx) { //0187
u16 eventId = ScriptGetVar(ctx);
u16 xVar = ScriptGetVar(ctx);
u16 zVar = ScriptGetVar(ctx);
u16 yVar = ScriptGetVar(ctx);
u16 direction = ScriptGetVar(ctx);
LocalMapObject *object = GetMapObjectByID(ctx->fieldSystem->mapObjectManager, eventId);
sub_02058E28(object, xVar, zVar, yVar, direction);
sub_02059D1C(object);
return FALSE;
}

4
arm9/src/scrcmd_coins.c
View File

@@ -80,7 +80,7 @@ BOOL ScrCmd_TakeCoinsAddress(struct ScriptContext * ctx) //02A8 - todo: TakeCoin
BOOL ScrCmd_HasEnoughCoinsImmediate(struct ScriptContext * ctx) //0274 - todo: CanAffordCoins?
{
struct FieldSystem* fieldSystem = ctx->fieldSystem;
struct SaveData * save = ScriptEnvironment_GetSavePtr(fieldSystem);
struct SaveData * save = FieldSystem_GetSaveDataPtr(fieldSystem);
// Created, but discarded.
PlayerProfile * player = Save_PlayerData_GetProfileAddr(save);
u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(fieldSystem->saveData);
@@ -104,7 +104,7 @@ BOOL ScrCmd_HasEnoughCoinsImmediate(struct ScriptContext * ctx) //0274 - todo: C
BOOL ScrCmd_HasEnoughCoinsAddress(struct ScriptContext * ctx) //02A9 - todo: CanAffordCoinsVar?
{
struct FieldSystem* fieldSystem = ctx->fieldSystem;
struct SaveData * save = ScriptEnvironment_GetSavePtr(fieldSystem);
struct SaveData * save = FieldSystem_GetSaveDataPtr(fieldSystem);
// Created, but discarded
PlayerProfile * player = Save_PlayerData_GetProfileAddr(save);
u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(fieldSystem->saveData);

2
arm9/src/scrcmd_daycare.c
View File

@@ -54,7 +54,7 @@ BOOL ScrCmd_GiveDaycareEgg(struct ScriptContext* ctx) //01A9
struct FieldSystem* fieldSystem = ctx->fieldSystem;
struct DayCare* daycare = SaveArray_Get(fieldSystem->saveData, 8);
struct PlayerParty* party = SaveArray_PlayerParty_Get(fieldSystem->saveData);
struct SaveData* save = ScriptEnvironment_GetSavePtr(ctx->fieldSystem);
struct SaveData* save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem);
PlayerProfile* player = Save_PlayerData_GetProfileAddr(save);
ov05_DayCare_GiveEggToPlayer(daycare, party, player);

12
arm9/src/scrcmd_mart.c
View File

@@ -5,7 +5,7 @@
#include "scrcmd.h"
#include "overlay_06.h"
extern void sub_02038AD0(struct TaskManager *);
extern void sub_02038AD0(TaskManager *);
static const u16 UNK_020F40A6[] = {
ITEM_AIR_MAIL,
@@ -344,7 +344,7 @@ const u16 *sSealsMartPointers[] = {
UNK_020F41B2,
};
BOOL ScrCmd_NormalMart(struct ScriptContext * ctx) //0147 - todo: Pokemart?
BOOL ScrCmd_NormalMart(ScriptContext * ctx) //0147 - todo: Pokemart?
{
u16 whichMart = ScriptGetVar(ctx);
s32 param;
@@ -398,7 +398,7 @@ BOOL ScrCmd_NormalMart(struct ScriptContext * ctx) //0147 - todo: Pokemart?
return TRUE;
}
BOOL ScrCmd_SpecialMart(struct ScriptContext * ctx) //0148
BOOL ScrCmd_SpecialMart(ScriptContext * ctx) //0148
{
u16 whichMart = ScriptGetVar(ctx);
u32 sp0;
@@ -413,7 +413,7 @@ BOOL ScrCmd_SpecialMart(struct ScriptContext * ctx) //0148
return TRUE;
}
BOOL ScrCmd_GoodsMart(struct ScriptContext * ctx) //0149
BOOL ScrCmd_GoodsMart(ScriptContext * ctx) //0149
{
u16 whichMart = ScriptGetVar(ctx);
u32 sp0;
@@ -427,7 +427,7 @@ BOOL ScrCmd_GoodsMart(struct ScriptContext * ctx) //0149
return TRUE;
}
BOOL ScrCmd_SealsMart(struct ScriptContext * ctx) //014A
BOOL ScrCmd_SealsMart(ScriptContext * ctx) //014A
{
u16 whichMart = ScriptGetVar(ctx);
@@ -435,7 +435,7 @@ BOOL ScrCmd_SealsMart(struct ScriptContext * ctx) //014A
return TRUE;
}
BOOL ScrCmd_AccessoriesShop(struct ScriptContext * ctx) //0257 - todo: Unsure if this is correct, SDSME has it as SprtSave?
BOOL ScrCmd_AccessoriesShop(ScriptContext * ctx) //0257 - todo: Unsure if this is correct, SDSME has it as SprtSave?
{
sub_02038AD0(ctx->fieldSystem->taskManager);
return TRUE;

10
arm9/src/scrcmd_money.c
View File

@@ -10,7 +10,7 @@ extern void ov05_021E28A0(struct FieldSystem *fieldSystem, Window *moneyBox);
BOOL ScrCmd_GiveMoney(struct ScriptContext * ctx) //006F
{
struct SaveData * save = ScriptEnvironment_GetSavePtr(ctx->fieldSystem);
struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem);
PlayerProfile * player = Save_PlayerData_GetProfileAddr(save);
u32 amount = ScriptReadWord(ctx);
@@ -21,7 +21,7 @@ BOOL ScrCmd_GiveMoney(struct ScriptContext * ctx) //006F
BOOL ScrCmd_TakeMoneyImmediate(struct ScriptContext * ctx) //0070 - todo: TakeMoney?
{
struct SaveData * save = ScriptEnvironment_GetSavePtr(ctx->fieldSystem);
struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem);
PlayerProfile * player = Save_PlayerData_GetProfileAddr(save);
u32 amount = ScriptReadWord(ctx);
@@ -32,7 +32,7 @@ BOOL ScrCmd_TakeMoneyImmediate(struct ScriptContext * ctx) //0070 - todo: TakeMo
BOOL ScrCmd_TakeMoneyAddress(struct ScriptContext * ctx) //01A3 - todo: TakeMoneyVar?
{
struct SaveData * save = ScriptEnvironment_GetSavePtr(ctx->fieldSystem);
struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem);
PlayerProfile * player = Save_PlayerData_GetProfileAddr(save);
u16 amount = ScriptGetVar(ctx);
@@ -43,7 +43,7 @@ BOOL ScrCmd_TakeMoneyAddress(struct ScriptContext * ctx) //01A3 - todo: TakeMone
BOOL ScrCmd_HasEnoughMoneyImmediate(struct ScriptContext * ctx) //0071 - todo: CanAffordMoney?
{
struct SaveData * save = ScriptEnvironment_GetSavePtr(ctx->fieldSystem);
struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem);
PlayerProfile * player = Save_PlayerData_GetProfileAddr(save);
u16 * ret_ptr = ScriptGetVarPointer(ctx);
@@ -64,7 +64,7 @@ BOOL ScrCmd_HasEnoughMoneyImmediate(struct ScriptContext * ctx) //0071 - todo: C
BOOL ScrCmd_HasEnoughMoneyAddress(struct ScriptContext * ctx) //01AB - todo: CanAffordMoneyVar?
{
struct SaveData * save = ScriptEnvironment_GetSavePtr(ctx->fieldSystem);
struct SaveData * save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem);
PlayerProfile * player = Save_PlayerData_GetProfileAddr(save);
u16 * ret_ptr = ScriptGetVarPointer(ctx);

2
arm9/src/scrcmd_move_relearner.c
View File

@@ -63,7 +63,7 @@ void sub_02045E74(struct ScriptContext* ctx, u8 a1, struct Pokemon* pokemon, u16
moveRelearner->pokemon = pokemon;
struct SaveData* save = ScriptEnvironment_GetSavePtr(ctx->fieldSystem);
struct SaveData* save = FieldSystem_GetSaveDataPtr(ctx->fieldSystem);
moveRelearner->player = Save_PlayerData_GetProfileAddr(save);
moveRelearner->options = Save_PlayerData_GetOptionsAddr(ctx->fieldSystem->saveData);

4
arm9/src/scrcmd_names.c
View File

@@ -25,7 +25,7 @@ BOOL ScrCmd_GetPlayerName(struct ScriptContext* ctx) //00CD - todo: BufferPlayer
struct FieldSystem *fieldSystem = ctx->fieldSystem;
MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT);
u8 idx = ScriptReadByte(ctx);
struct SaveData* save = ScriptEnvironment_GetSavePtr(fieldSystem);
struct SaveData* save = FieldSystem_GetSaveDataPtr(fieldSystem);
PlayerProfile* player = Save_PlayerData_GetProfileAddr(save);
BufferPlayersName(*messageFormat, idx, player);
@@ -202,7 +202,7 @@ BOOL ScrCmd_GetTrainerClassName(struct ScriptContext* ctx) //00D8 - todo: Buffer
BOOL ScrCmd_Unk00D9(struct ScriptContext* ctx) //00D9 - todo: BufferPlayerTrainerClassName? TextPlayerTrainerClassName?
{
struct FieldSystem *fieldSystem = ctx->fieldSystem;
struct SaveData* save = ScriptEnvironment_GetSavePtr(fieldSystem);
struct SaveData* save = FieldSystem_GetSaveDataPtr(fieldSystem);
PlayerProfile* player = Save_PlayerData_GetProfileAddr(save);
MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT);
u8 idx = ScriptReadByte(ctx);

2
arm9/src/scrcmd_party.c
View File

@@ -55,7 +55,7 @@ BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext* ctx) //0198 - todo: GetPart
BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext* ctx) //0199 - todo: CheckPartyPokemonTraded?
{
struct FieldSystem *fieldSystem = ctx->fieldSystem;
struct SaveData* save = ScriptEnvironment_GetSavePtr(fieldSystem);
struct SaveData* save = FieldSystem_GetSaveDataPtr(fieldSystem);
PlayerProfile* player = Save_PlayerData_GetProfileAddr(save);
u16* mon_slot = ScriptGetVarPointer(ctx);

8
arm9/src/task.c
View File

@@ -36,7 +36,7 @@ void sub_020463EC(struct TaskManager *taskManager, TaskFunc taskFunc, void *env)
}
}
void sub_0204640C(struct TaskManager *taskManager, TaskFunc taskFunc, void *env)
void TaskManager_Call(struct TaskManager *taskManager, TaskFunc taskFunc, void *env)
{
struct TaskManager *taskManager2 = FieldSys_CreateTask(taskManager->fieldSystem, taskFunc, env);
taskManager2->prev = taskManager;
@@ -83,7 +83,7 @@ BOOL sub_020464A4(void * r0)
BOOL sub_020464B8(struct TaskManager *taskManager)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
u32 * r4_2 = sub_0204652C(taskManager);
switch (r4_2[0])
{
@@ -108,10 +108,10 @@ void sub_02046500(struct TaskManager *taskManager, u32 r5, u32 r4)
r2[0] = 0;
r2[1] = r5;
r2[2] = r4;
sub_0204640C(taskManager, sub_020464B8, r2);
TaskManager_Call(taskManager, sub_020464B8, r2);
}
struct FieldSystem *sub_02046528(struct TaskManager *taskManager)
struct FieldSystem *TaskManager_GetFieldSystem(struct TaskManager *taskManager)
{
return taskManager->fieldSystem;
}

4
arm9/src/unk_0204AEA8.c
View File

@@ -8,7 +8,7 @@ extern void ov05_021E3444(u32, struct FieldSystem *, u32);
BOOL sub_0204AEA8(struct TaskManager *taskManager)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
u32 *v1 = sub_0204652C(taskManager);
switch (v1[0])
@@ -39,5 +39,5 @@ void sub_0204AEF8(struct TaskManager *taskManager, u32 a1, u32 a2)
v0[2] = a1;
v0[3] = a2;
sub_0204640C(taskManager, sub_0204AEA8, v0);
TaskManager_Call(taskManager, sub_0204AEA8, v0);
}

26
arm9/src/unk_0204AF24.c
View File

@@ -9,7 +9,7 @@ extern void ov05_021E331C(struct FieldSystem *);
BOOL sub_0204AF24(struct TaskManager *taskManager)
{
if(!sub_0203739C(sub_02046528(taskManager)))
if(!sub_0203739C(TaskManager_GetFieldSystem(taskManager)))
{
return TRUE;
}
@@ -18,19 +18,19 @@ BOOL sub_0204AF24(struct TaskManager *taskManager)
void sub_0204AF3C(struct TaskManager *taskManager)
{
struct FieldSystem * fieldSystem= sub_02046528(taskManager);
struct FieldSystem * fieldSystem= TaskManager_GetFieldSystem(taskManager);
if(!sub_0203739C(fieldSystem))
{
GF_ASSERT(FALSE);
return;
}
sub_02037394(fieldSystem);
sub_0204640C(taskManager, &sub_0204AF24, NULL);
TaskManager_Call(taskManager, &sub_0204AF24, NULL);
}
BOOL sub_0204AF6C(struct TaskManager *taskManager)
{
if(sub_020464A4(sub_02046528(taskManager)))
if(sub_020464A4(TaskManager_GetFieldSystem(taskManager)))
{
return TRUE;
}
@@ -39,14 +39,14 @@ BOOL sub_0204AF6C(struct TaskManager *taskManager)
void sub_0204AF84(struct TaskManager *taskManager) //TODO: RestoreOverworld
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
if(sub_0203739C(fieldSystem))
{
GF_ASSERT(FALSE);
return;
}
sub_0204649C(fieldSystem);
sub_0204640C(taskManager, &sub_0204AF6C, NULL);
TaskManager_Call(taskManager, &sub_0204AF6C, NULL);
}
BOOL sub_0204AFB4(struct TaskManager *taskManager)
@@ -61,24 +61,24 @@ BOOL sub_0204AFB4(struct TaskManager *taskManager)
void sub_0204AFC8(struct TaskManager *taskManager)
{
if(!sub_0203739C(sub_02046528(taskManager)))
if(!sub_0203739C(TaskManager_GetFieldSystem(taskManager)))
{
GF_ASSERT(0);
return;
}
BeginNormalPaletteFade(0, 0, 0, GX_RGB_BLACK, 6, 1, 4);
sub_0204640C(taskManager, &sub_0204AFB4, 0);
TaskManager_Call(taskManager, &sub_0204AFB4, 0);
}
void sub_0204B00C(struct TaskManager *taskManager)
{
if(!sub_0203739C(sub_02046528(taskManager)))
if(!sub_0203739C(TaskManager_GetFieldSystem(taskManager)))
{
GF_ASSERT(0);
return;
}
BeginNormalPaletteFade(0, 1, 1, GX_RGB_BLACK, 6, 1, 4);
sub_0204640C(taskManager, sub_0204AFB4, 0);
TaskManager_Call(taskManager, sub_0204AFB4, 0);
}
BOOL sub_0204B050(struct TaskManager *taskManager)
@@ -104,13 +104,13 @@ BOOL sub_0204B050(struct TaskManager *taskManager)
void sub_0204B090(struct TaskManager *taskManager)
{
sub_0204640C(taskManager, &sub_0204B050, 0);
TaskManager_Call(taskManager, &sub_0204B050, 0);
}
BOOL sub_0204B0A0(struct TaskManager *taskManager)
{
u32 * r4 = sub_02046530(taskManager);
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
switch(r4[0])
{
case 0:
@@ -132,5 +132,5 @@ BOOL sub_0204B0A0(struct TaskManager *taskManager)
void sub_0204B0E8(struct TaskManager *taskManager)
{
sub_0204640C(taskManager, &sub_0204B0A0, 0);
TaskManager_Call(taskManager, &sub_0204B0A0, 0);
}

4
arm9/src/unk_0204B0A0.c
View File

@@ -22,7 +22,7 @@ extern void* Save_Roamers_Get(struct SaveData* save);
extern void sub_02060344(struct SaveData* save, s32);
extern void sub_0203959C(struct FieldSystem*);
extern void sub_02025A60(struct SaveData* save, s32);
extern struct SaveData* ScriptEnvironment_GetSavePtr(struct FieldSystem*);
extern struct SaveData* FieldSystem_GetSaveDataPtr(struct FieldSystem*);
void sub_0204B0F8(struct FieldSystem *fieldSystem)
{
@@ -79,7 +79,7 @@ void sub_0204B158(struct FieldSystem *fieldSystem, struct UnkSaveStruct_0202376C
void sub_0204B1DC(struct FieldSystem *fieldSystem, s32 a1)
{
struct SaveData* save = ScriptEnvironment_GetSavePtr(fieldSystem);
struct SaveData* save = FieldSystem_GetSaveDataPtr(fieldSystem);
sub_02025A60(save, a1);
sub_0203959C(fieldSystem);
sub_02060344(fieldSystem->saveData, a1);

18
arm9/src/unk_0205FA2C.c
View File

@@ -152,7 +152,7 @@ u32 sub_0205FBC0(
BOOL sub_0205FBE8(struct TaskManager *taskManager)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
struct UnkCallbackStruct1_0205FA2C *res2 =
(struct UnkCallbackStruct1_0205FA2C *)sub_0204652C(taskManager);
switch (res2->unk04)
@@ -186,7 +186,7 @@ void sub_0205FC50(struct TaskManager *taskManager,
u8 param6,
u8 param7)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
struct UnkCallbackStruct1_0205FA2C *ptr = (struct UnkCallbackStruct1_0205FA2C *)AllocFromHeap(
0xb, sizeof(struct UnkCallbackStruct1_0205FA2C));
@@ -200,7 +200,7 @@ void sub_0205FC50(struct TaskManager *taskManager,
ptr->unk0d = param7;
ptr->unk14 = param1;
sub_0204640C(fieldSystem->taskManager, &sub_0205FBE8, ptr);
TaskManager_Call(fieldSystem->taskManager, &sub_0205FBE8, ptr);
}
u32 sub_0205FC9C(
@@ -233,7 +233,7 @@ u32 sub_0205FCC4(
BOOL sub_0205FCE8(struct TaskManager *taskManager)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
struct UnkCallbackStruct2_0205FA2C *res2 =
(struct UnkCallbackStruct2_0205FA2C *)sub_0204652C(taskManager);
@@ -258,7 +258,7 @@ BOOL sub_0205FCE8(struct TaskManager *taskManager)
void sub_0205FD38(struct TaskManager *taskManager, u16 param1, u16 param2, u16 param3)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
struct UnkCallbackStruct2_0205FA2C *ptr = (struct UnkCallbackStruct2_0205FA2C *)AllocFromHeap(
0xb, sizeof(struct UnkCallbackStruct2_0205FA2C));
MI_CpuFill8(ptr, 0, sizeof(struct UnkCallbackStruct2_0205FA2C));
@@ -267,12 +267,12 @@ void sub_0205FD38(struct TaskManager *taskManager, u16 param1, u16 param2, u16 p
ptr->unk14 = param3;
ptr->unk10 = param2;
sub_0204640C(fieldSystem->taskManager, &sub_0205FCE8, (u32 *)ptr);
TaskManager_Call(fieldSystem->taskManager, &sub_0205FCE8, (u32 *)ptr);
}
BOOL sub_0205FD70(struct TaskManager *taskManager)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
u16 *res2 = (u16 *)sub_0204652C(taskManager);
u8 *res3 = sub_020316E0(1 - sub_02031190());
if (res3 == NULL)
@@ -301,7 +301,7 @@ BOOL sub_0205FD70(struct TaskManager *taskManager)
void sub_0205FDDC(struct TaskManager *taskManager, u16 param1, u16 param2)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
u16 *ptr = AllocFromHeap(0xb, 2 * sizeof(u16));
MI_CpuFill8(ptr, 0, 2 * sizeof(u16));
@@ -309,7 +309,7 @@ void sub_0205FDDC(struct TaskManager *taskManager, u16 param1, u16 param2)
ptr[0] = param1;
ptr[1] = param2;
sub_0204640C(fieldSystem->taskManager, &sub_0205FD70, (u32 *)ptr);
TaskManager_Call(fieldSystem->taskManager, &sub_0205FD70, (u32 *)ptr);
}
u32 sub_0205FE10(struct SaveData *save)

4
arm9/src/unk_0206015C.c
View File

@@ -41,12 +41,12 @@ void sub_0206015C(struct FieldSystem *fieldSystem)
unkStruct->unkC = 0;
unkStruct->unkD = 0;
sub_0204640C(fieldSystem->taskManager, sub_02060194, (u32 *)unkStruct);
TaskManager_Call(fieldSystem->taskManager, sub_02060194, (u32 *)unkStruct);
}
BOOL sub_02060194(struct TaskManager *taskManager)
{
struct FieldSystem *fieldSystem = sub_02046528(taskManager);
struct FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
struct UnkStruct_0204652C *unkStruct1 = (struct UnkStruct_0204652C *)sub_0204652C(taskManager);
switch (unkStruct1->action)

2
arm9/src/unk_02064E20.c
View File

@@ -6,7 +6,7 @@
void sub_02064E20(struct FieldSystem* fieldSystem)
{
struct unk_2025484 * r4 = (struct unk_2025484 *)sub_02024ED8(ScriptEnvironment_GetSavePtr(fieldSystem));
struct unk_2025484 * r4 = (struct unk_2025484 *)sub_02024ED8(FieldSystem_GetSaveDataPtr(fieldSystem));
if((u32)sub_020254B4(r4) == 6)
{
return;

4
arm9/src/unk_0208890C.c
View File

@@ -7,7 +7,7 @@
#include "player_data.h"
#include "poke_overlay.h"
extern struct SaveData* ScriptEnvironment_GetSavePtr(struct FieldSystem *);
extern struct SaveData* FieldSystem_GetSaveDataPtr(struct FieldSystem *);
extern u32 sub_02028048(struct SaveData* save);
extern void sub_020373D4(struct FieldSystem *, struct OverlayManagerTemplate *, void*);
extern BOOL sub_020889B0(struct OverlayManager *, u32*);
@@ -44,7 +44,7 @@ void sub_02088950(struct FieldSystem *fieldSystem, struct PoffinCaseAppData *par
struct PoffinCaseAppData* sub_02088960(struct FieldSystem *fieldSystem, u32 a1, u32 heap_id)
{
struct SaveData* save = ScriptEnvironment_GetSavePtr(fieldSystem);
struct SaveData* save = FieldSystem_GetSaveDataPtr(fieldSystem);
struct PoffinCaseAppData* ret = sub_0208890C(a1, save, heap_id, fieldSystem->unk98);
sub_02088950(fieldSystem, ret);

12
include/player_data.h
View File

@@ -9,11 +9,11 @@ struct SaveData;
#define MAX_MONEY 999999
typedef enum
typedef enum PlayerGender
{
Male = 0,
Female = 1
} GenderEnum;
PLAYER_GENDER_MALE = 0,
PLAYER_GENDER_FEMALE = 1
} PlayerGender;
typedef struct PlayerProfile
{
@@ -59,8 +59,8 @@ struct String * PlayerProfile_GetPlayerName_NewString(PlayerProfile * data, u32
void PlayerProfile_SetTrainerID(PlayerProfile *playerProfile, u32 otid);
u32 PlayerProfile_GetTrainerID(PlayerProfile * data);
u16 PlayerProfile_GetTrainerID_VisibleHalf(PlayerProfile * data);
void PlayerProfile_SetTrainerGender(PlayerProfile * data, GenderEnum gender);
GenderEnum PlayerProfile_GetTrainerGender(PlayerProfile * data);
void PlayerProfile_SetTrainerGender(PlayerProfile * data, PlayerGender gender);
PlayerGender PlayerProfile_GetTrainerGender(PlayerProfile * data);
BOOL PlayerProfile_TestBadgeFlag(PlayerProfile * data, u32 badgeno);
void PlayerProfile_SetBadgeFlag(PlayerProfile * data, u32 badgeno);
u32 PlayerProfile_CountBadges(PlayerProfile * data);

60
include/scrcmd.h
View File

@@ -4,9 +4,9 @@
#include "global.h"
#include "script.h"
extern u16 VarGet(struct FieldSystem *fieldSystem, u16);
extern u16* GetVarPointer(struct FieldSystem *fieldSystem, u16);
extern struct SaveData* ScriptEnvironment_GetSavePtr(struct FieldSystem *fieldSystem);
extern u16 VarGet(FieldSystem *fieldSystem, u16);
extern u16* GetVarPointer(FieldSystem *fieldSystem, u16);
extern SaveData* FieldSystem_GetSaveDataPtr(FieldSystem *fieldSystem);
static inline u16 ScriptGetVar(ScriptContext *ctx)
{
@@ -131,19 +131,19 @@ BOOL ScrCmd_LockAllEvents2(ScriptContext *ctx);
BOOL ScrCmd_ReleaseAllEvents(ScriptContext *ctx);
BOOL ScrCmd_LockEvent(ScriptContext *ctx);
BOOL ScrCmd_ReleaseEvent(ScriptContext *ctx);
BOOL ScrCmd_AddOverworldEvent(ScriptContext *ctx);
BOOL ScrCmd_RemoveOverworldEvent(ScriptContext *ctx);
BOOL ScrCmd_AddObjectEvent(ScriptContext *ctx);
BOOL ScrCmd_RemoveObjectEvent(ScriptContext *ctx);
BOOL ScrCmd_LockCamera(ScriptContext *ctx);
BOOL ScrCmd_ReleaseCamera(ScriptContext *ctx);
BOOL ScrCmd_FacePlayer(ScriptContext *ctx);
BOOL ScrCmd_GetPlayerPosition(ScriptContext *ctx);
BOOL ScrCmd_GetOverworldEventPosition(ScriptContext *ctx);
BOOL ScrCmd_GetObjectEventPosition(ScriptContext *ctx);
BOOL ScrCmd_GetPlayerDirection(ScriptContext *ctx);
BOOL ScrCmd_Unk006B(ScriptContext *ctx);
BOOL ScrCmd_KeepOverworldEvent(ScriptContext *ctx);
BOOL ScrCmd_SetOverworldEventMovement(ScriptContext *ctx);
BOOL ScrCmd_GetOverworldEventMovement(ScriptContext *ctx);
BOOL ScrCmd_OverworldEventStopFollowing(ScriptContext *ctx);
BOOL ScrCmd_KeepObjectEvent(ScriptContext *ctx);
BOOL ScrCmd_SetObjectEventMovement(ScriptContext *ctx);
BOOL ScrCmd_GetObjectEventMovement(ScriptContext *ctx);
BOOL ScrCmd_ObjectEventStopFollowing(ScriptContext *ctx);
BOOL ScrCmd_Unk02AB(ScriptContext *ctx);
BOOL ScrCmd_GetSealCountFromId(ScriptContext *ctx);
BOOL ScrCmd_GiveSeals(ScriptContext *ctx);
@@ -267,13 +267,43 @@ BOOL ScrCmd_Unk0137(ScriptContext *ctx);
BOOL ScrCmd_Unk0138(ScriptContext *ctx);
BOOL ScrCmd_Unk0139(ScriptContext *ctx);
BOOL ScrCmd_Unk013C(ScriptContext *ctx);
BOOL ScrCmd_Unk013D(ScriptContext *ctx);
BOOL ScrCmd_Unk013E(ScriptContext *ctx);
BOOL ScrCmd_Unk013F(ScriptContext *ctx);
BOOL ScrCmd_Unk02BA(ScriptContext *ctx);
BOOL ScrCmd_Unk0140(ScriptContext *ctx);
BOOL ScrCmd_Unk0146(ScriptContext *ctx);
BOOL ScrCmd_Unk0141(ScriptContext *ctx);
BOOL ScrCmd_Unk0142(ScriptContext *ctx);
BOOL ScrCmd_Unk013A(ScriptContext *ctx);
BOOL ScrCmd_Unk013B(ScriptContext *ctx);
BOOL ScrCmd_Unk0143(ScriptContext *ctx);
BOOL ScrCmd_Unk0144(ScriptContext *ctx);
BOOL ScrCmd_Unk0145(ScriptContext *ctx);
BOOL ScrCmd_Unk0153(ScriptContext *ctx);
BOOL ScrCmd_Unk0154(ScriptContext *ctx);
BOOL ScrCmd_Unk0155(ScriptContext *ctx);
BOOL ScrCmd_Unk029C(ScriptContext *ctx);
BOOL ScrCmd_SetPlayerAvatar(ScriptContext *ctx);
BOOL ScrCmd_DummyBlackOut(ScriptContext *ctx);
BOOL ScrCmd_SetSpawn(ScriptContext *ctx);
BOOL ScrCmd_GetPlayerGender(ScriptContext *ctx);
BOOL ScrCmd_HealParty(ScriptContext *ctx);
BOOL ScrCmd_Unk014F(ScriptContext *ctx);
BOOL ScrCmd_Unk0150(ScriptContext *ctx);
BOOL ScrCmd_Unk02BB(ScriptContext *ctx);
BOOL ScrCmd_Unk0151(ScriptContext *ctx);
BOOL ScrCmd_Unk0152(ScriptContext *ctx);
BOOL ScrCmd_CheckPocketNotEmpty(ScriptContext *ctx);
BOOL ScrCmd_SetObjectEventSpawnPosition(ScriptContext *ctx);
BOOL ScrCmd_MoveObjectEvent(ScriptContext *ctx);
// scrcmd_mart.c
BOOL ScrCmd_NormalMart(struct ScriptContext * ctx);
BOOL ScrCmd_SpecialMart(struct ScriptContext * ctx);
BOOL ScrCmd_GoodsMart(struct ScriptContext * ctx);
BOOL ScrCmd_SealsMart(struct ScriptContext * ctx);
BOOL ScrCmd_AccessoriesShop(struct ScriptContext * ctx);
BOOL ScrCmd_NormalMart(ScriptContext *ctx);
BOOL ScrCmd_SpecialMart(ScriptContext *ctx);
BOOL ScrCmd_GoodsMart(ScriptContext *ctx);
BOOL ScrCmd_SealsMart(ScriptContext *ctx);
BOOL ScrCmd_AccessoriesShop(ScriptContext *ctx);
//scrcmd_4.c
BOOL ScrCmd_GetPlayerName(struct ScriptContext* ctx);

9
include/script.h
View File

@@ -99,6 +99,10 @@ typedef struct RoamerSaveData {
} RoamerSaveData; //todo: fill out and move to own file
typedef struct MapObjectManager {
} MapObjectManager; //todo: fill out
typedef struct FieldSystem //todo move to field_system.c
{
u32 *unk00;
@@ -111,13 +115,14 @@ typedef struct FieldSystem //todo move to field_system.c
struct Camera *camera;
u32 unk24;
u8 padding3[0xC];
u32 unk34;
MapObjectManager *mapObjectManager;
struct PlayerAvatar *playerAvatar;
u8 padding4[0x24];
u32 unk60;
u8 padding5[0x14];
u32 unk78;
u8 padding6[0x14];
u32 unk7C;
u8 padding6[0x10];
u32 unk90;
u8 padding7[0x4];
u32 *unk98;

4
include/task.h
View File

@@ -31,7 +31,7 @@ extern BOOL sub_020373C4(struct FieldSystem *fieldSystem);
struct TaskManager *FieldSys_CreateTask(struct FieldSystem *fieldSystem, TaskFunc taskFunc, void *env);
void sub_020463CC(struct FieldSystem *fieldSystem, TaskFunc taskFunc, void *env);
void sub_020463EC(struct TaskManager *taskManager, TaskFunc taskFunc, void *env);
void sub_0204640C(struct TaskManager *taskManager, TaskFunc taskFunc, void *env);
void TaskManager_Call(struct TaskManager *taskManager, TaskFunc taskFunc, void *env);
BOOL sub_02046420(struct TaskManager *taskManager);
BOOL sub_0204646C(struct TaskManager *taskManager);
BOOL sub_0204647C(struct FieldSystem *fieldSystem);
@@ -42,6 +42,6 @@ void sub_02046500(struct TaskManager *taskManager, u32 r5, u32 r4);
void * sub_0204652C(struct TaskManager *taskManager);
u32 * sub_02046530(struct TaskManager *taskManager);
u32 sub_02046534(struct TaskManager *taskManager);
struct FieldSystem *sub_02046528(struct TaskManager *taskManager);
struct FieldSystem *TaskManager_GetFieldSystem(struct TaskManager *taskManager);
#endif //POKEDIAMOND_TASK_H