pret/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-02 23:45:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #548 from red031000/master

Browse Source 
decompile map_object.c
This commit is contained in:
red031000
2024-07-22 11:55:35 +01:00
committed by GitHub
parent 9428132cb0 b6a56a75f3
commit 4ce19707ef
142 changed files with 5460 additions and 6155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arm9/arm9.lsf
+975 -974
View File
File diff suppressed because it is too large Load Diff
arm9/asm/map_object_s.s
+2319
View File
File diff suppressed because it is too large Load Diff
arm9/asm/scrcmd_7.s
+3 -3
View File
@@ -627,7 +627,7 @@ ScrCmd_Unk00F0: ; 0x02041BC4
bl FieldSysGetAttrAddr
add r5, r0, #0x0
ldr r0, [r5, #0x0]
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r4, r0, #0x0
ldr r0, [r5, #0x0]
bl MapObject_GetID
@@ -652,7 +652,7 @@ ScrCmd_Unk00F1: ; 0x02041BF0
bl ScriptReadWord
add r4, r0, #0x0
ldr r0, [r5, #0x0]
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r7, r0, #0x0
ldr r0, [r5, #0x0]
bl MapObject_GetID
@@ -660,7 +660,7 @@ ScrCmd_Unk00F1: ; 0x02041BF0
lsl r1, r1, #0x10
add r0, r7, #0x0
lsr r1, r1, #0x10
bl TrainerFlagCheck
bl TrainerFieldSystem_FlagCheck
cmp r0, #0x1
bne _02041C34
ldr r1, [r6, #0x8]
arm9/asm/unk_02012944.s
+1 -1
View File
@@ -184,7 +184,7 @@ _02012A4E:
ldr r0, _02012ABC ; =sub_02012BE4
ldr r2, [sp, #0x28]
add r1, r5, #0x0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02012AB0 ; =0x00000604
mov r2, #0x3
str r0, [r5, r1]
arm9/asm/unk_02014BF4.s
+1 -1
View File
@@ -224,7 +224,7 @@ _02014CC2:
ldr r1, [r5, #0x0]
ldr r0, _02014D78 ; =sub_02014DD8
add r1, r1, r4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [r5, #0x0]
add r1, r1, r4
str r0, [r1, #0x4]
arm9/asm/unk_02034A28.s
+1 -1
View File
@@ -104,7 +104,7 @@ _02034AD8:
ldr r1, [r1, #0x0]
ldr r3, [r3, #0x14]
add r2, r4, #0x0
bl sub_02057BAC
bl MapObject_CreateFromMultipleObjectEvents
_02034AEC:
pop {r3-r5, pc}
.balign 4
arm9/asm/unk_02034D7C.s
+8 -8
View File
@@ -163,25 +163,25 @@ Save_LocalFieldData_Get: ; 0x02034E30
nop
_02034E38: .word SaveArray_Get
thumb_func_start sub_02034E3C
sub_02034E3C: ; 0x02034E3C
thumb_func_start Save_MapObjects_Get
Save_MapObjects_Get: ; 0x02034E3C
ldr r3, _02034E44 ; =SaveArray_Get
mov r1, #0xb
bx r3
nop
_02034E44: .word SaveArray_Get
thumb_func_start sub_02034E48
sub_02034E48: ; 0x02034E48
thumb_func_start FieldSystem_SyncMapObjectsToSave
FieldSystem_SyncMapObjectsToSave: ; 0x02034E48
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl sub_02034E3C
bl Save_MapObjects_Get
add r2, r0, #0x0
ldr r1, [r4, #0x34]
add r0, r4, #0x0
mov r3, #0x40
bl sub_02057800
bl FieldSystem_SyncMapObjectsToSaveEx
pop {r4, pc}
thumb_func_start sub_02034E60
@@ -189,10 +189,10 @@ sub_02034E60: ; 0x02034E60
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl sub_02034E3C
bl Save_MapObjects_Get
add r1, r0, #0x0
ldr r0, [r4, #0x34]
mov r2, #0x40
bl sub_0205785C
bl MapObjectManager_RestoreFromSave
pop {r4, pc}
.balign 4
arm9/asm/unk_02037024.s
+2 -2
View File
@@ -166,7 +166,7 @@ _0203714A:
bl sub_02039694
add r1, r0, #0x0
add r0, r4, #0x0
bl FlagCheck
bl FieldSystem_FlagCheck
cmp r0, #0x1
beq _02037160
mov r0, #0x1
@@ -313,7 +313,7 @@ _02037244:
cmp r0, #0x1
bne _02037260
ldr r0, [r4, #0x0]
bl sub_02058458
bl MapObject_GetSpriteID
sub r0, #0x5b
cmp r0, #0x5
bhi _02037260
arm9/asm/unk_02038C78.s
+7 -7
View File
@@ -1982,8 +1982,8 @@ _020394FE:
pop {r4, pc}
.balign 4
thumb_func_start sub_02039504
sub_02039504: ; 0x02039504
thumb_func_start FieldSystem_VarGetObjectEventGraphicsId
FieldSystem_VarGetObjectEventGraphicsId: ; 0x02039504
push {r3-r5, lr}
add r4, r1, #0x0
add r5, r0, #0x0
@@ -2001,8 +2001,8 @@ _02039512:
nop
_02039524: .word 0x00004020
thumb_func_start FlagCheck
FlagCheck: ; 0x02039528
thumb_func_start FieldSystem_FlagCheck
FieldSystem_FlagCheck: ; 0x02039528
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
@@ -2152,8 +2152,8 @@ _0203963C:
mov r0, #0x0
pop {r3, pc}
thumb_func_start TrainerFlagCheck
TrainerFlagCheck: ; 0x02039640
thumb_func_start TrainerFieldSystem_FlagCheck
TrainerFieldSystem_FlagCheck: ; 0x02039640
push {r4, lr}
ldr r0, [r0, #0xc]
add r4, r1, #0x0
@@ -2385,7 +2385,7 @@ _020397EC:
bl sub_02039694
add r1, r0, #0x0
ldr r0, [sp, #0x0]
bl FlagCheck
bl FieldSystem_FlagCheck
cmp r0, #0x0
bne _0203984C
ldr r1, [r4, #0x4]
arm9/asm/unk_02048904.s
+4 -4
View File
@@ -265,7 +265,7 @@ sub_02048AE4: ; 0x02048AE4
add r5, r0, #0x0
mov r1, #0x40
mov r2, #0x5
bl sub_02057380
bl MapObjectManager_Init
str r0, [r5, #0x34]
ldr r0, [r5, #0xc]
bl Save_PlayerData_GetProfileAddr
@@ -301,9 +301,9 @@ sub_02048B34: ; 0x02048B34
ldr r0, [r4, #0x38]
bl sub_02055160
ldr r0, [r4, #0x34]
bl sub_0205771C
bl MapObjectManager_RemoveAllActiveObjects
ldr r0, [r4, #0x34]
bl sub_020573AC
bl MapObjectManager_Delete
pop {r4, pc}
thumb_func_start sub_02048B50
@@ -312,7 +312,7 @@ sub_02048B50: ; 0x02048B50
add r5, r0, #0x0
mov r1, #0x40
mov r2, #0x5
bl sub_02057380
bl MapObjectManager_Init
str r0, [r5, #0x34]
add r0, r5, #0x0
bl sub_02034E60
arm9/asm/unk_0204B34C.s
+16 -16
View File
@@ -210,14 +210,14 @@ sub_0204B490: ; 0x0204B490
add r1, sp, #0x0
add r2, sp, #0x4
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x1
bne _0204B4F8
mov r6, #0x0
mov r7, #0x1
_0204B4B6:
ldr r0, [sp, #0x0]
bl sub_02058458
bl MapObject_GetSpriteID
bl sub_0205C334
cmp r0, #0x1
bne _0204B4E8
@@ -230,7 +230,7 @@ _0204B4B6:
beq _0204B4E8
ldr r0, [sp, #0x0]
add r1, r6, #0x0
bl sub_02058510
bl MapObject_GetParam
add r1, r0, #0x0
add r0, r4, #0x0
add r2, r7, #0x0
@@ -240,7 +240,7 @@ _0204B4E8:
add r1, sp, #0x0
add r2, sp, #0x4
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x1
beq _0204B4B6
_0204B4F8:
@@ -258,7 +258,7 @@ sub_0204B4FC: ; 0x0204B4FC
add r4, r0, #0x0
add r0, r7, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
str r0, [sp, #0x0]
ldr r1, [sp, #0x0]
add r0, r4, #0x0
@@ -312,7 +312,7 @@ sub_0204B57C: ; 0x0204B57C
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_0204B37C
@@ -334,7 +334,7 @@ sub_0204B5A8: ; 0x0204B5A8
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_0204B35C
@@ -357,7 +357,7 @@ sub_0204B5DC: ; 0x0204B5DC
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_020252AC
@@ -373,7 +373,7 @@ sub_0204B5FC: ; 0x0204B5FC
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02025238
@@ -389,7 +389,7 @@ sub_0204B61C: ; 0x0204B61C
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02025244
@@ -405,7 +405,7 @@ sub_0204B63C: ; 0x0204B63C
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02025244
@@ -422,7 +422,7 @@ sub_0204B660: ; 0x0204B660
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_020252D0
@@ -439,7 +439,7 @@ sub_0204B684: ; 0x0204B684
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_0202524C
@@ -455,7 +455,7 @@ sub_0204B6A4: ; 0x0204B6A4
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_020252E8
@@ -470,7 +470,7 @@ sub_0204B6C4: ; 0x0204B6C4
ldr r4, _0204B708 ; =0x00000000
beq _0204B6D8
add r0, r5, #0x0
bl sub_02058458
bl MapObject_GetSpriteID
cmp r0, #0x64
beq _0204B6DC
_0204B6D8:
@@ -615,7 +615,7 @@ _0204B7CC:
thumb_func_start sub_0204B7D8
sub_0204B7D8: ; 0x0204B7D8
push {r3, lr}
bl sub_02058458
bl MapObject_GetSpriteID
cmp r0, #0x64
bne _0204B7E6
mov r0, #0x1
arm9/asm/unk_0204CB20.s
+14 -14
View File
@@ -169,7 +169,7 @@ _0204CB7A:
ldr r0, _0204CC44 ; =sub_0204D4F0
mov r1, #0x0
mov r2, #0xc8
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0204CC34 ; =UNK_021C5A68
ldr r1, [r1, #0x0]
str r0, [r1, #0x50]
@@ -510,7 +510,7 @@ _0204CDFA:
ldr r0, _0204CEF4 ; =sub_0204D4F0
mov r1, #0x0
mov r2, #0xc8
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0204CED4 ; =UNK_021C5A68
ldr r1, [r1, #0x0]
str r0, [r1, #0x50]
@@ -1101,10 +1101,10 @@ sub_0204D328: ; 0x0204D328
ldr r0, [r0, #0x54]
add r1, r5, r1
ldr r0, [r0, #0x34]
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
cmp r0, #0x0
beq _0204D37C
bl sub_02057654
bl MapObject_Remove
_0204D37C:
ldr r0, _0204D430 ; =UNK_021C5A68
lsl r4, r5, #0x3
@@ -1140,7 +1140,7 @@ _0204D3B2:
mov r1, #0x1
lsl r1, r1, #0x8
add r1, r5, r1
bl sub_02058444
bl MapObject_SetID
ldr r0, _0204D430 ; =UNK_021C5A68
ldr r1, [r0, #0x0]
ldr r0, _0204D438 ; =0x000002BE
@@ -2412,7 +2412,7 @@ _0204DD5E:
beq _0204DDB4
add r0, r4, #0x0
mov r1, #0x80
bl sub_02058418
bl MapObject_ClearFlagsBits
ldr r0, _0204DE28 ; =UNK_021C5A68
ldr r0, [r0, #0x0]
add r1, r0, r5
@@ -2427,7 +2427,7 @@ _0204DD5E:
bl sub_02055304
add r0, r4, #0x0
mov r1, #0x80
bl sub_02058410
bl MapObject_SetFlagsBits
_0204DDB4:
add r0, r4, #0x0
bl sub_0205AE28
@@ -3018,11 +3018,11 @@ sub_0204E214: ; 0x0204E214
bl PlayerAvatar_GetMapObject
mov r1, #0x80
add r6, r0, #0x0
bl sub_02058410
bl MapObject_SetFlagsBits
mov r1, #0x1
add r0, r6, #0x0
lsl r1, r1, #0x8
bl sub_02058410
bl MapObject_SetFlagsBits
ldr r0, _0204E24C ; =UNK_021C5A68
ldr r0, [r0, #0x0]
add r1, r0, r5
@@ -3057,11 +3057,11 @@ sub_0204E254: ; 0x0204E254
bl sub_0205AE50
add r0, r5, #0x0
mov r1, #0x80
bl sub_02058418
bl MapObject_ClearFlagsBits
mov r1, #0x1
add r0, r5, #0x0
lsl r1, r1, #0x8
bl sub_02058418
bl MapObject_ClearFlagsBits
ldr r0, _0204E2A0 ; =UNK_021C5A68
mov r2, #0x0
ldr r0, [r0, #0x0]
@@ -5074,7 +5074,7 @@ sub_0204F178: ; 0x0204F178
strb r2, [r0, #0x0]
ldr r0, _0204F1AC ; =sub_0204F124
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r0, r4, #0x0
mov r1, #0x0
bl sub_0204EAD8
@@ -5967,10 +5967,10 @@ _0204F89E:
ldrsb r1, [r1, r2]
str r1, [sp, #0x4]
ldr r1, [sp, #0x8]
bl sub_02058B30
bl MapObject_SetCurrentX
ldr r0, [sp, #0xc]
add r1, r7, #0x0
bl sub_02058B50
bl MapObject_SetCurrentY
ldr r0, [sp, #0x4]
ldr r1, [sp, #0x8]
str r0, [sp, #0x0]
arm9/asm/unk_0204FBA8.s
+1 -1
View File
@@ -77,7 +77,7 @@ sub_0204FBB0: ; 0x0204FBB0
strh r1, [r0, #0x3c]
ldr r0, _0204FC0C ; =sub_0205006C
mov r1, #0x0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0204FC08 ; =UNK_021C5A6C
ldr r2, [r1, #0x0]
str r0, [r2, #0x38]
arm9/asm/unk_020520AC.s
+1 -1
View File
@@ -200,7 +200,7 @@ _0205211E:
ldr r0, _02052174 ; =sub_02052308
add r1, r4, #0x0
mov r2, #0xa
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0xc]
str r5, [r4, #0x0]
str r6, [r4, #0x4]
arm9/asm/unk_02052EE8.s
+12 -12
View File
@@ -31,7 +31,7 @@ sub_02052EE8: ; 0x02052EE8
ldr r0, _02052F5C ; =sub_02052FC8
add r1, r4, #0x0
mov r2, #0xb
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x4]
add r0, r5, #0x0
bl sub_020524BC
@@ -423,7 +423,7 @@ sub_020531E4: ; 0x020531E4
_02053206:
ldr r0, [sp, #0x4]
add r1, r7, #0x1
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r5, r0, #0x0
bne _02053216
bl GF_AssertFail
@@ -490,10 +490,10 @@ _02053272:
bl sub_02058E90
add r0, r5, #0x0
mov r1, #0x1
bl sub_02058534
bl MapObject_SetXRange
add r0, r5, #0x0
mov r1, #0x1
bl sub_0205853C
bl MapObject_SetYRange
mov r0, #0x1
strb r0, [r4, #0x15]
_020532A8:
@@ -630,13 +630,13 @@ sub_0205339C: ; 0x0205339C
add r0, r4, #0x0
str r2, [sp, #0x4]
str r3, [sp, #0x8]
bl sub_02058AFC
bl MapObject_GetInitialX
add r7, r0, #0x0
add r0, r4, #0x0
bl sub_02058B04
bl MapObject_GetInitialHeight
str r0, [sp, #0xc]
add r0, r4, #0x0
bl sub_02058B0C
bl MapObject_GetInitialY
add r6, r0, #0x0
ldr r0, [sp, #0x4]
cmp r7, r0
@@ -662,7 +662,7 @@ _020533CC:
bl sub_02058E28
add r0, r4, #0x0
mov r1, #0x1
bl sub_020584A4
bl MapObject_SetFacingDirectionDirect
add r0, r4, #0x0
mov r1, #0x44
bl sub_0205ADDC
@@ -758,7 +758,7 @@ sub_020534A0: ; 0x020534A0
_020534AC:
add r0, r7, #0x0
add r1, r5, #0x0
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r4, r0, #0x0
bne _020534BC
bl GF_AssertFail
@@ -784,7 +784,7 @@ sub_020534DC: ; 0x020534DC
add r5, r1, #0x0
mov r1, #0x0
add r7, r0, #0x0
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r4, r0, #0x0
bne _020534F0
bl GF_AssertFail
@@ -808,7 +808,7 @@ _0205350E:
bne _02053578
add r0, r7, #0x0
add r1, r6, #0x1
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r4, r0, #0x0
bne _02053524
bl GF_AssertFail
@@ -818,7 +818,7 @@ _02053524:
bl sub_02057634
add r0, r4, #0x0
mov r1, #0x1
bl sub_020584A4
bl MapObject_SetFacingDirectionDirect
add r0, r4, #0x0
mov r1, #0x44
bl sub_0205ADDC
arm9/asm/unk_02055068.s
+29 -29
View File
@@ -56,15 +56,15 @@ sub_020550A4: ; 0x020550A4
bl PlayerAvatar_GetSpriteByStateAndGender
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02058454
bl MapObject_SetSpriteID
mov r1, #0x9
add r0, r4, #0x0
lsl r1, r1, #0xa
bl sub_02058410
bl MapObject_SetFlagsBits
mov r1, #0x6
add r0, r4, #0x0
lsl r1, r1, #0x6
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r4, #0x0
mov r1, #0x1
bl sub_02058AC8
@@ -85,7 +85,7 @@ sub_02055108: ; 0x02055108
bl GF_AssertFail
_02055118:
add r0, r4, #0x0
bl sub_02058578
bl MapObject_GetManager
add r0, r5, #0x0
bl ov05_021EDBC8
add r0, r5, #0x0
@@ -126,7 +126,7 @@ sub_02055168: ; 0x02055168
push {r4, lr}
add r4, r0, #0x0
bl PlayerAvatar_GetMapObject
bl sub_02057654
bl MapObject_Remove
add r0, r4, #0x0
bl sub_02055160
pop {r4, pc}
@@ -205,51 +205,51 @@ sub_02055208: ; 0x02055208
add r0, r1, #0x0
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x1c]
bl sub_0205753C
bl MapObject_Create
add r5, r0, #0x0
bne _02055228
bl GF_AssertFail
_02055228:
add r0, r5, #0x0
mov r1, #0xff
bl sub_02058444
bl MapObject_SetID
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058484
bl MapObject_SetType
add r0, r5, #0x0
mov r1, #0x0
bl sub_0205848C
bl MapObject_SetFlagID
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058494
bl MapObject_SetScript
mov r1, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
bl sub_020584EC
bl MapObject_SetParam
add r0, r5, #0x0
mov r1, #0x0
mov r2, #0x1
bl sub_020584EC
bl MapObject_SetParam
add r0, r5, #0x0
mov r1, #0x0
mov r2, #0x2
bl sub_020584EC
bl MapObject_SetParam
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
bl sub_02058534
bl MapObject_SetXRange
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
bl sub_0205853C
bl MapObject_SetYRange
mov r1, #0x9
add r0, r5, #0x0
lsl r1, r1, #0xa
bl sub_02058410
bl MapObject_SetFlagsBits
mov r1, #0x6
add r0, r5, #0x0
lsl r1, r1, #0x6
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r5, #0x0
mov r1, #0x1
bl sub_02058AC8
@@ -271,7 +271,7 @@ sub_020552A4: ; 0x020552A4
add r2, sp, #0x4
mov r3, #0x1
add r5, r0, #0x0
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x0
beq _020552DE
add r4, sp, #0x0
@@ -279,14 +279,14 @@ sub_020552A4: ; 0x020552A4
mov r7, #0x1
_020552C4:
ldr r0, [sp, #0x0]
bl sub_02058480
bl MapObject_GetMovement
cmp r0, #0x1
beq _020552DE
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
add r3, r7, #0x0
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x0
bne _020552C4
_020552DE:
@@ -310,7 +310,7 @@ _020552F2:
PlayerAvatar_GetFacingDirection: ; 0x020552F8
push {r3, lr}
bl PlayerAvatar_GetMapObject
bl sub_020584C4
bl MapObject_GetFacingDirection
pop {r3, pc}
thumb_func_start sub_02055304
@@ -326,21 +326,21 @@ sub_02055304: ; 0x02055304
sub_02055314: ; 0x02055314
push {r3, lr}
bl PlayerAvatar_GetMapObject
bl sub_020584D4
bl MapObject_GetNextFacingDirection
pop {r3, pc}
thumb_func_start GetPlayerXCoord
GetPlayerXCoord: ; 0x02055320
push {r3, lr}
bl PlayerAvatar_GetMapObject
bl sub_02058B2C
bl MapObject_GetCurrentX
pop {r3, pc}
thumb_func_start GetPlayerYCoord
GetPlayerYCoord: ; 0x0205532C
push {r3, lr}
bl PlayerAvatar_GetMapObject
bl sub_02058B4C
bl MapObject_GetCurrentY
pop {r3, pc}
thumb_func_start sub_02055338
@@ -363,7 +363,7 @@ sub_02055350: ; 0x02055350
add r4, r1, #0x0
bl PlayerAvatar_GetMapObject
add r1, r4, #0x0
bl sub_02058B5C
bl MapObject_GetPositionVec
pop {r4, pc}
thumb_func_start sub_02055360
@@ -402,12 +402,12 @@ sub_0205537C: ; 0x0205537C
bne _02055392
mov r1, #0x2
lsl r1, r1, #0x8
bl sub_02058418
bl MapObject_ClearFlagsBits
pop {r4, pc}
_02055392:
mov r1, #0x2
lsl r1, r1, #0x8
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r4, pc}
thumb_func_start sub_0205539C
@@ -738,11 +738,11 @@ sub_02055540: ; 0x02055540
bl PlayerAvatar_GetMapObject
add r4, r0, #0x0
add r1, sp, #0x0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r4, #0x0
add r1, sp, #0x0
str r5, [sp, #0x4]
bl sub_02058B6C
bl MapObject_SetPositionVec
add sp, #0xc
pop {r4-r5, pc}
arm9/asm/unk_020557F4.s
+58 -58
View File
@@ -479,7 +479,7 @@ sub_02055B8C: ; 0x02055B8C
add r0, r4, #0x0
bl sub_02059C60
add r0, r4, #0x0
bl sub_0205AE80
bl MapObject_ClearHeldMovement
add r0, r5, #0x0
mov r1, #0x0
bl sub_0205AFDC
@@ -584,7 +584,7 @@ sub_02055C78: ; 0x02055C78
add r5, r0, #0x0
bl PlayerAvatar_GetMapObject
add r4, r0, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -629,7 +629,7 @@ _02055CE4:
mov r1, #0x6
add r0, r4, #0x0
lsl r1, r1, #0x6
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r6, #0x0
mov r1, #0x8
bl sub_0205AFDC
@@ -676,7 +676,7 @@ _02055D54:
mov r1, #0x6
add r0, r4, #0x0
lsl r1, r1, #0x6
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r6, #0x0
mov r1, #0x8
bl sub_0205AFDC
@@ -700,7 +700,7 @@ _02055D8E:
mov r1, #0x6
add r0, r4, #0x0
lsl r1, r1, #0x6
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
add r1, r6, #0x0
bl sub_020560D0
@@ -718,7 +718,7 @@ sub_02055DAC: ; 0x02055DAC
add r7, r1, #0x0
bl PlayerAvatar_GetMapObject
add r6, r0, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
add r4, r0, #0x0
ldr r0, _02055EF4 ; =0x00000654
bl PlaySE
@@ -762,7 +762,7 @@ _02055E18:
mov r1, #0x6
add r0, r6, #0x0
lsl r1, r1, #0x6
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r4, #0x0
mov r1, #0x8
bl sub_0205AFDC
@@ -824,7 +824,7 @@ _02055EAC:
mov r1, #0x6
add r0, r6, #0x0
lsl r1, r1, #0x6
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r4, #0x0
mov r1, #0x8
bl sub_0205AFDC
@@ -860,7 +860,7 @@ sub_02055EF8: ; 0x02055EF8
add r5, r0, #0x0
bl PlayerAvatar_GetMapObject
add r4, r0, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
add r0, r5, #0x0
bl sub_020554BC
cmp r0, #0x1
@@ -895,7 +895,7 @@ sub_02055F44: ; 0x02055F44
add r5, r0, #0x0
bl PlayerAvatar_GetMapObject
add r4, r0, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
add r0, r5, #0x0
bl sub_020554BC
cmp r0, #0x1
@@ -982,7 +982,7 @@ sub_02055FFC: ; 0x02055FFC
bl PlayerAvatar_GetMapObject
mov r1, #0x6
lsl r1, r1, #0x6
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r4, #0x0
bl sub_020557E8
cmp r0, #0x0
@@ -1009,11 +1009,11 @@ sub_02056040: ; 0x02056040
add r5, r1, #0x0
bl PlayerAvatar_GetMapObject
add r4, r0, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r6, r0, #0x0
add r0, r4, #0x0
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
add r4, sp, #0xc
add r3, sp, #0x0
ldmia r4!, {r0-r1}
@@ -1319,7 +1319,7 @@ sub_02056288: ; 0x02056288
add r4, r1, #0x0
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r1, #0x0
bl sub_0205AFDC
add r2, r0, #0x0
@@ -1358,7 +1358,7 @@ _020562CA:
_020562DC:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
b _0205636C
_020562E6:
add r0, r5, #0x0
@@ -1419,7 +1419,7 @@ _02056356:
_02056364:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
_0205636C:
ldr r0, [sp, #0x0]
add r1, r7, #0x0
@@ -1447,7 +1447,7 @@ sub_02056384: ; 0x02056384
bl sub_02056B5C
add r0, r4, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
pop {r4-r6, pc}
thumb_func_start sub_020563A8
@@ -1766,7 +1766,7 @@ sub_020565F0: ; 0x020565F0
add r4, r1, #0x0
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r1, #0x0
bl sub_0205AFDC
add r2, r0, #0x0
@@ -1813,11 +1813,11 @@ _02056656:
beq _02056680
add r0, r6, #0x0
mov r7, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
str r0, [sp, #0x0]
ldr r1, [sp, #0x0]
add r0, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
sub r1, r7, #0x1
@@ -1843,18 +1843,18 @@ _02056680:
_020566A0:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
b _020566EA
_020566B0:
add r0, r6, #0x0
mov r7, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
str r0, [sp, #0x0]
ldr r1, [sp, #0x0]
add r0, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
sub r1, r7, #0x1
@@ -1905,7 +1905,7 @@ sub_02056704: ; 0x02056704
bl sub_02056B5C
add r0, r4, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
_0205673E:
@@ -1963,7 +1963,7 @@ _0205678C:
_020567AA:
add r0, r7, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
b _020567C4
@@ -2158,7 +2158,7 @@ sub_02056914: ; 0x02056914
add r4, r1, #0x0
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r1, #0x0
bl sub_0205AFDC
add r2, r0, #0x0
@@ -2222,7 +2222,7 @@ _02056994:
_020569AA:
add r0, r6, #0x0
add r1, r7, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
b _02056A6C
@@ -2231,14 +2231,14 @@ _020569BA:
tst r0, r4
beq _020569EC
add r0, r6, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
add r4, r0, #0x0
mov r1, #0x0
bl sub_0205AFDC
str r0, [sp, #0x0]
add r0, r6, #0x0
add r1, r4, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
mov r1, #0x0
@@ -2268,20 +2268,20 @@ _020569EC:
_02056A14:
add r0, r6, #0x0
add r1, r7, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
b _02056A6C
_02056A24:
add r0, r6, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
add r4, r0, #0x0
mov r1, #0x0
bl sub_0205AFDC
str r0, [sp, #0x0]
add r0, r6, #0x0
add r1, r4, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
mov r1, #0x0
@@ -2332,7 +2332,7 @@ sub_02056A7C: ; 0x02056A7C
bl sub_02056B5C
add r0, r4, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
_02056AB6:
@@ -2390,7 +2390,7 @@ _02056B04:
_02056B22:
add r0, r7, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_02055410
b _02056B3C
@@ -2515,23 +2515,23 @@ sub_02056C0C: ; 0x02056C0C
add r5, r1, #0x0
str r2, [sp, #0x4]
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r7, r0, #0x0
ldr r0, [sp, #0x4]
bl sub_02059BF4
str r0, [sp, #0x14]
add r0, r5, #0x0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
str r0, [sp, #0x8]
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0xc]
ldr r0, [sp, #0x4]
bl sub_02059C00
str r0, [sp, #0x10]
add r0, r5, #0x0
add r1, sp, #0x1c
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r1, [sp, #0x14]
ldr r6, [sp, #0xc]
ldr r3, [sp, #0x10]
@@ -2547,7 +2547,7 @@ sub_02056C0C: ; 0x02056C0C
orr r4, r0
_02056C60:
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
ldr r2, [sp, #0x14]
add r1, sp, #0x18
str r1, [sp, #0x0]
@@ -2610,16 +2610,16 @@ sub_02056CCC: ; 0x02056CCC
cmp r4, r0
beq _02056D54
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_02059BF4
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_02059C00
@@ -2679,13 +2679,13 @@ sub_02056D58: ; 0x02056D58
cmp r4, r0
beq _02056E00
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x0]
ldr r2, [sp, #0x0]
add r0, r7, #0x0
@@ -2763,16 +2763,16 @@ sub_02056E04: ; 0x02056E04
cmp r5, r0
beq _02056E68
add r0, r4, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x0]
add r0, r4, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02059BF4
add r7, r0, #0x0
add r0, r4, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02059C00
@@ -2813,16 +2813,16 @@ sub_02056E6C: ; 0x02056E6C
cmp r4, r0
beq _02056EC2
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_02059BF4
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x4]
add r0, r4, #0x0
bl sub_02059C00
@@ -2857,16 +2857,16 @@ sub_02056EC8: ; 0x02056EC8
cmp r4, r0
beq _02056F72
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x4]
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_02059BF4
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x8]
add r0, r4, #0x0
bl sub_02059C00
@@ -2945,16 +2945,16 @@ sub_02056F78: ; 0x02056F78
cmp r0, #0x1
bne _0205701A
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_02059BF4
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x4]
add r0, r4, #0x0
bl sub_02059C00
@@ -3404,7 +3404,7 @@ sub_020572B8: ; 0x020572B8
sub_020572D4: ; 0x020572D4
push {r3, lr}
bl PlayerAvatar_GetMapObject
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
ldr r0, [r0, #0xc]
bl Save_GameStats_Get
mov r1, #0x5
arm9/asm/unk_02057380.s
-4000
View File
File diff suppressed because it is too large Load Diff
arm9/asm/unk_02058EE8.s
+76 -76
View File
@@ -1212,7 +1212,7 @@ sub_02058EF8: ; 0x02058EF8
bl sub_02058FD0
add r0, r4, #0x0
mov r1, #0x10
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _02058F2C
add r0, r4, #0x0
@@ -1255,14 +1255,14 @@ _02058F70:
mov r1, #0x6
add r0, r4, #0x0
lsl r1, r1, #0xa
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
bne _02058F82
mov r0, #0x1
pop {r4, pc}
_02058F82:
add r0, r4, #0x0
bl sub_02058480
bl MapObject_GetMovement
cmp r0, #0x32
bne _02058F90
mov r0, #0x1
@@ -1277,7 +1277,7 @@ sub_02058F94: ; 0x02058F94
mov r1, #0x1
lsl r1, r1, #0xc
add r4, r0, #0x0
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _02058FAA
add r0, r4, #0x0
@@ -1291,7 +1291,7 @@ sub_02058FAC: ; 0x02058FAC
mov r1, #0x2
lsl r1, r1, #0xa
add r4, r0, #0x0
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _02058FCC
add r0, r4, #0x0
@@ -1309,7 +1309,7 @@ sub_02058FD0: ; 0x02058FD0
push {r4, lr}
mov r1, #0x4
add r4, r0, #0x0
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _02058FE4
add r0, r4, #0x0
@@ -1317,7 +1317,7 @@ sub_02058FD0: ; 0x02058FD0
_02058FE4:
ldr r1, _02058FF0 ; =0x00010004
add r0, r4, #0x0
bl sub_02058418
bl MapObject_ClearFlagsBits
pop {r4, pc}
nop
_02058FF0: .word 0x00010004
@@ -1328,7 +1328,7 @@ sub_02058FF4: ; 0x02058FF4
mov r1, #0x1
lsl r1, r1, #0x10
add r4, r0, #0x0
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _0205900C
add r0, r4, #0x0
@@ -1337,7 +1337,7 @@ sub_02058FF4: ; 0x02058FF4
_0205900C:
add r0, r4, #0x0
mov r1, #0x4
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _0205901E
add r0, r4, #0x0
@@ -1345,7 +1345,7 @@ _0205900C:
_0205901E:
ldr r1, _02059028 ; =0x00010004
add r0, r4, #0x0
bl sub_02058418
bl MapObject_ClearFlagsBits
pop {r4, pc}
.balign 4
_02059028: .word 0x00010004
@@ -1356,7 +1356,7 @@ sub_0205902C: ; 0x0205902C
mov r1, #0x2
lsl r1, r1, #0x10
add r4, r0, #0x0
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _02059044
add r0, r4, #0x0
@@ -1365,7 +1365,7 @@ sub_0205902C: ; 0x0205902C
_02059044:
add r0, r4, #0x0
mov r1, #0x8
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _02059056
add r0, r4, #0x0
@@ -1373,7 +1373,7 @@ _02059044:
_02059056:
ldr r1, _02059060 ; =0x00020008
add r0, r4, #0x0
bl sub_02058418
bl MapObject_ClearFlagsBits
pop {r4, pc}
.balign 4
_02059060: .word 0x00020008
@@ -1934,7 +1934,7 @@ sub_02059508: ; 0x02059508
add r5, r0, #0x0
add r4, r1, #0x0
add r6, r3, #0x0
bl sub_02058578
bl MapObject_GetManager
bl sub_0205881C
cmp r0, #0x0
beq _020595A2
@@ -1980,13 +1980,13 @@ _02059578:
mov r1, #0x1
add r0, r5, #0x0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r4-r6, pc}
_02059584:
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0xe
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
bne _020595A2
add r0, r5, #0x0
@@ -1994,7 +1994,7 @@ _02059584:
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0xe
bl sub_02058410
bl MapObject_SetFlagsBits
_020595A2:
pop {r4-r6, pc}
@@ -2004,7 +2004,7 @@ sub_020595A4: ; 0x020595A4
add r5, r0, #0x0
add r4, r1, #0x0
add r6, r3, #0x0
bl sub_02058578
bl MapObject_GetManager
bl sub_0205881C
cmp r0, #0x0
beq _0205962A
@@ -2050,13 +2050,13 @@ _02059614:
mov r1, #0x1
add r0, r5, #0x0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r4-r6, pc}
_02059620:
mov r1, #0x1
add r0, r5, #0x0
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
_0205962A:
pop {r4-r6, pc}
@@ -2185,13 +2185,13 @@ sub_0205970C: ; 0x0205970C
cmp r0, #0x1
bne _0205973C
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r3, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -2235,13 +2235,13 @@ sub_02059774: ; 0x02059774
cmp r0, #0x1
bne _020597A4
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r3, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -2374,7 +2374,7 @@ sub_02059874: ; 0x02059874
orr r4, r0
_02059896:
add r0, r6, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r1, sp, #0xc
str r1, [sp, #0x0]
ldr r1, [sp, #0x4]
@@ -2427,7 +2427,7 @@ sub_020598F0: ; 0x020598F0
add r5, r0, #0x0
add r7, r2, #0x0
add r4, r3, #0x0
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r0, [sp, #0x28]
str r4, [sp, #0x0]
str r0, [sp, #0x4]
@@ -2445,16 +2445,16 @@ sub_02059918: ; 0x02059918
sub sp, #0xc
add r4, r1, #0x0
add r5, r0, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_02059BF4
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
str r0, [sp, #0x4]
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x8]
add r0, r4, #0x0
bl sub_02059C00
@@ -2478,12 +2478,12 @@ sub_0205995C: ; 0x0205995C
add r5, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
bl sub_02058578
bl MapObject_GetManager
add r7, r0, #0x0
bl sub_020583BC
str r0, [sp, #0x8]
add r0, r7, #0x0
bl sub_02058368
bl MapObjectManager_GetObjectCount
str r0, [sp, #0x4]
_0205997C:
ldr r0, [sp, #0x8]
@@ -2491,26 +2491,26 @@ _0205997C:
cmp r0, r1
beq _020599F4
mov r1, #0x1
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _020599F4
mov r1, #0x1
ldr r0, [sp, #0x8]
lsl r1, r1, #0x12
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
bne _020599F4
ldr r0, [sp, #0x8]
bl sub_02058B2C
bl MapObject_GetCurrentX
add r7, r0, #0x0
ldr r0, [sp, #0x8]
bl sub_02058B4C
bl MapObject_GetCurrentY
cmp r7, r5
bne _020599C8
cmp r0, r6
bne _020599C8
ldr r0, [sp, #0x8]
bl sub_02058B3C
bl MapObject_GetCurrentHeight
sub r0, r0, r4
bpl _020599BE
neg r0, r0
@@ -2531,7 +2531,7 @@ _020599C8:
cmp r0, r6
bne _020599F4
ldr r0, [sp, #0x8]
bl sub_02058B3C
bl MapObject_GetCurrentHeight
sub r0, r0, r4
bpl _020599EA
neg r0, r0
@@ -2558,10 +2558,10 @@ sub_02059A08: ; 0x02059A08
add r6, r0, #0x0
add r5, r1, #0x0
add r4, r3, #0x0
bl sub_02058AFC
bl MapObject_GetInitialX
add r7, r0, #0x0
add r0, r6, #0x0
bl sub_02058538
bl MapObject_GetXRange
mov r1, #0x0
mvn r1, r1
cmp r0, r1
@@ -2577,10 +2577,10 @@ _02059A30:
pop {r3-r7, pc}
_02059A34:
add r0, r6, #0x0
bl sub_02058B0C
bl MapObject_GetInitialY
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_02058540
bl MapObject_GetYRange
mov r1, #0x0
mvn r1, r1
cmp r0, r1
@@ -2606,7 +2606,7 @@ sub_02059A60: ; 0x02059A60
add r6, r1, #0x0
add r7, r2, #0x0
add r5, r3, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x0]
add r0, r4, #0x0
bl sub_02058720
@@ -2839,20 +2839,20 @@ sub_02059C0C: ; 0x02059C0C
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r1, r0, #0x0
add r0, r5, #0x0
bl sub_02058B18
bl MapObject_SetPreviousX
add r0, r5, #0x0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
add r1, r0, #0x0
add r0, r5, #0x0
bl sub_02058B20
bl MapObject_SetPreviousHeight
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r1, r0, #0x0
add r0, r5, #0x0
bl sub_02058B28
bl MapObject_SetPreviousY
add r0, r4, #0x0
bl sub_02059BF4
add r1, r0, #0x0
@@ -2872,20 +2872,20 @@ sub_02059C0C: ; 0x02059C0C
sub_02059C60: ; 0x02059C60
push {r4, lr}
add r4, r0, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02058B18
bl MapObject_SetPreviousX
add r0, r4, #0x0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02058B20
bl MapObject_SetPreviousHeight
add r0, r4, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r1, r0, #0x0
add r0, r4, #0x0
bl sub_02058B28
bl MapObject_SetPreviousY
pop {r4, pc}
.balign 4
@@ -2894,19 +2894,19 @@ sub_02059C90: ; 0x02059C90
push {r3-r7, lr}
add r5, r1, #0x0
add r4, r0, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02059BF4
add r7, r0, #0x0
add r0, r4, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_02059C00
add r5, r0, #0x0
add r0, r4, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
ldr r2, [sp, #0x0]
add r1, r6, r7
add r2, r2, r5
@@ -2922,7 +2922,7 @@ sub_02059CC8: ; 0x02059CC8
add r1, sp, #0x0
add r6, r0, #0x0
add r4, r2, #0x0
bl sub_02058B5C
bl MapObject_GetPositionVec
cmp r5, #0x3
bhi _02059D0E
add r0, r5, r5
@@ -2958,7 +2958,7 @@ _02059D08:
_02059D0E:
add r0, r6, #0x0
add r1, sp, #0x0
bl sub_02058B6C
bl MapObject_SetPositionVec
add sp, #0xc
pop {r3-r6, pc}
.balign 4
@@ -2969,7 +2969,7 @@ sub_02059D1C: ; 0x02059D1C
sub sp, #0x18
add r1, sp, #0xc
add r5, r0, #0x0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r3, sp, #0xc
ldmia r3!, {r0-r1}
add r2, sp, #0x0
@@ -2983,16 +2983,16 @@ sub_02059D1C: ; 0x02059D1C
mov r1, #0x1
add r0, r5, #0x0
lsl r1, r1, #0xc
bl sub_02058418
bl MapObject_ClearFlagsBits
add sp, #0x18
mov r0, #0x0
pop {r3-r5, pc}
_02059D4E:
add r0, r5, #0x0
bl sub_02058AE4
bl MapObject_CheckFlag29
add r4, r0, #0x0
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r1, sp, #0x0
add r2, r4, #0x0
bl sub_02059EC8
@@ -3003,12 +3003,12 @@ _02059D4E:
add r1, sp, #0xc
str r0, [sp, #0x10]
add r0, r5, #0x0
bl sub_02058B6C
bl MapObject_SetPositionVec
add r0, r5, #0x0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
add r1, r0, #0x0
add r0, r5, #0x0
bl sub_02058B20
bl MapObject_SetPreviousHeight
ldr r1, [sp, #0x10]
add r0, r5, #0x0
asr r2, r1, #0x3
@@ -3016,17 +3016,17 @@ _02059D4E:
lsr r1, r1, #0x14
add r1, r2, r1
asr r1, r1, #0xc
bl sub_02058B40
bl MapObject_SetCurrentHeight
mov r1, #0x1
add r0, r5, #0x0
lsl r1, r1, #0xc
bl sub_02058418
bl MapObject_ClearFlagsBits
b _02059DAC
_02059DA2:
mov r1, #0x1
add r0, r5, #0x0
lsl r1, r1, #0xc
bl sub_02058410
bl MapObject_SetFlagsBits
_02059DAC:
add r0, r4, #0x0
add sp, #0x18
@@ -3043,7 +3043,7 @@ sub_02059DB4: ; 0x02059DB4
bl sub_02058B24
add r6, r0, #0x0
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r1, r4, #0x0
add r2, r6, #0x0
add r7, r0, #0x0
@@ -3052,10 +3052,10 @@ sub_02059DB4: ; 0x02059DB4
add r0, r5, #0x0
bl sub_02058728
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r2, r0, #0x0
add r0, r7, #0x0
add r1, r4, #0x0
@@ -3071,14 +3071,14 @@ sub_02059DB4: ; 0x02059DB4
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0xa
bl sub_02058410
bl MapObject_SetFlagsBits
mov r0, #0x0
pop {r3-r7, pc}
_02059E18:
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0xa
bl sub_02058418
bl MapObject_ClearFlagsBits
mov r0, #0x1
pop {r3-r7, pc}
.balign 4
arm9/asm/unk_02059F04.s
+48 -48
View File
@@ -258,7 +258,7 @@ _0205A0A0:
add r0, r5, #0x0
bl sub_0205886C
add r0, r5, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r1, #0x0
bl sub_0205AFDC
add r1, r0, #0x0
@@ -357,19 +357,19 @@ sub_0205A174: ; 0x0205A174
sub sp, #0x8
str r0, [sp, #0x0]
add r4, r1, #0x0
bl sub_02058AFC
bl MapObject_GetInitialX
add r6, r0, #0x0
ldr r0, [sp, #0x0]
bl sub_02058B0C
bl MapObject_GetInitialY
add r5, r0, #0x0
ldr r0, [sp, #0x0]
bl sub_02058538
bl MapObject_GetXRange
add r7, r0, #0x0
ldr r0, [sp, #0x0]
bl sub_02058540
bl MapObject_GetYRange
str r0, [sp, #0x4]
ldr r0, [sp, #0x0]
bl sub_02058480
bl MapObject_GetMovement
cmp r0, #0xd
bhi _0205A268
add r0, r0, r0
@@ -493,13 +493,13 @@ sub_0205A270: ; 0x0205A270
add r1, sp, #0x0
bl sub_0205A174
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_02059BF4
add r4, r4, r0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r5, r0, #0x0
add r0, r6, #0x0
bl sub_02059C00
@@ -667,7 +667,7 @@ sub_0205A3A0: ; 0x0205A3A0
cmp r0, r1
bne _0205A3BE
add r0, r5, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
_0205A3BE:
mov r1, #0x0
bl sub_0205AFDC
@@ -761,7 +761,7 @@ sub_0205A42C: ; 0x0205A42C
add r5, r2, #0x0
_0205A462:
add r0, r7, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r4, #0x0
ldr r2, [r5, #0x0]
sub r1, r4, #0x1
@@ -843,7 +843,7 @@ sub_0205A4F4: ; 0x0205A4F4
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r1, #0x0
bl sub_0205AFDC
add r1, r0, #0x0
@@ -918,7 +918,7 @@ sub_0205A548: ; 0x0205A548
add r5, r4, #0x0
_0205A57E:
add r0, r7, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r4, #0x0
ldr r2, [r5, #0x0]
sub r1, r4, #0x1
@@ -958,10 +958,10 @@ _0205A5C2:
add r0, r7, #0x0
bl sub_020584AC
add r0, r7, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
add r4, r0, #0x0
add r0, r7, #0x0
bl sub_020584A0
bl MapObject_GetInitialFacingDirection
cmp r4, r0
bne _0205A5E8
mov r0, #0x0
@@ -1021,7 +1021,7 @@ sub_0205A640: ; 0x0205A640
push {r4-r6, lr}
add r5, r0, #0x0
add r4, r1, #0x0
bl sub_020584A0
bl MapObject_GetInitialFacingDirection
mov r1, #0x2
ldrsh r1, [r4, r1]
add r6, r0, #0x0
@@ -1032,7 +1032,7 @@ sub_0205A640: ; 0x0205A640
_0205A65A:
add r0, r5, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_0205ACE0
cmp r0, #0x0
@@ -1055,28 +1055,28 @@ sub_0205A67C: ; 0x0205A67C
add r5, r0, #0x0
cmp r1, #0x0
beq _0205A6DA
bl sub_02058AFC
bl MapObject_GetInitialX
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B0C
bl MapObject_GetInitialY
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
ldr r1, [sp, #0x0]
cmp r6, r1
bne _0205A6DA
cmp r7, r0
bne _0205A6DA
add r0, r5, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
bl sub_02059E74
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_0205ACE0
cmp r0, #0x0
@@ -1089,7 +1089,7 @@ _0205A6D6:
strh r0, [r4, #0x2]
_0205A6DA:
add r0, r5, #0x0
bl sub_020584D4
bl MapObject_GetNextFacingDirection
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -1458,10 +1458,10 @@ sub_0205A940: ; 0x0205A940
ldrsh r1, [r4, r1]
cmp r1, #0x0
bne _0205A974
bl sub_02058AFC
bl MapObject_GetInitialX
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
cmp r6, r0
bne _0205A98C
mov r0, #0x2
@@ -1470,10 +1470,10 @@ sub_0205A940: ; 0x0205A940
strh r0, [r4, #0x2]
b _0205A98C
_0205A974:
bl sub_02058B0C
bl MapObject_GetInitialY
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
cmp r6, r0
bne _0205A98C
mov r0, #0x2
@@ -1486,16 +1486,16 @@ _0205A98C:
cmp r0, #0x3
bne _0205A9C0
add r0, r5, #0x0
bl sub_02058AFC
bl MapObject_GetInitialX
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B0C
bl MapObject_GetInitialY
add r7, r0, #0x0
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
ldr r1, [sp, #0x0]
cmp r6, r1
bne _0205A9C0
@@ -1513,7 +1513,7 @@ _0205A9C0:
ldr r6, [r7, r0]
add r0, r5, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_0205ACE0
cmp r0, #0x0
@@ -1537,7 +1537,7 @@ _0205A9EA:
ldr r6, [r7, r0]
add r0, r5, #0x0
add r1, r6, #0x0
bl sub_020584CC
bl MapObject_SetNextFacingDirection
add r0, r5, #0x0
bl sub_0205ACE0
cmp r0, #0x0
@@ -1684,7 +1684,7 @@ _0205AB1C: .word UNK_020F69BC
sub_0205AB20: ; 0x0205AB20
push {r3-r7, lr}
add r5, r0, #0x0
bl sub_02058488
bl MapObject_GetType
cmp r0, #0x1
beq _0205AB36
cmp r0, #0x2
@@ -1694,7 +1694,7 @@ sub_0205AB20: ; 0x0205AB20
pop {r3-r7, pc}
_0205AB36:
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
bl sub_02055698
add r6, r0, #0x0
bl sub_02057124
@@ -1706,7 +1706,7 @@ _0205AB36:
_0205AB50:
add r0, r5, #0x0
mov r4, #0x0
bl sub_02058480
bl MapObject_GetMovement
ldr r1, _0205ABE8 ; =UNK_020F6984
_0205AB5A:
lsl r2, r4, #0x2
@@ -1743,13 +1743,13 @@ _0205AB8E:
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r3, r0, #0x0
ldr r0, [sp, #0x0]
ldr r5, [sp, #0x0]
@@ -1817,13 +1817,13 @@ _0205AC22:
mvn r7, r7
ldr r0, [sp, #0x0]
add r6, r7, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #0x8]
ldr r0, [sp, #0x0]
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x4]
ldr r0, [sp, #0x0]
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
bl sub_02055698
str r0, [sp, #0xc]
bl GetPlayerXCoord
@@ -1913,7 +1913,7 @@ _0205ACDA:
thumb_func_start sub_0205ACE0
sub_0205ACE0: ; 0x0205ACE0
push {r3, lr}
bl sub_02058488
bl MapObject_GetType
sub r0, r0, #0x7
cmp r0, #0x1
bhi _0205ACF0
@@ -1927,7 +1927,7 @@ _0205ACF0:
sub_0205ACF4: ; 0x0205ACF4
push {r4, lr}
add r4, r1, #0x0
bl sub_02058488
bl MapObject_GetType
cmp r0, #0x7
bne _0205AD06
mov r0, #0x0
@@ -1943,7 +1943,7 @@ sub_0205AD0C: ; 0x0205AD0C
push {r3-r7, lr}
add r7, r0, #0x0
add r5, r1, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r4, #0x0
add r6, r0, #0x0
add r1, r4, #0x0
@@ -1984,7 +1984,7 @@ _0205AD3E:
ldr r4, [r1, r0]
add r0, r7, #0x0
mov r1, #0x80
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
beq _0205AD6C
mov r0, #0x1
@@ -1998,7 +1998,7 @@ _0205AD6E:
bl sub_020584AC
add r0, r7, #0x0
mov r1, #0x80
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r3-r7, pc}
nop
_0205AD84: .word UNK_020F6964
@@ -2010,6 +2010,6 @@ sub_0205AD88: ; 0x0205AD88
cmp r1, #0x0
bne _0205AD96
mov r1, #0x80
bl sub_02058418
bl MapObject_ClearFlagsBits
_0205AD96:
pop {r3, pc}
arm9/asm/unk_0205AD98.s
+39 -39
View File
@@ -16,7 +16,7 @@ sub_0205AD98: ; 0x0205AD98
push {r4, lr}
mov r1, #0x1
add r4, r0, #0x0
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x0
bne _0205ADAA
mov r0, #0x0
@@ -24,7 +24,7 @@ sub_0205AD98: ; 0x0205AD98
_0205ADAA:
add r0, r4, #0x0
mov r1, #0x2
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x1
bne _0205ADBA
mov r0, #0x0
@@ -32,12 +32,12 @@ _0205ADAA:
_0205ADBA:
add r0, r4, #0x0
mov r1, #0x10
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x1
bne _0205ADD6
add r0, r4, #0x0
mov r1, #0x20
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x0
bne _0205ADD6
mov r0, #0x0
@@ -64,10 +64,10 @@ _0205ADEA:
bl sub_020586F8
add r0, r5, #0x0
mov r1, #0x10
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
mov r1, #0x20
bl sub_02058418
bl MapObject_ClearFlagsBits
pop {r3-r5, pc}
thumb_func_start sub_0205AE0C
@@ -80,7 +80,7 @@ sub_0205AE0C: ; 0x0205AE0C
bl sub_020586F8
add r0, r4, #0x0
mov r1, #0x20
bl sub_02058418
bl MapObject_ClearFlagsBits
pop {r4, pc}
.balign 4
@@ -89,7 +89,7 @@ sub_0205AE28: ; 0x0205AE28
push {r4, lr}
mov r1, #0x10
add r4, r0, #0x0
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x0
bne _0205AE3A
mov r0, #0x1
@@ -97,7 +97,7 @@ sub_0205AE28: ; 0x0205AE28
_0205AE3A:
add r0, r4, #0x0
mov r1, #0x20
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x0
beq _0205AE4A
mov r0, #0x1
@@ -112,7 +112,7 @@ sub_0205AE50: ; 0x0205AE50
push {r4, lr}
mov r1, #0x10
add r4, r0, #0x0
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x0
bne _0205AE62
mov r0, #0x1
@@ -120,7 +120,7 @@ sub_0205AE50: ; 0x0205AE50
_0205AE62:
add r0, r4, #0x0
mov r1, #0x20
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x0
bne _0205AE72
mov r0, #0x0
@@ -128,20 +128,20 @@ _0205AE62:
_0205AE72:
add r0, r4, #0x0
mov r1, #0x30
bl sub_02058418
bl MapObject_ClearFlagsBits
mov r0, #0x1
pop {r4, pc}
.balign 4
thumb_func_start sub_0205AE80
sub_0205AE80: ; 0x0205AE80
thumb_func_start MapObject_ClearHeldMovement
MapObject_ClearHeldMovement: ; 0x0205AE80
push {r4, lr}
add r4, r0, #0x0
mov r1, #0x10
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r4, #0x0
mov r1, #0x20
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r4, #0x0
mov r1, #0xff
bl sub_020586E8
@@ -171,12 +171,12 @@ _0205AEC0:
sub r1, r1, #0x1
bne _0205AEC0
add r0, r5, #0x0
bl sub_02058578
bl sub_0205839C
bl MapObject_GetManager
bl MapObjectManager_GetPriority
sub r2, r0, #0x1
ldr r0, _0205AEEC ; =sub_0205AF2C
add r1, r4, #0x0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r7, r0, #0x0
bne _0205AEE4
bl GF_AssertFail
@@ -431,7 +431,7 @@ sub_0205B080: ; 0x0205B080
bl sub_0205B058
add r0, r4, #0x0
mov r1, #0x20
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0x0
bne _0205B098
mov r0, #0x0
@@ -439,7 +439,7 @@ sub_0205B080: ; 0x0205B080
_0205B098:
add r0, r4, #0x0
mov r1, #0x20
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r4, #0x0
mov r1, #0xff
bl sub_020586E8
@@ -466,7 +466,7 @@ _0205B0C4: .word UNK_020F6440
sub_0205B0C8: ; 0x0205B0C8
push {r3, lr}
mov r1, #0x20
bl sub_02058410
bl MapObject_SetFlagsBits
mov r0, #0x0
pop {r3, pc}
@@ -544,7 +544,7 @@ sub_0205B124: ; 0x0205B124
bl sub_02058544
add r0, r5, #0x0
mov r1, #0x4
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
bl sub_02058700
pop {r3-r7, pc}
@@ -574,7 +574,7 @@ sub_0205B16C: ; 0x0205B16C
_0205B198:
add r0, r5, #0x0
mov r1, #0x28
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
bl sub_02059C60
add r0, r5, #0x0
@@ -977,7 +977,7 @@ sub_0205B43C: ; 0x0205B43C
_0205B456:
add r0, r4, #0x0
mov r1, #0x20
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r4, #0x0
mov r1, #0x0
bl sub_02058544
@@ -1218,7 +1218,7 @@ _0205B5E2:
_0205B5EA:
ldr r1, _0205B614 ; =0x00010004
add r0, r5, #0x0
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
add r1, r4, #0x0
bl sub_020584D8
@@ -1264,7 +1264,7 @@ sub_0205B61C: ; 0x0205B61C
bl sub_02059C0C
add r0, r5, #0x0
mov r1, #0x4
bl sub_02058410
bl MapObject_SetFlagsBits
_0205B65E:
ldr r1, [r4, #0x0]
cmp r1, #0x0
@@ -1323,7 +1323,7 @@ _0205B6B8:
bl sub_02058B94
ldr r1, _0205B6FC ; =0x00020028
add r0, r5, #0x0
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
bl sub_02059C60
add r0, r5, #0x0
@@ -1922,7 +1922,7 @@ sub_0205BB08: ; 0x0205BB08
mov r1, #0x2
add r4, r0, #0x0
lsl r1, r1, #0x8
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r4, #0x0
bl sub_02058700
mov r0, #0x1
@@ -1935,7 +1935,7 @@ sub_0205BB20: ; 0x0205BB20
mov r1, #0x2
add r4, r0, #0x0
lsl r1, r1, #0x8
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r4, #0x0
bl sub_02058700
mov r0, #0x1
@@ -1947,7 +1947,7 @@ sub_0205BB38: ; 0x0205BB38
push {r4, lr}
add r4, r0, #0x0
mov r1, #0x80
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r4, #0x0
bl sub_02058700
mov r0, #0x1
@@ -1958,7 +1958,7 @@ sub_0205BB4C: ; 0x0205BB4C
push {r4, lr}
add r4, r0, #0x0
mov r1, #0x80
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r4, #0x0
bl sub_02058700
mov r0, #0x1
@@ -1970,7 +1970,7 @@ sub_0205BB60: ; 0x0205BB60
mov r1, #0x1
add r4, r0, #0x0
lsl r1, r1, #0x8
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r4, #0x0
bl sub_02058700
mov r0, #0x1
@@ -1983,7 +1983,7 @@ sub_0205BB78: ; 0x0205BB78
mov r1, #0x1
add r4, r0, #0x0
lsl r1, r1, #0x8
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r4, #0x0
bl sub_02058700
mov r0, #0x1
@@ -2067,7 +2067,7 @@ sub_0205BBF4: ; 0x0205BBF4
bl sub_02058544
add r0, r5, #0x0
mov r1, #0x4
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
bl sub_02058700
pop {r3-r7, pc}
@@ -2104,7 +2104,7 @@ sub_0205BC34: ; 0x0205BC34
_0205BC6E:
add r0, r5, #0x0
mov r1, #0x28
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
bl sub_02059C60
add r0, r5, #0x0
@@ -2342,11 +2342,11 @@ _0205BDFE:
bl ov06_0224D2E0
ldr r1, _0205BE34 ; =0x00010004
add r0, r4, #0x0
bl sub_02058410
bl MapObject_SetFlagsBits
mov r1, #0x1
add r0, r4, #0x0
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r4, #0x0
bl sub_02058700
mov r0, #0x0
@@ -2391,7 +2391,7 @@ _0205BE70:
bl sub_02058B94
ldr r1, _0205BE9C ; =0x00020028
add r0, r5, #0x0
bl sub_02058410
bl MapObject_SetFlagsBits
add r0, r5, #0x0
bl sub_0205EB2C
add r0, r5, #0x0
arm9/asm/unk_0205BEF8.s
+12 -12
View File
@@ -68,7 +68,7 @@ _0205BF1E:
sub_0205BF24: ; 0x0205BF24
push {r4, lr}
add r4, r0, #0x0
bl sub_02058488
bl MapObject_GetType
add r1, r0, #0x0
lsl r2, r1, #0x2
ldr r1, _0205BF3C ; =UNK_020F7118
@@ -83,7 +83,7 @@ _0205BF3C: .word UNK_020F7118
sub_0205BF40: ; 0x0205BF40
push {r4, lr}
add r4, r0, #0x0
bl sub_02058488
bl MapObject_GetType
add r1, r0, #0x0
lsl r2, r1, #0x2
ldr r1, _0205BF58 ; =UNK_020F7148
@@ -98,7 +98,7 @@ _0205BF58: .word UNK_020F7148
sub_0205BF5C: ; 0x0205BF5C
push {r4, lr}
add r4, r0, #0x0
bl sub_02058488
bl MapObject_GetType
add r1, r0, #0x0
lsl r2, r1, #0x2
ldr r1, _0205BF74 ; =UNK_020F7178
@@ -113,7 +113,7 @@ _0205BF74: .word UNK_020F7178
sub_0205BF78: ; 0x0205BF78
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_02058B14
@@ -123,7 +123,7 @@ sub_0205BF78: ; 0x0205BF78
pop {r3-r5, pc}
_0205BF90:
add r0, r4, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_02058B24
@@ -140,7 +140,7 @@ _0205BFA6:
sub_0205BFAC: ; 0x0205BFAC
push {r3-r5, lr}
add r4, r0, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_02058B14
@@ -150,7 +150,7 @@ sub_0205BFAC: ; 0x0205BFAC
pop {r3-r5, pc}
_0205BFC4:
add r0, r4, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_02058B24
@@ -187,7 +187,7 @@ sub_0205BFEC: ; 0x0205BFEC
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x1
bl sub_02058510
bl MapObject_GetParam
strb r0, [r4, #0x3]
pop {r3-r5, pc}
@@ -288,7 +288,7 @@ _0205C0A6:
ldmia r3!, {r0-r1}
stmia r2!, {r0-r1}
add r0, r5, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
strb r0, [r4, #0x4]
lsl r1, r0, #0x2
add r0, sp, #0x10
@@ -391,10 +391,10 @@ sub_0205C16C: ; 0x0205C16C
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x1
bl sub_02058510
bl MapObject_GetParam
strb r0, [r4, #0x3]
add r0, r5, #0x0
bl sub_02058488
bl MapObject_GetType
cmp r0, #0x5
beq _0205C190
mov r0, #0x1
@@ -508,7 +508,7 @@ _0205C248: ; jump table (using 16-bit offset)
.short _0205C2D2 - _0205C248 - 2; case 3
_0205C250:
add r0, r7, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r5, #0x0
add r6, r0, #0x0
add r1, r5, #0x0
arm9/asm/unk_0205C334.s
+6 -6
View File
@@ -66,7 +66,7 @@ sub_0205C390: ; 0x0205C390
bl sub_020585B0
add r4, r0, #0x0
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r1, r5, #0x0
bl sub_0204B5FC
strh r0, [r4, #0x0]
@@ -104,7 +104,7 @@ sub_0205C3D0: ; 0x0205C3D0
bl sub_02058628
add r4, r0, #0x0
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r1, r5, #0x0
bl sub_0204B5FC
add r6, r0, #0x0
@@ -121,7 +121,7 @@ sub_0205C3D0: ; 0x0205C3D0
add r1, #0x8
bl ov05_021F2094
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r1, r5, #0x0
bl sub_0204B61C
add r1, r6, #0x0
@@ -215,7 +215,7 @@ _0205C4C0:
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r3-r5, pc}
thumb_func_start sub_0205C4D8
@@ -244,7 +244,7 @@ _0205C506:
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
_0205C510:
add r0, r5, #0x0
bl ov06_0224A310
@@ -261,7 +261,7 @@ _0205C516:
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
_0205C536:
pop {r3-r5, pc}
.balign 4
arm9/asm/unk_0205C598.s
+30 -30
View File
@@ -175,7 +175,7 @@ sub_0205C6BC: ; 0x0205C6BC
add r1, sp, #0x4
add r2, sp, #0xc
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x0
beq _0205C734
_0205C6DE:
@@ -200,7 +200,7 @@ _0205C6E8:
lsl r1, r1, #0x10
add r0, r6, #0x0
lsr r1, r1, #0x10
bl TrainerFlagCheck
bl TrainerFieldSystem_FlagCheck
cmp r0, #0x0
bne _0205C724
ldr r0, [sp, #0x28]
@@ -216,7 +216,7 @@ _0205C724:
add r1, sp, #0x4
add r2, sp, #0xc
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x0
bne _0205C6DE
_0205C734:
@@ -233,7 +233,7 @@ sub_0205C73C: ; 0x0205C73C
str r2, [r5, #0x0]
str r3, [r5, #0x4]
add r0, r4, #0x0
bl sub_02058498
bl MapObject_GetScript
str r0, [r5, #0x8]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
@@ -250,7 +250,7 @@ sub_0205C73C: ; 0x0205C73C
thumb_func_start sub_0205C768
sub_0205C768: ; 0x0205C768
push {r3, lr}
bl sub_02058488
bl MapObject_GetType
cmp r0, #0x8
bhi _0205C792
add r1, r0, r0
@@ -291,11 +291,11 @@ sub_0205C794: ; 0x0205C794
bl GetPlayerYCoord
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_020584C4
bl MapObject_GetFacingDirection
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
add r2, r0, #0x0
str r6, [sp, #0x0]
mov r0, #0x0
@@ -336,7 +336,7 @@ _0205C802:
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl sub_02058510
bl MapObject_GetParam
str r0, [sp, #0xc]
mov r4, #0x0
_0205C822:
@@ -402,11 +402,11 @@ sub_0205C888: ; 0x0205C888
add r5, r1, #0x0
add r6, r2, #0x0
add r4, r3, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
cmp r0, r6
bne _0205C8AE
add r0, r7, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
cmp r4, r0
bge _0205C8AE
sub r1, r0, r5
@@ -426,11 +426,11 @@ sub_0205C8B4: ; 0x0205C8B4
add r5, r1, #0x0
add r6, r2, #0x0
add r4, r3, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
cmp r0, r6
bne _0205C8DA
add r0, r7, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
cmp r4, r0
ble _0205C8DA
add r1, r0, r5
@@ -450,11 +450,11 @@ sub_0205C8E0: ; 0x0205C8E0
add r5, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
cmp r0, r6
bne _0205C906
add r0, r7, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
cmp r4, r0
bge _0205C906
sub r1, r0, r5
@@ -474,11 +474,11 @@ sub_0205C90C: ; 0x0205C90C
add r5, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
cmp r0, r6
bne _0205C932
add r0, r7, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
cmp r4, r0
ble _0205C932
add r1, r0, r5
@@ -504,13 +504,13 @@ sub_0205C938: ; 0x0205C938
mov r0, #0x1
pop {r3-r7, pc}
_0205C94C:
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0x0
ldr r0, [sp, #0x4]
bl sub_02058B4C
bl MapObject_GetCurrentY
add r7, r0, #0x0
ldr r0, [sp, #0x4]
bl sub_02058B3C
bl MapObject_GetCurrentHeight
str r0, [sp, #0xc]
add r0, r5, #0x0
bl sub_02059BF4
@@ -573,7 +573,7 @@ _0205C9D0:
thumb_func_start sub_0205C9D8
sub_0205C9D8: ; 0x0205C9D8
push {r3, lr}
bl sub_02058498
bl MapObject_GetScript
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl sub_020395F4
@@ -599,7 +599,7 @@ sub_0205C9F0: ; 0x0205C9F0
add r1, sp, #0x0
add r2, sp, #0x4
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x0
beq _0205CA40
add r7, sp, #0x0
@@ -623,7 +623,7 @@ _0205CA30:
add r1, r7, #0x0
add r2, sp, #0x4
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x0
bne _0205CA10
_0205CA40:
@@ -698,7 +698,7 @@ _0205CA9A:
str r5, [r4, #0x24]
ldr r0, _0205CAD0 ; =sub_0205CAF8
str r6, [r4, #0x28]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r4, r0, #0x0
bne _0205CACC
bl GF_AssertFail
@@ -778,7 +778,7 @@ _0205CB44:
bl ov05_021F1EC0
add r0, r5, #0x0
mov r1, #0x40
bl sub_02058410
bl MapObject_SetFlagsBits
mov r0, #0x2
str r0, [r4, #0x0]
mov r0, #0x1
@@ -797,7 +797,7 @@ sub_0205CB5C: ; 0x0205CB5C
pop {r4, pc}
_0205CB72:
ldr r0, [r4, #0x24]
bl sub_02058480
bl MapObject_GetMovement
sub r0, #0x33
cmp r0, #0x3
bhi _0205CB9A
@@ -1024,16 +1024,16 @@ sub_0205CCEC: ; 0x0205CCEC
ldr r0, [r5, #0x28]
bl PlayerAvatar_GetMapObject
add r4, r0, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0x0
add r0, r4, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r7, r0, #0x0
ldr r0, [r5, #0x24]
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #0x0]
ldr r0, [r5, #0x24]
bl sub_02058B4C
bl MapObject_GetCurrentY
add r3, r0, #0x0
ldr r2, [sp, #0x0]
add r0, r6, #0x0
@@ -1057,7 +1057,7 @@ _0205CD38:
bne _0205CD64
add r0, r4, #0x0
mov r1, #0x80
bl sub_02058418
bl MapObject_ClearFlagsBits
add r0, r6, #0x0
mov r1, #0x0
bl sub_0205AFDC
arm9/asm/unk_0205E4EC.s
+25 -25
View File
@@ -132,7 +132,7 @@ sub_0205E5B4: ; 0x0205E5B4
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
bl sub_02058578
bl MapObject_GetManager
bl sub_020552A4
cmp r0, #0x0
bne _0205E5CC
@@ -155,7 +155,7 @@ _0205E5DA:
sub_0205E5E0: ; 0x0205E5E0
push {r3-r5, lr}
add r5, r1, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
bl sub_02055698
mov r1, #0x1
add r4, r0, #0x0
@@ -174,7 +174,7 @@ sub_0205E5E0: ; 0x0205E5E0
sub_0205E608: ; 0x0205E608
push {r4-r6, lr}
add r5, r1, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
bl sub_02055698
add r6, r0, #0x0
beq _0205E638
@@ -201,7 +201,7 @@ _0205E638:
sub_0205E63C: ; 0x0205E63C
push {r3-r5, lr}
add r5, r1, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
bl sub_02055698
add r4, r0, #0x0
bl GetPlayerXCoord
@@ -215,7 +215,7 @@ sub_0205E63C: ; 0x0205E63C
thumb_func_start sub_0205E65C
sub_0205E65C: ; 0x0205E65C
push {r3, lr}
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
bl sub_02055698
bl sub_02055464
add r1, r0, #0x0
@@ -253,14 +253,14 @@ sub_0205E698: ; 0x0205E698
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
bl sub_02055698
add r4, r0, #0x0
add r0, r5, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #0x0]
add r0, r5, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r7, r0, #0x0
add r0, r4, #0x0
bl sub_02055338
@@ -407,7 +407,7 @@ sub_0205E7C4: ; 0x0205E7C4
mov r1, #0x0
add r4, r0, #0x0
str r1, [sp, #0x8]
bl sub_02058488
bl MapObject_GetType
str r0, [sp, #0x0]
add r0, r4, #0x0
bl sub_02058450
@@ -416,7 +416,7 @@ sub_0205E7C4: ; 0x0205E7C4
bl sub_0205C9E8
add r5, r0, #0x0
add r0, r4, #0x0
bl sub_02058578
bl MapObject_GetManager
ldr r1, [sp, #0x0]
add r7, r0, #0x0
cmp r1, #0x8
@@ -441,7 +441,7 @@ _0205E810:
add r1, sp, #0x4
add r2, sp, #0x8
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x1
bne _0205E84C
_0205E81E:
@@ -463,7 +463,7 @@ _0205E83C:
add r1, sp, #0x4
add r2, sp, #0x8
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x1
beq _0205E81E
_0205E84C:
@@ -478,7 +478,7 @@ sub_0205E854: ; 0x0205E854
sub sp, #0xc
add r5, r0, #0x0
str r1, [sp, #0x0]
bl sub_02058578
bl MapObject_GetManager
add r4, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x8]
@@ -492,7 +492,7 @@ sub_0205E854: ; 0x0205E854
add r1, sp, #0x4
add r2, sp, #0x8
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x1
bne _0205E8C6
_0205E886:
@@ -523,7 +523,7 @@ _0205E8B6:
add r1, sp, #0x4
add r2, sp, #0x8
mov r3, #0x1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #0x1
beq _0205E886
_0205E8C6:
@@ -541,10 +541,10 @@ sub_0205E8D0: ; 0x0205E8D0
add r4, r2, #0x0
strb r0, [r5, #0x1]
add r0, r4, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
strh r0, [r5, #0x2]
add r0, r4, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
strh r0, [r5, #0x4]
mov r0, #0xff
strh r0, [r5, #0x6]
@@ -557,10 +557,10 @@ sub_0205E8F4: ; 0x0205E8F4
push {r3-r7, lr}
add r6, r0, #0x0
ldr r5, [r1, #0x8]
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r6, r0, #0x0
add r0, r5, #0x0
bl sub_02058B14
@@ -579,7 +579,7 @@ _0205E91E:
mov r1, #0x61
add r0, r5, #0x0
lsl r1, r1, #0x6
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0x0
bne _0205E93A
_0205E936:
@@ -596,16 +596,16 @@ sub_0205E940: ; 0x0205E940
sub sp, #0xc
str r0, [sp, #0x0]
add r5, r1, #0x0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0x0
ldr r0, [sp, #0x0]
bl sub_02058B4C
bl MapObject_GetCurrentY
add r6, r0, #0x0
ldr r0, [r5, #0x8]
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #0x8]
ldr r0, [r5, #0x8]
bl sub_02058B4C
bl MapObject_GetCurrentY
add r7, r0, #0x0
ldr r0, [r5, #0x8]
bl sub_02058B14
@@ -670,7 +670,7 @@ sub_0205E9C8: ; 0x0205E9C8
mov r1, #0x1
add r0, r4, #0x0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
ldr r5, _0205EA0C ; =UNK_020F7398
add r3, sp, #0x0
ldmia r5!, {r0-r1}
arm9/asm/unk_0205F7A0.s
+2 -2
View File
@@ -251,7 +251,7 @@ _0205F962:
_0205F98C:
ldrb r1, [r6, #0x1]
add r0, r7, #0x0
bl FlagCheck
bl FieldSystem_FlagCheck
lsl r0, r0, #0x18
lsr r0, r0, #0x18
lsl r0, r0, #0x1e
@@ -298,7 +298,7 @@ _0205F9BE:
_0205F9E8:
ldrb r1, [r6, #0x3]
add r0, r7, #0x0
bl FlagCheck
bl FieldSystem_FlagCheck
lsl r0, r0, #0x18
lsr r0, r0, #0x18
lsl r0, r0, #0x1e
arm9/asm/unk_02063948.s
+1 -1
View File
@@ -57,7 +57,7 @@ sub_02063964: ; 0x02063964
ldr r0, [sp, #0x8]
cmp r0, #0x0
beq _020639B6
bl sub_02058458
bl MapObject_GetSpriteID
cmp r0, #0x54
beq _0206399A
cmp r0, #0x55
arm9/asm/unk_020643C0.s
+1 -1
View File
@@ -251,7 +251,7 @@ sub_020645B0: ; 0x020645B0
add r2, r1, #0x0
ldr r0, _020645CC ; =sub_020645D0
add r1, r3, #0x0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r4, r0, #0x0
bne _020645C6
bl GF_AssertFail
arm9/asm/unk_020653EC.s
+1 -1
View File
@@ -87,7 +87,7 @@ sub_020653EC: ; 0x020653EC
ldr r0, _02065470 ; =sub_020654B0
add r1, r4, #0x0
mov r2, #0x0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x8]
pop {r4-r6, pc}
.balign 4
arm9/asm/unk_0206BF90.s
+2 -2
View File
@@ -47,11 +47,11 @@ sub_0206BF90: ; 0x0206BF90
ldr r0, _0206BFE8 ; =sub_0206C550
add r1, r4, #0x0
mov r2, #0x0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _0206BFEC ; =sub_0206C5DC
add r1, r6, #0x0
mov r2, #0x0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4-r6, pc}
nop
_0206BFE4: .word UNK_020F828C
arm9/asm/unk_0206C700.s
+1 -1
View File
@@ -236,7 +236,7 @@ sub_0206C700: ; 0x0206C700
ldr r0, _0206C8E8 ; =sub_0206C8EC
add r1, r4, #0x0
mov r2, #0x0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r0, #0x1
bl TextFlags_SetCanABSpeedUpPrint
bl sub_02033E74
arm9/asm/unk_02080C38.s
+3 -3
View File
@@ -2428,7 +2428,7 @@ _02081E46:
ldr r0, _02081EB4 ; =sub_02081680
add r1, r6, #0x0
mov r2, #0xa
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #0x6
lsl r1, r1, #0x6
str r0, [r6, r1]
@@ -2479,7 +2479,7 @@ _02081EE6:
ldr r0, _02081F04 ; =sub_02081F08
add r1, r4, #0x0
mov r2, #0xa
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #0x6
lsl r1, r1, #0x6
str r0, [r4, r1]
@@ -3334,7 +3334,7 @@ _020824DC:
ldr r0, _02082504 ; =sub_0208251C
add r1, r5, #0x0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x0]
ldr r0, _020824F0 ; =0x000019BC
str r4, [r5, r0]
arm9/global.inc
+66 -66
View File
@@ -681,7 +681,7 @@
.extern sub_0200C9D8
.extern sub_0200CA0C
.extern sub_0200CA40
.extern sub_0200CA44
.extern SysTask_CreateOnMainQueue
.extern sub_0200CA60
.extern sub_0200CA7C
.extern sub_0200CA98
@@ -2566,7 +2566,7 @@
.extern LocalFieldData_GetSafariStepsCounter
.extern sub_02034E2C
.extern Save_LocalFieldData_Get
.extern sub_02034E48
.extern FieldSystem_SyncMapObjectsToSave
.extern sub_02034E60
.extern GetMomSpawnId
.extern GetSpecialSpawnWarpData
@@ -2680,8 +2680,8 @@
.extern sub_02039460
.extern GetVarPointer
.extern FieldSystem_VarGet
.extern sub_02039504
.extern FlagCheck
.extern FieldSystem_VarGetObjectEventGraphicsId
.extern FieldSystem_FlagCheck
.extern FieldSystem_FlagSet
.extern FlagClear
.extern ResetTempFlagsAndVars
@@ -2690,7 +2690,7 @@
.extern sub_020395F4
.extern sub_02039618
.extern TrainerIsDoubleBattle
.extern TrainerFlagCheck
.extern TrainerFieldSystem_FlagCheck
.extern TrainerFieldSystem_FlagSet
.extern TrainerFlagClear
.extern sub_02039694
@@ -3983,33 +3983,33 @@
.extern sub_02057260
.extern sub_02057278
.extern sub_020572B8
.extern sub_02057380
.extern sub_020573AC
.extern MapObjectManager_Init
.extern MapObjectManager_Delete
.extern sub_020573C8
.extern sub_0205753C
.extern sub_020575D4
.extern MapObject_Create
.extern MapObject_CreateFromObjectEventWithId
.extern sub_02057614
.extern sub_02057634
.extern sub_02057654
.extern sub_02057688
.extern MapObject_Remove
.extern MapObject_Delete
.extern sub_020576A8
.extern sub_0205771C
.extern MapObjectManager_RemoveAllActiveObjects
.extern sub_02057750
.extern sub_020577A8
.extern sub_02057800
.extern sub_0205785C
.extern sub_02057BAC
.extern GetMapObjectByID
.extern sub_020580B4
.extern sub_020580F4
.extern FieldSystem_SyncMapObjectsToSaveEx
.extern MapObjectManager_RestoreFromSave
.extern MapObject_CreateFromMultipleObjectEvents
.extern MapObjectManager_GetFirstActiveObjectByID
.extern MapObjectManager_GetFirstActiveObjectWithMovement
.extern MapObjectManager_GetNextObjectWithFlagFromIndex
.extern sub_0205829C
.extern sub_020582A8
.extern sub_020582F8
.extern sub_02058368
.extern MapObjectManager_GetObjectCount
.extern sub_0205837C
.extern sub_02058384
.extern sub_02058390
.extern sub_0205839C
.extern MapObjectManager_GetPriority
.extern sub_020583A0
.extern sub_020583A4
.extern sub_020583AC
@@ -4017,39 +4017,39 @@
.extern sub_020583D4
.extern sub_020583F0
.extern sub_020583F4
.extern sub_02058410
.extern sub_02058418
.extern sub_02058424
.extern sub_0205842C
.extern sub_02058444
.extern MapObject_SetFlagsBits
.extern MapObject_ClearFlagsBits
.extern MapObject_GetFlagsBits
.extern MapObject_TestFlagsBits
.extern MapObject_SetID
.extern MapObject_GetID
.extern sub_02058450
.extern sub_02058454
.extern sub_02058458
.extern MapObject_SetSpriteID
.extern MapObject_GetSpriteID
.extern sub_0205845C
.extern sub_02058480
.extern sub_02058484
.extern sub_02058488
.extern sub_0205848C
.extern sub_02058494
.extern sub_02058498
.extern sub_020584A0
.extern sub_020584A4
.extern MapObject_GetMovement
.extern MapObject_SetType
.extern MapObject_GetType
.extern MapObject_SetFlagID
.extern MapObject_SetScript
.extern MapObject_GetScript
.extern MapObject_GetInitialFacingDirection
.extern MapObject_SetFacingDirectionDirect
.extern sub_020584AC
.extern sub_020584C4
.extern MapObject_GetFacingDirection
.extern sub_020584C8
.extern sub_020584CC
.extern sub_020584D4
.extern MapObject_SetNextFacingDirection
.extern MapObject_GetNextFacingDirection
.extern sub_020584D8
.extern sub_020584EC
.extern sub_02058510
.extern sub_02058534
.extern sub_02058538
.extern sub_0205853C
.extern sub_02058540
.extern MapObject_SetParam
.extern MapObject_GetParam
.extern MapObject_SetXRange
.extern MapObject_GetXRange
.extern MapObject_SetYRange
.extern MapObject_GetYRange
.extern sub_02058544
.extern sub_0205854C
.extern sub_02058578
.extern MapObject_GetManager
.extern sub_0205858C
.extern sub_020585B0
.extern sub_020585B4
@@ -4071,7 +4071,7 @@
.extern sub_02058720
.extern sub_02058728
.extern sub_02058730
.extern MapObject_GetFieldSysPtr
.extern MapObject_GetFieldSystem
.extern sub_02058744
.extern sub_02058750
.extern sub_02058768
@@ -4082,13 +4082,13 @@
.extern sub_020587F4
.extern sub_02058804
.extern sub_0205881C
.extern sub_02058830
.extern MapObject_IsInUse
.extern sub_0205883C
.extern sub_02058848
.extern sub_02058854
.extern sub_02058860
.extern sub_0205886C
.extern sub_02058884
.extern MapObject_CheckFlag14
.extern sub_02058890
.extern MapObject_SetVisible
.extern sub_020588B8
@@ -4101,7 +4101,7 @@
.extern sub_02058960
.extern sub_0205897C
.extern sub_02058994
.extern sub_020589CC
.extern MapObject_CheckFlag25
.extern sub_020589E4
.extern sub_02058A00
.extern sub_02058A18
@@ -4112,29 +4112,29 @@
.extern sub_02058A9C
.extern sub_02058AB4
.extern sub_02058AC8
.extern sub_02058AE4
.extern sub_02058AFC
.extern sub_02058B04
.extern sub_02058B0C
.extern MapObject_CheckFlag29
.extern MapObject_GetInitialX
.extern MapObject_GetInitialHeight
.extern MapObject_GetInitialY
.extern sub_02058B14
.extern sub_02058B18
.extern MapObject_SetPreviousX
.extern sub_02058B1C
.extern sub_02058B20
.extern MapObject_SetPreviousHeight
.extern sub_02058B24
.extern sub_02058B28
.extern sub_02058B2C
.extern sub_02058B30
.extern MapObject_SetPreviousY
.extern MapObject_GetCurrentX
.extern MapObject_SetCurrentX
.extern sub_02058B34
.extern sub_02058B3C
.extern sub_02058B40
.extern MapObject_GetCurrentHeight
.extern MapObject_SetCurrentHeight
.extern sub_02058B44
.extern sub_02058B4C
.extern sub_02058B50
.extern MapObject_GetCurrentY
.extern MapObject_SetCurrentY
.extern sub_02058B54
.extern sub_02058B5C
.extern sub_02058B6C
.extern MapObject_GetPositionVec
.extern MapObject_SetPositionVec
.extern sub_02058B7C
.extern sub_02058B80
.extern MapObject_GetPosVecYCoord
.extern sub_02058B84
.extern sub_02058B94
.extern sub_02058BA4
@@ -4248,7 +4248,7 @@
.extern sub_0205AE0C
.extern sub_0205AE28
.extern sub_0205AE50
.extern sub_0205AE80
.extern MapObject_ClearHeldMovement
.extern sub_0205AEA4
.extern sub_0205AEF0
.extern sub_0205AEFC
arm9/overlays/05/asm/ov05_021D7F4C.s
+1 -1
View File
@@ -134,7 +134,7 @@ _021D8034:
ldr r0, _021D809C ; =ov05_021D7FDC
ldr r2, [r6]
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
ldr r0, [r5, #0x10]
ldr r1, _021D80A0 ; =ov05_021D8000
arm9/overlays/05/asm/ov05_021D80E8.s
+8 -8
View File
@@ -461,12 +461,12 @@ _021D845A:
bl sub_02055B8C
_021D8486:
ldr r0, [sp, #4]
bl sub_02058488
bl MapObject_GetType
cmp r0, #9
beq _021D84A8
ldr r5, [sp, #4]
add r0, r5, #0
bl sub_02058498
bl MapObject_GetScript
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r4, #0
@@ -599,7 +599,7 @@ ov05_021D859C: ; 0x021D859C
bne _021D85C4
ldr r4, [sp]
add r0, r4, #0
bl sub_02058498
bl MapObject_GetScript
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r5, #0
@@ -732,7 +732,7 @@ _021D86AE:
cmp r0, #1
bne _021D86FE
ldr r0, [sp]
bl sub_02058480
bl MapObject_GetMovement
cmp r0, #1
beq _021D86FE
ldr r0, [r5, #0x38]
@@ -747,7 +747,7 @@ _021D86AE:
_021D86E4:
ldr r4, [sp]
add r0, r4, #0
bl sub_02058498
bl MapObject_GetScript
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r5, #0
@@ -852,7 +852,7 @@ _021D87B6:
bl sub_02031C10
ldr r4, [sp]
add r0, r4, #0
bl sub_02058498
bl MapObject_GetScript
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r5, #0
@@ -934,12 +934,12 @@ _021D8842:
bl sub_02055B8C
_021D886E:
ldr r0, [sp]
bl sub_02058488
bl MapObject_GetType
cmp r0, #9
beq _021D8890
ldr r5, [sp]
add r0, r5, #0
bl sub_02058498
bl MapObject_GetScript
add r1, r0, #0
lsl r1, r1, #0x10
add r0, r4, #0
arm9/overlays/05/asm/ov05_021DC0B8.s
+5 -5
View File
@@ -134,14 +134,14 @@ _021DC19A:
mov r2, #0
add r1, r5, #0
str r2, [r5, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
b _021DC1C2
_021DC1B6:
ldr r0, _021DC1CC ; =ov05_021DC2A4
mov r2, #0
add r1, r5, #0
str r2, [r5, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
_021DC1C2:
str r0, [r5, #0x14]
mov r0, #1
@@ -490,7 +490,7 @@ _021DC3F6:
ldr r0, _021DC470 ; =ov05_021DC474
add r1, r6, #0
mov r2, #0xa
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r6, #0xf8
str r0, [r6]
add sp, #0x1c
@@ -1136,7 +1136,7 @@ _021DC92E:
ldr r0, _021DC944 ; =ov05_021DCC38
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x1c]
mov r0, #1
str r0, [r4, #0x14]
@@ -1180,7 +1180,7 @@ _021DC974:
_021DC97E:
ldr r0, [r4, #0x20]
mov r2, #4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [r4, #0xc]
ldr r3, _021DCA34 ; =0x00000F48
str r0, [r1, r3]
arm9/overlays/05/asm/ov05_021E1374.s
+19 -19
View File
@@ -295,10 +295,10 @@ _021E15A6:
add r1, r6, #0
ldr r0, [r0, #4]
ldr r0, [r0, #0x34]
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r4, r0, #0
beq _021E161A
bl sub_02058488
bl MapObject_GetType
cmp r0, #8
bhi _021E161A
add r0, r0, r0
@@ -319,10 +319,10 @@ _021E15CA: ; jump table
.short _021E15DC - _021E15CA - 2 ; case 8
_021E15DC:
add r0, r4, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r7, r0, #0
add r0, r4, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
ldr r1, [sp, #0x14]
cmp r7, r1
blt _021E161A
@@ -336,7 +336,7 @@ _021E15DC:
cmp r0, r1
bgt _021E161A
add r0, r4, #0
bl sub_02058480
bl MapObject_GetMovement
bl ov05_021E1630
cmp r0, #0
bne _021E161A
@@ -447,10 +447,10 @@ ov05_021E16C8: ; 0x021E16C8
_021E16D6:
ldr r0, [r6, #0x34]
add r1, r5, #0
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r4, r0, #0
beq _021E16F2
bl sub_02058480
bl MapObject_GetMovement
cmp r0, #0x31
bne _021E16F2
add r0, r4, #0
@@ -501,7 +501,7 @@ _021E173C:
add r1, r4, #0
mov r2, #0
str r6, [r4, #4]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
pop {r4, r5, r6, pc}
nop
@@ -568,7 +568,7 @@ _021E17BE:
bl ov05_021E1848
add r1, r0, #0
ldr r0, [r5, #4]
bl TrainerFlagCheck
bl TrainerFieldSystem_FlagCheck
cmp r0, #0
bne _021E17DE
ldr r1, [r4, #0x10]
@@ -628,7 +628,7 @@ _021E1844: .word ov05_021F6910
thumb_func_start ov05_021E1848
ov05_021E1848: ; 0x021E1848
push {r3, lr}
bl sub_02058498
bl MapObject_GetScript
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl sub_020395F4
@@ -712,7 +712,7 @@ _021E18DC:
cmp r1, r7
beq _021E18F0
add r0, r6, #0
bl TrainerFlagCheck
bl TrainerFieldSystem_FlagCheck
cmp r0, #0
bne _021E18F0
lsl r0, r4, #0x10
@@ -797,7 +797,7 @@ _021E1974: .word ov05_021F691C
thumb_func_start ov05_021E1978
ov05_021E1978: ; 0x021E1978
push {r3, lr}
bl sub_02058480
bl MapObject_GetMovement
cmp r0, #0x31
bne _021E1986
mov r0, #1
@@ -821,7 +821,7 @@ ov05_021E1994: ; 0x021E1994
add r5, r1, #0
beq _021E19DC
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
cmp r0, #0
bne _021E19AA
mov r4, #0xe
@@ -869,7 +869,7 @@ ov05_021E19E0: ; 0x021E19E0
_021E19F0:
ldr r0, [r6, #0x34]
add r1, r5, #0
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r4, r0, #0
beq _021E1A16
bl sub_02058854
@@ -909,7 +909,7 @@ ov05_021E1A30: ; 0x021E1A30
bl sub_02034B64
add r7, r0, #0
add r0, r4, #0
bl sub_02058498
bl MapObject_GetScript
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0xc]
@@ -929,18 +929,18 @@ _021E1A66:
ldr r0, [sp]
add r1, r4, #0
ldr r0, [r0, #0x34]
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r5, r0, #0
beq _021E1ACC
ldr r1, [sp, #4]
cmp r1, #0
bne _021E1A82
bl sub_02058480
bl MapObject_GetMovement
cmp r0, #0x31
beq _021E1ACC
_021E1A82:
add r0, r5, #0
bl sub_02058488
bl MapObject_GetType
cmp r0, #8
bhi _021E1ACC
add r0, r0, r0
@@ -961,7 +961,7 @@ _021E1A98: ; jump table
.short _021E1AAA - _021E1A98 - 2 ; case 8
_021E1AAA:
add r0, r5, #0
bl sub_02058498
bl MapObject_GetScript
add r6, r0, #0
lsl r0, r6, #0x10
lsr r0, r0, #0x10
arm9/overlays/05/asm/ov05_021E1AD8.s
+4 -4
View File
@@ -306,7 +306,7 @@ _021E1CA8:
ldr r0, _021E1D34 ; =ov05_021E1E58
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
add sp, #0x14
pop {r3, r4, pc}
@@ -747,7 +747,7 @@ _021E2032:
ldr r0, _021E2090 ; =ov05_021E229C
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
add sp, #0x14
pop {r3, r4, pc}
@@ -1338,7 +1338,7 @@ _021E2496:
ldr r0, _021E253C ; =ov05_021E25A4
add r1, r5, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
add sp, #0x14
pop {r4, r5, pc}
@@ -1660,7 +1660,7 @@ _021E270A:
ldr r0, _021E2798 ; =ov05_021E1E58
add r1, r5, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
arm9/overlays/05/asm/ov05_021E2E88.s
+1 -1
View File
@@ -528,7 +528,7 @@ ov05_021E3270: ; 0x021E3270
ldr r0, _021E32EC ; =ov05_021E3124
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #8]
mov r0, #1
strb r0, [r4, #4]
arm9/overlays/05/asm/ov05_021E3444.s
+1 -1
View File
@@ -46,7 +46,7 @@ ov05_021E3474: ; 0x021E3474
ldr r0, _021E34B4 ; =ov05_021E34B8
add r1, r4, #0
mov r2, #5
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r5, [r4, #0x48]
cmp r5, #0
beq _021E34A4
arm9/overlays/05/asm/ov05_021E4AE4.s
+1 -1
View File
@@ -182,7 +182,7 @@ ov05_021E4C20: ; 0x021E4C20
thumb_func_start ov05_021E4C24
ov05_021E4C24: ; 0x021E4C24
push {r3, lr}
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
ldr r0, [r0, #0x3c]
pop {r3, pc}
.balign 4, 0
arm9/overlays/05/asm/ov05_021E55BC.s
+3 -3
View File
@@ -67,7 +67,7 @@ ov05_021E5614: ; 0x021E5614
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x1c]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, sp, #0x14
str r0, [sp]
mov r0, #0xff
@@ -107,7 +107,7 @@ ov05_021E5650: ; 0x021E5650
str r0, [r4, #0x28]
ldr r0, [r4, #0x38]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_0206476C
@@ -147,7 +147,7 @@ _021E56B8:
_021E56C8:
add r0, r6, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
mov r0, #0xa
ldr r1, [sp, #8]
lsl r0, r0, #0xc
arm9/overlays/05/asm/ov05_021E577C.s
+3 -3
View File
@@ -67,7 +67,7 @@ ov05_021E57D4: ; 0x021E57D4
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x1c]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, sp, #0x14
str r0, [sp]
mov r0, #0xff
@@ -107,7 +107,7 @@ ov05_021E5810: ; 0x021E5810
str r0, [r4, #0x28]
ldr r0, [r4, #0x38]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_0206476C
@@ -138,7 +138,7 @@ ov05_021E585C: ; 0x021E585C
_021E5878:
add r0, r5, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
mov r0, #0xa
ldr r1, [sp, #8]
lsl r0, r0, #0xc
arm9/overlays/05/asm/ov05_021E5918.s
+3 -3
View File
@@ -67,7 +67,7 @@ ov05_021E5970: ; 0x021E5970
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x1c]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, sp, #0x14
str r0, [sp]
mov r0, #0xff
@@ -107,7 +107,7 @@ ov05_021E59AC: ; 0x021E59AC
str r0, [r4, #0x28]
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_0206476C
@@ -141,7 +141,7 @@ _021E5A0E:
_021E5A16:
ldr r0, [r1, #0x3c]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
mov r0, #0xa
ldr r1, [sp, #8]
lsl r0, r0, #0xc
arm9/overlays/05/asm/ov05_021E5E10.s
+2 -2
View File
@@ -80,9 +80,9 @@ ov05_021E5E8C: ; 0x021E5E8C
str r0, [sp, #0xc]
add r0, r4, #0
add r1, sp, #0x10
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r4, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
cmp r0, #3
bhi _021E5EF4
add r0, r0, r0
arm9/overlays/05/asm/ov05_021E5FD8.s
+29 -29
View File
@@ -129,7 +129,7 @@ _021E60D2:
add r0, r5, #0
bl PlayerAvatar_GetMapObject
add r6, r0, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
mov r0, #1
mov r1, #0
str r0, [sp]
@@ -385,7 +385,7 @@ _021E62C4:
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_021E62D4:
bl sub_02058458
bl MapObject_GetSpriteID
cmp r0, #0x54
beq _021E62E0
mov r0, #0
@@ -1166,7 +1166,7 @@ _021E6916:
mov r0, #0
pop {r4, pc}
_021E692C:
bl sub_02058458
bl MapObject_GetSpriteID
cmp r0, #0x76
beq _021E6938
mov r0, #0
@@ -1175,7 +1175,7 @@ _021E6938:
add r0, r4, #0
bl ov05_021F1AF8
add r0, r4, #0
bl sub_02057654
bl MapObject_Remove
ldr r0, _021E6950 ; =0x0000065B
bl PlaySE
mov r0, #0
@@ -1433,7 +1433,7 @@ ov05_021E6B1C: ; 0x021E6B1C
pop {r3, r4, r5, pc}
_021E6B2E:
ldr r0, [r5, #0x14]
bl sub_020584D4
bl MapObject_GetNextFacingDirection
add r4, r0, #0
ldr r0, [r5, #0x14]
add r1, r4, #0
@@ -1647,14 +1647,14 @@ ov05_021E6CC4: ; 0x021E6CC4
sub sp, #0x18
add r5, r0, #0
ldr r0, [r5, #0x3c]
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0
mov r0, #0
bl sub_02059BF4
lsl r0, r0, #1
add r4, r4, r0
ldr r0, [r5, #0x3c]
bl sub_02058B4C
bl MapObject_GetCurrentY
add r6, r0, #0
mov r0, #0
bl sub_02059C00
@@ -1680,7 +1680,7 @@ ov05_021E6CC4: ; 0x021E6CC4
str r6, [r5, #0x14]
ldr r0, [r5, #0x3c]
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r1, [sp, #0x14]
ldr r0, [r5, #0x30]
cmp r1, r0
@@ -1737,7 +1737,7 @@ ov05_021E6D80: ; 0x021E6D80
add r4, r0, #0
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r1, [sp, #4]
ldr r0, [r4, #0x20]
add r1, r1, r0
@@ -1749,7 +1749,7 @@ ov05_021E6D80: ; 0x021E6D80
_021E6D9E:
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B6C
bl MapObject_SetPositionVec
ldr r0, [r4, #8]
add r0, r0, #1
str r0, [r4, #8]
@@ -1772,7 +1772,7 @@ ov05_021E6DC0: ; 0x021E6DC0
add r4, r0, #0
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r1, [sp, #4]
ldr r0, [r4, #0x20]
add r1, r1, r0
@@ -1793,7 +1793,7 @@ _021E6DDE:
_021E6DEE:
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B6C
bl MapObject_SetPositionVec
ldr r0, [r4, #8]
add r0, r0, #1
str r0, [r4, #8]
@@ -1817,13 +1817,13 @@ _021E6E12:
_021E6E1E:
ldr r0, [r4, #0x3c]
ldr r1, [r4, #0xc]
bl sub_02058B30
bl MapObject_SetCurrentX
ldr r0, [r4, #0x3c]
ldr r1, [r4, #0x10]
bl sub_02058B40
bl MapObject_SetCurrentHeight
ldr r0, [r4, #0x3c]
ldr r1, [r4, #0x14]
bl sub_02058B50
bl MapObject_SetCurrentY
ldr r0, [r4, #0x3c]
bl sub_02059C60
ldr r0, [r4, #0x50]
@@ -1878,14 +1878,14 @@ ov05_021E6E90: ; 0x021E6E90
sub sp, #0x18
add r5, r0, #0
ldr r0, [r5, #0x3c]
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0
mov r0, #1
bl sub_02059BF4
lsl r0, r0, #1
add r4, r4, r0
ldr r0, [r5, #0x3c]
bl sub_02058B4C
bl MapObject_GetCurrentY
add r6, r0, #0
mov r0, #1
bl sub_02059C00
@@ -1913,7 +1913,7 @@ ov05_021E6E90: ; 0x021E6E90
str r6, [r5, #0x14]
ldr r0, [r5, #0x3c]
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r1, [sp, #0x14]
ldr r0, [r5, #0x30]
cmp r1, r0
@@ -1970,7 +1970,7 @@ ov05_021E6F50: ; 0x021E6F50
add r4, r0, #0
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r1, [sp, #8]
ldr r0, [r4, #0x24]
add r1, r1, r0
@@ -1988,7 +1988,7 @@ _021E6F70:
_021E6F78:
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B6C
bl MapObject_SetPositionVec
ldr r0, [r4, #8]
add r0, r0, #1
str r0, [r4, #8]
@@ -2012,7 +2012,7 @@ ov05_021E6F9C: ; 0x021E6F9C
add r4, r0, #0
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r1, [sp, #4]
ldr r0, [r4, #0x20]
add r1, r1, r0
@@ -2039,7 +2039,7 @@ _021E6FCC:
_021E6FD4:
ldr r0, [r4, #0x3c]
add r1, sp, #0
bl sub_02058B6C
bl MapObject_SetPositionVec
ldr r0, [r4, #8]
add r0, r0, #1
str r0, [r4, #8]
@@ -2063,13 +2063,13 @@ _021E6FF8:
_021E7004:
ldr r0, [r4, #0x3c]
ldr r1, [r4, #0xc]
bl sub_02058B30
bl MapObject_SetCurrentX
ldr r0, [r4, #0x3c]
ldr r1, [r4, #0x10]
bl sub_02058B40
bl MapObject_SetCurrentHeight
ldr r0, [r4, #0x3c]
ldr r1, [r4, #0x14]
bl sub_02058B50
bl MapObject_SetCurrentY
ldr r0, [r4, #0x3c]
bl sub_02059C60
ldr r0, [r4, #0x50]
@@ -2184,7 +2184,7 @@ ov05_021E70F0: ; 0x021E70F0
cmp r0, #0
bne _021E7136
add r0, r5, #0
bl sub_02058458
bl MapObject_GetSpriteID
sub r0, #0xc4
cmp r0, #1
bls _021E7136
@@ -2216,7 +2216,7 @@ ov05_021E7138: ; 0x021E7138
cmp r0, #0
bne _021E7180
add r0, r5, #0
bl sub_02058458
bl MapObject_GetSpriteID
cmp r0, #0xc4
beq _021E7162
cmp r0, #0xc5
@@ -2271,7 +2271,7 @@ _021E7198:
ldr r0, _021E71E0 ; =ov05_021E7218
ldr r2, _021E71E4 ; =0x0000FFFF
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r4, r0, #0
bne _021E71DA
bl GF_AssertFail
@@ -2380,7 +2380,7 @@ ov05_021E727C: ; 0x021E727C
add r5, r0, #0
add r0, r4, #0
bl PlayerAvatar_GetMapObject
bl sub_02058578
bl MapObject_GetManager
ldr r2, [sp]
add r1, r6, r7
add r2, r2, r5
arm9/overlays/05/asm/ov05_021E7504.s
+2 -2
View File
@@ -303,13 +303,13 @@ ov05_021E7750: ; 0x021E7750
ldr r0, _021E7794 ; =ov05_021E7544
add r1, r4, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_021E7786:
ldr r0, _021E7798 ; =ov05_021E7618
add r1, r4, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_021E7794: .word ov05_021E7544
arm9/overlays/05/asm/ov05_021E779C.s
+1 -1
View File
@@ -464,7 +464,7 @@ ov05_021E7AC0: ; 0x021E7AC0
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x20]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
bl sub_02058744
add r1, r0, #1
arm9/overlays/05/asm/ov05_021E8310.s
+1 -1
View File
@@ -366,7 +366,7 @@ Field_SaveStatsPrinter_Delete: ; 0x021E85E4
Field_SaveGame: ; 0x021E85FC
push {r4, lr}
add r4, r0, #0
bl sub_02034E48
bl FieldSystem_SyncMapObjectsToSave
add r0, r4, #0
mov r1, #4
mov r2, #0
arm9/overlays/05/asm/ov05_021ED9C0.s
+2 -2
View File
@@ -81,7 +81,7 @@ ov05_021EDA48: ; 0x021EDA48
bl ov05_021E4C24
add r4, r0, #0
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0x18
@@ -192,7 +192,7 @@ ov05_021EDB10: ; 0x021EDB10
_021EDB32:
add r0, r4, #0
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r4, #0
add r1, sp, #0
bl sub_02058B84
arm9/overlays/05/asm/ov05_021EDB70.s
+3 -3
View File
@@ -173,13 +173,13 @@ _021EDCAE:
str r0, [r5, #0x20]
_021EDCB8:
add r0, r6, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r4, r0, #0
ldr r0, [r5, #4]
bl sub_02059BF4
add r7, r0, #0
add r0, r6, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #8]
ldr r0, [r5, #4]
bl sub_02059C00
@@ -191,7 +191,7 @@ _021EDCB8:
bl sub_02059E60
add r0, r6, #0
add r1, sp, #0x18
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r0, [sp, #0x1c]
add r1, sp, #0xc
str r0, [sp, #0x10]
arm9/overlays/05/asm/ov05_021EDE34.s
+1 -1
View File
@@ -3746,7 +3746,7 @@ ov05_021EFA08: ; 0x021EFA08
str r2, [r1, #0x1c]
ldr r0, _021EFA3C ; =ov05_021EF904
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_021EFA3C: .word ov05_021EF904
arm9/overlays/05/asm/ov05_021F0514.s
+22 -22
View File
@@ -7,7 +7,7 @@
ov05_021F0514: ; 0x021F0514
push {r4, lr}
add r4, r0, #0
bl sub_02058458
bl MapObject_GetSpriteID
cmp r0, #0x97
bgt _021F053E
bge _021F05B2
@@ -152,7 +152,7 @@ _021F061C:
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r3, r4, r5, pc}
.balign 4, 0
@@ -186,7 +186,7 @@ _021F0658:
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
_021F0678:
pop {r3, r4, r5, pc}
.balign 4, 0
@@ -208,7 +208,7 @@ ov05_021F067C: ; 0x021F067C
cmp r7, #0
beq _021F06E6
add r0, r4, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
str r0, [sp, #4]
add r0, r4, #0
bl sub_0205854C
@@ -660,7 +660,7 @@ ov05_021F0A04: ; 0x021F0A04
thumb_func_start ov05_021F0A28
ov05_021F0A28: ; 0x021F0A28
bl sub_020584C4
bl MapObject_GetFacingDirection
str r0, [sp, #4]
add r0, r4, #0
bl sub_0205854C
@@ -808,7 +808,7 @@ _021F0B44:
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r3, r4, r5, pc}
thumb_func_start ov05_021F0B58
@@ -840,7 +840,7 @@ _021F0B7A:
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
_021F0B9A:
pop {r3, r4, r5, pc}
@@ -860,7 +860,7 @@ ov05_021F0B9C: ; 0x021F0B9C
cmp r6, #0
beq _021F0C26
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
add r7, r0, #0
add r0, r5, #0
bl sub_0205854C
@@ -926,7 +926,7 @@ ov05_021F0C28: ; 0x021F0C28
cmp r4, #0
beq _021F0CEA
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
add r7, r0, #0
add r0, r5, #0
bl sub_0205854C
@@ -1067,7 +1067,7 @@ _021F0D5C:
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r3, r4, r5, pc}
thumb_func_start ov05_021F0D70
@@ -1099,7 +1099,7 @@ _021F0D92:
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
_021F0DB2:
pop {r3, r4, r5, pc}
@@ -1120,7 +1120,7 @@ ov05_021F0DB4: ; 0x021F0DB4
cmp r7, #0
beq _021F0E1E
add r0, r4, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
str r0, [sp, #4]
add r0, r4, #0
bl sub_0205854C
@@ -1686,7 +1686,7 @@ ov05_021F1234: ; 0x021F1234
cmp r0, #0
beq _021F12B6
add r0, r7, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
str r0, [sp, #8]
add r0, r7, #0
bl sub_0205854C
@@ -1938,7 +1938,7 @@ ov05_021F1440: ; 0x021F1440
cmp r0, #1
beq _021F14B4
add r0, r4, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
str r0, [sp, #4]
add r0, r4, #0
bl sub_0205854C
@@ -2274,7 +2274,7 @@ ov05_021F16D4: ; 0x021F16D4
cmp r4, #0
beq _021F1734
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
add r7, r0, #0
strb r7, [r6]
add r0, r5, #0
@@ -2317,7 +2317,7 @@ ov05_021F1738: ; 0x021F1738
cmp r4, #0
beq _021F179C
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
strb r0, [r6]
add r0, r5, #0
bl sub_0205854C
@@ -2363,7 +2363,7 @@ ov05_021F17A0: ; 0x021F17A0
cmp r4, #0
beq _021F1836
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
add r7, r0, #0
add r0, r5, #0
bl sub_0205854C
@@ -2431,7 +2431,7 @@ ov05_021F1838: ; 0x021F1838
cmp r4, #0
beq _021F18A0
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r1, #0
ldrsb r1, [r6, r1]
add r7, r0, #0
@@ -2479,7 +2479,7 @@ ov05_021F18A4: ; 0x021F18A4
cmp r4, #0
beq _021F191A
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
str r0, [sp]
add r0, r5, #0
bl sub_0205854C
@@ -2593,7 +2593,7 @@ ov05_021F19A4: ; 0x021F19A4
add r6, r1, #0
lsl r1, r4, #9
add r5, r0, #0
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
bne _021F19B8
mov r4, #0
@@ -2601,13 +2601,13 @@ _021F19B8:
mov r1, #1
add r0, r5, #0
lsl r1, r1, #0xc
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
bne _021F19D6
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0xc
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0
bne _021F19D6
mov r4, #0
arm9/overlays/05/asm/ov05_021F1B0C.s
+5 -5
View File
@@ -67,7 +67,7 @@ _021F1B76:
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r3, r4, r5, pc}
.balign 4, 0
@@ -99,7 +99,7 @@ _021F1BAE:
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
_021F1BCC:
pop {r3, r4, r5, pc}
.balign 4, 0
@@ -198,7 +198,7 @@ ov05_021F1C64: ; 0x021F1C64
add r6, r1, #0
lsl r1, r4, #9
add r5, r0, #0
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
bne _021F1C78
mov r4, #0
@@ -206,13 +206,13 @@ _021F1C78:
mov r1, #1
add r0, r5, #0
lsl r1, r1, #0xc
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
bne _021F1C96
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0xc
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0
bne _021F1C96
mov r4, #0
arm9/overlays/05/asm/ov05_021F1CB8.s
+9 -9
View File
@@ -20,10 +20,10 @@ _021F1CD2:
add r0, r5, #0
bl ov05_021F1D68
add r0, r5, #0
bl sub_02058368
bl MapObjectManager_GetObjectCount
str r0, [sp, #0x10]
add r0, r5, #0
bl sub_0205839C
bl MapObjectManager_GetPriority
sub r0, r0, #1
str r0, [sp, #0xc]
add r0, r5, #0
@@ -103,7 +103,7 @@ ov05_021F1D80: ; 0x021F1D80
ov05_021F1D8C: ; 0x021F1D8C
push {r4, lr}
add r4, r0, #0
bl sub_02058578
bl MapObject_GetManager
mov r1, #4
bl sub_02058390
cmp r0, #0
@@ -111,7 +111,7 @@ ov05_021F1D8C: ; 0x021F1D8C
mov r1, #1
add r0, r4, #0
lsl r1, r1, #0xe
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0
beq _021F1DC6
add r0, r4, #0
@@ -131,7 +131,7 @@ _021F1DC6:
thumb_func_start ov05_021F1DC8
ov05_021F1DC8: ; 0x021F1DC8
push {r3, lr}
bl sub_02058458
bl MapObject_GetSpriteID
bl ov05_021F1DD4
pop {r3, pc}
@@ -175,7 +175,7 @@ _021F1E16:
mov r1, #1
add r0, r4, #0
lsl r1, r1, #8
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0
beq _021F1E28
mov r0, #1
@@ -219,7 +219,7 @@ ov05_021F1E64: ; 0x021F1E64
add r4, r1, #0
add r5, r0, #0
add r1, sp, #0x24
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0x18
bl sub_02058B84
@@ -263,7 +263,7 @@ ov05_021F1EC0: ; 0x021F1EC0
add r4, r0, #0
bl sub_020584AC
add r0, r4, #0
bl sub_02058884
bl MapObject_CheckFlag14
cmp r0, #1
bne _021F1ED8
add r0, r4, #0
@@ -281,7 +281,7 @@ ov05_021F1EDC: ; 0x021F1EDC
mov r1, #1
add r0, r4, #0
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r4, pc}
.balign 4, 0
arm9/overlays/05/asm/ov05_021F1F04.s
+34 -34
View File
@@ -101,7 +101,7 @@ ov05_021F1FC8: ; 0x021F1FC8
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
bl sub_02058458
bl MapObject_GetSpriteID
add r2, r0, #0
add r0, r5, #0
add r1, r4, #0
@@ -155,7 +155,7 @@ ov05_021F202C: ; 0x021F202C
mov r0, #0
str r0, [r4]
add r0, r5, #0
bl sub_02058578
bl MapObject_GetManager
add r1, r5, #0
add r2, r6, #0
bl ov05_021F2284
@@ -179,7 +179,7 @@ ov05_021F2060: ; 0x021F2060
cmp r0, #0
beq _021F2092
add r0, r5, #0
bl sub_02058458
bl MapObject_GetSpriteID
add r6, r0, #0
bl sub_0205C334
cmp r0, #1
@@ -213,7 +213,7 @@ _021F20AE:
cmp r4, r0
beq _021F20D2
add r0, r6, #0
bl sub_02058578
bl MapObject_GetManager
add r1, r6, #0
add r2, r4, #0
bl ov05_021F2284
@@ -471,7 +471,7 @@ ov05_021F2284: ; 0x021F2284
add r5, r0, #0
add r6, r1, #0
add r7, r2, #0
bl sub_02058368
bl MapObjectManager_GetObjectCount
add r4, r0, #0
add r0, r5, #0
bl sub_020583BC
@@ -480,11 +480,11 @@ _021F229A:
ldr r0, [sp]
cmp r0, r6
beq _021F22CE
bl sub_02058830
bl MapObject_IsInUse
cmp r0, #1
bne _021F22CE
ldr r0, [sp]
bl sub_02058458
bl MapObject_GetSpriteID
add r5, r0, #0
bl sub_0205C334
cmp r0, #1
@@ -1585,7 +1585,7 @@ ov05_021F2B10: ; 0x021F2B10
add r2, sp, #4
mov r3, #1
add r7, r0, #0
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #1
bne _021F2B6A
_021F2B2E:
@@ -1596,7 +1596,7 @@ _021F2B2E:
beq _021F2B5A
_021F2B38:
ldr r0, [sp]
bl sub_02058458
bl MapObject_GetSpriteID
add r4, r0, #0
bl sub_0205C334
cmp r0, #1
@@ -1615,7 +1615,7 @@ _021F2B5A:
add r1, sp, #0
add r2, sp, #4
mov r3, #1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #1
beq _021F2B2E
_021F2B6A:
@@ -1636,7 +1636,7 @@ ov05_021F2B70: ; 0x021F2B70
add r2, sp, #4
mov r3, #1
add r7, r0, #0
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #1
bne _021F2BEE
_021F2B8E:
@@ -1647,7 +1647,7 @@ _021F2B8E:
beq _021F2BDE
_021F2B98:
ldr r0, [sp]
bl sub_02058458
bl MapObject_GetSpriteID
add r4, r0, #0
ldr r0, _021F2BF4 ; =0x0000FFFF
cmp r4, r0
@@ -1682,7 +1682,7 @@ _021F2BDE:
add r1, sp, #0
add r2, sp, #4
mov r3, #1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #1
beq _021F2B8E
_021F2BEE:
@@ -1705,7 +1705,7 @@ ov05_021F2BF8: ; 0x021F2BF8
add r2, sp, #4
mov r3, #1
add r7, r0, #0
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #1
bne _021F2C74
_021F2C16:
@@ -1726,7 +1726,7 @@ _021F2C20:
cmp r0, #1
bne _021F2C64
ldr r0, [sp]
bl sub_02058458
bl MapObject_GetSpriteID
add r4, r0, #0
bl sub_0205C334
cmp r0, #1
@@ -1750,7 +1750,7 @@ _021F2C64:
add r1, sp, #0
add r2, sp, #4
mov r3, #1
bl sub_020580F4
bl MapObjectManager_GetNextObjectWithFlagFromIndex
cmp r0, #1
beq _021F2C16
_021F2C74:
@@ -2030,12 +2030,12 @@ ov05_021F2E0C: ; 0x021F2E0C
bne _021F2E1C
mov r1, #1
lsl r1, r1, #0x16
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r3, pc}
_021F2E1C:
mov r1, #1
lsl r1, r1, #0x16
bl sub_02058418
bl MapObject_ClearFlagsBits
pop {r3, pc}
.balign 4, 0
@@ -2044,7 +2044,7 @@ ov05_021F2E28: ; 0x021F2E28
push {r3, lr}
mov r1, #1
lsl r1, r1, #0x16
bl sub_02058424
bl MapObject_GetFlagsBits
cmp r0, #0
beq _021F2E3A
mov r0, #1
@@ -2172,7 +2172,7 @@ ov05_021F2ED0: ; 0x021F2ED0
thumb_func_start ov05_021F2F3C
ov05_021F2F3C: ; 0x021F2F3C
push {r3, lr}
bl sub_02058578
bl MapObject_GetManager
bl sub_020583A0
pop {r3, pc}
@@ -2202,7 +2202,7 @@ ov05_021F2F6C: ; 0x021F2F6C
add r6, r1, #0
lsl r1, r4, #9
add r5, r0, #0
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
bne _021F2F80
mov r4, #0
@@ -2210,13 +2210,13 @@ _021F2F80:
mov r1, #1
add r0, r5, #0
lsl r1, r1, #0xc
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
bne _021F2F9E
mov r1, #2
add r0, r5, #0
lsl r1, r1, #0xc
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #0
bne _021F2F9E
mov r4, #0
@@ -2803,7 +2803,7 @@ _021F338A:
mov r1, #2
ldr r0, [r4, #4]
lsl r1, r1, #0x14
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
ldr r0, [r4, #4]
bne _021F33A8
@@ -2862,17 +2862,17 @@ _021F33E2:
str r4, [r5, r0]
add r0, r0, #4
ldr r0, [r5, r0]
bl sub_0205839C
bl MapObjectManager_GetPriority
add r6, r0, #0
ldr r0, _021F3448 ; =ov05_021F30C4
add r1, r5, #0
add r2, r6, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x18]
ldr r0, _021F344C ; =ov05_021F3358
add r1, r5, #0
add r2, r6, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x1c]
ldr r0, _021F3450 ; =ov05_021F3240
add r1, r5, #0
@@ -2932,10 +2932,10 @@ ov05_021F3490: ; 0x021F3490
bne _021F34D2
_021F34A8:
add r0, r5, #0
bl sub_02058458
bl MapObject_GetSpriteID
add r6, r0, #0
add r0, r5, #0
bl sub_02058578
bl MapObject_GetManager
add r7, r0, #0
add r0, r5, #0
bl sub_020576A8
@@ -2977,7 +2977,7 @@ ov05_021F34DC: ; 0x021F34DC
str r0, [r5]
add r0, r7, #0
str r7, [r5, #0x50]
bl sub_02058458
bl MapObject_GetSpriteID
add r6, r0, #0
bl ov05_021F2DE8
ldr r4, _021F36C4 ; =ov05_021F9094
@@ -3124,7 +3124,7 @@ _021F35EC:
_021F3658:
add r0, r7, #0
add r1, sp, #0x1c
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r7, #0
bl ov05_021E4C24
ldr r1, [sp, #0xc]
@@ -3153,7 +3153,7 @@ _021F367A:
ldr r0, [sp, #0x18]
lsl r1, r1, #2
ldr r0, [r0, r1]
bl sub_0205839C
bl MapObjectManager_GetPriority
ldr r0, _021F36D4 ; =ov05_021F36D8
add r1, r5, #0
mov r2, #0xff
@@ -3188,7 +3188,7 @@ ov05_021F36D8: ; 0x021F36D8
pop {r4, r5, r6, pc}
_021F36EC:
add r0, r4, #0
bl sub_02058830
bl MapObject_IsInUse
cmp r0, #0
beq _021F3700
add r0, r4, #0
@@ -3216,7 +3216,7 @@ _021F370A:
pop {r4, r5, r6, pc}
_021F3730:
add r0, r4, #0
bl sub_02058458
bl MapObject_GetSpriteID
ldr r1, [r5]
cmp r1, r0
beq _021F377C
arm9/overlays/05/asm/ov05_021F3FE0.s
+1 -1
View File
@@ -572,7 +572,7 @@ ov05_021F43E4: ; 0x021F43E4
str r2, [r0]
ldr r0, _021F4440 ; =ov05_021F4200
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_021F4440: .word ov05_021F4200
arm9/overlays/05/asm/ov05_021F46C8.s
+1 -1
View File
@@ -71,7 +71,7 @@ _021F4732:
ldr r0, _021F47A8 ; =ov05_021F47B4
add r1, r4, #0
add r2, #0xec
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r2, #0xc7
lsl r2, r2, #2
str r0, [r4, r2]
arm9/overlays/05/asm/ov05_021F5C44.s
+1 -1
View File
@@ -126,7 +126,7 @@ ov05_021F5D2C: ; 0x021F5D2C
ldr r0, _021F5D4C ; =ov05_021F5D7C
mov r2, #0x80
str r6, [r1]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
.align 2, 0
_021F5D4C: .word ov05_021F5D7C
arm9/overlays/05/asm/ov05_021F61F4.s
+1 -1
View File
@@ -27,7 +27,7 @@ ov05_021F61F4: ; 0x021F61F4
ldr r0, _021F622C ; =ov05_021F6270
ldr r2, _021F6230 ; =0x0000FFFF
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
.align 2, 0
_021F622C: .word ov05_021F6270
arm9/overlays/05/include/ov05_021E72FC.h
+6 -4
View File
@@ -2,21 +2,23 @@
#define POKEDIAMOND_ov05_021E72FC_H
#include "nitro/types.h"
#include "field_system.h"
#include "task.h"
typedef struct UnkStruct021E7358
{
u32 Unk00;
u32 Unk04;
u32 Unk08;
u32 Unk0C;
FieldSystem *fieldSystem;
u32 Unk10;
} UnkStruct021E7358;
BOOL ov05_021E72FC(u32 param0, u32 param1);
void ov05_021E7358(u32 param0, u32 param1, u32 param2);
BOOL ov05_021E72FC(FieldSystem *fieldSystem, u32 param1);
void ov05_021E7358(FieldSystem *fieldSystem, u32 param1, u32 param2);
u32 ov05_021E7388(u32 param0);
BOOL ov05_021E73B4(UnkStruct021E7358 *param0);
BOOL ov05_021E73B4(TaskManager *taskManager);
UnkStruct021E7358 *ov05_021E74D4(u32 param0);
void ov05_021E74F8(UnkStruct021E7358 *param0);
arm9/overlays/05/src/ov05_021E72FC.c
+19 -20
View File
@@ -2,25 +2,24 @@
#include "ov05_021E72FC.h"
#include "constants/sndseq.h"
#include "heap.h"
#include "map_object.h"
#include "unk_020051F4.h"
extern void FieldSystem_CreateTask(u32 param0, void *func, UnkStruct021E7358 *param2);
extern u32 PlayerAvatar_GetMapObject(u32 param0);
extern u32 sub_02058720(u32 param0);
extern LocalMapObject *PlayerAvatar_GetMapObject(u32 param0);
extern u32 sub_02058720(LocalMapObject *object);
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 *TaskManager_GetEnvironment(UnkStruct021E7358 *param0);
extern void sub_02058410(u32 param0, u32 param1);
extern void MapObject_SetFlagsBits(LocalMapObject *object, u32 bits);
extern BOOL sub_02057254(u32 param0);
extern u32 sub_0205AFDC(u32 param0, u32 param1);
extern void sub_02057260(u32 param0, u32 param1);
extern void sub_02055304(u32 param0, u32 param1);
extern BOOL sub_02056B74(u32 param0, u32 param1, u32 param2);
extern void sub_02058418(u32 param0, u32 param1);
extern BOOL sub_02056B74(u32 param0, LocalMapObject *object, u32 param2);
extern void MapObject_ClearFlagsBits(LocalMapObject *object, u32 bits);
BOOL ov05_021E72FC(u32 param0, u32 param1)
BOOL ov05_021E72FC(FieldSystem *fieldSystem, u32 param1)
{
u8 res = (u8)sub_02058720(PlayerAvatar_GetMapObject(param1));
u32 r2;
@@ -46,18 +45,18 @@ BOOL ov05_021E72FC(u32 param0, u32 param1)
}
return FALSE;
label:
ov05_021E7358(param0, param1, r2);
ov05_021E7358(fieldSystem, param1, r2);
return TRUE;
}
void ov05_021E7358(u32 param0, u32 param1, u32 param2)
void ov05_021E7358(FieldSystem *fieldSystem, u32 param1, u32 param2)
{
UnkStruct021E7358 *res = ov05_021E74D4(24);
res->Unk0C = param0;
res->fieldSystem = fieldSystem;
res->Unk10 = param1;
res->Unk00 = param2;
PlaySE(SEQ_SE_DP_F209);
FieldSystem_CreateTask(param0, ov05_021E73B4, res);
FieldSystem_CreateTask(fieldSystem, ov05_021E73B4, res);
}
u32 ov05_021E7388(u32 param0)
@@ -76,15 +75,15 @@ u32 ov05_021E7388(u32 param0)
return 0;
}
BOOL ov05_021E73B4(UnkStruct021E7358 *param0)
BOOL ov05_021E73B4(TaskManager *taskManager)
{
UnkStruct021E7358 *strct = TaskManager_GetEnvironment(param0);
u32 res = PlayerAvatar_GetMapObject(strct->Unk10);
u8 res2 = (u8)sub_02058720(res);
UnkStruct021E7358 *strct = TaskManager_GetEnvironment(taskManager);
LocalMapObject *playerObject = PlayerAvatar_GetMapObject(strct->Unk10);
u8 res2 = (u8)sub_02058720(playerObject);
switch (strct->Unk08)
{
case 0:
sub_02058410(res, 1 << 8);
MapObject_SetFlagsBits(playerObject, MAPOBJECTFLAG_UNK8);
strct->Unk08++;
break;
case 1:
@@ -127,13 +126,13 @@ BOOL ov05_021E73B4(UnkStruct021E7358 *param0)
{
strct->Unk00 = ov05_021E7388(strct->Unk00);
}
if (sub_02056B74(strct->Unk10, res, strct->Unk00) == FALSE)
if (sub_02056B74(strct->Unk10, playerObject, strct->Unk00) == FALSE)
{
strct->Unk08 = 1;
break;
}
sub_02058418(res, 0x80);
sub_02058418(res, 1 << 8);
MapObject_ClearFlagsBits(playerObject, MAPOBJECTFLAG_UNK7);
MapObject_ClearFlagsBits(playerObject, MAPOBJECTFLAG_UNK8);
sub_02055304(strct->Unk10, strct->Unk00);
ov05_021E74F8(strct);
sub_020054F0(1624, 0);
arm9/overlays/06/asm/overlay_06.s
+102 -102
View File
@@ -309,17 +309,17 @@ ov06_022398D8: ; 0x022398D8
push {r4, lr}
ldr r0, [r0, #0x34]
add r4, r2, #0
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
cmp r4, #1
bne _022398F0
mov r1, #1
lsl r1, r1, #0x14
bl sub_02058410
bl MapObject_SetFlagsBits
pop {r4, pc}
_022398F0:
mov r1, #1
lsl r1, r1, #0x14
bl sub_02058418
bl MapObject_ClearFlagsBits
pop {r4, pc}
.align 2, 0
@@ -1121,17 +1121,17 @@ ov06_02239F04: ; 0x02239F04
ldr r0, [r1, #0x34]
mov r1, #5
add r4, r2, #0
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r5, r0, #0
bne _02239F18
bl GF_AssertFail
_02239F18:
add r0, r5, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r5, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
lsl r0, r0, #0x10
lsr r5, r0, #0x10
mov r0, #4
@@ -2325,7 +2325,7 @@ ov06_0223A7AC: ; 0x0223A7AC
add r1, r4, #0
lsl r2, r2, #0xa
str r3, [r4, r5]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
nop
_0223A7D8: .word ov06_0223A8A8
@@ -2357,7 +2357,7 @@ ov06_0223A800: ; 0x0223A800
mov r2, #0
lsl r0, r0, #4
str r2, [r1, r0]
ldr r3, _0223A818 ; =sub_0200CA44
ldr r3, _0223A818 ; =SysTask_CreateOnMainQueue
mov r2, #4
sub r0, r0, #4
str r2, [r1, r0]
@@ -2365,7 +2365,7 @@ ov06_0223A800: ; 0x0223A800
lsl r2, r2, #8
bx r3
.align 2, 0
_0223A818: .word sub_0200CA44
_0223A818: .word SysTask_CreateOnMainQueue
_0223A81C: .word ov06_0223A944
thumb_func_start ov06_0223A820
@@ -3000,7 +3000,7 @@ ov06_0223ACD8: ; 0x0223ACD8
bl ov06_0223ADB4
ldr r0, [r4, #8]
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
mov r0, #1
ldr r1, [sp, #8]
lsl r0, r0, #0x10
@@ -3115,7 +3115,7 @@ ov06_0223ADB4: ; 0x0223ADB4
add r4, r0, #0
ldr r0, [r1, #0x34]
add r1, r2, #0
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
str r0, [r4]
cmp r0, #0
bne _0223ADCA
@@ -4672,9 +4672,9 @@ ov06_0223B8EC: ; 0x0223B8EC
add r0, #0xd8
ldr r0, [r0]
ldr r0, [r0, #0x34]
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r1, [sp]
ldr r2, [sp, #4]
ldr r3, [sp, #8]
@@ -11865,7 +11865,7 @@ _0223F2AA:
ldr r0, _0223F338 ; =ov06_0223FAA4
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _0223F330 ; =0x02252420
ldr r0, [r0]
bl ov06_0223F344
@@ -12573,7 +12573,7 @@ ov06_0223F8C8: ; 0x0223F8C8
ldr r0, _0223F94C ; =ov06_0223FAA4
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
bl ov06_0223F95C
ldr r0, _0223F950 ; =0x02252420
ldr r0, [r0]
@@ -13587,7 +13587,7 @@ _02240144:
ldr r0, _02240160 ; =ov06_02240164
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x44
pop {r3, r4, r5, r6, pc}
nop
@@ -13907,7 +13907,7 @@ ov06_022403E0: ; 0x022403E0
ldr r0, _02240410 ; =ov06_0223FAA4
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _02240414 ; =ov06_02240474
bl ov06_0223F8BC
pop {r4, pc}
@@ -13941,7 +13941,7 @@ ov06_02240418: ; 0x02240418
ldr r0, _0224046C ; =ov06_0223FAA4
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _02240470 ; =ov06_02240474
bl ov06_0223F8BC
ldr r0, _02240468 ; =0x02252420
@@ -14214,7 +14214,7 @@ ov06_02240668: ; 0x02240668
ldr r0, _022406A4 ; =ov06_022406A8
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, pc}
.align 2, 0
_022406A0: .word ov06_02252420
@@ -14250,7 +14250,7 @@ ov06_022406D4: ; 0x022406D4
ldr r0, _022406E8 ; =ov06_022406EC
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, pc}
.align 2, 0
_022406E8: .word ov06_022406EC
@@ -23441,14 +23441,14 @@ ov06_02244EF8: ; 0x02244EF8
mov r2, #1
lsl r0, r0, #2
str r2, [r1, r0]
ldr r3, _02244F10 ; =sub_0200CA44
ldr r3, _02244F10 ; =SysTask_CreateOnMainQueue
mov r2, #0
add r0, r0, #4
str r2, [r1, r0]
ldr r0, _02244F14 ; =ov06_02244F64
bx r3
nop
_02244F10: .word sub_0200CA44
_02244F10: .word SysTask_CreateOnMainQueue
_02244F14: .word ov06_02244F64
thumb_func_start ov06_02244F18
@@ -26531,12 +26531,12 @@ ov06_0224666C: ; 0x0224666C
bne _0224668E
ldr r0, _02246698 ; =ov06_022466E8
mov r2, #0x85
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
_0224668E:
ldr r0, _0224669C ; =ov06_02246AA8
mov r2, #0x85
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
.align 2, 0
_02246698: .word ov06_022466E8
@@ -30393,7 +30393,7 @@ ov06_022483BC: ; 0x022483BC
ldr r0, _022483DC ; =ov06_02248400
mov r2, #0x85
str r5, [r1, #0x14]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
.align 2, 0
_022483DC: .word ov06_02248400
@@ -32375,11 +32375,11 @@ ov06_022492EC: ; 0x022492EC
ldr r0, [r4, #0x20]
bl ov05_021E4C20
ldr r0, [r0, #0x34]
bl sub_0205839C
bl MapObjectManager_GetPriority
sub r2, r0, #1
ldr r0, _0224930C ; =ov06_02249388
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x24]
pop {r4, pc}
nop
@@ -32663,7 +32663,7 @@ ov06_02249508: ; 0x02249508
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x1c]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
mov r1, #2
bl sub_0205829C
@@ -32697,13 +32697,13 @@ ov06_0224954C: ; 0x0224954C
bl sub_02064754
str r0, [r4, #0x10]
ldr r0, [r4, #0x1c]
bl sub_02058458
bl MapObject_GetSpriteID
str r0, [r4]
ldr r0, [r4, #0x1c]
bl MapObject_GetID
str r0, [r4, #4]
ldr r0, [r4, #0x1c]
bl sub_020589CC
bl MapObject_CheckFlag25
cmp r0, #1
ldr r0, [r4, #0x1c]
bne _0224958E
@@ -32754,7 +32754,7 @@ _022495D6:
str r0, [r4, #0xc]
ldr r1, _02249604 ; =0x00100200
add r0, r6, #0
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
bne _022495EE
mov r0, #1
@@ -32764,7 +32764,7 @@ _022495D6:
_022495EE:
add r0, r6, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_0206476C
@@ -32838,7 +32838,7 @@ ov06_02249668: ; 0x02249668
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x1c]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
mov r1, #2
bl sub_0205829C
@@ -32878,7 +32878,7 @@ _022496D0:
str r0, [r4, #0xc]
ldr r1, _022496FC ; =0x00100200
add r0, r6, #0
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
bne _022496E8
mov r0, #1
@@ -32888,7 +32888,7 @@ _022496D0:
_022496E8:
add r0, r6, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_0206476C
@@ -33028,7 +33028,7 @@ ov06_022497E8: ; 0x022497E8
sub sp, #0x24
add r5, r0, #0
add r4, r1, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #8]
add r0, r5, #0
bl ov05_021E4C24
@@ -33039,7 +33039,7 @@ ov06_022497E8: ; 0x022497E8
add r0, r5, #0
add r1, sp, #0x18
str r5, [sp, #0x14]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
mov r1, #2
bl sub_0205829C
@@ -33080,7 +33080,7 @@ ov06_02249834: ; 0x02249834
bl sub_02058450
str r0, [r4, #4]
ldr r0, [r4, #0x20]
bl sub_02058458
bl MapObject_GetSpriteID
str r0, [r4, #8]
bl sub_0205C334
cmp r0, #1
@@ -33129,7 +33129,7 @@ ov06_022498BC: ; 0x022498BC
ldr r6, [r4, #0x20]
add r5, r0, #0
add r0, r6, #0
bl sub_02058458
bl MapObject_GetSpriteID
add r7, r0, #0
bl sub_0205C334
cmp r0, #1
@@ -33205,7 +33205,7 @@ ov06_02249954: ; 0x02249954
ldr r4, [r5, #0x20]
add r6, r0, #0
add r0, r4, #0
bl sub_02058458
bl MapObject_GetSpriteID
add r7, r0, #0
bl sub_0205C334
cmp r0, #1
@@ -33295,7 +33295,7 @@ ov06_02249A00: ; 0x02249A00
neg r6, r0
ldr r0, [sp]
ldr r7, [r4]
bl sub_02058B5C
bl MapObject_GetPositionVec
ldr r0, [r5, #0x14]
add r1, r4, #0
bl sub_02059E9C
@@ -33334,7 +33334,7 @@ ov06_02249A68: ; 0x02249A68
add r4, r1, #0
add r5, r0, #0
ldr r0, [r4, #0x20]
bl sub_02058578
bl MapObject_GetManager
ldr r1, [r4, #8]
add r2, sp, #0
bl ov05_021F220C
@@ -33899,10 +33899,10 @@ ov06_02249E9C: ; 0x02249E9C
bl sub_02058B24
str r0, [sp, #0x10]
add r0, r5, #0
bl sub_02058B80
bl MapObject_GetPosVecYCoord
add r6, r0, #0
add r0, r5, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
str r0, [sp, #0x14]
add r0, r5, #0
bl sub_020584C8
@@ -34255,7 +34255,7 @@ ov06_0224A130: ; 0x0224A130
bl ov05_021E4C08
add r6, r0, #0
add r0, r5, #0
bl sub_02058458
bl MapObject_GetSpriteID
bl ov06_0224A0F0
add r2, r0, #0
add r0, sp, #0x14
@@ -34313,7 +34313,7 @@ _0224A1AC:
bl MapObject_GetID
str r0, [r4, #4]
ldr r0, [r4, #0x68]
bl sub_020589CC
bl MapObject_CheckFlag25
cmp r0, #1
ldr r0, [r4, #0x68]
bne _0224A1CE
@@ -34351,7 +34351,7 @@ ov06_0224A1DC: ; 0x0224A1DC
_0224A1FE:
add r0, r5, #0
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_02058B84
@@ -34506,7 +34506,7 @@ ov06_0224A310: ; 0x0224A310
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x1c]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
bl sub_02058744
add r1, r0, #1
@@ -34573,11 +34573,11 @@ _0224A3A6:
str r0, [r5, #8]
add r0, r4, #0
lsl r1, r1, #8
bl sub_0205842C
bl MapObject_TestFlagsBits
cmp r0, #1
beq _0224A3C8
add r0, r4, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r1, r4, #0
bl sub_0204B5FC
cmp r0, #0
@@ -34589,13 +34589,13 @@ _0224A3C8:
pop {r3, r4, r5, r6, pc}
_0224A3D0:
add r0, r4, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
add r1, r4, #0
bl sub_0204B684
str r0, [r5, #0xc]
add r0, r4, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r6, #0
add r1, sp, #0
bl sub_0206476C
@@ -35073,7 +35073,7 @@ ov06_0224A710: ; 0x0224A710
ldr r5, [r5, #0x18]
add r1, sp, #0xc
add r0, r5, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_02058B84
@@ -35158,7 +35158,7 @@ _0224A828:
bne _0224A86C
add r0, r6, #0
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r6, #0
add r1, sp, #0
bl sub_02058B84
@@ -35326,7 +35326,7 @@ ov06_0224A948: ; 0x0224A948
_0224A96A:
add r0, r5, #0
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_02058B84
@@ -35516,7 +35516,7 @@ ov06_0224AAB4: ; 0x0224AAB4
_0224AAD6:
add r0, r5, #0
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_02058B84
@@ -35649,7 +35649,7 @@ ov06_0224ABAC: ; 0x0224ABAC
cmp r0, #0
bne _0224ABF6
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
mov r1, #2
lsl r2, r4, #0x10
lsl r1, r1, #0xe
@@ -35670,7 +35670,7 @@ _0224ABF6:
add r1, sp, #0x14
str r0, [r2]
add r0, r5, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #8
bl sub_02058BB4
@@ -35762,7 +35762,7 @@ _0224ACBA:
mov r0, #0
str r0, [r5]
add r0, r4, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
mov r1, #0
mvn r1, r1
str r0, [r5, #4]
@@ -35814,7 +35814,7 @@ _0224AD06:
bl sub_02058BB4
add r0, r4, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
mov r0, #1
ldr r1, [r5, #0x1c]
lsl r0, r0, #0xc
@@ -36083,7 +36083,7 @@ ov06_0224AEE8: ; 0x0224AEE8
str r4, [sp, #0x1c]
str r0, [sp, #0x18]
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x20]
add r0, r4, #0
mov r1, #0x12
@@ -36108,7 +36108,7 @@ ov06_0224AEE8: ; 0x0224AEE8
_0224AF3E:
add r0, r5, #0
add r1, sp, #0xc
bl sub_02058B5C
bl MapObject_GetPositionVec
_0224AF46:
add r0, r5, #0
mov r1, #2
@@ -36192,7 +36192,7 @@ ov06_0224AFC4: ; 0x0224AFC4
bl sub_02058BB4
add r0, r4, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
add r1, sp, #0
bl sub_0206476C
@@ -36887,13 +36887,13 @@ ov06_0224B568: ; 0x0224B568
bl ov05_021E4C24
add r4, r0, #0
add r0, r5, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #8]
add r0, r5, #0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
str r0, [sp, #0xc]
add r0, r5, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x10]
add r0, r4, #0
str r4, [sp, #0x18]
@@ -36906,7 +36906,7 @@ ov06_0224B568: ; 0x0224B568
add r0, r5, #0
add r1, sp, #0x24
str r5, [sp, #0x20]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
mov r1, #2
bl sub_0205829C
@@ -36957,7 +36957,7 @@ ov06_0224B5D0: ; 0x0224B5D0
lsl r0, r0, #0x10
str r0, [sp, #8]
ldr r0, [r4, #0x30]
bl sub_02058B80
bl MapObject_GetPosVecYCoord
str r0, [sp, #4]
ldr r0, [r4, #0x24]
add r1, sp, #0
@@ -37092,10 +37092,10 @@ _0224B710:
pop {r3, r4, r5, r6, r7, pc}
_0224B72A:
add r0, r6, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r7, r0, #0
add r0, r6, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
ldr r1, [r4, #0x18]
cmp r1, r7
bne _0224B744
@@ -37464,7 +37464,7 @@ ov06_0224B9E0: ; 0x0224B9E0
bl ov05_021E4C24
add r4, r0, #0
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0x17
@@ -37621,7 +37621,7 @@ ov06_0224BB0C: ; 0x0224BB0C
_0224BB30:
add r0, r6, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
mov r0, #2
ldr r1, [sp, #8]
lsl r0, r0, #0xe
@@ -37719,7 +37719,7 @@ ov06_0224BBEC: ; 0x0224BBEC
bl ov05_021E4C24
add r4, r0, #0
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0x19
@@ -37729,12 +37729,12 @@ ov06_0224BBEC: ; 0x0224BBEC
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x20]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0
add r0, r5, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r1, r0, #0
add r0, r6, #0
add r2, sp, #8
@@ -37925,13 +37925,13 @@ ov06_0224BD90: ; 0x0224BD90
bl ov05_021E4C24
add r4, r0, #0
add r0, r5, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #8]
add r0, r5, #0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
str r0, [sp, #0xc]
add r0, r5, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x10]
add r0, r4, #0
str r4, [sp, #0x18]
@@ -37944,7 +37944,7 @@ ov06_0224BD90: ; 0x0224BD90
add r0, r5, #0
add r1, sp, #0x24
str r5, [sp, #0x20]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
mov r1, #2
bl sub_0205829C
@@ -37995,7 +37995,7 @@ ov06_0224BDF8: ; 0x0224BDF8
lsl r0, r0, #0x10
str r0, [sp, #8]
ldr r0, [r4, #0x30]
bl sub_02058B80
bl MapObject_GetPosVecYCoord
str r0, [sp, #4]
ldr r0, [r4, #0x24]
add r1, sp, #0
@@ -38121,10 +38121,10 @@ _0224BF2A:
str r0, [r4]
_0224BF40:
add r0, r6, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r7, r0, #0
add r0, r6, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
ldr r1, [r4, #0x18]
cmp r1, r7
bne _0224BF5A
@@ -38252,13 +38252,13 @@ ov06_0224C038: ; 0x0224C038
bl ov05_021E4C24
add r4, r0, #0
add r0, r5, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #8]
add r0, r5, #0
bl sub_02058B3C
bl MapObject_GetCurrentHeight
str r0, [sp, #0xc]
add r0, r5, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
str r0, [sp, #0x10]
add r0, r4, #0
str r4, [sp, #0x18]
@@ -38271,7 +38271,7 @@ ov06_0224C038: ; 0x0224C038
add r0, r5, #0
add r1, sp, #0x24
str r5, [sp, #0x20]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
mov r1, #2
bl sub_0205829C
@@ -38322,7 +38322,7 @@ ov06_0224C0A0: ; 0x0224C0A0
lsl r0, r0, #0x10
str r0, [sp, #8]
ldr r0, [r4, #0x30]
bl sub_02058B80
bl MapObject_GetPosVecYCoord
str r0, [sp, #4]
ldr r0, [r4, #0x24]
add r1, sp, #0
@@ -38454,10 +38454,10 @@ _0224C1DE:
str r0, [r4]
_0224C1F4:
add r0, r6, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r7, r0, #0
add r0, r6, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
ldr r1, [r4, #0x18]
cmp r1, r7
bne _0224C20E
@@ -40118,10 +40118,10 @@ ov06_0224CECC: ; 0x0224CECC
bl ov05_021E4C20
add r7, r0, #0
add r0, r5, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
str r0, [sp, #8]
add r0, r5, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r1, r0, #0
ldr r0, [sp, #8]
add r2, sp, #0x20
@@ -40651,7 +40651,7 @@ ov06_0224D2E0: ; 0x0224D2E0
bl ov05_021E4C24
add r4, r0, #0
add r0, r5, #0
bl MapObject_GetFieldSysPtr
bl MapObject_GetFieldSystem
str r0, [sp, #0x14]
add r0, r4, #0
mov r1, #0x1d
@@ -40661,12 +40661,12 @@ ov06_0224D2E0: ; 0x0224D2E0
add r0, r5, #0
add r1, sp, #8
str r5, [sp, #0x20]
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r5, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r6, r0, #0
add r0, r5, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r1, r0, #0
add r0, r6, #0
add r2, sp, #8
@@ -43298,18 +43298,18 @@ ov06_0224E858: ; 0x0224E858
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r7, r2, #0
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
add r6, r0, #0
add r1, sp, #0
bl sub_02058B5C
bl MapObject_GetPositionVec
add r0, r6, #0
bl sub_02058B2C
bl MapObject_GetCurrentX
add r5, r0, #0
add r0, r6, #0
bl sub_02058B4C
bl MapObject_GetCurrentY
add r4, r0, #0
add r0, r6, #0
bl sub_020584C4
bl MapObject_GetFacingDirection
cmp r0, #3
bhi _0224E8A8
add r0, r0, r0
@@ -44528,7 +44528,7 @@ _0224F144:
mov r2, #0
add r1, r6, #0
strh r2, [r5]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0224F16C: .word ov06_02252210
arm9/overlays/08/asm/overlay_08.s
+19 -19
View File
@@ -115,7 +115,7 @@ _02211F18:
ldr r2, [sp, #0x10]
add r0, r5, #0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
thumb_func_start ov08_02211F24
@@ -1003,13 +1003,13 @@ _02212544:
thumb_func_start ov08_0221255C
ov08_0221255C: ; 0x0221255C
ldr r3, _02212568 ; =sub_0200CA44
ldr r3, _02212568 ; =SysTask_CreateOnMainQueue
str r0, [r1, #0x38]
ldr r0, _0221256C ; =ov08_02212574
ldr r2, _02212570 ; =0x0000044C
bx r3
nop
_02212568: .word sub_0200CA44
_02212568: .word SysTask_CreateOnMainQueue
_0221256C: .word ov08_02212574
_02212570: .word 0x0000044C
@@ -3227,7 +3227,7 @@ _02213500:
ldr r0, _02213628 ; =ov08_022133F4
ldr r1, [r5, r1]
ldr r2, _0221362C ; =0x00001001
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #0x5e
lsl r1, r1, #2
ldr r1, [r5, r1]
@@ -3698,7 +3698,7 @@ _0221393A:
strb r1, [r0, #5]
ldr r0, _0221399C ; =ov08_022133A8
ldr r1, [r6, r5]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [r6, r5]
str r0, [r1, #0xc]
_02213990:
@@ -3994,7 +3994,7 @@ _02213BBC:
ldr r0, _02213BD0 ; =ov08_022139FC
add r1, r1, r4
lsl r2, r2, #0xc
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
_02213BCA:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
@@ -5333,7 +5333,7 @@ _022145C0:
ldr r0, _022145F0 ; =ov08_022144C0
ldr r2, _022145F4 ; =0x00001001
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r0, #0
pop {r3, r4, r5, pc}
nop
@@ -5435,7 +5435,7 @@ _022146A6:
ldr r0, _022146CC ; =ov08_022146E4
add r1, r6, #0
lsl r2, r2, #0xc
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r0, #0
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
@@ -5766,7 +5766,7 @@ ov08_02214910: ; 0x02214910
str r0, [r4, #0x18]
ldr r0, _0221495C ; =ov08_022148E0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
.align 2, 0
_02214954: .word 0x0000044C
@@ -5858,7 +5858,7 @@ ov08_022149B8: ; 0x022149B8
str r0, [r4, #0x18]
ldr r0, _02214A08 ; =ov08_022148E0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
nop
_02214A00: .word 0x0000044C
@@ -6006,7 +6006,7 @@ _02214B12:
ldr r0, _02214B20 ; =ov08_022148E0
ldr r2, _02214B24 ; =0x0000044C
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02214B20: .word ov08_022148E0
@@ -14039,7 +14039,7 @@ ov08_022186D4: ; 0x022186D4
ldr r0, _02218700 ; =ov08_0221868C
add r1, r4, #0
str r2, [r4, #0x24]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #8
pop {r4, r5, r6, pc}
nop
@@ -14674,7 +14674,7 @@ _02218B70:
ldr r0, _02218B88 ; =ov08_02218A84
ldr r2, [sp, #0x30]
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
add r0, r4, #0
pop {r3, r4, r5, r6, r7, pc}
@@ -14933,7 +14933,7 @@ ov08_02218D38: ; 0x02218D38
ldr r0, _02218D58 ; =ov08_02218D14
lsl r2, r2, #0xc
str r4, [r1, #4]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, pc}
.align 2, 0
_02218D58: .word ov08_02218D14
@@ -45425,7 +45425,7 @@ _0222854E:
ldr r0, _0222856C ; =ov08_022282B4
add r1, r4, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r1, r4, #0
bl ov08_022282B4
pop {r4, pc}
@@ -45453,7 +45453,7 @@ ov08_02228574: ; 0x02228574
ldr r0, _022285A0 ; =ov08_022285BC
add r1, r5, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r5, #0x84
str r0, [r5]
pop {r3, r4, r5, pc}
@@ -45637,7 +45637,7 @@ _022286DE:
ldr r0, _02228708 ; =ov08_02228620
ldr r2, _0222870C ; =0x000003E9
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, [sp]
add r7, r7, #1
add r0, r0, #4
@@ -48170,7 +48170,7 @@ _022299B2:
ldr r0, _022299E4 ; =ov08_022298C0
add r1, r4, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r1, r4, #0
add r1, #0xcc
str r0, [r1]
@@ -49267,7 +49267,7 @@ ov08_0222A1DC: ; 0x0222A1DC
ldr r0, _0222A200 ; =ov08_0222A208
add r1, r4, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x18]
pop {r4, pc}
nop
arm9/overlays/11/asm/ov11_0222D5C0_1.s
+2 -2
View File
@@ -1018,12 +1018,12 @@ _0222DC42:
ldr r0, _0222DF34 ; =ov11_0222F100
ldr r2, _0222DF38 ; =0x0000EA60
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x1c]
ldr r0, _0222DF3C ; =ov11_0222F144
ldr r2, _0222DF40 ; =0x0000C350
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x20]
mov r2, #0x4b
ldr r0, _0222DF44 ; =ov11_0222F254
arm9/overlays/11/asm/ov11_02232264.s
+2 -2
View File
@@ -3088,7 +3088,7 @@ ov11_02233A78: ; 0x02233A78
str r2, [r0, #0x48]
ldr r0, _02233AB4 ; =ov11_0223A79C
ldr r1, [r4, r1]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r0, #0
pop {r3, r4, r5, pc}
nop
@@ -3487,7 +3487,7 @@ ov11_02233D7C: ; 0x02233D7C
str r3, [r0, #0x2c]
ldr r0, _02233DC8 ; =ov11_0223B49C
ldr r1, [r4, r1]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r0, #0
pop {r4, r5, r6, pc}
.align 2, 0
arm9/overlays/11/asm/ov11_0224D550.s
+45 -45
View File
@@ -16,7 +16,7 @@ ov11_0224D550: ; 0x0224D550
strb r2, [r1, #0x14]
ldr r0, _0224D570 ; =ov11_022530A0
strb r2, [r1, #0x15]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, pc}
nop
_0224D570: .word ov11_022530A0
@@ -221,7 +221,7 @@ _0224D6D8:
lsr r0, r0, #0x1f
str r0, [r4, #0x28]
ldr r0, _0224D734 ; =ov11_0224EEA0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x58
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -383,7 +383,7 @@ _0224D774:
strh r2, [r0]
ldr r0, _0224D878 ; =ov11_0224F2DC
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -595,7 +595,7 @@ _0224D9C2:
ldr r0, _0224DA28 ; =ov11_0224F7C4
add r1, r5, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
nop
@@ -691,7 +691,7 @@ _0224DA92:
ldr r0, _0224DAE4 ; =ov11_0224FD90
add r1, r2, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@@ -739,7 +739,7 @@ ov11_0224DAE8: ; 0x0224DAE8
ldr r0, _0224DB48 ; =ov11_0224FFF0
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0224DB44: .word ov11_0225E84A
@@ -927,7 +927,7 @@ _0224DCBE:
ldr r0, _0224DCE0 ; =ov11_02250060
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -981,7 +981,7 @@ _0224DD30:
ldr r0, _0224DD40 ; =ov11_02250338
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0224DD40: .word ov11_02250338
@@ -1018,7 +1018,7 @@ _0224DD7A:
strb r0, [r1, #0xb]
ldr r0, _0224DD88 ; =ov11_022508A4
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
nop
_0224DD88: .word ov11_022508A4
@@ -1102,7 +1102,7 @@ _0224DDB8:
add r1, r4, #0
strb r0, [r4, #9]
ldr r0, _0224DE4C ; =ov11_0225092C
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -1201,7 +1201,7 @@ ov11_0224DE50: ; 0x0224DE50
ldr r0, _0224DF14 ; =ov11_022509B4
add r1, r4, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x10]
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -1238,7 +1238,7 @@ ov11_0224DF18: ; 0x0224DF18
ldr r0, _0224DF5C ; =ov11_02250A28
add r1, r4, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x10]
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1353,7 +1353,7 @@ _0224E004:
add r1, r4, #0
ldr r0, [r0]
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
thumb_func_start ov11_0224E034
@@ -1410,7 +1410,7 @@ _0224E076:
strh r0, [r3, #0x22]
ldr r0, [sp]
ldr r0, [r0, #4]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -1479,7 +1479,7 @@ _0224E120:
ldr r0, [r7, #8]
add r1, r6, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -1565,7 +1565,7 @@ _0224E1A8:
add r1, r4, #0
ldr r0, [r0, #0xc]
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -1623,7 +1623,7 @@ _0224E220:
add r1, r2, #0
ldr r0, [r0, #0x10]
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -1658,7 +1658,7 @@ ov11_0224E248: ; 0x0224E248
ldr r0, [r4, #8]
str r0, [r1, #0x14]
ldr r0, [r5, #0x14]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1705,7 +1705,7 @@ ov11_0224E28C: ; 0x0224E28C
ldr r0, _0224E2F0 ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -1743,7 +1743,7 @@ ov11_0224E2F4: ; 0x0224E2F4
ldr r0, _0224E340 ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0224E340: .word ov11_02253008
@@ -1823,7 +1823,7 @@ _0224E3BC:
ldr r0, _0224E3DC ; =ov11_02252754
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0224E3DC: .word ov11_02252754
@@ -1848,7 +1848,7 @@ ov11_0224E3E0: ; 0x0224E3E0
strb r0, [r1, #8]
ldr r0, _0224E40C ; =ov11_022529C0
strb r2, [r1, #0xa]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
.align 2, 0
_0224E40C: .word ov11_022529C0
@@ -1913,7 +1913,7 @@ _0224E480:
ldr r0, _0224E498 ; =ov11_02252A1C
add r1, r4, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x10]
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -1965,7 +1965,7 @@ _0224E4AE:
ldr r0, _0224E50C ; =ov11_02252A70
add r1, r4, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x10]
pop {r3, r4, r5, r6, r7, pc}
_0224E4FA:
@@ -2091,7 +2091,7 @@ _0224E5A0:
blt _0224E5A0
ldr r0, _0224E5F4 ; =ov11_02252B30
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@@ -2145,7 +2145,7 @@ ov11_0224E628: ; 0x0224E628
ldrb r0, [r4, r0]
strb r0, [r1, #5]
ldr r0, _0224E658 ; =ov11_02252DB4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
nop
_0224E658: .word ov11_02252DB4
@@ -2226,7 +2226,7 @@ _0224E6AA:
blt _0224E6AA
ldr r0, _0224E6F8 ; =ov11_02252E50
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -2298,7 +2298,7 @@ ov11_0224E734: ; 0x0224E734
ldr r0, _0224E78C ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -2338,7 +2338,7 @@ ov11_0224E790: ; 0x0224E790
ldr r0, _0224E7E4 ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -2378,7 +2378,7 @@ ov11_0224E7E8: ; 0x0224E7E8
ldr r0, _0224E83C ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -2417,7 +2417,7 @@ ov11_0224E840: ; 0x0224E840
ldr r0, _0224E890 ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -2457,7 +2457,7 @@ ov11_0224E894: ; 0x0224E894
ldr r0, _0224E8E8 ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -2486,7 +2486,7 @@ ov11_0224E8EC: ; 0x0224E8EC
strb r2, [r1, #0xa]
ldr r0, _0224E920 ; =ov11_02252FBC
str r4, [r1, #4]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
nop
_0224E920: .word ov11_02252FBC
@@ -2527,7 +2527,7 @@ ov11_0224E924: ; 0x0224E924
ldr r0, _0224E9BC ; =ov11_0225304C
add r1, r7, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_0224E976:
cmp r2, #1
@@ -2676,7 +2676,7 @@ ov11_0224EA74: ; 0x0224EA74
ldrb r0, [r4, #1]
strb r0, [r1, #0xe]
ldr r0, _0224EAA8 ; =ov11_022533F4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
.align 2, 0
_0224EAA8: .word ov11_022533F4
@@ -2708,7 +2708,7 @@ ov11_0224EAAC: ; 0x0224EAAC
ldrb r0, [r4, #2]
strb r0, [r1, #0xd]
ldr r0, _0224EAE8 ; =ov11_0225352C
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
nop
_0224EAE8: .word ov11_0225352C
@@ -2746,7 +2746,7 @@ _0224EB16:
ldr r0, _0224EB30 ; =ov11_0225359C
mov r2, #0
strb r2, [r1, #0xe]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
.align 2, 0
_0224EB30: .word ov11_0225359C
@@ -2775,7 +2775,7 @@ ov11_0224EB34: ; 0x0224EB34
strb r0, [r1, #6]
ldr r0, _0224EB68 ; =ov11_02253650
strb r2, [r1, #0xe]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
.align 2, 0
_0224EB68: .word ov11_02253650
@@ -2814,7 +2814,7 @@ _0224EB96:
strb r0, [r1, #0xe]
ldr r0, _0224EBB4 ; =ov11_0225359C
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
nop
_0224EBB4: .word ov11_0225359C
@@ -2844,7 +2844,7 @@ ov11_0224EBB8: ; 0x0224EBB8
mov r0, #1
strb r0, [r1, #0xe]
ldr r0, _0224EBF0 ; =ov11_02253650
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
nop
_0224EBF0: .word ov11_02253650
@@ -2940,7 +2940,7 @@ ov11_0224EC80: ; 0x0224EC80
ldr r0, [r4, #0x20]
str r0, [r1, #8]
ldr r0, _0224ECB4 ; =ov11_022536D4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
.align 2, 0
_0224ECB4: .word ov11_022536D4
@@ -2969,7 +2969,7 @@ ov11_0224ECB8: ; 0x0224ECB8
ldr r0, [r4, #0x20]
str r0, [r1, #8]
ldr r0, _0224ECEC ; =ov11_02253720
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
.align 2, 0
_0224ECEC: .word ov11_02253720
@@ -3007,7 +3007,7 @@ ov11_0224ECF0: ; 0x0224ECF0
ldr r0, _0224ED40 ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -3046,7 +3046,7 @@ ov11_0224ED44: ; 0x0224ED44
ldr r0, _0224ED94 ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -3085,7 +3085,7 @@ ov11_0224ED98: ; 0x0224ED98
ldr r0, _0224EDE8 ; =ov11_02253008
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.align 2, 0
arm9/overlays/11/asm/ov11_0225464C.s
+1 -1
View File
@@ -25,7 +25,7 @@ ov11_0225464C: ; 0x0225464C
ldr r0, _02254684 ; =ov11_022546B4
ldr r2, _02254688 ; =0x000003F2
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #0x66
lsl r1, r1, #2
str r0, [r4, r1]
arm9/overlays/11/asm/ov11_02256C08.s
+3 -3
View File
@@ -1017,7 +1017,7 @@ _022573C4:
ldr r0, _022573D0 ; =ov11_022573D8
ldr r2, _022573D4 ; =0x000003DE
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
.align 2, 0
_022573D0: .word ov11_022573D8
@@ -2633,7 +2633,7 @@ ov11_0225805C: ; 0x0225805C
add r1, r4, #0
lsl r2, r2, #2
str r6, [r4, #4]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
nop
_0225808C: .word ov11_02258090
@@ -2779,7 +2779,7 @@ ov11_02258188: ; 0x02258188
ldr r0, _022581A8 ; =ov11_022581D4
ldr r2, _022581AC ; =0x000003F2
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x50]
_022581A6:
pop {r4, pc}
arm9/overlays/11/asm/ov11_02258428.s
+7 -7
View File
@@ -112,7 +112,7 @@ ov11_022584D4: ; 0x022584D4
str r0, [r6, r2]
ldr r0, _02258644 ; =ov11_0225B794
add r2, #0x56
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02258648 ; =0x000006AC
mov r7, #2
str r0, [r6, r1]
@@ -251,7 +251,7 @@ _022585DE:
ldr r0, _02258650 ; =ov11_0225B824
ldr r2, _02258654 ; =0x0000D6D8
add r1, r6, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r6, #0x64]
add r0, r6, #0
add sp, #0x1c
@@ -753,7 +753,7 @@ _02258A82:
ldr r0, _02258AFC ; =ov11_02258BE0
ldr r1, [sp, #0x14]
ldr r2, _02258B00 ; =0x00000514
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [sp, #0x14]
str r0, [r1, #4]
add r0, r1, #0
@@ -1551,7 +1551,7 @@ ov11_02259098: ; 0x02259098
ldr r0, _022590C0 ; =ov11_022590C4
add r1, r3, #0
lsl r2, r2, #4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
_022590BC:
pop {r4, pc}
nop
@@ -1724,7 +1724,7 @@ ov11_0225916C: ; 0x0225916C
ldr r0, _02259260 ; =ov11_0225B438
ldr r2, _02259264 ; =0x000004BA
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _02259268 ; =ov11_0225B644
add r1, r4, #0
bl Main_SetHBlankIntrCB
@@ -3801,7 +3801,7 @@ _0225A3A8:
str r6, [r1, r0]
ldr r0, _0225A3F0 ; =ov11_0225A3F4
add r1, r6, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
lsl r1, r5, #2
add r2, r4, r1
ldr r1, _0225A3D4 ; =0x00000634
@@ -5076,7 +5076,7 @@ _0225AD90:
ldr r2, _0225ADAC ; =0x00000514
add r0, r5, #0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #8]
pop {r3, r4, r5, pc}
.align 2, 0
arm9/overlays/11/asm/ov11_0225C91C.s
+6 -6
View File
@@ -328,7 +328,7 @@ _0225CB80:
ldr r0, _0225CBB4 ; =ov11_0225CBBC
add r1, r5, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
ldr r0, _0225CBB8 ; =0x00000711
bl PlaySE
@@ -456,7 +456,7 @@ _0225CC8C:
ldr r0, _0225CCA0 ; =ov11_0225CCA4
add r1, r5, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
pop {r3, r4, r5, pc}
nop
@@ -709,14 +709,14 @@ _0225CE70:
strh r0, [r5, #0x28]
ldr r0, _0225CEBC ; =ov11_0225CEC4
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
pop {r3, r4, r5, r6, r7, pc}
_0225CE96:
ldr r0, _0225CEC0 ; =ov11_0225D0C4
strh r1, [r5, #0x28]
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -1145,7 +1145,7 @@ _0225D1C2:
strb r1, [r0]
ldr r0, _0225D204 ; =ov11_0225D20C
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
pop {r3, r4, r5, r6, r7, pc}
_0225D1EC:
@@ -1155,7 +1155,7 @@ _0225D1EC:
strb r1, [r0]
ldr r0, _0225D208 ; =ov11_0225D31C
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm9/overlays/11/asm/ov11_0225D3EC.s
+1 -1
View File
@@ -129,7 +129,7 @@ _0225D4CE:
ldr r0, _0225D500 ; =ov11_0225D670
ldr r1, [sp]
ldr r2, _0225D504 ; =0x00009C40
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [sp]
str r0, [r1, #0x14]
add r0, r1, #0
arm9/overlays/11/asm/ov11_0225D6A4.s
+1 -1
View File
@@ -125,7 +125,7 @@ _0225D74C:
ldr r0, _0225D7B0 ; =ov11_0225D828
ldr r2, _0225D7B4 ; =0x000003E7
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
add r0, r4, #0
add sp, #0x38
arm9/overlays/12/asm/overlay_12.s
+100 -100
View File
@@ -250,7 +250,7 @@ _0222D7BC:
ldr r0, _0222D884 ; =ov12_0222DB18
ldr r2, _0222D888 ; =0x0000EA60
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
ldr r0, _0222D88C ; =0x00000824
mov r1, #1
@@ -3352,7 +3352,7 @@ ov12_0222EF04: ; 0x0222EF04
ldr r0, _0222F180 ; =ov12_0222F4F4
ldr r2, _0222F184 ; =0x0000EA60
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
ldr r0, _0222F188 ; =0x000004F8
mov r1, #1
@@ -5214,7 +5214,7 @@ ov12_0222FE4C: ; 0x0222FE4C
ldr r0, _02230108 ; =ov12_02230520
ldr r2, _0223010C ; =0x00013880
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
ldr r0, _02230110 ; =0x00001154
mov r1, #1
@@ -8157,7 +8157,7 @@ _02231804:
ldr r0, _02231858 ; =ov12_02231880
ldr r1, [sp]
ldr r2, [sp, #0x68]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [sp]
str r0, [r1, #0x18]
add sp, #0x3c
@@ -8227,7 +8227,7 @@ ov12_022318A4: ; 0x022318A4
ldr r0, _022318D8 ; =ov12_0223190C
ldr r2, [sp, #0x1c]
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
add r0, r4, #0
pop {r3, r4, r5, r6, r7, pc}
@@ -10000,7 +10000,7 @@ _02232664:
ldr r2, _02232680 ; =0x00000514
add r0, r5, #0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x10]
pop {r3, r4, r5, pc}
.align 2, 0
@@ -10527,7 +10527,7 @@ _02232A78:
ldr r2, _02232A94 ; =0x00000528
add r0, r5, #0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x14]
pop {r3, r4, r5, pc}
.align 2, 0
@@ -12066,7 +12066,7 @@ ov12_022335E4: ; 0x022335E4
ldr r0, _02233618 ; =ov12_02233648
add r1, r4, #0
strb r6, [r4, #0xa]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
add r0, r4, #0
pop {r4, r5, r6, pc}
@@ -12956,13 +12956,13 @@ _02233CEE:
strh r0, [r4, #0x26]
ldr r0, _02233D6C ; =ov12_02233E48
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_02233D04:
ldr r0, _02233D70 ; =ov12_02233D84
ldr r2, _02233D68 ; =0x00009C40
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_02233D10:
ldr r0, _02233D74 ; =0xFFFFFD00
@@ -12970,7 +12970,7 @@ _02233D10:
strh r0, [r4, #0x24]
ldr r0, _02233D6C ; =ov12_02233E48
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_02233D20:
ldr r0, _02233D78 ; =0xFFFFFC00
@@ -12978,7 +12978,7 @@ _02233D20:
strh r0, [r4, #0x24]
ldr r0, _02233D6C ; =ov12_02233E48
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_02233D30:
ldr r0, _02233D7C ; =0xFFFFFB80
@@ -12986,7 +12986,7 @@ _02233D30:
strh r0, [r4, #0x24]
ldr r0, _02233D6C ; =ov12_02233E48
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_02233D40:
ldr r0, _02233D80 ; =0xFFFFFD80
@@ -12994,7 +12994,7 @@ _02233D40:
strh r0, [r4, #0x24]
ldr r0, _02233D6C ; =ov12_02233E48
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_02233D50:
mov r0, #0xff
@@ -13003,7 +13003,7 @@ _02233D50:
ldr r0, _02233D6C ; =ov12_02233E48
ldr r2, _02233D68 ; =0x00009C40
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02233D64: .word 0xFFFFFE00
@@ -13565,7 +13565,7 @@ ov12_0223419C: ; 0x0223419C
ldr r0, _022341C8 ; =ov12_022341D0
ldr r2, _022341CC ; =0x00009C40
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, pc}
.align 2, 0
_022341C8: .word ov12_022341D0
@@ -14254,7 +14254,7 @@ _02234672:
strb r0, [r1]
ldr r0, _0223477C ; =ov12_0223440C
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
_02234736:
add r5, r5, #1
_02234738:
@@ -14411,7 +14411,7 @@ ov12_0223483C: ; 0x0223483C
add r1, r4, #0
lsl r2, r2, #2
str r7, [r4, #4]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02234870: .word ov12_02234874
@@ -15774,7 +15774,7 @@ ov12_022352F4: ; 0x022352F4
strb r0, [r4, #0xe]
ldr r0, _02235338 ; =ov12_0223533C
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02235334: .word 0x00000BB8
@@ -16131,7 +16131,7 @@ _022355E6:
lsl r0, r0, #8
str r0, [r4, #0x18]
ldr r0, _02235630 ; =ov12_02235634
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldrb r0, [r5]
add r0, r0, #1
strb r0, [r5]
@@ -16355,7 +16355,7 @@ ov12_022357B0: ; 0x022357B0
ldr r2, _022357E0 ; =0x00009C40
add r1, r4, #0
strb r6, [r4, #8]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
add r0, r4, #0
pop {r4, r5, r6, pc}
@@ -16450,7 +16450,7 @@ _02235846:
strh r0, [r4, #0x24]
ldr r0, _022358A0 ; =ov12_022358A4
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldrb r0, [r5]
add r0, r0, #1
strb r0, [r5]
@@ -17270,7 +17270,7 @@ ov12_02235E3C: ; 0x02235E3C
ldrh r0, [r5, #6]
strh r0, [r4, #0xa]
ldr r0, _02235E78 ; =ov12_02235E7C
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
nop
_02235E74: .word 0x00007530
@@ -17398,7 +17398,7 @@ ov12_02235F14: ; 0x02235F14
ldrh r0, [r6]
strh r0, [r4, #0x16]
ldr r0, _02235F70 ; =ov12_02235F74
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02235F6C: .word 0x00007530
@@ -17558,7 +17558,7 @@ ov12_02236058: ; 0x02236058
ldr r0, _022360A8 ; =ov12_022360B0
ldr r2, _022360AC ; =0x00007530
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r0, r6, #0
bl ov12_02234EFC
pop {r3, r4, r5, r6, r7, pc}
@@ -17794,7 +17794,7 @@ ov12_02236228: ; 0x02236228
ldr r0, _0223627C ; =ov12_02236284
ldr r2, _02236280 ; =0x00007530
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0223627C: .word ov12_02236284
@@ -17976,7 +17976,7 @@ ov12_02236388: ; 0x02236388
ldrb r0, [r5, #3]
strb r0, [r4, #0x10]
ldr r0, _022363F0 ; =ov12_022363F4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022363EC: .word 0x00007530
@@ -18251,7 +18251,7 @@ _022365E6:
str r0, [r3]
ldr r0, _02236600 ; =ov12_02236604
mov r2, #5
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02236600: .word ov12_02236604
@@ -18886,7 +18886,7 @@ ov12_02236AB8: ; 0x02236AB8
add r1, r4, #0
strb r0, [r4, #0xd]
ldr r0, _02236AFC ; =ov12_02236B00
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
nop
_02236AF8: .word 0x00000123
@@ -19240,7 +19240,7 @@ _02236D8E:
str r0, [r3]
ldr r0, _02236DAC ; =ov12_02236DB0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02236DA8: .word 0x00007530
@@ -19400,7 +19400,7 @@ _02236EBE:
str r0, [r3]
ldr r0, _02236EDC ; =ov12_02236EE0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02236ED8: .word 0x00007530
@@ -19756,7 +19756,7 @@ _0223715A:
str r0, [r3]
ldr r0, _02237178 ; =ov12_0223717C
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02237174: .word 0x00007530
@@ -19947,7 +19947,7 @@ _022372C2:
str r0, [r3]
ldr r0, _022372E0 ; =ov12_022372E4
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_022372DC: .word 0x00007530
@@ -20478,7 +20478,7 @@ _022376AE:
str r0, [r3]
ldr r0, _022376CC ; =ov12_022376D0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_022376C8: .word 0x00007530
@@ -20666,7 +20666,7 @@ _0223780E:
str r0, [r3]
ldr r0, _0223782C ; =ov12_02237830
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02237828: .word 0x00007530
@@ -21061,7 +21061,7 @@ _02237AFA:
str r0, [r3]
ldr r0, _02237B18 ; =ov12_02237B1C
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02237B14: .word 0x00007530
@@ -21326,7 +21326,7 @@ _02237CEA:
str r0, [r3]
ldr r0, _02237D0C ; =ov12_02237D10
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02237D04: .word 0x00000123
@@ -21439,7 +21439,7 @@ ov12_02237DA8: ; 0x02237DA8
strh r0, [r4, #0xa]
ldr r0, _02237DE8 ; =ov12_02237DEC
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02237DE4: .word 0x00007530
@@ -21690,7 +21690,7 @@ ov12_02237F5C: ; 0x02237F5C
ldrb r0, [r5]
strb r0, [r4, #0x1b]
ldr r0, _02237FD0 ; =ov12_02237FD4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02237FCC: .word 0x00007530
@@ -25298,7 +25298,7 @@ _0223993C:
strb r0, [r1]
ldr r0, _02239978 ; =ov12_02239980
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _0223997C ; =0x000006E1
bl PlaySE
pop {r3, r4, r5, r6, r7, pc}
@@ -25824,7 +25824,7 @@ _02239C90:
ldr r0, _02239D84 ; =ov12_02239D8C
ldr r2, _02239D88 ; =0x00007530
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -26010,7 +26010,7 @@ ov12_02239EAC: ; 0x02239EAC
ldrb r0, [r0]
strb r0, [r4, #0x11]
ldr r0, _02239EF4 ; =ov12_02239EF8
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02239EF0: .word 0x00007530
@@ -26147,7 +26147,7 @@ ov12_02239FBC: ; 0x02239FBC
mov r0, #0
strb r0, [r4, #0x1a]
ldr r0, _0223A008 ; =ov12_0223A0BC
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A004: .word 0x00007530
@@ -26185,7 +26185,7 @@ ov12_0223A00C: ; 0x0223A00C
mov r0, #1
strb r0, [r4, #0x1a]
ldr r0, _0223A058 ; =ov12_0223A0BC
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A054: .word 0x00007530
@@ -26231,7 +26231,7 @@ ov12_0223A05C: ; 0x0223A05C
mov r0, #1
strb r0, [r4, #0x1b]
ldr r0, _0223A0B8 ; =ov12_0223A0BC
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A0B4: .word 0x00007530
@@ -26506,7 +26506,7 @@ ov12_0223A27C: ; 0x0223A27C
ldrb r0, [r0]
strb r0, [r4, #0x11]
ldr r0, _0223A2C4 ; =ov12_0223A2C8
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A2C0: .word 0x00007530
@@ -26646,7 +26646,7 @@ ov12_0223A39C: ; 0x0223A39C
strh r0, [r4, #0xa]
ldr r0, _0223A3DC ; =ov12_0223A3E0
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A3D8: .word 0x00007530
@@ -26876,7 +26876,7 @@ ov12_0223A550: ; 0x0223A550
strh r0, [r4, #0xa]
ldr r0, _0223A590 ; =ov12_0223A594
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A58C: .word 0x00007530
@@ -27130,7 +27130,7 @@ ov12_0223A72C: ; 0x0223A72C
ldrb r0, [r0]
strb r0, [r4, #0x11]
ldr r0, _0223A774 ; =ov12_0223A778
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A770: .word 0x00007530
@@ -27255,7 +27255,7 @@ ov12_0223A828: ; 0x0223A828
ldrb r0, [r0]
strb r0, [r4, #0x11]
ldr r0, _0223A870 ; =ov12_0223A874
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A86C: .word 0x00007530
@@ -27396,7 +27396,7 @@ ov12_0223A92C: ; 0x0223A92C
add r1, r4, #0
str r0, [r4, #0x24]
ldr r0, _0223A98C ; =ov12_0223A990
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223A988: .word 0x00007530
@@ -27420,12 +27420,12 @@ _0223A9A8:
ldr r0, _0223AAA8 ; =ov12_0223AB54
ldr r2, _0223AAAC ; =0x0000753A
add r1, #0x2c
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r1, r5, #0
ldr r0, _0223AAB0 ; =ov12_0223ACFC
ldr r2, _0223AAAC ; =0x0000753A
add r1, #0x48
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, [r5, #0x38]
ldr r1, [r0, #0xc]
add r0, r5, #0
@@ -27489,12 +27489,12 @@ _0223AA32:
ldr r0, _0223AAB4 ; =ov12_0223AAF8
ldr r2, _0223AAAC ; =0x0000753A
add r1, #0x14
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r1, r5, #0
ldr r0, _0223AAB8 ; =ov12_0223ABD4
ldr r2, _0223AAAC ; =0x0000753A
add r1, #0x38
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldrb r0, [r5, #0x10]
add sp, #0x10
add r0, r0, #1
@@ -28062,7 +28062,7 @@ ov12_0223AE58: ; 0x0223AE58
ldrb r0, [r5, #8]
strb r0, [r4, #0x18]
ldr r0, _0223AEBC ; =ov12_0223AEC0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223AEB8: .word 0x00007530
@@ -28208,7 +28208,7 @@ ov12_0223AF88: ; 0x0223AF88
ldrsb r0, [r6, r0]
strb r0, [r4, #0x13]
ldr r0, _0223AFDC ; =ov12_0223AFE0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0223AFD8: .word 0x00007530
@@ -28373,7 +28373,7 @@ ov12_0223B0EC: ; 0x0223B0EC
strh r0, [r4, #0xa]
ldr r0, _0223B12C ; =ov12_0223B130
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223B128: .word 0x00007530
@@ -28715,7 +28715,7 @@ ov12_0223B37C: ; 0x0223B37C
ldr r0, _0223B3C0 ; =ov12_0223B3C8
ldr r2, _0223B3C4 ; =0x00007530
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0223B3C0: .word ov12_0223B3C8
@@ -30090,7 +30090,7 @@ _0223BE74:
ldr r2, _0223BE90 ; =0x00000514
add r0, r5, #0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0xc]
pop {r3, r4, r5, pc}
nop
@@ -31523,7 +31523,7 @@ _0223C940:
ldr r0, _0223C98C ; =ov12_0223C994
ldr r2, _0223C990 ; =0x00009D08
add r1, r6, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r6, #8]
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@@ -31723,7 +31723,7 @@ ov12_0223CAF8: ; 0x0223CAF8
ldr r0, _0223CB10 ; =ov12_0223CB28
ldr r2, _0223CB14 ; =0x00009CAE
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #2
lsl r1, r1, #8
str r0, [r4, r1]
@@ -31874,7 +31874,7 @@ _0223CBE4:
ldr r0, _0223CC68 ; =ov12_0223CCBC
ldr r2, _0223CC6C ; =0x0000A08C
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #2
lsl r1, r1, #8
str r0, [r4, r1]
@@ -32248,7 +32248,7 @@ _0223CF06:
str r0, [r4, #0x14]
ldr r0, _0223CF40 ; =ov12_0223CF44
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
mov r0, #1
add sp, #8
@@ -33077,7 +33077,7 @@ ov12_0223D55C: ; 0x0223D55C
ldr r0, _0223D570 ; =ov12_0223D5B0
ldr r2, _0223D574 ; =0x00009862
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #8]
pop {r4, pc}
nop
@@ -34034,7 +34034,7 @@ _0223DC46:
ldr r0, _0223DCB8 ; =ov12_0223DE10
ldr r2, _0223DCBC ; =0x00009858
add r1, r1, r4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [sp, #4]
str r0, [r7, r1]
add sp, #0xc
@@ -34917,7 +34917,7 @@ _0223E33E:
ldr r0, _0223E384 ; =ov12_0223E3BC
ldr r2, _0223E388 ; =0x00009C4F
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
pop {r3, r4, r5, pc}
.align 2, 0
@@ -35226,12 +35226,12 @@ ov12_0223E598: ; 0x0223E598
bne _0223E5E8
ldr r0, _0223E5FC ; =ov12_0223E604
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_0223E5E8:
ldr r0, _0223E600 ; =ov12_0223E6A4
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223E5F4: .word 0x00000AB4
@@ -35579,7 +35579,7 @@ _0223E87A:
ldr r2, _0223E894 ; =0x00009C40
add r1, r5, #0
str r4, [r5]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
pop {r3, r4, r5, pc}
.align 2, 0
@@ -36004,7 +36004,7 @@ _0223EBAC:
ldr r0, _0223EC20 ; =ov12_0223EC28
add r1, r4, #0
lsl r2, r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _0223EC24 ; =0x000006E5
bl PlaySE
add sp, #0xc
@@ -36277,7 +36277,7 @@ _0223EDF4:
ldr r0, _0223EE0C ; =ov12_0223EE14
ldr r2, _0223EE10 ; =0x00009C40
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -36442,7 +36442,7 @@ ov12_0223EEFC: ; 0x0223EEFC
strh r0, [r4, #0xa]
ldr r0, _0223EF3C ; =ov12_0223EF40
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223EF38: .word 0x00007530
@@ -36672,7 +36672,7 @@ ov12_0223F0B0: ; 0x0223F0B0
strh r0, [r4, #0xa]
ldr r0, _0223F0FC ; =ov12_0223F108
str r7, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _0223F100 ; =0x00001134
mov r1, #0
strb r1, [r6, r0]
@@ -36929,7 +36929,7 @@ ov12_0223F2A0: ; 0x0223F2A0
strh r0, [r4, #0xa]
ldr r0, _0223F2E0 ; =ov12_0223F2E4
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0223F2DC: .word 0x00007530
@@ -37134,7 +37134,7 @@ _0223F452:
ldr r0, _0223F514 ; =ov12_0223F5CC
add r1, r4, #0
str r6, [r4, #0x54]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r7, #0
add r5, r4, #0
_0223F46E:
@@ -37248,7 +37248,7 @@ ov12_0223F524: ; 0x0223F524
ldr r2, _0223F554 ; =0x00007594
add r1, r4, #0
strb r6, [r4, #0x12]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
add r0, r4, #0
pop {r4, r5, r6, pc}
@@ -38427,7 +38427,7 @@ _0223FE24:
str r0, [r3]
ldr r0, _0223FE40 ; =ov12_0223FE44
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0223FE3C: .word 0x00007530
@@ -38579,7 +38579,7 @@ _0223FF4C:
ldr r0, _02240034 ; =ov12_02240044
ldr r2, _02240038 ; =0x00009CA4
add r1, r1, r7
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r6, r6, #1
cmp r6, #4
blt _0223FEF4
@@ -39003,7 +39003,7 @@ _022402C0:
str r0, [r3]
ldr r0, _022402DC ; =ov12_022402E0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022402D8: .word 0x00007530
@@ -39113,7 +39113,7 @@ _0224039C:
str r0, [r3]
ldr r0, _022403B8 ; =ov12_022403BC
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022403B4: .word 0x00007530
@@ -39281,7 +39281,7 @@ ov12_022404A0: ; 0x022404A0
ldrb r0, [r5]
strb r0, [r4, #0x1b]
ldr r0, _02240508 ; =ov12_0224050C
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_02240504: .word 0x00007530
@@ -39501,7 +39501,7 @@ _02240690:
str r0, [r3]
ldr r0, _022406AC ; =ov12_022406B0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022406A8: .word 0x00007530
@@ -41270,7 +41270,7 @@ ov12_02241210: ; 0x02241210
ldr r0, _02241474 ; =ov12_0224182C
ldr r2, _02241478 ; =0x00013880
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #4]
mov r0, #0x85
mov r1, #1
@@ -44211,7 +44211,7 @@ _02242B7A:
ldr r0, _02242BC4 ; =ov12_02242C1C
ldr r2, _02242BC8 ; =0x0000C738
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #0x4d
lsl r1, r1, #2
str r0, [r5, r1]
@@ -44358,7 +44358,7 @@ _02242CCA:
ldr r0, _02242CE4 ; =ov12_02242CF8
ldr r2, _02242CE8 ; =0x0000C35A
add r1, r6, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r4, r5, r6, pc}
nop
_02242CE4: .word ov12_02242CF8
@@ -44476,7 +44476,7 @@ ov12_02242D3C: ; 0x02242D3C
ldr r0, _02242DEC ; =ov12_02242DF8
ldr r2, _02242DF0 ; =0x0000C35B
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _02242DF4 ; =0x0000127E
ldrb r1, [r5, r0]
add r1, r1, #1
@@ -45063,7 +45063,7 @@ ov12_0224324C: ; 0x0224324C
str r0, [r4, #0xc]
ldr r0, _022432A0 ; =ov12_022432A8
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_02243286:
mov r0, #3
@@ -45074,7 +45074,7 @@ _02243286:
str r0, [r4, #0xc]
ldr r0, _022432A4 ; =ov12_0224333C
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0224329C: .word 0x0000A028
@@ -45265,7 +45265,7 @@ ov12_022433CC: ; 0x022433CC
str r0, [r4, #0xc]
ldr r0, _02243430 ; =ov12_02243438
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
_02243416:
mov r0, #2
@@ -45276,7 +45276,7 @@ _02243416:
str r0, [r4, #0xc]
ldr r0, _02243434 ; =ov12_022434A4
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0224342C: .word 0x0000C350
@@ -46240,7 +46240,7 @@ ov12_02243B1C: ; 0x02243B1C
strh r0, [r4, #0xa]
ldr r0, _02243B5C ; =ov12_02243B60
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02243B58: .word 0x00007530
@@ -46470,7 +46470,7 @@ ov12_02243CD0: ; 0x02243CD0
strh r0, [r4, #0xa]
ldr r0, _02243D10 ; =ov12_02243D14
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02243D0C: .word 0x00007530
@@ -46764,7 +46764,7 @@ ov12_02243ED8: ; 0x02243ED8
ldrb r0, [r5, #0xf]
strb r0, [r4, #0x1b]
ldr r0, _02243F3C ; =ov12_02243F40
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02243F38: .word 0x00007530
@@ -46914,7 +46914,7 @@ _0224401C:
strh r0, [r4, #0xa]
ldr r0, _0224405C ; =ov12_02244060
str r7, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0224405C: .word ov12_02244060
@@ -47139,7 +47139,7 @@ _02244210:
ldr r0, _0224422C ; =ov12_02244234
ldr r2, _02244230 ; =0x00007530
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_0224422C: .word ov12_02244234
@@ -47264,7 +47264,7 @@ ov12_022442D4: ; 0x022442D4
ldrb r0, [r0, #2]
strb r0, [r4, #0x11]
ldr r0, _0224431C ; =ov12_02244320
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02244318: .word 0x00007530
@@ -47503,7 +47503,7 @@ _022444D8:
ldr r0, _022444F0 ; =ov12_022444F8
ldr r2, _022444F4 ; =0x00007530
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022444E4: .word 0x0000041E
@@ -47699,7 +47699,7 @@ ov12_02244624: ; 0x02244624
strh r0, [r4, #0xa]
ldr r0, _02244664 ; =ov12_02244668
str r6, [r4, #0xc]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
pop {r3, r4, r5, r6, r7, pc}
nop
_02244660: .word 0x00007530
@@ -47947,7 +47947,7 @@ _02244832:
ldr r0, _02244864 ; =ov12_02244958
ldr r1, [sp]
ldr r2, _02244868 ; =0x00009C40
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [sp]
str r0, [r1, #0x14]
add r0, r1, #0
arm9/overlays/14/asm/overlay_14.s
+10 -10
View File
@@ -5260,7 +5260,7 @@ _021D9FFA:
blo _021D9FFA
ldr r0, _021DA014 ; =ov14_021DA018
add r1, r7, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -10725,7 +10725,7 @@ _021DC854:
str r6, [r4, r0]
ldr r0, _021DCA04 ; =ov14_021DCA0C
mov r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
ldr r0, _021DCA08 ; =ov14_021DCBFC
add r1, r4, #0
@@ -10904,7 +10904,7 @@ _021DCB3A:
ldr r0, _021DCB94 ; =ov14_021E63CC
mov r2, #1
ldr r0, [r0, r7]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
lsl r1, r4, #2
add r1, r5, r1
str r0, [r1, #8]
@@ -13995,7 +13995,7 @@ ov14_021DE2E8: ; 0x021DE2E8
str r2, [r0]
ldr r0, _021DE38C ; =ov14_021DE39C
add r1, r5, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r0, _021DE390 ; =ov14_021DE3E4
add r1, r5, #0
mov r2, #1
@@ -17716,7 +17716,7 @@ ov14_021E0050: ; 0x021E0050
strb r2, [r4, r0]
ldr r0, _021E0078 ; =ov14_021E0094
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _021E0070
ldr r0, _021E007C ; =0x0000078D
@@ -17799,7 +17799,7 @@ ov14_021E00F0: ; 0x021E00F0
strb r2, [r4, r0]
ldr r0, _021E0118 ; =ov14_021E0134
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _021E0112
ldr r0, _021E011C ; =0x0000078D
@@ -17883,7 +17883,7 @@ ov14_021E0190: ; 0x021E0190
strb r2, [r4, r0]
ldr r0, _021E01B4 ; =ov14_021E01D0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _021E01AC
ldr r0, _021E01B8 ; =0x00000788
@@ -19825,7 +19825,7 @@ _021E10D8:
str r5, [r4, #8]
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #0x4c]
pop {r3, r4, r5, pc}
_021E10EA:
@@ -22369,7 +22369,7 @@ ov14_021E247C: ; 0x021E247C
strb r2, [r4, #4]
add r1, r4, #0
strb r2, [r4, #5]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r1, r5, #0
add r1, #0xdc
add r5, #0xdc
@@ -29537,7 +29537,7 @@ _021E5AC6:
ldr r0, _021E5B60 ; =ov14_021E5D64
add r1, r7, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #0xe
lsl r1, r1, #6
str r0, [r7, r1]
arm9/overlays/15/asm/overlay_15.s
+3 -3
View File
@@ -2616,7 +2616,7 @@ ov15_021D87F8: ; 0x021D87F8
ldr r0, _021D8880 ; =ov15_021D88D8
add r1, r4, #0
mov r2, #2
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
ldr r0, _021D8884 ; =ov15_021D88DC
add r1, r4, #0
@@ -2733,7 +2733,7 @@ _021D8928:
ldr r0, [r0, r2]
mov r2, #1
str r4, [r1, #0x10]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
lsl r1, r4, #2
add r1, r5, r1
str r0, [r1, #8]
@@ -8023,7 +8023,7 @@ ov15_021DB2D0: ; 0x021DB2D0
add r1, r4, #0
strh r0, [r4, #0x16]
ldr r0, _021DB350 ; =ov15_021DB36C
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _021DB354 ; =0x000004FC
str r0, [r5, r1]
pop {r3, r4, r5, pc}
arm9/overlays/16/asm/overlay_16.s
+6 -6
View File
@@ -4309,7 +4309,7 @@ ov16_021D95C4: ; 0x021D95C4
ldr r0, _021D95E0 ; =ov16_021D95F4
add r1, r4, r1
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #0x9d
lsl r1, r1, #2
str r0, [r4, r1]
@@ -4533,7 +4533,7 @@ ov16_021D9760: ; 0x021D9760
ldr r0, _021D977C ; =ov16_021D9724
add r1, r4, r1
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #0x9e
lsl r1, r1, #2
str r0, [r4, r1]
@@ -49129,7 +49129,7 @@ _021EE18A:
ldr r0, _021EE19C ; =ov16_021EE1A0
add r1, #0x40
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x3c]
pop {r4, pc}
.align 2, 0
@@ -49421,7 +49421,7 @@ _021EE3B4:
ldr r0, _021EE3C4 ; =ov16_021EE3C8
add r1, #0x74
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x3c]
pop {r3, r4, r5, pc}
.align 2, 0
@@ -49535,7 +49535,7 @@ _021EE438:
add r1, r5, #0
ldr r0, _021EE494 ; =ov16_021EE498
add r1, #0x98
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #0x3c]
pop {r3, r4, r5, pc}
nop
@@ -50999,7 +50999,7 @@ ov16_021EEF0C: ; 0x021EEF0C
ldr r0, _021EEF64 ; =ov16_021EF90C
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
mov r1, #7
lsl r1, r1, #6
str r0, [r4, r1]
arm9/overlays/18/asm/overlay_18.s
+34 -34
View File
@@ -1175,7 +1175,7 @@ ov18_02239F34: ; 0x02239F34
ldr r1, [r2]
ldr r0, _02239F8C ; =ov18_02239F98
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r2, _02239F88 ; =0x02251380
ldr r1, _02239F90 ; =0x0000087C
ldr r3, [r2]
@@ -2718,7 +2718,7 @@ ov18_0223AC24: ; 0x0223AC24
ldr r0, _0223AC78 ; =ov18_0223A64C
add r1, r4, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0223AC7C ; =0x02251380
ldr r2, [r1]
mov r1, #0x22
@@ -6358,7 +6358,7 @@ _0223C7F6:
str r4, [r1, r0]
ldr r0, _0223C844 ; =ov18_0223C7B0
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0223C834 ; =0x02251380
ldr r2, [r1]
ldr r1, _0223C83C ; =0x00000878
@@ -7856,7 +7856,7 @@ _0223D330:
str r4, [r1, r0]
ldr r0, _0223D36C ; =ov18_0223D2EC
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0223D364 ; =0x02251384
ldr r2, [r1]
mov r1, #0x13
@@ -8117,7 +8117,7 @@ _0223D536:
mov r1, #0
ldr r0, _0223D59C ; =ov18_0223E7AC
add r2, r1, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0223D580 ; =0x02251388
ldr r1, [r1]
str r0, [r1, #0x14]
@@ -14072,7 +14072,7 @@ _0224023E:
str r0, [r4, #0x18]
ldr r0, _0224026C ; =ov18_02240100
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02240268 ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -14221,7 +14221,7 @@ ov18_02240334: ; 0x02240334
ldr r0, _02240384 ; =ov18_02240658
mov r2, #0x64
strb r7, [r4, #0x18]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02240380 ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -15332,7 +15332,7 @@ ov18_02240BB8: ; 0x02240BB8
str r4, [r1, r0]
ldr r0, _02240C10 ; =ov18_02240B90
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02240C0C ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa5
@@ -15742,7 +15742,7 @@ ov18_02240EE8: ; 0x02240EE8
str r4, [r1, r0]
ldr r0, _02240F30 ; =ov18_02240E2C
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02240F2C ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -16212,7 +16212,7 @@ ov18_02241288: ; 0x02241288
ldr r0, _022412E0 ; =ov18_02241038
add r1, r4, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _022412DC ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -16829,7 +16829,7 @@ _02241778:
str r4, [r1, r0]
ldr r0, _022417B0 ; =ov18_02241424
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _022417A4 ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -18129,7 +18129,7 @@ ov18_02242180: ; 0x02242180
str r4, [r1, r0]
ldr r0, _022421CC ; =ov18_02241F10
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _022421C8 ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -20166,7 +20166,7 @@ ov18_022431A4: ; 0x022431A4
str r4, [r1, r0]
ldr r0, _022431F0 ; =ov18_02242F08
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _022431EC ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -20921,7 +20921,7 @@ ov18_02243794: ; 0x02243794
str r4, [r1, r0]
ldr r0, _022437DC ; =ov18_02243540
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _022437D8 ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -21191,7 +21191,7 @@ ov18_022439A8: ; 0x022439A8
ldr r0, _022439E8 ; =ov18_02243894
add r1, r4, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _022439E4 ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0xa3
@@ -21772,7 +21772,7 @@ ov18_02243E18: ; 0x02243E18
ldr r0, [sp, #0x30]
str r0, [r4, #0x1c]
ldr r0, _02243E88 ; =ov18_02243D00
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02243E84 ; =0x022513A0
ldr r2, [r1, #4]
mov r1, #0x29
@@ -21930,7 +21930,7 @@ ov18_02243F5C: ; 0x02243F5C
mov r2, #0x64
str r4, [r0, r5]
ldr r0, _02243FB4 ; =ov18_02243E8C
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02243FAC ; =0x022513A0
ldr r1, [r1, #4]
add r1, r1, r5
@@ -24110,7 +24110,7 @@ _02244F9A:
ldr r0, _02245050 ; =ov18_02246338
mov r1, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _02245000 ; =0x022513EC
ldr r1, [r1]
str r0, [r1, #4]
@@ -24400,7 +24400,7 @@ _0224523E:
ldr r0, _0224526C ; =ov18_02246338
mov r1, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0224525C ; =0x022513EC
ldr r1, [r1]
str r0, [r1, #4]
@@ -25415,7 +25415,7 @@ ov18_022459E8: ; 0x022459E8
ldr r0, _02245A48 ; =ov18_02245838
str r5, [r4]
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #8]
ldr r1, [r4, #8]
ldr r2, _02245A4C ; =ov18_022457F8
@@ -25939,7 +25939,7 @@ ov18_02245E1C: ; 0x02245E1C
ldr r0, _02245E84 ; =ov18_02245BB4
add r1, r4, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #8]
ldr r1, [r4, #8]
ldr r2, _02245E88 ; =ov18_022457F8
@@ -27680,7 +27680,7 @@ ov18_02246C44: ; 0x02246C44
ldr r0, [r0]
str r0, [r4]
ldr r0, _02246C8C ; =ov18_02246898
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
ldr r1, [r4, #4]
ldr r2, _02246C90 ; =ov18_02246C10
@@ -28682,7 +28682,7 @@ ov18_02247428: ; 0x02247428
mov r2, #0x64
strb r0, [r4, #5]
ldr r0, _02247468 ; =ov18_02247338
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r1, r0, #0
ldr r2, _0224746C ; =ov18_02247324
add r0, r4, #0
@@ -29515,7 +29515,7 @@ ov18_02247A34: ; 0x02247A34
ldr r0, _02247AA0 ; =ov18_02248054
ldr r2, _02247AA4 ; =0x00002710
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -31957,7 +31957,7 @@ _02248E0C:
ldr r0, _02248E64 ; =ov18_022489CC
ldr r2, _02248E68 ; =0x00002710
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4]
pop {r4, r5, r6, pc}
nop
@@ -32900,7 +32900,7 @@ ov18_022494C8: ; 0x022494C8
ldr r0, _02249538 ; =ov18_02249684
ldr r2, _0224953C ; =0x00002710
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
ldr r1, [r4, #4]
ldr r2, _02249540 ; =ov18_0224AFE8
@@ -35195,7 +35195,7 @@ ov18_0224A7C8: ; 0x0224A7C8
ldr r0, _0224A838 ; =ov18_0224A914
ldr r2, _0224A83C ; =0x00002710
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
ldr r1, [r4, #4]
ldr r2, _0224A840 ; =ov18_0224AFE8
@@ -36101,7 +36101,7 @@ ov18_0224AF28: ; 0x0224AF28
ldr r0, _0224AFA4 ; =ov18_02249684
ldr r2, _0224AFA8 ; =0x00002710
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
ldr r1, [r4, #4]
ldr r2, _0224AFAC ; =ov18_0224AFE8
@@ -37856,7 +37856,7 @@ ov18_0224BD54: ; 0x0224BD54
ldr r0, _0224BDE8 ; =ov18_0224B9D0
ldr r2, _0224BDEC ; =0x00002710
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #4]
ldr r1, [r4, #4]
ldr r2, _0224BDF0 ; =ov18_0224AFE8
@@ -37976,7 +37976,7 @@ ov18_0224BEA4: ; 0x0224BEA4
ldr r2, _0224BF10 ; =0x00002710
str r6, [r4, #4]
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x10]
bl ov18_0223D638
add r6, r0, #0
@@ -40378,7 +40378,7 @@ ov18_0224D1F8: ; 0x0224D1F8
ldr r0, _0224D2E4 ; =ov18_0224CC04
ldr r2, _0224D2E8 ; =0x00002710
add r1, r6, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r6, #4]
ldr r1, [r6, #4]
ldr r2, _0224D2EC ; =ov18_0224AFE8
@@ -40405,7 +40405,7 @@ _0224D2AE:
ldr r0, [r6, #0xc]
add r1, r4, #0
ldr r0, [r0, #0x34]
bl GetMapObjectByID
bl MapObjectManager_GetFirstActiveObjectByID
ldr r1, [sp]
bl sub_020584AC
_0224D2CE:
@@ -40853,7 +40853,7 @@ _0224D64A:
ldr r0, _0224D694 ; =ov18_0224D5B4
add r1, r4, #0
mov r2, #0xa
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, _0224D68C ; =0x022513FC
ldr r2, [r1]
str r0, [r2, #4]
@@ -41603,7 +41603,7 @@ _0224DC4C:
ldr r0, _0224DCB4 ; =ov18_0224DBB8
add r1, r5, #0
mov r2, #0x64
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r5, #0x20]
_0224DC74:
ldr r1, [r5, #0x40]
arm9/overlays/20/asm/ov20_02252440.s
+2 -2
View File
@@ -51,12 +51,12 @@ ov20_02252448: ; 0x02252448
str r5, [r4, #0x34]
add r1, r4, #0
mov r2, #4
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x38]
ldr r0, _022524B8 ; =ov20_0225259C
add r1, r4, #0
mov r2, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
_022524B2:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
arm9/overlays/20/asm/ov20_022536F4.s
+1 -1
View File
@@ -212,7 +212,7 @@ _0225382E:
str r0, [r4, #0x10]
ldr r0, [r5, r6]
add r1, r4, #0
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x14]
cmp r0, #0
beq _02253884
arm9/overlays/21/include/ov21_02254854.h
+2 -1
View File
@@ -3,6 +3,7 @@
#include "nitro/types.h"
#include "ov21_02254A6C.h"
#include "unk_0200CA44.h"
typedef struct Time
{
@@ -25,7 +26,7 @@ typedef struct UnkStruct02254854
BOOL ov21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3);
BOOL ov21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2, u32 param3);
void ov21_02254918(UnkStruct02254854 *param0);
void ov21_02254930(u32 param0, UnkStruct02254854 *param1);
void ov21_02254930(SysTask *task, UnkStruct02254854 *param1);
void ov21_0225496C(UnkStruct02254854 *param0);
void ov21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3);
void ov21_02254990(UnkStruct02254854 * param0, u8 param1);
arm9/overlays/21/src/ov21_02254854.c
+3 -3
View File
@@ -29,7 +29,7 @@ BOOL ov21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param
UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(HEAP_ID_8, sizeof(UnkStruct02254854));
if (alloced != NULL)
{
if (ov21_0225489C(alloced, param1, param2, param3) && sub_0200CA44((void (*)(u32, void *))ov21_02254930, (void *)alloced, 1))
if (ov21_0225489C(alloced, param1, param2, param3) && SysTask_CreateOnMainQueue((SysTaskFunc)ov21_02254930, (void *)alloced, 1))
{
*param0 = alloced;
return TRUE;
@@ -80,7 +80,7 @@ void ov21_02254918(UnkStruct02254854 *param0)
FreeToHeap((void *)param0);
}
void ov21_02254930(u32 param0, UnkStruct02254854 *param1)
void ov21_02254930(SysTask *task, UnkStruct02254854 *param1)
{
if (param1->bytearray[0] >= 3)
{
@@ -92,7 +92,7 @@ void ov21_02254930(u32 param0, UnkStruct02254854 *param1)
return;
}
ov21_02254918(param1);
sub_0200CAB4((s32)param0);
sub_0200CAB4((s32)task);
ov20_022529A0(param1->Unk28);
}
arm9/overlays/22/asm/overlay_22.s
+2 -2
View File
@@ -24,7 +24,7 @@ ov22_02254854: ; 0x02254854
add r1, r4, #0
mov r2, #1
str r6, [r4, #0x64]
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _02254892
str r4, [r5]
@@ -1197,7 +1197,7 @@ ov22_02255098: ; 0x02255098
ldr r0, _02255160 ; =ov22_02254F28
add r1, r5, #0
mov r2, #3
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r5, #0x84
str r0, [r5]
add r0, r4, #0
arm9/overlays/23/asm/overlay_23.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov23_02254854: ; 0x02254854
str r6, [r4, #0x10]
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r4, [r5]
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
arm9/overlays/24/asm/overlay_24.s
+1 -1
View File
@@ -25,7 +25,7 @@ ov24_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov24_02254918
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488E
str r4, [r5]
arm9/overlays/25/asm/overlay_25.s
+2 -2
View File
@@ -24,7 +24,7 @@ ov25_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov25_02254930
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
@@ -331,7 +331,7 @@ _02254AA8:
ldr r0, _02254AC0 ; =ov25_02254AE0
add r1, r4, #0
mov r2, #3
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
str r0, [r4, #0x30]
str r4, [r5]
mov r0, #1
arm9/overlays/26/asm/ov26_02254854.s
+1 -1
View File
@@ -25,7 +25,7 @@ ov26_02254854: ; 0x02254854
ldr r0, _022548A0 ; =ov26_02254A4C
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _02254896
ldr r0, _022548A4 ; =ov26_02254A30
arm9/overlays/27/asm/overlay_27.s
+2 -2
View File
@@ -24,7 +24,7 @@ ov27_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov27_022548F8
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
@@ -1122,7 +1122,7 @@ ov27_022550C8: ; 0x022550C8
ldr r0, _022550F4 ; =ov27_022550F8
add r1, #0xf8
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
add r4, #0xf4
str r0, [r4]
pop {r4, pc}
arm9/overlays/28/asm/overlay_28.s
+2 -2
View File
@@ -24,7 +24,7 @@ ov28_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov28_022549C0
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
@@ -897,7 +897,7 @@ _02254EF8:
ldr r0, _02254F14 ; =ov28_02254F84
ldr r1, [sp]
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
ldr r1, [sp]
add r1, #0xb0
str r1, [sp]
arm9/overlays/29/asm/overlay_29.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov29_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov29_022548E0
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/30/asm/overlay_30.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov30_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov30_02254930
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/31/asm/overlay_31.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov31_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov31_02254918
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/32/asm/overlay_32.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov32_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov32_02254920
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/33/asm/ov33_02254854.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov33_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov33_022548D4
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/34/asm/overlay_34.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov34_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov34_0225490C
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/35/asm/overlay_35.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov35_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov35_022548F0
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/36/asm/overlay_36.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov36_02254854: ; 0x02254854
ldr r0, _0225489C ; =ov36_02254938
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/37/asm/overlay_37.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov37_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov37_02254900
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/38/asm/overlay_38.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov38_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov38_0225494C
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]
arm9/overlays/39/asm/overlay_39.s
+1 -1
View File
@@ -24,7 +24,7 @@ ov39_02254854: ; 0x02254854
ldr r0, _02254898 ; =ov39_02254998
add r1, r4, #0
mov r2, #1
bl sub_0200CA44
bl SysTask_CreateOnMainQueue
cmp r0, #0
beq _0225488C
str r4, [r5]

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