Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-04-24 23:09:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed remaining compile errors

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-07-09 00:02:54 -04:00
parent e87e69a4a4
commit ad62158e7f
34 changed files with 2382 additions and 893 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asm/include/overlay_00.inc
View File

@ -92,7 +92,7 @@
.public sub_0208B298
.public sub_02008F88
.public sub_0207B854
.public ov00_0232F3F4
.public ov01_0232F3F4
.public sub_02079888
.public Strcat
.public sub_02051C24
@ -112,7 +112,7 @@
.public sub_02079FB4
.public sub_0207911C
.public EnableIrqFlag
.public ov00_023310B8
.public ov01_023310B8
.public ov00_0232E7E8
.public sub_0207B1E8
.public sub_0207DB20
@ -216,3 +216,19 @@
.public Strchr
.public sub_0207F70C
.public sub_020798D8
.public ov01_0232EA30
.public ov01_02329520
.public ov01_023310B8
.public ov01_0232C4D8
.public ov01_02337914
.public ov01_0232E768
.public ov01_0232EC30
.public ov01_0232ED84
.public ov01_0232E7E8
.public ov01_0232ED5C
.public ov01_0232E7C0
.public ov01_0233103C
.public ov01_0232F3F4
.public ov01_0232C244
.public ov01_0232BE98
.public ov01_0233AE64

22
asm/include/overlay_01.inc
View File

@ -1,6 +1,6 @@
#include <nitro/fs/overlay.h>
#pragma once
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public ov00_022EF548
.public GetNbPokemonBattled
.public sub_0204AE60
@ -281,9 +281,27 @@
.public sub_0204E40C
.public ov00_022C306C
.public sub_02027B1C
.public GetSpriteIndex
.public GetSpriteIndex__020526EC
.public ov00_022BCCC8
.public sub_0202065C
.public Sprintf
.public GetNbEvolutions
.public sub_0204E464
.public sub_0201C138
.public ov00_022BD8FC
.public ov00_022BDA68
.public sub_0204A1CC
.public ov00_022BD95C
.public sub_02029F88
.public NoteSaveBase
.public sub_0202BBF0
.public sub_0202BC28
.public sub_02029FBC
.public IsDBoxActive
.public sub_020308C4
.public sub_0202FB9C
.public sub_0203088C
.public sub_02031914
.public sub_0202C38C
.public ov00_022BD780
.public sub_0202BD48

4
asm/include/overlay_03.inc
View File

@ -39,7 +39,7 @@
.public sub_02043400
.public sub_0204E6A4
.public sub_02043218
.public ov00_0232F3F4
.public ov01_0232F3F4
.public sub_0205B77C
.public sub_02037570
.public ov01_02338BEC
@ -174,7 +174,7 @@
.public GetAdvancedMenuResult
.public sub_0203D438
.public GetHeldButtons
.public ov00_023310B8
.public ov01_023310B8
.public sub_020663DC
.public ov01_02338B08
.public sub_0203FD38

4
asm/include/overlay_04.inc
View File

@ -26,7 +26,7 @@
.public sub_0201007C
.public sub_02043254
.public StrncpySimpleNoPadSafe
.public ov00_0232F3F4
.public ov01_0232F3F4
.public ov01_0232E94C
.public sub_0204329C
.public sub_02043568
@ -40,7 +40,7 @@
.public sub_020103AC
.public sub_02003BC8
.public sub_0204A018
.public ov00_023310B8
.public ov01_023310B8
.public sub_020440B8
.public sub_02043468
.public sub_02043380

4
asm/include/overlay_05.inc
View File

@ -40,7 +40,7 @@
.public ov01_0233767C
.public ov01_0232C5C8
.public ov01_02337C54
.public ov00_023310B8
.public ov01_023310B8
.public ov01_0233769C
.public MemAlloc
.public sub_02059060
@ -53,7 +53,7 @@
.public sub_02027AF0
.public PreprocessString
.public ov01_02338C28
.public ov00_0232F3F4
.public ov01_0232F3F4
.public sub_02029FBC
.public ov01_023398A4
.public ov01_02338C34

7
asm/include/overlay_06.inc
View File

@ -24,11 +24,11 @@
.public sub_02046BE8
.public ov01_02338E68
.public ov00_022BD264
.public ov00_0232F3F4
.public ov01_0232F3F4
.public GetKeyboardStringResult
.public sub_020668B4
.public sub_02046A9C
.public ov00_023310B8
.public ov01_023310B8
.public sub_02069DC0
.public ov01_02337614
.public sub_0205EC98
@ -57,7 +57,7 @@
.public DungeonRequestsDoneWrapper
.public ov02_02338E48
.public sub_02003BFC
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public sub_0204DD80
.public ov01_02338A24
.public ov00_022BCBAC
@ -85,3 +85,4 @@
.public sub_02046B04
.public sub_02046BB4
.public sub_02003BC8
.public sub_02046D20

4
asm/include/overlay_07.inc
View File

@ -39,7 +39,7 @@
.public sub_0203931C
.public ov00_022BD398
.public ov01_0232C5C8
.public ov00_023310B8
.public ov01_023310B8
.public ov01_02337938
.public MemAlloc
.public ov01_02335FA8
@ -81,7 +81,7 @@
.public sub_02046BA0
.public sub_02046BB4
.public sub_0202F8FC
.public ov00_0232F3F4
.public ov01_0232F3F4
.public sub_02029FBC
.public NoteSaveBase
.public sub_02017CCC

6
asm/include/overlay_08.inc
View File

@ -27,7 +27,7 @@
.public ov00_022BF640
.public ov01_0232C0CC
.public ov00_022C4C08
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public ov01_0232C10C
.public sub_0207BA08
.public ov00_022C6EFC
@ -37,7 +37,7 @@
.public sub_020467F0
.public ov01_0232C370
.public InitPreprocessorArgs
.public ov00_023310B8
.public ov01_023310B8
.public sub_02003BC8
.public sub_020255D8
.public sub_02046A9C
@ -60,3 +60,5 @@
.public ov00_022C3270
.public ov00_022BFB14
.public Rand16Bit
.public ov00_022C3298
.public sub_02046D20

2
asm/include/overlay_15.inc
View File

@ -33,7 +33,7 @@
.public CreateNormalMenu
.public sub_0203088C
.public CreatePortraitBox
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public GetNormalMenuResult
.public sub_02010758
.public IsDBoxActive

3
asm/include/overlay_21.inc
View File

@ -28,7 +28,7 @@
.public sub_02013150
.public GetTeamMember
.public sub_02027B1C
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public sub_0203FA64
.public MemFree
.public sub_0203F150
@ -51,3 +51,4 @@
.public CreateDBox
.public AddItemToStorage
.public sub_0202F8C4
.public ov11_0230C910

2
asm/include/overlay_22.inc
View File

@ -38,7 +38,7 @@
.public GetActualBuyPrice
.public sub_02017CCC
.public sub_0202C7D0
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public ShowMessageInDBox
.public Strcat
.public sub_02042BBC

2
asm/include/overlay_23.inc
View File

@ -46,7 +46,7 @@
.public sub_02043380
.public CreateNormalMenu
.public RemoveItemNoHole
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public sub_02043568
.public sub_020582E0
.public InitPortraitBoxWithMonsterId

3
asm/include/overlay_27.inc
View File

@ -25,7 +25,7 @@
.public sub_0200FD78
.public sub_02042258
.public sub_0202836C
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public CreateDBox
.public sub_0202F2C4
.public FreeNormalMenu
@ -43,3 +43,4 @@
.public CopyItemAtIdx
.public RemoveEmptyItemsInBag
.public PreprocessString
.public sub_0200FD48

4
asm/include/overlay_29.inc
View File

@ -264,7 +264,7 @@
.public GetMoveMaxGinsengBoost
.public SetPokemonJoined
.public ov31_023860A4
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public sub_0204AF20
.public SetMonsterFlag2
.public ReplaceWanFromBinFile
@ -659,3 +659,5 @@
.public sub_01FF8C60
.public sub_01FF8130
.public GetScenarioBalance__0204CB94
.public CheckTeamMemberIdx__02056228
.public ov01_0233103C

2
asm/include/overlay_30.inc
View File

@ -27,7 +27,7 @@
.public ov29_022E2978
.public ov29_02338768
.public ov29_02344B1C
.public GetSpriteIndex
.public GetSpriteIndex__022F7388
.public ov29_022FB920
.public sub_02034EB4
.public sub_02034D0C

9
asm/include/overlay_31.inc
View File

@ -7,7 +7,7 @@
.public AllManip1
.public IsBlinded
.public sub_020585B4
.public CheckTeamMemberIdx
.public CheckTeamMemberIdx__022F9C34
.public ov29_022EB8F4
.public sub_020348E4
.public sub_0203083C
@ -23,7 +23,7 @@
.public ov10_022BCE58
.public sub_020265A8
.public ov29_022E87DC
.public DebugPrint0
.public DebugPrint0__0200C1FC
.public FreeDBox
.public sub_02028284
.public ov29_022EBA70
@ -229,3 +229,8 @@
.public sub_020416FC
.public sub_020410A4
.public AiMovement
.public ov02_0234FB60
.public ov29_022F9C40
.public sub_02017C74
.public sub_0204019C
.public CheckTeamMemberIdx__02056228

44
asm/main.s
View File

@ -44075,14 +44075,17 @@ SetQuestionMarks: ; 0x020250E4
strb r1, [r0, #3]
bx lr
arm_func_end SetQuestionMarks
_02025100:
arm_func_start StrcpySimple
StrcpySimple:
ldrb r2, [r1], #1
mov r3, r0
strb r2, [r0], #1
ldrb r2, [r3]
cmp r2, #0
bne _02025100
bne StrcpySimple
bx lr
arm_func_end StrcpySimple
arm_func_start StrncpySimple
StrncpySimple: ; 0x0202511C
@ -64765,7 +64768,7 @@ ShowKeyboard: ; 0x020367F0
ldr r0, [r0]
add r0, r0, #0x6e
add r0, r0, #0x100
bl _02025100
bl StrcpySimple
_02036850:
ldr r0, _02036CB0 ; =0x020AFDF0
mov r2, #0
@ -66718,7 +66721,7 @@ _02038760:
add r1, r0, #0x6e
ldr r0, [r0, #0xf8]
add r1, r1, #0x100
bl _02025100
bl StrcpySimple
_02038794:
ldr r0, _02038900 ; =0x020AFDF0
ldr r1, [r0]
@ -70836,7 +70839,7 @@ sub_0203C5C8: ; 0x0203C5C8
bl GetKeyboardStringResult
mov r1, r0
add r0, sp, #0
bl _02025100
bl StrcpySimple
ldrb r0, [sp]
bl sub_0203BBEC
cmp r0, #0
@ -80205,7 +80208,7 @@ _02044EE8:
mov r0, #0x68
smlabb r0, r1, r0, r2
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__02056228
cmp r0, #0
ldrsh r1, [r8, #0x12]
ldrsh r0, [r8, #0x16]
@ -101221,8 +101224,8 @@ _020561D8:
_02056224: .word 0x020B0A48
arm_func_end sub_020561C0
arm_func_start CheckTeamMemberIdx
CheckTeamMemberIdx: ; 0x02056228
arm_func_start CheckTeamMemberIdx__02056228
CheckTeamMemberIdx__02056228: ; 0x02056228
ldr r1, _0205625C ; =0x000055AA
cmp r0, r1
moveq r0, #1
@ -101239,7 +101242,7 @@ CheckTeamMemberIdx: ; 0x02056228
.align 2, 0
_0205625C: .word 0x000055AA
_02056260: .word 0x00005AA5
arm_func_end CheckTeamMemberIdx
arm_func_end CheckTeamMemberIdx__02056228
arm_func_start sub_02056264
sub_02056264: ; 0x02056264
@ -104037,7 +104040,7 @@ sub_02058674: ; 0x02058674
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
mov r4, r1
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__02056228
cmp r0, #0
ldmnedb sp!, {r3, r4, r5, pc}
mov r0, r5
@ -145473,10 +145476,13 @@ sub_0207B848: ; 0x0207B848
and r0, r0, #0x1f
bx lr
arm_func_end sub_0207B848
_0207B854:
arm_func_start sub_0207B854
sub_0207B854: ; 0x0207B854
subs r0, r0, #4
bhs _0207B854
bhs sub_0207B854
bx lr
arm_func_end sub_0207B854
arm_func_start sub_0207B860
sub_0207B860: ; 0x0207B860
@ -147255,7 +147261,7 @@ _0207CD74:
mov r0, r4
bl SetIrqFlag
mov r0, r6
bl _0207B854
bl sub_0207B854
bl EnableIrqFlag
mov r4, r0
bl sub_0207D49C
@ -147664,7 +147670,7 @@ sub_0207D270: ; 0x0207D270
mov r4, #1
_0207D2AC:
mov r0, r6
bl _0207B854
bl sub_0207B854
mov r0, r5
mov r1, r4
bl sub_0207DAFC
@ -153180,7 +153186,7 @@ sub_02081F60: ; 0x02081F60
mov r7, r0
ldr r0, _02082008 ; =0x00996A00
mov r6, r1
bl _0207B854
bl sub_0207B854
bl sub_02082440
cmp r0, #1
beq _02081FF0
@ -153209,7 +153215,7 @@ _02081FC0:
mov r4, #1
_02081FD8:
mov r0, r5
bl _0207B854
bl sub_0207B854
mov r0, r4
bl sub_02082420
cmp r0, #0
@ -153431,7 +153437,7 @@ _020822B4:
str r6, [r0]
_020822C4:
ldr r0, _02082324 ; =0x00708100
bl _0207B854
bl sub_0207B854
bl EnableIrqFlag
ldr r0, [sp, #4]
bl sub_02078C3C
@ -155996,7 +156002,7 @@ sub_02084404: ; 0x02084404
mov r4, #1
_0208444C:
mov r0, r6
bl _0207B854
bl sub_0207B854
mov r0, r5
mov r1, r4
bl sub_0207DAFC
@ -156158,7 +156164,7 @@ sub_020845F8: ; 0x020845F8
ldr r4, _02084680 ; =0x000A3A47
_02084644:
mov r0, r4
bl _0207B854
bl sub_0207B854
bl sub_0208200C
cmp r0, #4
beq _02084644

39
asm/overlay_00.s
View File

@ -1820,7 +1820,7 @@ ov00_022BE094: ; 0x022BE094
bl sub_020348E4
cmp r0, #0
ldmeqdb sp!, {r3, pc}
bl ov00_0232F3F4
bl ov01_0232F3F4
ldmdb sp!, {r3, pc}
.align 2, 0
_022BE0B0: .word 0x02317FA0
@ -1901,7 +1901,7 @@ _022BE184:
bl sub_020519D0
bl sub_0201DC90
bl ov00_022BE4D8
bl ov00_0232E768
bl ov01_0232E768
ldr r1, _022BE3BC ; =0x023187EC
mov r2, #1
ldr r0, _022BE3C0 ; =ov00_022BE3CC
@ -1948,12 +1948,12 @@ _022BE234:
bne _022BE320
cmp sl, #4
bne _022BE268
bl ov00_0233AE64
bl ov01_0233AE64
b _022BE2A4
_022BE268:
cmp sl, #2
bne _022BE278
bl ov00_02337914
bl ov01_02337914
b _022BE2A4
_022BE278:
cmp sl, #5
@ -1967,7 +1967,7 @@ _022BE278:
b _022BE2A4
_022BE29C:
mov r0, #0
bl ov00_023310B8
bl ov01_023310B8
_022BE2A4:
str r5, [r4, #4]
b _022BE304
@ -1997,18 +1997,18 @@ _022BE2E4:
str r0, [r4, #4]
_022BE304:
bl sub_02006E14
bl ov00_0232EA30
bl ov01_0232EA30
bl sub_020039E4
bl ov00_0232EC30
bl ov01_0232EC30
bl sub_02034A80
bl sub_02028848
b _022BE1E8
_022BE320:
mov r0, #0
bl sub_0200383C
bl ov00_0232E7E8
bl ov01_0232E7E8
bl sub_02034710
bl ov00_0232E7C0
bl ov01_0232E7C0
bl ov00_022BE51C
bl sub_0201DCD0
bl sub_02051B44
@ -2022,7 +2022,7 @@ _022BE320:
bl LoadOverlay
bl sub_020184B4
bl sub_020024B0
bl ov00_02329520
bl ov01_02329520
ldr r2, _022BE3C8 ; =0x04000208
mov r0, #1
ldrh r1, [r2]
@ -2064,12 +2064,12 @@ ov00_022BE3CC: ; 0x022BE3CC
bl ov00_022BE6D0
bl sub_02003990
_022BE3EC:
bl ov00_0232BE98
bl ov00_0233103C
bl ov00_0232ED5C
bl ov01_0232BE98
bl ov01_0233103C
bl ov01_0232ED5C
bl ov00_022BE774
bl ov00_0232C244
bl ov00_0232C4D8
bl ov01_0232C244
bl ov01_0232C4D8
bl sub_0201DD48
bl sub_0201F464
ldr r0, _022BE4A4 ; =0x023187EC
@ -2096,7 +2096,7 @@ _022BE420:
mov r1, #2
bl sub_02008F64
_022BE464:
bl ov00_0232ED84
bl ov01_0232ED84
mov r0, r4
bl sub_02028A64
bl sub_0201BE5C
@ -79279,7 +79279,7 @@ _023000F8:
ldr r1, _0230038C ; =0x0231AD64
bl Strstr
movs sl, r0
beq _023002F0
beq ov00_023002F0
ldr fp, _02300390 ; =0x0231AD7C
ldr r5, _02300394 ; =0x0231AD94
mov r6, #0x800
@ -79409,7 +79409,9 @@ _023002DC:
movs sl, r0
bne _0230011C
arm_func_end ov00_0230002C
_023002F0:
arm_func_start ov00_023002F0
ov00_023002F0: ; 023002F0
ldr r0, [sp, #8]
cmp r0, #0
ldrne r0, [r8, #0x1f4]
@ -79463,6 +79465,7 @@ _023003A4: .word 0x0231AD9C
_023003A8: .word 0x0231ADA4
_023003AC: .word 0x0001D4C0
_023003B0: .word 0x0231ADCC
arm_func_end ov00_023002F0
arm_func_start ov00_023003B4
ov00_023003B4: ; 0x023003B4

2393
asm/overlay_01.s
View File

File diff suppressed because it is too large Load Diff

7
asm/overlay_02.s
View File

@ -22958,14 +22958,16 @@ ov02_0233CAD8: ; 0x0233CAD8
ldr r0, _0233CB30 ; =0x0235AACC
ldrb r0, [r0]
cmp r0, #0
bne _0233CB10
bne ov02_0233CB10
mov r1, #1
mov r2, r1
mov r0, #3
mov r3, #8
bl ov02_0234D8E0
arm_func_end ov02_0233CAD8
_0233CB10:
arm_func_start ov02_0233CB10
ov02_0233CB10: ; 0x0233CB10
mov r0, #3
mov r1, #0
mov r2, #0x15
@ -22977,6 +22979,7 @@ _0233CB10:
.align 2, 0
_0233CB30: .word 0x0235AACC
_0233CB34: .word ov02_0233CB38
arm_func_end ov02_0233CB10
arm_func_start ov02_0233CB38
ov02_0233CB38: ; 0x0233CB38

4
asm/overlay_03.s
View File

@ -188,7 +188,7 @@ _0233CC58:
bl ov01_0232E94C
cmp r0, #0
bne _0233CF68
bl ov00_0232F3F4
bl ov01_0232F3F4
bl ov03_0233CA80
mov r0, #1
mov r1, #0
@ -289,7 +289,7 @@ ov03_0233CDC8: ; 0x0233CDC8
cmp r0, #0
bne _0233CF68
mov r0, #0xf
bl ov00_023310B8
bl ov01_023310B8
arm_func_end ov03_0233CDC8
arm_func_start ov03_0233CDD8

6
asm/overlay_04.s
View File

@ -256,7 +256,7 @@ _0233CD04:
bl ov01_0232E94C
cmp r0, #0
bne _0233D148
bl ov00_0232F3F4
bl ov01_0232F3F4
bl ov04_0233CA80
mov r3, #0
ldr r1, _0233D154 ; =0x0233F670
@ -340,7 +340,7 @@ _0233CE0C:
cmp r0, #0
bne _0233D148
mov r0, #0x11
bl ov00_023310B8
bl ov01_023310B8
mov r0, #3
b _0233D14C
_0233CE28:
@ -548,7 +548,7 @@ _0233D114:
bne _0233D130
bl ov04_0233D2B4
mov r0, #0x11
bl ov00_023310B8
bl ov01_023310B8
mov r0, #3
b _0233D14C
_0233D130:

8
asm/overlay_05.s
View File

@ -243,7 +243,7 @@ _0233CCE8:
bl ov01_0232E94C
cmp r0, #0
bne _0233D338
bl ov00_0232F3F4
bl ov01_0232F3F4
bl ov05_0233CA80
ldr r0, _0233D344 ; =0x0233FCCC
mov r1, #3
@ -343,7 +343,7 @@ _0233CE2C:
cmp r0, #0
bne _0233D338
mov r0, #0x13
bl ov00_023310B8
bl ov01_023310B8
mov r0, #3
b _0233D33C
_0233CE48:
@ -645,7 +645,7 @@ _0233D288:
bne _0233D338
bl ov05_0233D424
mov r0, #0x13
bl ov00_023310B8
bl ov01_023310B8
mov r0, #3
b _0233D33C
_0233D2A4:
@ -686,7 +686,7 @@ _0233D31C:
bne _0233D338
bl ov05_0233DBA0
mov r0, #0x13
bl ov00_023310B8
bl ov01_023310B8
mov r0, #3
b _0233D33C
_0233D338:

40
asm/overlay_06.s
View File

@ -189,7 +189,7 @@ _0233CCA0:
mov r0, #1
b _0233CD34
_0233CCB4:
bl sub_020473A4
bl sub_02046D20
mov r0, #0x11
bl sub_020668B4
ldr r0, _0233CD3C ; =0x0233EEC0
@ -435,7 +435,7 @@ _0233CF78:
ldr r1, _0233D4D4 ; =0x00000321
ldr r0, [r0]
str r1, [r0]
bl sub_020473A4
bl sub_02046D20
b _0233D4C4
_0233CFA4:
bl GetKeyboardStatus
@ -537,7 +537,7 @@ _0233D0D8:
movlt r4, #0
_0233D110:
ldr r0, _0233D4DC ; =0x0233EDCC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r6, _0233D4E0 ; =0x0233EDD0
ldr r5, _0233D4CC ; =0x0233EEC4
mov r7, #0
@ -546,12 +546,12 @@ _0233D124:
mov r0, r6
add r1, r1, r7
ldrb r1, [r1, #0x44]
bl DebugPrint0
bl DebugPrint0__0200C1FC
add r7, r7, #1
cmp r7, #0x22
blt _0233D124
ldr r0, _0233D4DC ; =0x0233EDCC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0233D4CC ; =0x0233EEC4
cmp r4, #7
ldr r1, [r0]
@ -854,7 +854,7 @@ _0233D548:
strh r3, [r2, #0xb0]
ldr r0, [r0]
bl MemZero
bl sub_020473A4
bl sub_02046D20
mov r0, #1
ldmdb sp!, {r3, pc}
.align 2, 0
@ -935,7 +935,7 @@ _0233D690:
bl ov01_0232E94C
cmp r0, #0
bne _0233DC68
bl ov00_0232F3F4
bl ov01_0232F3F4
bl ov06_0233CA80
bl sub_0205ED84
cmp r0, #0
@ -1030,7 +1030,7 @@ _0233D7F0:
cmp r0, #0
bne _0233DC68
mov r0, #0x12
bl ov00_023310B8
bl ov01_023310B8
mov r0, #3
b _0233DC6C
_0233D80C:
@ -1288,7 +1288,7 @@ _0233DB80:
streq r1, [r0, #0xc]
b _0233DC68
_0233DB9C:
bl sub_020473A4
bl sub_02046D20
bl ov06_0233CAC8
cmp r0, #1
bne _0233DBB8
@ -1377,7 +1377,7 @@ ov06_0233DCC0: ; 0x0233DCC0
ldr r0, [r0]
cmp r0, #0
ldmeqdb sp!, {r3, pc}
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233DCF4 ; =0x0233EEEC
ldr r0, [r0]
bl MemFree
@ -1569,7 +1569,7 @@ _0233DF44:
bl ov02_02338EC4
cmp r0, #5
bne _0233DF74
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _0233E8E0 ; =0x0233EEC8
ldr r1, _0233E8E8 ; =0x00001005
@ -1619,7 +1619,7 @@ _0233DFF0:
cmp r0, fp
beq _0233E018
ldr r0, _0233E904 ; =0x0233EDD4
bl DebugPrint0
bl DebugPrint0__0200C1FC
b _0233E0F0
_0233E018:
ldr r1, [r7, #4]
@ -1627,7 +1627,7 @@ _0233E018:
cmp r1, r0
beq _0233E034
ldr r0, _0233E90C ; =0x0233EDFC
bl DebugPrint0
bl DebugPrint0__0200C1FC
b _0233E0F0
_0233E034:
bl GetLanguageType
@ -1635,7 +1635,7 @@ _0233E034:
cmp r1, r0
beq _0233E050
ldr r0, _0233E910 ; =0x0233EE24
bl DebugPrint0
bl DebugPrint0__0200C1FC
b _0233E0F0
_0233E050:
add r0, r7, #0x20
@ -1647,7 +1647,7 @@ _0233E050:
cmp r1, r2
beq _0233E07C
ldr r0, _0233E914 ; =0x0233EE4C
bl DebugPrint0
bl DebugPrint0__0200C1FC
b _0233E0F0
_0233E07C:
ldr r2, [sp, #8]
@ -1672,7 +1672,7 @@ _0233E07C:
cmp r0, #0
bne _0233E0EC
ldr r0, _0233E918 ; =0x0233EE84
bl DebugPrint0
bl DebugPrint0__0200C1FC
strb r6, [r7]
strb r5, [r7, #4]
strb r6, [r7, #5]
@ -1833,7 +1833,7 @@ _0233E2F8:
streq r1, [r0, #4]
b _0233E69C
_0233E314:
bl sub_020473A4
bl sub_02046D20
ldr r1, _0233E8E0 ; =0x0233EEC8
mov r0, #0x14
ldr r1, [r1]
@ -2080,7 +2080,7 @@ _0233E6A0:
bl ov06_0233CB10
bl sub_02069904
bl sub_02046BB4
bl sub_020473A4
bl sub_02046D20
bl ov01_02338C34
ldr r0, _0233E8E0 ; =0x0233EEC8
ldr r1, _0233E8E8 ; =0x00001005
@ -2314,7 +2314,7 @@ _0233E9E8:
add r7, r7, #1
cmp r7, #9
blt _0233E9E8
bl sub_020473A4
bl sub_02046D20
mov r0, #1
ldmdb sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
@ -2373,7 +2373,7 @@ ov06_0233ECCC: ; 0x0233ECCC
ldr r0, [r0]
cmp r0, #0
ldmeqdb sp!, {r3, pc}
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233ED00 ; =0x0233EEF0
ldr r0, [r0]
bl MemFree

4
asm/overlay_07.s
View File

@ -3349,7 +3349,7 @@ _0233F85C:
bl ov01_0232E94C
cmp r0, #0
bne _0233FC90
bl ov00_0232F3F4
bl ov01_0232F3F4
bl sub_0204A1CC
bl ov00_022BCA80
cmp r0, #3
@ -3477,7 +3477,7 @@ _0233FA3C:
cmp r0, #0
bne _0233FC90
mov r0, #0x10
bl ov00_023310B8
bl ov01_023310B8
mov r0, #3
b _0233FC94
_0233FA58:

34
asm/overlay_08.s
View File

@ -199,7 +199,7 @@ _0233CCD4:
bl ov08_0233CD3C
cmp r0, #0
movne r0, #5
ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
ldmnedb sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
_0233CCE4:
mov r0, #0
ldmdb sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
@ -324,7 +324,7 @@ ov08_0233CE14: ; 0x0233CE14
ldr r0, _0233CE68 ; =0x0233EC24
ldrb r1, [r0]
cmp r1, #0
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
mov r1, #1
strb r1, [r0]
mov r1, #0
@ -805,7 +805,7 @@ _0233D4A0:
cmp r0, #1
bne _0233D4D0
ldr r0, _0233D5A8 ; =0x0233EA70
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, [r4, #4]
ldrb r0, [r0, #0xd14]
cmp r0, #0
@ -849,12 +849,12 @@ _0233D514: ; jump table
b _0233D568 ; case 9
_0233D53C:
ldr r0, _0233D5AC ; =0x0233EA94
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov08_0233E1D8
b _0233D574
_0233D54C:
ldr r0, _0233D5B0 ; =0x0233EAA4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov08_0233E16C
b _0233D574
_0233D55C:
@ -961,7 +961,7 @@ ov08_0233D66C: ; 0x0233D66C
ldrh r0, [r0, #0xe]
cmp r0, #0
beq _0233D6B4
bl ov00_022C329
bl ov00_022C3298
cmp r0, #7
bne _0233D6B4
ldr r0, _0233D6BC ; =0x0233EC28
@ -1003,7 +1003,7 @@ ov08_0233D6E8: ; 0x0233D6E8
ldrh r0, [r0, #0xe]
cmp r0, #0
beq _0233D730
bl ov00_022C329
bl ov00_022C3298
cmp r0, #0xe
bne _0233D730
ldr r0, _0233D738 ; =0x0233EC28
@ -1069,7 +1069,7 @@ ov08_0233D788: ; 0x0233D788
ldrh r0, [r0, #0xe]
cmp r0, #0
beq _0233D80C
bl ov00_022C329
bl ov00_022C3298
cmp r0, #0xa
bne _0233D80C
ldr r0, _0233D814 ; =0x0233EC28
@ -1744,7 +1744,7 @@ ov08_0233DFF8: ; 0x0233DFF8
ldrh r1, [r0]
cmp r1, #0
movne r0, #0
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
ldr r1, [r0, #0x18]
mov r2, #1
cmp r1, #0
@ -1863,7 +1863,7 @@ _0233E194:
mov r0, #0
_0233E1B8:
cmp r0, #0
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
mov r0, #0xa
bl ov08_0233DB60
ldmdb sp!, {r3, pc}
@ -1935,7 +1935,7 @@ _0233E25C:
str r3, [r1, #0xe4]
ldr r0, [r0]
str r3, [r0, #0xe8]
bl sub_020473A4
bl sub_02046D20
mov r0, #1
ldmdb sp!, {r3, pc}
.align 2, 0
@ -2254,7 +2254,7 @@ _0233E710:
bl ov08_0233CED0
mov r0, #0
str r0, [r5, #0xe8]
bl sub_020473A4
bl sub_02046D20
ldr r1, _0233E7CC ; =0x000004E2
mov r0, #0x1c
mov r2, #0
@ -2268,7 +2268,7 @@ _0233E74C:
bl ov08_0233CED0
mov r0, #0
str r0, [r5, #0xe8]
bl sub_020473A4
bl sub_02046D20
ldr r1, _0233E7CC ; =0x000004E2
mov r0, #0x1c
mov r2, #0
@ -2290,7 +2290,7 @@ _0233E79C:
bl ov08_0233CED0
bl ov08_0233CDC8
mov r0, #0x18
bl ov00_023310B8
bl ov01_023310B8
mov r0, #3
b _0233E7C0
_0233E7B4:
@ -2314,7 +2314,7 @@ ov08_0233E7D8: ; 0x0233E7D8
ldr r0, [r0]
cmp r0, #0
ldmeqdb sp!, {r3, pc}
bl sub_020473A4
bl sub_02046D20
ldr r0, _0233E80C ; =0x0234C920
ldr r0, [r0]
bl MemFree
@ -2349,11 +2349,11 @@ ov08_0233E844: ; 0x0233E844
mov r5, r0
ldr r0, _0233E870 ; =0x0233EBFC
mov r4, r1
bl DebugPrint0
bl DebugPrint0__0200C1FC
cmp r4, #0xb
str r4, [r5]
cmpne r4, #0xe
ldmneia sp!, {r3, r4, r5, pc}
ldmnedb sp!, {r3, r4, r5, pc}
bl ov08_0233CD18
ldmdb sp!, {r3, r4, r5, pc}
.align 2, 0

28
asm/overlay_15.s
View File

@ -244,7 +244,7 @@ ov15_0238A468: ; 0x0238A468
b _0238A4D4
_0238A488:
ldr r0, _0238A4E4 ; =0x0238B0CC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238A4DC ; =0x0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
@ -320,7 +320,7 @@ _0238A56C:
ldr r0, _0238AD18 ; =0x0238B0D4
and r1, r1, #0x1f
strb r1, [r3, #0x68]
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =0x0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x68]
@ -374,7 +374,7 @@ _0238A634:
ldrsb r0, [r0, #0x80]
bl ShowDBox
ldr r0, _0238AD2C ; =0x0238B0E0
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r1, #4
ldr r0, _0238AD30 ; =0x0238B0AC
str r1, [sp]
@ -388,7 +388,7 @@ _0238A634:
b _0238AD08
_0238A68C:
ldr r0, _0238AD3C ; =0x0238B0E8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =0x0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
@ -422,7 +422,7 @@ _0238A708:
ldr r0, _0238AD3C ; =0x0238B0E8
mov r1, #6
str r1, [r3, #8]
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =0x0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
@ -463,7 +463,7 @@ _0238A790:
b _0238AD08
_0238A7AC:
ldr r0, _0238AD4C ; =0x0238B0F4
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =0x0238B180
mov r2, #1
ldr r1, [r0]
@ -493,7 +493,7 @@ _0238A7AC:
b _0238AD08
_0238A820:
ldr r0, _0238AD3C ; =0x0238B0E8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =0x0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
@ -592,7 +592,7 @@ _0238A95C:
str ip, [r3, #0x74]
ldr r1, [r1]
str r2, [r1, #0x78]
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238AD24 ; =0x0238B08C
ldr r1, _0238AD28 ; =ov15_0238ADC4
bl sub_0202F8C4
@ -653,7 +653,7 @@ _0238AA08:
b _0238AD08
_0238AA88:
ldr r0, _0238AD3C ; =0x0238B0E8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238AD10 ; =0x0238B180
ldr r0, [r0]
ldrsb r0, [r0, #0x83]
@ -756,7 +756,7 @@ _0238ABD4:
str ip, [r3, #0x74]
ldr r1, [r1]
str r2, [r1, #0x78]
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238AD24 ; =0x0238B08C
ldr r1, _0238AD28 ; =ov15_0238ADC4
bl sub_0202F8C4
@ -942,7 +942,7 @@ ov15_0238AE98: ; 0x0238AE98
cmp r1, r0
beq _0238AEC4
ldr r0, _0238AF44 ; =0x0238B11C
bl DebugPrint0
bl DebugPrint0__0200C1FC
_0238AEC4:
ldr r1, _0238AF40 ; =0x0238B180
mvn r0, #1
@ -951,7 +951,7 @@ _0238AEC4:
cmp r1, r0
beq _0238AEE4
ldr r0, _0238AF48 ; =0x0238B12C
bl DebugPrint0
bl DebugPrint0__0200C1FC
_0238AEE4:
ldr r1, _0238AF40 ; =0x0238B180
mvn r0, #1
@ -960,7 +960,7 @@ _0238AEE4:
cmp r1, r0
beq _0238AF04
ldr r0, _0238AF4C ; =0x0238B13C
bl DebugPrint0
bl DebugPrint0__0200C1FC
_0238AF04:
ldr r1, _0238AF40 ; =0x0238B180
mvn r0, #1
@ -969,7 +969,7 @@ _0238AF04:
cmp r1, r0
beq _0238AF24
ldr r0, _0238AF50 ; =0x0238B150
bl DebugPrint0
bl DebugPrint0__0200C1FC
_0238AF24:
ldr r0, _0238AF40 ; =0x0238B180
ldr r0, [r0]

60
asm/overlay_21.s
View File

@ -86,7 +86,7 @@ _0238A168: ; jump table
b _0238B7B8 ; case 66
_0238A274:
ldr r0, _0238B090 ; =0x0238CBB8
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r1, [r0]
mov r2, #0x96
@ -133,7 +133,7 @@ _0238A274:
b _0238B7B8
_0238A32C:
ldr r0, _0238B0A0 ; =0x0238CBD4
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0A4 ; =0x0238CA28
ldr r1, _0238B0A8 ; =ov21_0238C9A4
bl sub_0202F8C4
@ -153,7 +153,7 @@ _0238A32C:
b _0238B7B8
_0238A378:
ldr r0, _0238B0B8 ; =0x0238CBF8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -224,7 +224,7 @@ ov21_0238A468: ; 0x0238A468
b _0238B7B8
_0238A478:
ldr r0, _0238B0C8 ; =0x0238CC18
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -254,7 +254,7 @@ _0238A478:
b _0238B7B8
_0238A4EC:
ldr r0, _0238B0C8 ; =0x0238CC18
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r2, [r0]
mov r4, #2
@ -268,7 +268,7 @@ _0238A4EC:
b _0238B7B8
_0238A520:
ldr r0, _0238B0C8 ; =0x0238CC18
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -298,7 +298,7 @@ _0238A520:
b _0238B7B8
_0238A594:
ldr r0, _0238B0D8 ; =0x0238CC3C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -353,7 +353,7 @@ _0238A5FC:
b _0238B7B8
_0238A668:
ldr r0, _0238B0E0 ; =0x0238CC5C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -383,7 +383,7 @@ _0238A668:
b _0238B7B8
_0238A6DC:
ldr r0, _0238B0E8 ; =0x0238CC7C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -413,7 +413,7 @@ _0238A6DC:
b _0238B7B8
_0238A750:
ldr r0, _0238B0EC ; =0x0238CC9C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -446,7 +446,7 @@ _0238A750:
b _0238B7B8
_0238A7D0:
ldr r0, _0238B0F4 ; =0x0238CCC0
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -476,12 +476,12 @@ _0238A7D0:
b _0238B7B8
_0238A844:
ldr r0, _0238B0F8 ; =0x0238CCE4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
b _0238B7B8
_0238A854:
ldr r0, _0238B0FC ; =0x0238CD00
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov21_0238C920
mov r0, r4
ldr r1, [r0]
@ -514,7 +514,7 @@ _0238A854:
b _0238B7B8
_0238A8D4:
ldr r0, _0238B100 ; =0x0238CD24
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r1, [r0]
mov r2, #0xd
@ -546,7 +546,7 @@ _0238A8D4:
b _0238B7B8
_0238A950:
ldr r0, _0238B108 ; =0x0238CD44
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
@ -562,15 +562,15 @@ _0238A950:
b _0238B7B8
_0238A98C:
ldr r0, _0238B10C ; =0x0238CD68
bl DebugPrint0
bl ov11_0230C91
bl DebugPrint0__0200C1FC
bl ov11_0230C910
mov r0, #0
mov r1, r0
bl ov11_0230B20C
b _0238B7B8
_0238A9A8:
ldr r0, _0238B110 ; =0x0238CD8C
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r0, [r0]
ldrsb r0, [r0, #0x80]
@ -587,7 +587,7 @@ _0238A9A8:
b _0238B7B8
_0238A9E8:
ldr r0, _0238B114 ; =0x0238CDB4
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #3
ldr r0, _0238B118 ; =0x0238CB78
ldr r1, _0238B11C ; =0x00400013
@ -601,7 +601,7 @@ _0238A9E8:
b _0238B7B8
_0238AA1C:
ldr r0, _0238B124 ; =0x0238CDDC
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r5, [r0]
ldr r2, _0238B128 ; =0x0238CE00
@ -643,7 +643,7 @@ _0238AA1C:
b _0238B7B8
_0238AAC0:
ldr r0, _0238B13C ; =0x0238CE0C
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r1, [r0]
mov r3, #0x96
@ -717,7 +717,7 @@ _0238ABC0:
b _0238B7B8
_0238ABDC:
ldr r0, _0238B148 ; =0x0238CE34
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r1, r4
ldr r2, [r1]
mov r3, #0x96
@ -741,7 +741,7 @@ _0238ABDC:
b _0238B7B8
_0238AC38:
ldr r0, _0238B150 ; =0x0238CE4C
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r1, [r0]
mov r3, #6
@ -759,7 +759,7 @@ _0238AC38:
b _0238B7B8
_0238AC7C:
ldr r0, _0238B154 ; =0x0238CE78
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r1, [r0]
mov r3, #7
@ -777,7 +777,7 @@ _0238AC7C:
b _0238B7B8
_0238ACC0:
ldr r0, _0238B158 ; =0x0238CEA4
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
ldr r1, [r0]
mov r3, #8
@ -931,7 +931,7 @@ _0238AE94:
b _0238B7B8
_0238AEF4:
ldr r0, _0238B164 ; =0x0238CED0
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r0, r4
mov r2, #0x13
ldr r1, [r0]
@ -955,7 +955,7 @@ _0238AEF4:
b _0238B7B8
_0238AF50:
ldr r0, _0238B16C ; =0x0238CEF8
bl DebugPrint0
bl DebugPrint0__0200C1FC
mvn r0, #0x95
bl AddMoneyCarried
ldr r1, [r4]
@ -1254,7 +1254,7 @@ _0238B344:
ldr r2, _0238B7D0 ; =0x000003CB
add r3, r3, #0x30
bl ShowMessageInDBox
bl ov11_0230C91
bl ov11_0230C910
b _0238B7B8
_0238B3B8:
ldrsb r0, [r0, #0x80]
@ -1436,7 +1436,7 @@ _0238B640:
ldr r0, [r0]
ldrsb r0, [r0, #0x81]
bl HidePortraitBox
bl ov11_0230C91
bl ov11_0230C910
mov r1, r4
ldr r1, [r1]
mov r0, #3
@ -1606,7 +1606,7 @@ ov21_0238B848: ; 0x0238B848
str r3, [r2, #0x30]
ldr r0, [r0]
str r1, [r0, #8]
bl ov11_0230C91
bl ov11_0230C910
ldr r0, _0238B8F4 ; =0x0238CF40
mov r2, #0
ldr r1, [r0]

172
asm/overlay_22.s
View File

@ -1035,7 +1035,7 @@ _0238AE00: ; jump table
b _0238AFA4 ; case 48
_0238AEC4:
ldr r0, _0238BD64 ; =0x0238E9D0
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
mov r1, #1
ldr r0, [r0]
@ -1057,7 +1057,7 @@ _0238AEC4:
b _0238C16C
_0238AF18:
ldr r0, _0238BD70 ; =0x0238E9D8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02042AF8
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
@ -1080,7 +1080,7 @@ _0238AF18:
b _0238C16C
_0238AF70:
ldr r0, _0238BD7C ; =0x0238E9E4
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #5
ldr r0, _0238BD80 ; =0x0238E980
ldr r1, _0238BD84 ; =0x00300013
@ -1098,7 +1098,7 @@ _0238AFA4:
b _0238C16C
_0238AFB0:
ldr r0, _0238BD8C ; =0x0238E9F4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r2, #1
@ -1119,7 +1119,7 @@ _0238AFB0:
b _0238C16C
_0238B000:
ldr r0, _0238BD98 ; =0x0238EA04
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r2, #4
@ -1140,7 +1140,7 @@ _0238B000:
b _0238C16C
_0238B050:
ldr r0, _0238BDA0 ; =0x0238EA10
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r2, #1
@ -1161,7 +1161,7 @@ _0238B050:
b _0238C16C
_0238B0A0:
ldr r0, _0238BDA8 ; =0x0238EA1C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r2, #0x11
@ -1182,7 +1182,7 @@ _0238B0A0:
b _0238C16C
_0238B0F0:
ldr r0, _0238BDB0 ; =0x0238EA28
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238BD60 ; =0x0238EC70
mov r0, #1
@ -1202,7 +1202,7 @@ _0238B0F0:
b _0238C16C
_0238B13C:
ldr r0, _0238BDB8 ; =0x0238EA34
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238BD60 ; =0x0238EC70
mov r0, #1
@ -1222,7 +1222,7 @@ _0238B13C:
b _0238C16C
_0238B188:
ldr r0, _0238BDC0 ; =0x0238EA40
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238BD60 ; =0x0238EC70
mov r0, #1
@ -1242,7 +1242,7 @@ _0238B188:
b _0238C16C
_0238B1D4:
ldr r0, _0238BDC8 ; =0x0238EA4C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238BD60 ; =0x0238EC70
mov r0, #1
@ -1262,7 +1262,7 @@ _0238B1D4:
b _0238C16C
_0238B220:
ldr r0, _0238BDD0 ; =0x0238EA58
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238BD60 ; =0x0238EC70
mov r0, #1
@ -1282,7 +1282,7 @@ _0238B220:
b _0238C16C
_0238B26C:
ldr r0, _0238BDD8 ; =0x0238EA64
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r2, #1
@ -1303,7 +1303,7 @@ _0238B26C:
b _0238C16C
_0238B2BC:
ldr r0, _0238BDE0 ; =0x0238EA70
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r2, #0x11
@ -1324,7 +1324,7 @@ _0238B2BC:
b _0238C16C
_0238B30C:
ldr r0, _0238BDE8 ; =0x0238EA7C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238BD60 ; =0x0238EC70
mov r2, #0x1d
@ -1351,7 +1351,7 @@ _0238B30C:
b _0238C16C
_0238B374:
ldr r0, _0238BDF0 ; =0x0238EA88
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r2, #0x1d
@ -1381,7 +1381,7 @@ _0238B3D8:
b _0238C16C
_0238B3E0:
ldr r0, _0238BDF4 ; =0x0238EA94
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r3, #0x13
@ -1405,7 +1405,7 @@ _0238B3E0:
b _0238C16C
_0238B43C:
ldr r0, _0238BDFC ; =0x0238EAA8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
mov r3, #0x14
ldr r1, [r0]
@ -1429,7 +1429,7 @@ _0238B43C:
b _0238C16C
_0238B498:
ldr r0, _0238BE04 ; =0x0238EAB8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r0, [r0]
ldrsb r0, [r0, #0x48]
@ -1462,7 +1462,7 @@ _0238B4F0:
b _0238C16C
_0238B510:
ldr r0, _0238BE08 ; =0x0238EAC8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r2, _0238BD74 ; =0x0000017F
ldr r1, [r0]
@ -1498,7 +1498,7 @@ _0238B574:
b _0238C16C
_0238B594:
ldr r0, _0238BE0C ; =0x0238EAD8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r3, _0238BE10 ; =0x0238E8A0
ldr r0, [r0]
@ -1517,7 +1517,7 @@ _0238B594:
b _0238C16C
_0238B5DC:
ldr r0, _0238BE1C ; =0x0238EAE8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r2, _0238BE20 ; =0x0238E85C
ldr r1, [r0]
@ -1561,7 +1561,7 @@ _0238B680:
ldrsh r1, [r2, #0x30]
ldrh r2, [r2, #0x2e]
ldr r0, _0238BE28 ; =0x0238EAF8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r0, [r0]
add r0, r0, #0x50
@ -1610,7 +1610,7 @@ _0238B680:
b _0238C16C
_0238B748:
ldr r0, _0238BE40 ; =0x0238EB20
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238D528
cmp r0, #0
bne _0238B790
@ -1651,7 +1651,7 @@ _0238B7A0:
b _0238C16C
_0238B7D8:
ldr r0, _0238BE48 ; =0x0238EB30
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
mov r3, #0x1f
@ -1675,7 +1675,7 @@ _0238B7D8:
b _0238C16C
_0238B834:
ldr r0, _0238BE50 ; =0x0238EB40
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
mov r3, #0x20
ldr r1, [r0]
@ -1699,7 +1699,7 @@ _0238B834:
b _0238C16C
_0238B890:
ldr r0, _0238BE58 ; =0x0238EB50
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r0, [r0]
ldrsb r0, [r0, #0x48]
@ -1724,7 +1724,7 @@ _0238B890:
b _0238C16C
_0238B8F0:
ldr r0, _0238BE5C ; =0x0238EB60
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r2, _0238BD74 ; =0x0000017F
ldr r1, [r0]
@ -1751,7 +1751,7 @@ _0238B8F0:
b _0238C16C
_0238B958:
ldr r0, _0238BE60 ; =0x0238EB70
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #3
ldr r0, _0238BE14 ; =0x0238E990
ldr r3, _0238BE64 ; =0x0238E880
@ -1765,7 +1765,7 @@ _0238B958:
b _0238C16C
_0238B98C:
ldr r0, _0238BE68 ; =0x0238EB80
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r2, _0238BE20 ; =0x0238E85C
ldr r1, [r0]
@ -1800,7 +1800,7 @@ _0238B98C:
b _0238C16C
_0238BA14:
ldr r0, _0238BE70 ; =0x0238EB90
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238BE74 ; =0x0238E9A0
ldr r1, _0238BD84 ; =0x00300013
@ -1814,7 +1814,7 @@ _0238BA14:
b _0238C16C
_0238BA48:
ldr r0, _0238BE7C ; =0x0238EBA4
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238BE74 ; =0x0238E9A0
ldr r1, _0238BD84 ; =0x00300013
@ -1828,7 +1828,7 @@ _0238BA48:
b _0238C16C
_0238BA7C:
ldr r0, _0238BE80 ; =0x0238EBB8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r0, [r0]
add r0, r0, #0x50
@ -1884,7 +1884,7 @@ _0238BA7C:
b _0238C16C
_0238BB58:
ldr r0, _0238BE84 ; =0x0238EBC8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl GetNbItemsInBag
cmp r0, #0
beq _0238BB7C
@ -1920,7 +1920,7 @@ _0238BBA0:
b _0238C16C
_0238BBD8:
ldr r0, _0238BE90 ; =0x0238EBD8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238BD60 ; =0x0238EC70
mov r0, #0
@ -1947,7 +1947,7 @@ _0238BBD8:
b _0238C16C
_0238BC40:
ldr r0, _0238BE98 ; =0x0238EBE4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238BD60 ; =0x0238EC70
ldr r0, [r0]
@ -2106,7 +2106,7 @@ _0238BE9C: .word 0x0238E8FC
_0238BEA0: .word 0x0238EBF0
_0238BEA4:
ldr r0, _0238BEA0 ; =0x0238EBF0
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r8, _0238BD60 ; =0x0238EC70
mov r6, #0
@ -2177,7 +2177,7 @@ _0238BF48:
b _0238C16C
_0238BFB4:
ldr r0, _0238C174 ; =0x0238EC00
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238BE74 ; =0x0238E9A0
ldr r1, _0238BD84 ; =0x00300013
@ -2191,7 +2191,7 @@ _0238BFB4:
b _0238C16C
_0238BFE8:
ldr r0, _0238C178 ; =0x0238EC10
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
mov r2, #1
ldr r1, [r0]
@ -2212,7 +2212,7 @@ _0238BFE8:
b _0238C16C
_0238C038:
ldr r0, _0238C174 ; =0x0238EC00
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238BE74 ; =0x0238E9A0
ldr r1, _0238BD84 ; =0x00300013
@ -2226,7 +2226,7 @@ _0238C038:
b _0238C16C
_0238C06C:
ldr r0, _0238C174 ; =0x0238EC00
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238BE74 ; =0x0238E9A0
ldr r1, _0238BD84 ; =0x00300013
@ -2240,7 +2240,7 @@ _0238C06C:
b _0238C16C
_0238C0A0:
ldr r0, _0238C17C ; =0x0238EC24
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r0, [r0]
ldrsb r0, [r0, #0x48]
@ -2269,7 +2269,7 @@ _0238C0A0:
b _0238C16C
_0238C110:
ldr r0, _0238C180 ; =0x0238EC38
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238BD60 ; =0x0238EC70
ldr r0, [r0]
ldrsb r0, [r0, #0x48]
@ -2363,7 +2363,7 @@ _0238C1A4: ; jump table
b _0238C348 ; case 48
_0238C268:
ldr r0, _0238D108 ; =0x0238E9D0
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
mov r1, #1
ldr r0, [r0]
@ -2385,7 +2385,7 @@ _0238C268:
b _0238D510
_0238C2BC:
ldr r0, _0238D114 ; =0x0238E9D8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02042AF8
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
@ -2408,7 +2408,7 @@ _0238C2BC:
b _0238D510
_0238C314:
ldr r0, _0238D120 ; =0x0238E9E4
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #5
ldr r0, _0238D124 ; =0x0238E980
ldr r1, _0238D128 ; =0x00300013
@ -2426,7 +2426,7 @@ _0238C348:
b _0238D510
_0238C354:
ldr r0, _0238D130 ; =0x0238E9F4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r2, #1
@ -2447,7 +2447,7 @@ _0238C354:
b _0238D510
_0238C3A4:
ldr r0, _0238D13C ; =0x0238EA04
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r2, #4
@ -2468,7 +2468,7 @@ _0238C3A4:
b _0238D510
_0238C3F4:
ldr r0, _0238D144 ; =0x0238EA10
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r2, #1
@ -2489,7 +2489,7 @@ _0238C3F4:
b _0238D510
_0238C444:
ldr r0, _0238D14C ; =0x0238EA1C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r2, #0x11
@ -2510,7 +2510,7 @@ _0238C444:
b _0238D510
_0238C494:
ldr r0, _0238D154 ; =0x0238EA28
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238D104 ; =0x0238EC70
mov r0, #1
@ -2530,7 +2530,7 @@ _0238C494:
b _0238D510
_0238C4E0:
ldr r0, _0238D15C ; =0x0238EA34
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238D104 ; =0x0238EC70
mov r0, #1
@ -2550,7 +2550,7 @@ _0238C4E0:
b _0238D510
_0238C52C:
ldr r0, _0238D164 ; =0x0238EA40
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238D104 ; =0x0238EC70
mov r0, #1
@ -2570,7 +2570,7 @@ _0238C52C:
b _0238D510
_0238C578:
ldr r0, _0238D16C ; =0x0238EA4C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238D104 ; =0x0238EC70
mov r0, #1
@ -2590,7 +2590,7 @@ _0238C578:
b _0238D510
_0238C5C4:
ldr r0, _0238D174 ; =0x0238EA58
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238D104 ; =0x0238EC70
mov r0, #1
@ -2610,7 +2610,7 @@ _0238C5C4:
b _0238D510
_0238C610:
ldr r0, _0238D17C ; =0x0238EA64
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r2, #1
@ -2631,7 +2631,7 @@ _0238C610:
b _0238D510
_0238C660:
ldr r0, _0238D184 ; =0x0238EA70
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r2, #0x11
@ -2652,7 +2652,7 @@ _0238C660:
b _0238D510
_0238C6B0:
ldr r0, _0238D18C ; =0x0238EA7C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238D104 ; =0x0238EC70
mov r2, #0x1d
@ -2679,7 +2679,7 @@ _0238C6B0:
b _0238D510
_0238C718:
ldr r0, _0238D194 ; =0x0238EA88
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r2, #0x1d
@ -2709,7 +2709,7 @@ _0238C77C:
b _0238D510
_0238C784:
ldr r0, _0238D198 ; =0x0238EA94
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r3, #0x13
@ -2733,7 +2733,7 @@ _0238C784:
b _0238D510
_0238C7E0:
ldr r0, _0238D1A0 ; =0x0238EAA8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
mov r3, #0x14
ldr r1, [r0]
@ -2757,7 +2757,7 @@ _0238C7E0:
b _0238D510
_0238C83C:
ldr r0, _0238D1A8 ; =0x0238EAB8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r0, [r0]
ldrsb r0, [r0, #0x48]
@ -2790,7 +2790,7 @@ _0238C894:
b _0238D510
_0238C8B4:
ldr r0, _0238D1AC ; =0x0238EAC8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r2, _0238D118 ; =0x0000017F
ldr r1, [r0]
@ -2826,7 +2826,7 @@ _0238C918:
b _0238D510
_0238C938:
ldr r0, _0238D1B0 ; =0x0238EAD8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r3, _0238D1B4 ; =0x0238E8A0
ldr r0, [r0]
@ -2845,7 +2845,7 @@ _0238C938:
b _0238D510
_0238C980:
ldr r0, _0238D1C0 ; =0x0238EAE8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r2, _0238D1C4 ; =0x0238E85C
ldr r1, [r0]
@ -2889,7 +2889,7 @@ _0238CA24:
ldrsh r1, [r2, #0x30]
ldrh r2, [r2, #0x2e]
ldr r0, _0238D1CC ; =0x0238EAF8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r0, [r0]
add r0, r0, #0x50
@ -2938,7 +2938,7 @@ _0238CA24:
b _0238D510
_0238CAEC:
ldr r0, _0238D1E4 ; =0x0238EB20
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238D528
cmp r0, #0
bne _0238CB34
@ -2979,7 +2979,7 @@ _0238CB44:
b _0238D510
_0238CB7C:
ldr r0, _0238D1EC ; =0x0238EB30
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
mov r3, #0x1f
@ -3003,7 +3003,7 @@ _0238CB7C:
b _0238D510
_0238CBD8:
ldr r0, _0238D1F4 ; =0x0238EB40
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
mov r3, #0x20
ldr r1, [r0]
@ -3027,7 +3027,7 @@ _0238CBD8:
b _0238D510
_0238CC34:
ldr r0, _0238D1FC ; =0x0238EB50
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r0, [r0]
ldrsb r0, [r0, #0x48]
@ -3053,7 +3053,7 @@ _0238CC34:
arm_func_end ov22_0238C184
ov22_0238CC94:
ldr r0, _0238D200 ; =0x0238EB60
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r2, _0238D118 ; =0x0000017F
ldr r1, [r0]
@ -3095,7 +3095,7 @@ ov22_0238CCF0: ; 0x0238CCF0
b _0238D510
_0238CCFC:
ldr r0, _0238D204 ; =0x0238EB70
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #3
ldr r0, _0238D1B8 ; =0x0238E990
ldr r3, _0238D208 ; =0x0238E880
@ -3109,7 +3109,7 @@ _0238CCFC:
b _0238D510
_0238CD30:
ldr r0, _0238D20C ; =0x0238EB80
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r2, _0238D1C4 ; =0x0238E85C
ldr r1, [r0]
@ -3144,7 +3144,7 @@ _0238CD30:
b _0238D510
_0238CDB8:
ldr r0, _0238D214 ; =0x0238EB90
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238D218 ; =0x0238E9A0
ldr r1, _0238D128 ; =0x00300013
@ -3158,7 +3158,7 @@ _0238CDB8:
b _0238D510
_0238CDEC:
ldr r0, _0238D220 ; =0x0238EBA4
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238D218 ; =0x0238E9A0
ldr r1, _0238D128 ; =0x00300013
@ -3172,7 +3172,7 @@ _0238CDEC:
b _0238D510
_0238CE20:
ldr r0, _0238D224 ; =0x0238EBB8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r0, [r0]
add r0, r0, #0x50
@ -3228,7 +3228,7 @@ _0238CE20:
b _0238D510
_0238CEFC:
ldr r0, _0238D228 ; =0x0238EBC8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl GetNbItemsInBag
cmp r0, #0
beq _0238CF20
@ -3264,7 +3264,7 @@ _0238CF44:
b _0238D510
_0238CF7C:
ldr r0, _0238D234 ; =0x0238EBD8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r1, _0238D104 ; =0x0238EC70
mov r0, #0
@ -3291,7 +3291,7 @@ _0238CF7C:
b _0238D510
_0238CFE4:
ldr r0, _0238D23C ; =0x0238EBE4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r0, _0238D104 ; =0x0238EC70
ldr r0, [r0]
@ -3450,7 +3450,7 @@ _0238D240: .word 0x0238E8FC
_0238D244: .word 0x0238EBF0
_0238D248:
ldr r0, _0238D244 ; =0x0238EBF0
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov22_0238E7E4
ldr r8, _0238D104 ; =0x0238EC70
mov r6, #0
@ -3521,7 +3521,7 @@ _0238D2EC:
b _0238D510
_0238D358:
ldr r0, _0238D518 ; =0x0238EC00
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238D218 ; =0x0238E9A0
ldr r1, _0238D128 ; =0x00300013
@ -3535,7 +3535,7 @@ _0238D358:
b _0238D510
_0238D38C:
ldr r0, _0238D51C ; =0x0238EC10
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
mov r2, #1
ldr r1, [r0]
@ -3556,7 +3556,7 @@ _0238D38C:
b _0238D510
_0238D3DC:
ldr r0, _0238D518 ; =0x0238EC00
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238D218 ; =0x0238E9A0
ldr r1, _0238D128 ; =0x00300013
@ -3570,7 +3570,7 @@ _0238D3DC:
b _0238D510
_0238D410:
ldr r0, _0238D518 ; =0x0238EC00
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov r4, #2
ldr r0, _0238D218 ; =0x0238E9A0
ldr r1, _0238D128 ; =0x00300013
@ -3584,7 +3584,7 @@ _0238D410:
b _0238D510
_0238D444:
ldr r0, _0238D520 ; =0x0238EC24
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r0, [r0]
ldrsb r0, [r0, #0x48]
@ -3613,7 +3613,7 @@ _0238D444:
b _0238D510
_0238D4B4:
ldr r0, _0238D524 ; =0x0238EC38
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238D104 ; =0x0238EC70
ldr r0, [r0]
ldrsb r0, [r0, #0x48]

148
asm/overlay_23.s
View File

@ -98,7 +98,7 @@ _0238A218:
b _0238B230
_0238A2A0:
ldr r0, _0238B0E4 ; =0x0238D448
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r3, [r0]
add r1, r3, #0x90
@ -172,7 +172,7 @@ _0238A38C:
b _0238B230
_0238A3B8:
ldr r0, _0238B0FC ; =0x0238D468
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02042AF8
bl sub_020434D4
bl ov23_0238D098
@ -192,7 +192,7 @@ _0238A3B8:
b _0238B230
_0238A404:
ldr r0, _0238B100 ; =0x0238D484
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r2, #1
@ -213,7 +213,7 @@ _0238A404:
b _0238B230
_0238A454:
ldr r0, _0238B108 ; =0x0238D4A4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r3, #4
@ -234,7 +234,7 @@ _0238A454:
b _0238B230
_0238A4A4:
ldr r0, _0238B110 ; =0x0238D4C0
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r2, #1
@ -255,7 +255,7 @@ _0238A4A4:
b _0238B230
_0238A4F4:
ldr r0, _0238B114 ; =0x0238D4DC
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r3, #1
@ -276,7 +276,7 @@ _0238A4F4:
b _0238B230
_0238A544:
ldr r0, _0238B11C ; =0x0238D4F8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r2, #1
@ -297,7 +297,7 @@ _0238A544:
b _0238B230
_0238A594:
ldr r0, _0238B120 ; =0x0238D51C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r3, #1
@ -318,7 +318,7 @@ _0238A594:
b _0238B230
_0238A5E4:
ldr r0, _0238B128 ; =0x0238D540
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r3, #1
@ -339,7 +339,7 @@ _0238A5E4:
b _0238B230
_0238A634:
ldr r0, _0238B12C ; =0x0238D55C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r3, #0xf
@ -369,7 +369,7 @@ _0238A634:
b _0238B230
_0238A6A8:
ldr r0, _0238B134 ; =0x0238D578
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r2, #0xf
@ -390,11 +390,11 @@ _0238A6A8:
b _0238B230
_0238A6F8:
ldr r0, _0238B138 ; =0x0238D594
bl DebugPrint0
bl DebugPrint0__0200C1FC
b _0238B230
_0238A704:
ldr r0, _0238B13C ; =0x0238D5AC
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02042730
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
@ -416,7 +416,7 @@ _0238A704:
b _0238B230
_0238A758:
ldr r0, _0238B140 ; =0x0238D5CC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
mov r3, #0xf
ldr r1, [r0]
@ -436,7 +436,7 @@ _0238A758:
b _0238B230
_0238A7A4:
ldr r0, _0238B144 ; =0x0238D5E8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r0, [r0]
ldrsb r0, [r0, #0x95]
@ -460,7 +460,7 @@ _0238A7A4:
b _0238B230
_0238A800:
ldr r0, _0238B148 ; =0x0238D608
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r0, [r0]
ldrsb r0, [r0, #0x95]
@ -484,7 +484,7 @@ _0238A800:
b _0238B230
_0238A85C:
ldr r0, _0238B14C ; =0x0238D628
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r1, [r0]
add r0, r1, #0x90
@ -527,7 +527,7 @@ _0238A8B8:
b _0238B230
_0238A8FC:
ldr r0, _0238B158 ; =0x0238D64C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B15C ; =0x0238D2EC
mov r4, #3
str r0, [sp, #0x19c]
@ -543,13 +543,13 @@ _0238A8FC:
b _0238B230
_0238A938:
ldr r0, _0238B160 ; =0x0238D670
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r1, _0238B0DC ; =0x0238D8A0
ldr r0, _0238B164 ; =0x0238D68C
ldr r2, [r1]
ldrsh r1, [r2, #0x1c]
ldrh r2, [r2, #0x1a]
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
mov lr, #0
ldr ip, [r0]
@ -601,7 +601,7 @@ _0238A938:
b _0238B230
_0238AA1C:
ldr r0, _0238B17C ; =0x0238D6A8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r2, [r0]
ldr r1, [r2]
@ -644,7 +644,7 @@ _0238AA54:
b _0238B230
_0238AAC0:
ldr r0, _0238B180 ; =0x0238D6CC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r2, [r0]
ldr r1, [r2]
@ -687,7 +687,7 @@ _0238AAF8:
b _0238B230
_0238AB64:
ldr r0, _0238B188 ; =0x0238D6F0
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B18C ; =0x0238D418
ldr r1, _0238B0F4 ; =0x00300013
@ -701,7 +701,7 @@ _0238AB64:
b _0238B230
_0238AB98:
ldr r0, _0238B194 ; =0x0238D708
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B18C ; =0x0238D418
ldr r1, _0238B0F4 ; =0x00300013
@ -715,7 +715,7 @@ _0238AB98:
b _0238B230
_0238ABCC:
ldr r0, _0238B198 ; =0x0238D71C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
bl GetNbItemsInBag
cmp r0, #0
@ -758,7 +758,7 @@ _0238AC28:
b _0238B230
_0238AC68:
ldr r0, _0238B19C ; =0x0238D73C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02043218
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
@ -780,7 +780,7 @@ _0238AC68:
b _0238B230
_0238ACBC:
ldr r0, _0238B1A0 ; =0x0238D75C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238B0DC ; =0x0238D8A0
mov r2, #0x19
@ -801,7 +801,7 @@ _0238ACBC:
b _0238B230
_0238AD0C:
ldr r0, _0238B1A4 ; =0x0238D77C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
mov r2, #0x2b
ldr r1, [r0]
@ -829,7 +829,7 @@ _0238AD54:
b _0238B230
_0238AD74:
ldr r0, _0238B1A8 ; =0x0238D79C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r0, [r0]
ldrsb r0, [r0, #0x95]
@ -852,7 +852,7 @@ _0238AD74:
b _0238B230
_0238ADCC:
ldr r0, _0238B1AC ; =0x0238D7BC
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #3
ldr r0, _0238B150 ; =0x0238D408
ldr r3, _0238B1B0 ; =0x0238D314
@ -870,7 +870,7 @@ caseD_2c: ; 0x0238ADFC
b _0238B230
_0238AE00:
ldr r0, _0238B1AC ; =0x0238D7BC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B1B4 ; =0x0238D2E8
mov ip, #3
str r0, [sp, #0x284]
@ -886,7 +886,7 @@ _0238AE00:
b _0238B230
_0238AE3C:
ldr r0, _0238B1B8 ; =0x0238D7E0
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r2, _0238B168 ; =0x0238D69C
ldr lr, [r0]
@ -931,7 +931,7 @@ _0238AE3C:
b _0238B230
_0238AEEC:
ldr r0, _0238B1BC ; =0x0238D7FC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r2, [r0]
ldr r1, [r2]
@ -975,7 +975,7 @@ _0238AF24:
b _0238B230
_0238AF94:
ldr r0, _0238B1C4 ; =0x0238D81C
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B18C ; =0x0238D418
ldr r1, _0238B0F4 ; =0x00300013
@ -989,7 +989,7 @@ _0238AF94:
b _0238B230
_0238AFC8:
ldr r0, _0238B1C8 ; =0x0238D834
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B0DC ; =0x0238D8A0
ldr r2, [r0]
ldr r1, [r2]
@ -1032,7 +1032,7 @@ _0238B000:
b _0238B230
_0238B06C:
ldr r0, _0238B1CC ; =0x0238D854
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B18C ; =0x0238D418
ldr r1, _0238B0F4 ; =0x00300013
@ -1046,7 +1046,7 @@ _0238B06C:
b _0238B230
_0238B0A0:
ldr r0, _0238B1D0 ; =0x0238D868
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
mov r0, #1
bl sub_02043320
@ -1246,7 +1246,7 @@ _0238B308:
b _0238C320
_0238B390:
ldr r0, _0238C1D4 ; =0x0238D448
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r3, [r0]
add r1, r3, #0x90
@ -1320,7 +1320,7 @@ _0238B47C:
b _0238C320
_0238B4A8:
ldr r0, _0238C1EC ; =0x0238D468
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02042AF8
bl sub_020434D4
bl ov23_0238D098
@ -1340,7 +1340,7 @@ _0238B4A8:
b _0238C320
_0238B4F4:
ldr r0, _0238C1F0 ; =0x0238D484
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r2, #1
@ -1361,7 +1361,7 @@ _0238B4F4:
b _0238C320
_0238B544:
ldr r0, _0238C1F8 ; =0x0238D4A4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r3, #4
@ -1382,7 +1382,7 @@ _0238B544:
b _0238C320
_0238B594:
ldr r0, _0238C200 ; =0x0238D4C0
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r2, #1
@ -1403,7 +1403,7 @@ _0238B594:
b _0238C320
_0238B5E4:
ldr r0, _0238C204 ; =0x0238D4DC
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r3, #1
@ -1424,7 +1424,7 @@ _0238B5E4:
b _0238C320
_0238B634:
ldr r0, _0238C20C ; =0x0238D4F8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r2, #1
@ -1445,7 +1445,7 @@ _0238B634:
b _0238C320
_0238B684:
ldr r0, _0238C210 ; =0x0238D51C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r3, #1
@ -1466,7 +1466,7 @@ _0238B684:
b _0238C320
_0238B6D4:
ldr r0, _0238C218 ; =0x0238D540
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r3, #1
@ -1487,7 +1487,7 @@ _0238B6D4:
b _0238C320
_0238B724:
ldr r0, _0238C21C ; =0x0238D55C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r3, #0xf
@ -1517,7 +1517,7 @@ _0238B724:
b _0238C320
_0238B798:
ldr r0, _0238C224 ; =0x0238D578
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r2, #0xf
@ -1538,11 +1538,11 @@ _0238B798:
b _0238C320
_0238B7E8:
ldr r0, _0238C228 ; =0x0238D594
bl DebugPrint0
bl DebugPrint0__0200C1FC
b _0238C320
_0238B7F4:
ldr r0, _0238C22C ; =0x0238D5AC
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02042730
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
@ -1564,7 +1564,7 @@ _0238B7F4:
b _0238C320
_0238B848:
ldr r0, _0238C230 ; =0x0238D5CC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
mov r3, #0xf
ldr r1, [r0]
@ -1584,7 +1584,7 @@ _0238B848:
b _0238C320
_0238B894:
ldr r0, _0238C234 ; =0x0238D5E8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r0, [r0]
ldrsb r0, [r0, #0x95]
@ -1608,7 +1608,7 @@ _0238B894:
b _0238C320
_0238B8F0:
ldr r0, _0238C238 ; =0x0238D608
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r0, [r0]
ldrsb r0, [r0, #0x95]
@ -1632,7 +1632,7 @@ _0238B8F0:
b _0238C320
_0238B94C:
ldr r0, _0238C23C ; =0x0238D628
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r1, [r0]
add r0, r1, #0x90
@ -1675,7 +1675,7 @@ _0238B9A8:
b _0238C320
_0238B9EC:
ldr r0, _0238C248 ; =0x0238D64C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C24C ; =0x0238D2EC
mov r4, #3
str r0, [sp, #0x1a4]
@ -1691,13 +1691,13 @@ _0238B9EC:
b _0238C320
_0238BA28:
ldr r0, _0238C250 ; =0x0238D670
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r1, _0238C1CC ; =0x0238D8A0
ldr r0, _0238C254 ; =0x0238D68C
ldr r2, [r1]
ldrsh r1, [r2, #0x1c]
ldrh r2, [r2, #0x1a]
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
mov lr, #0
ldr ip, [r0]
@ -1749,7 +1749,7 @@ _0238BA28:
b _0238C320
_0238BB0C:
ldr r0, _0238C26C ; =0x0238D6A8
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r2, [r0]
ldr r1, [r2]
@ -1792,7 +1792,7 @@ _0238BB44:
b _0238C320
_0238BBB0:
ldr r0, _0238C270 ; =0x0238D6CC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r2, [r0]
ldr r1, [r2]
@ -1835,7 +1835,7 @@ _0238BBE8:
b _0238C320
_0238BC54:
ldr r0, _0238C278 ; =0x0238D6F0
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238C27C ; =0x0238D418
ldr r1, _0238C1E4 ; =0x00300013
@ -1849,7 +1849,7 @@ _0238BC54:
b _0238C320
_0238BC88:
ldr r0, _0238C284 ; =0x0238D708
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238C27C ; =0x0238D418
ldr r1, _0238C1E4 ; =0x00300013
@ -1863,7 +1863,7 @@ _0238BC88:
b _0238C320
_0238BCBC:
ldr r0, _0238C288 ; =0x0238D71C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
bl GetNbItemsInBag
cmp r0, #0
@ -1906,7 +1906,7 @@ _0238BD18:
b _0238C320
_0238BD58:
ldr r0, _0238C28C ; =0x0238D73C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02043218
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
@ -1928,7 +1928,7 @@ _0238BD58:
b _0238C320
_0238BDAC:
ldr r0, _0238C290 ; =0x0238D75C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov23_0238D098
ldr r0, _0238C1CC ; =0x0238D8A0
mov r2, #0x19
@ -1949,7 +1949,7 @@ _0238BDAC:
b _0238C320
_0238BDFC:
ldr r0, _0238C294 ; =0x0238D77C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
mov r2, #0x2b
ldr r1, [r0]
@ -1977,7 +1977,7 @@ _0238BE44:
b _0238C320
_0238BE64:
ldr r0, _0238C298 ; =0x0238D79C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r0, [r0]
ldrsb r0, [r0, #0x95]
@ -2000,7 +2000,7 @@ _0238BE64:
b _0238C320
_0238BEBC:
ldr r0, _0238C29C ; =0x0238D7BC
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #3
ldr r0, _0238C240 ; =0x0238D408
ldr r3, _0238C2A0 ; =0x0238D314
@ -2014,7 +2014,7 @@ _0238BEBC:
b _0238C320
_0238BEF0:
ldr r0, _0238C29C ; =0x0238D7BC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C2A4 ; =0x0238D2E8
mov ip, #3
str r0, [sp, #0xbc]
@ -2030,7 +2030,7 @@ _0238BEF0:
b _0238C320
_0238BF2C:
ldr r0, _0238C2A8 ; =0x0238D7E0
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r2, _0238C258 ; =0x0238D69C
ldr lr, [r0]
@ -2075,7 +2075,7 @@ _0238BF2C:
b _0238C320
_0238BFDC:
ldr r0, _0238C2AC ; =0x0238D7FC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r2, [r0]
ldr r1, [r2]
@ -2119,7 +2119,7 @@ _0238C014:
b _0238C320
_0238C084:
ldr r0, _0238C2B4 ; =0x0238D81C
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238C27C ; =0x0238D418
ldr r1, _0238C1E4 ; =0x00300013
@ -2133,7 +2133,7 @@ _0238C084:
b _0238C320
_0238C0B8:
ldr r0, _0238C2B8 ; =0x0238D834
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238C1CC ; =0x0238D8A0
ldr r2, [r0]
ldr r1, [r2]
@ -2176,7 +2176,7 @@ _0238C0F0:
b _0238C320
_0238C15C:
ldr r0, _0238C2BC ; =0x0238D854
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238C27C ; =0x0238D418
ldr r1, _0238C1E4 ; =0x00300013
@ -2190,7 +2190,7 @@ _0238C15C:
b _0238C320
_0238C190:
ldr r0, _0238C2C0 ; =0x0238D868
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
mov r0, #1
bl sub_02043320

88
asm/overlay_27.s
View File

@ -66,7 +66,7 @@ ov27_0238A140: ; 0x0238A140
ldr r1, _0238A380 ; =0x0238CE80
ldr r1, [r1]
str r0, [r1, #0x1c]
bl sub_02050CE4
bl sub_0200FD48
ldr r1, _0238A380 ; =0x0238CE80
ldr r1, [r1]
str r0, [r1, #0x20]
@ -306,7 +306,7 @@ ov27_0238A928: ; 0x0238A928
bl IsDBoxActive
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
_0238A954:
mov r0, #0
ldmdb sp!, {r3, pc}
@ -322,7 +322,7 @@ ov27_0238A960: ; 0x0238A960
ldr r1, [r1]
ldrsb r1, [r1, #8]
cmp r1, r0
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
mov r0, #0
bl CreateDBox
ldr r1, _0238A994 ; =0x0238CE80
@ -421,7 +421,7 @@ _0238AA78:
b _0238BA74
_0238AAE0:
ldr r0, _0238B928 ; =0x0238CA8C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r1, _0238B920 ; =0x0238CE84
mov r3, #0
ldr r4, [r1]
@ -454,7 +454,7 @@ _0238AAE0:
b _0238BA74
_0238AB60:
ldr r0, _0238B934 ; =0x0238CAA4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02042AF8
bl sub_020434D4
bl ov27_0238C900
@ -474,7 +474,7 @@ _0238AB60:
b _0238BA74
_0238ABAC:
ldr r0, _0238B938 ; =0x0238CAB8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #1
@ -495,7 +495,7 @@ _0238ABAC:
b _0238BA74
_0238ABFC:
ldr r0, _0238B93C ; =0x0238CAD0
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #4
@ -516,7 +516,7 @@ _0238ABFC:
b _0238BA74
_0238AC4C:
ldr r0, _0238B944 ; =0x0238CAE4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r2, #1
@ -537,7 +537,7 @@ _0238AC4C:
b _0238BA74
_0238AC9C:
ldr r0, _0238B948 ; =0x0238CAFC
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #1
@ -558,7 +558,7 @@ _0238AC9C:
b _0238BA74
_0238ACEC:
ldr r0, _0238B950 ; =0x0238CB14
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #1
@ -579,7 +579,7 @@ _0238ACEC:
b _0238BA74
_0238AD3C:
ldr r0, _0238B958 ; =0x0238CB30
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #1
@ -600,7 +600,7 @@ _0238AD3C:
b _0238BA74
_0238AD8C:
ldr r0, _0238B95C ; =0x0238CB4C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #0xe
@ -634,7 +634,7 @@ ov27_0238ADFC: ; 0x0238ADFC
b _0238BA74
_0238AE00:
ldr r0, _0238B968 ; =0x0238CB64
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r2, #0xe
@ -655,11 +655,11 @@ _0238AE00:
b _0238BA74
_0238AE50:
ldr r0, _0238B96C ; =0x0238CB7C
bl DebugPrint0
bl DebugPrint0__0200C1FC
b _0238BA74
_0238AE5C:
ldr r0, _0238B970 ; =0x0238CB8C
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #0xd
@ -680,7 +680,7 @@ _0238AE5C:
b _0238BA74
_0238AEAC:
ldr r0, _0238B974 ; =0x0238CBA4
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #0xe
ldr r1, [r0]
@ -700,7 +700,7 @@ _0238AEAC:
b _0238BA74
_0238AEF8:
ldr r0, _0238B978 ; =0x0238CBBC
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
ldr r0, [r0]
ldrsb r0, [r0, #0x8d]
@ -721,7 +721,7 @@ _0238AEF8:
b _0238BA74
_0238AF48:
ldr r0, _0238B97C ; =0x0238CBD4
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
ldr r0, [r0]
ldrsb r0, [r0, #0x8d]
@ -741,7 +741,7 @@ _0238AF48:
b _0238BA74
_0238AF94:
ldr r0, _0238B980 ; =0x0238CBF0
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
ldr r1, [r0]
add r0, r1, #0x88
@ -774,7 +774,7 @@ _0238AF94:
b _0238BA74
_0238B014:
ldr r0, _0238B98C ; =0x0238CC0C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B990 ; =0x0238C94C
mov r4, #3
str r0, [sp, #0x19c]
@ -790,13 +790,13 @@ _0238B014:
b _0238BA74
_0238B050:
ldr r0, _0238B994 ; =0x0238CC28
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r1, _0238B920 ; =0x0238CE84
ldr r0, _0238B998 ; =0x0238CC40
ldr r2, [r1]
ldrsh r1, [r2, #0x14]
ldrh r2, [r2, #0x12]
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov lr, #0
ldr ip, [r0]
@ -848,7 +848,7 @@ _0238B050:
b _0238BA74
_0238B134:
ldr r0, _0238B9B0 ; =0x0238CC5C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #0
ldr r1, [r0]
@ -880,7 +880,7 @@ _0238B134:
b _0238BA74
_0238B1B0:
ldr r0, _0238B9B8 ; =0x0238CC78
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #0
ldr r1, [r0]
@ -912,7 +912,7 @@ _0238B1B0:
b _0238BA74
_0238B22C:
ldr r0, _0238B9BC ; =0x0238CC94
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B9C0 ; =0x0238CA5C
ldr r1, _0238B9C4 ; =0x00300013
@ -926,7 +926,7 @@ _0238B22C:
b _0238BA74
_0238B260:
ldr r0, _0238B9CC ; =0x0238CCAC
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B9C0 ; =0x0238CA5C
ldr r1, _0238B9C4 ; =0x00300013
@ -940,7 +940,7 @@ _0238B260:
b _0238BA74
_0238B294:
ldr r0, _0238B9D0 ; =0x0238CCC0
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
bl GetNbItemsInBag
cmp r0, #0
@ -988,7 +988,7 @@ _0238B2E8:
b _0238BA74
_0238B34C:
ldr r0, _0238B9D4 ; =0x0238CCDC
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
bl GetNbItemsInBag
cmp r0, #0
@ -1020,7 +1020,7 @@ _0238B37C:
b _0238BA74
_0238B3C4:
ldr r0, _0238B9D8 ; =0x0238CCF8
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl sub_02043218
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
@ -1042,7 +1042,7 @@ _0238B3C4:
b _0238BA74
_0238B418:
ldr r0, _0238B9E0 ; =0x0238CD10
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov27_0238C900
ldr r0, _0238B920 ; =0x0238CE84
mov ip, #0x18
@ -1063,7 +1063,7 @@ _0238B418:
b _0238BA74
_0238B468:
ldr r0, _0238B9E8 ; =0x0238CD28
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov r2, #0x2d
ldr r1, [r0]
@ -1087,7 +1087,7 @@ _0238B4A0:
b _0238BA74
_0238B4C0:
ldr r0, _0238B9EC ; =0x0238CD40
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
ldr r0, [r0]
ldrsb r0, [r0, #0x8d]
@ -1106,7 +1106,7 @@ _0238B4C0:
b _0238BA74
_0238B508:
ldr r0, _0238B9F0 ; =0x0238CD5C
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #3
ldr r0, _0238B988 ; =0x0238CA4C
ldr r3, _0238B9F4 ; =0x0238C974
@ -1120,7 +1120,7 @@ _0238B508:
b _0238BA74
_0238B53C:
ldr r0, _0238B9F0 ; =0x0238CD5C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B9F8 ; =0x0238C948
mov ip, #3
str r0, [sp, #0x284]
@ -1136,7 +1136,7 @@ _0238B53C:
b _0238BA74
_0238B578:
ldr r0, _0238B9FC ; =0x0238CD78
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
ldr r2, _0238B99C ; =0x0238CC50
ldr lr, [r0]
@ -1181,7 +1181,7 @@ _0238B578:
b _0238BA74
_0238B628:
ldr r0, _0238BA00 ; =0x0238CD90
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #0
ldr r1, [r0]
@ -1214,7 +1214,7 @@ _0238B628:
b _0238BA74
_0238B6A8:
ldr r0, _0238BA04 ; =0x0238CDAC
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B9C0 ; =0x0238CA5C
ldr r1, _0238B9C4 ; =0x00300013
@ -1228,7 +1228,7 @@ _0238B6A8:
b _0238BA74
_0238B6DC:
ldr r0, _0238BA08 ; =0x0238CDC4
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #0
ldr r1, [r0]
@ -1260,7 +1260,7 @@ _0238B6DC:
b _0238BA74
_0238B758:
ldr r0, _0238BA10 ; =0x0238CDE0
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B9C0 ; =0x0238CA5C
ldr r1, _0238B9C4 ; =0x00300013
@ -1274,7 +1274,7 @@ _0238B758:
b _0238BA74
_0238B78C:
ldr r0, _0238BA14 ; =0x0238CDF4
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
mov r0, #1
bl sub_02043320
@ -1312,7 +1312,7 @@ _0238B78C:
b _0238BA74
_0238B820:
ldr r0, _0238BA18 ; =0x0238CE10
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl ov11_022DC504
mov r0, #1
bl sub_02043320
@ -1341,7 +1341,7 @@ _0238B820:
b _0238BA74
_0238B890:
ldr r0, _0238BA1C ; =0x0238CE2C
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov r2, #0
ldr r1, [r0]
@ -1365,7 +1365,7 @@ _0238B890:
b _0238BA74
_0238B8EC:
ldr r0, _0238BA24 ; =0x0238CE44
bl DebugPrint0
bl DebugPrint0__0200C1FC
mov ip, #2
ldr r0, _0238B9C0 ; =0x0238CA5C
ldr r1, _0238B9C4 ; =0x00300013
@ -1447,7 +1447,7 @@ _0238BA24: .word 0x0238CE44
_0238BA28: .word 0x0238CE58
_0238BA2C:
ldr r0, _0238BA28 ; =0x0238CE58
bl DebugPrint0
bl DebugPrint0__0200C1FC
ldr r0, _0238B920 ; =0x0238CE84
mov r3, #3
ldr r1, [r0]

66
asm/overlay_29.s
View File

@ -6838,7 +6838,7 @@ ov29_022E1D2C: ; 0x022E1D2C
mov r1, r8
mov r0, #0
bl ov29_022F9408
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
mov r4, r0
add r0, sp, #8
add r1, sp, #4
@ -7110,7 +7110,7 @@ ov29_022E20C0: ; 0x022E20C0
mov r0, #0
bl ov29_022F9408
mov r4, r0
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
mov r3, r0
add r0, sp, #8
add r1, sp, #4
@ -7156,7 +7156,7 @@ _022E211C:
ldr r1, [r7, #0xb4]
mov r0, r4
strb r2, [r1, #8]
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
strh r0, [r7, #0xa8]
strb r6, [r7, #0xaa]
ldr r0, [sp, #8]
@ -14791,7 +14791,7 @@ ov29_022E82CC: ; 0x022E82CC
bne _022E82F0
_022E82E4:
ldr r0, _022E8404 ; =0x00000229
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
str r0, [sp, #0x18]
_022E82F0:
ldrb r0, [r8, #0xc4]
@ -28453,7 +28453,7 @@ _022F39D8:
tst r0, #0xff
beq _022F3A40
ldrsh r0, [r7, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__022F9C34
cmp r0, #0
ldrsh r0, [sb, #0xc]
ldreqsh r8, [r7, #8]
@ -32640,8 +32640,8 @@ EntityIsValid__022F7364: ; 0x022F7364
bx lr
arm_func_end EntityIsValid__022F7364
arm_func_start GetSpriteIndex
GetSpriteIndex: ; 0x022F7388
arm_func_start GetSpriteIndex__022F7388
GetSpriteIndex__022F7388: ; 0x022F7388
ldr r2, _022F73A0 ; =0x02353538
ldr r1, _022F73A4 ; =0x00019914
ldr r2, [r2]
@ -32651,7 +32651,7 @@ GetSpriteIndex: ; 0x022F7388
.align 2, 0
_022F73A0: .word 0x02353538
_022F73A4: .word 0x00019914
arm_func_end GetSpriteIndex
arm_func_end GetSpriteIndex__022F7388
arm_func_start JoinedAtRangeCheck2Veneer
JoinedAtRangeCheck2Veneer: ; 0x022F73A8
@ -33448,7 +33448,7 @@ _022F7E4C:
strneb r5, [sb]
bne _022F7E94
ldrsh r0, [sb, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__02056228
cmp r0, #0
strneb r4, [sb]
_022F7E94:
@ -35591,13 +35591,13 @@ _022F9C00:
ldmdb sp!, {r3, r4, pc}
arm_func_end ov29_022F9B8C
arm_func_start CheckTeamMemberIdx
CheckTeamMemberIdx: ; 0x022F9C34
ldr ip, _022F9C3C ; =CheckTeamMemberIdx
arm_func_start CheckTeamMemberIdx__022F9C34
CheckTeamMemberIdx__022F9C34: ; 0x022F9C34
ldr ip, _022F9C3C ; =CheckTeamMemberIdx__02056228
bx ip
.align 2, 0
_022F9C3C: .word CheckTeamMemberIdx
arm_func_end CheckTeamMemberIdx
_022F9C3C: .word CheckTeamMemberIdx__02056228
arm_func_end CheckTeamMemberIdx__022F9C34
arm_func_start ov29_022F9C40
ov29_022F9C40: ; 0x022F9C40
@ -39734,7 +39734,7 @@ _022FD36C:
mov r1, r7
mov r0, #0
bl ov29_022F9408
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
mov r4, r0
mov r0, #1
bl ov29_022DEA10
@ -40042,7 +40042,7 @@ ov29_022FD7A0: ; 0x022FD7A0
mov r0, r4
bl ov29_022F9408
mov r8, r0
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
mov r4, r0
mov r0, r7
mov r1, #1
@ -40086,7 +40086,7 @@ _022FD864:
strh r0, [r1, #4]
ldr r1, [r7, #0xb4]
strh r6, [r1, #2]
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
strh r0, [r7, #0xa8]
cmp r4, #0
beq _022FD904
@ -46068,7 +46068,7 @@ _023028FC:
mov r1, r8, lsl #1
add r0, sp, #0x2c
ldrsh r0, [r0, r1]
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
cmp r0, #0
bne _02302944
_0230292C:
@ -47486,7 +47486,7 @@ EvolveMonster: ; 0x02303C7C
mov r0, #1
bl ov29_0234B06C
mov r0, r5
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
strh r5, [r6, #4]
strh r5, [r6, #2]
mov r4, r0
@ -47825,7 +47825,7 @@ _0230414C:
b _023041E4
_02304198:
ldr r0, _023046D0 ; =0x00000229
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
mov r1, r0
add r0, r7, #0x2c
bl sub_0201C0E8
@ -48342,7 +48342,7 @@ ov29_02304830: ; 0x02304830
b _0230492C
_023048E0:
ldr r0, _02304950 ; =0x00000229
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
mov r1, r0
add r0, r5, #0x2c
bl sub_0201C0E8
@ -50828,7 +50828,7 @@ _02306A84:
bl ov29_022F9408
strh r0, [r6, #4]
ldrsh r0, [r6, #4]
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
strh r0, [r8, #0xa8]
mov r0, r8
bl GetSleepAnimationId
@ -69665,7 +69665,7 @@ _023172C0:
cmp r0, #0
beq _0231730C
mov r0, r5
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
movs r4, r0
bne _02317318
_0231730C:
@ -74641,7 +74641,7 @@ _0231B5A0:
strh r0, [r7, #4]
ldr r4, [r8, #0xb4]
ldrsh r0, [r4, #4]
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
strh r0, [r8, #0xa8]
ldrb r0, [r4, #0xd8]
cmp r0, #2
@ -77431,7 +77431,7 @@ _0231DC60:
bge _0231DCAC
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__022F9C34
cmp r0, #0
movne r6, #0
_0231DCAC:
@ -96270,13 +96270,13 @@ _0232D8F4: .word 0x022C47DC
_0232D8F8: .word 0x00000CD7
arm_func_end ov29_0232D860
arm_func_start ov01_0232D8FC
ov01_0232D8FC: ; 0x0232D8FC
arm_func_start ov29_0232D8FC
ov29_0232D8FC: ; 0x0232D8FC
stmdb sp!, {r3, lr}
bl ov29_023383BC
mov r0, #1
ldmdb sp!, {r3, pc}
arm_func_end ov01_0232D8FC
arm_func_end ov29_0232D8FC
arm_func_start ov29_0232D90C
ov29_0232D90C: ; 0x0232D90C
@ -98684,7 +98684,7 @@ _0232F8B8: ; jump table
b ov29_02330ED0 ; case 91
b ov29_023319D0 ; case 92
b ov29_0233069C ; case 93
b ov00_0233103C ; case 94
b ov01_0233103C ; case 94
b ov29_0233111C ; case 95
b ov29_02331B3C ; case 96
b ov29_02330AA8 ; case 97
@ -102292,7 +102292,7 @@ ov29_02332340: ; 0x02332340
mov r1, r4
mov r2, r8
mov r3, r7
bl ov01_0232D8FC
bl ov29_0232D8FC
mov sl, r0
b _023326CC
arm_func_end ov29_02332340
@ -105890,7 +105890,7 @@ _023352C0:
cmp r0, r4
beq _02335420
ldrsh r0, [r7, #4]
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
strh r0, [sl, #0xa8]
mov r0, sl
bl GetSleepAnimationId
@ -105973,7 +105973,7 @@ _023353F0:
cmp r0, r4
beq _02335420
ldrsh r0, [r7, #4]
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
strh r0, [sl, #0xa8]
mov r0, sl
bl GetSleepAnimationId
@ -136274,7 +136274,7 @@ _0234ECE4:
add sl, sb, r5, lsl #5
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__022F9C34
strb r0, [sl, #4]
str r7, [sl, #0x1c]
str r6, [sb, r5, lsl #5]

4
asm/overlay_30.s
View File

@ -3447,7 +3447,7 @@ ov30_023859DC: ; 0x023859DC
bl ov29_022DEA10
mov r5, r0
mov r0, r8
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
mov r4, r0
add r0, sp, #8
add r1, sp, #4
@ -3530,7 +3530,7 @@ ov30_02385B10: ; 0x02385B10
bl ov29_022DEA10
mov r5, r0
mov r0, r8
bl GetSpriteIndex
bl GetSpriteIndex__022F7388
mov r4, r0
add r0, sp, #8
add r1, sp, #4

32
asm/overlay_31.s
View File

@ -847,7 +847,7 @@ ov31_0238372C: ; 0x0238372C
bl ov29_02337B2C
cmp r0, #0
movne r0, #1
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
_0238375C:
mov r0, #0
ldmdb sp!, {r3, pc}
@ -1060,7 +1060,7 @@ _02383A1C:
bl Arm9LoadUnkFieldNa0x2029EC8
mov r1, r0
ldr r0, _0238489C ; =0x02389F64
bl DebugPrint0
bl DebugPrint0__0200C1FC
bl GetNbItemsInBag
ldr r2, _02384898 ; =0x0238A26C
cmp r6, #0
@ -3552,7 +3552,7 @@ _02385DC8:
_02385DD4:
ldr r0, _02385FA4 ; =0x00003F07
mov r1, #0x100
bl sub_020182B8
bl sub_02017C74
b _02385DEC
_02385DE4:
mov r0, #0
@ -4112,13 +4112,13 @@ _02386534:
beq _02386568
mov r0, #2
mov r2, r1
bl sub_0203FE5C
bl sub_0204019C
mov r4, r0
b _02386578
_02386568:
mov r0, #3
mov r2, r1
bl sub_0203FE5C
bl sub_0204019C
mov r4, r0
_02386578:
mov r0, #0x1e
@ -5053,7 +5053,7 @@ _02387278:
bge _023872FC
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__022F9C34
cmp r0, #0
movne r6, #0
_023872FC:
@ -5536,7 +5536,7 @@ _02387958:
ldrsh r0, [r6, #0xc]
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__022F9C34
cmp r0, #0
ldrsh r1, [r6, #0x12]
ldrsh r0, [r6, #0x16]
@ -6146,7 +6146,7 @@ _0238826C:
ldrsh r0, [r6, #0xc]
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__022F9C34
str r0, [sp, #4]
b _023882E8
_023882A0:
@ -6163,7 +6163,7 @@ _023882A0:
ldrsh r5, [r6, #0xe]
ldrsh r8, [r6, #0x10]
ldrsh r0, [r6, #8]
bl CheckTeamMemberIdx
bl CheckTeamMemberIdx__02056228
str r0, [sp, #4]
mov r1, r6
add r0, sp, #0xc
@ -6998,7 +6998,7 @@ _0238900C:
tst r0, #0xff
beq _02389058
ldrsh r0, [fp, #8]
bl ov29_02056264
bl ov29_022F9C40
cmp r0, #0
bne _02389058
ldrsh r1, [fp, #0xc]
@ -7386,7 +7386,7 @@ _0238970C:
bne _02389780
ldr r0, _02389910 ; =0x00003F07
mov r1, #0x100
bl sub_020182B8
bl sub_02017C74
ldrb r0, [r5, #0x528]
cmp r0, #0
beq _0238973C
@ -7463,7 +7463,7 @@ _02389820:
beq _02389840
ldr r0, _02389918 ; =0x00003F03
mov r1, #0x100
bl sub_020182B8
bl sub_02017C74
b _023898AC
_02389840:
ldrsb r0, [r5]
@ -7473,7 +7473,7 @@ _02389840:
mov r4, r0
ldr r0, _02389910 ; =0x00003F07
mov r1, #0x100
bl sub_020182B8
bl sub_02017C74
ldrb r0, [r5, #0x528]
cmp r0, #0
add r0, r5, r4
@ -7667,7 +7667,7 @@ _02389AD0:
add r0, r0, #0x12000
ldr r8, [r0, #0xb28]
mov r0, r8
bl ov02_0234FB6C
bl ov02_0234FB60
cmp r0, #0
beq _02389B08
ldr r1, [r8, #0xb4]
@ -7775,7 +7775,7 @@ ov31_02389C2C: ; 0x02389C2C
strh r1, [r3, #0x80]
ldrb r1, [r3, #7]
cmp r1, #0
ldmneia sp!, {r3, pc}
ldmnedb sp!, {r3, pc}
mov r1, #1
bl AiMovement
ldmdb sp!, {r3, pc}
@ -7793,7 +7793,7 @@ _02389C78:
add r0, r0, #0x12000
ldr r7, [r0, #0xb28]
mov r0, r7
bl ov02_0234FB6C
bl ov02_0234FB60
cmp r0, #0
beq _02389CA4
mov r0, r7