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

Merge pull request #46 from AnonymousRandomPerson/main

Browse Source 
Synced from pmdsky-debug
This commit is contained in:
AnonymousRandomPerson 2023-12-21 01:54:25 -05:00 committed by GitHub
commit 9327eef8bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 133 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/itcm.inc
View File

@ -166,7 +166,6 @@
.public sub_0201BD50 .public sub_0201BD50
.public sub_0201BD80 .public sub_0201BD80
.public sub_0202760C .public sub_0202760C
.public sub_02027AF0
.public sub_0207A238 .public sub_0207A238
.public sub_0207A244 .public sub_0207A244
.public sub_0207A300 .public sub_0207A300
@ -178,3 +177,4 @@
.public TRIG_TABLE .public TRIG_TABLE
.public TryAddTargetToAiTargetList .public TryAddTargetToAiTargetList
.public UpdateAiTargetPos .public UpdateAiTargetPos
.public UpdateWindow

2
asm/include/main_02054C24.inc
View File

@ -494,7 +494,6 @@
.public sub_020264F8 .public sub_020264F8
.public sub_02026E78 .public sub_02026E78
.public sub_02027180 .public sub_02027180
.public sub_02027AF0
.public sub_0202836C .public sub_0202836C
.public sub_02029F88 .public sub_02029F88
.public sub_02029FBC .public sub_02029FBC
@ -614,6 +613,7 @@
.public UnloadFile .public UnloadFile
.public UnloadOverlay .public UnloadOverlay
.public UpdateTrackVolumeEnvelopes .public UpdateTrackVolumeEnvelopes
.public UpdateWindow
.public vsprintf .public vsprintf
.public WAN_TABLE .public WAN_TABLE
.public ZINC_BAND_STAT_BOOST .public ZINC_BAND_STAT_BOOST

2
asm/include/overlay_01.inc
View File

@ -277,7 +277,6 @@
.public sub_02026268 .public sub_02026268
.public sub_0202676C .public sub_0202676C
.public sub_0202737C .public sub_0202737C
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_020288FC .public sub_020288FC
.public sub_02029F88 .public sub_02029F88
@ -372,5 +371,6 @@
.public sub_020851AC .public sub_020851AC
.public sub_0208FE3C .public sub_0208FE3C
.public sub_0208FE48 .public sub_0208FE48
.public UpdateWindow
.public vsprintf .public vsprintf
.public WAN_TABLE .public WAN_TABLE

2
asm/include/overlay_05.inc
View File

@ -74,7 +74,6 @@
.public sub_02003BC8 .public sub_02003BC8
.public sub_02003BFC .public sub_02003BFC
.public sub_02006C8C .public sub_02006C8C
.public sub_02027AF0
.public sub_0202836C .public sub_0202836C
.public sub_02029F88 .public sub_02029F88
.public sub_02029FBC .public sub_02029FBC
@ -108,3 +107,4 @@
.public sub_02062B64 .public sub_02062B64
.public sub_0208FE3C .public sub_0208FE3C
.public sub_0208FE48 .public sub_0208FE48
.public UpdateWindow

2
asm/include/overlay_07.inc
View File

@ -115,7 +115,6 @@
.public sub_02003BFC .public sub_02003BFC
.public sub_0202065C .public sub_0202065C
.public sub_020264F8 .public sub_020264F8
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202836C .public sub_0202836C
.public sub_02029F88 .public sub_02029F88
@ -149,3 +148,4 @@
.public sub_0205BD78 .public sub_0205BD78
.public sub_0208FE3C .public sub_0208FE3C
.public sub_0208FE48 .public sub_0208FE48
.public UpdateWindow

2
asm/include/overlay_09.inc
View File

@ -41,7 +41,6 @@
.public sub_02017B7C .public sub_02017B7C
.public sub_020263C8 .public sub_020263C8
.public sub_020265A8 .public sub_020265A8
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202810C .public sub_0202810C
.public sub_0202812C .public sub_0202812C
@ -66,3 +65,4 @@
.public sub_02033758 .public sub_02033758
.public sub_0204CA1C .public sub_0204CA1C
.public sub_02052060 .public sub_02052060
.public UpdateWindow

2
asm/include/overlay_10.inc
View File

@ -262,7 +262,6 @@
.public sub_02025010_EU .public sub_02025010_EU
.public sub_020263C8 .public sub_020263C8
.public sub_020265A8 .public sub_020265A8
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202810C .public sub_0202810C
.public sub_0202812C .public sub_0202812C
@ -341,5 +340,6 @@
.public UnloadFile .public UnloadFile
.public UnloadOverlay .public UnloadOverlay
.public UnloadWte .public UnloadWte
.public UpdateWindow
.public vsprintf .public vsprintf
.public WAN_TABLE .public WAN_TABLE

2
asm/include/overlay_11.inc
View File

@ -520,7 +520,6 @@
.public sub_02026268 .public sub_02026268
.public sub_020262E0 .public sub_020262E0
.public sub_020265A8 .public sub_020265A8
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202810C .public sub_0202810C
.public sub_0202812C .public sub_0202812C
@ -809,6 +808,7 @@
.public UnloadFile .public UnloadFile
.public UnloadOverlay .public UnloadOverlay
.public UpdateTeamStats .public UpdateTeamStats
.public UpdateWindow
.public vsprintf .public vsprintf
.public WAN_TABLE .public WAN_TABLE
.public ZInit8 .public ZInit8

2
asm/include/overlay_13.inc
View File

@ -60,7 +60,6 @@
.public sub_02017C74 .public sub_02017C74
.public sub_02017CB4 .public sub_02017CB4
.public sub_0201F2E4 .public sub_0201F2E4
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202836C .public sub_0202836C
.public sub_02028770 .public sub_02028770
@ -73,3 +72,4 @@
.public sub_02048764 .public sub_02048764
.public sub_02048794 .public sub_02048794
.public sub_0204A198 .public sub_0204A198
.public UpdateWindow

2
asm/include/overlay_14.inc
View File

@ -64,8 +64,8 @@
.public sub_02017B70 .public sub_02017B70
.public sub_02017B7C .public sub_02017B7C
.public sub_02017C80 .public sub_02017C80
.public sub_02027AF0
.public sub_0202BC60 .public sub_0202BC60
.public sub_0202F334 .public sub_0202F334
.public sub_0202F954 .public sub_0202F954
.public sub_0204AE60 .public sub_0204AE60
.public UpdateWindow

2
asm/include/overlay_15.inc
View File

@ -35,7 +35,6 @@
.public ShowStringIdInDialogueBox .public ShowStringIdInDialogueBox
.public sub_02017C80 .public sub_02017C80
.public sub_02026268 .public sub_02026268
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202836C .public sub_0202836C
.public sub_020288DC .public sub_020288DC
@ -44,3 +43,4 @@
.public sub_020395CC .public sub_020395CC
.public sub_020396E4 .public sub_020396E4
.public sub_02039B0C .public sub_02039B0C
.public UpdateWindow

2
asm/include/overlay_18.inc
View File

@ -51,7 +51,6 @@
.public sub_02017C74 .public sub_02017C74
.public sub_02017C80 .public sub_02017C80
.public sub_02026268 .public sub_02026268
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202BBF0 .public sub_0202BBF0
.public sub_0202BC60 .public sub_0202BC60
@ -112,4 +111,5 @@
.public sub_020573A0 .public sub_020573A0
.public sub_0205B028 .public sub_0205B028
.public TEAM_MEMBER_TABLE_PTR .public TEAM_MEMBER_TABLE_PTR
.public UpdateWindow
.public vsprintf .public vsprintf

2
asm/include/overlay_20.inc
View File

@ -77,7 +77,6 @@
.public sub_02017C10 .public sub_02017C10
.public sub_02017C50 .public sub_02017C50
.public sub_02025D50 .public sub_02025D50
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202A03C .public sub_0202A03C
.public sub_0202B490 .public sub_0202B490
@ -97,3 +96,4 @@
.public sub_02046C30 .public sub_02046C30
.public sub_02046C78 .public sub_02046C78
.public sub_02046D20 .public sub_02046D20
.public UpdateWindow

2
asm/include/overlay_21.inc
View File

@ -72,7 +72,6 @@
.public sub_02017C74 .public sub_02017C74
.public sub_02017C80 .public sub_02017C80
.public sub_02026268 .public sub_02026268
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202836C .public sub_0202836C
.public sub_0202F2C4 .public sub_0202F2C4
@ -101,3 +100,4 @@
.public sub_020420F4 .public sub_020420F4
.public sub_020572EC .public sub_020572EC
.public sub_0205B028 .public sub_0205B028
.public UpdateWindow

2
asm/include/overlay_25.inc
View File

@ -49,7 +49,7 @@
.public sub_02017C74 .public sub_02017C74
.public sub_02017C80 .public sub_02017C80
.public sub_02026268 .public sub_02026268
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202836C .public sub_0202836C
.public sub_0202F2C4 .public sub_0202F2C4
.public UpdateWindow

2
asm/include/overlay_29_022E37DC.inc
View File

@ -163,7 +163,6 @@
.public sub_0201C000 .public sub_0201C000
.public sub_0201CF90 .public sub_0201CF90
.public sub_0201D034 .public sub_0201D034
.public sub_02027AF0
.public sub_02048384 .public sub_02048384
.public sub_020483B8 .public sub_020483B8
.public sub_020483D8 .public sub_020483D8
@ -174,3 +173,4 @@
.public TOP_SCREEN_STATUS_PTR .public TOP_SCREEN_STATUS_PTR
.public UnloadFile .public UnloadFile
.public UpdateMinimap .public UpdateMinimap
.public UpdateWindow

2
asm/include/overlay_29_022F05B4.inc
View File

@ -186,7 +186,6 @@
.public sub_0201B9F8 .public sub_0201B9F8
.public sub_0201CF90 .public sub_0201CF90
.public sub_02026268 .public sub_02026268
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0204AEA0 .public sub_0204AEA0
.public sub_0204AEB0 .public sub_0204AEB0
@ -203,4 +202,5 @@
.public UpdateAiTargetPos .public UpdateAiTargetPos
.public UpdateMinimap .public UpdateMinimap
.public UpdateTrapsVisibility .public UpdateTrapsVisibility
.public UpdateWindow
.public YesNoMenu .public YesNoMenu

2
asm/include/overlay_31.inc
View File

@ -187,7 +187,6 @@
.public sub_02017C80 .public sub_02017C80
.public sub_02025888 .public sub_02025888
.public sub_020265A8 .public sub_020265A8
.public sub_02027AF0
.public sub_02027B1C .public sub_02027B1C
.public sub_0202810C .public sub_0202810C
.public sub_0202812C .public sub_0202812C
@ -244,5 +243,6 @@
.public sub_020585B4 .public sub_020585B4
.public TryPointCameraToMonster .public TryPointCameraToMonster
.public UpdateMapSurveyorFlag .public UpdateMapSurveyorFlag
.public UpdateWindow
.public vsprintf .public vsprintf
.public YesNoMenu .public YesNoMenu

4
asm/itcm.s
View File

@ -1329,7 +1329,7 @@ _01FF9274:
ldrb r1, [r1, #6] ldrb r1, [r1, #6]
cmp r6, r1 cmp r6, r1
blt _01FF9170 blt _01FF9170
bl sub_02027AF0 bl UpdateWindow
_01FF9288: _01FF9288:
add sp, sp, #0x14 add sp, sp, #0x14
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@ -1441,7 +1441,7 @@ _01FF940C:
ldrb r1, [r1, #6] ldrb r1, [r1, #6]
cmp r6, r1 cmp r6, r1
blt _01FF92EC blt _01FF92EC
bl sub_02027AF0 bl UpdateWindow
_01FF9420: _01FF9420:
add sp, sp, #0x20 add sp, sp, #0x20
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}

82
asm/main_0200C4CC.s
View File

@ -32943,11 +32943,11 @@ _0202600C: .word sub_01FF929C
arm_func_start sub_02026010 arm_func_start sub_02026010
sub_02026010: ; 0x02026010 sub_02026010: ; 0x02026010
ldr ip, _0202601C ; =sub_02027AF0 ldr ip, _0202601C ; =UpdateWindow
ldrsb r0, [r0] ldrsb r0, [r0]
bx ip bx ip
.align 2, 0 .align 2, 0
_0202601C: .word sub_02027AF0 _0202601C: .word UpdateWindow
arm_func_end sub_02026010 arm_func_end sub_02026010
arm_func_start sub_02026020 arm_func_start sub_02026020
@ -35161,8 +35161,8 @@ _02027AE8: .word _020AFD9C
_02027AEC: .word _020AFD94 _02027AEC: .word _020AFD94
arm_func_end sub_02027AA0 arm_func_end sub_02027AA0
arm_func_start sub_02027AF0 arm_func_start UpdateWindow
sub_02027AF0: ; 0x02027AF0 UpdateWindow: ; 0x02027AF0
ldr r2, _02027B18 ; =_022A88DC ldr r2, _02027B18 ; =_022A88DC
mov r1, #0xe0 mov r1, #0xe0
mla r1, r0, r1, r2 mla r1, r0, r1, r2
@ -35175,7 +35175,7 @@ sub_02027AF0: ; 0x02027AF0
bx lr bx lr
.align 2, 0 .align 2, 0
_02027B18: .word _022A88DC _02027B18: .word _022A88DC
arm_func_end sub_02027AF0 arm_func_end UpdateWindow
arm_func_start sub_02027B1C arm_func_start sub_02027B1C
sub_02027B1C: ; 0x02027B1C sub_02027B1C: ; 0x02027B1C
@ -35190,7 +35190,7 @@ sub_02027B1C: ; 0x02027B1C
mov r1, #0 mov r1, #0
bl memset bl memset
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
_02027B50: .word _022A88F0 _02027B50: .word _022A88F0
@ -35571,7 +35571,7 @@ sub_02028080: ; 0x02028080
mla r4, r0, r2, r3 mla r4, r0, r2, r3
strb r1, [r4, #9] strb r1, [r4, #9]
ldrsb r0, [r4, #0x10] ldrsb r0, [r4, #0x10]
bl sub_02027AF0 bl UpdateWindow
ldr r0, _020280BC ; =_020AFD4C ldr r0, _020280BC ; =_020AFD4C
ldrb r1, [r4, #8] ldrb r1, [r4, #8]
ldr r3, [r0, #8] ldr r3, [r0, #8]
@ -38426,7 +38426,7 @@ _0202A564:
add r1, r5, #0x30 add r1, r5, #0x30
bl sub_02026E3C bl sub_02026E3C
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
mov r0, r5 mov r0, r5
bl MemFree bl MemFree
_0202A5B4: _0202A5B4:
@ -38784,7 +38784,7 @@ _0202AA3C:
ldrb r0, [r7, #8] ldrb r0, [r7, #8]
bl sub_020287C4 bl sub_020287C4
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
mov r0, #3 mov r0, #3
str r0, [r8, #0x19c] str r0, [r8, #0x19c]
mov r2, #0 mov r2, #0
@ -39225,7 +39225,7 @@ _0202B008:
add r0, r5, #4 add r0, r5, #4
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
arm_func_end sub_0202AF78 arm_func_end sub_0202AF78
@ -39974,7 +39974,7 @@ _0202B9F4:
add r0, r4, #4 add r0, r4, #4
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
arm_func_end sub_0202B934 arm_func_end sub_0202B934
@ -40282,7 +40282,7 @@ _0202BDC8:
ldrb r0, [r6, #8] ldrb r0, [r6, #8]
bl sub_020287C4 bl sub_020287C4
ldrsb r0, [r6, #0x10] ldrsb r0, [r6, #0x10]
bl sub_02027AF0 bl UpdateWindow
mov r0, #2 mov r0, #2
str r0, [r4, #0x19c] str r0, [r4, #0x19c]
b _0202C1D8 b _0202C1D8
@ -40681,7 +40681,7 @@ _0202C36C:
add r0, r4, #4 add r0, r4, #4
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0xc add sp, sp, #0xc
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@ -41102,7 +41102,7 @@ _0202C8A4:
ldrb r0, [r4, #8] ldrb r0, [r4, #8]
bl sub_020287C4 bl sub_020287C4
ldrsb r0, [r4, #0x10] ldrsb r0, [r4, #0x10]
bl sub_02027AF0 bl UpdateWindow
mov r0, #2 mov r0, #2
str r0, [r5, #0x1ac] str r0, [r5, #0x1ac]
b _0202CE40 b _0202CE40
@ -41643,7 +41643,7 @@ _0202D04C:
bl sub_0202A03C bl sub_0202A03C
_0202D058: _0202D058:
ldrsb r0, [r5, #0x10] ldrsb r0, [r5, #0x10]
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x410 add sp, sp, #0x410
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
arm_func_end sub_0202CEA0 arm_func_end sub_0202CEA0
@ -42127,7 +42127,7 @@ _0202D668:
ldrb r0, [r7, #8] ldrb r0, [r7, #8]
bl sub_020287C4 bl sub_020287C4
ldrsb r0, [r7, #0x10] ldrsb r0, [r7, #0x10]
bl sub_02027AF0 bl UpdateWindow
mov r0, #2 mov r0, #2
str r0, [r4, #0x1a0] str r0, [r4, #0x1a0]
b _0202DA5C b _0202DA5C
@ -42525,7 +42525,7 @@ _0202DC1C:
add r0, r4, #4 add r0, r4, #4
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x160 add sp, sp, #0x160
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0
@ -42819,7 +42819,7 @@ _0202DFE8:
ldrb r0, [r7, #8] ldrb r0, [r7, #8]
bl sub_020287C4 bl sub_020287C4
ldrsb r0, [r7, #0x10] ldrsb r0, [r7, #0x10]
bl sub_02027AF0 bl UpdateWindow
mov r0, #2 mov r0, #2
str r0, [r4, #0x1a0] str r0, [r4, #0x1a0]
b _0202E294 b _0202E294
@ -43083,7 +43083,7 @@ _0202E3B0:
add r0, r4, #4 add r0, r4, #4
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0xc add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
arm_func_end sub_0202E29C arm_func_end sub_0202E29C
@ -44008,7 +44008,7 @@ _0202F088:
add r0, r5, #4 add r0, r5, #4
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x124 add sp, sp, #0x124
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0
@ -45061,7 +45061,7 @@ _0202FDD0:
add r3, r6, #0xac add r3, r6, #0xac
bl DrawTextInWindow bl DrawTextInWindow
ldrsb r0, [r5, #0x10] ldrsb r0, [r5, #0x10]
bl sub_02027AF0 bl UpdateWindow
mov r0, #2 mov r0, #2
str r0, [r4, #0xa0] str r0, [r4, #0xa0]
sub r0, r0, #3 sub r0, r0, #3
@ -45181,7 +45181,7 @@ _0202FF54:
mov r2, #2 mov r2, #2
bl sub_02026268 bl sub_02026268
ldrsb r0, [r5, #0x10] ldrsb r0, [r5, #0x10]
bl sub_02027AF0 bl UpdateWindow
mov r0, #2 mov r0, #2
str r0, [r4, #0xa0] str r0, [r4, #0xa0]
sub r0, r0, #3 sub r0, r0, #3
@ -45507,7 +45507,7 @@ _02030388:
bl sub_02025D50 bl sub_02025D50
_020303C4: _020303C4:
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add r0, r6, #0x600 add r0, r6, #0x600
ldrsh r1, [r0, #0x46] ldrsh r1, [r0, #0x46]
strh r1, [r0, #0x48] strh r1, [r0, #0x48]
@ -46375,7 +46375,7 @@ _02030ED8:
add r0, r4, #4 add r0, r4, #4
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [r5, #0x10] ldrsb r0, [r5, #0x10]
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r3, r4, r5, pc} ldmia sp!, {r3, r4, r5, pc}
arm_func_end sub_02030E94 arm_func_end sub_02030E94
@ -46691,7 +46691,7 @@ _020312D4:
ldrb r0, [r7, #8] ldrb r0, [r7, #8]
bl sub_020287C4 bl sub_020287C4
ldrsb r0, [r7, #0x10] ldrsb r0, [r7, #0x10]
bl sub_02027AF0 bl UpdateWindow
mov r0, #2 mov r0, #2
str r0, [r4, #0x19c] str r0, [r4, #0x19c]
b _02031714 b _02031714
@ -47085,7 +47085,7 @@ _02031868:
add r0, r4, #4 add r0, r4, #4
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0xc add sp, sp, #0xc
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@ -54678,7 +54678,7 @@ sub_02037C78: ; 0x02037C78
mov r2, r1 mov r2, r1
bl sub_02026268 bl sub_02026268
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
_02037CA4: .word 0x00000122 _02037CA4: .word 0x00000122
@ -54695,7 +54695,7 @@ sub_02037CA8: ; 0x02037CA8
mov r2, r1 mov r2, r1
bl sub_02026268 bl sub_02026268
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
_02037CD4: .word 0x00000123 _02037CD4: .word 0x00000123
@ -54859,7 +54859,7 @@ _02037EF8:
cmp r4, #0x54 cmp r4, #0x54
bne _02037D20 bne _02037D20
mov r0, r7 mov r0, r7
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x40 add sp, sp, #0x40
ldmia sp!, {r4, r5, r6, r7, r8, pc} ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0 .align 2, 0
@ -55197,7 +55197,7 @@ _02038394:
bl sub_02025D50 bl sub_02025D50
_020383CC: _020383CC:
mov r0, sb mov r0, sb
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x114 add sp, sp, #0x114
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0
@ -56389,7 +56389,7 @@ _020393E0:
mov r2, #3 mov r2, #3
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x254 add sp, sp, #0x254
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
.align 2, 0 .align 2, 0
@ -60285,7 +60285,7 @@ sub_0203C784: ; 0x0203C784
str ip, [sp] str ip, [sp]
bl sub_020262E0 bl sub_020262E0
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
.align 2, 0 .align 2, 0
@ -60902,7 +60902,7 @@ _0203CEE4:
add r3, sp, #0xd4 add r3, sp, #0xd4
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
_0203CF84: _0203CF84:
add sp, sp, #0x1d4 add sp, sp, #0x1d4
ldmia sp!, {r3, r4, r5, r6, pc} ldmia sp!, {r3, r4, r5, r6, pc}
@ -61200,7 +61200,7 @@ _0203D3D0:
mov r1, #4 mov r1, #4
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r6 mov r0, r6
bl sub_02027AF0 bl UpdateWindow
_0203D3F4: _0203D3F4:
add sp, sp, #0xcc add sp, sp, #0xcc
add sp, sp, #0x400 add sp, sp, #0x400
@ -64503,7 +64503,7 @@ _02040250:
mov r0, #1 mov r0, #1
bl sub_0204027C bl sub_0204027C
mov r0, sl mov r0, sl
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0
_02040274: .word _020AFE7C _02040274: .word _020AFE7C
@ -65428,7 +65428,7 @@ _02040F18:
ldr r0, _02040F94 ; =_020AFE7C ldr r0, _02040F94 ; =_020AFE7C
ldr r0, [r0, #8] ldr r0, [r0, #8]
ldrsb r0, [r0] ldrsb r0, [r0]
bl sub_02027AF0 bl UpdateWindow
cmp r4, #0 cmp r4, #0
bne _02040F84 bne _02040F84
mov r0, #2 mov r0, #2
@ -69407,7 +69407,7 @@ sub_02044210: ; 0x02044210
mov r2, #2 mov r2, #2
bl sub_020262E0 bl sub_020262E0
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
.align 2, 0 .align 2, 0
@ -69532,7 +69532,7 @@ _020443B0:
bl sub_020262E0 bl sub_020262E0
_020443F4: _020443F4:
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
_020443FC: _020443FC:
add sp, sp, #0x54 add sp, sp, #0x54
ldmia sp!, {r4, r5, pc} ldmia sp!, {r4, r5, pc}
@ -69647,7 +69647,7 @@ sub_020444F0: ; 0x020444F0
bl sub_02026268 bl sub_02026268
_02044558: _02044558:
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
_02044564: .word _020AFECC _02044564: .word _020AFECC
@ -69732,7 +69732,7 @@ sub_02044604: ; 0x02044604
mov r2, #0xc mov r2, #0xc
bl sub_020262E0 bl sub_020262E0
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
_02044678: _02044678:
add sp, sp, #0x54 add sp, sp, #0x54
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
@ -73762,7 +73762,7 @@ _02047C18:
strb r1, [r0, #0xf7b] strb r1, [r0, #0xf7b]
_02047C2C: _02047C2C:
mov r0, sl mov r0, sl
bl sub_02027AF0 bl UpdateWindow
_02047C34: _02047C34:
add sp, sp, #8 add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}

8
asm/main_02054C24.s
View File

@ -25291,7 +25291,7 @@ sub_020696E8: ; 0x020696E8
add r3, sp, #4 add r3, sp, #4
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x154 add sp, sp, #0x154
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
.align 2, 0 .align 2, 0
@ -25316,7 +25316,7 @@ sub_02069750: ; 0x02069750
mov r2, #3 mov r2, #3
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x100 add sp, sp, #0x100
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
@ -25717,7 +25717,7 @@ _02069C50:
strb r2, [sp, #0x45] strb r2, [sp, #0x45]
bl sub_02060FD8 bl sub_02060FD8
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x68 add sp, sp, #0x68
ldmia sp!, {r3, r4, r5, pc} ldmia sp!, {r3, r4, r5, pc}
.align 2, 0 .align 2, 0
@ -25756,7 +25756,7 @@ _02069CFC:
bl sub_02060FD8 bl sub_02060FD8
_02069D2C: _02069D2C:
mov r0, r6 mov r0, r6
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x68 add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, pc} ldmia sp!, {r4, r5, r6, pc}
.align 2, 0 .align 2, 0

16
asm/overlay_01.s
View File

@ -7797,7 +7797,7 @@ ov01_0232F830: ; 0x0232F830
bl DrawTextInWindow bl DrawTextInWindow
_0232F8F0: _0232F8F0:
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r4, r5, pc} ldmia sp!, {r4, r5, pc}
@ -11357,7 +11357,7 @@ _02332950:
ldr r0, [r0] ldr r0, [r0]
add r0, r0, #0x600 add r0, r0, #0x600
ldrsb r0, [r0, #0xd] ldrsb r0, [r0, #0xd]
bl sub_02027AF0 bl UpdateWindow
ldr r0, _023329F0 ; =MAIN_MENU_WINDOW_PARAMS_7 ldr r0, _023329F0 ; =MAIN_MENU_WINDOW_PARAMS_7
ldr r3, _023329F4 ; =MAIN_MENU_ITEMS_CONFIRM ldr r3, _023329F4 ; =MAIN_MENU_ITEMS_CONFIRM
add r2, sp, #0xc add r2, sp, #0xc
@ -11729,7 +11729,7 @@ _02332E58:
ldr r0, [r0] ldr r0, [r0]
add r0, r0, #0x600 add r0, r0, #0x600
ldrsb r0, [r0, #0xd] ldrsb r0, [r0, #0xd]
bl sub_02027AF0 bl UpdateWindow
ldr r0, _02332EEC ; =MAIN_MENU_WINDOW_PARAMS_7 ldr r0, _02332EEC ; =MAIN_MENU_WINDOW_PARAMS_7
ldr r3, _02332EF0 ; =MAIN_MENU_ITEMS_CONFIRM ldr r3, _02332EF0 ; =MAIN_MENU_ITEMS_CONFIRM
add r2, sp, #0 add r2, sp, #0
@ -14273,7 +14273,7 @@ _0233506C:
mov r0, sl mov r0, sl
bl ov01_02335088 bl ov01_02335088
mov r0, sl mov r0, sl
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x204 add sp, sp, #0x204
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0
@ -15951,7 +15951,7 @@ _02336564:
add r3, r3, #0x12 add r3, r3, #0x12
bl sub_02030978 bl sub_02030978
mov r0, r8 mov r0, r8
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x10 add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0 .align 2, 0
@ -16010,7 +16010,7 @@ _02336684:
add r3, r3, #0x12 add r3, r3, #0x12
bl sub_02030978 bl sub_02030978
mov r0, r8 mov r0, r8
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0 .align 2, 0
_02336724: .word ov01_0233BB88 _02336724: .word ov01_0233BB88
@ -16104,7 +16104,7 @@ _02336824:
cmp r7, #3 cmp r7, #3
blt _02336824 blt _02336824
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0 .align 2, 0
_02336880: .word ov01_0233BB9E _02336880: .word ov01_0233BB9E
@ -16155,7 +16155,7 @@ _023368B4:
sub r2, r2, #8 sub r2, r2, #8
bl sub_02030978 bl sub_02030978
mov r0, r8 mov r0, r8
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x10 add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0 .align 2, 0

2
asm/overlay_05.s
View File

@ -3551,7 +3551,7 @@ _0233FAE0:
mov r2, #2 mov r2, #2
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r6 mov r0, r6
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x194 add sp, sp, #0x194
ldmia sp!, {r3, r4, r5, r6, pc} ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0 .align 2, 0

4
asm/overlay_07.s
View File

@ -1340,7 +1340,7 @@ ov07_0233DB50: ; 0x0233DB50
mov r0, r5 mov r0, r5
bl MemFree bl MemFree
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0 .align 2, 0
@ -5846,7 +5846,7 @@ _02341888:
add r7, r7, #0x12 add r7, r7, #0x12
blt _02341824 blt _02341824
mov r0, sl mov r0, sl
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x108 add sp, sp, #0x108
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0

6
asm/overlay_09.s
View File

@ -2182,7 +2182,7 @@ _0233E8EC:
add r0, r4, #8 add r0, r4, #8
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
ldr r1, [r4, #4] ldr r1, [r4, #4]
mov r0, #2 mov r0, #2
bl ov01_02330E38 bl ov01_02330E38
@ -2836,7 +2836,7 @@ _0233F1DC:
add r0, r4, #8 add r0, r4, #8
bl sub_0202A03C bl sub_0202A03C
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
ldr r1, [r4, #4] ldr r1, [r4, #4]
mov r0, #3 mov r0, #3
bl ov01_02330E38 bl ov01_02330E38
@ -3013,7 +3013,7 @@ _0233F444:
add r3, r6, #0x1a8 add r3, r6, #0x1a8
bl DrawTextInWindow bl DrawTextInWindow
ldrsb r0, [r5, #0x10] ldrsb r0, [r5, #0x10]
bl sub_02027AF0 bl UpdateWindow
ldr r1, [r6, #4] ldr r1, [r6, #4]
mov r0, #1 mov r0, #1
bl ov01_02330E38 bl ov01_02330E38

14
asm/overlay_10.s
View File

@ -377,7 +377,7 @@ _022BCF0C:
ldrb r0, [r8, #8] ldrb r0, [r8, #8]
bl sub_020287C4 bl sub_020287C4
ldrsb r0, [r8, #0x10] ldrsb r0, [r8, #0x10]
bl sub_02027AF0 bl UpdateWindow
mov r0, #2 mov r0, #2
str r0, [r4, #0x19c] str r0, [r4, #0x19c]
b _022BD200 b _022BD200
@ -677,7 +677,7 @@ _022BD354:
add r0, r4, #4 add r0, r4, #4
bl sub_0202A0B0 bl sub_0202A0B0
ldrsb r0, [sl, #0x10] ldrsb r0, [sl, #0x10]
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #4 add sp, sp, #4
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@ -5810,7 +5810,7 @@ _022C169C:
cmp r5, #4 cmp r5, #4
blt _022C15F4 blt _022C15F4
mov r0, sl mov r0, sl
bl sub_02027AF0 bl UpdateWindow
ldr r0, _022C16CC ; =ov10_022DC1D0 ldr r0, _022C16CC ; =ov10_022DC1D0
ldr r0, [r0] ldr r0, [r0]
add r0, r0, #0x2d8 add r0, r0, #0x2d8
@ -5899,7 +5899,7 @@ _022C1794:
bne _022C17C8 bne _022C17C8
bl ClearWindow bl ClearWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
b _022C182C b _022C182C
_022C17C8: _022C17C8:
bl ClearWindow bl ClearWindow
@ -5939,7 +5939,7 @@ _022C17C8:
add r3, sp, #0x154 + OV10_022C1748_STACK_OFFSET add r3, sp, #0x154 + OV10_022C1748_STACK_OFFSET
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
_022C182C: _022C182C:
add sp, sp, #0x254 + OV10_022C1748_STACK_OFFSET add sp, sp, #0x254 + OV10_022C1748_STACK_OFFSET
ldmia sp!, {r4, r5, pc} ldmia sp!, {r4, r5, pc}
@ -5994,7 +5994,7 @@ _022C18A4:
mov r0, r5 mov r0, r5
bl ClearWindow bl ClearWindow
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
b _022C197C b _022C197C
_022C18D8: _022C18D8:
ldr r1, _022C1988 ; =ov10_022DBFB0 ldr r1, _022C1988 ; =ov10_022DBFB0
@ -6038,7 +6038,7 @@ _022C1930:
mov r2, r1 mov r2, r1
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
_022C197C: _022C197C:
add sp, sp, #0x258 add sp, sp, #0x258
ldmia sp!, {r3, r4, r5, pc} ldmia sp!, {r3, r4, r5, pc}

50
asm/overlay_11.s
View File

@ -41613,7 +41613,7 @@ _022FF0F8:
bl sub_0202A434 bl sub_0202A434
strb r0, [r6, #4] strb r0, [r6, #4]
ldrsb r0, [r8, #0x10] ldrsb r0, [r8, #0x10]
bl sub_02027AF0 bl UpdateWindow
_022FF118: _022FF118:
bl GetMoneyCarried bl GetMoneyCarried
str r0, [sp, #0x28] str r0, [sp, #0x28]
@ -43760,8 +43760,8 @@ _02300D80: .word ov11_0232260C
_02300D84: .word ov11_02324D34 _02300D84: .word ov11_02324D34
arm_func_end ov11_02300D5C arm_func_end ov11_02300D5C
arm_func_start ov11_02300D88 arm_func_start CreateTopGroundMenu
ov11_02300D88: ; 0x02300D88 CreateTopGroundMenu: ; 0x02300D88
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0x98 sub sp, sp, #0x98
bl GetGameMode bl GetGameMode
@ -43802,7 +43802,7 @@ _02300DFC:
beq _02300E2C beq _02300E2C
b _02300E44 b _02300E44
_02300E1C: _02300E1C:
bl ov11_02304AC4 bl IsBagNotEmpty
b _02300E48 b _02300E48
_02300E24: _02300E24:
mov r0, r7 mov r0, r7
@ -43862,10 +43862,10 @@ _02300EE4: .word ov11_0232262C
_02300EE8: .word ov11_023225FC _02300EE8: .word ov11_023225FC
_02300EEC: .word 0x00400213 _02300EEC: .word 0x00400213
_02300EF0: .word ov11_0232261C _02300EF0: .word ov11_0232261C
arm_func_end ov11_02300D88 arm_func_end CreateTopGroundMenu
arm_func_start ov11_02300EF4 arm_func_start CloseTopGroundMenu
ov11_02300EF4: ; 0x02300EF4 CloseTopGroundMenu: ; 0x02300EF4
stmdb sp!, {r3, lr} stmdb sp!, {r3, lr}
ldr r0, _02300F4C ; =ov11_02324D34 ldr r0, _02300F4C ; =ov11_02324D34
ldr r0, [r0] ldr r0, [r0]
@ -43890,10 +43890,10 @@ ov11_02300EF4: ; 0x02300EF4
ldmia sp!, {r3, pc} ldmia sp!, {r3, pc}
.align 2, 0 .align 2, 0
_02300F4C: .word ov11_02324D34 _02300F4C: .word ov11_02324D34
arm_func_end ov11_02300EF4 arm_func_end CloseTopGroundMenu
arm_func_start ov11_02300F50 arm_func_start UpdateTopGroundMenu
ov11_02300F50: ; 0x02300F50 UpdateTopGroundMenu: ; 0x02300F50
stmdb sp!, {r3, lr} stmdb sp!, {r3, lr}
ldr r0, _02301138 ; =ov11_02324D34 ldr r0, _02301138 ; =ov11_02324D34
ldr r2, [r0] ldr r2, [r0]
@ -44031,7 +44031,7 @@ _02301130:
ldmia sp!, {r3, pc} ldmia sp!, {r3, pc}
.align 2, 0 .align 2, 0
_02301138: .word ov11_02324D34 _02301138: .word ov11_02324D34
arm_func_end ov11_02300F50 arm_func_end UpdateTopGroundMenu
arm_func_start ov11_0230113C arm_func_start ov11_0230113C
ov11_0230113C: ; 0x0230113C ov11_0230113C: ; 0x0230113C
@ -47697,7 +47697,7 @@ _02304334:
mov r2, #3 mov r2, #3
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #4 add sp, sp, #4
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
@ -48294,8 +48294,8 @@ _02304ABC: .word ov11_02324D78
_02304AC0: .word ov11_02322AC4 _02304AC0: .word ov11_02322AC4
arm_func_end ov11_0230492C arm_func_end ov11_0230492C
arm_func_start ov11_02304AC4 arm_func_start IsBagNotEmpty
ov11_02304AC4: ; 0x02304AC4 IsBagNotEmpty: ; 0x02304AC4
stmdb sp!, {r3, lr} stmdb sp!, {r3, lr}
bl GetNbItemsInBag bl GetNbItemsInBag
cmp r0, #0 cmp r0, #0
@ -48303,7 +48303,7 @@ ov11_02304AC4: ; 0x02304AC4
movle r0, #0 movle r0, #0
and r0, r0, #0xff and r0, r0, #0xff
ldmia sp!, {r3, pc} ldmia sp!, {r3, pc}
arm_func_end ov11_02304AC4 arm_func_end IsBagNotEmpty
arm_func_start ov11_02304AE0 arm_func_start ov11_02304AE0
ov11_02304AE0: ; 0x02304AE0 ov11_02304AE0: ; 0x02304AE0
@ -51286,7 +51286,7 @@ _023073FC:
str r2, [r0] str r2, [r0]
b _02308CF0 b _02308CF0
_02307464: _02307464:
bl ov11_02304AC4 bl IsBagNotEmpty
cmp r0, #0 cmp r0, #0
bne _02307494 bne _02307494
ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, _023082B4 ; =ov11_02324D8C
@ -51402,7 +51402,7 @@ _023075F0:
mov r2, r1 mov r2, r1
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
_0230760C: _0230760C:
ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, _023082B4 ; =ov11_02324D8C
ldr r0, [r0] ldr r0, [r0]
@ -52770,7 +52770,7 @@ _023089C0:
ldr r0, [r0] ldr r0, [r0]
ldrsb r0, [r0, #8] ldrsb r0, [r0, #8]
bl ShowDialogueBox bl ShowDialogueBox
bl ov11_02304AC4 bl IsBagNotEmpty
cmp r0, #0 cmp r0, #0
ldreq r0, _023082B4 ; =ov11_02324D8C ldreq r0, _023082B4 ; =ov11_02324D8C
moveq r1, #0xc moveq r1, #0xc
@ -55685,7 +55685,7 @@ _0230B184:
str r4, [sp] str r4, [sp]
bl sub_020262E0 bl sub_020262E0
mov r0, r7 mov r0, r7
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x15c add sp, sp, #0x15c
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0
@ -57549,7 +57549,7 @@ ov11_0230CA7C: ; 0x0230CA7C
mov r2, #2 mov r2, #2
bl sub_02026268 bl sub_02026268
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
_0230CAA0: .word 0x000003A9 _0230CAA0: .word 0x000003A9
@ -57620,7 +57620,7 @@ ov11_0230CB28: ; 0x0230CB28
mov r1, #6 mov r1, #6
bl sub_020262E0 bl sub_020262E0
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
.align 2, 0 .align 2, 0
@ -69663,7 +69663,7 @@ _023169FC:
bl sub_02026268 bl sub_02026268
_02316A18: _02316A18:
mov r0, sl mov r0, sl
bl sub_02027AF0 bl UpdateWindow
mov r0, r6 mov r0, r6
bl MemFree bl MemFree
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
@ -80060,9 +80060,9 @@ ov11_023225FC:
.global ov11_0232260C .global ov11_0232260C
ov11_0232260C: ov11_0232260C:
.byte 0x0D, 0x00, 0x00, 0x00 .byte 0x0D, 0x00, 0x00, 0x00
.word ov11_02300D88 .word CreateTopGroundMenu
.word ov11_02300EF4 .word CloseTopGroundMenu
.word ov11_02300F50 .word UpdateTopGroundMenu
.global ov11_0232261C .global ov11_0232261C
ov11_0232261C: ov11_0232261C:
.byte 0x00, 0x00, 0x00, 0x00, 0x0D, 0x04, 0x11, 0x02, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x0D, 0x04, 0x11, 0x02, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

2
asm/overlay_13.s
View File

@ -2120,7 +2120,7 @@ ov13_0238BE6C: ; 0x0238BE6C
mov r2, #0x24 mov r2, #0x24
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r4, r5, pc} ldmia sp!, {r4, r5, pc}

6
asm/overlay_14.s
View File

@ -903,7 +903,7 @@ _0238AD84:
bl DrawTextInWindow bl DrawTextInWindow
_0238ADE8: _0238ADE8:
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
_0238ADF0: _0238ADF0:
add sp, sp, #0x18 add sp, sp, #0x18
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
@ -3454,7 +3454,7 @@ _0238D160:
ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR
ldr r0, [r0] ldr r0, [r0]
ldrsb r0, [r0, #4] ldrsb r0, [r0, #4]
bl sub_02027AF0 bl UpdateWindow
ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR
ldr r0, [r0] ldr r0, [r0]
ldrsb r0, [r0, #5] ldrsb r0, [r0, #5]
@ -3462,7 +3462,7 @@ _0238D160:
ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR
ldr r0, [r0] ldr r0, [r0]
ldrsb r0, [r0, #5] ldrsb r0, [r0, #5]
bl sub_02027AF0 bl UpdateWindow
ldr r1, _0238D2FC ; =SENTRY_DUTY_PTR ldr r1, _0238D2FC ; =SENTRY_DUTY_PTR
ldr r3, [r1] ldr r3, [r1]
add r0, r3, #0x3000 add r0, r3, #0x3000

2
asm/overlay_15.s
View File

@ -946,7 +946,7 @@ ov15_0238ADFC: ; 0x0238ADFC
add r3, sp, #4 add r3, sp, #4
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}

2
asm/overlay_18.s
View File

@ -1045,7 +1045,7 @@ ov18_0238AF3C: ; 0x0238AF3C
mov r2, #0x10 mov r2, #0x10
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}

10
asm/overlay_20.s
View File

@ -1875,7 +1875,7 @@ _0238BA14:
cmp sb, r0 cmp sb, r0
blt _0238B94C blt _0238B94C
mov r0, sl mov r0, sl
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x154 add sp, sp, #0x154
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0
@ -1916,7 +1916,7 @@ ov20_0238BA40: ; 0x0238BA40
mov r2, #2 mov r2, #2
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x154 add sp, sp, #0x154
ldmia sp!, {r4, r5, pc} ldmia sp!, {r4, r5, pc}
.align 2, 0 .align 2, 0
@ -1968,7 +1968,7 @@ ov20_0238BAB4: ; 0x0238BAB4
add r3, sp, #0x54 add r3, sp, #0x54
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x154 add sp, sp, #0x154
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
.align 2, 0 .align 2, 0
@ -3435,7 +3435,7 @@ ov20_0238CE9C: ; 0x0238CE9C
add r3, sp, #0x54 add r3, sp, #0x54
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x154 add sp, sp, #0x154
ldmia sp!, {r4, r5, pc} ldmia sp!, {r4, r5, pc}
.align 2, 0 .align 2, 0
@ -3468,7 +3468,7 @@ ov20_0238CF20: ; 0x0238CF20
add r3, sp, #0x54 add r3, sp, #0x54
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x154 add sp, sp, #0x154
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
.align 2, 0 .align 2, 0

2
asm/overlay_21.s
View File

@ -2840,7 +2840,7 @@ ov21_0238C9A4: ; 0x0238C9A4
add r3, sp, #4 add r3, sp, #4
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}

2
asm/overlay_25.s
View File

@ -1347,7 +1347,7 @@ ov25_0238B414: ; 0x0238B414
add r3, sp, #4 add r3, sp, #4
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
add sp, sp, #0x400 add sp, sp, #0x400
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}

4
asm/overlay_29_022E37DC.s
View File

@ -6871,7 +6871,7 @@ ov29_022E8E60: ; 0x022E8E60
mov r2, r1 mov r2, r1
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
#ifdef EUROPE #ifdef EUROPE
@ -6968,7 +6968,7 @@ ov29_022E8F78: ; 0x022E8F78
mov r2, r1 mov r2, r1
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
_022E8FC4: .word ov29_02353558 _022E8FC4: .word ov29_02353558

2
asm/overlay_29_022F05B4.s
View File

@ -458,7 +458,7 @@ ov29_022F0B10: ; 0x022F0B10
add r3, sp, #0x54 add r3, sp, #0x54
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0xd4 add sp, sp, #0xd4
ldmia sp!, {r3, r4, pc} ldmia sp!, {r3, r4, pc}
.align 2, 0 .align 2, 0

12
asm/overlay_31.s
View File

@ -172,7 +172,7 @@ _02382A88:
blt _023829D8 blt _023829D8
_02382A90: _02382A90:
mov r0, sl mov r0, sl
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x254 add sp, sp, #0x254
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0 .align 2, 0
@ -220,7 +220,7 @@ DungeonMenuSwitch: ; 0x02382AC0
mov r0, r4 mov r0, r4
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x54 add sp, sp, #0x54
ldmia sp!, {r3, r4, r5, r6, pc} ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0 .align 2, 0
@ -549,7 +549,7 @@ ov31_02382F68: ; 0x02382F68
str r3, [ip] str r3, [ip]
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r4 mov r0, r4
bl sub_02027AF0 bl UpdateWindow
ldmia sp!, {r4, pc} ldmia sp!, {r4, pc}
.align 2, 0 .align 2, 0
_02382FB4: .word ov31_0238A2A0 _02382FB4: .word ov31_0238A2A0
@ -1693,7 +1693,7 @@ _02383F34:
add r3, sp, #0x4c add r3, sp, #0x4c
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r8 mov r0, r8
bl sub_02027AF0 bl UpdateWindow
ldr r0, [sp, #0x28] ldr r0, [sp, #0x28]
mov r1, #0 mov r1, #0
mov r2, #1 mov r2, #1
@ -1749,7 +1749,7 @@ _02383FF0:
add r3, sp, #0x4c add r3, sp, #0x4c
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r8 mov r0, r8
bl sub_02027AF0 bl UpdateWindow
ldr r0, [r4] ldr r0, [r4]
mov r1, #0 mov r1, #0
add r2, r0, #0x1000 add r2, r0, #0x1000
@ -8326,7 +8326,7 @@ ov31_02389A04: ; 0x02389A04
mov r2, #2 mov r2, #2
bl DrawTextInWindow bl DrawTextInWindow
mov r0, r5 mov r0, r5
bl sub_02027AF0 bl UpdateWindow
add sp, sp, #0x94 add sp, sp, #0x94
ldmia sp!, {r4, r5, pc} ldmia sp!, {r4, r5, pc}
.align 2, 0 .align 2, 0