pret/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-29 15:08:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokediamond

Browse Source
This commit is contained in:
Tranzi72
2023-09-30 23:10:34 +03:00
parent 1663e559bf f3f211a450
commit e9558acaa9
151 changed files with 2595 additions and 3580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -1
View File
@@ -311,4 +311,8 @@ diamond: ; @+$(MAKE) GAME_VERSION=DIAMOND
pearl: ; @+$(MAKE) GAME_VERSION=PEARL
compare_diamond: ; @+$(MAKE) GAME_VERSION=DIAMOND COMPARE=1
compare_pearl: ; @+$(MAKE) GAME_VERSION=PEARL COMPARE=1
compare: compare_diamond
clean_diamond: ; @+$(MAKE) GAME_VERSION=DIAMOND clean
clean_pearl: ; @+$(MAKE) GAME_VERSION=PEARL clean
compare: compare_diamond
.PHONY: diamond pearl compare_diamond compare_pearl compare clean_diamond clean_pearl
arm9/arm9.lsf
+1 -1
View File
@@ -184,7 +184,7 @@ Static arm9
Object unk_02046030.o
Object event_data.o
Object task.o
Object unk_0204653C.o
Object encounter.o
Object unk_02047500.o
Object unk_020476CC.o
Object unk_02048120.o
arm9/asm/scrcmd_10.s
+12 -12
View File
@@ -49,7 +49,7 @@ ScrCmd_Unk01DB: ; 0x02042364
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r1, r4, #0x0
add r2, r6, #0x0
bl ov06_022434D0
@@ -89,7 +89,7 @@ ScrCmd_Unk01DD: ; 0x020423B0
add r0, r7, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r7, #0x0
bl ScriptReadHalfword
@@ -516,7 +516,7 @@ ScrCmd_Unk01DE: ; 0x02042700
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -524,7 +524,7 @@ ScrCmd_Unk01DE: ; 0x02042700
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -610,7 +610,7 @@ ScrCmd_Unk01E1: ; 0x020427D0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -618,7 +618,7 @@ ScrCmd_Unk01E1: ; 0x020427D0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
@@ -680,7 +680,7 @@ ScrCmd_Unk01E2: ; 0x02042864
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -882,7 +882,7 @@ ScrCmd_Unk0298: ; 0x020429E8
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r5, r0, #0x0
add r0, r4, #0x0
bl Save_FrontierData_Get
@@ -905,7 +905,7 @@ ScrCmd_Unk0299: ; 0x02042A18
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r5, r0, #0x0
add r0, r4, #0x0
bl Save_FrontierData_Get
@@ -929,7 +929,7 @@ ScrCmd_Unk029A: ; 0x02042A48
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -964,7 +964,7 @@ ScrCmd_Unk029B: ; 0x02042A98
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -972,7 +972,7 @@ ScrCmd_Unk029B: ; 0x02042A98
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
arm9/asm/scrcmd_12.s
+4 -4
View File
@@ -283,8 +283,8 @@ _02042F0C: .word UNK_020F43E4
sub_02042F10: ; 0x02042F10
push {r3, lr}
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl GetPartyCount
bl SaveArray_Party_Get
bl Party_GetCount
cmp r0, #0x6
bge _02042F24
mov r0, #0x1
@@ -656,9 +656,9 @@ _0204322C:
bl CalcMonLevelAndStats
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r4, #0x0
bl AddMonToParty
bl Party_AddMon
cmp r0, #0x0
beq _02043266
ldr r0, [sp, #0x4]
arm9/asm/scrcmd_3.s
+26 -26
View File
@@ -17,7 +17,7 @@ ScrCmd_Unk00F8: ; 0x0203FE90
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r1, r0, #0x0
lsl r1, r1, #0x18
ldr r0, [r4, #0x0]
@@ -40,7 +40,7 @@ ScrCmd_Unk00F9: ; 0x0203FEC0
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
str r0, [r4, #0x64]
ldr r1, _0203FEF0 ; =sub_0203FEF4
add r0, r4, #0x0
@@ -78,7 +78,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
add r4, r0, #0x0
add r0, r5, #0x0
@@ -87,7 +87,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp, #0x4]
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -95,7 +95,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp, #0x8]
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -103,7 +103,7 @@ ScrCmd_Unk00FA: ; 0x0203FF10
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp, #0xc]
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -111,15 +111,15 @@ ScrCmd_Unk00FA: ; 0x0203FF10
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r6, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x10]
add r0, r4, #0x0
mov r1, #0x4
@@ -200,7 +200,7 @@ ScrCmd_Unk00FB: ; 0x02040028
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
@@ -241,14 +241,14 @@ ScrCmd_Unk00FC: ; 0x02040074
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r3, r0, #0x0
ldr r0, [r4, #0x0]
ldr r2, [r6, #0x0]
@@ -279,14 +279,14 @@ ScrCmd_Unk00FD: ; 0x020400C8
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r3, r0, #0x0
ldr r0, [r4, #0x0]
ldr r2, [r6, #0x0]
@@ -317,14 +317,14 @@ ScrCmd_Unk00FE: ; 0x0204011C
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r3, r0, #0x0
ldr r0, [r4, #0x0]
ldr r2, [r6, #0x0]
@@ -355,14 +355,14 @@ ScrCmd_Unk00FF: ; 0x02040170
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r1, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -440,7 +440,7 @@ ScrCmd_Unk0102: ; 0x02040220
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, [r6, #0x0]
@@ -468,7 +468,7 @@ ScrCmd_Unk0103: ; 0x0204025C
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, [r6, #0x0]
@@ -496,7 +496,7 @@ ScrCmd_Unk0104: ; 0x02040298
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, [r6, #0x0]
@@ -547,7 +547,7 @@ ScrCmd_Unk0106: ; 0x02040304
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, [r6, #0x0]
@@ -639,7 +639,7 @@ ScrCmd_Unk010A: ; 0x020403D0
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -670,7 +670,7 @@ ScrCmd_Unk010B: ; 0x02040414
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -803,7 +803,7 @@ ScrCmd_Unk010E: ; 0x0204052C
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, [r6, #0x0]
@@ -876,7 +876,7 @@ ScrCmd_Unk0111: ; 0x020405CC
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_02082444
arm9/asm/scrcmd_5.s
+6 -6
View File
@@ -40,7 +40,7 @@ ScrCmd_Unk024F: ; 0x020411C4
add r0, #0x80
ldr r7, [r0, #0x0]
ldr r0, [r7, #0xc]
bl GetStoragePCPointer
bl SaveArray_PCStorage_Get
str r0, [sp, #0x20]
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -71,11 +71,11 @@ ScrCmd_Unk024F: ; 0x020411C4
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp, #0x0]
ldr r0, [r7, #0xc]
bl SaveArray_PlayerParty_Get
bl GetPartyCount
bl SaveArray_Party_Get
bl Party_GetCount
lsl r0, r0, #0x10
lsr r6, r0, #0x10
ldr r0, _0204133C ; =0x00000000
@@ -85,9 +85,9 @@ ScrCmd_Unk024F: ; 0x020411C4
beq _02041286
_0204123C:
ldr r0, [r7, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r5, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
arm9/asm/scrcmd_7.s
+16 -16
View File
@@ -15,7 +15,7 @@ ScrCmd_Unk00B6: ; 0x020416A8
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r5, r0, #0x0
bne _02041708
add r0, r4, #0x0
@@ -100,7 +100,7 @@ ScrCmd_Unk00B7: ; 0x02041770
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -187,7 +187,7 @@ ScrCmd_Unk00B9: ; 0x02041808
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -250,7 +250,7 @@ ScrCmd_Unk00E5: ; 0x0204188C
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp, #0xc]
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -258,7 +258,7 @@ ScrCmd_Unk00E5: ; 0x0204188C
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp, #0x8]
add r0, r5, #0x0
add r0, #0x80
@@ -266,7 +266,7 @@ ScrCmd_Unk00E5: ; 0x0204188C
mov r6, #0x0
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0x1
bne _020418F2
ldr r0, [r4, #0xc]
@@ -281,7 +281,7 @@ _020418F2:
ldr r1, [sp, #0xc]
ldr r2, [sp, #0x8]
add r3, r6, #0x0
bl sub_020470E8
bl SetupAndStartTrainerBattle
mov r0, #0x1
add sp, #0x10
pop {r3-r7, pc}
@@ -303,7 +303,7 @@ ScrCmd_Unk02A0: ; 0x0204190C
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -311,7 +311,7 @@ ScrCmd_Unk02A0: ; 0x0204190C
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -319,7 +319,7 @@ ScrCmd_Unk02A0: ; 0x0204190C
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r2, r0, #0x0
mov r0, #0xb
str r0, [sp, #0x0]
@@ -327,7 +327,7 @@ ScrCmd_Unk02A0: ; 0x0204190C
ldr r0, [r5, #0x74]
add r1, r7, #0x0
add r3, r6, #0x0
bl sub_020470E8
bl SetupAndStartTrainerBattle
mov r0, #0x1
add sp, #0x8
pop {r3-r7, pc}
@@ -492,7 +492,7 @@ ScrCmd_Unk00EA: ; 0x02041AB4
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
bl VarGet
bl FieldSystem_VarGet
bl sub_0204AD0C
bl sub_02004724
mov r0, #0x1
@@ -524,7 +524,7 @@ ScrCmd_Unk00EC: ; 0x02041AE0
bl GetVarPointer
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_020480B8
bl IsBattleResultWin
strh r0, [r5, #0x0]
mov r0, #0x1
pop {r3-r5, pc}
@@ -590,7 +590,7 @@ ScrCmd_Unk00EE: ; 0x02041B70
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
bl HasEnoughAlivePokemonForDoubleBattle
strh r0, [r4, #0x0]
mov r0, #0x0
@@ -613,7 +613,7 @@ ScrCmd_Unk00EF: ; 0x02041B9C
ldr r0, [r4, #0x74]
mov r1, #0x1
add r3, r2, #0x0
bl sub_020470E8
bl SetupAndStartTrainerBattle
mov r0, #0x1
add sp, #0x8
pop {r4, pc}
@@ -635,7 +635,7 @@ ScrCmd_Unk00F0: ; 0x02041BC4
lsl r1, r1, #0x10
add r0, r4, #0x0
lsr r1, r1, #0x10
bl TrainerFlagSet
bl TrainerFieldSystem_FlagSet
mov r0, #0x0
pop {r3-r5, pc}
arm9/asm/scrcmd_9.s
+18 -18
View File
@@ -111,7 +111,7 @@ _02041ECA:
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -173,7 +173,7 @@ _02041F68:
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -181,7 +181,7 @@ _02041F68:
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -226,7 +226,7 @@ ScrCmd_Unk0236: ; 0x02041FDC
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r4, #0x80
add r1, r0, #0x0
ldr r0, [r4, #0x0]
@@ -242,7 +242,7 @@ ScrCmd_Unk02B8: ; 0x02042000
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -250,10 +250,10 @@ ScrCmd_Unk02B8: ; 0x02042000
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r1, r0, #0x0
add r0, r4, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
@@ -284,7 +284,7 @@ _02042058:
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
str r0, [sp, #0x0]
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -324,7 +324,7 @@ _020420A8:
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -332,7 +332,7 @@ _020420A8:
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -340,7 +340,7 @@ _020420A8:
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r5, #0x80
add r3, r0, #0x0
ldr r0, [r5, #0x0]
@@ -365,7 +365,7 @@ ScrCmd_Unk0238: ; 0x02042110
add r0, r5, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -407,17 +407,17 @@ _02042170:
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r6, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r1, r0, #0x0
add r0, r6, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
add r0, r4, #0x0
mov r2, #0x4
@@ -429,7 +429,7 @@ _020421A2:
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02060F9C
@@ -440,7 +440,7 @@ _020421BC:
add r5, #0x80
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl VarGet
bl FieldSystem_VarGet
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02060F88
@@ -548,7 +548,7 @@ sub_02042288: ; 0x02042288
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
bl GetFirstNonEggInParty
bl sub_020690E4
add r2, r0, #0x0
arm9/asm/unk_02035068.s
+78 -78
View File
@@ -85,7 +85,7 @@ sub_02035080: ; 0x02035080
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x1
bne _020350A6
add r0, r5, #0x0
@@ -141,7 +141,7 @@ _02035106:
ldr r1, _02035114 ; =sub_020352E4
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3-r5, pc}
nop
_02035114: .word sub_020352E4
@@ -173,7 +173,7 @@ _0203514C:
ldr r1, _02035158 ; =sub_020352E4
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3-r5, pc}
.balign 4
_02035158: .word sub_020352E4
@@ -205,7 +205,7 @@ _02035190:
ldr r1, _0203519C ; =sub_020352E4
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3-r5, pc}
.balign 4
_0203519C: .word sub_020352E4
@@ -224,7 +224,7 @@ sub_020351A0: ; 0x020351A0
str r1, [r4, r0]
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x1
bne _020351D4
add r0, r5, #0x0
@@ -288,7 +288,7 @@ _02035240:
ldr r0, [r5, #0x10]
ldr r1, _02035250 ; =sub_020352E4
add r2, r4, #0x0
bl sub_020463EC
bl TaskManager_Jump
pop {r3-r5, pc}
.balign 4
_0203524C: .word 0x000005FD
@@ -390,7 +390,7 @@ sub_020352E4: ; 0x020352E4
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldrh r1, [r4, #0x2a]
cmp r1, #0xf
@@ -420,7 +420,7 @@ _02035308: ; jump table (using 16-bit offset)
.short _02035432 - _02035308 - 2; case 15
_02035328:
ldr r0, [r5, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
mov r1, #0x73
lsl r1, r1, #0x2
add r0, r5, #0x0
@@ -478,7 +478,7 @@ _02035398:
cmp r0, #0x0
beq _02035484
ldr r0, [r5, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
add r0, r6, #0x0
bl sub_0203549C
add r0, r6, #0x0
@@ -508,7 +508,7 @@ _020353D6:
add r0, r4, #0x0
bl FreeToHeap
ldr r0, [r5, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
mov r0, #0x1
pop {r4-r6, pc}
_020353F6:
@@ -517,7 +517,7 @@ _020353F6:
cmp r0, #0x0
beq _02035484
ldr r0, [r5, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
mov r0, #0x1
bl ov05_021D7CA4
mov r0, #0xb
@@ -533,14 +533,14 @@ _02035412:
add r2, #0x30
ldr r2, [r4, r2]
add r0, r6, #0x0
bl sub_020463EC
bl TaskManager_Jump
add r0, r4, #0x0
bl FreeToHeap
b _02035484
_02035432:
bl FreeToHeap
ldr r0, [r5, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
mov r0, #0x1
pop {r4-r6, pc}
_02035440:
@@ -561,7 +561,7 @@ _02035440:
add r0, r4, #0x0
bl FreeToHeap
ldr r0, [r5, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
mov r0, #0x1
pop {r4-r6, pc}
_02035478:
@@ -591,7 +591,7 @@ sub_0203549C: ; 0x0203549C
bl TaskManager_GetFieldSystem
str r0, [sp, #0x1c]
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r1, r4, #0x0
add r1, #0x30
@@ -915,11 +915,11 @@ sub_02035734: ; 0x02035734
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
ldr r0, [r4, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x1
bne _0203575A
mov r6, #0x0
@@ -1023,7 +1023,7 @@ _020357D6:
b _0203584C
_02035834:
add r0, r4, #0x0
bl sub_0204BAB0
bl PalPark_CountMonsNotCaught
mov r1, #0x0
add r2, r0, #0x0
str r1, [sp, #0x0]
@@ -1074,11 +1074,11 @@ sub_020358A0: ; 0x020358A0
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
ldr r0, [r4, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x0
bne _020358CE
ldr r0, [r4, #0xc]
@@ -1105,7 +1105,7 @@ sub_020358E4: ; 0x020358E4
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
ldr r0, [r5, #0x20]
bl sub_02001E5C
@@ -1583,7 +1583,7 @@ sub_02035CA0: ; 0x02035CA0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
bl sub_02035718
add r0, r4, #0x0
@@ -1608,10 +1608,10 @@ sub_02035CDC: ; 0x02035CDC
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _02035D02
mov r1, #0x72
@@ -1634,7 +1634,7 @@ sub_02035D04: ; 0x02035D04
thumb_func_start sub_02035D10
sub_02035D10: ; 0x02035D10
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x0
bl ov05_021D7CA4
@@ -1657,7 +1657,7 @@ sub_02035D34: ; 0x02035D34
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0x0
mov r0, #0xb
mov r1, #0x20
@@ -1721,7 +1721,7 @@ sub_02035DC8: ; 0x02035DC8
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204649C
@@ -1741,7 +1741,7 @@ _02035DF0:
thumb_func_start sub_02035DF8
sub_02035DF8: ; 0x02035DF8
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x0
bl ov05_021D7CA4
@@ -1763,7 +1763,7 @@ sub_02035E1C: ; 0x02035E1C
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
mov r1, #0x7a
add r4, r0, #0x0
lsl r1, r1, #0x2
@@ -1790,7 +1790,7 @@ sub_02035E50: ; 0x02035E50
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0xb
mov r1, #0x40
@@ -1849,7 +1849,7 @@ _02035ECC:
bl AllocFromHeap
add r7, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r7, #0x0]
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetOptionsAddr
@@ -1861,7 +1861,7 @@ _02035ECC:
ldrb r0, [r0, #0x0]
strb r0, [r7, #0x14]
ldr r0, [r7, #0x0]
bl GetPartyCount
bl Party_GetCount
strb r0, [r7, #0x13]
mov r0, #0x0
strh r0, [r7, #0x18]
@@ -1901,7 +1901,7 @@ _02035F4A:
bl AllocFromHeap
add r7, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r7, #0x0]
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetOptionsAddr
@@ -1958,7 +1958,7 @@ _02035FD0:
bl AllocFromHeap
add r7, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r7, #0x0]
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetOptionsAddr
@@ -2052,11 +2052,11 @@ _0203609C:
b _0203625E
_020360AC:
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r6, #0x0
add r1, #0x22
ldrb r1, [r1, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
add r0, r5, #0x0
mov r2, #0xb
@@ -2271,7 +2271,7 @@ _02036280: .word sub_020362E4
thumb_func_start sub_02036284
sub_02036284: ; 0x02036284
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x0
bl ov05_021D7CA4
@@ -2293,7 +2293,7 @@ sub_020362A8: ; 0x020362A8
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
mov r1, #0x73
add r4, r0, #0x0
lsl r1, r1, #0x2
@@ -2323,7 +2323,7 @@ sub_020362E4: ; 0x020362E4
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0xb
bl BagView_New
@@ -2400,7 +2400,7 @@ _0203638A:
add r5, r0, #0x0
bl memset
ldr r0, [r6, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r5, #0x0]
ldr r0, [r6, #0xc]
bl Save_Bag_Get
@@ -2439,7 +2439,7 @@ _0203638A:
b _020364F8
_020363F6:
ldr r0, [r6, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #0x4]
mov r0, #0x7f
lsl r0, r0, #0x2
@@ -2450,7 +2450,7 @@ _020363F6:
add r5, r0, #0x0
ldr r0, [sp, #0x4]
add r1, r7, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0xc]
mov r0, #0x7f
lsl r0, r0, #0x2
@@ -2566,7 +2566,7 @@ _0203650C: .word sub_02036BDC
thumb_func_start sub_02036510
sub_02036510: ; 0x02036510
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x0
bl ov05_021D7CA4
@@ -2589,7 +2589,7 @@ sub_02036534: ; 0x02036534
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0xb
bl sub_02065054
@@ -2626,7 +2626,7 @@ sub_02036584: ; 0x02036584
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
mov r1, #0x7e
add r4, r0, #0x0
lsl r1, r1, #0x2
@@ -2649,7 +2649,7 @@ sub_02036584: ; 0x02036584
sub_020365BC: ; 0x020365BC
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
bl sub_02035718
add r0, r4, #0x0
@@ -2672,7 +2672,7 @@ sub_020365BC: ; 0x020365BC
sub_020365F0: ; 0x020365F0
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -2684,7 +2684,7 @@ sub_020365F0: ; 0x020365F0
ldr r1, _0203663C ; =0x000007F2
add r0, r5, #0x0
add r3, r2, #0x0
bl sub_02038CD8
bl QueueScript
b _02036636
_02036618:
mov r0, #0x20
@@ -2699,7 +2699,7 @@ _02036618:
ldr r1, _02036640 ; =0x000007D5
add r0, r5, #0x0
add r3, r3, #0x4
bl sub_02038CD8
bl QueueScript
_02036636:
mov r0, #0x5
strh r0, [r4, #0x2a]
@@ -2715,7 +2715,7 @@ sub_02036644: ; 0x02036644
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x7e
lsl r0, r0, #0x2
@@ -2745,7 +2745,7 @@ _02036678:
thumb_func_start sub_02036684
sub_02036684: ; 0x02036684
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x0
bl ov05_021D7CA4
@@ -2767,7 +2767,7 @@ sub_020366A8: ; 0x020366A8
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02037EF8
@@ -2789,7 +2789,7 @@ sub_020366D4: ; 0x020366D4
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x7e
lsl r0, r0, #0x2
@@ -2806,7 +2806,7 @@ sub_020366D4: ; 0x020366D4
thumb_func_start sub_02036700
sub_02036700: ; 0x02036700
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x0
bl ov05_021D7CA4
@@ -2829,7 +2829,7 @@ sub_02036724: ; 0x02036724
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r2, [r5, #0xc]
mov r0, #0x2
@@ -2870,7 +2870,7 @@ sub_0203677C: ; 0x0203677C
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
mov r0, #0x7e
lsl r0, r0, #0x2
@@ -2919,7 +2919,7 @@ sub_020367E8: ; 0x020367E8
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
bl sub_02035718
add r0, r4, #0x0
@@ -2934,19 +2934,19 @@ sub_020367E8: ; 0x020367E8
bl sub_020358A0
ldr r0, [r6, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x1
bne _02036834
ldr r1, _02036848 ; =0x00002275
add r0, r5, #0x0
mov r2, #0x0
bl sub_02038D10
bl StartScriptFromMenu
b _0203683E
_02036834:
add r0, r5, #0x0
mov r1, #0x4
mov r2, #0x0
bl sub_02038D10
bl StartScriptFromMenu
_0203683E:
add r0, r4, #0x0
bl FreeToHeap
@@ -2962,7 +2962,7 @@ sub_0203684C: ; 0x0203684C
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0xb
mov r1, #0x30
@@ -2992,7 +2992,7 @@ sub_0203684C: ; 0x0203684C
add r5, r0, #0x0
bl memset
ldr r0, [r6, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r5, #0x0]
ldr r0, [r6, #0xc]
bl Save_Bag_Get
@@ -3089,7 +3089,7 @@ sub_0203695C: ; 0x0203695C
bl TaskManager_GetFieldSystem
str r0, [sp, #0x4]
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0x0
mov r0, #0xb
bl sub_020851B8
@@ -3172,7 +3172,7 @@ sub_02036A14: ; 0x02036A14
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x7e
lsl r0, r0, #0x2
@@ -3217,7 +3217,7 @@ sub_02036A78: ; 0x02036A78
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
mov r1, #0x7e
add r4, r0, #0x0
lsl r1, r1, #0x2
@@ -3248,7 +3248,7 @@ sub_02036AB8: ; 0x02036AB8
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x7f
lsl r0, r0, #0x2
@@ -3281,9 +3281,9 @@ sub_02036AB8: ; 0x02036AB8
b _02036B82
_02036B0E:
ldr r0, [r6, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r7, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r2, r0, #0x0
ldr r0, [r5, #0x14]
add r1, r6, #0x0
@@ -3346,7 +3346,7 @@ sub_02036B90: ; 0x02036B90
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
mov r1, #0x73
add r4, r0, #0x0
lsl r1, r1, #0x2
@@ -3385,7 +3385,7 @@ sub_02036BDC: ; 0x02036BDC
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x7f
lsl r0, r0, #0x2
@@ -3521,7 +3521,7 @@ sub_02036CEC: ; 0x02036CEC
add r4, r0, #0x0
bl memset
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
ldr r0, [r5, #0xc]
bl Save_Bag_Get
@@ -3553,7 +3553,7 @@ sub_02036CEC: ; 0x02036CEC
str r5, [r4, #0x1c]
ldrb r1, [r7, #0x2]
ldr r0, [r4, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
mov r0, #0x7e
lsl r0, r0, #0x2
@@ -3585,7 +3585,7 @@ sub_02036D94: ; 0x02036D94
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x7e
lsl r0, r0, #0x2
@@ -3614,7 +3614,7 @@ sub_02036DD4: ; 0x02036DD4
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
mov r1, #0x73
add r4, r0, #0x0
lsl r1, r1, #0x2
@@ -3640,7 +3640,7 @@ sub_02036E08: ; 0x02036E08
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0x0
mov r0, #0x7e
lsl r0, r0, #0x2
@@ -3651,10 +3651,10 @@ sub_02036E08: ; 0x02036E08
lsl r2, r0, #0x10
bl CreateHeap
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
ldrb r1, [r5, #0x0]
str r0, [sp, #0x20]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x24]
ldrb r0, [r5, #0x1]
cmp r0, #0x0
@@ -3760,7 +3760,7 @@ sub_02036F1C: ; 0x02036F1C
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x7e
lsl r0, r0, #0x2
arm9/asm/unk_02037024.s
+1 -1
View File
@@ -359,7 +359,7 @@ _0203728A:
bge _020372BE
ldrh r1, [r5, #0xe]
ldr r0, [sp, #0x0]
bl VarGet
bl FieldSystem_VarGet
ldrh r1, [r5, #0xc]
cmp r1, r0
bne _020372BE
arm9/asm/unk_020372D4.s
+2 -2
View File
@@ -632,7 +632,7 @@ sub_020377A8: ; 0x020377A8
ldr r0, [r0, #0x8]
bx lr
thumb_func_start FieldSystem_GetSaveDataPtr
FieldSystem_GetSaveDataPtr: ; 0x020377AC
thumb_func_start FieldSystem_GetSaveData
FieldSystem_GetSaveData: ; 0x020377AC
ldr r0, [r0, #0xc]
bx lr
arm9/asm/unk_020377F0.s
+39 -39
View File
@@ -429,7 +429,7 @@ sub_0203797C: ; 0x0203797C
mov r2, #0x40
bl MIi_CpuClearFast
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
ldr r0, [r5, #0xc]
bl Save_Bag_Get
@@ -557,10 +557,10 @@ sub_02037A7C: ; 0x02037A7C
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r5, r0, #0x0
ldr r0, [r5, #0x0]
cmp r0, #0x4
@@ -587,7 +587,7 @@ _02037AB2:
b _02037B3A
_02037AC2:
add r0, r6, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _02037B3A
ldr r0, [r4, #0x4]
@@ -630,7 +630,7 @@ _02037AF8:
b _02037B3A
_02037B1A:
add r0, r6, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _02037B3A
ldr r0, [r4, #0x8]
@@ -755,7 +755,7 @@ sub_02037C00: ; 0x02037C00
bl AllocFromHeap
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetOptionsAddr
@@ -764,7 +764,7 @@ sub_02037C00: ; 0x02037C00
strb r0, [r4, #0x11]
strb r6, [r4, #0x14]
ldr r0, [r4, #0x0]
bl GetPartyCount
bl Party_GetCount
strb r0, [r4, #0x13]
mov r0, #0x0
strh r0, [r4, #0x18]
@@ -814,14 +814,14 @@ sub_02037C7C: ; 0x02037C7C
bl Save_PlayerData_GetOptionsAddr
str r0, [r4, #0x4]
add r0, r5, #0x0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
mov r0, #0x1
strb r0, [r4, #0x11]
mov r0, #0x0
strb r0, [r4, #0x14]
ldr r0, [r4, #0x0]
bl GetPartyCount
bl Party_GetCount
strb r0, [r4, #0x13]
mov r0, #0x0
strh r0, [r4, #0x18]
@@ -860,7 +860,7 @@ sub_02037CF0: ; 0x02037CF0
add r4, r0, #0x0
bl memset
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetOptionsAddr
@@ -915,10 +915,10 @@ sub_02037D70: ; 0x02037D70
push {r3-r6, lr}
sub sp, #0x4
add r6, r0, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
add r0, r6, #0x0
bl TaskManager_GetFieldSystem
@@ -938,7 +938,7 @@ _02037D9A:
str r0, [r4, #0x0]
b _02037E12
_02037DA8:
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _02037E12
ldr r0, [r4, #0x0]
@@ -1115,7 +1115,7 @@ sub_02037EF8: ; 0x02037EF8
bl AllocFromHeapAtEnd
add r4, r0, #0x0
add r0, r5, #0x0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r1, r4, #0x0
add r2, r6, #0x0
bl sub_020855B0
b _02037F82
_02037F74:
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r1, r5, #0x0
bl sub_02087D00
add r5, r0, #0x0
@@ -1261,9 +1261,9 @@ sub_0203800C: ; 0x0203800C
add r4, r0, #0x0
bl memset
add r0, r5, #0x0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r7, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [r4, #0x0]
add r0, r5, #0x0
bl Save_FashionData_Get
@@ -1298,7 +1298,7 @@ sub_02038070: ; 0x02038070
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
ldr r0, [r5, #0x0]
cmp r0, #0x0
@@ -1316,7 +1316,7 @@ _0203808E:
b _020380C8
_0203809E:
add r0, r4, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _020380C8
ldr r0, [r5, #0x8]
@@ -1410,7 +1410,7 @@ sub_02038144: ; 0x02038144
bl Save_PlayerData_GetProfileAddr
str r0, [r5, #0x4]
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r5, #0x8]
ldr r0, [r4, #0xc]
mov r1, #0x9
@@ -1493,7 +1493,7 @@ sub_020381FC: ; 0x020381FC
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x7
@@ -1684,7 +1684,7 @@ _02038386:
beq _020383C8
ldr r0, [r4, #0xc]
ldr r1, [r4, #0x30]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
ldr r0, [r4, #0x44]
bl CopyPokemonToPokemon
@@ -1803,7 +1803,7 @@ sub_0203847C: ; 0x0203847C
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x3
@@ -1837,7 +1837,7 @@ _020384B6:
b _02038544
_020384C8:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -1907,7 +1907,7 @@ sub_0203854C: ; 0x0203854C
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0xc]
ldr r0, [r0, #0x0]
@@ -1936,9 +1936,9 @@ _02038580:
pop {r3-r5, pc}
_02038590:
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
ldr r1, [r4, #0x4]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r2, [r4, #0xc]
mov r1, #0x75
add r2, #0x1c
@@ -2003,9 +2003,9 @@ CreateNamingScreen: ; 0x020385CC
b _02038660
_02038620:
ldr r0, [r7, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
ldr r1, [r4, #0x4]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x6f
mov r2, #0x0
add r6, r0, #0x0
@@ -2127,7 +2127,7 @@ sub_020386E0: ; 0x020386E0
bl SaveArray_Get
str r0, [r4, #0x8]
ldr r0, [r5, #0xc]
bl GetStoragePCPointer
bl SaveArray_PCStorage_Get
str r0, [r4, #0xc]
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@@ -2329,7 +2329,7 @@ HatchEggInParty: ; 0x020388B4
sub sp, #0x10
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
bl ov05_021ED49C
add r5, r0, #0x0
bne _020388CC
@@ -2379,10 +2379,10 @@ sub_02038914: ; 0x02038914
bl Save_VarsFlags_Get
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r6, r0, #0x0
ldr r0, [r6, #0x0]
cmp r0, #0x0
@@ -2401,7 +2401,7 @@ _02038944:
b _020389C6
_02038956:
add r0, r4, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _020389C6
ldr r0, [r4, #0xc]
@@ -2556,7 +2556,7 @@ _02038AAC: .word UNK_020F2BE8
thumb_func_start sub_02038AB0
sub_02038AB0: ; 0x02038AB0
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
bl ov06_0224D79C
cmp r0, #0x1
arm9/asm/unk_02038C78.s
+19 -19
View File
@@ -891,7 +891,7 @@ sub_02038C78: ; 0x02038C78
ldr r1, _02038CA4 ; =sub_02038D48
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3-r7, pc}
nop
_02038CA4: .word sub_02038D48
@@ -903,7 +903,7 @@ sub_02038CA8: ; 0x02038CA8
add r5, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
ldr r2, [sp, #0x1c]
mov r1, #0x1c
add r3, r2, #0x0
@@ -922,8 +922,8 @@ sub_02038CA8: ; 0x02038CA8
pop {r4-r6, pc}
.balign 4
thumb_func_start sub_02038CD8
sub_02038CD8: ; 0x02038CD8
thumb_func_start QueueScript
QueueScript: ; 0x02038CD8
push {r4-r7, lr}
sub sp, #0xc
add r6, r0, #0x0
@@ -949,8 +949,8 @@ sub_02038CD8: ; 0x02038CD8
.balign 4
_02038D0C: .word sub_02038D48
thumb_func_start sub_02038D10
sub_02038D10: ; 0x02038D10
thumb_func_start StartScriptFromMenu
StartScriptFromMenu: ; 0x02038D10
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
@@ -970,7 +970,7 @@ sub_02038D10: ; 0x02038D10
ldr r1, _02038D44 ; =sub_02038D48
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_020463EC
bl TaskManager_Jump
add sp, #0x8
pop {r3-r7, pc}
.balign 4
@@ -981,7 +981,7 @@ sub_02038D48: ; 0x02038D48
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -1874,7 +1874,7 @@ FieldSysGetAttrAddr: ; 0x02039438
push {r3-r5, lr}
ldr r0, [r0, #0x10]
add r5, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
ldr r0, _0203945C ; =0x0003643F
@@ -1894,7 +1894,7 @@ sub_02039460: ; 0x02039460
push {r3-r5, lr}
add r5, r0, #0x0
ldr r0, [r5, #0x10]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02035068
@@ -1969,8 +1969,8 @@ _020394DE:
nop
_020394EC: .word 0x00007FD7
thumb_func_start VarGet
VarGet: ; 0x020394F0
thumb_func_start FieldSystem_VarGet
FieldSystem_VarGet: ; 0x020394F0
push {r4, lr}
add r4, r1, #0x0
bl GetVarPointer
@@ -1996,7 +1996,7 @@ _02039512:
add r1, r4, r1
lsl r1, r1, #0x10
lsr r1, r1, #0x10
bl VarGet
bl FieldSystem_VarGet
pop {r3-r5, pc}
nop
_02039524: .word 0x00004020
@@ -2012,8 +2012,8 @@ FlagCheck: ; 0x02039528
pop {r4, pc}
.balign 4
thumb_func_start FlagSet
FlagSet: ; 0x0203953C
thumb_func_start FieldSystem_FlagSet
FieldSystem_FlagSet: ; 0x0203953C
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
@@ -2167,8 +2167,8 @@ TrainerFlagCheck: ; 0x02039640
pop {r4, pc}
.balign 4
thumb_func_start TrainerFlagSet
TrainerFlagSet: ; 0x0203965C
thumb_func_start TrainerFieldSystem_FlagSet
TrainerFieldSystem_FlagSet: ; 0x0203965C
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
@@ -2592,11 +2592,11 @@ _02039968:
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r5, #0x0
bl VarGet
bl FieldSystem_VarGet
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
bl VarGet
bl FieldSystem_VarGet
cmp r7, r0
bne _02039996
ldrb r0, [r4, #0x5]
arm9/asm/unk_02046030.s
+5 -5
View File
@@ -41,7 +41,7 @@ sub_02046068: ; 0x02046068
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
@@ -80,7 +80,7 @@ _020460AE:
mov r1, #0x1
bl sub_0206367C
add r0, r6, #0x0
bl sub_0204AFC8
bl CallTask_FadeToBlack
ldrb r0, [r4, #0x8]
add r0, r0, #0x1
strb r0, [r4, #0x8]
@@ -113,7 +113,7 @@ _020460E2:
b _020461F8
_0204610A:
add r0, r6, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldrb r0, [r4, #0x8]
add r0, r0, #0x1
strb r0, [r4, #0x8]
@@ -200,7 +200,7 @@ _02046198:
b _020461F8
_020461C0:
add r0, r6, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldrb r0, [r4, #0x8]
add r0, r0, #0x1
strb r0, [r4, #0x8]
@@ -210,7 +210,7 @@ _020461CE:
mov r1, #0x0
bl sub_02046214
add r0, r6, #0x0
bl sub_0204B00C
bl CallTask_FadeFromBlack
ldrb r0, [r4, #0x8]
add r0, r0, #0x1
strb r0, [r4, #0x8]
arm9/asm/unk_0204653C.s
-1932
View File
File diff suppressed because it is too large Load Diff
arm9/asm/unk_020476CC.s
+32 -32
View File
@@ -11,8 +11,8 @@ UNK_020F45F8: ; 0x020F45F8
.text
thumb_func_start sub_020476CC
sub_020476CC: ; 0x020476CC
thumb_func_start BattleSetup_New
BattleSetup_New: ; 0x020476CC
push {r3-r7, lr}
add r4, r1, #0x0
mov r1, #0x67
@@ -156,7 +156,7 @@ sub_020477EC: ; 0x020477EC
push {r4, lr}
add r4, r1, #0x0
mov r1, #0x20
bl sub_020476CC
bl BattleSetup_New
mov r1, #0x19
lsl r1, r1, #0x4
str r4, [r0, r1]
@@ -169,7 +169,7 @@ sub_02047800: ; 0x02047800
add r4, r1, #0x0
mov r1, #0x2
lsl r1, r1, #0x8
bl sub_020476CC
bl BattleSetup_New
mov r1, #0x19
lsl r1, r1, #0x4
str r4, [r0, r1]
@@ -190,7 +190,7 @@ sub_02047814: ; 0x02047814
str r0, [sp, #0x14]
add r0, r6, #0x0
lsl r1, r1, #0xa
bl sub_020476CC
bl BattleSetup_New
add r4, r0, #0x0
ldr r2, _0204795C ; =0x000001F1
mov r0, #0x1
@@ -268,7 +268,7 @@ sub_02047814: ; 0x02047814
bl CreateMon
ldr r0, [r4, #0x4]
add r1, r6, #0x0
bl AddMonToParty
bl Party_AddMon
mov r0, #0x0
str r0, [sp, #0x0]
str r0, [sp, #0x4]
@@ -281,11 +281,11 @@ sub_02047814: ; 0x02047814
bl CreateMon
ldr r0, [r4, #0x8]
add r1, r6, #0x0
bl AddMonToParty
bl Party_AddMon
add r0, r6, #0x0
bl FreeToHeap
ldr r0, [r5, #0xc]
bl GetStoragePCPointer
bl SaveArray_PCStorage_Get
mov r1, #0x45
lsl r1, r1, #0x2
str r0, [r4, r1]
@@ -317,8 +317,8 @@ sub_02047814: ; 0x02047814
_0204795C: .word 0x000001F1
_02047960: .word 0x0000018F
thumb_func_start sub_02047964
sub_02047964: ; 0x02047964
thumb_func_start BattleSetup_Delete
BattleSetup_Delete: ; 0x02047964
push {r3-r7, lr}
add r7, r0, #0x0
mov r4, #0x0
@@ -405,7 +405,7 @@ _02047A0C:
add r0, r5, r0
ldr r0, [r0, #0x4]
add r1, r6, #0x0
bl AddMonToParty
bl Party_AddMon
cmp r0, #0x0
bne _02047A20
bl GF_AssertFail
@@ -427,7 +427,7 @@ _02047A34:
add r1, r5, r1
ldr r1, [r1, #0x4]
add r0, r6, #0x0
bl CopyPlayerParty
bl CopyParty
pop {r4-r6, pc}
.balign 4
@@ -471,7 +471,7 @@ sub_02047A78: ; 0x02047A78
bl Save_PlayerData_GetProfileAddr
add r6, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r7, r0, #0x0
ldr r0, [r4, #0xc]
bl Save_Bag_Get
@@ -519,7 +519,7 @@ sub_02047A78: ; 0x02047A78
mov r2, #0x0
bl sub_02047A64
ldr r0, [r4, #0xc]
bl GetStoragePCPointer
bl SaveArray_PCStorage_Get
mov r1, #0x45
lsl r1, r1, #0x2
str r0, [r5, r1]
@@ -594,8 +594,8 @@ sub_02047A78: ; 0x02047A78
pop {r4-r7, pc}
.balign 4
thumb_func_start sub_02047BB0
sub_02047BB0: ; 0x02047BB0
thumb_func_start BattleSetup_InitFromFieldSystem
BattleSetup_InitFromFieldSystem: ; 0x02047BB0
push {r4, lr}
add r4, r0, #0x0
bl sub_02047A78
@@ -616,7 +616,7 @@ sub_02047BC0: ; 0x02047BC0
add r4, r0, #0x0
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #0x14]
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
@@ -649,19 +649,19 @@ sub_02047BC0: ; 0x02047BC0
bl AllocMonZeroed
add r5, r0, #0x0
ldr r0, [sp, #0x14]
bl GetPartyCount
bl Party_GetCount
add r1, r0, #0x0
ldr r0, [r6, #0x4]
bl InitPartyWithMaxSize
bl Party_InitWithMaxSize
ldr r0, [sp, #0x14]
mov r4, #0x0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0x0
ble _02047C98
_02047C40:
ldr r0, [sp, #0x14]
add r1, r4, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r5, #0x0
bl CopyPokemonToPokemon
add r0, r5, #0x0
@@ -692,7 +692,7 @@ _02047C82:
bl sub_020479FC
ldr r0, [sp, #0x14]
add r4, r4, #0x1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _02047C40
_02047C98:
@@ -719,7 +719,7 @@ _02047C98:
bl sub_02047A64
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
bl GetStoragePCPointer
bl SaveArray_PCStorage_Get
mov r1, #0x45
lsl r1, r1, #0x2
str r0, [r6, r1]
@@ -848,7 +848,7 @@ _02047DD8:
str r0, [sp, #0x8]
ldr r0, [r5, #0x4]
add r1, r4, #0x0
bl InitPartyWithMaxSize
bl Party_InitWithMaxSize
mov r6, #0x0
cmp r4, #0x0
ble _02047E0E
@@ -856,7 +856,7 @@ _02047DEE:
ldrb r1, [r7, r6]
ldr r0, [sp, #0x4]
sub r1, r1, #0x1
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r1, [sp, #0x8]
bl CopyPokemonToPokemon
ldr r1, [sp, #0x8]
@@ -903,7 +903,7 @@ _02047E2C:
bl sub_02047A64
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
bl GetStoragePCPointer
bl SaveArray_PCStorage_Get
mov r1, #0x45
lsl r1, r1, #0x2
str r0, [r5, r1]
@@ -995,7 +995,7 @@ sub_02047F1C: ; 0x02047F1C
add r5, r0, #0x0
ldr r0, [r4, #0xc]
add r6, r2, #0x0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r2, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -1013,7 +1013,7 @@ sub_02047F38: ; 0x02047F38
bl Save_PlayerData_GetProfileAddr
add r6, r0, #0x0
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r7, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Bag_Get
@@ -1032,7 +1032,7 @@ sub_02047F38: ; 0x02047F38
bl PlayerProfile_Copy
ldr r0, [r4, #0x4]
add r1, r7, #0x0
bl CopyPlayerParty
bl CopyParty
mov r0, #0x42
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -1058,7 +1058,7 @@ sub_02047FA4: ; 0x02047FA4
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetProfileAddr
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
ldr r0, [r5, #0xc]
bl Save_Bag_Get
ldr r0, [r5, #0xc]
@@ -1191,8 +1191,8 @@ sub_020480AC: ; 0x020480AC
bx lr
.balign 4
thumb_func_start sub_020480B8
sub_020480B8: ; 0x020480B8
thumb_func_start IsBattleResultWin
IsBattleResultWin: ; 0x020480B8
cmp r0, #0x2
beq _020480C0
cmp r0, #0x3
arm9/asm/unk_02048120.s
+6 -6
View File
@@ -96,7 +96,7 @@ _0204817A:
add r1, #0xc
bl AddWindow
add r0, r5, #0x0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
add r2, r0, #0x0
ldr r0, [r4, #0x20]
@@ -137,7 +137,7 @@ _02048210: .word sub_02048214
sub_02048214: ; 0x02048214
push {r3-r4, lr}
sub sp, #0xc
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x4
@@ -313,7 +313,7 @@ FieldTask_BlackOut: ; 0x0204837C
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x6
@@ -391,7 +391,7 @@ _0204840C:
b _02048488
_02048434:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -412,14 +412,14 @@ _02048442:
ldr r1, _02048490 ; =0x000007E4
add r0, r5, #0x0
add r3, r2, #0x0
bl sub_02038CD8
bl QueueScript
b _0204847A
_0204846E:
mov r2, #0x0
ldr r1, _02048494 ; =0x000007E5
add r0, r5, #0x0
add r3, r2, #0x0
bl sub_02038CD8
bl QueueScript
_0204847A:
ldr r0, [r4, #0x0]
add r0, r0, #0x1
arm9/asm/unk_020484A8.s
+8 -8
View File
@@ -41,7 +41,7 @@ _020484C6:
bl Save_HOF_Init
_020484CC:
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r6, r0, #0x0
add r0, sp, #0x4
bl GF_RTC_CopyDate
@@ -66,10 +66,10 @@ sub_020484F8: ; 0x020484F8
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x9
@@ -101,7 +101,7 @@ _0204853A:
b _02048688
_0204854A:
add r0, r6, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
beq _02048556
_02048554:
@@ -158,7 +158,7 @@ _020485AE:
b _02048688
_020485C0:
ldr r0, [r6, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
bl HealParty
bl Save_SetDirtyBit
ldr r0, [r6, #0xc]
@@ -234,7 +234,7 @@ _02048644:
b _02048688
_02048666:
add r0, r6, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _02048688
add r0, r5, #0x0
@@ -285,7 +285,7 @@ CallTask_GameClear: ; 0x02048694
bl Save_PlayerData_GetProfileAddr
str r0, [r5, #0x4]
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r5, #0x8]
ldr r0, [r4, #0xc]
bl Save_PlayerData_GetIGTAddr
@@ -308,7 +308,7 @@ CallTask_GameClear: ; 0x02048694
bl Script_SavRTC_DateTimeTox2C
_0204871E:
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
bl GiveAllMonsTheSinnohChampRibbon
ldr r0, [sp, #0x8]
bl sub_020377B0
arm9/asm/unk_02048904.s
+55 -55
View File
@@ -554,7 +554,7 @@ sub_02048D34: ; 0x02048D34
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x0
@@ -603,7 +603,7 @@ sub_02048D90: ; 0x02048D90
ldr r1, _02048DA8 ; =sub_02048D34
add r0, r4, #0x0
mov r2, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r4, pc}
.balign 4
_02048DA8: .word sub_02048D34
@@ -618,7 +618,7 @@ sub_02048DAC: ; 0x02048DAC
bl Save_VarsFlags_Get
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r5, r0, #0x0
ldr r0, [r5, #0x0]
cmp r0, #0x4
@@ -724,7 +724,7 @@ _02048EB0:
pop {r3-r7, pc}
_02048EB4:
add r0, r4, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _02048EC2
mov r0, #0x1
@@ -736,13 +736,13 @@ _02048EC2:
thumb_func_start sub_02048EC8
sub_02048EC8: ; 0x02048EC8
ldr r3, _02048ED4 ; =sub_020463CC
ldr r3, _02048ED4 ; =FieldSystem_CreateTask
mov r2, #0x0
str r2, [r0, #0x6c]
ldr r1, _02048ED8 ; =sub_02048DAC
bx r3
nop
_02048ED4: .word sub_020463CC
_02048ED4: .word FieldSystem_CreateTask
_02048ED8: .word sub_02048DAC
thumb_func_start sub_02048EDC
@@ -752,13 +752,13 @@ sub_02048EDC: ; 0x02048EDC
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0x0
ldr r0, [r4, #0xc]
bl Save_VarsFlags_Get
str r0, [sp, #0x0]
add r0, r7, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r5, r0, #0x0
ldr r0, [r5, #0x0]
cmp r0, #0x5
@@ -823,7 +823,7 @@ _02048F7E:
bl sub_02052EE8
str r0, [r4, #0x7c]
add r0, r7, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r5, #0x0]
add r0, r0, #0x1
str r0, [r5, #0x0]
@@ -899,7 +899,7 @@ _02049000:
str r0, [r4, #0x6c]
ldr r1, _02049034 ; =sub_02048EDC
add r0, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3-r5, pc}
nop
_02049030: .word 0x000001D2
@@ -912,7 +912,7 @@ sub_02049038: ; 0x02049038
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
cmp r1, #0x3
@@ -1003,7 +1003,7 @@ sub_020490F0: ; 0x020490F0
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x0
@@ -1107,7 +1107,7 @@ sub_020491C4: ; 0x020491C4
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
cmp r1, #0x3
@@ -1149,7 +1149,7 @@ _02049216:
add r0, r6, #0x0
bl sub_0204AD8C
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -1219,7 +1219,7 @@ sub_02049274: ; 0x02049274
ldr r1, _020492B8 ; =sub_02049304
str r0, [r3, #0x0]
add r0, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
add sp, #0x14
pop {r4-r5, pc}
nop
@@ -1255,7 +1255,7 @@ sub_020492BC: ; 0x020492BC
ldr r1, _02049300 ; =sub_02049304
str r0, [r3, #0x0]
add r0, r4, #0x0
bl sub_020463EC
bl TaskManager_Jump
add sp, #0x14
pop {r4-r5, pc}
nop
@@ -1268,7 +1268,7 @@ sub_02049304: ; 0x02049304
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r5, r4, #0x0
ldr r1, [r4, #0x0]
@@ -1345,7 +1345,7 @@ _020493A0: .word sub_020493A4
sub_020493A4: ; 0x020493A4
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x0
@@ -1371,7 +1371,7 @@ _020493CC:
sub_020493D0: ; 0x020493D0
push {r4, lr}
add r4, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r2, r0, #0x0
ldr r1, _020493E4 ; =sub_020493E8
add r0, r4, #0x0
@@ -1384,7 +1384,7 @@ _020493E4: .word sub_020493E8
sub_020493E8: ; 0x020493E8
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -1398,7 +1398,7 @@ sub_020493E8: ; 0x020493E8
b _0204942C
_02049408:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -1425,7 +1425,7 @@ sub_02049430: ; 0x02049430
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0203739C
@@ -1451,7 +1451,7 @@ _02049470: .word sub_02049474
thumb_func_start sub_02049474
sub_02049474: ; 0x02049474
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
bl ov06_022483E0
@@ -1489,7 +1489,7 @@ sub_02049494: ; 0x02049494
ldr r1, _020494C8 ; =sub_020494CC
str r0, [r3, #0x0]
add r0, r6, #0x0
bl sub_020463EC
bl TaskManager_Jump
pop {r4-r6, pc}
.balign 4
_020494C8: .word sub_020494CC
@@ -1501,7 +1501,7 @@ sub_020494CC: ; 0x020494CC
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r6, r4, #0x0
ldr r1, [r4, #0x0]
@@ -1591,7 +1591,7 @@ _02049580: .word sub_02049584
sub_02049584: ; 0x02049584
push {r3-r5, lr}
add r5, r0, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x0
@@ -1617,7 +1617,7 @@ _020495AC:
sub_020495B0: ; 0x020495B0
push {r4, lr}
add r4, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r2, r0, #0x0
ldr r1, _020495C4 ; =sub_020495C8
add r0, r4, #0x0
@@ -1630,13 +1630,13 @@ _020495C4: .word sub_020495C8
sub_020495C8: ; 0x020495C8
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
ldr r0, [r4, #0x0]
cmp r0, #0x0
beq _020495F0
@@ -1647,7 +1647,7 @@ sub_020495C8: ; 0x020495C8
b _02049616
_020495F0:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -1676,7 +1676,7 @@ sub_0204961C: ; 0x0204961C
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_0203739C
@@ -1704,7 +1704,7 @@ sub_02049658: ; 0x02049658
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r5, r4, #0x0
ldr r1, [r4, #0x0]
@@ -1763,7 +1763,7 @@ _020496CC:
add r0, r7, #0x0
bl sub_0204AD8C
add r0, r6, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -1828,7 +1828,7 @@ sub_02049718: ; 0x02049718
str r0, [r2, #0x0]
add r0, r5, #0x0
add r2, r7, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
add sp, #0x14
pop {r4-r7, pc}
nop
@@ -1943,7 +1943,7 @@ sub_02049824: ; 0x02049824
add r1, r0, #0x0
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
_02049840:
pop {r3-r5, pc}
.balign 4
@@ -1956,7 +1956,7 @@ sub_02049844: ; 0x02049844
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0xc
@@ -2088,7 +2088,7 @@ _0204995E:
ldr r1, _02049AC0 ; =0x000007F2
add r0, r6, #0x0
add r3, r2, #0x0
bl sub_02038CD8
bl QueueScript
b _0204999C
_02049976:
ldr r0, [r5, #0xc]
@@ -2105,7 +2105,7 @@ _02049976:
add r0, r6, #0x0
add r3, #0x1c
strh r2, [r4, #0x1c]
bl sub_02038CD8
bl QueueScript
_0204999C:
mov r0, #0x4
str r0, [r4, #0x0]
@@ -2135,7 +2135,7 @@ _020499CA:
b _02049AB2
_020499D0:
ldr r0, [r5, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
add r0, r4, #0x0
bl FreeToHeap
add sp, #0x8
@@ -2196,7 +2196,7 @@ _02049A42:
add r0, r5, #0x0
bl sub_0204AB44
add r0, r6, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -2254,7 +2254,7 @@ sub_02049ACC: ; 0x02049ACC
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
cmp r1, #0x7
@@ -2354,7 +2354,7 @@ _02049B9C:
add r0, r5, #0x0
bl sub_0204AB44
add r0, r6, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -2410,7 +2410,7 @@ sub_02049C0C: ; 0x02049C0C
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
mov r5, #0x0
@@ -2448,7 +2448,7 @@ sub_02049C54: ; 0x02049C54
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x0
@@ -2529,10 +2529,10 @@ sub_02049CF8: ; 0x02049CF8
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x5
@@ -2584,14 +2584,14 @@ _02049D60:
b _02049D98
_02049D72:
add r0, r6, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
b _02049D98
_02049D80:
add r0, r6, #0x0
bl sub_0204B00C
bl CallTask_FadeFromBlack
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -2637,7 +2637,7 @@ sub_02049D9C: ; 0x02049D9C
ldr r1, _02049DF0 ; =sub_02049CF8
add r0, r5, #0x0
add r2, r6, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
mov r0, #0x0
str r0, [r5, #0x78]
pop {r4-r6, pc}
@@ -2651,10 +2651,10 @@ sub_02049DF4: ; 0x02049DF4
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x6
@@ -2679,7 +2679,7 @@ _02049E2E:
mov r2, #0x0
bl sub_0204ACA8
add r0, r6, #0x0
bl sub_0204AFC8
bl CallTask_FadeToBlack
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -2702,7 +2702,7 @@ _02049E54:
b _02049E9E
_02049E66:
add r0, r6, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -2788,7 +2788,7 @@ sub_02049F10: ; 0x02049F10
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
cmp r1, #0x3
@@ -2832,7 +2832,7 @@ _02049F68:
add r0, r6, #0x0
bl sub_0204AD8C
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
arm9/asm/unk_0204B34C.s
+1 -1
View File
@@ -657,7 +657,7 @@ sub_0204B818: ; 0x0204B818
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x4
arm9/asm/unk_0204B9EC.s
+6 -6
View File
@@ -99,8 +99,8 @@ sub_0204BA90: ; 0x0204BA90
_0204BA98: .word sub_0204BD40
_0204BA9C: .word UNK_021C5A1C
thumb_func_start sub_0204BAA0
sub_0204BAA0: ; 0x0204BAA0
thumb_func_start PalPark_HandleBattleEnd
PalPark_HandleBattleEnd: ; 0x0204BAA0
ldr r3, _0204BAA8 ; =sub_0204BD18
ldr r2, _0204BAAC ; =UNK_021C5A1C
bx r3
@@ -108,8 +108,8 @@ sub_0204BAA0: ; 0x0204BAA0
_0204BAA8: .word sub_0204BD18
_0204BAAC: .word UNK_021C5A1C
thumb_func_start sub_0204BAB0
sub_0204BAB0: ; 0x0204BAB0
thumb_func_start PalPark_CountMonsNotCaught
PalPark_CountMonsNotCaught: ; 0x0204BAB0
push {r3, lr}
ldr r0, _0204BAC0 ; =UNK_021C5A1C
bl sub_0204BBA8
@@ -479,13 +479,13 @@ sub_0204BD40: ; 0x0204BD40
bl sub_02022528
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_0204BAB0
bl PalPark_CountMonsNotCaught
add r1, r0, #0x0
mov r0, #0xb
bl sub_02047800
add r1, r5, #0x0
add r7, r0, #0x0
bl sub_02047BB0
bl BattleSetup_InitFromFieldSystem
ldr r0, [sp, #0x0]
ldr r1, [r6, #0x3c]
add r2, r4, #0x0
arm9/asm/unk_0204C1B4.s
+19 -19
View File
@@ -60,7 +60,7 @@ sub_0204C1F4: ; 0x0204C1F4
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x0]
cmp r0, #0x0
@@ -130,7 +130,7 @@ sub_0204C260: ; 0x0204C260
ldr r0, [sp, #0x20]
str r0, [r2, #0x20]
add r0, r7, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3-r7, pc}
nop
_0204C298: .word sub_0204C380
@@ -238,7 +238,7 @@ _0204C36A:
add r0, r7, #0x0
add r2, r6, #0x0
str r4, [r6, #0x20]
bl sub_020463CC
bl FieldSystem_CreateTask
add sp, #0xc
pop {r4-r7, pc}
nop
@@ -251,7 +251,7 @@ sub_0204C380: ; 0x0204C380
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r6, r4, #0x0
ldr r1, [r4, #0x0]
@@ -306,7 +306,7 @@ _0204C3E8:
b _0204C458
_0204C3F8:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -365,7 +365,7 @@ sub_0204C468: ; 0x0204C468
add r5, r0, #0x0
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x0
@@ -377,7 +377,7 @@ _0204C484:
ldr r0, _0204C4A0 ; =0x00000603
bl PlaySE
add r0, r5, #0x0
bl sub_0204AFC8
bl CallTask_FadeToBlack
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -398,7 +398,7 @@ sub_0204C4A4: ; 0x0204C4A4
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x3
@@ -444,7 +444,7 @@ _0204C4F6:
b _0204C522
_0204C510:
add r0, r6, #0x0
bl sub_0204AFC8
bl CallTask_FadeToBlack
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -464,7 +464,7 @@ sub_0204C528: ; 0x0204C528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x0
@@ -522,7 +522,7 @@ sub_0204C5A0: ; 0x0204C5A0
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x3
@@ -603,7 +603,7 @@ sub_0204C644: ; 0x0204C644
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r6, #0x38]
bl PlayerAvatar_GetMapObject
@@ -639,7 +639,7 @@ sub_0204C68C: ; 0x0204C68C
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r6, #0x38]
bl PlayerAvatar_GetMapObject
@@ -675,7 +675,7 @@ sub_0204C6D4: ; 0x0204C6D4
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
ldr r0, [r5, #0x4]
cmp r0, #0x3
@@ -769,7 +769,7 @@ sub_0204C7A0: ; 0x0204C7A0
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x0
@@ -801,7 +801,7 @@ _0204C7BE:
ldr r1, _0204C81C ; =sub_0204C6D4
add r0, r6, #0x0
add r2, r4, #0x0
bl sub_020463EC
bl TaskManager_Jump
b _0204C818
_0204C7FE:
bl ov05_021DB030
@@ -830,7 +830,7 @@ sub_0204C824: ; 0x0204C824
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x0
@@ -888,7 +888,7 @@ sub_0204C89C: ; 0x0204C89C
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x3
@@ -968,7 +968,7 @@ sub_0204C93C: ; 0x0204C93C
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r6, #0x38]
bl PlayerAvatar_GetMapObject
arm9/asm/unk_0204CB20.s
+6 -6
View File
@@ -2315,13 +2315,13 @@ sub_0204DCB4: ; 0x0204DCB4
ldr r0, _0204DD10 ; =UNK_021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x54]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CC4
add r4, r0, #0x0
ldr r0, _0204DD10 ; =UNK_021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x54]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CB4
add r4, r0, #0x0
bl sub_020269A0
arm9/asm/unk_0204FBA8.s
+4 -4
View File
@@ -146,7 +146,7 @@ sub_0204FC5C: ; 0x0204FC5C
ldr r1, [r1, #0x0]
cmp r1, #0x0
bne _0204FC9A
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
mov r1, #0x0
add r3, r5, #0x0
str r1, [sp, #0x0]
@@ -1762,7 +1762,7 @@ sub_02050968: ; 0x02050968
ldr r1, [r1, #0x0]
add r0, r4, #0x0
ldr r1, [r1, #0x44]
bl CopyPlayerParty
bl CopyParty
_02050986:
cmp r5, #0x0
beq _02050994
arm9/asm/unk_02050E48.s
+20 -20
View File
@@ -50,7 +50,7 @@ sub_02050E48: ; 0x02050E48
ldr r0, [sp, #0x4]
strb r0, [r4, #0x14]
ldr r0, [r4, #0x0]
bl GetPartyCount
bl Party_GetCount
strb r0, [r4, #0x13]
mov r0, #0x0
strh r0, [r4, #0x18]
@@ -94,7 +94,7 @@ sub_02050ED4: ; 0x02050ED4
str r0, [r4, #0x14]
ldr r0, [r5, #0x24]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
ldr r0, [r5, #0x24]
ldr r0, [r0, #0xc]
@@ -198,7 +198,7 @@ sub_02050FC8: ; 0x02050FC8
push {r4, lr}
add r4, r0, #0x0
add r0, r1, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
beq _02050FDA
mov r0, #0x0
@@ -246,7 +246,7 @@ sub_02051020: ; 0x02051020
push {r4, lr}
add r4, r0, #0x0
add r0, r1, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
beq _02051032
mov r0, #0x0
@@ -311,7 +311,7 @@ sub_02051094: ; 0x02051094
push {r3-r5, lr}
sub sp, #0x8
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -627,7 +627,7 @@ _02051308:
_0205130E:
ldr r0, [r4, #0x24]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -957,7 +957,7 @@ _020515BA:
add r1, #0x84
ldrb r1, [r1, #0x0]
ldr r0, [r4, #0x50]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl sub_020690E4
add r2, r0, #0x0
ldr r0, [r4, #0x28]
@@ -1380,7 +1380,7 @@ _02051938:
bl SaveArray_Party_Alloc
mov r1, #0x3
str r0, [r4, #0x50]
bl InitPartyWithMaxSize
bl Party_InitWithMaxSize
add r0, r4, #0x0
mov r1, #0x5
add r0, #0x44
@@ -1408,7 +1408,7 @@ _02051988:
ldr r1, _02051994 ; =sub_02051094
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
_02051992:
pop {r4-r6, pc}
.balign 4
@@ -1451,11 +1451,11 @@ _020519BA:
thumb_func_start sub_020519E4
sub_020519E4: ; 0x020519E4
ldr r3, _020519EC ; =sub_0204652C
ldr r3, _020519EC ; =TaskManager_GetEnvironment
ldr r0, [r0, #0x10]
bx r3
nop
_020519EC: .word sub_0204652C
_020519EC: .word TaskManager_GetEnvironment
thumb_func_start sub_020519F0
sub_020519F0: ; 0x020519F0
@@ -1464,7 +1464,7 @@ sub_020519F0: ; 0x020519F0
ldr r0, [r7, #0x24]
add r5, r1, #0x0
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #0x0]
ldr r4, [r7, #0x4c]
bl sub_020690C4
@@ -1482,7 +1482,7 @@ _02051A16:
ldrb r1, [r1, #0x0]
ldr r0, [sp, #0x0]
sub r1, r1, #0x1
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r4, #0x0
add r2, r6, #0x0
bl MI_CpuCopy8
@@ -1611,7 +1611,7 @@ sub_02051AF0: ; 0x02051AF0
add r6, r0, #0x0
ldr r0, [r5, #0x50]
mov r1, #0x3
bl InitPartyWithMaxSize
bl Party_InitWithMaxSize
mov r4, #0x0
_02051B04:
add r1, r4, #0x0
@@ -1619,7 +1619,7 @@ _02051B04:
mul r1, r6
ldr r0, [r5, #0x50]
add r1, r2, r1
bl AddMonToParty
bl Party_AddMon
add r4, r4, #0x1
cmp r4, #0x3
blt _02051B04
@@ -1650,7 +1650,7 @@ sub_02051B1C: ; 0x02051B1C
bl MI_CpuCopy8
ldr r0, [r6, #0x50]
mov r1, #0x3
bl InitPartyWithMaxSize
bl Party_InitWithMaxSize
mov r5, #0x0
_02051B52:
add r1, r5, #0x0
@@ -1658,7 +1658,7 @@ _02051B52:
mul r1, r4
ldr r0, [r6, #0x50]
add r1, r2, r1
bl AddMonToParty
bl Party_AddMon
add r5, r5, #0x1
cmp r5, #0x3
blt _02051B52
@@ -2095,7 +2095,7 @@ sub_02051EB0: ; 0x02051EB0
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r1, #0x0
ldr r0, [r4, #0x24]
@@ -2230,7 +2230,7 @@ _02051FDC:
b _0205203A
_02051FEC:
add r0, r5, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _0205203A
ldr r0, [r4, #0x28]
@@ -2306,7 +2306,7 @@ _02052066:
str r0, [r2, #0x28]
ldr r0, [sp, #0x0]
ldr r1, _020520A8 ; =sub_02051EB0
bl sub_020463CC
bl FieldSystem_CreateTask
bl sub_02037760
pop {r3-r7, pc}
_0205209C:
arm9/asm/unk_020520AC.s
+1 -1
View File
@@ -181,7 +181,7 @@ sub_02052110: ; 0x02052110
mov r0, #0x0
pop {r4-r6, pc}
_0205211E:
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r6, r0, #0x0
bl sub_02031A7C
mov r1, #0x19
arm9/asm/unk_02054C14.s
+9 -9
View File
@@ -288,8 +288,8 @@ _02054DE8: .word 0x0000010D
sub_02054DEC: ; 0x02054DEC
push {r3-r7, lr}
add r6, r0, #0x0
bl SaveArray_PlayerParty_Get
bl GetPartyCount
bl SaveArray_Party_Get
bl Party_GetCount
lsl r0, r0, #0x10
lsr r5, r0, #0x10
ldr r4, _02054E2C ; =0x00000000
@@ -297,9 +297,9 @@ sub_02054DEC: ; 0x02054DEC
mov r7, #0x4c
_02054E02:
add r0, r6, #0x0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r4, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r7, #0x0
mov r2, #0x0
bl GetMonData
@@ -324,9 +324,9 @@ Save_PlayerHasAllRegisInParty: ; 0x02054E30
push {r3-r7, lr}
sub sp, #0x10
mov r7, #0x0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #0x0]
bl GetPartyCount
bl Party_GetCount
add r4, r0, #0x0
add r6, r7, #0x0
cmp r4, #0x0
@@ -335,7 +335,7 @@ Save_PlayerHasAllRegisInParty: ; 0x02054E30
_02054E4A:
ldr r0, [sp, #0x0]
add r1, r6, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x5
mov r2, #0x0
bl GetMonData
@@ -388,7 +388,7 @@ sub_02054EA0: ; 0x02054EA0
add r4, r0, #0x0
bl TaskManager_GetFieldSystem
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0x2
lsl r0, r0, #0xe
@@ -538,7 +538,7 @@ sub_02054FE4: ; 0x02054FE4
add r4, r0, #0x0
bl TaskManager_GetFieldSystem
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldrb r1, [r4, #0x9]
ldr r0, [r4, #0x0]
arm9/asm/unk_02057380.s
+5 -5
View File
@@ -368,7 +368,7 @@ sub_02057688: ; 0x02057688
bl MapObject_GetFieldSysPtr
lsl r1, r5, #0x10
lsr r1, r1, #0x10
bl FlagSet
bl FieldSystem_FlagSet
add r0, r4, #0x0
bl sub_02057654
pop {r3-r5, pc}
@@ -2734,8 +2734,8 @@ sub_02058774: ; 0x02058774
nop
_0205877C: .word sub_02058384
thumb_func_start sub_02058780
sub_02058780: ; 0x02058780
thumb_func_start MapObjectManager_PauseAllMovement
MapObjectManager_PauseAllMovement: ; 0x02058780
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02058368
@@ -2759,8 +2759,8 @@ _020587A6:
pop {r4-r6, pc}
.balign 4
thumb_func_start sub_020587B0
sub_020587B0: ; 0x020587B0
thumb_func_start MapObjectManager_UnpauseAllMovement
MapObjectManager_UnpauseAllMovement: ; 0x020587B0
push {r4-r6, lr}
add r5, r0, #0x0
bl sub_02058368
arm9/asm/unk_0205CDB4.s
+3 -3
View File
@@ -24,7 +24,7 @@ UNK_020F7240: ; 0x020F7240
sub_0205CDB4: ; 0x0205CDB4
push {r4, lr}
add r4, r0, #0x0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
bl sub_020254B4
cmp r0, #0x0
arm9/asm/unk_0205CE48.s
+49 -49
View File
@@ -76,7 +76,7 @@ sub_0205CE80: ; 0x0205CE80
str r0, [r5, #0x0]
ldr r0, [r4, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
str r0, [r5, #0x4]
ldr r0, [r4, #0x38]
bl PlayerAvatar_GetState
@@ -165,7 +165,7 @@ sub_0205CF34: ; 0x0205CF34
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_0204649C
@@ -202,7 +202,7 @@ sub_0205CF78: ; 0x0205CF78
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205CF9C ; =sub_0205CFA0
bl sub_020463CC
bl FieldSystem_CreateTask
add sp, #0x4
pop {r3-r4, pc}
nop
@@ -215,10 +215,10 @@ sub_0205CFA0: ; 0x0205CFA0
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r6, r0, #0x0
ldr r0, [r6, #0x0]
cmp r0, #0x0
@@ -236,7 +236,7 @@ _0205CFC6:
add r0, r7, #0x0
lsr r1, r1, #0x10
mov r3, #0x0
bl sub_02038CD8
bl QueueScript
add r0, r5, #0x0
mov r1, #0x29
bl FieldSysGetAttrAddr
@@ -278,7 +278,7 @@ sub_0205D024: ; 0x0205D024
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r7, r0, #0x0
mov r0, #0xb
mov r1, #0x40
@@ -288,7 +288,7 @@ sub_0205D024: ; 0x0205D024
add r4, r0, #0x0
bl memset
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
ldr r0, [r5, #0xc]
bl Save_Bag_Get
@@ -344,7 +344,7 @@ sub_0205D0BC: ; 0x0205D0BC
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02037EB8
@@ -383,7 +383,7 @@ sub_0205D104: ; 0x0205D104
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204649C
@@ -414,11 +414,11 @@ sub_0205D144: ; 0x0205D144
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
ldr r0, [r5, #0x0]
ldr r1, _0205D16C ; =sub_02049844
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
ldr r1, [r5, #0x0]
mov r0, #0x0
add r1, #0x8c
@@ -458,7 +458,7 @@ _0205D1A4:
ldr r0, [r5, #0x18]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x1
beq _0205D1C4
ldr r0, [r5, #0x18]
@@ -520,7 +520,7 @@ sub_0205D21C: ; 0x0205D21C
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204649C
@@ -543,7 +543,7 @@ sub_0205D250: ; 0x0205D250
ldr r0, [r0, #0x0]
ldr r1, _0205D260 ; =sub_0205D264
mov r2, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -556,7 +556,7 @@ sub_0205D264: ; 0x0205D264
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r5, r0, #0x0
ldr r0, [r5, #0x0]
cmp r0, #0x3
@@ -633,7 +633,7 @@ _0205D314:
b _0205D324
_0205D31A:
ldr r0, [r4, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
mov r0, #0x1
pop {r3-r5, pc}
_0205D324:
@@ -723,7 +723,7 @@ sub_0205D3B8: ; 0x0205D3B8
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -761,7 +761,7 @@ sub_0205D400: ; 0x0205D400
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r7, r0, #0x0
mov r0, #0xb
mov r1, #0x40
@@ -771,7 +771,7 @@ sub_0205D400: ; 0x0205D400
add r4, r0, #0x0
bl memset
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
ldr r0, [r5, #0xc]
bl Save_Bag_Get
@@ -827,7 +827,7 @@ sub_0205D498: ; 0x0205D498
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldrh r0, [r5, #0x4]
bl ItemToMailId
@@ -866,7 +866,7 @@ sub_0205D4E8: ; 0x0205D4E8
add r4, r1, #0x0
bl TaskManager_GetFieldSystem
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
ldrh r1, [r4, #0x10]
mov r0, #0x1
tst r0, r1
@@ -902,7 +902,7 @@ sub_0205D528: ; 0x0205D528
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xb
@@ -943,7 +943,7 @@ sub_0205D574: ; 0x0205D574
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r5, #0xc]
add r0, r5, #0x0
@@ -985,7 +985,7 @@ sub_0205D5C4: ; 0x0205D5C4
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
mov r0, #0xb
mov r1, #0x4
@@ -1019,7 +1019,7 @@ sub_0205D604: ; 0x0205D604
str r0, [r2, #0x0]
ldr r0, [r4, #0x0]
ldr r1, _0205D624 ; =sub_0205E30C
bl sub_020463CC
bl FieldSystem_CreateTask
mov r0, #0x0
pop {r4, pc}
nop
@@ -1124,7 +1124,7 @@ sub_0205D6BC: ; 0x0205D6BC
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204649C
@@ -1197,7 +1197,7 @@ sub_0205D74C: ; 0x0205D74C
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204649C
@@ -1229,7 +1229,7 @@ sub_0205D788: ; 0x0205D788
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D7A4 ; =ov05_021F5C70
bl sub_020463CC
bl FieldSystem_CreateTask
mov r0, #0x0
pop {r4, pc}
.balign 4
@@ -1243,7 +1243,7 @@ sub_0205D7A8: ; 0x0205D7A8
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204649C
@@ -1275,7 +1275,7 @@ sub_0205D7E4: ; 0x0205D7E4
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D800 ; =ov05_021F5C70
bl sub_020463CC
bl FieldSystem_CreateTask
mov r0, #0x0
pop {r4, pc}
.balign 4
@@ -1289,7 +1289,7 @@ sub_0205D804: ; 0x0205D804
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204649C
@@ -1321,7 +1321,7 @@ sub_0205D840: ; 0x0205D840
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D85C ; =ov05_021F5C70
bl sub_020463CC
bl FieldSystem_CreateTask
mov r0, #0x0
pop {r4, pc}
.balign 4
@@ -1402,7 +1402,7 @@ sub_0205D8B8: ; 0x0205D8B8
ldr r0, [r5, #0x0]
ldr r1, _0205D900 ; =sub_0205D904
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
@@ -1415,7 +1415,7 @@ sub_0205D904: ; 0x0205D904
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldrh r0, [r4, #0x16]
cmp r0, #0x0
@@ -1427,7 +1427,7 @@ sub_0205D904: ; 0x0205D904
b _0205D9A0
_0205D926:
ldr r0, [r5, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
ldr r0, [r5, #0x8]
add r1, r4, #0x0
mov r2, #0x3
@@ -1469,7 +1469,7 @@ _0205D95C:
b _0205D9A0
_0205D984:
ldr r0, [r5, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
add r0, r4, #0x0
bl RemoveWindow
ldr r0, [r4, #0x10]
@@ -1492,7 +1492,7 @@ sub_0205D9A8: ; 0x0205D9A8
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r7, r0, #0x0
mov r0, #0xb
mov r1, #0x40
@@ -1502,7 +1502,7 @@ sub_0205D9A8: ; 0x0205D9A8
add r4, r0, #0x0
bl memset
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r4, #0x0]
ldr r0, [r5, #0xc]
bl Save_Bag_Get
@@ -1557,7 +1557,7 @@ sub_0205DA3C: ; 0x0205DA3C
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204649C
@@ -1615,7 +1615,7 @@ sub_0205DAAC: ; 0x0205DAAC
add r2, r0, #0x0
ldr r1, _0205DAC8 ; =0x0224C721
add r0, r4, #0x0
bl sub_020463EC
bl TaskManager_Jump
mov r0, #0x0
pop {r4, pc}
.balign 4
@@ -1796,7 +1796,7 @@ sub_0205DBF0: ; 0x0205DBF0
ldr r0, [r5, #0x0]
ldr r1, _0205DC34 ; =sub_0205D904
add r2, r4, #0x0
bl sub_020463CC
bl FieldSystem_CreateTask
add sp, #0x4
pop {r3-r6, pc}
.balign 4
@@ -1809,7 +1809,7 @@ sub_0205DC38: ; 0x0205DC38
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, #0x2a
ldrb r0, [r0, #0x0]
@@ -1829,7 +1829,7 @@ _0205DC5E: ; jump table (using 16-bit offset)
.short _0205DCE2 - _0205DC5E - 2; case 4
_0205DC68:
ldr r0, [r5, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
mov r0, #0x0
bl ov05_021D7CA4
mov r0, #0x1
@@ -1850,7 +1850,7 @@ _0205DC7C:
b _0205DCFA
_0205DC94:
add r0, r5, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _0205DCFA
ldr r0, [r4, #0x24]
@@ -1877,7 +1877,7 @@ _0205DCC4:
cmp r0, #0x0
beq _0205DCFA
ldr r0, [r5, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
mov r0, #0x1
bl ov05_021D7CA4
mov r0, #0x4
@@ -1889,7 +1889,7 @@ _0205DCE2:
cmp r0, #0x0
beq _0205DCFA
ldr r0, [r5, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
add r0, r4, #0x0
bl FreeToHeap
mov r0, #0x1
@@ -1904,10 +1904,10 @@ _0205DD00: .word sub_0205D568
sub_0205DD04: ; 0x0205DD04
add r2, r0, #0x0
str r1, [r2, #0x20]
ldr r3, _0205DD10 ; =sub_020463CC
ldr r3, _0205DD10 ; =FieldSystem_CreateTask
ldr r0, [r2, #0x0]
ldr r1, _0205DD14 ; =sub_0205DC38
bx r3
.balign 4
_0205DD10: .word sub_020463CC
_0205DD10: .word FieldSystem_CreateTask
_0205DD14: .word sub_0205DC38
arm9/asm/unk_0205DD18.s
+5 -5
View File
@@ -836,7 +836,7 @@ sub_0205E30C: ; 0x0205E30C
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
ldr r1, [r5, #0x0]
cmp r1, #0x4
@@ -855,7 +855,7 @@ _0205E330: ; jump table (using 16-bit offset)
.short _0205E3DE - _0205E330 - 2; case 4
_0205E33A:
ldr r0, [r4, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
ldr r0, [r4, #0xc]
bl Save_Roamers_Get
bl sub_0202AB40
@@ -867,7 +867,7 @@ _0205E33A:
ldr r1, _0205E400 ; =0x0000230A
add r0, r7, #0x0
add r3, r2, #0x0
bl sub_02038CD8
bl QueueScript
add r0, r4, #0x0
mov r1, #0x29
bl FieldSysGetAttrAddr
@@ -931,7 +931,7 @@ _0205E3CC:
_0205E3DE:
bl FreeToHeap
ldr r0, [r4, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
mov r0, #0x1
pop {r3-r7, pc}
_0205E3EC:
@@ -939,7 +939,7 @@ _0205E3EC:
ldr r1, _0205E408 ; =0x0000230B
add r0, r7, #0x0
add r3, r2, #0x0
bl sub_02038CD8
bl QueueScript
mov r0, #0x4
str r0, [r5, #0x0]
_0205E3FC:
arm9/asm/unk_0205F7A0.s
+1 -1
View File
@@ -70,7 +70,7 @@ _0205F806:
str r0, [r5, #0x4]
_0205F812:
ldr r0, [sp, #0x0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
bl PlayerProfile_GetTrainerGender
str r0, [r5, #0xc]
arm9/asm/unk_020606B0.s
+5 -5
View File
@@ -15,7 +15,7 @@ sub_020606B0: ; 0x020606B0
add r4, r0, #0x0
bl TaskManager_GetFieldSystem
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r2, r0, #0x0
ldr r1, _020606CC ; =UNK_020F7630
add r0, r4, #0x0
@@ -33,7 +33,7 @@ sub_020606D0: ; 0x020606D0
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x6
@@ -73,7 +73,7 @@ _02060704:
b _0206078A
_0206072C:
add r0, r5, #0x0
bl sub_0204AFC8
bl CallTask_FadeToBlack
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -94,14 +94,14 @@ _02060748:
b _0206078A
_02060756:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
b _0206078A
_02060764:
add r0, r5, #0x0
bl sub_0204B00C
bl CallTask_FadeFromBlack
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
arm9/asm/unk_020607D4.s
+4 -4
View File
@@ -195,10 +195,10 @@ sub_02060948: ; 0x02060948
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02046530
bl TaskManager_GetStatePtr
add r5, r0, #0x0
ldr r0, [r5, #0x0]
cmp r0, #0x0
@@ -215,7 +215,7 @@ _02060972:
b _02060994
_0206097C:
add r0, r4, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
beq _02060994
mov r0, #0x0
@@ -241,7 +241,7 @@ sub_020609A0: ; 0x020609A0
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldrb r1, [r4, #0x0]
cmp r1, #0x7
arm9/asm/unk_02060CCC.s
+1 -1
View File
@@ -2172,7 +2172,7 @@ sub_02061C5C: ; 0x02061C5C
add r5, r0, #0x0
ldr r0, [r5, #0xc]
add r4, r1, #0x0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
bl GetFirstNonEggInParty
add r1, sp, #0x8
add r2, sp, #0x4
arm9/asm/unk_020625EC.s
+1 -1
View File
@@ -1963,7 +1963,7 @@ sub_02063524: ; 0x02063524
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r2, [r4, #0x0]
ldr r1, [r4, #0x8]
arm9/asm/unk_0206367C.s
+1 -1
View File
@@ -33,7 +33,7 @@ sub_02063684: ; 0x02063684
strh r1, [r0, #0x0]
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x0
bne _020636DA
ldr r0, [r5, #0xc]
arm9/asm/unk_02063888.s
+1 -1
View File
@@ -39,7 +39,7 @@ sub_020638BC: ; 0x020638BC
add r5, r0, #0x0
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x0
arm9/asm/unk_02063948.s
+42 -42
View File
@@ -233,7 +233,7 @@ sub_02063AD0: ; 0x02063AD0
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -258,7 +258,7 @@ sub_02063B04: ; 0x02063B04
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -266,7 +266,7 @@ sub_02063B04: ; 0x02063B04
ldr r1, _02063B3C ; =0x00002718
ldr r2, [r4, #0x4]
add r0, r5, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
@@ -312,7 +312,7 @@ _02063B74:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0x1
bne _02063B88
mov r0, #0x3
@@ -321,7 +321,7 @@ _02063B88:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x1
beq _02063BA8
ldr r0, [r4, #0x4]
@@ -353,7 +353,7 @@ sub_02063BBC: ; 0x02063BBC
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
mov r0, #0xb
mov r1, #0x4
@@ -424,7 +424,7 @@ _02063C56:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0x1
bne _02063C6A
mov r0, #0x3
@@ -440,7 +440,7 @@ sub_02063C70: ; 0x02063C70
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -465,7 +465,7 @@ sub_02063CA4: ; 0x02063CA4
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -473,7 +473,7 @@ sub_02063CA4: ; 0x02063CA4
ldr r1, _02063CDC ; =0x0000271C
add r0, r5, #0x0
mov r2, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
@@ -526,7 +526,7 @@ sub_02063D18: ; 0x02063D18
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -551,7 +551,7 @@ sub_02063D4C: ; 0x02063D4C
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -559,7 +559,7 @@ sub_02063D4C: ; 0x02063D4C
ldr r1, _02063D84 ; =0x0000271A
ldr r2, [r4, #0x4]
add r0, r5, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
@@ -612,7 +612,7 @@ sub_02063DC0: ; 0x02063DC0
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -637,7 +637,7 @@ sub_02063DF4: ; 0x02063DF4
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -645,7 +645,7 @@ sub_02063DF4: ; 0x02063DF4
ldr r1, _02063E2C ; =0x0000271E
add r0, r5, #0x0
mov r2, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
@@ -698,7 +698,7 @@ sub_02063E68: ; 0x02063E68
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -723,7 +723,7 @@ sub_02063E9C: ; 0x02063E9C
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -731,7 +731,7 @@ sub_02063E9C: ; 0x02063E9C
ldr r1, _02063ED4 ; =0x00002719
ldr r2, [r4, #0x4]
add r0, r5, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
@@ -784,7 +784,7 @@ sub_02063F10: ; 0x02063F10
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -809,7 +809,7 @@ sub_02063F44: ; 0x02063F44
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -817,7 +817,7 @@ sub_02063F44: ; 0x02063F44
ldr r1, _02063F7C ; =0x0000271D
add r0, r5, #0x0
mov r2, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
@@ -863,7 +863,7 @@ _02063FB2:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0x1
bne _02063FC6
mov r0, #0x3
@@ -879,7 +879,7 @@ sub_02063FCC: ; 0x02063FCC
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -904,7 +904,7 @@ sub_02064000: ; 0x02064000
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -912,7 +912,7 @@ sub_02064000: ; 0x02064000
ldr r1, _02064038 ; =0x0000271B
add r0, r5, #0x0
mov r2, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
@@ -954,7 +954,7 @@ sub_0206405C: ; 0x0206405C
add r5, r0, #0x0
ldr r0, [r5, #0x0]
add r6, r1, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -979,7 +979,7 @@ sub_02064090: ; 0x02064090
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -987,7 +987,7 @@ sub_02064090: ; 0x02064090
ldr r1, _020640C8 ; =0x0000271F
add r0, r5, #0x0
mov r2, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
@@ -1024,7 +1024,7 @@ _020640EC:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0x1
bne _02064100
mov r0, #0x3
@@ -1033,7 +1033,7 @@ _02064100:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0x1
beq _02064120
ldr r0, [r4, #0x4]
@@ -1065,7 +1065,7 @@ sub_02064134: ; 0x02064134
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204649C
@@ -1094,7 +1094,7 @@ sub_02064174: ; 0x02064174
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
add r0, r6, #0x0
@@ -1106,7 +1106,7 @@ sub_02064174: ; 0x02064174
ldr r1, _020641A8 ; =ov06_0224CB54
add r0, r5, #0x0
add r2, r6, #0x0
bl sub_020463EC
bl TaskManager_Jump
mov r0, #0x0
pop {r4-r6, pc}
nop
@@ -1139,7 +1139,7 @@ _020641D6:
ldr r0, [r4, #0x4]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0x1
bne _020641EA
mov r0, #0x3
@@ -1157,7 +1157,7 @@ sub_020641F0: ; 0x020641F0
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204649C
@@ -1186,7 +1186,7 @@ sub_02064230: ; 0x02064230
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0x0
ldr r1, [r6, #0x0]
add r0, r4, #0x0
@@ -1210,7 +1210,7 @@ sub_02064230: ; 0x02064230
ldr r1, _02064280 ; =ov06_0224CAAC
add r0, r5, #0x0
add r2, r7, #0x0
bl sub_020463EC
bl TaskManager_Jump
mov r0, #0x0
pop {r3-r7, pc}
nop
@@ -1253,7 +1253,7 @@ sub_020642B4: ; 0x020642B4
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
ldr r0, [r6, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
ldrh r1, [r6, #0x4]
add r4, r0, #0x0
ldr r2, [r5, #0xc]
@@ -1311,7 +1311,7 @@ sub_02064324: ; 0x02064324
bl TaskManager_GetFieldSystem
add r7, r0, #0x0
ldr r0, [r5, #0x0]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -1336,7 +1336,7 @@ sub_02064360: ; 0x02064360
push {r3-r6, lr}
sub sp, #0x4
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r5, #0x0
bl TaskManager_GetFieldSystem
@@ -1344,7 +1344,7 @@ sub_02064360: ; 0x02064360
ldr r1, _02064398 ; =0x000022C4
add r0, r5, #0x0
mov r2, #0x0
bl sub_02038D10
bl StartScriptFromMenu
mov r2, #0x0
str r2, [sp, #0x0]
ldrh r1, [r4, #0xc]
arm9/asm/unk_020647A4.s
+6 -6
View File
@@ -47,7 +47,7 @@ sub_020647A4: ; 0x020647A4
push {r3-r7, lr}
sub sp, #0x30
add r4, r0, #0x0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #0x7
bl sub_020254A0
@@ -422,7 +422,7 @@ sub_02064A70: ; 0x02064A70
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
cmp r1, #0x3
@@ -546,7 +546,7 @@ sub_02064B70: ; 0x02064B70
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
cmp r1, #0x3
arm9/asm/unk_02064CA8.s
+5 -5
View File
@@ -17,7 +17,7 @@ UNK_020F7E54: ; 0x020F7E54
thumb_func_start InitPastoriaGym
InitPastoriaGym: ; 0x02064CA8
push {r4, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x1
@@ -33,7 +33,7 @@ InitPastoriaGym: ; 0x02064CA8
InitHearthomeGym: ; 0x02064CC8
push {r3-r5, lr}
add r5, r0, #0x0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x2
@@ -67,7 +67,7 @@ _02064D08:
thumb_func_start InitCanalaveGym
InitCanalaveGym: ; 0x02064D10
push {r4-r6, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x3
@@ -95,7 +95,7 @@ _02064D48: .word UNK_020F7E54
thumb_func_start InitVeilstoneGym
InitVeilstoneGym: ; 0x02064D4C
push {r4-r6, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x4
@@ -130,7 +130,7 @@ InitSunyshoreGym: ; 0x02064D88
bl GF_AssertFail
_02064D96:
add r0, r7, #0x0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
add r4, r0, #0x0
mov r1, #0x5
arm9/asm/unk_02064E90.s
+4 -4
View File
@@ -14,7 +14,7 @@ sub_02064E90: ; 0x02064E90
add r0, r6, #0x0
str r3, [sp, #0x1c]
ldr r5, [sp, #0xbc]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [sp, #0x20]
bl Save_PlayerData_GetProfileAddr
add r7, r0, #0x0
@@ -218,7 +218,7 @@ _02065074: .word FreeToHeap
thumb_func_start GetTrainerCardLevel
GetTrainerCardLevel: ; 0x02065078
push {r3-r7, lr}
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r7, r0, #0x0
bl Save_GameStats_Get
add r6, r0, #0x0
@@ -609,7 +609,7 @@ sub_02065370: ; 0x02065370
bl TaskManager_GetFieldSystem
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0x0
ldr r0, [r5, #0x0]
cmp r0, #0xa
@@ -650,7 +650,7 @@ _020653BA:
b _020653E2
_020653C8:
add r0, r4, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _020653E2
ldr r0, [r4, #0x78]
arm9/asm/unk_020653EC.s
+11 -11
View File
@@ -55,7 +55,7 @@ sub_020653EC: ; 0x020653EC
bl MI_CpuFill8
add r0, r5, #0x0
str r6, [r4, #0x4]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
mov r1, #0x5b
lsl r1, r1, #0x2
str r5, [r4, r1]
@@ -1807,10 +1807,10 @@ sub_020661F8: ; 0x020661F8
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl FieldSystem_GetSaveDataPtr
bl SaveArray_PlayerParty_Get
bl FieldSystem_GetSaveData
bl SaveArray_Party_Get
add r1, r7, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r2, r0, #0x0
mov r0, #0x6b
lsl r0, r0, #0x2
@@ -2376,19 +2376,19 @@ _02066676:
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl FieldSystem_GetSaveDataPtr
bl SaveArray_PlayerParty_Get
bl FieldSystem_GetSaveData
bl SaveArray_Party_Get
str r0, [r4, #0x0]
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_Bag_Get
str r0, [r4, #0x4]
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetOptionsAddr
str r0, [r4, #0xc]
mov r0, #0x5b
@@ -2434,7 +2434,7 @@ _02066708:
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _0206671E
mov r0, #0x0
@@ -2495,7 +2495,7 @@ _0206677A:
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
bne _020667D0
mov r0, #0x6a
@@ -2544,7 +2544,7 @@ sub_020667D4: ; 0x020667D4
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x4]
cmp r1, #0x0
arm9/asm/unk_0206BB5C.s
+3 -3
View File
@@ -193,7 +193,7 @@ _0206BCBC:
beq _0206BD0A
ldr r0, [sp, #0x4]
sub r1, r1, #0x1
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, r0, #0x0
ldr r0, [sp, #0x0]
ldr r2, [sp, #0x8]
@@ -407,7 +407,7 @@ sub_0206BE48: ; 0x0206BE48
add r0, r1, #0x0
str r1, [sp, #0x10]
str r2, [sp, #0x14]
bl GetPartyCount
bl Party_GetCount
str r0, [sp, #0x20]
add r6, r0, #0x0
add r0, sp, #0x30
@@ -423,7 +423,7 @@ sub_0206BE48: ; 0x0206BE48
_0206BE72:
ldr r0, [sp, #0x10]
add r1, r7, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x24]
mov r1, #0x5
mov r2, #0x0
arm9/asm/unk_0206BF90.s
+2 -2
View File
@@ -514,7 +514,7 @@ _0206C2E8:
add r4, #0x20
ldr r0, [r0, #0x4]
add r1, r4, #0x0
bl CopyPlayerParty
bl CopyParty
mov r0, #0x1
pop {r4, pc}
@@ -788,7 +788,7 @@ _0206C4DA:
add r5, #0x20
ldr r0, [r0, #0x4]
add r1, r5, #0x0
bl CopyPlayerParty
bl CopyParty
mov r0, #0x1
pop {r3-r5, pc}
.balign 4
arm9/asm/unk_0206C700.s
+2 -2
View File
@@ -2085,7 +2085,7 @@ _0206D854:
cmp r0, #0x0
beq _0206D86C
ldr r0, [r4, #0x24]
bl GetPartyCount
bl Party_GetCount
cmp r0, #0x6
blt _0206D86E
_0206D86C:
@@ -2195,7 +2195,7 @@ _0206D8EA:
bl CalcMonLevelAndStats
ldr r0, [r4, #0x24]
add r1, r5, #0x0
bl AddMonToParty
bl Party_AddMon
ldr r0, [r4, #0x48]
add r1, r5, #0x0
bl Pokedex_SetMonCaughtFlag
arm9/asm/unk_0206F1F0.s
+1 -1
View File
@@ -16,7 +16,7 @@ sub_0206F1F0: ; 0x0206F1F0
bl TaskManager_GetFieldSystem
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0xb
arm9/asm/unk_0206F3FC.s
+12 -12
View File
@@ -1669,7 +1669,7 @@ sub_0207008C: ; 0x0207008C
ldr r0, _020701DC ; =0x000005A4
ldr r0, [r5, r0]
ldr r0, [r0, #0x0]
bl GetPartyCount
bl Party_GetCount
ldr r1, [sp, #0x0]
cmp r0, r1
bgt _020700BC
@@ -1680,7 +1680,7 @@ _020700BC:
ldr r0, _020701DC ; =0x000005A4
ldr r0, [r5, r0]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x5
mov r2, #0x0
add r7, r0, #0x0
@@ -2812,7 +2812,7 @@ sub_020709FC: ; 0x020709FC
add r6, r1, #0x0
ldr r0, [r5, r0]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r1, _02070A7C ; =0x00000B23
ldrb r2, [r5, r1]
lsl r3, r2, #0x19
@@ -3758,7 +3758,7 @@ sub_0207117C: ; 0x0207117C
ldr r1, [sp, #0x0]
ldr r0, [r0, #0x0]
ldrb r1, [r1, r2]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x8]
ldr r0, [sp, #0x4]
mov r1, #0x1
@@ -3999,7 +3999,7 @@ sub_02071340: ; 0x02071340
cmp r0, #0x0
beq _0207136E
ldr r0, [r2, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
ldr r0, _020713E0 ; =0x000005A4
ldr r2, _020713E4 ; =0x00000B34
@@ -5036,7 +5036,7 @@ _02071B34:
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r6, r0, #0x0
ldr r0, _02071C3C ; =0x0000069C
mov r1, #0x40
@@ -5247,7 +5247,7 @@ _02071D14:
add r1, r6, #0x0
ldr r0, [r5, r0]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldrh r1, [r7, r4]
add r2, sp, #0x0
str r1, [sp, #0x0]
@@ -5429,7 +5429,7 @@ _02071E5A:
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
ldr r0, _02071F1C ; =0x000005A4
mov r2, #0x3
@@ -5463,7 +5463,7 @@ _02071ECC:
ldr r0, [r1, #0x0]
ldr r1, _02071F20 ; =0x00000B25
ldrb r1, [r5, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
ldr r0, _02071F1C ; =0x000005A4
ldr r2, [r5, r0]
@@ -5529,7 +5529,7 @@ sub_02071F58: ; 0x02071F58
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r6, r0, #0x0
mov r7, #0x89
add r0, r5, #0x0
@@ -5807,7 +5807,7 @@ _020721B0:
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r7, r0, #0x0
ldr r0, _020722A8 ; =0x000005A4
ldr r0, [r5, r0]
@@ -5971,7 +5971,7 @@ sub_0207230C: ; 0x0207230C
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r7, r0, #0x0
ldr r0, _02072410 ; =0x000005A4
ldr r0, [r5, r0]
arm9/asm/unk_02072548.s
+4 -4
View File
@@ -582,7 +582,7 @@ _0207297E:
ldr r1, _020729CC ; =0x00000B25
ldr r0, [r2, #0x0]
ldrb r1, [r5, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r6, r0, #0x0
ldr r0, _020729D0 ; =0x0000069C
mov r1, #0x25
@@ -1211,7 +1211,7 @@ _02072E98:
add r1, r4, #0x0
ldr r0, [r5, r0]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
mov r0, #0x0
ldr r3, _02072EE0 ; =0x000005A4
@@ -1280,7 +1280,7 @@ _02072F2C:
add r1, r4, #0x0
ldr r0, [r5, r0]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
add r0, r5, #0x0
bl sub_02076AA0
@@ -1983,7 +1983,7 @@ sub_020734C0: ; 0x020734C0
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa3
mov r2, #0x0
add r4, r0, #0x0
arm9/asm/unk_02073710.s
+1 -1
View File
@@ -218,7 +218,7 @@ sub_020737D0: ; 0x020737D0
add r4, r2, #0x0
ldr r0, [r0, #0x0]
add r7, r1, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
lsl r1, r4, #0x10
asr r6, r1, #0x10
mov r1, #0x2c
arm9/asm/unk_02073DA8.s
+6 -6
View File
@@ -199,7 +199,7 @@ sub_02073EEC: ; 0x02073EEC
bne _02073F66
ldr r0, [r5, r0]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r2, _02074058 ; =0x0000069C
add r6, r0, #0x0
ldr r0, [r5, r2]
@@ -238,7 +238,7 @@ _02073F66:
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x0
str r1, [sp, #0x0]
add r6, r0, #0x0
@@ -530,7 +530,7 @@ sub_02074200: ; 0x02074200
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0x0
ldr r0, _02074268 ; =0x000005A4
mov r2, #0xc
@@ -625,7 +625,7 @@ sub_020742A8: ; 0x020742A8
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x0
str r1, [sp, #0x0]
add r5, r0, #0x0
@@ -789,7 +789,7 @@ sub_02074428: ; 0x02074428
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl Pokemon_RemoveCapsule
ldr r0, _0207444C ; =0x000005A4
mov r1, #0x0
@@ -2383,7 +2383,7 @@ sub_02075118: ; 0x02075118
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa1
mov r2, #0x0
bl GetMonData
arm9/asm/unk_0207550C.s
+16 -16
View File
@@ -365,7 +365,7 @@ sub_020757F4: ; 0x020757F4
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
add r5, r2, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl sub_020690E4
add r2, r0, #0x0
mov r0, #0x6a
@@ -1045,7 +1045,7 @@ sub_02075DC0: ; 0x02075DC0
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xd
mov r2, #0x0
add r4, r0, #0x0
@@ -1243,7 +1243,7 @@ sub_02075F60: ; 0x02075F60
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0x0
str r0, [sp, #0x8]
@@ -1372,7 +1372,7 @@ sub_020760A0: ; 0x020760A0
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
@@ -1558,7 +1558,7 @@ _02076212:
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_020772CC
@@ -1646,7 +1646,7 @@ _020762DC:
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0x0
bl GetMonData
@@ -1782,7 +1782,7 @@ sub_0207640C: ; 0x0207640C
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa3
mov r2, #0x0
add r4, r0, #0x0
@@ -2056,7 +2056,7 @@ _02076680:
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r1, _02076878 ; =0x000005A4
add r5, r0, #0x0
ldr r2, [r4, r1]
@@ -2196,7 +2196,7 @@ _020767A4:
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r2, _02076878 ; =0x000005A4
add r1, r0, #0x0
ldr r2, [r4, r2]
@@ -2241,7 +2241,7 @@ _02076814:
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r5, r0, #0x0
ldr r0, _02076878 ; =0x000005A4
ldr r0, [r4, r0]
@@ -2307,7 +2307,7 @@ sub_02076890: ; 0x02076890
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r5, r0, #0x0
bl sub_020690E4
add r2, r0, #0x0
@@ -2586,7 +2586,7 @@ sub_02076AF8: ; 0x02076AF8
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r6, r0, #0x0
add r0, r4, #0x0
add r1, r6, #0x0
@@ -2775,7 +2775,7 @@ sub_02076C94: ; 0x02076C94
ldr r0, [r4, r0]
ldrb r1, [r4, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r5, r0, #0x0
bl sub_020690E4
add r2, r0, #0x0
@@ -2854,7 +2854,7 @@ sub_02076D3C: ; 0x02076D3C
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r2, _02076DC4 ; =0x000005A4
add r1, r0, #0x0
ldr r2, [r5, r2]
@@ -3138,7 +3138,7 @@ sub_02076FB0: ; 0x02076FB0
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r6, #0x0
add r1, #0x36
mov r2, #0x0
@@ -3375,7 +3375,7 @@ _0207716A:
ldr r0, [r5, r0]
ldrb r1, [r5, r1]
ldr r0, [r0, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, #0x36
add r1, r4, #0x0
mov r2, #0x0
arm9/asm/unk_02079C70.s
+2 -2
View File
@@ -3169,7 +3169,7 @@ _0207B588:
_0207B58E:
ldr r0, [r1, #0x0]
add r1, r4, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x5
mov r2, #0x0
add r6, r0, #0x0
@@ -3269,7 +3269,7 @@ _0207B640:
_0207B64E:
ldrb r1, [r4, #0x14]
ldr r0, [r4, #0x0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
pop {r4, pc}
_0207B658:
bl sub_020690C8
arm9/asm/unk_0207D5BC.s
+1 -1
View File
@@ -1188,7 +1188,7 @@ sub_0207DE3C: ; 0x0207DE3C
add r1, #0x10
ldrh r1, [r4, r1]
ldr r0, [r0, #0x1c]
bl sub_0206BB48
bl Pokedex_ConvertToCurrentDexNo
add r2, r0, #0x0
beq _0207DEFE
mov r0, #0x2
arm9/asm/unk_02080C38.s
+9 -9
View File
@@ -68,7 +68,7 @@ sub_02080C60: ; 0x02080C60
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0xe
@@ -106,12 +106,12 @@ _02080CA6:
b _02080DF2
_02080CB4:
ldr r0, [r6, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
mov r1, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r7, r0, #0x0
add r0, r6, #0x0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
mov r1, #0xb
str r0, [sp, #0x0]
@@ -240,7 +240,7 @@ _02080DCE:
b _02080DF2
_02080DD4:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -308,7 +308,7 @@ sub_02080E5C: ; 0x02080E5C
add r5, r0, #0x0
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0xd
@@ -491,7 +491,7 @@ _02080FBA:
b _02080FDC
_02080FC0:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -523,7 +523,7 @@ sub_02081000: ; 0x02081000
add r5, r0, #0x0
bl TaskManager_GetFieldSystem
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, [r4, #0x4]
cmp r0, #0x9
@@ -741,7 +741,7 @@ _0208117E:
b _020811B4
_02081196:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
arm9/asm/unk_020859C0.s
+5 -5
View File
@@ -627,7 +627,7 @@ sub_02085DA4: ; 0x02085DA4
push {r4-r7, lr}
sub sp, #0xc
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0x0
add r0, r5, #0x0
ldr r7, [r6, #0x8]
@@ -662,9 +662,9 @@ _02085DDC:
mov r1, #0x0
bl sub_02085D8C
ldr r0, [r6, #0x10]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r7, #0x1c]
bl GetPartyCount
bl Party_GetCount
mov r4, #0x0
str r0, [sp, #0x0]
str r0, [r7, #0x0]
@@ -674,7 +674,7 @@ _02085DDC:
_02085E0A:
ldr r0, [r7, #0x1c]
add r1, r4, #0x0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [r5, #0x4]
ldr r0, [sp, #0x0]
add r4, r4, #0x1
@@ -799,7 +799,7 @@ _02085F0E:
b _02085F38
_02085F14:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
mov r0, #0x6
str r0, [r6, #0x14]
b _02085F38
arm9/asm/unk_02086084.s
+5 -5
View File
@@ -229,7 +229,7 @@ sub_02086280: ; 0x02086280
push {r4-r7, lr}
sub sp, #0xc
add r5, r0, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x0]
cmp r1, #0x6
@@ -274,7 +274,7 @@ _020862D6:
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
ldr r5, [r4, #0xc]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
ldr r1, [r4, #0xc]
bl sub_0202C144
ldr r0, [r4, #0x4]
@@ -322,7 +322,7 @@ _0208633A:
bl GetMonData
add r7, r0, #0x0
add r0, r6, #0x0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetOptionsAddr
str r0, [sp, #0x0]
mov r0, #0xb
@@ -369,7 +369,7 @@ _020863A8:
b _020863CE
_020863B6:
add r0, r5, #0x0
bl sub_0204AF84
bl CallTask_RestoreOverworld
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
arm9/asm/unk_02087D00.s
+4 -4
View File
@@ -63,7 +63,7 @@ sub_02087D00: ; 0x02087D00
bl Save_PlayerData_GetProfileAddr
str r0, [r7, #0xc]
add r0, r4, #0x0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [r7, #0x10]
add r0, r4, #0x0
bl Save_Bag_Get
@@ -446,7 +446,7 @@ _02087FFE:
strb r0, [r4, #0x11]
strb r6, [r4, #0x14]
ldr r0, [r4, #0x0]
bl GetPartyCount
bl Party_GetCount
strb r0, [r4, #0x13]
mov r1, #0x0
strh r1, [r4, #0x18]
@@ -540,7 +540,7 @@ sub_020880A0: ; 0x020880A0
ldr r0, [r5, #0xc]
ldrb r1, [r5, #0x8]
ldr r0, [r0, #0x10]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [r4, #0x0]
ldr r0, [r5, #0xc]
ldr r0, [r0, #0x18]
@@ -608,7 +608,7 @@ sub_02088130: ; 0x02088130
ldrb r0, [r5, #0x8]
strb r0, [r4, #0x14]
ldr r0, [r4, #0x0]
bl GetPartyCount
bl Party_GetCount
strb r0, [r4, #0x13]
mov r1, #0x0
strh r1, [r4, #0x18]
arm9/asm/unk_0208A258.s
+4 -4
View File
@@ -10,7 +10,7 @@ sub_0208A258: ; 0x0208A258
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r0, _0208A290 ; =0x0000022F
ldrb r0, [r4, r0]
@@ -40,7 +40,7 @@ sub_0208A294: ; 0x0208A294
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
beq _0208A2A6
mov r0, #0x10
@@ -66,7 +66,7 @@ sub_0208A2C4: ; 0x0208A2C4
bl TaskManager_GetFieldSystem
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_020464A4
@@ -77,7 +77,7 @@ sub_0208A2C4: ; 0x0208A2C4
ldr r1, _0208A2F8 ; =0x0223D4AD
add r0, r5, #0x0
add r2, r4, #0x0
bl sub_020463EC
bl TaskManager_Jump
ldr r0, _0208A2FC ; =0x0000022F
mov r1, #0x12
strb r1, [r4, r0]
arm9/asm/unk_0208A338.s
+2 -2
View File
@@ -133,7 +133,7 @@ _0208A456:
thumb_func_start sub_0208A458
sub_0208A458: ; 0x0208A458
push {r3-r5, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0x0
ldr r1, [r4, #0x54]
cmp r1, #0xd
@@ -293,7 +293,7 @@ _0208A57A:
b _0208A6C8
_0208A5A6:
ldr r0, [r4, #0x0]
bl sub_0204647C
bl FieldSystem_ApplicationIsRunning
cmp r0, #0x0
beq _0208A5B2
_0208A5B0:
arm9/global.inc
+35 -35
View File
@@ -1427,7 +1427,7 @@
.extern sub_02022450
.extern Reset_To_File
.extern Save_SafariZone_Get
.extern GetStoragePCPointer
.extern SaveArray_PCStorage_Get
.extern sub_0202251C
.extern sub_02022528
.extern LoadHallOfFame
@@ -2612,7 +2612,7 @@
.extern sub_02037778
.extern sub_02037790
.extern sub_020377A8
.extern FieldSystem_GetSaveDataPtr
.extern FieldSystem_GetSaveData
.extern sub_020377B0
.extern sub_020377C8
.extern sub_020377E0
@@ -2673,16 +2673,16 @@
.extern sub_02038B6C
.extern sub_02038C78
.extern sub_02038CA8
.extern sub_02038CD8
.extern sub_02038D10
.extern QueueScript
.extern StartScriptFromMenu
.extern CreateScriptContext
.extern FieldSysGetAttrAddr
.extern sub_02039460
.extern GetVarPointer
.extern VarGet
.extern FieldSystem_VarGet
.extern sub_02039504
.extern FlagCheck
.extern FlagSet
.extern FieldSystem_FlagSet
.extern FlagClear
.extern ResetTempFlagsAndVars
.extern sub_0203959C
@@ -2691,7 +2691,7 @@
.extern sub_02039618
.extern TrainerIsDoubleBattle
.extern TrainerFlagCheck
.extern TrainerFlagSet
.extern TrainerFieldSystem_FlagSet
.extern TrainerFlagClear
.extern sub_02039694
.extern sub_02039754
@@ -3428,18 +3428,18 @@
.extern ClearFlagInArray
.extern GetFlagAddr
.extern GetVarAddr
.extern sub_020463CC
.extern sub_020463EC
.extern FieldSystem_CreateTask
.extern TaskManager_Jump
.extern TaskManager_Call
.extern sub_02046420
.extern sub_0204646C
.extern sub_0204647C
.extern FieldSystem_ApplicationIsRunning
.extern sub_0204649C
.extern sub_020464A4
.extern sub_02046500
.extern TaskManager_GetFieldSystem
.extern sub_0204652C
.extern sub_02046530
.extern TaskManager_GetEnvironment
.extern TaskManager_GetStatePtr
.extern sub_02046534
.extern sub_02046948
.extern sub_020469B8
@@ -3449,28 +3449,28 @@
.extern sub_02046F70
.extern SetupAndStartFirstBattle
.extern SetupAndStartTutorialBattle
.extern sub_020470E8
.extern SetupAndStartTrainerBattle
.extern sub_02047174
.extern sub_020471C0
.extern sub_0204726C
.extern sub_020472B0
.extern sub_020475A0
.extern sub_020475B0
.extern sub_020476CC
.extern BattleSetup_New
.extern sub_020477EC
.extern sub_02047800
.extern sub_02047814
.extern sub_02047964
.extern BattleSetup_Delete
.extern sub_020479FC
.extern sub_02047A78
.extern sub_02047BB0
.extern BattleSetup_InitFromFieldSystem
.extern sub_02047BC0
.extern sub_02047D48
.extern sub_02047F1C
.extern sub_02047F38
.extern sub_02047FA4
.extern sub_020480AC
.extern sub_020480B8
.extern IsBattleResultWin
.extern sub_020480C8
.extern sub_020480D8
.extern sub_020480E4
@@ -3539,9 +3539,9 @@
.extern sub_0204AE5C
.extern sub_0204AEF8
.extern sub_0204AF3C
.extern sub_0204AF84
.extern sub_0204AFC8
.extern sub_0204B00C
.extern CallTask_RestoreOverworld
.extern CallTask_FadeToBlack
.extern CallTask_FadeFromBlack
.extern sub_0204B090
.extern sub_0204B0E8
.extern sub_0204B0F8
@@ -3575,8 +3575,8 @@
.extern sub_0204BA1C
.extern sub_0204BA68
.extern sub_0204BA90
.extern sub_0204BAA0
.extern sub_0204BAB0
.extern PalPark_HandleBattleEnd
.extern PalPark_CountMonsNotCaught
.extern sub_0204BAC4
.extern sub_0204BAD4
.extern sub_0204BAE4
@@ -4076,8 +4076,8 @@
.extern sub_02058750
.extern sub_02058768
.extern sub_02058774
.extern sub_02058780
.extern sub_020587B0
.extern MapObjectManager_PauseAllMovement
.extern MapObjectManager_UnpauseAllMovement
.extern sub_020587E0
.extern sub_020587F4
.extern sub_02058804
@@ -4535,7 +4535,7 @@
.extern sub_0205ED0C
.extern sub_0205ED1C
.extern sub_0205ED2C
.extern sub_0205ED3C
.extern Save_VarsFlags_CheckHaveFollower
.extern sub_0205ED4C
.extern sub_0205ED5C
.extern sub_0205ED6C
@@ -4564,7 +4564,7 @@
.extern sub_0205F1E4
.extern Save_VarsFlags_SetSafariSysFlag
.extern Save_VarsFlags_ClearSafariSysFlag
.extern sub_0205F214
.extern Save_VarsFlags_CheckSafariSysFlag
.extern sub_0205F224
.extern sub_0205F234
.extern sub_0205F244
@@ -4881,19 +4881,19 @@
.extern SaveArray_Party_sizeof
.extern SaveArray_Party_Alloc
.extern SaveArray_Party_Init
.extern InitPartyWithMaxSize
.extern AddMonToParty
.extern RemoveMonFromParty
.extern GetPartyCount
.extern GetPartyMonByIndex
.extern Party_InitWithMaxSize
.extern Party_AddMon
.extern Party_RemoveMon
.extern Party_GetCount
.extern Party_GetMonByIndex
.extern ReplacePartySlotWithMon
.extern SwapSlotsInParty
.extern CopyPlayerParty
.extern PartyHasMon
.extern SaveArray_PlayerParty_Get
.extern CopyParty
.extern Party_HasMon
.extern SaveArray_Party_Get
.extern SaveArray_IsNatDexEnabled
.extern Pokedex_IsNatDexEnabled
.extern sub_0206BB48
.extern Pokedex_ConvertToCurrentDexNo
.extern sub_0206BB5C
.extern sub_0206BB74
.extern sub_0206BB84
arm9/overlays/05/asm/ov05_021D80E8.s
+12 -12
View File
@@ -221,7 +221,7 @@ ov05_021D825C: ; 0x021D825C
_021D827C:
ldr r0, [r4, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0
bne _021D8290
add sp, #0x10
@@ -318,12 +318,12 @@ _021D8342:
lsr r0, r0, #0x1f
bne _021D8384
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
bl HasEnoughAlivePokemonForDoubleBattle
add r6, r0, #0
ldr r0, [r4, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #1
bne _021D8366
mov r6, #1
@@ -336,7 +336,7 @@ _021D8366:
ldr r0, [r4, #0x38]
bl sub_02055B14
ldr r0, [r4, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
add sp, #8
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
@@ -385,7 +385,7 @@ _021D83C2:
orr r6, r0
_021D83E4:
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
mov r1, #0x7f
bl GetIdxOfFirstPartyMonWithMove
cmp r0, #0xff
@@ -1471,7 +1471,7 @@ _021D8C88:
cmp r0, #0
beq _021D8CE0
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
mov r1, #0x39
bl GetIdxOfFirstPartyMonWithMove
cmp r0, #0xff
@@ -1762,7 +1762,7 @@ ov05_021D8F38: ; 0x021D8F38
push {r3, r4, r5, lr}
add r4, r0, #0
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r5, r0, #0
ldr r0, [r4, #0xc]
bl Save_Daycare_Get
@@ -1842,7 +1842,7 @@ ov05_021D8FD0: ; 0x021D8FD0
push {r3, r4, r5, r6, r7, lr}
add r4, r0, #0
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r6, r0, #0
ldr r0, [r4, #0x1c]
ldr r0, [r0]
@@ -1850,7 +1850,7 @@ ov05_021D8FD0: ; 0x021D8FD0
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r6, #0
bl GetPartyCount
bl Party_GetCount
add r7, r0, #0
mov r4, #0
cmp r7, #0
@@ -1858,7 +1858,7 @@ ov05_021D8FD0: ; 0x021D8FD0
_021D8FF6:
add r0, r6, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
add r2, r5, #0
bl MonApplyFriendshipMod
@@ -1874,7 +1874,7 @@ ov05_021D9010: ; 0x021D9010
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r4, r0, #0
ldr r0, [r5, #0xc]
bl Save_LocalFieldData_Get
@@ -1938,7 +1938,7 @@ ov05_021D9090: ; 0x021D9090
add r4, r0, #0
ldr r0, [r4, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
cmp r0, #0
bne _021D90A6
mov r0, #0
arm9/overlays/05/asm/ov05_021DA5B8.s
+6 -6
View File
@@ -1072,7 +1072,7 @@ ov05_021DAE14: ; 0x021DAE14
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4]
ldr r0, [r5, #0x50]
@@ -1351,7 +1351,7 @@ ov05_021DB040: ; 0x021DB040
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #3
@@ -1472,7 +1472,7 @@ ov05_021DB144: ; 0x021DB144
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r0, [r5]
cmp r0, #0
@@ -1539,7 +1539,7 @@ ov05_021DB1D0: ; 0x021DB1D0
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #0
@@ -1602,7 +1602,7 @@ ov05_021DB250: ; 0x021DB250
bl TaskManager_GetFieldSystem
add r5, r0, #0
ldr r0, [sp, #0x10]
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #3
@@ -1753,7 +1753,7 @@ ov05_021DB380: ; 0x021DB380
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r7, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #3
arm9/overlays/05/asm/ov05_021E1374.s
+1 -1
View File
@@ -45,7 +45,7 @@ _021E13C0: .word ov05_021E13C4
ov05_021E13C4: ; 0x021E13C4
push {r3, r4, r5, lr}
sub sp, #8
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4]
cmp r1, #8
arm9/overlays/05/asm/ov05_021E3340.s
+1 -1
View File
@@ -11,7 +11,7 @@ ov05_021E3340: ; 0x021E3340
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #4
arm9/overlays/05/asm/ov05_021E5FD8.s
+13 -13
View File
@@ -425,7 +425,7 @@ ov05_021E6304: ; 0x021E6304
ldr r1, _021E6328 ; =ov05_021E632C
add r0, r4, #0
str r6, [r2, #0xc]
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
_021E6328: .word ov05_021E632C
@@ -433,7 +433,7 @@ _021E6328: .word ov05_021E632C
thumb_func_start ov05_021E632C
ov05_021E632C: ; 0x021E632C
push {r4, r5, r6, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0xc]
bl PlayerAvatar_GetMapObject
@@ -596,7 +596,7 @@ _021E647E:
thumb_func_start ov05_021E6484
ov05_021E6484: ; 0x021E6484
push {r3, r4, r5, r6, r7, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #7
@@ -830,7 +830,7 @@ _021E6666:
ldr r1, _021E6674 ; =ov05_021E6678
add r0, r5, #0
add r2, r4, #0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3, r4, r5, r6, r7, pc}
nop
_021E6674: .word ov05_021E6678
@@ -838,7 +838,7 @@ _021E6674: .word ov05_021E6678
thumb_func_start ov05_021E6678
ov05_021E6678: ; 0x021E6678
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #0
@@ -986,7 +986,7 @@ ov05_021E67A0: ; 0x021E67A0
ldr r1, _021E67BC ; =ov05_021E67C0
add r0, r5, #0
str r4, [r2, #0xc]
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3, r4, r5, pc}
.balign 4, 0
_021E67BC: .word ov05_021E67C0
@@ -996,7 +996,7 @@ ov05_021E67C0: ; 0x021E67C0
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r6, r0, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0xc]
bl PlayerAvatar_GetMapObject
@@ -1273,7 +1273,7 @@ _021E69F6:
thumb_func_start ov05_021E69FC
ov05_021E69FC: ; 0x021E69FC
push {r4, r5, r6, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
ldr r6, _021E6A24 ; =ov05_021F7714
add r5, r0, #0
_021E6A06:
@@ -1527,7 +1527,7 @@ ov05_021E6BD8: ; 0x021E6BD8
add r2, r0, #0
ldr r1, _021E6BF0 ; =ov05_021E6C30
add r0, r4, #0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r4, pc}
nop
_021E6BF0: .word ov05_021E6C30
@@ -1563,7 +1563,7 @@ _021E6C2C: .word ov05_021E6C30
thumb_func_start ov05_021E6C30
ov05_021E6C30: ; 0x021E6C30
push {r4, r5, r6, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
ldr r6, _021E6C70 ; =ov05_021F7700
ldr r4, _021E6C74 ; =ov05_021F76EC
add r5, r0, #0
@@ -2112,7 +2112,7 @@ _021E7068: .word ov05_021E706C
thumb_func_start ov05_021E706C
ov05_021E706C: ; 0x021E706C
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0xc]
cmp r0, #0
@@ -2421,9 +2421,9 @@ ov05_021E72E8: ; 0x021E72E8
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
pop {r4, pc}
.balign 4, 0
arm9/overlays/05/asm/ov05_021EC458.s
+14 -14
View File
@@ -92,7 +92,7 @@ ov05_021EC4F0: ; 0x021EC4F0
add r6, r0, #0
str r1, [sp]
add r7, r3, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, r0, #0
add r0, r5, #0
bl DaycareMon_GetExtras
@@ -127,10 +127,10 @@ _021EC544:
bl DaycareMon_SetSteps
ldr r1, [sp]
add r0, r6, #0
bl RemoveMonFromParty
bl Party_RemoveMon
ldr r1, _021EC578 ; =0x000001B9
add r0, r6, #0
bl PartyHasMon
bl Party_HasMon
cmp r0, #0
bne _021EC572
add r0, r7, #0
@@ -321,7 +321,7 @@ _021EC6E0:
_021EC6FA:
ldr r0, [sp]
add r1, r4, #0
bl AddMonToParty
bl Party_AddMon
add r0, r5, #0
bl ZeroBoxMonData
add r0, r6, #0
@@ -1642,7 +1642,7 @@ _021ED168:
bl SetMonData
ldr r0, [sp, #4]
add r1, r4, #0
bl AddMonToParty
bl Party_AddMon
add r0, r5, #0
bl ov05_021ECD64
add r0, r4, #0
@@ -1654,7 +1654,7 @@ _021ED168:
ov05_021ED190: ; 0x021ED190
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
bl GetPartyCount
bl Party_GetCount
add r6, r0, #0
mov r4, #0
cmp r6, #0
@@ -1663,7 +1663,7 @@ ov05_021ED190: ; 0x021ED190
_021ED1A2:
add r0, r5, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r7, #0
mov r2, #0
bl GetMonData
@@ -1671,7 +1671,7 @@ _021ED1A2:
bne _021ED1D6
add r0, r5, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa
mov r2, #0
bl GetMonData
@@ -1992,13 +1992,13 @@ _021ED3F8:
add r6, r0, #0
add r0, r7, #0
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
bls _021ED490
_021ED430:
add r0, r7, #0
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x4c
mov r2, #0
add r4, r0, #0
@@ -2039,7 +2039,7 @@ _021ED47E:
_021ED484:
add r0, r7, #0
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blo _021ED430
_021ED490:
@@ -2053,7 +2053,7 @@ _021ED498: .word 0x0000FFFF
ov05_021ED49C: ; 0x021ED49C
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
bl GetPartyCount
bl Party_GetCount
add r6, r0, #0
mov r5, #0
cmp r6, #0
@@ -2061,7 +2061,7 @@ ov05_021ED49C: ; 0x021ED49C
_021ED4AC:
add r0, r7, #0
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x4c
mov r2, #0
add r4, r0, #0
@@ -2197,7 +2197,7 @@ _021ED5B4:
ov05_021ED5C4: ; 0x021ED5C4
push {r3, r4, r5, lr}
add r5, r2, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, r0, #0
bl sub_020690E4
add r2, r0, #0
arm9/overlays/05/asm/ov05_021EFBF8.s
+2 -2
View File
@@ -653,7 +653,7 @@ _021F0122:
ov05_021F0128: ; 0x021F0128
push {r3, r4, r5, lr}
add r5, r0, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
thumb_func_start ov05_021F0130
ov05_021F0130: ; 0x021F0130
@@ -870,7 +870,7 @@ ov05_021F02C4: ; 0x021F02C4
ldr r1, _021F0300 ; =ov05_021F0128
add r0, r6, #0
add r2, r4, #0
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r4, r5, r6, pc}
_021F02F2:
ldr r1, _021F0300 ; =ov05_021F0128
arm9/overlays/05/asm/ov05_021F38CC.s
+6 -6
View File
@@ -168,9 +168,9 @@ Field_CheckPokemonSizeRecord: ; 0x021F3A18
add r4, r0, #0
ldr r0, [r4, #0xc]
add r5, r1, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
str r0, [sp]
@@ -237,9 +237,9 @@ Field_SetPokemonSizeRecord: ; 0x021F3AB4
add r4, r0, #0
ldr r0, [r4, #0xc]
add r5, r1, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl ov05_021F38CC
add r1, sp, #0
strh r0, [r1]
@@ -333,9 +333,9 @@ Field_BufferPartyPokemonSize: ; 0x021F3B7C
ldr r0, [r5, #0xc]
add r4, r3, #0
add r7, r1, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
arm9/overlays/05/asm/ov05_021F5518.s
+3 -3
View File
@@ -395,7 +395,7 @@ ov05_021F57F0: ; 0x021F57F0
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrh r1, [r4, #8]
cmp r1, #9
@@ -557,7 +557,7 @@ _021F5936:
ldr r1, _021F5988 ; =0x000007ED
add r0, r6, #0
add r3, r2, #0
bl sub_02038CD8
bl QueueScript
mov r0, #9
strh r0, [r4, #8]
b _021F5980
@@ -566,7 +566,7 @@ _021F5956:
ldr r1, _021F598C ; =0x000007EC
add r0, r6, #0
add r3, r2, #0
bl sub_02038CD8
bl QueueScript
mov r0, #9
strh r0, [r4, #8]
b _021F5980
arm9/overlays/05/asm/ov05_021F5C44.s
+5 -5
View File
@@ -34,7 +34,7 @@ ov05_021F5C70: ; 0x021F5C70
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r0, [r5]
cmp r0, #0
@@ -44,7 +44,7 @@ ov05_021F5C70: ; 0x021F5C70
b _021F5D28
_021F5C8E:
ldr r0, [r4, #0x34]
bl sub_02058780
bl MapObjectManager_PauseAllMovement
mov r0, #0
str r0, [r5, #0x10]
add r2, r5, #0
@@ -77,7 +77,7 @@ _021F5CBA:
bne _021F5D10
ldr r0, [r0, #8]
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r2, [r5, #4]
add r3, r0, #0
lsl r2, r2, #0x10
@@ -100,10 +100,10 @@ _021F5CBA:
_021F5D10:
cmp r0, #0
beq _021F5D18
bl sub_02047964
bl BattleSetup_Delete
_021F5D18:
ldr r0, [r4, #0x34]
bl sub_020587B0
bl MapObjectManager_UnpauseAllMovement
add r0, r5, #0
bl FreeToHeap
mov r0, #1
arm9/overlays/05/asm/ov05_021F6360.s
+2 -2
View File
@@ -10,10 +10,10 @@ ov05_021F6360: ; 0x021F6360
bl TaskManager_GetFieldSystem
str r0, [sp]
add r0, r7, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r6, r0, #0
add r0, r7, #0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0
ldr r0, [r4]
ldr r5, [r6, #4]
arm9/overlays/05/src/ov05_021E72FC.c
+4 -4
View File
@@ -4,14 +4,14 @@
#include "heap.h"
#include "unk_020051F4.h"
extern void sub_020463CC(u32 param0, void *func, UnkStruct021E7358 *param2);
extern void FieldSystem_CreateTask(u32 param0, void *func, UnkStruct021E7358 *param2);
extern u32 PlayerAvatar_GetMapObject(u32 param0);
extern u32 sub_02058720(u32 param0);
extern BOOL sub_02054B30(u8 param0);
extern BOOL sub_02054B3C(u8 param0);
extern BOOL sub_02054B48(u8 param0);
extern BOOL sub_02054B54(u8 param0);
extern UnkStruct021E7358 *sub_0204652C(UnkStruct021E7358 *param0);
extern UnkStruct021E7358 *TaskManager_GetEnvironment(UnkStruct021E7358 *param0);
extern void sub_02058410(u32 param0, u32 param1);
extern BOOL sub_02057254(u32 param0);
extern u32 sub_0205AFDC(u32 param0, u32 param1);
@@ -57,7 +57,7 @@ void ov05_021E7358(u32 param0, u32 param1, u32 param2)
res->Unk10 = param1;
res->Unk00 = param2;
PlaySE(SEQ_SE_DP_F209);
sub_020463CC(param0, ov05_021E73B4, res);
FieldSystem_CreateTask(param0, ov05_021E73B4, res);
}
u32 ov05_021E7388(u32 param0)
@@ -78,7 +78,7 @@ u32 ov05_021E7388(u32 param0)
BOOL ov05_021E73B4(UnkStruct021E7358 *param0)
{
UnkStruct021E7358 *strct = sub_0204652C(param0);
UnkStruct021E7358 *strct = TaskManager_GetEnvironment(param0);
u32 res = PlayerAvatar_GetMapObject(strct->Unk10);
u8 res2 = (u8)sub_02058720(res);
switch (strct->Unk08)
arm9/overlays/06/asm/overlay_06.s
+118 -118
View File
@@ -329,7 +329,7 @@ ov06_022398FC: ; 0x022398FC
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0xc]
cmp r0, #0
@@ -429,7 +429,7 @@ ov06_022399C8: ; 0x022399C8
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0xc]
cmp r0, #7
@@ -4844,14 +4844,14 @@ ov06_0223BA04: ; 0x0223BA04
pop {r4, r5, r6, r7, pc}
_0223BA42:
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r7, r0, #0
add r0, r5, #0
bl sub_02034CE0
add r4, r0, #0
add r0, r7, #0
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x20]
ldr r1, [sp, #0x20]
add r0, r5, #0
@@ -4943,7 +4943,7 @@ _0223BB0C:
_0223BB18:
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0
beq _0223BB2C
mov r0, #1
@@ -4976,10 +4976,10 @@ _0223BB30:
mov r0, #0xb
add r1, r0, #0
add r1, #0xf5
bl sub_020476CC
bl BattleSetup_New
str r0, [sp, #0x2c]
add r1, r5, #0
bl sub_02047BB0
bl BattleSetup_InitFromFieldSystem
ldr r0, [sp, #0x30]
ldr r1, [sp, #0x28]
ldr r2, [sp, #0x2c]
@@ -5004,7 +5004,7 @@ _0223BB98:
bne _0223BBB6
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
add r0, r5, #0
@@ -5014,12 +5014,12 @@ _0223BB98:
_0223BBB6:
mov r0, #0xb
mov r1, #0x4a
bl sub_020476CC
bl BattleSetup_New
str r0, [sp, #0x2c]
_0223BBC0:
ldr r0, [sp, #0x2c]
add r1, r5, #0
bl sub_02047BB0
bl BattleSetup_InitFromFieldSystem
add r0, sp, #0x24
ldrb r0, [r0, #1]
cmp r0, #0
@@ -5042,7 +5042,7 @@ _0223BBDA:
cmp r0, #0xc
blt _0223BBDA
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_Pokedex_Get
bl Pokedex_GetNatDexFlag
add r6, r0, #0
@@ -5135,7 +5135,7 @@ _0223BC90:
_0223BCBC:
bl GF_AssertFail
ldr r0, [sp, #0x2c]
bl sub_02047964
bl BattleSetup_Delete
add sp, #0xb4
mov r0, #0
pop {r4, r5, r6, r7, pc}
@@ -5166,7 +5166,7 @@ _0223BCFA:
cmp r0, #0
bne _0223BD06
ldr r0, [sp, #0x2c]
bl sub_02047964
bl BattleSetup_Delete
_0223BD06:
mov r0, #0
add r5, #0x74
@@ -5193,9 +5193,9 @@ ov06_0223BD14: ; 0x0223BD14
_0223BD2E:
ldr r0, [sp, #8]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x14]
ldr r0, [sp, #8]
ldr r1, [sp, #0x14]
@@ -5233,7 +5233,7 @@ _0223BD8A:
ldr r0, [sp, #8]
ldr r0, [r0, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
add r1, r0, #0
ldr r0, [sp, #8]
ldr r2, [sp, #0x10]
@@ -5241,7 +5241,7 @@ _0223BD8A:
ldr r0, [sp, #0x10]
ldr r1, [sp, #8]
ldr r0, [r0]
bl sub_02047BB0
bl BattleSetup_InitFromFieldSystem
ldr r0, [sp, #0x10]
ldr r0, [r0]
bl sub_020480AC
@@ -5370,14 +5370,14 @@ ov06_0223BE70: ; 0x0223BE70
pop {r4, r5, r6, r7, pc}
_0223BEA4:
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r6, r0, #0
add r0, r5, #0
bl sub_02034CE0
add r4, r0, #0
add r0, r6, #0
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
add r0, r5, #0
@@ -5395,7 +5395,7 @@ _0223BEA4:
str r1, [r0, #0xc]
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0
beq _0223BEF0
mov r0, #1
@@ -5416,10 +5416,10 @@ _0223BEF4:
mov r0, #0xb
add r1, r0, #0
add r1, #0xf5
bl sub_020476CC
bl BattleSetup_New
str r0, [sp, #0x24]
add r1, r5, #0
bl sub_02047BB0
bl BattleSetup_InitFromFieldSystem
ldr r0, [sp, #0x28]
ldr r1, [sp, #0x20]
ldr r2, [sp, #0x24]
@@ -5441,7 +5441,7 @@ _0223BF3C:
bne _0223BF5A
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
str r0, [sp, #0x14]
ldr r1, [sp, #0x14]
add r0, r5, #0
@@ -5451,12 +5451,12 @@ _0223BF3C:
_0223BF5A:
mov r0, #0xb
mov r1, #0x4a
bl sub_020476CC
bl BattleSetup_New
str r0, [sp, #0x24]
_0223BF64:
ldr r0, [sp, #0x24]
add r1, r5, #0
bl sub_02047BB0
bl BattleSetup_InitFromFieldSystem
add r0, sp, #0x1c
ldrb r0, [r0]
cmp r0, #0
@@ -5479,7 +5479,7 @@ _0223BF7E:
cmp r0, #0xc
blt _0223BF7E
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_Pokedex_Get
bl Pokedex_GetNatDexFlag
add r6, r0, #0
@@ -5626,14 +5626,14 @@ ov06_0223C08C: ; 0x0223C08C
pop {r4, r5, r6, r7, pc}
_0223C0CE:
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r6, r0, #0
add r0, r5, #0
bl sub_02034CE0
str r0, [sp, #0x14]
add r0, r6, #0
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x1c]
ldr r1, [sp, #0x1c]
ldr r2, [sp, #0x14]
@@ -5697,7 +5697,7 @@ _0223C162:
str r0, [sp, #0x48]
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205ED3C
bl Save_VarsFlags_CheckHaveFollower
cmp r0, #0
beq _0223C184
mov r0, #1
@@ -5727,10 +5727,10 @@ _0223C188:
mov r0, #0xb
add r1, r0, #0
add r1, #0xf5
bl sub_020476CC
bl BattleSetup_New
str r0, [r4]
add r1, r5, #0
bl sub_02047BB0
bl BattleSetup_InitFromFieldSystem
ldr r0, [sp, #0x28]
ldr r1, [sp, #0x24]
ldr r2, [r4]
@@ -5751,7 +5751,7 @@ _0223C1E0:
bne _0223C1FE
ldr r0, [r5, #0xc]
bl Save_VarsFlags_Get
bl sub_0205F214
bl Save_VarsFlags_CheckSafariSysFlag
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
add r0, r5, #0
@@ -5761,12 +5761,12 @@ _0223C1E0:
_0223C1FE:
mov r0, #0xb
mov r1, #0x4a
bl sub_020476CC
bl BattleSetup_New
str r0, [r4]
_0223C208:
ldr r0, [r4]
add r1, r5, #0
bl sub_02047BB0
bl BattleSetup_InitFromFieldSystem
add r0, sp, #0x20
ldrb r0, [r0, #1]
cmp r0, #0
@@ -5789,7 +5789,7 @@ _0223C222:
cmp r0, #0xc
blt _0223C222
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_Pokedex_Get
bl Pokedex_GetNatDexFlag
add r6, r0, #0
@@ -5853,7 +5853,7 @@ _0223C2A2:
_0223C2CC:
bl GF_AssertFail
ldr r0, [r4]
bl sub_02047964
bl BattleSetup_Delete
add sp, #0xac
mov r0, #0
pop {r4, r5, r6, r7, pc}
@@ -5879,7 +5879,7 @@ _0223C300:
cmp r0, #0
bne _0223C30E
ldr r0, [r4]
bl sub_02047964
bl BattleSetup_Delete
b _0223C314
_0223C30E:
mov r0, #0
@@ -5930,7 +5930,7 @@ _0223C350:
cmp r0, #1
bne _0223C38C
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
bl PlayerProfile_GetTrainerID
str r0, [sp]
@@ -7181,9 +7181,9 @@ ov06_0223CCDC: ; 0x0223CCDC
bl ov05_021F51D0
str r0, [sp, #8]
ldr r0, [r5, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0xc]
ldr r1, [sp, #0xc]
add r0, r5, #0
@@ -7257,9 +7257,9 @@ ov06_0223CD7C: ; 0x0223CD7C
ldr r0, [r5, #0xc]
add r7, r1, #0
add r6, r3, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, r0, #0
add r0, r5, #0
add r1, r4, #0
@@ -7588,7 +7588,7 @@ ov06_0223CFD0: ; 0x0223CFD0
bne _0223CFE4
mov r0, #0xb
mov r1, #0
bl sub_020476CC
bl BattleSetup_New
str r0, [r4]
pop {r4, pc}
_0223CFE4:
@@ -7702,7 +7702,7 @@ ov06_0223D044: ; 0x0223D044
bl SetMonData
ldr r0, [r6, #8]
add r1, r4, #0
bl AddMonToParty
bl Party_AddMon
cmp r0, #0
bne _0223D0D8
bl GF_AssertFail
@@ -7911,7 +7911,7 @@ _0223D25C:
lsl r0, r0, #2
add r0, r7, r0
ldr r0, [r0, #4]
bl AddMonToParty
bl Party_AddMon
add sp, #0xc
pop {r4, r5, r6, r7, pc}
nop
@@ -8219,7 +8219,7 @@ ov06_0223D4AC: ; 0x0223D4AC
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
ldr r1, _0223D604 ; =0x0000022F
add r4, r0, #0
ldrb r1, [r4, r1]
@@ -11156,7 +11156,7 @@ ov06_0223ECF0: ; 0x0223ECF0
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
bl ov06_0223D7B8
ldr r0, [r5, #0xc]
@@ -11177,7 +11177,7 @@ ov06_0223ECF0: ; 0x0223ECF0
ldr r1, _0223ED4C ; =sub_0208A258
add r0, r6, #0
add r2, r4, #0
bl sub_020463EC
bl TaskManager_Jump
ldr r0, _0223ED50 ; =0x0000022F
mov r1, #0x10
strb r1, [r4, r0]
@@ -11442,7 +11442,7 @@ _0223EF28:
str r0, [r2, #0x74]
ldr r0, [r1]
ldr r0, [r0, #0x68]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
ldr r1, _0223EFF4 ; =0x02252420
ldr r1, [r1]
@@ -15300,7 +15300,7 @@ ov06_02240F40: ; 0x02240F40
add r4, r0, #0
ldr r0, [r4, #0x10]
ldr r0, [r0, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r0, #0
ldr r0, [r4, #0x10]
ldr r2, [r4, #0x6c]
@@ -15380,7 +15380,7 @@ ov06_02240FEC: ; 0x02240FEC
add r4, r0, #0
bl TaskManager_GetFieldSystem
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #0x7c]
cmp r1, #0xb
@@ -15699,7 +15699,7 @@ CheckPastoriaGymButton: ; 0x02241230
cmp r0, #0
beq _022412E0
add r0, r4, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #1
bl sub_020254A0
@@ -15803,7 +15803,7 @@ ov06_02241348: ; 0x02241348
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r1, [r5]
cmp r1, #3
@@ -15910,7 +15910,7 @@ ov06_02241428: ; 0x02241428
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r1, [r5]
cmp r1, #5
@@ -16082,7 +16082,7 @@ ov06_0224158C: ; 0x0224158C
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r5, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r1, [r5]
cmp r1, #3
@@ -16188,7 +16188,7 @@ ov06_02241670: ; 0x02241670
push {r4, r5, r6, r7, lr}
sub sp, #0x2c
add r4, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #2
bl sub_020254A0
@@ -16499,7 +16499,7 @@ MoveHearthomeGymElevator: ; 0x02241914
mov r0, #0
str r0, [r6]
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #2
bl sub_020254A0
@@ -16538,7 +16538,7 @@ ov06_02241974: ; 0x02241974
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4]
cmp r1, #3
@@ -16637,7 +16637,7 @@ ov06_02241A44: ; 0x02241A44
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4]
cmp r1, #3
@@ -16820,7 +16820,7 @@ ov06_02241BB0: ; 0x02241BB0
add r5, r0, #0
ldr r0, [r5]
add r4, r1, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #3
bl sub_020254A0
@@ -16897,7 +16897,7 @@ _02241C34:
strb r1, [r0]
ldr r0, [r5]
ldr r1, _02241D70 ; =ov06_02241F7C
bl sub_020463CC
bl FieldSystem_CreateTask
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
_02241C64:
@@ -16958,7 +16958,7 @@ _02241CB2:
ldr r0, [r5]
ldr r1, _02241D7C ; =ov06_022420CC
ldr r2, [sp]
bl sub_020463CC
bl FieldSystem_CreateTask
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
_02241CDA:
@@ -17028,7 +17028,7 @@ _02241D54:
ldr r0, [r5]
ldr r1, _02241D8C ; =ov06_02241E58
ldr r2, [sp]
bl sub_020463CC
bl FieldSystem_CreateTask
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -17145,7 +17145,7 @@ ov06_02241E58: ; 0x02241E58
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
ldr r1, [r6, #4]
add r4, r0, #0
ldr r5, [r1, #0x24]
@@ -17285,7 +17285,7 @@ ov06_02241F7C: ; 0x02241F7C
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r7, #4]
ldr r5, [r0, #0x24]
@@ -17444,7 +17444,7 @@ ov06_022420CC: ; 0x022420CC
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r6, #4]
ldr r5, [r0, #0x24]
@@ -17604,7 +17604,7 @@ ov06_02242224: ; 0x02242224
push {r4, r5, r6, r7, lr}
sub sp, #0x5c
add r6, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #4
bl sub_020254A0
@@ -18047,7 +18047,7 @@ _022425A4:
ldr r0, [r5]
ldr r1, _022425C4 ; =ov06_02242744
ldr r2, [sp]
bl sub_020463CC
bl FieldSystem_CreateTask
pop {r3, r4, r5, r6, r7, pc}
nop
_022425B8: .word ov06_0224F8BD
@@ -18060,7 +18060,7 @@ ov06_022425C8: ; 0x022425C8
push {r4, r5, r6, r7, lr}
sub sp, #0x24
str r0, [sp, #8]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
bl sub_020254B4
cmp r0, #4
@@ -18260,7 +18260,7 @@ ov06_02242744: ; 0x02242744
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r6, #4]
ldr r5, [r0, #0x24]
@@ -18472,7 +18472,7 @@ ov06_022428D8: ; 0x022428D8
push {r4, r5, r6, r7, lr}
sub sp, #0x2c
add r5, r0, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #5
bl sub_020254A0
@@ -18652,7 +18652,7 @@ RotateSunyshoreGymGear: ; 0x02242A38
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
add r5, r1, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #5
bl sub_020254A0
@@ -18743,7 +18743,7 @@ ov06_02242AEC: ; 0x02242AEC
bl TaskManager_GetFieldSystem
str r0, [sp, #8]
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
ldr r1, [sp, #8]
str r0, [sp, #4]
ldr r1, [r1, #4]
@@ -19232,7 +19232,7 @@ _02242EB2:
thumb_func_start ov06_02242EC0
ov06_02242EC0: ; 0x02242EC0
push {r4, lr}
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
add r1, r4, #0
add r1, #0x5c
@@ -19798,9 +19798,9 @@ ov06_022432E4: ; 0x022432E4
sub sp, #0x28
str r0, [sp]
add r0, r1, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #4]
bl GetPartyCount
bl Party_GetCount
lsl r0, r0, #0x18
lsr r1, r0, #0x18
str r1, [sp, #8]
@@ -19819,7 +19819,7 @@ _02243308:
_02243312:
ldr r0, [sp, #4]
add r1, r7, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
str r0, [sp, #0xc]
@@ -20327,7 +20327,7 @@ _02243706:
pop {r4, r5, r6, r7, pc}
_02243716:
add r0, r2, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #8]
ldrb r0, [r5, #0xe]
mov r4, #0
@@ -20346,7 +20346,7 @@ _02243726:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp, #8]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
lsl r1, r4, #1
add r6, r5, r1
add r7, r0, #0
@@ -20383,7 +20383,7 @@ ov06_02243780: ; 0x02243780
sub sp, #0x1c
str r0, [sp]
add r0, r1, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #4]
ldr r0, [sp]
mov r5, #0
@@ -20398,7 +20398,7 @@ _0224379C:
add r1, r1, r5
add r1, #0x2a
ldrb r1, [r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #8]
lsl r6, r5, #1
mov r1, #5
@@ -20638,13 +20638,13 @@ ov06_02243938: ; 0x02243938
bne _02243980
_0224394A:
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
ldrb r1, [r5, #0xf]
cmp r1, #0
bne _0224396C
add r5, #0x2a
ldrb r1, [r5]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
@@ -20654,7 +20654,7 @@ _0224394A:
_0224396C:
add r5, #0x2a
ldrb r1, [r5]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
@@ -21506,7 +21506,7 @@ ov06_02243FDC: ; 0x02243FDC
mov r2, #1
add r1, sp, #8
strb r2, [r1]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp]
mov r7, #0
ldrb r0, [r5, #0xe]
@@ -21518,7 +21518,7 @@ _02243FFA:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r6, #0
mov r2, #0
str r0, [sp, #4]
@@ -21729,7 +21729,7 @@ ov06_02244190: ; 0x02244190
str r0, [sp, #4]
bl MI_CpuFill8
add r0, r4, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
ldr r5, [sp, #4]
add r7, r0, #0
mov r4, #0
@@ -21738,7 +21738,7 @@ _022441B8:
add r1, #0x2a
ldrb r1, [r1]
add r0, r7, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
add r0, r5, #0
bl ov06_0224406C
@@ -22186,10 +22186,10 @@ ov06_02244558: ; 0x02244558
bl ov06_02244528
add r1, r0, #0
ldr r0, [r5, #4]
bl sub_020476CC
bl BattleSetup_New
add r7, r0, #0
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #4]
add r0, r7, #0
add r1, r4, #0
@@ -22206,7 +22206,7 @@ ov06_02244558: ; 0x02244558
add r4, r0, #0
ldrb r1, [r5, #0xe]
ldr r0, [r7, #4]
bl InitPartyWithMaxSize
bl Party_InitWithMaxSize
ldrb r0, [r5, #0xe]
mov r6, #0
cmp r0, #0
@@ -22216,7 +22216,7 @@ _022445A6:
add r1, #0x2a
ldrb r1, [r1]
ldr r0, [sp, #4]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r4, #0
bl CopyPokemonToPokemon
add r0, r4, #0
@@ -22401,7 +22401,7 @@ ov06_022446FC: ; 0x022446FC
ldr r1, _02244750 ; =0x0000083E
strh r0, [r6, r1]
add r0, r4, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r7, r0, #0
mov r4, #0
add r5, r6, #0
@@ -22410,7 +22410,7 @@ _0224471C:
add r1, #0x2a
ldrb r1, [r1]
add r0, r7, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
bl GetMonData
@@ -23257,7 +23257,7 @@ _02244D8A:
bl ov06_02244388
ldr r0, [r7, #4]
add r1, r4, #0
bl AddMonToParty
bl Party_AddMon
ldr r0, [sp]
add r6, r6, #1
add r5, #0x38
@@ -23652,7 +23652,7 @@ _02245098:
cmp r0, #0xc
blo _02245098
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #6
bl sub_020254A0
@@ -23989,7 +23989,7 @@ _0224533C: .word ov06_02245360
ov06_02245340: ; 0x02245340
push {r4, lr}
add r4, r1, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02024ED8
mov r1, #6
bl sub_020254A0
@@ -24010,7 +24010,7 @@ ov06_02245360: ; 0x02245360
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #5]
cmp r1, #5
@@ -30826,7 +30826,7 @@ ov06_02248724: ; 0x02248724
ldr r0, [r1, #8]
str r1, [sp]
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r6, r0, #0
ldr r0, [r5, #0xc]
bl Save_Roamers_Get
@@ -31059,7 +31059,7 @@ ov06_022488FC: ; 0x022488FC
ldr r0, [r5, #0xc]
add r4, r1, #0
add r6, r2, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
ldr r2, [r4, #4]
add r1, r6, #0
bl ReplacePartySlotWithMon
@@ -31077,9 +31077,9 @@ ov06_0224891C: ; 0x0224891C
add r7, r2, #0
add r5, r1, #0
add r4, r3, #0
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r7, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa0
mov r2, #0
add r7, r0, #0
@@ -38587,7 +38587,7 @@ ov06_0224C2F4: ; 0x0224C2F4
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #0xf]
cmp r1, #5
@@ -38879,7 +38879,7 @@ ov06_0224C560: ; 0x0224C560
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #2]
cmp r1, #4
@@ -39098,7 +39098,7 @@ ov06_0224C720: ; 0x0224C720
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
_0224C732:
ldr r3, [r5]
@@ -39323,7 +39323,7 @@ ov06_0224C8E8: ; 0x0224C8E8
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
ldr r7, _0224C928 ; =0x02251DF4
add r4, r0, #0
_0224C8FC:
@@ -39550,7 +39550,7 @@ ov06_0224CAAC: ; 0x0224CAAC
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
_0224CABE:
ldr r3, [r5]
@@ -39639,7 +39639,7 @@ ov06_0224CB54: ; 0x0224CB54
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
_0224CB66:
ldr r3, [r5]
@@ -40797,7 +40797,7 @@ ov06_0224D410: ; 0x0224D410
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r1, [r4, #4]
cmp r1, #0
@@ -40845,7 +40845,7 @@ ov06_0224D46C: ; 0x0224D46C
bl sub_020377A8
add r5, r0, #0
add r0, r4, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
str r0, [sp, #0x1c]
mov r0, #0xb
mov r1, #0x18
@@ -42987,7 +42987,7 @@ ov06_0224E5D0: ; 0x0224E5D0
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldrb r1, [r4, #0xf]
cmp r1, #5
@@ -43238,7 +43238,7 @@ ov06_0224E7D8: ; 0x0224E7D8
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_02046530
bl TaskManager_GetStatePtr
add r4, r0, #0
ldr r0, [r4]
cmp r0, #0
arm9/overlays/07/asm/overlay_07.s
+6 -6
View File
@@ -2305,7 +2305,7 @@ ov07_02213104: ; 0x02213104
str r1, [sp]
str r2, [sp, #4]
add r7, r3, #0
bl GetPartyCount
bl Party_GetCount
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #8]
@@ -2329,7 +2329,7 @@ _0221312A:
bls _022131B0
ldr r0, [sp]
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r7, r0, #0
@@ -3643,7 +3643,7 @@ ov07_02213BEC: ; 0x02213BEC
add r0, r1, #0
str r1, [sp]
add r5, r2, #0
bl GetPartyCount
bl Party_GetCount
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #8]
@@ -3672,7 +3672,7 @@ _02213C0C:
_02213C2E:
ldr r0, [sp]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x18
add r2, r6, #0
mul r2, r1
@@ -4488,13 +4488,13 @@ ov07_0221428C: ; 0x0221428C
bhs _022142B4
ldr r0, [r0, #4]
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x18]
b _022142BE
_022142B4:
ldr r0, [r0, #0xc]
sub r1, r4, #3
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x18]
_022142BE:
add r1, r4, #0
arm9/overlays/09/asm/overlay_09.s
+8 -8
View File
@@ -2423,7 +2423,7 @@ ov09_022131C8: ; 0x022131C8
ldr r0, [sp]
ldr r0, [r0]
ldr r0, [r0]
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
bgt _022131E2
b _02213476
@@ -2437,7 +2437,7 @@ _022131E2:
ldr r0, [r0]
ldr r1, [sp, #8]
ldr r0, [r0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [r4, #4]
mov r1, #5
mov r2, #0
@@ -2724,7 +2724,7 @@ _0221345A:
ldr r0, [sp]
ldr r0, [r0]
ldr r0, [r0]
bl GetPartyCount
bl Party_GetCount
ldr r1, [sp, #8]
cmp r1, r0
bge _02213476
@@ -6734,7 +6734,7 @@ ov09_022155D0: ; 0x022155D0
ldr r0, [r5]
mov r4, #0
ldr r0, [r0]
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02215656
add r0, r4, #0
@@ -6788,7 +6788,7 @@ _0221563E:
add r7, #0x50
ldr r0, [r0]
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _022155EE
_02215656:
@@ -10495,7 +10495,7 @@ ov09_02217580: ; 0x02217580
ldr r0, [r5]
mov r4, #0
ldr r0, [r0]
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _022175D8
add r7, r5, #4
@@ -10528,7 +10528,7 @@ _022175C6:
lsr r4, r0, #0x10
ldr r0, [r5]
ldr r0, [r0]
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _02217594
_022175D8:
@@ -13506,7 +13506,7 @@ _02218DF2:
bl ov11_02230290
add r4, r0, #0
add r0, r6, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #6
bne _02218E32
add r0, r4, #0
arm9/overlays/11/asm/ov11_0222D5C0_1.s
+39 -39
View File
@@ -213,7 +213,7 @@ _0222D752:
bl CreateHeap
ldr r0, [r5, #4]
ldr r1, [sp, #0x24]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
mov r0, #0x5a
lsl r0, r0, #2
@@ -1141,7 +1141,7 @@ ov11_0222DFA4: ; 0x0222DFA4
beq _0222DFE4
ldr r0, [r4, #0x6c]
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
add r0, r4, #0
bl ov11_02230FA8
@@ -1153,7 +1153,7 @@ _0222DFE4:
_0222DFEC:
ldr r0, [r5, #0x68]
ldr r1, [r6, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [r5, #0x68]
bl FreeToHeap
add r1, r6, #0
@@ -1997,7 +1997,7 @@ _0222E734:
ldr r0, [sp, #4]
ldr r1, [r5, #0x68]
ldr r0, [r0, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [sp, #4]
add r6, r6, #1
add r0, r0, #4
@@ -2014,13 +2014,13 @@ _0222E734:
_0222E760:
ldr r0, [r7, #0x68]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222E7AA
_0222E76C:
ldr r0, [r7, #0x68]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2042,7 +2042,7 @@ _0222E76C:
_0222E79E:
ldr r0, [r7, #0x68]
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222E76C
_0222E7AA:
@@ -2102,7 +2102,7 @@ _0222E810:
ldr r0, [sp, #4]
ldr r1, [r5, #0x68]
ldr r0, [r0, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [sp, #4]
add r6, r6, #1
add r0, r0, #4
@@ -2119,13 +2119,13 @@ _0222E810:
_0222E83C:
ldr r0, [r7, #0x68]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222E886
_0222E848:
ldr r0, [r7, #0x68]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2147,7 +2147,7 @@ _0222E848:
_0222E87A:
ldr r0, [r7, #0x68]
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222E848
_0222E886:
@@ -2212,7 +2212,7 @@ _0222E8FE:
ldr r0, [sp, #4]
ldr r1, [r5, #0x68]
ldr r0, [r0, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [sp, #4]
add r6, r6, #1
add r0, r0, #4
@@ -2234,13 +2234,13 @@ _0222E920:
add r7, r4, r0
ldr r0, [r7, #0x68]
mov r6, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222E9B8
_0222E938:
ldr r0, [r7, #0x68]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r1, [sp, #0x14]
add r5, r0, #0
cmp r1, #1
@@ -2292,7 +2292,7 @@ _0222E984:
_0222E9AC:
ldr r0, [r7, #0x68]
add r6, r6, #1
bl GetPartyCount
bl Party_GetCount
cmp r6, r0
blt _0222E938
_0222E9B8:
@@ -2342,16 +2342,16 @@ _0222EA0C:
ldr r0, [sp, #4]
ldr r1, [r7, #0x68]
ldr r0, [r0, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [r7, #0x68]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222EA60
_0222EA22:
ldr r0, [r7, #0x68]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2373,7 +2373,7 @@ _0222EA22:
_0222EA54:
ldr r0, [r7, #0x68]
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222EA22
_0222EA60:
@@ -2428,7 +2428,7 @@ _0222EAC0:
ldr r0, [sp, #4]
ldr r1, [r5, #0x68]
ldr r0, [r0, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [sp, #4]
add r6, r6, #1
add r0, r0, #4
@@ -2555,7 +2555,7 @@ _0222EBC6:
ldr r0, [sp, #4]
ldr r1, [r5, #0x68]
ldr r0, [r0, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [sp, #4]
add r6, r6, #1
add r0, r0, #4
@@ -2572,13 +2572,13 @@ _0222EBC6:
_0222EBEA:
ldr r0, [r7, #0x68]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222EC34
_0222EBF6:
ldr r0, [r7, #0x68]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2600,7 +2600,7 @@ _0222EBF6:
_0222EC28:
ldr r0, [r7, #0x68]
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222EBF6
_0222EC34:
@@ -2664,7 +2664,7 @@ _0222ECA6:
ldr r0, [sp, #4]
ldr r1, [r5, #0x68]
ldr r0, [r0, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [sp, #4]
add r6, r6, #1
add r0, r0, #4
@@ -2686,13 +2686,13 @@ _0222ECC8:
add r7, r4, r0
ldr r0, [r7, #0x68]
mov r6, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222ED60
_0222ECE0:
ldr r0, [r7, #0x68]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r1, [sp, #0x20]
add r5, r0, #0
cmp r1, #1
@@ -2744,7 +2744,7 @@ _0222ED2C:
_0222ED54:
ldr r0, [r7, #0x68]
add r6, r6, #1
bl GetPartyCount
bl Party_GetCount
cmp r6, r0
blt _0222ECE0
_0222ED60:
@@ -2797,16 +2797,16 @@ _0222EDBC:
ldr r0, [sp, #4]
ldr r1, [r7, #0x68]
ldr r0, [r0, #4]
bl CopyPlayerParty
bl CopyParty
ldr r0, [r7, #0x68]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222EE10
_0222EDD2:
ldr r0, [r7, #0x68]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r6, r0, #0
@@ -2828,7 +2828,7 @@ _0222EDD2:
_0222EE04:
ldr r0, [r7, #0x68]
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222EDD2
_0222EE10:
@@ -2861,7 +2861,7 @@ _0222EE3E:
beq _0222EE5A
ldr r0, [r4, #0x6c]
mov r1, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r2, r4, #0
mov r1, #0x8f
add r2, #0xf4
@@ -2885,7 +2885,7 @@ _0222EE5A:
_0222EE7C:
ldr r0, [r4, #0x68]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222EEAC
ldr r6, _0222EEEC ; =0x00002404
@@ -2893,7 +2893,7 @@ _0222EE7C:
_0222EE8C:
ldr r0, [r4, #0x68]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r2, [r4, r6]
add r1, r7, #0
lsl r2, r2, #0x10
@@ -2901,13 +2901,13 @@ _0222EE8C:
bl MonApplyFriendshipMod
ldr r0, [r4, #0x68]
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222EE8C
_0222EEAC:
ldr r0, [r4, #0x70]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222EEDC
ldr r6, _0222EEEC ; =0x00002404
@@ -2915,7 +2915,7 @@ _0222EEAC:
_0222EEBC:
ldr r0, [r4, #0x70]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r2, [r4, r6]
add r1, r7, #0
lsl r2, r2, #0x10
@@ -2923,7 +2923,7 @@ _0222EEBC:
bl MonApplyFriendshipMod
ldr r0, [r4, #0x70]
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222EEBC
_0222EEDC:
arm9/overlays/11/asm/ov11_0222FF68.s
+7 -7
View File
@@ -94,7 +94,7 @@ _0222FFE6:
lsl r0, r4, #2
add r0, r5, r0
ldr r0, [r0, #0x68]
bl GetPartyCount
bl Party_GetCount
pop {r3, r4, r5, pc}
_0222FFF2:
ldr r1, [r5, #0x2c]
@@ -105,13 +105,13 @@ _0222FFF2:
lsr r0, r0, #0x1d
add r0, r5, r0
ldr r0, [r0, #0x68]
bl GetPartyCount
bl Party_GetCount
pop {r3, r4, r5, pc}
_02230008:
lsl r0, r4, #2
add r0, r5, r0
ldr r0, [r0, #0x68]
bl GetPartyCount
bl Party_GetCount
pop {r3, r4, r5, pc}
thumb_func_start ov11_02230014
@@ -136,7 +136,7 @@ _02230034:
add r0, r5, r0
ldr r0, [r0, #0x68]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
pop {r4, r5, r6, pc}
_02230042:
ldr r1, [r5, #0x2c]
@@ -148,14 +148,14 @@ _02230042:
add r0, r5, r0
ldr r0, [r0, #0x68]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
pop {r4, r5, r6, pc}
_0223005A:
lsl r0, r4, #2
add r0, r5, r0
ldr r0, [r0, #0x68]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
pop {r4, r5, r6, pc}
thumb_func_start ov11_02230068
@@ -1938,7 +1938,7 @@ _02230D9C:
cmp r1, #6
bge _02230DC4
ldr r0, [r5, #4]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r3, #0x59
str r7, [sp]
lsl r3, r3, #2
arm9/overlays/11/asm/ov11_02232264.s
+15 -15
View File
@@ -2917,7 +2917,7 @@ _02233938:
add r4, r0, #0
add r0, r7, #0
bl ov11_0222FF88
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _022339C6
_02233950:
@@ -2971,7 +2971,7 @@ _022339B4:
mov r1, #0
add r4, r4, #1
bl ov11_0222FF88
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _02233950
_022339C6:
@@ -8819,7 +8819,7 @@ _0223678C:
_02236794:
ldr r0, [sp, #0x14]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r4, r0, #0
@@ -8872,7 +8872,7 @@ _022367EA:
beq _022367EA
ldr r0, [sp, #0x14]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r7, #0
mov r2, #0
add r4, r0, #0
@@ -15691,13 +15691,13 @@ _02239DFA:
bl ov11_0222FF7C
add r0, r7, #0
mov r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02239E68
_02239E2A:
add r0, r7, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -15719,7 +15719,7 @@ _02239E2A:
_02239E5C:
add r0, r7, #0
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _02239E2A
_02239E68:
@@ -15739,14 +15739,14 @@ _02239E76:
_02239E82:
ldr r0, [sp, #8]
mov r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02239ECC
ldr r7, _02239F48 ; =0x000001EE
_02239E90:
ldr r0, [sp, #8]
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -15767,7 +15767,7 @@ _02239E90:
_02239EC0:
ldr r0, [sp, #8]
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _02239E90
_02239ECC:
@@ -15787,13 +15787,13 @@ _02239EDA:
bl ov11_0222FF7C
add r0, r7, #0
mov r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02239F36
_02239EF8:
add r0, r7, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -15815,7 +15815,7 @@ _02239EF8:
_02239F2A:
add r0, r7, #0
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _02239EF8
_02239F36:
@@ -18327,7 +18327,7 @@ ov11_0223B2DC: ; 0x0223B2DC
add r7, r0, #0
ldr r0, [sp]
ldr r1, [sp, #4]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #6
add r2, r4, #0
str r0, [sp, #0x14]
@@ -19494,7 +19494,7 @@ _0223BC8A:
bl ov11_022564A8
ldr r0, [sp, #0x28]
add r1, r6, #0
bl AddMonToParty
bl Party_AddMon
cmp r0, #1
bne _0223BD1E
ldr r0, [r4, #0x28]
arm9/overlays/11/asm/ov11_0223D1DC.s
+18 -18
View File
@@ -9868,7 +9868,7 @@ _02241DD2:
bl ov11_0222FF7C
add r0, r6, #0
add r5, r7, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02241E4A
ldr r0, [sp, #0x2c]
@@ -9880,7 +9880,7 @@ _02241DD2:
_02241DFE:
add r0, r6, #0
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r4, r0, #0
@@ -9909,7 +9909,7 @@ _02241DFE:
_02241E3E:
add r0, r6, #0
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _02241DFE
_02241E4A:
@@ -9961,13 +9961,13 @@ _02241E8A:
bl ov11_0222FF7C
add r0, r6, #0
add r5, r7, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02241EF2
_02241EB4:
add r0, r6, #0
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r4, r0, #0
@@ -9989,7 +9989,7 @@ _02241EB4:
_02241EE6:
add r0, r6, #0
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _02241EB4
_02241EF2:
@@ -10166,13 +10166,13 @@ _0224200C:
bl ov11_0222FF7C
add r0, r6, #0
add r4, r7, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02242094
_02242056:
add r0, r6, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r5, r0, #0
@@ -10194,7 +10194,7 @@ _02242056:
_02242088:
add r0, r6, #0
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _02242056
_02242094:
@@ -10246,13 +10246,13 @@ _022420CA:
str r0, [sp, #0x14]
add r0, r7, #0
add r4, r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0224213C
_022420FE:
add r0, r7, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -10274,20 +10274,20 @@ _022420FE:
_02242130:
add r0, r7, #0
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _022420FE
_0224213C:
ldr r0, [sp, #0x18]
mov r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02242186
ldr r7, _02242340 ; =0x000001EE
_0224214A:
ldr r0, [sp, #0x18]
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r6, r0, #0
@@ -10308,7 +10308,7 @@ _0224214A:
_0224217A:
ldr r0, [sp, #0x18]
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _0224214A
_02242186:
@@ -10350,13 +10350,13 @@ _022421B0:
str r0, [sp, #0x10]
add r0, r6, #0
add r4, r7, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0224221A
_022421DC:
add r0, r6, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r5, r0, #0
@@ -10378,7 +10378,7 @@ _022421DC:
_0224220E:
add r0, r6, #0
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _022421DC
_0224221A:
arm9/overlays/11/asm/ov11_02242B78.s
+7 -7
View File
@@ -5300,13 +5300,13 @@ _02245384:
mov r6, #0
add r5, r0, #0
add r4, r6, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _022453C6
_022453A4:
add r0, r5, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0
bl GetMonData
@@ -5316,7 +5316,7 @@ _022453A4:
_022453BA:
add r0, r5, #0
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _022453A4
_022453C6:
@@ -5357,13 +5357,13 @@ _022453F8:
mov r6, #0
add r5, r0, #0
add r4, r6, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0224543A
_02245418:
add r0, r5, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0
bl GetMonData
@@ -5373,7 +5373,7 @@ _02245418:
_0224542E:
add r0, r5, #0
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _02245418
_0224543A:
@@ -8792,7 +8792,7 @@ _02246E72:
_02246E76:
ldr r0, [sp, #0x14]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r4, r0, #0
arm9/overlays/11/asm/ov11_0224CA64.s
+3 -3
View File
@@ -1307,13 +1307,13 @@ _0224D452:
bl ov11_0222FF88
add r6, r0, #0
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0224D4C0
_0224D466:
add r0, r6, #0
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r4, r0, #0
@@ -1348,7 +1348,7 @@ _0224D4A8:
_0224D4B4:
add r0, r6, #0
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0224D466
_0224D4C0:
arm9/overlays/11/asm/ov11_0224D550.s
+12 -12
View File
@@ -8047,10 +8047,10 @@ _02251662:
mov r1, #6
ldr r0, [r0, #4]
ldr r0, [r0]
bl InitPartyWithMaxSize
bl Party_InitWithMaxSize
ldr r0, [sp, #0x14]
mov r6, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _022516B0
mov r0, #6
@@ -8065,7 +8065,7 @@ _02251680:
ldr r0, [r4, #8]
ldr r0, [r0, #4]
ldr r0, [r0]
bl AddMonToParty
bl Party_AddMon
ldr r1, [r4, #8]
ldrb r0, [r5, #0x18]
ldr r1, [r1, #4]
@@ -8075,7 +8075,7 @@ _02251680:
strb r0, [r1]
ldr r0, [sp, #0x14]
add r6, r6, #1
bl GetPartyCount
bl Party_GetCount
cmp r6, r0
blt _02251680
_022516B0:
@@ -9442,7 +9442,7 @@ _022521AE:
ldr r0, [r4, #4]
add r1, r6, #0
ldr r0, [r0]
bl AddMonToParty
bl Party_AddMon
add r5, r5, #1
cmp r5, #6
blt _022521AE
@@ -9468,7 +9468,7 @@ _022521DC:
ldr r0, [r4, #4]
add r1, r6, #0
ldr r0, [r0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
ldr r0, [sp, #0x1c]
bl CopyPokemonToPokemon
@@ -9508,7 +9508,7 @@ _02252232:
ldr r0, [r4, #4]
ldr r1, [sp, #0xc]
ldr r0, [r0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
ldr r0, [sp, #0x20]
bl CopyPokemonToPokemon
@@ -9579,7 +9579,7 @@ _022522C4:
bl ov11_0222FF88
str r0, [sp, #0x10]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0225230E
mov r0, #6
@@ -9593,7 +9593,7 @@ _022522E2:
add r1, r0, #0
ldr r0, [r4, #4]
ldr r0, [r0]
bl AddMonToParty
bl Party_AddMon
ldr r0, [r4, #4]
ldrb r1, [r6, #0x1c]
add r0, r0, r5
@@ -9602,7 +9602,7 @@ _022522E2:
ldr r0, [sp, #0x10]
add r6, r6, #1
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _022522E2
_0225230E:
@@ -9814,7 +9814,7 @@ _0225249A:
bl ov11_0222FF88
str r0, [sp, #8]
mov r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _022524FE
ldr r0, [sp, #4]
@@ -9839,7 +9839,7 @@ _022524D0:
_022524F2:
ldr r0, [sp, #8]
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _022524D0
_022524FE:
arm9/overlays/11/asm/ov11_02254710.s
+21 -21
View File
@@ -1425,7 +1425,7 @@ _02255210:
bl ov11_0222FF88
str r0, [sp, #0x24]
mov r6, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _022552A6
mov r0, #6
@@ -1443,7 +1443,7 @@ _0225523A:
ldr r1, _022554FC ; =0x0000312C
ldr r0, [sp, #0x24]
ldrb r1, [r7, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r4, r0, #0
@@ -1491,7 +1491,7 @@ _02255298:
ldr r0, [sp, #0x24]
add r7, r7, #1
add r6, r6, #1
bl GetPartyCount
bl Party_GetCount
cmp r6, r0
blt _0225523A
_022552A6:
@@ -1531,7 +1531,7 @@ _022552E2:
bl ov11_0222FF88
str r0, [sp, #0x10]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0225535E
add r1, r4, #0
@@ -1544,7 +1544,7 @@ _02255304:
ldr r1, _022554FC ; =0x0000312C
ldr r0, [sp, #0x10]
ldrb r1, [r6, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r7, r0, #0
@@ -1582,7 +1582,7 @@ _02255350:
ldr r0, [sp, #0x10]
add r6, r6, #1
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _02255304
_0225535E:
@@ -1606,7 +1606,7 @@ _0225537C:
bl ov11_0222FF88
str r0, [sp, #0x14]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02255482
add r1, r4, #0
@@ -1620,7 +1620,7 @@ _022553A0:
ldr r1, _022554FC ; =0x0000312C
ldr r0, [sp, #0x14]
ldrb r1, [r6, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r7, r0, #0
@@ -1658,7 +1658,7 @@ _022553EC:
ldr r0, [sp, #0x14]
add r6, r6, #1
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _022553A0
b _02255482
@@ -1673,7 +1673,7 @@ _022553FC:
bl ov11_0222FF88
str r0, [sp, #0x18]
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02255482
add r1, r4, #0
@@ -1686,7 +1686,7 @@ _02255428:
ldr r1, _022554FC ; =0x0000312C
ldr r0, [sp, #0x18]
ldrb r1, [r6, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
add r7, r0, #0
@@ -1724,7 +1724,7 @@ _02255474:
ldr r0, [sp, #0x18]
add r6, r6, #1
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _02255428
_02255482:
@@ -4614,7 +4614,7 @@ _02256A60:
mov r4, #0
str r0, [sp, #0x10]
add r7, r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02256AE0
mov r0, #6
@@ -4626,7 +4626,7 @@ _02256A80:
ldr r1, _02256C00 ; =0x0000312C
ldr r0, [sp, #0x10]
ldrb r1, [r6, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x14]
@@ -4667,7 +4667,7 @@ _02256AD2:
ldr r0, [sp, #0x10]
add r6, r6, #1
add r7, r7, #1
bl GetPartyCount
bl Party_GetCount
cmp r7, r0
blt _02256A80
_02256AE0:
@@ -4677,7 +4677,7 @@ _02256AE0:
str r0, [sp, #8]
mov r4, #3
mov r6, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
bgt _02256AF8
b _02256BFA
@@ -4691,7 +4691,7 @@ _02256B02:
ldr r1, _02256C00 ; =0x0000312C
ldr r0, [sp, #8]
ldrb r1, [r7, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x18]
@@ -4732,7 +4732,7 @@ _02256B54:
ldr r0, [sp, #8]
add r7, r7, #1
add r6, r6, #1
bl GetPartyCount
bl Party_GetCount
cmp r6, r0
blt _02256B02
add sp, #0x20
@@ -4755,7 +4755,7 @@ _02256B7A:
mov r4, #0
str r0, [sp, #0xc]
add r7, r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _02256BFA
ldr r0, [sp, #0x38]
@@ -4767,7 +4767,7 @@ _02256B9A:
ldr r1, _02256C00 ; =0x0000312C
ldr r0, [sp, #0xc]
ldrb r1, [r6, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xad
mov r2, #0
str r0, [sp, #0x1c]
@@ -4808,7 +4808,7 @@ _02256BEC:
ldr r0, [sp, #0xc]
add r6, r6, #1
add r7, r7, #1
bl GetPartyCount
bl Party_GetCount
cmp r7, r0
blt _02256B9A
_02256BFA:
arm9/overlays/14/asm/overlay_14.s
+27 -27
View File
@@ -116,7 +116,7 @@ StoragePC_Overlay_Teardown: ; 0x021D75B8
lsl r1, r1, #2
ldr r0, [r4, r1]
add r1, #0x95
bl PartyHasMon
bl Party_HasMon
cmp r0, #0
bne _021D75DE
mov r0, #0x47
@@ -1905,7 +1905,7 @@ _021D8476:
add r0, #0x19
strb r2, [r4, r0]
ldr r0, [r4, r1]
bl GetPartyCount
bl Party_GetCount
ldr r1, _021D8504 ; =0x0000013F
strb r0, [r4, r1]
add r0, r4, #0
@@ -4031,7 +4031,7 @@ _021D95CA:
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
bl GetPartyCount
bl Party_GetCount
sub r0, r0, #1
cmp r6, r0
beq _021D9610
@@ -4238,7 +4238,7 @@ _021D979C:
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r4, r0]
bl GetPartyCount
bl Party_GetCount
cmp r0, #6
beq _021D97F2
mov r0, #0x45
@@ -4699,7 +4699,7 @@ ov14_021D9B84: ; 0x021D9B84
lsl r1, r1, #2
str r0, [sp]
ldr r0, [r0, r1]
bl GetPartyCount
bl Party_GetCount
mov r6, #0
add r5, r6, #0
str r0, [sp, #4]
@@ -4711,7 +4711,7 @@ _021D9B9E:
lsl r0, r0, #2
ldr r0, [r1, r0]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, r0, #0
bl AcquireMonLock
add r7, r0, #0
@@ -5351,7 +5351,7 @@ _021DA0A4:
_021DA0AE:
add r0, r1, #0
ldr r0, [r0, #0x18]
bl GetPartyCount
bl Party_GetCount
str r0, [sp, #0x10]
mov r0, #0
str r0, [sp, #8]
@@ -5362,7 +5362,7 @@ _021DA0C2:
ldr r0, [sp, #4]
ldr r1, [sp, #8]
ldr r0, [r0, #0x18]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r4, _021DA164 ; =ov14_021E6224
ldr r5, [sp, #4]
add r7, r0, #0
@@ -7519,7 +7519,7 @@ ov14_021DB220: ; 0x021DB220
add r4, r1, #0
add r5, r0, #0
ldr r0, [r4]
bl GetStoragePCPointer
bl SaveArray_PCStorage_Get
mov r1, #0x12
lsl r1, r1, #4
str r0, [r5, r1]
@@ -7527,7 +7527,7 @@ ov14_021DB220: ; 0x021DB220
sub r0, r1, #4
str r2, [r5, r0]
ldr r0, [r4]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
mov r1, #0x49
lsl r1, r1, #2
str r0, [r5, r1]
@@ -8416,7 +8416,7 @@ ov14_021DB8D0: ; 0x021DB8D0
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
bl GetPartyCount
bl Party_GetCount
strb r0, [r4, #8]
mov r0, #8
ldrsb r0, [r4, r0]
@@ -8495,14 +8495,14 @@ _021DB96C:
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
bl GetPartyCount
bl Party_GetCount
cmp r6, r0
bge _021DB98E
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [r4]
b _021DB998
_021DB98E:
@@ -8661,7 +8661,7 @@ _021DBA98:
lsl r0, r0, #2
ldrsb r1, [r5, r1]
ldr r0, [r7, r0]
bl RemoveMonFromParty
bl Party_RemoveMon
mov r0, #1
_021DBAB6:
strb r0, [r4, #0xb]
@@ -8878,7 +8878,7 @@ _021DBC42:
lsl r0, r0, #2
ldr r0, [r5, r0]
ldr r1, [r4]
bl AddMonToParty
bl Party_AddMon
b _021DBC70
_021DBC56:
mov r1, #0x1a
@@ -8891,18 +8891,18 @@ _021DBC56:
ldr r0, [r5, r1]
add r1, #0x7c
ldr r1, [r5, r1]
bl AddMonToParty
bl Party_AddMon
_021DBC70:
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
bl GetPartyCount
bl Party_GetCount
add r1, r0, #0
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
sub r1, r1, #1
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
_021DBC8A:
add r0, r7, #0
@@ -9108,7 +9108,7 @@ ov14_021DBE00: ; 0x021DBE00
lsl r0, r0, #2
ldrsb r1, [r4, r1]
ldr r0, [r5, r0]
bl RemoveMonFromParty
bl Party_RemoveMon
add r0, r5, #0
bl ov14_021DB934
mov r0, #1
@@ -9154,7 +9154,7 @@ _021DBE70:
lsl r0, r0, #2
ldrsb r1, [r4, r1]
ldr r0, [r5, r0]
bl RemoveMonFromParty
bl Party_RemoveMon
_021DBE7E:
add r0, r5, #0
bl ov14_021DB934
@@ -9207,7 +9207,7 @@ ov14_021DBEAC: ; 0x021DBEAC
ldr r0, [r6, r0]
bl SaveArray_IsNatDexEnabled
ldrh r1, [r4, #4]
bl sub_0206BB48
bl Pokedex_ConvertToCurrentDexNo
strh r0, [r4, #8]
add r0, r5, #0
mov r1, #0xac
@@ -23402,7 +23402,7 @@ ov14_021E2C7C: ; 0x021E2C7C
add r6, r0, #0
ldr r0, [r6, #0xc]
ldr r0, [r0, #4]
bl GetPartyCount
bl Party_GetCount
add r1, r6, #0
add r1, #0x28
ldrb r4, [r1]
@@ -23570,7 +23570,7 @@ ov14_021E2DB4: ; 0x021E2DB4
add r5, r0, #0
ldr r0, [r5, #0xc]
ldr r0, [r0, #4]
bl GetPartyCount
bl Party_GetCount
sub r4, r0, #1
add r0, r5, #0
add r0, #0x28
@@ -23975,7 +23975,7 @@ ov14_021E30C0: ; 0x021E30C0
str r1, [sp]
ldr r0, [r0, #4]
str r2, [sp, #4]
bl GetPartyCount
bl Party_GetCount
sub r6, r0, #1
add r4, r5, #0
mov r0, #0x34
@@ -24281,7 +24281,7 @@ _021E330E:
ldr r0, [sp, #0x24]
ldr r0, [r0, #0xc]
ldr r0, [r0, #4]
bl GetPartyCount
bl Party_GetCount
mov r4, #0
str r0, [sp, #0x20]
cmp r0, #0
@@ -24299,7 +24299,7 @@ _021E3330:
add r1, r4, #0
ldr r0, [r0, #0xc]
ldr r0, [r0, #4]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
mov r0, #1
str r0, [sp]
@@ -24347,7 +24347,7 @@ ov14_021E3390: ; 0x021E3390
add r7, r0, #0
ldr r0, [r7, #0xc]
ldr r0, [r0, #4]
bl GetPartyCount
bl Party_GetCount
mov r6, #0
str r0, [sp]
cmp r0, #0
arm9/overlays/16/asm/overlay_16.s
+6 -6
View File
@@ -55038,7 +55038,7 @@ _021F0E5A:
_021F0E68:
ldr r0, [sp, #0xc]
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r1, [sp, #8]
add r6, r0, #0
cmp r4, r1
@@ -55588,7 +55588,7 @@ _021F1276:
_021F128E:
ldr r0, [sp, #0x14]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r1, [sp, #8]
add r4, r0, #0
cmp r5, r1
@@ -55703,7 +55703,7 @@ _021F136A:
_021F1382:
ldr r0, [sp, #0x14]
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
ldr r1, [sp, #8]
add r4, r0, #0
cmp r5, r1
@@ -62886,13 +62886,13 @@ _021F4A94:
bl ov11_0222FF88
add r7, r0, #0
mov r5, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _021F4AF2
_021F4AA8:
add r0, r7, #0
add r1, r5, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
@@ -62920,7 +62920,7 @@ _021F4AA8:
_021F4AE6:
add r0, r7, #0
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _021F4AA8
_021F4AF2:
arm9/overlays/18/asm/overlay_18.s
+60 -60
View File
@@ -2199,7 +2199,7 @@ _0223A7EA:
ldr r0, _0223AB04 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CB4
ldr r0, _0223BDDC ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CB4
add r6, r0, #0
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
bl ov18_0224D2F0
add r0, r5, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CA8
add r4, r0, #0
bl sub_02026CC0
@@ -26733,7 +26733,7 @@ ov18_0224648C: ; 0x0224648C
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0x10]
cmp r0, #0
@@ -26770,7 +26770,7 @@ ov18_022464D0: ; 0x022464D0
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0x10]
cmp r0, #0
@@ -26808,7 +26808,7 @@ ov18_02246514: ; 0x02246514
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #0xc]
cmp r0, #0xd
@@ -27213,7 +27213,7 @@ ov18_0224686C: ; 0x0224686C
strb r1, [r0]
ldr r1, _02246894 ; =ov18_02246514
add r0, r4, #0
bl sub_020463CC
bl FieldSystem_CreateTask
_0224688E:
add sp, #8
pop {r3, r4, r5, pc}
@@ -27700,7 +27700,7 @@ ov18_02246C94: ; 0x02246C94
add r5, r2, #0
ldr r0, [r0]
ldr r0, [r0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CA8
str r0, [sp, #0xc]
ldr r0, _02247108 ; =0x022513EC
ldr r0, [r0]
ldr r0, [r0]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CC4
add r1, r5, #0
add r4, r0, #0
@@ -37225,7 +37225,7 @@ ov18_0224B84C: ; 0x0224B84C
bl TaskManager_GetFieldSystem
add r4, r0, #0
add r0, r6, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r0, [r5]
cmp r0, #5
@@ -37482,11 +37482,11 @@ _0224BA70:
bl ov18_0223D658
bl ov18_0224DD94
ldr r0, [r4, #0xc]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl Save_PlayerData_GetProfileAddr
add r5, r0, #0
ldr r0, [r4, #0xc]
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CC4
mov r3, #0
str r3, [sp]
@@ -37707,7 +37707,7 @@ _0224BC5C:
ldr r0, [r4, #0xc]
ldr r1, _0224BD50 ; =ov18_0224B84C
add r2, r5, #0
bl sub_020463CC
bl FieldSystem_CreateTask
_0224BC86:
add r0, r6, #0
add r1, r4, #0
@@ -38088,7 +38088,7 @@ ov18_0224BFAC: ; 0x0224BFAC
add r6, r0, #0
ldr r0, [r6, #0xc]
add r4, r1, #0
bl FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
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 FieldSystem_GetSaveDataPtr
bl FieldSystem_GetSaveData
bl sub_02026CC4
ldr r1, _0224CA24 ; =0x00000215
add r4, r0, #0
@@ -43203,7 +43203,7 @@ ov18_0224E824: ; 0x0224E824
bl TaskManager_GetFieldSystem
add r6, r0, #0
add r0, r5, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4]
cmp r0, #7
@@ -43346,7 +43346,7 @@ ov18_0224E960: ; 0x0224E960
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, _0224EA68 ; =0x00000504
ldr r0, [r4, r0]
@@ -43515,7 +43515,7 @@ ov18_0224EAD4: ; 0x0224EAD4
bl TaskManager_GetFieldSystem
add r5, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #4]
cmp r0, #5
@@ -43886,7 +43886,7 @@ ov18_0224EDDC: ; 0x0224EDDC
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #4]
cmp r0, #6
@@ -44442,7 +44442,7 @@ ov18_0224F258: ; 0x0224F258
bl TaskManager_GetFieldSystem
add r7, r0, #0
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r5, r0, #0
ldr r0, [r5, #4]
cmp r0, #0
@@ -44786,7 +44786,7 @@ ov18_0224F528: ; 0x0224F528
bl TaskManager_GetFieldSystem
str r0, [sp]
add r0, r4, #0
bl sub_0204652C
bl TaskManager_GetEnvironment
add r4, r0, #0
ldr r0, [r4, #4]
cmp r0, #3
arm9/overlays/27/asm/overlay_27.s
+4 -4
View File
@@ -56,7 +56,7 @@ ov27_0225489C: ; 0x0225489C
strb r0, [r5, #2]
add r0, r4, #0
bl ov20_02252C40
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r0, #0
add r0, r5, #4
bl ov27_02254A48
@@ -223,7 +223,7 @@ _0225499C:
blo _02254A02
ldr r0, [r4, #0x78]
bl ov20_02252C40
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
add r1, r0, #0
add r0, r4, #4
bl ov27_02254A48
@@ -281,7 +281,7 @@ ov27_02254A48: ; 0x02254A48
str r0, [sp]
add r0, r1, #0
str r1, [sp, #4]
bl GetPartyCount
bl Party_GetCount
ldr r1, [sp]
mov r6, #0
str r0, [r1]
@@ -291,7 +291,7 @@ ov27_02254A48: ; 0x02254A48
_02254A62:
ldr r0, [sp, #4]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, r0, #0
bl AcquireMonLock
add r7, r0, #0
arm9/overlays/28/asm/overlay_28.s
+3 -3
View File
@@ -57,11 +57,11 @@ ov28_0225489C: ; 0x0225489C
strb r0, [r7, #2]
str r4, [r7, #0x60]
bl sub_020225F8
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
mov r1, #0
str r0, [sp, #4]
str r1, [sp]
bl GetPartyCount
bl Party_GetCount
mov r6, #0
str r0, [r7, #4]
cmp r0, #0
@@ -70,7 +70,7 @@ ov28_0225489C: ; 0x0225489C
_022548D6:
ldr r0, [sp, #4]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x4c
mov r2, #0
add r5, r0, #0
arm9/overlays/39/asm/overlay_39.s
+3 -3
View File
@@ -49,9 +49,9 @@ ov39_0225489C: ; 0x0225489C
str r1, [sp, #8]
str r2, [sp, #0xc]
bl ov20_02252C40
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #0x10]
bl GetPartyCount
bl Party_GetCount
ldr r1, [sp, #4]
mov r6, #0
add r1, #0x34
@@ -66,7 +66,7 @@ ov39_0225489C: ; 0x0225489C
_022548CC:
ldr r0, [sp, #0x10]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r7, r0, #0
bl sub_0206B688
str r0, [r4, #4]
arm9/overlays/56/asm/overlay_56.s
+6 -6
View File
@@ -210,9 +210,9 @@ ov56_02211F88: ; 0x02211F88
push {r3, r4, r5, r6, r7, lr}
add r0, #0xc4
ldr r0, [r0]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp]
bl GetPartyCount
bl Party_GetCount
mov r5, #0
add r7, r0, #0
add r4, r5, #0
@@ -221,7 +221,7 @@ ov56_02211F88: ; 0x02211F88
_02211FA2:
ldr r0, [sp]
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa2
mov r2, #0
add r6, r0, #0
@@ -1984,7 +1984,7 @@ ov56_02212E0C: ; 0x02212E0C
add r0, r5, #0
add r0, #0xc4
ldr r0, [r0]
bl SaveArray_PlayerParty_Get
bl SaveArray_Party_Get
str r0, [sp, #0xc]
add r0, r5, #0
add r0, #0xc4
@@ -1992,7 +1992,7 @@ ov56_02212E0C: ; 0x02212E0C
bl sub_02029AFC
str r0, [sp, #8]
ldr r0, [sp, #0xc]
bl GetPartyCount
bl Party_GetCount
mov r6, #0
str r0, [sp, #4]
cmp r0, #0
@@ -2001,7 +2001,7 @@ ov56_02212E0C: ; 0x02212E0C
_02212E52:
ldr r0, [sp, #0xc]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #5
mov r2, #0
add r7, r0, #0
arm9/overlays/69/asm/overlay_69.s
+4 -4
View File
@@ -50,7 +50,7 @@ HOF_OverlayInit: ; 0x0222D5C0
str r0, [r4, #4]
ldr r0, [r4, #0xc]
ldr r0, [r0, #4]
bl GetPartyCount
bl Party_GetCount
add r6, r0, #0
mov r5, #0
cmp r6, #0
@@ -61,7 +61,7 @@ _0222D63A:
ldr r0, [r4, #0xc]
add r1, r5, #0
ldr r0, [r0, #4]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x4c
mov r2, #0
bl GetMonData
@@ -1224,7 +1224,7 @@ _0222DF98:
lsl r1, r1, #2
ldr r0, [r0, #4]
ldr r1, [r5, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x2c]
ldr r1, [sp, #0x2c]
add r0, sp, #0xc4
@@ -2281,7 +2281,7 @@ _0222E860:
lsl r1, r1, #2
ldr r0, [r0, #4]
ldr r1, [r2, r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [r4, #0x24]
ldr r0, [r5, #0xc]
mov r2, #0
arm9/overlays/71/asm/overlay_71.s
+40 -40
View File
@@ -420,11 +420,11 @@ ov71_0222D93C: ; 0x0222D93C
bl ov71_0222DB94
ldr r0, _0222D9B8 ; =0x00002218
ldr r0, [r5, r0]
bl GetPartyCount
bl Party_GetCount
add r4, r0, #0
ldr r0, _0222D9BC ; =0x0000221C
ldr r0, [r5, r0]
bl GetPartyCount
bl Party_GetCount
add r2, r0, #0
mov r0, #0x5d
lsl r0, r0, #2
@@ -644,13 +644,13 @@ ov71_0222DB5C: ; 0x0222DB5C
add r0, r5, #0
add r6, r2, #0
mov r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222DB92
_0222DB70:
add r0, r5, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl sub_020690E4
add r2, r0, #0
add r0, r7, #0
@@ -658,7 +658,7 @@ _0222DB70:
bl BufferBoxMonNickname
add r0, r5, #0
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _0222DB70
_0222DB92:
@@ -676,7 +676,7 @@ ov71_0222DB94: ; 0x0222DB94
str r3, [sp, #0x10]
ldr r6, [sp, #0x28]
mov r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222DBE6
add r7, r6, #1
@@ -701,7 +701,7 @@ _0222DBB0:
ldr r0, [sp, #0x10]
add r5, #0x10
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _0222DBB0
_0222DBE6:
@@ -718,7 +718,7 @@ ov71_0222DBEC: ; 0x0222DBEC
str r1, [sp, #0xc]
str r2, [sp, #0x20]
mov r7, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
bgt _0222DC02
b _0222DD10
@@ -847,7 +847,7 @@ _0222DCE2:
_0222DD02:
ldr r0, [sp, #8]
add r7, r7, #1
bl GetPartyCount
bl Party_GetCount
cmp r7, r0
bge _0222DD10
b _0222DC0C
@@ -1086,7 +1086,7 @@ _0222DED6:
blt _0222DED6
ldr r0, _0222E0F8 ; =0x00002218
ldr r0, [r4, r0]
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222DF12
mov r0, #0x69
@@ -1097,20 +1097,20 @@ _0222DEF4:
ldr r0, _0222E0F8 ; =0x00002218
add r1, r5, #0
ldr r0, [r4, r0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r6, #0
bl ov71_0222E118
ldr r0, [r4, r7]
add r6, #0x10
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222DEF4
_0222DF12:
ldr r0, _0222E0FC ; =0x0000221C
mov r5, #0
ldr r0, [r4, r0]
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222DF48
mov r0, #0x69
@@ -1121,14 +1121,14 @@ _0222DF28:
ldr r0, _0222E0FC ; =0x0000221C
add r1, r5, #0
ldr r0, [r4, r0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r5, #6
lsl r1, r1, #4
add r1, r6, r1
bl ov71_0222E118
ldr r0, [r4, r7]
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222DF28
_0222DF48:
@@ -1233,7 +1233,7 @@ _0222E010:
ldr r0, _0222E0F8 ; =0x00002218
mov r1, #0
ldr r0, [r4, r0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r2, #0x7f
ldr r3, _0222E104 ; =0x000020F0
lsl r2, r2, #4
@@ -1412,7 +1412,7 @@ ov71_0222E1A0: ; 0x0222E1A0
ldr r0, _0222E20C ; =0x0000221C
add r7, r1, #0
ldr r0, [r5, r0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r6, r0, #0
add r0, r4, #0
mov r1, #6
@@ -1473,7 +1473,7 @@ ov71_0222E224: ; 0x0222E224
bge _0222E29E
ldr r0, _0222E2BC ; =0x00002218
ldr r0, [r5, r0]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, r0, #0
add r0, r5, #0
add r0, #0x88
@@ -1675,7 +1675,7 @@ ov71_0222E3D4: ; 0x0222E3D4
ldr r0, _0222E42C ; =0x00002218
mov r4, #0
ldr r0, [r6, r0]
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222E402
ldr r7, _0222E42C ; =0x00002218
@@ -1688,14 +1688,14 @@ _0222E3EA:
ldr r0, [r6, r7]
add r5, r5, #4
add r4, r4, #1
bl GetPartyCount
bl Party_GetCount
cmp r4, r0
blt _0222E3EA
_0222E402:
ldr r0, _0222E430 ; =0x0000221C
mov r5, #0
ldr r0, [r6, r0]
bl GetPartyCount
bl Party_GetCount
cmp r0, #0
ble _0222E42A
ldr r7, _0222E430 ; =0x0000221C
@@ -1707,7 +1707,7 @@ _0222E414:
ldr r0, [r6, r7]
add r4, r4, #4
add r5, r5, #1
bl GetPartyCount
bl Party_GetCount
cmp r5, r0
blt _0222E414
_0222E42A:
@@ -2151,7 +2151,7 @@ ov71_0222E76C: ; 0x0222E76C
str r0, [r5, r1]
ldr r0, [r5, r1]
mov r1, #6
bl InitPartyWithMaxSize
bl Party_InitWithMaxSize
bl SaveArray_Party_sizeof
add r2, r0, #0
ldr r0, _0222E844 ; =0x0000221C
@@ -2694,7 +2694,7 @@ ov71_0222EC5C: ; 0x0222EC5C
add r4, r0, #0
add r0, r6, #0
add r1, r7, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x76
add r2, r4, #0
bl GetMonData
@@ -2728,7 +2728,7 @@ ov71_0222ECA8: ; 0x0222ECA8
_0222ECB6:
add r0, r1, #0
add r1, r2, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0x4d
mov r2, #0
bl GetMonData
@@ -2753,7 +2753,7 @@ ov71_0222ECD4: ; 0x0222ECD4
str r2, [sp, #8]
str r3, [sp, #0xc]
ldr r4, [sp, #0x50]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #2
bl sub_02068E14
str r0, [sp, #0x10]
@@ -2929,7 +2929,7 @@ _0222EE14:
bl ov71_02230EFC
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa0
mov r2, #0
bl GetMonData
@@ -2975,7 +2975,7 @@ _0222EEA6:
bl ov71_02230EFC
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #6
mov r2, #0
bl GetMonData
@@ -3864,7 +3864,7 @@ ov71_0222F59C: ; 0x0222F59C
str r0, [r5, #0xc]
ldr r0, [r5, #8]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
strb r0, [r5, #0x1f]
mov r0, #0
str r0, [r5, #0x34]
@@ -3880,7 +3880,7 @@ _0222F5CC:
ldr r1, [r5, r0]
str r1, [r5, #0xc]
ldr r0, [r5, r0]
bl GetPartyCount
bl Party_GetCount
strb r0, [r5, #0x1f]
bl sub_02031190
mov r2, #1
@@ -4875,7 +4875,7 @@ ov71_0222FDD8: ; 0x0222FDD8
add r1, #0x88
ldr r0, [r4, r0]
ldr r1, [r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl sub_020690E4
add r2, r0, #0
mov r0, #0x5f
@@ -5694,7 +5694,7 @@ ov71_022304AC: ; 0x022304AC
add r1, #0x88
ldr r0, [r4, r0]
ldr r1, [r1]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl sub_020690E4
add r2, r0, #0
mov r0, #0x5f
@@ -5708,7 +5708,7 @@ ov71_022304AC: ; 0x022304AC
ldr r1, [r1]
ldr r0, [r4, r0]
sub r1, r1, #6
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl sub_020690E4
add r2, r0, #0
mov r0, #0x5f
@@ -6121,7 +6121,7 @@ ov71_02230810: ; 0x02230810
ldr r1, [r1]
ldr r0, [r4, r0]
sub r1, r1, #6
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl sub_020690E4
add r2, r0, #0
mov r0, #0x5f
@@ -6327,12 +6327,12 @@ ov71_022309E8: ; 0x022309E8
add r4, r0, #0
ldr r0, [sp, #4]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r7, #0
bl CopyPokemonToPokemon
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r4, #0
bl CopyPokemonToPokemon
add r0, r4, #0
@@ -6375,7 +6375,7 @@ _02230A40:
ldr r0, [sp, #4]
ldr r1, _02230AE0 ; =0x000001B9
str r6, [r5, #0x2c]
bl PartyHasMon
bl Party_HasMon
cmp r0, #0
bne _02230A98
ldr r0, [r5, #0x10]
@@ -6387,13 +6387,13 @@ _02230A98:
bl sub_0202C144
ldr r0, [sp, #4]
add r1, r6, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
add r0, r4, #0
bl CopyPokemonToPokemon
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
add r0, r7, #0
bl CopyPokemonToPokemon
@@ -6538,7 +6538,7 @@ ov71_02230BC4: ; 0x02230BC4
ldr r0, _02230C00 ; =0x00002218
mov r4, #0
ldr r0, [r5, r0]
bl GetPartyCount
bl Party_GetCount
add r3, r4, #0
cmp r0, #0
ble _02230BF0
arm9/overlays/80/asm/overlay_80.s
+21 -21
View File
@@ -4660,7 +4660,7 @@ _0222FA26:
beq _0222FA80
ldr r0, [r5]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
cmp r0, #6
bne _0222FA80
ldr r0, _0222FAE4 ; =0x00000F0F
@@ -9976,7 +9976,7 @@ _022325CE:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa1
add r2, r4, #0
bl GetMonData
@@ -10216,7 +10216,7 @@ _022327CE:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
mov r1, #0xa1
add r2, r4, #0
bl GetMonData
@@ -10458,7 +10458,7 @@ ov80_02232990: ; 0x02232990
beq _022329E6
ldr r0, [r4]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
cmp r0, #6
bne _022329E6
ldr r0, _02232A2C ; =0x00000F0F
@@ -11031,7 +11031,7 @@ _02232E22:
_02232E3A:
ldr r0, [r5]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
mov r4, #0
str r0, [sp, #0x14]
cmp r0, #0
@@ -11040,7 +11040,7 @@ _02232E4A:
ldr r0, [r5]
add r1, r4, #0
ldr r0, [r0, #8]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
str r0, [sp, #0x24]
bl sub_020690E4
ldr r1, _02232F84 ; =0x00001004
@@ -11221,7 +11221,7 @@ ov80_02232FB8: ; 0x02232FB8
cmp r0, #0
beq _02232FEA
add r0, r5, #0
bl GetPartyCount
bl Party_GetCount
sub r0, r0, #1
cmp r4, r0
ble _02232FDC
@@ -11230,7 +11230,7 @@ ov80_02232FB8: ; 0x02232FB8
_02232FDC:
add r0, r5, #0
add r1, r4, #0
bl GetPartyMonByIndex
bl Party_GetMonByIndex
bl sub_020690E4
pop {r3, r4, r5, r6, r7, pc}
_02232FEA:
@@ -11251,7 +11251,7 @@ ov80_02232FF8: ; 0x02232FF8
cmp r0, #0
beq _02233014
add r0, r4, #0
bl GetPartyCount
bl Party_GetCount
cmp r0, #2
bge _02233014
mov r0, #0
@@ -16102,7 +16102,7 @@ _02235590:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r4, r0, #0
bl Pokemon_RemoveCapsule
add r2, r5, #0
@@ -16117,11 +16117,11 @@ _02235590:
add r1, #0xba
ldrh r1, [r1]
ldr r0, [r0, #8]
bl RemoveMonFromParty
bl Party_RemoveMon
ldr r0, [r5]
ldr r1, _022355EC ; =0x000001B9
ldr r0, [r0, #8]
bl PartyHasMon
bl Party_HasMon
cmp r0, #0
bne _022355DC
ldr r0, [r5]
@@ -16161,7 +16161,7 @@ ov80_022355F0: ; 0x022355F0
str r0, [sp, #0x20]
ldr r0, [r5]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
cmp r0, #6
bne _02235624
mov r0, #0
@@ -16186,10 +16186,10 @@ _02235640:
ldr r0, [r5]
add r1, r4, #0
ldr r0, [r0, #8]
bl AddMonToParty
bl Party_AddMon
ldr r0, [r5]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
add r1, r5, #0
mov r2, #0x12
add r1, #0xcc
@@ -16246,7 +16246,7 @@ ov80_022356AC: ; 0x022356AC
str r0, [sp, #0x20]
ldr r0, [r5]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
cmp r0, #6
bne _022356D2
mov r0, #0
@@ -16265,10 +16265,10 @@ _022356D2:
ldr r0, [r5]
add r1, r4, #0
ldr r0, [r0, #8]
bl AddMonToParty
bl Party_AddMon
ldr r0, [r5]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
add r1, r5, #0
mov r2, #0x12
add r1, #0xcc
@@ -16395,7 +16395,7 @@ ov80_022357DC: ; 0x022357DC
beq _022357FA
ldr r0, [r4]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
cmp r0, #6
bne _022357FA
mov r0, #2
@@ -16409,7 +16409,7 @@ _022357FA:
bne _02235816
ldr r0, [r4]
ldr r0, [r0, #8]
bl GetPartyCount
bl Party_GetCount
cmp r0, #6
bne _02235816
mov r0, #1
@@ -17717,7 +17717,7 @@ ov80_02236218: ; 0x02236218
add r5, #0xd0
ldr r0, [r0, #8]
ldr r1, [r5]
bl GetPartyMonByIndex
bl Party_GetMonByIndex
add r1, r0, #0
add r0, r4, #0
bl CopyPokemonToPokemon
arm9/src/encounter.c
+808
View File
@@ -0,0 +1,808 @@
#include "global.h"
#include "encounter.h"
#include "constants/battle.h"
#include "constants/game_stats.h"
#include "event_data.h"
#include "field_system.h"
#include "igt.h"
#include "task.h"
#include "unk_020040F4.h"
#include "unk_02022504.h"
#include "unk_02029FB0.h"
#include "unk_0204AEA8.h"
#include "unk_0204AF24.h"
#include "unk_0205EC84.h"
#include "unk_0205FA2C.h"
#include "use_item_on_mon.h"
extern void sub_0203780C(FieldSystem *fieldSystem, BattleSetup *battleSetup);
extern void BattleSetup_Delete(BattleSetup *setup);
extern BOOL IsBattleResultWin(u32 winFlag);
extern void sub_02047F38(BattleSetup *setup, FieldSystem *fieldSystem);
extern void sub_02061080(FieldSystem *fieldSystem, u32 param1, u32 winFlag);
extern void MapObjectManager_PauseAllMovement(MapObjectManager *mapObjectManager);
extern void MapObjectManager_UnpauseAllMovement(MapObjectManager *mapObjectManager);
extern void sub_0202E25C(SaveData *saveData, s32 param1);
extern void sub_02047FA4(BattleSetup *setup, FieldSystem *fieldSystem);
extern BattleSetup *ov06_02244558(u32 param0, FieldSystem *fieldSystem);
extern s32 sub_020475A0(BattleSetup *battleSetup);
extern s32 sub_020475B0(BattleSetup *battleSetup);
extern BOOL FieldTask_BlackOut(TaskManager *taskManager);
extern void sub_0205DD40(u32 param0);
extern u32 sub_0205E128(u32 param0);
extern void sub_0205DED4(FieldSystem *fieldSystem, u32 winFlag, u32 param2);
extern void sub_0205DF44(FieldSystem *fieldSystem, u32 param1);
extern BOOL sub_0205DF9C(u32 param0);
extern u32 sub_0205E0A4(u32 param0);
extern void ov06_02248724(FieldSystem *fieldSystem, BattleSetup *setup);
extern void sub_02060FE0(SafariZone *safariZone, Pokemon *pokemon);
extern LocalFieldData *Save_LocalFieldData_Get(SaveData *save);
extern u16 *LocalFieldData_GetSafariBallsCounter(LocalFieldData *localFieldData);
extern Location *LocalFieldData_GetDynamicWarp(LocalFieldData *localFieldData);
extern void sub_02049160(TaskManager *taskManager, Location *location);
extern void QueueScript(TaskManager *taskManager, u16 script, LocalMapObject *lastInteracted, void *param3);
extern BattleSetup *BattleSetup_New(HeapID heapId, u32 flags);
extern void BattleSetup_InitFromFieldSystem(BattleSetup *setup, FieldSystem *fieldSystem);
extern void ov06_0223CCDC(FieldSystem *fieldSystem, BattleSetup *setup);
extern void ov06_0223CD7C(FieldSystem *fieldSystem, u16 species, u8 level, BattleSetup *setup);
extern void PalPark_HandleBattleEnd(FieldSystem *fieldSystem, BattleSetup *setup);
extern u32 PalPark_CountMonsNotCaught(FieldSystem *fieldSystem);
extern void StartScriptFromMenu(TaskManager *taskManager, u16 script, LocalMapObject *lastInteracted);
extern BattleSetup *sub_02047814(HeapID heapId, FieldSystem *fieldSystem);
extern void sub_02047F1C(BattleSetup *setup, FieldSystem *fieldSystem, void *param2);
extern void sub_02047BC0(BattleSetup *setup, FieldSystem *fieldSystem, s32 maxLevel);
extern void sub_0204FF5C(FieldSystem *fieldSystem);
extern void sub_02047D48(BattleSetup *setup, FieldSystem *fieldSystem, Party *party, void *param3);
extern void *sub_0202920C(IGT *igt, u16 species, u8 gender, u8 param3, HeapID heapId);
extern void *sub_0202918C(IGT *igt, u16 species, u8 gender, u8 param3, HeapID heapId);
extern void sub_02028AD4(u32 *param0, void *param1, u32 param2);
extern void sub_020299DC(u32 *param0, u16 mapId, u16 trainerId, HeapID heapId);
static BOOL Task_StartBattle(TaskManager *taskManager);
static void CallTask_StartBattle(TaskManager *taskManager, BattleSetup *setup);
static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag);
static void Encounter_Delete(Encounter *encounter);
static BOOL Encounter_GetResult(Encounter *encounter);
static void sub_020465E4(BattleSetup *setup, FieldSystem *fieldSystem);
static BOOL Task_StartEncounter(TaskManager *taskManager);
static void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag);
static void sub_0204671C(s32 flag, FieldSystem *fieldSystem);
static BOOL Task_02046758(TaskManager *taskManager);
static BOOL Task_020467FC(TaskManager *taskManager);
static BOOL Task_02046878(TaskManager *taskManager);
static void CallTask_02046878(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag);
static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag);
static void WildEncounter_Delete(WildEncounter *encounter);
static BOOL Task_WildEncounter(TaskManager *taskManager);
static BOOL Task_SafariEncounter(TaskManager *taskManager);
static BOOL Task_PalParkEncounter(TaskManager *taskManager);
static BOOL Task_TutorialBattle(TaskManager *taskManager);
static BOOL sub_02047220(TaskManager *taskManager);
static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup);
static void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup);
static BOOL Task_StartBattle(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
BattleSetup *battleSetup = TaskManager_GetEnvironment(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
switch (*state) {
case 0:
sub_0203780C(fieldSystem, battleSetup);
(*state)++;
break;
case 1:
if (!FieldSystem_ApplicationIsRunning(fieldSystem)) {
return TRUE;
}
break;
}
return FALSE;
}
static void CallTask_StartBattle(TaskManager *taskManager, BattleSetup *setup) {
TaskManager_Call(taskManager, Task_StartBattle, setup);
}
static Encounter *Encounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) {
Encounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(Encounter));
encounter->winFlag = winFlag;
if (winFlag != NULL) {
*winFlag = BATTLE_OUTCOME_NONE;
}
encounter->effect = effect;
encounter->bgm = bgm;
encounter->setup = setup;
return encounter;
}
static void Encounter_Delete(Encounter *encounter) {
BattleSetup_Delete(encounter->setup);
FreeToHeap(encounter);
}
static BOOL Encounter_GetResult(Encounter *encounter) {
if (encounter->winFlag != NULL) {
*(encounter->winFlag) = encounter->setup->winFlag;
}
return IsBattleResultWin(encounter->setup->winFlag);
}
static void sub_020465E4(BattleSetup *setup, FieldSystem *fieldSystem) {
if (!(setup->flags & BATTLE_TYPE_DEBUG)) {
sub_02047F38(setup, fieldSystem);
}
}
static BOOL Task_StartEncounter(TaskManager *taskManager) { //todo: better name
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter = TaskManager_GetEnvironment(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
switch (*state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager);
sub_0204AEF8(taskManager, encounter->effect, encounter->bgm);
(*state)++;
break;
case 1:
sub_0204AF3C(taskManager);
(*state)++;
break;
case 2:
CallTask_StartBattle(taskManager, encounter->setup);
(*state)++;
break;
case 3:
sub_020465E4(encounter->setup, fieldSystem);
if (encounter->setup->flags == BATTLE_TYPE_NONE || encounter->setup->flags == BATTLE_TYPE_8 || encounter->setup->flags == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) {
sub_02061080(fieldSystem, encounter->setup->unk134, encounter->setup->winFlag);
}
if (Encounter_GetResult(encounter) == FALSE) {
Encounter_Delete(encounter);
return TRUE;
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData))) {
HealParty(SaveArray_Party_Get(fieldSystem->saveData));
}
sub_020472F4(fieldSystem, encounter->setup);
sub_020473CC(fieldSystem, encounter->setup);
CallTask_RestoreOverworld(taskManager);
(*state)++;
break;
case 4:
MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager);
CallTask_FadeFromBlack(taskManager);
(*state)++;
break;
case 5:
Encounter_Delete(encounter);
return TRUE;
break;
}
return FALSE;
}
static void CallTask_StartEncounter(TaskManager *taskManager, BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) {
Encounter *encounter = Encounter_New(setup, effect, bgm, winFlag);
TaskManager_Call(taskManager, Task_StartEncounter, encounter);
}
static void sub_0204671C(s32 flag, FieldSystem *fieldSystem) {
switch(flag & 0xF) {
case 1:
case 6:
sub_0202E25C(fieldSystem->saveData, 1);
break;
case 2:
case 5:
sub_0202E25C(fieldSystem->saveData, -1);
break;
}
}
static BOOL Task_02046758(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter = TaskManager_GetEnvironment(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
switch (*state) {
case 0:
sub_0204AEF8(taskManager, encounter->effect, encounter->bgm);
(*state)++;
break;
case 1:
sub_0204AF3C(taskManager);
(*state)++;
break;
case 2:
CallTask_StartBattle(taskManager, encounter->setup);
(*state)++;
break;
case 3:
sub_0204671C(encounter->setup->winFlag, fieldSystem);
sub_02047FA4(encounter->setup, fieldSystem);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK21);
CallTask_RestoreOverworld(taskManager);
(*state)++;
break;
case 4:
case 5: //??
Encounter_Delete(encounter);
return TRUE;
}
return FALSE;
}
static BOOL Task_020467FC(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter = TaskManager_GetEnvironment(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
switch (*state) {
case 0:
sub_0200433C(5, encounter->bgm, 1);
CallTask_StartBattle(taskManager, encounter->setup);
(*state)++;
break;
case 1:
sub_0204671C(encounter->setup->winFlag, fieldSystem);
sub_02047FA4(encounter->setup, fieldSystem);
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK21);
(*state)++;
break;
case 2:
Encounter_Delete(encounter);
return TRUE;
}
return FALSE;
}
static BOOL Task_02046878(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter = TaskManager_GetEnvironment(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
switch (*state) {
case 0:
sub_0204AEF8(taskManager, encounter->effect, encounter->bgm);
(*state)++;
break;
case 1:
sub_0204AF3C(taskManager);
(*state)++;
break;
case 2:
CallTask_StartBattle(taskManager, encounter->setup);
(*state)++;
break;
case 3:
sub_02047FA4(encounter->setup, fieldSystem);
sub_02060044(fieldSystem, &encounter->setup->unk138);
Encounter_GetResult(encounter);
CallTask_RestoreOverworld(taskManager);
(*state)++;
break;
case 4:
CallTask_FadeFromBlack(taskManager);
(*state)++;
break;
case 5:
Encounter_Delete(encounter);
return TRUE;
}
return FALSE;
}
static void CallTask_02046878(TaskManager *taskManager, BattleSetup *battleSetup, s32 effect, s32 bgm, u32 *winFlag) { //CallTask_02046878
Encounter *encounter = Encounter_New(battleSetup, effect, bgm, winFlag);
TaskManager_Call(taskManager, Task_02046878, encounter);
}
void sub_02046948(TaskManager *taskManager, u32 param1, u32 *winFlag) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
BattleSetup *battleSetup = ov06_02244558(param1, fieldSystem);
s32 effect = sub_020475A0(battleSetup);
s32 bgm = sub_020475B0(battleSetup);
CallTask_02046878(taskManager, battleSetup, effect, bgm, winFlag);
}
static WildEncounter *WildEncounter_New(BattleSetup *setup, s32 effect, s32 bgm, u32 *winFlag) {
WildEncounter *encounter = AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(WildEncounter));
encounter->winFlag = winFlag;
if (winFlag != NULL) {
*winFlag = BATTLE_OUTCOME_NONE;
}
encounter->effect = effect;
encounter->bgm = bgm;
encounter->setup = setup;
encounter->state = 0;
return encounter;
}
static void WildEncounter_Delete(WildEncounter *encounter) {
BattleSetup_Delete(encounter->setup);
FreeToHeap(encounter);
}
void sub_020469B8(FieldSystem *fieldSystem, BattleSetup *setup) {
SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->saveData);
if (Save_VarsFlags_CheckSafariSysFlag(flags)) {
Encounter *encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
FieldSystem_CreateTask(fieldSystem, Task_SafariEncounter, encounter);
} else {
WildEncounter *encounter = WildEncounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
FieldSystem_CreateTask(fieldSystem, Task_WildEncounter, encounter);
}
}
void sub_02046A20(FieldSystem *fieldSystem, TaskManager *taskManager, BattleSetup *setup) {
SaveVarsFlags *flags = Save_VarsFlags_Get(fieldSystem->saveData);
if (Save_VarsFlags_CheckSafariSysFlag(flags)) {
Encounter *encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
TaskManager_Jump(taskManager, Task_SafariEncounter, encounter);
} else {
WildEncounter *encounter = WildEncounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
TaskManager_Jump(taskManager, Task_WildEncounter, encounter);
}
}
static BOOL Task_WildEncounter(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
WildEncounter *encounter = TaskManager_GetEnvironment(taskManager);
switch (encounter->state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7);
sub_0204AEF8(taskManager, encounter->effect, encounter->bgm);
encounter->state++;
break;
case 1:
sub_0204AF3C(taskManager);
encounter->state++;
break;
case 2:
CallTask_StartBattle(taskManager, encounter->setup);
encounter->state++;
break;
case 3:
sub_020465E4(encounter->setup, fieldSystem);
sub_02061080(fieldSystem, encounter->setup->unk134, encounter->setup->winFlag);
if (IsBattleResultWin(encounter->setup->winFlag) == FALSE) {
WildEncounter_Delete(encounter);
sub_0205DD40(fieldSystem->unk90);
TaskManager_Jump(taskManager, FieldTask_BlackOut, NULL);
return FALSE;
}
if (Save_VarsFlags_CheckHaveFollower(Save_VarsFlags_Get(fieldSystem->saveData))) {
HealParty(SaveArray_Party_Get(fieldSystem->saveData));
}
sub_020472F4(fieldSystem, encounter->setup);
sub_020473CC(fieldSystem, encounter->setup);
if (sub_0205E128(fieldSystem->unk90) != 0) {
if (sub_0205E0A4(fieldSystem->unk90) != 0) {
if (encounter->setup->winFlag != BATTLE_OUTCOME_WIN && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) {
sub_0205DD40(fieldSystem->unk90);
}
} else {
sub_0205DD40(fieldSystem->unk90);
}
}
CallTask_RestoreOverworld(taskManager);
encounter->state++;
break;
case 4:
ov06_02248724(fieldSystem, encounter->setup);
CallTask_FadeFromBlack(taskManager);
encounter->state++;
break;
case 5:
if (sub_0205E128(fieldSystem->unk90) != 0) {
sub_0205DED4(fieldSystem, encounter->setup->winFlag, fieldSystem->unk90);
sub_0205DF44(fieldSystem, fieldSystem->unk90);
}
encounter->state++;
break;
case 6:
if (sub_0205DF9C(fieldSystem->unk90)) {
MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager);
WildEncounter_Delete(encounter);
return TRUE;
}
break;
}
return FALSE;
}
static BOOL Task_SafariEncounter(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter = TaskManager_GetEnvironment(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
u16 *safariBalls = LocalFieldData_GetSafariBallsCounter(Save_LocalFieldData_Get(fieldSystem->saveData));
switch (*state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7);
sub_0204AEF8(taskManager, encounter->effect, encounter->bgm);
(*state)++;
break;
case 1:
sub_0204AF3C(taskManager);
(*state)++;
break;
case 2:
CallTask_StartBattle(taskManager, encounter->setup);
(*state)++;
break;
case 3:
sub_020465E4(encounter->setup, fieldSystem);
if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
SafariZone *safariZone = Save_SafariZone_Get(fieldSystem->saveData);
Pokemon *pokemon = Party_GetMonByIndex(encounter->setup->party[BATTLER_ENEMY], 0);
sub_02060FE0(safariZone, pokemon);
}
sub_020472F4(fieldSystem, encounter->setup);
if (*safariBalls == 0 && encounter->setup->winFlag != BATTLE_OUTCOME_MON_CAUGHT) {
Location *location = LocalFieldData_GetDynamicWarp(Save_LocalFieldData_Get(fieldSystem->saveData));
sub_02049160(taskManager, location);
}
sub_020473CC(fieldSystem, encounter->setup);
(*state)++;
break;
case 4:
CallTask_RestoreOverworld(taskManager);
(*state)++;
break;
case 5:
MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager);
CallTask_FadeFromBlack(taskManager);
(*state)++;
break;
case 6:
if (*safariBalls == 0) {
if (encounter->setup->winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
QueueScript(taskManager, 0x2262, NULL, NULL);
} else {
QueueScript(taskManager, 0x2269, NULL, NULL);
}
} else {
PCStorage *pc = SaveArray_PCStorage_Get(fieldSystem->saveData);
Party *party = SaveArray_Party_Get(fieldSystem->saveData);
if (PCStorage_FindFirstBoxWithEmptySlot(pc) == NUM_BOXES && Party_GetCount(party) == PARTY_SIZE) {
QueueScript(taskManager, 0x2276, NULL, NULL);
}
}
(*state)++;
break;
case 7:
Encounter_Delete(encounter);
return TRUE;
}
return FALSE;
}
void SetupAndStartHoneyTreeBattle(TaskManager *taskManager, u32 *winFlag) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
sub_0205DD40(fieldSystem->unk90);
BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_TYPE_NONE);
BattleSetup_InitFromFieldSystem(setup, fieldSystem);
setup->unk150 = 0;
setup->unk154 = 0;
ov06_0223CCDC(fieldSystem, setup);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7);
CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), winFlag);
}
void SetupAndStartWildBattle(TaskManager *taskManager, u16 species, u8 level, u32 *winFlag, BOOL canFlee) {
BattleSetup *setup;
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
sub_0205DD40(fieldSystem->unk90);
setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_TYPE_NONE);
BattleSetup_InitFromFieldSystem(setup, fieldSystem);
ov06_0223CD7C(fieldSystem, species, level, setup);
if (canFlee) {
setup->unk18C |= 8;
}
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7);
CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), winFlag);
}
static BOOL Task_PalParkEncounter(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter = TaskManager_GetEnvironment(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
switch (*state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7);
sub_0204AEF8(taskManager, encounter->effect, encounter->bgm);
(*state)++;
break;
case 1:
sub_0204AF3C(taskManager);
(*state)++;
break;
case 2:
CallTask_StartBattle(taskManager, encounter->setup);
(*state)++;
break;
case 3:
sub_020465E4(encounter->setup, fieldSystem);
PalPark_HandleBattleEnd(fieldSystem, encounter->setup);
sub_020472F4(fieldSystem, encounter->setup);
(*state)++;
break;
case 4:
CallTask_RestoreOverworld(taskManager);
(*state)++;
break;
case 5:
MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager);
CallTask_FadeFromBlack(taskManager);
(*state)++;
break;
case 6:
Encounter_Delete(encounter);
if (PalPark_CountMonsNotCaught(fieldSystem) == 0) {
StartScriptFromMenu(taskManager, 3, NULL);
return FALSE;
}
return TRUE;
}
return FALSE;
}
void sub_02046F70(FieldSystem *fieldSystem, BattleSetup *setup) {
Encounter *encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
FieldSystem_CreateTask(fieldSystem, Task_PalParkEncounter, encounter);
}
void SetupAndStartFirstBattle(TaskManager *taskManager, u16 species, u8 level) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, BATTLE_TYPE_NONE);
BattleSetup_InitFromFieldSystem(setup, fieldSystem);
ov06_0223CD7C(fieldSystem, species, level, setup);
setup->unk18C = 1;
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK7);
CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
}
static BOOL Task_TutorialBattle(TaskManager *taskManager) {
Encounter *encounter = TaskManager_GetEnvironment(taskManager);
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
switch (*state) {
case 0:
MapObjectManager_PauseAllMovement(fieldSystem->mapObjectManager);
sub_0204AEF8(taskManager, encounter->effect, encounter->bgm);
(*state)++;
break;
case 1:
sub_0204AF3C(taskManager);
(*state)++;
break;
case 2:
CallTask_StartBattle(taskManager, encounter->setup);
(*state)++;
break;
case 3:
(*state)++;
break;
case 4:
CallTask_RestoreOverworld(taskManager);
(*state)++;
break;
case 5:
MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager);
CallTask_FadeFromBlack(taskManager);
(*state)++;
break;
case 6:
Encounter_Delete(encounter);
return TRUE;
}
return FALSE;
}
void SetupAndStartTutorialBattle(TaskManager *taskManager) {
Encounter *encounter;
BattleSetup *setup;
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
setup = sub_02047814(HEAP_ID_FIELD, fieldSystem);
encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
TaskManager_Call(taskManager, Task_TutorialBattle, encounter);
}
void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, HeapID heapId, u32 *winFlag) {
u32 battleType;
BattleSetup *setup;
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
if (opponentTrainer2 != 0 && opponentTrainer1 != opponentTrainer2) {
if (followerTrainerNum == 0) {
battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_INGAME_PARTNER);
} else {
battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6);
}
} else if (opponentTrainer1 == opponentTrainer2) {
battleType = (BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLES);
} else {
battleType = BATTLE_TYPE_TRAINER;
}
sub_0205DD40(fieldSystem->unk90);
setup = BattleSetup_New(HEAP_ID_FIELD, battleType);
BattleSetup_InitFromFieldSystem(setup, fieldSystem);
setup->trainerId[BATTLER_ENEMY] = opponentTrainer1;
setup->trainerId[BATTLER_ENEMY2] = opponentTrainer2;
setup->trainerId[BATTLER_PLAYER2] = followerTrainerNum;
EnemyTrainerSet_Init(setup, fieldSystem->saveData, heapId);
GameStats_Inc(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8);
CallTask_StartEncounter(taskManager, setup, sub_020475A0(setup), sub_020475B0(setup), winFlag);
}
void sub_02047174(TaskManager *taskManager, void *param1, u32 battleType) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter;
BattleSetup *setup;
setup = BattleSetup_New(HEAP_ID_FIELD, battleType);
sub_02047F1C(setup, fieldSystem, param1);
encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
TaskManager_Call(taskManager, Task_02046758, encounter);
}
void sub_020471C0(TaskManager *taskManager, s32 target, s32 maxLevel, u32 flag) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter;
BattleSetup *setup;
if (flag != 0) {
setup = BattleSetup_New(HEAP_ID_FIELD, (BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER));
} else {
setup = BattleSetup_New(HEAP_ID_FIELD, (BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLES | BATTLE_TYPE_TRAINER));
}
sub_02047BC0(setup, fieldSystem, maxLevel);
encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
encounter->unkC = target;
TaskManager_Call(taskManager, Task_020467FC, encounter);
}
static BOOL sub_02047220(TaskManager *taskManager) {
FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskManager);
Encounter *encounter = TaskManager_GetEnvironment(taskManager);
u32 *state = TaskManager_GetStatePtr(taskManager);
switch (*state) {
case 0:
TaskManager_Call(taskManager, Task_02046758, encounter);
(*state)++;
break;
case 1:
sub_0204FF5C(fieldSystem);
return TRUE;
}
return FALSE;
}
void sub_0204726C(FieldSystem *fieldSystem, void *param1, s32 battleType) {
Encounter *encounter;
BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, battleType);
sub_02047F1C(setup, fieldSystem, param1);
encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
FieldSystem_CreateTask(fieldSystem, sub_02047220, encounter);
}
void sub_020472B0(FieldSystem *fieldSystem, Party *party, s32 battleType) {
Encounter *encounter;
BattleSetup *setup = BattleSetup_New(HEAP_ID_FIELD, battleType);
sub_02047D48(setup, fieldSystem, party, NULL);
encounter = Encounter_New(setup, sub_020475A0(setup), sub_020475B0(setup), NULL);
FieldSystem_CreateTask(fieldSystem, sub_02047220, encounter);
}
static void sub_020472F4(FieldSystem *fieldSystem, BattleSetup *setup) {
Pokemon *mon;
u32 battleType = setup->flags;
u32 winFlag = setup->winFlag;
if (battleType & BATTLE_TYPE_LINK || battleType & BATTLE_TYPE_TOWER) {
return;
}
if (battleType == BATTLE_TYPE_NONE || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6)) {
if (winFlag == BATTLE_OUTCOME_WIN) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK8);
} else if (winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0);
if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9);
} else {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10);
}
}
} else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) {
if (winFlag == BATTLE_OUTCOME_WIN) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK11);
}
} else if ((battleType & BATTLE_TYPE_SAFARI || battleType & BATTLE_TYPE_PAL_PARK) && winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0);
if (Pokedex_ConvertToCurrentDexNo(FALSE, GetMonData(mon, MON_DATA_SPECIES, NULL)) != 0) {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK9);
} else {
GameStats_AddSpecial(Save_GameStats_Get(fieldSystem->saveData), GAME_STAT_UNK10);
}
}
}
static void sub_020473CC(FieldSystem *fieldSystem, BattleSetup *setup) {
Pokemon *mon;
u32 battleType = setup->flags;
u32 winFlag = setup->winFlag;
if (battleType & BATTLE_TYPE_LINK || battleType & BATTLE_TYPE_TOWER || battleType & BATTLE_TYPE_PAL_PARK) {
return;
}
if (battleType == BATTLE_TYPE_NONE || battleType == BATTLE_TYPE_8 || battleType == (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_MULTI | BATTLE_TYPE_6) || battleType == BATTLE_TYPE_SAFARI) {
if (winFlag == BATTLE_OUTCOME_WIN) {
fieldSystem->unk76++;
if (fieldSystem->unk76 < 5) {
return;
}
mon = Party_GetMonByIndex(setup->party[BATTLER_ENEMY], 0);
sub_02028AD4(fieldSystem->unk98, sub_0202920C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2);
} else if (winFlag == BATTLE_OUTCOME_MON_CAUGHT) {
mon = Party_GetMonByIndex(setup->party[setup->unk170], 0);
sub_02028AD4(fieldSystem->unk98, sub_0202918C(Save_PlayerData_GetIGTAddr(fieldSystem->saveData), GetMonData(mon, MON_DATA_SPECIES, NULL), GetMonData(mon, MON_DATA_GENDER, NULL), setup->unk160, HEAP_ID_FIELD), 2);
}
} else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_INGAME_PARTNER)) {
if (winFlag == BATTLE_OUTCOME_WIN) {
sub_020299DC(fieldSystem->unk98, fieldSystem->location->mapId, setup->trainerId[BATTLER_ENEMY], HEAP_ID_FIELD);
}
}
}
arm9/src/hall_of_fame.c
+3 -3
View File
@@ -18,20 +18,20 @@ void Save_HOF_Init(struct HallOfFame * hof)
MI_CpuClear32(hof, sizeof(struct HallOfFame));
}
void Save_HOF_RecordParty(struct HallOfFame * hof, struct PlayerParty * party, RTCDate * date)
void Save_HOF_RecordParty(struct HallOfFame * hof, struct Party * party, RTCDate * date)
{
GF_ASSERT(hof != NULL);
GF_ASSERT(hof->next_record < NUM_HOF_RECORDS);
if (hof->num_total < 9999)
{
struct HOFParty * hof_party = &hof->parties[hof->next_record];
int nmons = GetPartyCount(party);
int nmons = Party_GetCount(party);
struct String * str = String_New(POKEMON_NAME_LENGTH + 1, HEAP_ID_DEFAULT);
MI_CpuClear16(hof_party->party, 6 * sizeof(struct HOFMon));
int i, j;
for (i = 0, j = 0; i < nmons; i++)
{
struct Pokemon * mon = GetPartyMonByIndex(party, i);
struct Pokemon * mon = Party_GetMonByIndex(party, i);
BOOL lock = AcquireMonLock(mon);
if (!GetMonData(mon, MON_DATA_IS_EGG, NULL))
{
arm9/src/mail.c
+4 -4
View File
@@ -52,7 +52,7 @@ void Mail_SetNewMessageDetails(struct Mail * mail, u8 type, u8 monIdx, struct Sa
u32 form;
BOOL is_egg;
u16 species;
struct PlayerParty * party;
struct Party * party;
PlayerProfile * profile;
struct Pokemon * pokemon;
u16 r7;
@@ -60,16 +60,16 @@ void Mail_SetNewMessageDetails(struct Mail * mail, u8 type, u8 monIdx, struct Sa
Mail_Init(mail);
mail->mail_type = type;
party = SaveArray_PlayerParty_Get(save);
party = SaveArray_Party_Get(save);
profile = Save_PlayerData_GetProfileAddr(save);
CopyU16StringArray(mail->author_name, PlayerProfile_GetNamePtr(profile));
mail->author_gender = (u8)PlayerProfile_GetTrainerGender(profile);
mail->author_otId = PlayerProfile_GetTrainerID(profile);
for (i = 0; monIdx < GetPartyCount(party); monIdx++)
for (i = 0; monIdx < Party_GetCount(party); monIdx++)
{
union MailPatternData * ptr;
pokemon = GetPartyMonByIndex(party, monIdx);
pokemon = Party_GetMonByIndex(party, monIdx);
species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, NULL);
is_egg = (BOOL)GetMonData(pokemon, MON_DATA_IS_EGG, NULL);
form = GetMonData(pokemon, MON_DATA_FORM, NULL);
arm9/src/message_format.c
+2 -2
View File
@@ -362,7 +362,7 @@ void BufferTrainerClassNameWithArticle(MessageFormat *messageFormat, u32 idx, u3
}
}
void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, struct TrainerDataLoaded * tr)
void BufferTrainerClassNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trainer * tr)
{
struct MsgData * msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0560_bin, messageFormat->heapId);
if (msgData != NULL)
@@ -384,7 +384,7 @@ void BufferTrainerName(MessageFormat *messageFormat, u32 idx, u32 msgno)
}
}
void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, struct TrainerDataLoaded * trdata)
void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trainer * trdata)
{
CopyU16ArrayToString(messageFormat->buffer, trdata->name);
SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL);
arm9/src/party.c
+19 -19
View File
@@ -2,38 +2,38 @@
#include "party.h"
#include "heap.h"
void SaveArray_Party_Init(struct PlayerParty * party);
void InitPartyWithMaxSize(struct PlayerParty * party, int count);
void SaveArray_Party_Init(struct Party * party);
void Party_InitWithMaxSize(struct Party * party, int count);
u32 SaveArray_Party_sizeof(void)
{
return sizeof(struct PlayerParty);
return sizeof(struct Party);
}
struct PlayerParty * SaveArray_Party_Alloc(HeapID heapId)
struct Party * SaveArray_Party_Alloc(HeapID heapId)
{
struct PlayerParty * ret = (struct PlayerParty *)AllocFromHeap(heapId, sizeof(struct PlayerParty));
struct Party * ret = (struct Party *)AllocFromHeap(heapId, sizeof(struct Party));
SaveArray_Party_Init(ret);
return ret;
}
void SaveArray_Party_Init(struct PlayerParty * party)
void SaveArray_Party_Init(struct Party * party)
{
InitPartyWithMaxSize(party, PARTY_SIZE);
Party_InitWithMaxSize(party, PARTY_SIZE);
}
void InitPartyWithMaxSize(struct PlayerParty * party, int count)
void Party_InitWithMaxSize(struct Party * party, int count)
{
int i;
GF_ASSERT(count <= PARTY_SIZE);
memset(party, 0, sizeof(struct PlayerParty));
memset(party, 0, sizeof(struct Party));
party->curCount = 0;
party->maxCount = count;
for (i = 0; i < PARTY_SIZE; i++)
ZeroMonData(&party->mons[i]);
}
BOOL AddMonToParty(struct PlayerParty * party, struct Pokemon * pokemon)
BOOL Party_AddMon(struct Party * party, struct Pokemon * pokemon)
{
if (party->curCount >= party->maxCount)
return FALSE;
@@ -42,7 +42,7 @@ BOOL AddMonToParty(struct PlayerParty * party, struct Pokemon * pokemon)
return TRUE;
}
BOOL RemoveMonFromParty(struct PlayerParty * party, int pos)
BOOL Party_RemoveMon(struct Party * party, int pos)
{
int i;
@@ -61,12 +61,12 @@ BOOL RemoveMonFromParty(struct PlayerParty * party, int pos)
return TRUE;
}
int GetPartyCount(struct PlayerParty * party)
int Party_GetCount(struct Party * party)
{
return party->curCount;
}
struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party, int pos)
struct Pokemon * Party_GetMonByIndex(struct Party * party, int pos)
{
GF_ASSERT(pos >= 0);
GF_ASSERT(pos < party->curCount);
@@ -74,7 +74,7 @@ struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party, int pos)
return &party->mons[pos];
}
void ReplacePartySlotWithMon(struct PlayerParty * party, int pos, struct Pokemon * pokemon)
void ReplacePartySlotWithMon(struct Party * party, int pos, struct Pokemon * pokemon)
{
int r2;
GF_ASSERT(pos >= 0);
@@ -85,7 +85,7 @@ void ReplacePartySlotWithMon(struct PlayerParty * party, int pos, struct Pokemon
party->curCount += r2;
}
BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2)
BOOL SwapSlotsInParty(struct Party * party, int pos1, int pos2)
{
struct Pokemon * buffer;
GF_ASSERT(pos1 >= 0);
@@ -102,12 +102,12 @@ BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2)
return FALSE;
}
void CopyPlayerParty(struct PlayerParty * src, struct PlayerParty * dest)
void CopyParty(struct Party * src, struct Party * dest)
{
*dest = *src;
}
BOOL PartyHasMon(struct PlayerParty * party, u16 species)
BOOL Party_HasMon(struct Party * party, u16 species)
{
int i;
for (i = 0; i < party->curCount; i++)
@@ -118,7 +118,7 @@ BOOL PartyHasMon(struct PlayerParty * party, u16 species)
return i != party->curCount;
}
struct PlayerParty * SaveArray_PlayerParty_Get(struct SaveData * ptr)
struct Party * SaveArray_Party_Get(struct SaveData * ptr)
{
return (struct PlayerParty *)SaveArray_Get(ptr, 2);
return (struct Party *)SaveArray_Get(ptr, 2);
}
arm9/src/pokemon.c
+20 -20
View File
@@ -39,7 +39,7 @@ void BoxMonSetMoveInSlot(struct BoxPokemon * boxmon, u16 move, u8 slot);
void sub_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2);
s8 BoxMonGetFlavorPreference(struct BoxPokemon * boxmon, int flavor);
s8 GetFlavorPreferenceFromPID(u32 personality, int flavor);
u8 Party_MaskMonsWithPokerus(struct PlayerParty * party_p, u8 mask);
u8 Party_MaskMonsWithPokerus(struct Party * party_p, u8 mask);
BOOL BoxMon_HasPokerus(struct BoxPokemon * boxmon);
BOOL BoxMon_IsImmuneToPokerus(struct BoxPokemon * boxmon);
void BoxMon_UpdateArceusForm(struct BoxPokemon * boxmon);
@@ -2498,7 +2498,7 @@ BOOL sub_020690E8(struct Pokemon * pokemon)
return FALSE;
}
u16 GetMonEvolution(struct PlayerParty * party, struct Pokemon * pokemon, u32 context, u32 usedItem, u32 * method_ret)
u16 GetMonEvolution(struct Party * party, struct Pokemon * pokemon, u32 context, u32 usedItem, u32 * method_ret)
{
u16 target = SPECIES_NONE;
u32 sp40;
@@ -2648,7 +2648,7 @@ u16 GetMonEvolution(struct PlayerParty * party, struct Pokemon * pokemon, u32 co
}
break;
case EVO_OTHER_PARTY_MON:
if (party != NULL && PartyHasMon(party, evoTable[i].param) == 1)
if (party != NULL && Party_HasMon(party, evoTable[i].param) == 1)
{
target = evoTable[i].target;
*method_ret = EVO_OTHER_PARTY_MON;
@@ -3009,15 +3009,15 @@ void CopyBoxPokemonToPokemon(struct BoxPokemon * src, struct Pokemon * dest)
CalcMonLevelAndStats(dest);
}
u8 Party_GetMaxLevel(struct PlayerParty * party)
u8 Party_GetMaxLevel(struct Party * party)
{
int i;
int r7 = GetPartyCount(party);
int r7 = Party_GetCount(party);
u8 ret = 1;
u8 level;
for (i = 0; i < r7; i++)
{
struct Pokemon * pokemon = GetPartyMonByIndex(party, i);
struct Pokemon * pokemon = Party_GetMonByIndex(party, i);
if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE
&& !GetMonData(pokemon, MON_DATA_IS_EGG, NULL))
{
@@ -3088,9 +3088,9 @@ int Species_LoadLearnsetTable(u16 species, u32 form, u16 * dest)
return i;
}
void Party_GivePokerusAtRandom(struct PlayerParty * party)
void Party_GivePokerusAtRandom(struct Party * party)
{
int count = GetPartyCount(party);
int count = Party_GetCount(party);
int idx;
struct Pokemon * pokemon;
u8 sp0;
@@ -3102,7 +3102,7 @@ void Party_GivePokerusAtRandom(struct PlayerParty * party)
do
{
idx = LCRandom() % count;
pokemon = GetPartyMonByIndex(party, idx);
pokemon = Party_GetMonByIndex(party, idx);
} while (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_NONE || GetMonData(pokemon, MON_DATA_IS_EGG, NULL));
if (!Party_MaskMonsWithPokerus(party, (u8)MaskOfFlagNo(idx)))
{
@@ -3120,7 +3120,7 @@ void Party_GivePokerusAtRandom(struct PlayerParty * party)
}
}
u8 Party_MaskMonsWithPokerus(struct PlayerParty * party, u8 mask)
u8 Party_MaskMonsWithPokerus(struct Party * party, u8 mask)
{
int i = 0;
u32 flag = 1;
@@ -3132,7 +3132,7 @@ u8 Party_MaskMonsWithPokerus(struct PlayerParty * party, u8 mask)
{
if (mask & 1)
{
pokemon = GetPartyMonByIndex(party, i);
pokemon = Party_GetMonByIndex(party, i);
if (GetMonData(pokemon, MON_DATA_POKERUS, NULL))
ret |= flag;
}
@@ -3144,22 +3144,22 @@ u8 Party_MaskMonsWithPokerus(struct PlayerParty * party, u8 mask)
}
else
{
pokemon = GetPartyMonByIndex(party, 0);
pokemon = Party_GetMonByIndex(party, 0);
if (GetMonData(pokemon, MON_DATA_POKERUS, NULL))
ret++;
}
return ret;
}
void Party_UpdatePokerus(struct PlayerParty * party, int r5)
void Party_UpdatePokerus(struct Party * party, int r5)
{
int i;
u8 pokerus;
struct Pokemon * pokemon;
int count = GetPartyCount(party);
int count = Party_GetCount(party);
for (i = 0; i < count; i++)
{
pokemon = GetPartyMonByIndex(party, i);
pokemon = Party_GetMonByIndex(party, i);
if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE)
{
pokerus = (u8)GetMonData(pokemon, MON_DATA_POKERUS, NULL);
@@ -3177,9 +3177,9 @@ void Party_UpdatePokerus(struct PlayerParty * party, int r5)
}
}
void Party_SpreadPokerus(struct PlayerParty * party)
void Party_SpreadPokerus(struct Party * party)
{
int count = GetPartyCount(party);
int count = Party_GetCount(party);
int i;
struct Pokemon * pokemon;
u8 pokerus;
@@ -3187,7 +3187,7 @@ void Party_SpreadPokerus(struct PlayerParty * party)
{
for (i = 0; i < count; i++)
{
pokemon = GetPartyMonByIndex(party, i);
pokemon = Party_GetMonByIndex(party, i);
if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE)
{
pokerus = (u8)GetMonData(pokemon, MON_DATA_POKERUS, NULL);
@@ -3195,13 +3195,13 @@ void Party_SpreadPokerus(struct PlayerParty * party)
{
if (i != 0)
{
pokemon = GetPartyMonByIndex(party, i - 1);
pokemon = Party_GetMonByIndex(party, i - 1);
if (!(GetMonData(pokemon, MON_DATA_POKERUS, NULL) & 0xF0))
SetMonData(pokemon, MON_DATA_POKERUS, &pokerus);
}
if (i < count - 1)
{
pokemon = GetPartyMonByIndex(party, i + 1);
pokemon = Party_GetMonByIndex(party, i + 1);
if (!(GetMonData(pokemon, MON_DATA_POKERUS, NULL) & 0xF0))
{
SetMonData(pokemon, MON_DATA_POKERUS, &pokerus);

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