mirror of
https://github.com/pret/pmd-sky.git
synced 2026-04-25 15:42:34 -05:00
Matched overlay 11 EU
This commit is contained in:
AnonymousRandomPerson
parent
b8771bdf64
commit
0a3c493127
|
|
@ -217,17 +217,17 @@
|
|||
.public ov13_0238A468
|
||||
.public ov13_0238ADFC
|
||||
.public ov14_0238B708
|
||||
.public ov14_0238CC94
|
||||
.public ov14_0238CCA8
|
||||
.public ov14_0238CCBC
|
||||
.public ov14_0238CCD8
|
||||
.public ov14_0238CCF0
|
||||
.public ov15_0238AE88
|
||||
.public ov15_0238AE98
|
||||
.public ov15_0238AF54
|
||||
.public ov16_0238C148
|
||||
.public ov16_0238C1CC
|
||||
.public ov16_0238C1F8
|
||||
.public ov16_0238CC94
|
||||
.public ov16_0238CCA8
|
||||
.public ov16_0238CCBC
|
||||
.public ov16_0238CCD8
|
||||
.public ov16_0238CCF0
|
||||
.public ov17_0238A140
|
||||
.public ov17_0238A71C
|
||||
.public ov17_0238A754
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#pragma once
|
||||
.public AddMoneyCarried
|
||||
.public AddMoneyStored
|
||||
.public CreateDBox
|
||||
.public CreateNormalMenu
|
||||
.public CreatePortraitBox
|
||||
|
|
@ -8,6 +9,7 @@
|
|||
.public FreeNormalMenu
|
||||
.public FreePortraitBox
|
||||
.public GetMoneyCarried
|
||||
.public GetMoneyStored
|
||||
.public GetNormalMenuResult
|
||||
.public HidePortraitBox
|
||||
.public InitPortraitBoxWithMonsterId
|
||||
|
|
@ -22,9 +24,8 @@
|
|||
.public ShowDBox
|
||||
.public ShowMessageInDBox
|
||||
.public ShowPortraitBox
|
||||
.public GetMoneyStored
|
||||
.public AddMoneyStored
|
||||
.public sub_02017C80
|
||||
.public sub_02017CCC
|
||||
.public sub_02026214
|
||||
.public sub_02026268
|
||||
.public sub_02027AF0
|
||||
|
|
@ -36,6 +37,7 @@
|
|||
.public sub_0202F8FC
|
||||
.public sub_0202F954
|
||||
.public sub_020305B4
|
||||
.public sub_020307A4
|
||||
.public sub_0203083C
|
||||
.public sub_0203088C
|
||||
.public sub_020308A0
|
||||
|
|
|
|||
135
asm/overlay_11.s
135
asm/overlay_11.s
|
|
@ -2054,7 +2054,11 @@ _022DDD28: .word ov11_02319338
|
|||
_022DDD2C: .word ov11_02319350
|
||||
_022DDD30: .word ov11_02319370
|
||||
_022DDD34: .word 0x00000113
|
||||
#ifdef EUROPE
|
||||
_022DDD38: .word 0x0000013E
|
||||
#else
|
||||
_022DDD38: .word 0x00000132
|
||||
#endif
|
||||
_022DDD3C: .word ov11_02319380
|
||||
_022DDD40: .word ov11_02319398
|
||||
_022DDD44: .word ov11_02324EA4
|
||||
|
|
@ -23169,7 +23173,7 @@ ov11_022EFD5C: ; 0x022EFD5C
|
|||
sub r3, r0, #0x4d
|
||||
cmp r1, r3
|
||||
bgt _022F07A8
|
||||
bge _022F09F4
|
||||
bge _022F0038
|
||||
cmp r1, #0xdc
|
||||
bgt _022F0730
|
||||
bge _022EFFF4
|
||||
|
|
@ -23236,7 +23240,7 @@ _022F07D4:
|
|||
b _022F03A8
|
||||
_022F07E8: ; jump table
|
||||
b _022F0048 ; case 0
|
||||
b _022F09F4 ; case 1
|
||||
b _022F0038 ; case 1
|
||||
b _022F03A8 ; case 2
|
||||
b _022F03A8 ; case 3
|
||||
b _022F0054 ; case 4
|
||||
|
|
@ -23302,12 +23306,12 @@ _022F08AC:
|
|||
_022F08D0:
|
||||
cmp r1, #0x1b0
|
||||
bgt _022F08E0
|
||||
beq _022F09F4
|
||||
beq _022F0038
|
||||
b _022F03A8
|
||||
_022F08E0:
|
||||
add r0, r0, #0x36
|
||||
cmp r1, r0
|
||||
beq _022F09F4
|
||||
beq _022F0038
|
||||
b _022F03A8
|
||||
_022F08F0:
|
||||
add r3, r0, #0x53
|
||||
|
|
@ -23318,10 +23322,10 @@ _022F08F0:
|
|||
bge _022F0244
|
||||
cmp r1, #0x1bc
|
||||
bgt _022F0924
|
||||
bge _022F09F4
|
||||
bge _022F0038
|
||||
add r0, r0, #0x40
|
||||
cmp r1, r0
|
||||
beq _022F09F4
|
||||
beq _022F0038
|
||||
b _022F03A8
|
||||
_022F0924:
|
||||
cmp r1, #0x1cc
|
||||
|
|
@ -23977,10 +23981,11 @@ _022F0540:
|
|||
#ifdef EUROPE
|
||||
sub r0, r0, #5
|
||||
cmp r2, r0
|
||||
beq _022F07FC
|
||||
#else
|
||||
cmp r2, #0x160
|
||||
#endif
|
||||
beq _022F0F04
|
||||
#endif
|
||||
b _022F11C0
|
||||
_022F054C:
|
||||
#ifdef EUROPE
|
||||
|
|
@ -23989,9 +23994,10 @@ _022F054C:
|
|||
bge _022F0C44
|
||||
cmp r2, #0x19c
|
||||
bgt _022F0594
|
||||
bge _022F09F4
|
||||
bge _022F08F8
|
||||
cmp r2, #0x17c
|
||||
bgt _022F0588
|
||||
beq _022F0700
|
||||
#else
|
||||
add r1, r0, #0x37
|
||||
cmp r2, r1
|
||||
|
|
@ -24006,17 +24012,18 @@ _022F054C:
|
|||
bgt _022F0588
|
||||
add r0, r0, #5
|
||||
cmp r2, r0
|
||||
#endif
|
||||
beq _022F07FC
|
||||
#endif
|
||||
b _022F11C0
|
||||
_022F0588:
|
||||
#ifdef EUROPE
|
||||
add r0, r0, #0x13
|
||||
cmp r2, r0
|
||||
beq _022F09F4
|
||||
#else
|
||||
cmp r2, #0x170
|
||||
#endif
|
||||
beq _022F0700
|
||||
#endif
|
||||
b _022F11C0
|
||||
_022F0594:
|
||||
#ifdef EUROPE
|
||||
|
|
@ -24027,11 +24034,12 @@ _022F0594:
|
|||
cmp r2, r0
|
||||
bge _022F0C44
|
||||
cmp r2, #0x1b0
|
||||
beq _022F0C44
|
||||
#else
|
||||
cmp r2, #0x190
|
||||
bgt _022F05A4
|
||||
#endif
|
||||
beq _022F08F8
|
||||
#endif
|
||||
b _022F11C0
|
||||
_022F05A4:
|
||||
#ifdef EUROPE
|
||||
|
|
@ -24047,9 +24055,10 @@ _022F05B0:
|
|||
add r1, r0, #0x53
|
||||
cmp r2, r1
|
||||
bgt _022F05E4
|
||||
bge _022F1090
|
||||
bge _022F1128
|
||||
cmp r2, #0x1cc
|
||||
bgt _022F05D8
|
||||
beq _022F1090
|
||||
#else
|
||||
cmp r2, #0x1b0
|
||||
bgt _022F05E4
|
||||
|
|
@ -24059,17 +24068,18 @@ _022F05B0:
|
|||
bgt _022F05D8
|
||||
add r0, r0, #0x41
|
||||
cmp r2, r0
|
||||
#endif
|
||||
beq _022F0C44
|
||||
#endif
|
||||
b _022F11C0
|
||||
_022F05D8:
|
||||
#ifdef EUROPE
|
||||
add r0, r0, #0x52
|
||||
cmp r2, r0
|
||||
beq _022F1090
|
||||
#else
|
||||
cmp r2, #0x1ac
|
||||
#endif
|
||||
beq _022F0C44
|
||||
#endif
|
||||
b _022F11C0
|
||||
_022F05E4:
|
||||
#ifdef EUROPE
|
||||
|
|
@ -24078,8 +24088,9 @@ _022F05E4:
|
|||
bgt _022F0604
|
||||
add r0, r0, #0x57
|
||||
cmp r2, r0
|
||||
bge _022F1128
|
||||
bge _022F0FF8
|
||||
cmp r2, #0x1d0
|
||||
beq _022F1128
|
||||
#else
|
||||
add r1, r0, #0x48
|
||||
cmp r2, r1
|
||||
|
|
@ -24087,8 +24098,8 @@ _022F05E4:
|
|||
bge _022F1128
|
||||
add r0, r0, #0x47
|
||||
cmp r2, r0
|
||||
#endif
|
||||
beq _022F1090
|
||||
#endif
|
||||
b _022F11C0
|
||||
_022F0604:
|
||||
#ifdef EUROPE
|
||||
|
|
@ -27979,11 +27990,11 @@ _022F3A44:
|
|||
str r1, [r0]
|
||||
b _022F3DE0
|
||||
_022F3A98:
|
||||
bl ov14_0238CC94
|
||||
bl ov16_0238CC94
|
||||
ldr r1, _022F3E48 ; =ov11_02324CE0
|
||||
ldr r1, [r1]
|
||||
str r0, [r1, #0x33c]
|
||||
bl ov14_0238CCA8
|
||||
bl ov16_0238CCA8
|
||||
ldr r1, _022F3E48 ; =ov11_02324CE0
|
||||
ldr r1, [r1]
|
||||
str r0, [r1, #0x340]
|
||||
|
|
@ -28014,7 +28025,7 @@ _022F3A98:
|
|||
mov r2, #4
|
||||
add r0, r0, #0x18
|
||||
bl SetAnimDataFields2
|
||||
bl ov14_0238CCA8
|
||||
bl ov16_0238CCA8
|
||||
bl FemaleToMaleForm
|
||||
ldr r1, _022F3E60 ; =0x00000807
|
||||
bl GetIdleAnimationType
|
||||
|
|
@ -41910,7 +41921,11 @@ _022FF4E4:
|
|||
ldmia sp!, {r3, r4, r5, pc}
|
||||
.align 2, 0
|
||||
_022FF4F0: .word ov11_0232249C
|
||||
#ifdef EUROPE
|
||||
_022FF4F4: .word 0x000001CB
|
||||
#else
|
||||
_022FF4F4: .word 0x000001AF
|
||||
#endif
|
||||
_022FF4F8: .word ov11_02324D14
|
||||
_022FF4FC: .word ov11_0238A078
|
||||
arm_func_end ov11_022FF490
|
||||
|
|
@ -41952,7 +41967,11 @@ _022FF558:
|
|||
.align 2, 0
|
||||
_022FF57C: .word ov11_02324D14
|
||||
_022FF580: .word ov11_0238A078
|
||||
#ifdef EUROPE
|
||||
_022FF584: .word 0x000001CB
|
||||
#else
|
||||
_022FF584: .word 0x000001AF
|
||||
#endif
|
||||
arm_func_end ov11_022FF500
|
||||
|
||||
arm_func_start ov11_022FF588
|
||||
|
|
@ -42264,7 +42283,11 @@ _022FF9D8:
|
|||
ldmia sp!, {r4, r5, r6, r7, r8, pc}
|
||||
.align 2, 0
|
||||
_022FF9E0: .word ov11_02324D14
|
||||
#ifdef EUROPE
|
||||
_022FF9E4: .word 0x000001CB
|
||||
#else
|
||||
_022FF9E4: .word 0x000001AF
|
||||
#endif
|
||||
_022FF9E8: .word ov11_023224AC
|
||||
_022FF9EC: .word ov11_022FF9FC
|
||||
_022FF9F0: .word ov11_023224BC
|
||||
|
|
@ -42329,7 +42352,11 @@ _022FFA70:
|
|||
.align 2, 0
|
||||
_022FFAA0: .word ov11_02324D14
|
||||
_022FFAA4: .word ov11_0238A078
|
||||
#ifdef EUROPE
|
||||
_022FFAA8: .word 0x000001CB
|
||||
#else
|
||||
_022FFAA8: .word 0x000001AF
|
||||
#endif
|
||||
arm_func_end ov11_022FFA5C
|
||||
|
||||
arm_func_start ov11_022FFAAC
|
||||
|
|
@ -47235,7 +47262,11 @@ _02303D4C:
|
|||
ldmia sp!, {r3, pc}
|
||||
.align 2, 0
|
||||
_02303D68: .word ov11_02324D58
|
||||
#ifdef EUROPE
|
||||
_02303D6C: .word 0x00003D01
|
||||
#else
|
||||
_02303D6C: .word 0x00003CFF
|
||||
#endif
|
||||
_02303D70: .word ov11_023228D0
|
||||
_02303D74: .word ov11_023228F0
|
||||
_02303D78: .word ov11_02322910
|
||||
|
|
@ -54555,7 +54586,11 @@ _0230A2A8:
|
|||
ldmia sp!, {r4, pc}
|
||||
.align 2, 0
|
||||
_0230A2B0: .word ov11_02324D94
|
||||
#ifdef EUROPE
|
||||
_0230A2B4: .word 0x00003FBA
|
||||
#else
|
||||
_0230A2B4: .word 0x00003FB8
|
||||
#endif
|
||||
_0230A2B8: .word ov11_02322EAC
|
||||
_0230A2BC: .word 0x00401833
|
||||
_0230A2C0: .word ov11_02322EDC
|
||||
|
|
@ -56668,7 +56703,11 @@ _0230BF7C:
|
|||
.align 2, 0
|
||||
_0230BF8C: .word ov11_02324DA4
|
||||
_0230BF90: .word 0x0000032F
|
||||
#ifdef EUROPE
|
||||
_0230BF94: .word 0x00004642
|
||||
#else
|
||||
_0230BF94: .word 0x00004623
|
||||
#endif
|
||||
arm_func_end ov11_0230BF38
|
||||
|
||||
arm_func_start ov11_0230BF98
|
||||
|
|
@ -59990,7 +60029,11 @@ _0230E854:
|
|||
ldmia sp!, {r3, pc}
|
||||
.align 2, 0
|
||||
_0230E8C0: .word ov11_02324DDC
|
||||
#ifdef EUROPE
|
||||
_0230E8C4: .word 0x00003FCC
|
||||
#else
|
||||
_0230E8C4: .word 0x00003FCA
|
||||
#endif
|
||||
_0230E8C8: .word ov11_023232BC
|
||||
_0230E8CC: .word ov11_023232FC
|
||||
arm_func_end ov11_0230E7EC
|
||||
|
|
@ -68959,10 +69002,10 @@ ov11_02316168: ; 0x02316168
|
|||
bl OverlayIsLoaded
|
||||
cmp r0, #0
|
||||
beq _023161BC
|
||||
bl ov14_0238CCBC
|
||||
bl ov16_0238CCBC
|
||||
cmp r0, #0
|
||||
beq _023161BC
|
||||
bl ov14_0238CCBC
|
||||
bl ov16_0238CCBC
|
||||
cmp r0, #1
|
||||
str r0, [r4, #0xc]
|
||||
cmpne r0, #2
|
||||
|
|
@ -68975,7 +69018,7 @@ _023161B0:
|
|||
mov r0, #0
|
||||
strh r0, [r4, #0x16]
|
||||
_023161B8:
|
||||
bl ov14_0238CCD8
|
||||
bl ov16_0238CCD8
|
||||
_023161BC:
|
||||
ldrh r0, [r4, #0x16]
|
||||
add r0, r0, #1
|
||||
|
|
@ -69044,7 +69087,7 @@ _0231626C:
|
|||
ldrh r0, [r4, #0x16]
|
||||
cmp r0, #0xb4
|
||||
bne _023162B8
|
||||
bl ov14_0238CCF0
|
||||
bl ov16_0238CCF0
|
||||
_023162B8:
|
||||
ldrh r0, [r4, #0x16]
|
||||
cmp r0, #0xc4
|
||||
|
|
@ -69627,7 +69670,11 @@ _02316A18:
|
|||
.align 2, 0
|
||||
_02316A2C: .word ov11_02324C38
|
||||
_02316A30: .word ov11_02324C30
|
||||
#ifdef EUROPE
|
||||
_02316A34: .word 0x00003C2C
|
||||
#else
|
||||
_02316A34: .word 0x00003C2A
|
||||
#endif
|
||||
_02316A38: .word 0x000008DF
|
||||
arm_func_end ov11_023168E0
|
||||
|
||||
|
|
@ -76374,7 +76421,7 @@ GROUND_WEATHER_TABLE:
|
|||
#else
|
||||
#define GROUND_WEATHER_OFFSET 0
|
||||
#endif
|
||||
.byte 0x00, 0x00, 0x13 + GROUND_WEATHER_OFFSET, 0x01, 0x01, 0x00, 0xB0 + GROUND_WEATHER_OFFSET, 0x01, 0x01, 0x00, 0xB1 + GROUND_WEATHER_OFFSET, 0x01
|
||||
.byte 0x00, 0x00, 0x13, 0x01, 0x01, 0x00, 0xB0 + GROUND_WEATHER_OFFSET, 0x01, 0x01, 0x00, 0xB1 + GROUND_WEATHER_OFFSET, 0x01
|
||||
.byte 0x02, 0x00, 0xB2 + GROUND_WEATHER_OFFSET, 0x01, 0x01, 0x00, 0xB3 + GROUND_WEATHER_OFFSET, 0x01, 0x02, 0x00, 0xB4 + GROUND_WEATHER_OFFSET, 0x01, 0x01, 0x00, 0xB5 + GROUND_WEATHER_OFFSET, 0x01
|
||||
.byte 0x02, 0x00, 0xB6 + GROUND_WEATHER_OFFSET, 0x01, 0x01, 0x00, 0xB7 + GROUND_WEATHER_OFFSET, 0x01, 0x02, 0x00, 0xB8 + GROUND_WEATHER_OFFSET, 0x01, 0x01, 0x00, 0xB9 + GROUND_WEATHER_OFFSET, 0x01
|
||||
.byte 0x02, 0x00, 0xBA + GROUND_WEATHER_OFFSET, 0x01
|
||||
|
|
@ -81050,37 +81097,35 @@ ov11_02323BBC:
|
|||
.global ov11_02323BD0
|
||||
ov11_02323BD0:
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global ov11_02323BD8
|
||||
ov11_02323BD8:
|
||||
#ifdef EUROPE
|
||||
.byte 0x00, 0xC0, 0x00, 0x00
|
||||
.byte 0x00, 0xA4, 0x00, 0x00
|
||||
#else
|
||||
.byte 0x00, 0x80, 0x00, 0x00
|
||||
.byte 0x00, 0x84, 0x00, 0x00
|
||||
#endif
|
||||
.global ov11_02323BE0
|
||||
ov11_02323BE0:
|
||||
#ifdef EUROPE
|
||||
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00
|
||||
#else
|
||||
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00
|
||||
#endif
|
||||
.global ov11_02323BE8
|
||||
ov11_02323BE8:
|
||||
#ifdef EUROPE
|
||||
.byte 0x00, 0x04, 0x00, 0x00
|
||||
.byte 0x00, 0x18, 0x00, 0x00
|
||||
#else
|
||||
.byte 0x00, 0xC0, 0x00, 0x00
|
||||
.byte 0x00, 0xA4, 0x00, 0x00
|
||||
#endif
|
||||
.global ov11_02323BD8
|
||||
ov11_02323BD8:
|
||||
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00
|
||||
.global ov11_02323BE0
|
||||
ov11_02323BE0:
|
||||
.byte 0x00, 0x04, 0x00, 0x00
|
||||
.byte 0x00, 0x18, 0x00, 0x00
|
||||
.word ov11_02323C1C
|
||||
#ifdef EUROPE
|
||||
.byte 0x9B, 0x01, 0x00, 0x00, 0xAF, 0x00, 0xB0, 0x00
|
||||
.byte 0xB1, 0x00, 0xB2, 0x00, 0xB3, 0x00, 0xA5, 0x00, 0xA6, 0x00, 0xA7, 0x00, 0xA8, 0x00, 0xA9, 0x00
|
||||
.byte 0x15, 0x01, 0xC7, 0x01, 0xC8, 0x01, 0xC9, 0x01, 0xCA, 0x01, 0x00, 0x00
|
||||
#else
|
||||
.global ov11_02323BD8
|
||||
ov11_02323BD8:
|
||||
.byte 0x00, 0x80, 0x00, 0x00
|
||||
.byte 0x00, 0x84, 0x00, 0x00
|
||||
.global ov11_02323BE0
|
||||
ov11_02323BE0:
|
||||
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00
|
||||
.global ov11_02323BE8
|
||||
ov11_02323BE8:
|
||||
.byte 0x00, 0xC0, 0x00, 0x00
|
||||
.byte 0x00, 0xA4, 0x00, 0x00
|
||||
.word ov11_02323C1C
|
||||
.byte 0x52, 0x01, 0x00, 0x00
|
||||
#endif
|
||||
.global ov11_02323BF8
|
||||
|
|
|
|||
|
|
@ -3091,29 +3091,17 @@ _0238CC7C:
|
|||
mov r0, #4
|
||||
str r0, [r1, #0x538]
|
||||
ldr r3, [r2]
|
||||
arm_func_end SentryStateGetUserChoice
|
||||
|
||||
arm_func_start ov14_0238CC94
|
||||
ov14_0238CC94: ; 0x0238CC94
|
||||
mov r2, #3
|
||||
add r0, r3, #0x3000
|
||||
ldr r1, [r0, #0x878]
|
||||
mov r0, #0x10
|
||||
add r1, r3, r1, lsl #2
|
||||
arm_func_end ov14_0238CC94
|
||||
|
||||
arm_func_start ov14_0238CCA8
|
||||
ov14_0238CCA8: ; 0x0238CCA8
|
||||
add r1, r1, #0x3000
|
||||
str r2, [r1, #0x554]
|
||||
bl SentrySetStateIntermediate
|
||||
b _0238CCE0
|
||||
_0238CCB8:
|
||||
mov r2, #5
|
||||
arm_func_end ov14_0238CCA8
|
||||
|
||||
arm_func_start ov14_0238CCBC
|
||||
ov14_0238CCBC: ; 0x0238CCBC
|
||||
mov r0, #0x14
|
||||
str r2, [r1, #0x538]
|
||||
bl SentrySetStateIntermediate
|
||||
|
|
@ -3122,10 +3110,6 @@ _0238CCCC:
|
|||
ldr r0, _0238CFA4 ; =SENTRY_DUTY_PTR
|
||||
mov r1, #3
|
||||
ldr r0, [r0]
|
||||
arm_func_end ov14_0238CCBC
|
||||
|
||||
arm_func_start ov14_0238CCD8
|
||||
ov14_0238CCD8: ; 0x0238CCD8
|
||||
add r0, r0, #0x3000
|
||||
str r1, [r0, #0x538]
|
||||
_0238CCE0:
|
||||
|
|
@ -3133,10 +3117,6 @@ _0238CCE0:
|
|||
tst r0, #0xf0
|
||||
beq _0238CCF4
|
||||
ldr r0, _0238CFB4 ; =0x00003F01
|
||||
arm_func_end ov14_0238CCD8
|
||||
|
||||
arm_func_start ov14_0238CCF0
|
||||
ov14_0238CCF0: ; 0x0238CCF0
|
||||
bl sub_02017C80
|
||||
_0238CCF4:
|
||||
ldr r0, _0238CFA4 ; =SENTRY_DUTY_PTR
|
||||
|
|
@ -3338,7 +3318,7 @@ _0238CFB4: .word 0x00003F01
|
|||
_0238CFB8: .word ov14_0238D96C
|
||||
_0238CFBC: .word ov14_0238DA80
|
||||
_0238CFC0: .word 0x00002C06
|
||||
arm_func_end ov14_0238CCF0
|
||||
arm_func_end SentryStateGetUserChoice
|
||||
|
||||
arm_func_start SentryStateFinalizeRound
|
||||
SentryStateFinalizeRound: ; 0x0238CFC4
|
||||
|
|
|
|||
|
|
@ -192,6 +192,10 @@ _0238A3A0:
|
|||
bl ov15_0238A4E8
|
||||
b _0238A4D4
|
||||
_0238A3E4:
|
||||
#ifdef EUROPE
|
||||
mov r0, #1
|
||||
bl sub_02017CCC
|
||||
#endif
|
||||
ldr r0, _0238A4DC ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
ldr r0, [r0]
|
||||
ldrsb r0, [r0, #0x80]
|
||||
|
|
@ -229,10 +233,6 @@ _0238A444:
|
|||
rsb r0, r0, #0
|
||||
bl AddMoneyStored
|
||||
ldr r0, _0238A4DC ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
arm_func_end ov15_0238A234
|
||||
|
||||
arm_func_start ov15_0238A468
|
||||
ov15_0238A468: ; 0x0238A468
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl AddMoneyCarried
|
||||
|
|
@ -242,8 +242,13 @@ ov15_0238A468: ; 0x0238A468
|
|||
bl ov15_0238A4E8
|
||||
b _0238A4D4
|
||||
_0238A488:
|
||||
#ifdef EUROPE
|
||||
mov r0, #1
|
||||
bl sub_02017CCC
|
||||
#else
|
||||
ldr r0, _0238A4E4 ; =ov15_0238B0CC
|
||||
bl DebugPrint0
|
||||
#endif
|
||||
ldr r0, _0238A4DC ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
ldr r0, [r0]
|
||||
ldrsb r0, [r0, #0x80]
|
||||
|
|
@ -269,8 +274,10 @@ _0238A4D4:
|
|||
.align 2, 0
|
||||
_0238A4DC: .word OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
_0238A4E0: .word 0x00001308
|
||||
#ifndef EUROPE
|
||||
_0238A4E4: .word ov15_0238B0CC
|
||||
arm_func_end ov15_0238A468
|
||||
#endif
|
||||
arm_func_end ov15_0238A234
|
||||
|
||||
arm_func_start ov15_0238A4E8
|
||||
ov15_0238A4E8: ; 0x0238A4E8
|
||||
|
|
@ -605,10 +612,22 @@ _0238A95C:
|
|||
ldr r3, _0238AD68 ; =ov15_0238AE6C
|
||||
str r2, [sp, #4]
|
||||
bl sub_020305B4
|
||||
#ifdef EUROPE
|
||||
ldr r2, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
mov r1, #0
|
||||
ldr r3, [r2]
|
||||
strb r0, [r3, #0x68]
|
||||
ldr r0, [r2]
|
||||
ldrsb r0, [r0, #0x68]
|
||||
bl sub_020307A4
|
||||
ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
ldr r0, [r0]
|
||||
#else
|
||||
ldr r1, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
ldr r2, [r1]
|
||||
strb r0, [r2, #0x68]
|
||||
ldr r0, [r1]
|
||||
#endif
|
||||
add r0, r0, #0x54
|
||||
bl sub_020395CC
|
||||
ldr r1, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
|
|
@ -769,10 +788,22 @@ _0238ABD4:
|
|||
ldr r3, _0238AD68 ; =ov15_0238AE6C
|
||||
str r2, [sp, #4]
|
||||
bl sub_020305B4
|
||||
#ifdef EUROPE
|
||||
ldr r2, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
mov r1, #0
|
||||
ldr r3, [r2]
|
||||
strb r0, [r3, #0x68]
|
||||
ldr r0, [r2]
|
||||
ldrsb r0, [r0, #0x68]
|
||||
bl sub_020307A4
|
||||
ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
ldr r0, [r0]
|
||||
#else
|
||||
ldr r1, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
ldr r2, [r1]
|
||||
strb r0, [r2, #0x68]
|
||||
ldr r0, [r1]
|
||||
#endif
|
||||
add r0, r0, #0x54
|
||||
bl sub_020395CC
|
||||
ldr r1, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180
|
||||
|
|
@ -1096,9 +1127,11 @@ BANK_D_BOX_LAYOUT_4:
|
|||
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
|
||||
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x05
|
||||
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
#ifndef EUROPE
|
||||
.global ov15_0238B0CC
|
||||
ov15_0238B0CC:
|
||||
.byte 0x43, 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00
|
||||
#endif
|
||||
.global ov15_0238B0D4
|
||||
ov15_0238B0D4:
|
||||
.byte 0x52, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00
|
||||
|
|
|
|||
|
|
@ -3004,8 +3004,14 @@ ov16_0238CC64: ; 0x0238CC64
|
|||
stmdb sp!, {r3, lr}
|
||||
bl GetTeamMember
|
||||
ldr r1, _0238CC90 ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40
|
||||
#ifdef EUROPE
|
||||
mov r2, #0xa
|
||||
ldr r3, [r1]
|
||||
str r0, [r3, #0x3c]
|
||||
#else
|
||||
ldr r2, [r1]
|
||||
str r0, [r2, #0x3c]
|
||||
#endif
|
||||
ldr r0, [r1]
|
||||
ldr r1, [r0, #0x3c]
|
||||
add r0, r0, #0xb1
|
||||
|
|
|
|||
|
|
@ -3290,7 +3290,7 @@ ov18_0238CC00: ; 0x0238CC00
|
|||
addls pc, pc, r0, lsl #2
|
||||
b _0238CD5C
|
||||
_0238CC50: ; jump table
|
||||
b ov18_0238CCF0 ; case 0
|
||||
b _0238CCF0 ; case 0
|
||||
b _0238CD5C ; case 1
|
||||
b _0238CD5C ; case 2
|
||||
b _0238CD5C ; case 3
|
||||
|
|
@ -3308,28 +3308,16 @@ _0238CC78:
|
|||
add r0, r2, #0x300
|
||||
ldrsh r0, [r0, #0x8c]
|
||||
bl ov18_0238ADA8
|
||||
arm_func_end ov18_0238CC00
|
||||
|
||||
arm_func_start ov18_0238CC94
|
||||
ov18_0238CC94: ; 0x0238CC94
|
||||
ldr r1, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620
|
||||
mov r4, r0
|
||||
ldr r0, [r1]
|
||||
str r4, [r0, #0x24]
|
||||
bl sub_020415BC
|
||||
arm_func_end ov18_0238CC94
|
||||
|
||||
arm_func_start ov18_0238CCA8
|
||||
ov18_0238CCA8: ; 0x0238CCA8
|
||||
cmp r0, #0
|
||||
mov r0, r4
|
||||
beq _0238CCCC
|
||||
bl sub_0203FD14
|
||||
ldr r0, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620
|
||||
arm_func_end ov18_0238CCA8
|
||||
|
||||
arm_func_start ov18_0238CCBC
|
||||
ov18_0238CCBC: ; 0x0238CCBC
|
||||
mov r1, #0x3c
|
||||
ldr r0, [r0]
|
||||
str r1, [r0, #0x80]
|
||||
|
|
@ -3338,18 +3326,13 @@ _0238CCCC:
|
|||
bl sub_02041614
|
||||
ldr r0, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620
|
||||
ldr r0, [r0]
|
||||
arm_func_end ov18_0238CCBC
|
||||
|
||||
arm_func_start ov18_0238CCD8
|
||||
ov18_0238CCD8: ; 0x0238CCD8
|
||||
add r0, r0, #0x300
|
||||
ldrsh r0, [r0, #0x8c]
|
||||
bl sub_0203FD80
|
||||
mov r0, #0x3a
|
||||
bl ov18_0238BE28
|
||||
ldmia sp!, {r4, pc}
|
||||
arm_func_end ov18_0238CCD8
|
||||
ov18_0238CCF0:
|
||||
_0238CCF0:
|
||||
ldr r1, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620
|
||||
mov r0, r4, lsl #0x10
|
||||
ldr r2, [r1]
|
||||
|
|
@ -3391,6 +3374,7 @@ _0238CD78:
|
|||
ldmia sp!, {r4, pc}
|
||||
.align 2, 0
|
||||
_0238CD84: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620
|
||||
arm_func_end ov18_0238CC00
|
||||
|
||||
arm_func_start ov18_0238CD88
|
||||
ov18_0238CD88: ; 0x0238CD88
|
||||
|
|
|
|||
176
asm/overlay_19.s
176
asm/overlay_19.s
|
|
@ -678,7 +678,11 @@ _0238AA08:
|
|||
bl InitPreprocessorArgs
|
||||
str r5, [sp, #0x988]
|
||||
ldrh r1, [r4, #2]
|
||||
#ifdef EUROPE
|
||||
add r0, r5, #0xd3
|
||||
#else
|
||||
add r0, r5, #0xd1
|
||||
#endif
|
||||
add r0, r0, #0x2900
|
||||
str r1, [sp, #0x99c]
|
||||
ldrh r1, [r4, #2]
|
||||
|
|
@ -1324,6 +1328,15 @@ _0238B34C:
|
|||
ldr r1, _0238B484 ; =0x0000101C
|
||||
str r0, [r8, #0x1c4]
|
||||
add r0, r8, #0x100
|
||||
#ifdef EUROPE
|
||||
strh r3, [r0, #0xc8]
|
||||
add r1, sp, #0x700
|
||||
str r1, [sp]
|
||||
add r2, r3, #0x35c0
|
||||
add r0, r8, #0x1cc
|
||||
mov r1, #0x400
|
||||
add r3, r3, #0x2000
|
||||
#else
|
||||
strh r1, [r0, #0xc8]
|
||||
add r3, r1, #0x2000
|
||||
add r1, sp, #0x700
|
||||
|
|
@ -1331,6 +1344,7 @@ _0238B34C:
|
|||
ldr r2, _0238B494 ; =0x000045BD
|
||||
add r0, r8, #0x1cc
|
||||
mov r1, #0x400
|
||||
#endif
|
||||
bl PreprocessStringFromMessageId
|
||||
mov r0, #0x1f
|
||||
str r0, [r8, #4]
|
||||
|
|
@ -1367,38 +1381,45 @@ _0238B3B4:
|
|||
str r0, [r8]
|
||||
b _0238C598
|
||||
.align 2, 0
|
||||
#ifdef EUROPE
|
||||
#define OV19_0238A4A4_OFFSET 0x1F
|
||||
#else
|
||||
#define OV19_0238A4A4_OFFSET 0
|
||||
#endif
|
||||
_0238B424: .word ov11_02324DB0
|
||||
_0238B428: .word 0x0001012E
|
||||
_0238B42C: .word 0x0000458B
|
||||
_0238B42C: .word 0x0000458B + OV19_0238A4A4_OFFSET
|
||||
_0238B430: .word BAR_MAIN_MENU
|
||||
_0238B434: .word 0x0000458C
|
||||
_0238B438: .word 0x00004590
|
||||
_0238B43C: .word 0x0000458F
|
||||
_0238B434: .word 0x0000458C + OV19_0238A4A4_OFFSET
|
||||
_0238B438: .word 0x00004590 + OV19_0238A4A4_OFFSET
|
||||
_0238B43C: .word 0x0000458F + OV19_0238A4A4_OFFSET
|
||||
_0238B440: .word 0x0000301C
|
||||
_0238B444: .word 0x0000458D
|
||||
_0238B448: .word 0x0000458E
|
||||
_0238B444: .word 0x0000458D + OV19_0238A4A4_OFFSET
|
||||
_0238B448: .word 0x0000458E + OV19_0238A4A4_OFFSET
|
||||
_0238B44C: .word ov19_0238D4A4
|
||||
_0238B450: .word OVERLAY19_UNKNOWN_POINTER__NA_238E360
|
||||
_0238B454: .word BAR_D_BOX_LAYOUT_1
|
||||
_0238B458: .word BAR_SUBMENU_1
|
||||
_0238B45C: .word 0x00003F02
|
||||
_0238B460: .word 0x00004594
|
||||
_0238B460: .word 0x00004594 + OV19_0238A4A4_OFFSET
|
||||
_0238B464: .word BAR_D_BOX_LAYOUT_2
|
||||
_0238B468: .word 0x00001013
|
||||
_0238B46C: .word 0x000008E4
|
||||
_0238B470: .word BAR_D_BOX_LAYOUT_3
|
||||
_0238B474: .word BAR_SUBMENU_2
|
||||
_0238B478: .word BAR_MENU_CONFIRM_1
|
||||
_0238B47C: .word 0x0000459A
|
||||
_0238B480: .word 0x0000459D
|
||||
_0238B47C: .word 0x0000459A + OV19_0238A4A4_OFFSET
|
||||
_0238B480: .word 0x0000459D + OV19_0238A4A4_OFFSET
|
||||
_0238B484: .word 0x0000101C
|
||||
_0238B488: .word 0x0000459E
|
||||
_0238B48C: .word 0x000045B1
|
||||
_0238B490: .word 0x000045BC
|
||||
_0238B494: .word 0x000045BD
|
||||
_0238B488: .word 0x0000459E + OV19_0238A4A4_OFFSET
|
||||
_0238B48C: .word 0x000045B1 + OV19_0238A4A4_OFFSET
|
||||
_0238B490: .word 0x000045BC + OV19_0238A4A4_OFFSET
|
||||
#ifndef EUROPE
|
||||
_0238B494: .word 0x000045BD + OV19_0238A4A4_OFFSET
|
||||
#endif
|
||||
_0238B498: .word 0x00001311
|
||||
_0238B49C: .word 0x000045BE
|
||||
_0238B4A0: .word 0x000045BF
|
||||
_0238B49C: .word 0x000045BE + OV19_0238A4A4_OFFSET
|
||||
_0238B4A0: .word 0x000045BF + OV19_0238A4A4_OFFSET
|
||||
_0238B4A4:
|
||||
add r0, sp, #0x660
|
||||
bl InitPreprocessorArgs
|
||||
|
|
@ -1469,7 +1490,11 @@ _0238B528:
|
|||
orr r1, r1, #0x20000
|
||||
str r1, [sp, #0x5c0]
|
||||
str r0, [sp, #0x5e4]
|
||||
#ifdef EUROPE
|
||||
add r1, r0, #0x32c0
|
||||
#else
|
||||
ldr r1, _0238C490 ; =0x000045B2
|
||||
#endif
|
||||
mov r0, #0x1c
|
||||
add r2, sp, #0x5c0
|
||||
str r4, [sp, #0x5f8]
|
||||
|
|
@ -2450,9 +2475,15 @@ _0238C3AC:
|
|||
mov r3, #0x1c
|
||||
strh r3, [r0, #0xc8]
|
||||
add r4, sp, #0x2f8
|
||||
#ifdef EUROPE
|
||||
add r0, r8, #0x1cc
|
||||
mov r1, #0x400
|
||||
mov r2, #0x4600
|
||||
#else
|
||||
ldr r2, _0238C508 ; =0x000045E1
|
||||
add r0, r8, #0x1cc
|
||||
mov r1, #0x400
|
||||
#endif
|
||||
str r4, [sp]
|
||||
bl PreprocessStringFromMessageId
|
||||
mov r0, #0xb
|
||||
|
|
@ -2497,39 +2528,43 @@ _0238C480:
|
|||
bl ov19_0238D310
|
||||
b _0238C598
|
||||
.align 2, 0
|
||||
_0238C488: .word 0x000045C0
|
||||
_0238C488: .word 0x000045C0 + OV19_0238A4A4_OFFSET
|
||||
_0238C48C: .word OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238
|
||||
#ifndef EUROPE
|
||||
_0238C490: .word 0x000045B2
|
||||
#endif
|
||||
_0238C494: .word ov19_0238E18A
|
||||
_0238C498: .word ov19_0238E17E
|
||||
_0238C49C: .word ov19_0238E190
|
||||
_0238C4A0: .word 0x000045B9
|
||||
_0238C4A4: .word 0x000045D6
|
||||
_0238C4A8: .word 0x000045D7
|
||||
_0238C4AC: .word 0x000045D4
|
||||
_0238C4B0: .word 0x000045D5
|
||||
_0238C4A0: .word 0x000045B9 + OV19_0238A4A4_OFFSET
|
||||
_0238C4A4: .word 0x000045D6 + OV19_0238A4A4_OFFSET
|
||||
_0238C4A8: .word 0x000045D7 + OV19_0238A4A4_OFFSET
|
||||
_0238C4AC: .word 0x000045D4 + OV19_0238A4A4_OFFSET
|
||||
_0238C4B0: .word 0x000045D5 + OV19_0238A4A4_OFFSET
|
||||
_0238C4B4: .word 0x0000068A
|
||||
_0238C4B8: .word 0x000045E3
|
||||
_0238C4BC: .word 0x000045E4
|
||||
_0238C4C0: .word 0x000045E5
|
||||
_0238C4C4: .word 0x000045E6
|
||||
_0238C4B8: .word 0x000045E3 + OV19_0238A4A4_OFFSET
|
||||
_0238C4BC: .word 0x000045E4 + OV19_0238A4A4_OFFSET
|
||||
_0238C4C0: .word 0x000045E5 + OV19_0238A4A4_OFFSET
|
||||
_0238C4C4: .word 0x000045E6 + OV19_0238A4A4_OFFSET
|
||||
_0238C4C8: .word OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC
|
||||
_0238C4CC: .word ov19_0238E2C0
|
||||
_0238C4D0: .word 0x000045E7
|
||||
_0238C4D4: .word 0x000045C1
|
||||
_0238C4D8: .word 0x000045D9
|
||||
_0238C4DC: .word 0x000045DA
|
||||
_0238C4D0: .word 0x000045E7 + OV19_0238A4A4_OFFSET
|
||||
_0238C4D4: .word 0x000045C1 + OV19_0238A4A4_OFFSET
|
||||
_0238C4D8: .word 0x000045D9 + OV19_0238A4A4_OFFSET
|
||||
_0238C4DC: .word 0x000045DA + OV19_0238A4A4_OFFSET
|
||||
_0238C4E0: .word ov19_0238E1BC
|
||||
_0238C4E4: .word ov19_0238E1C4
|
||||
_0238C4E8: .word 0x000045DB
|
||||
_0238C4E8: .word 0x000045DB + OV19_0238A4A4_OFFSET
|
||||
_0238C4EC: .word OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4
|
||||
_0238C4F0: .word ov19_0238E1AC
|
||||
_0238C4F4: .word BAR_MENU_CONFIRM_2
|
||||
_0238C4F8: .word 0x000045DC
|
||||
_0238C4F8: .word 0x000045DC + OV19_0238A4A4_OFFSET
|
||||
_0238C4FC: .word ov19_0238E1B4
|
||||
_0238C500: .word 0x00000163
|
||||
_0238C504: .word 0x000045DF
|
||||
_0238C508: .word 0x000045E1
|
||||
_0238C504: .word 0x000045DF + OV19_0238A4A4_OFFSET
|
||||
#ifndef EUROPE
|
||||
_0238C508: .word 0x000045E1 + OV19_0238A4A4_OFFSET
|
||||
#endif
|
||||
_0238C50C:
|
||||
bl sub_02046C78
|
||||
cmp r0, #0
|
||||
|
|
@ -3093,28 +3128,16 @@ _0238CC4C:
|
|||
str r0, [sp]
|
||||
mov r0, #1
|
||||
str r0, [sp, #8]
|
||||
arm_func_end ov19_0238CBC0
|
||||
|
||||
arm_func_start ov19_0238CC94
|
||||
ov19_0238CC94: ; 0x0238CC94
|
||||
ldr r2, _0238CCE8 ; =0x000045E2
|
||||
mov r0, sb
|
||||
mov r1, #0x100
|
||||
mov r3, #0
|
||||
bl PreprocessStringFromMessageId
|
||||
arm_func_end ov19_0238CC94
|
||||
|
||||
arm_func_start ov19_0238CCA8
|
||||
ov19_0238CCA8: ; 0x0238CCA8
|
||||
mov r0, sl
|
||||
mov r1, sb
|
||||
bl strcat
|
||||
add r0, fp, #0x14
|
||||
and r1, r5, #0xff
|
||||
arm_func_end ov19_0238CCA8
|
||||
|
||||
arm_func_start ov19_0238CCBC
|
||||
ov19_0238CCBC: ; 0x0238CCBC
|
||||
bl EnableIqSkill
|
||||
add r5, r5, #1
|
||||
_0238CCC4:
|
||||
|
|
@ -3123,25 +3146,17 @@ _0238CCC4:
|
|||
blt _0238CBF8
|
||||
ldr r0, [sp, #8]
|
||||
add sp, sp, #0x5c
|
||||
arm_func_end ov19_0238CCBC
|
||||
|
||||
arm_func_start ov19_0238CCD8
|
||||
ov19_0238CCD8: ; 0x0238CCD8
|
||||
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
.align 2, 0
|
||||
_0238CCDC: .word ov11_02324DB0
|
||||
_0238CCE0: .word ov19_0238E2C0
|
||||
_0238CCE4: .word ov19_0238E2C4
|
||||
_0238CCE8: .word 0x000045E2
|
||||
arm_func_end ov19_0238CCD8
|
||||
arm_func_end ov19_0238CBC0
|
||||
|
||||
arm_func_start ov19_0238CCEC
|
||||
ov19_0238CCEC: ; 0x0238CCEC
|
||||
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
arm_func_end ov19_0238CCEC
|
||||
|
||||
arm_func_start ov19_0238CCF0
|
||||
ov19_0238CCF0: ; 0x0238CCF0
|
||||
ldr r2, _0238CEBC ; =ov11_02324DB0
|
||||
mov r5, r0
|
||||
ldr r0, [r2]
|
||||
|
|
@ -3272,7 +3287,7 @@ _0238CEB0:
|
|||
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
|
||||
.align 2, 0
|
||||
_0238CEBC: .word ov11_02324DB0
|
||||
arm_func_end ov19_0238CCF0
|
||||
arm_func_end ov19_0238CCEC
|
||||
|
||||
arm_func_start ov19_0238CEC0
|
||||
ov19_0238CEC0: ; 0x0238CEC0
|
||||
|
|
@ -4325,27 +4340,32 @@ BAR_AVAILABLE_ITEMS:
|
|||
.byte 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x64, 0x00, 0x14, 0x00, 0x32, 0x00
|
||||
.global OVERLAY19_UNKNOWN_STRING_IDS__NA_238E178
|
||||
OVERLAY19_UNKNOWN_STRING_IDS__NA_238E178:
|
||||
.byte 0xCA, 0x45, 0xC6, 0x45
|
||||
.byte 0xC2, 0x45
|
||||
#ifdef EUROPE
|
||||
#define OVERLAY19_STRING_IDS_OFFSET 0x1F
|
||||
#else
|
||||
#define OVERLAY19_STRING_IDS_OFFSET 0
|
||||
#endif
|
||||
.byte 0xCA + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC6 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.byte 0xC2 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.global ov19_0238E17E
|
||||
ov19_0238E17E:
|
||||
.byte 0xB6, 0x45, 0xB7, 0x45, 0xB8, 0x45
|
||||
.byte 0xB6 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xB7 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xB8 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.global ov19_0238E184
|
||||
ov19_0238E184:
|
||||
.byte 0xCB, 0x45, 0xC7, 0x45, 0xC3, 0x45
|
||||
.byte 0xCB + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC7 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC3 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.global ov19_0238E18A
|
||||
ov19_0238E18A:
|
||||
.byte 0xB3, 0x45
|
||||
.byte 0xB4, 0x45, 0xB5, 0x45
|
||||
.byte 0xB3 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.byte 0xB4 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xB5 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.global ov19_0238E190
|
||||
ov19_0238E190:
|
||||
.byte 0xB9, 0x45, 0xBA, 0x45, 0xBB, 0x45
|
||||
.byte 0xB9 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xBA + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xBB + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.global ov19_0238E196
|
||||
ov19_0238E196:
|
||||
.byte 0xCD, 0x45, 0xC9, 0x45, 0xC5, 0x45
|
||||
.byte 0xCD + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC9 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC5 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.global ov19_0238E19C
|
||||
ov19_0238E19C:
|
||||
.byte 0xCC, 0x45, 0xC8, 0x45, 0xC4, 0x45, 0x00, 0x00
|
||||
.byte 0xCC + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC8 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC4 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
|
||||
.global OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4
|
||||
OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4:
|
||||
.byte 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
|
||||
|
|
@ -4363,7 +4383,7 @@ ov19_0238E1C4:
|
|||
.byte 0x0A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
|
||||
.global OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC
|
||||
OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC:
|
||||
.byte 0xCE, 0x45, 0xCF, 0x45, 0xD0, 0x45, 0xD1, 0x45, 0xD2, 0x45, 0xD3, 0x45
|
||||
.byte 0xCE + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xCF + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xD0 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xD1 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xD2 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xD3 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.global BAR_D_BOX_LAYOUT_1
|
||||
BAR_D_BOX_LAYOUT_1:
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
|
|
@ -4378,33 +4398,33 @@ BAR_D_BOX_LAYOUT_3:
|
|||
.byte 0x14, 0x02, 0x0A, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.global BAR_MENU_CONFIRM_1
|
||||
BAR_MENU_CONFIRM_1:
|
||||
.byte 0x9B, 0x45, 0x00, 0x00
|
||||
.byte 0x08, 0x00, 0x00, 0x00, 0x9C, 0x45, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x9B + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
|
||||
.byte 0x08, 0x00, 0x00, 0x00, 0x9C + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xFF, 0xFF, 0xFF, 0xFF
|
||||
.global BAR_MENU_CONFIRM_2
|
||||
BAR_MENU_CONFIRM_2:
|
||||
.byte 0xDD, 0x45, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xDE, 0x45, 0x00, 0x00
|
||||
.byte 0xDD + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xDE + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
|
||||
.byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
|
||||
.global OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238
|
||||
OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238:
|
||||
.byte 0xA0, 0x45, 0xA2, 0x45
|
||||
.byte 0xA5, 0x45, 0xA6, 0x45, 0xA7, 0x45, 0xA9, 0x45, 0xAA, 0x45, 0xAB, 0x45, 0xAC, 0x45, 0xAE, 0x45
|
||||
.byte 0xAF, 0x45, 0xB0, 0x45
|
||||
.byte 0xA0 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xA2 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.byte 0xA5 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xA6 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xA7 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xA9 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xAA + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xAB + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xAC + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xAE + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.byte 0xAF + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xB0 + OVERLAY19_STRING_IDS_OFFSET, 0x45
|
||||
.global BAR_MAIN_MENU
|
||||
BAR_MAIN_MENU:
|
||||
.byte 0x88, 0x45, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x45, 0x00, 0x00
|
||||
.byte 0x02, 0x00, 0x00, 0x00, 0x8A, 0x45, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x88 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
|
||||
.byte 0x02, 0x00, 0x00, 0x00, 0x8A + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xFF, 0xFF, 0xFF, 0xFF
|
||||
.global BAR_SUBMENU_1
|
||||
BAR_SUBMENU_1:
|
||||
.byte 0x91, 0x45, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x92, 0x45, 0x00, 0x00
|
||||
.byte 0x02, 0x00, 0x00, 0x00, 0x93, 0x45, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x91 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x92 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
|
||||
.byte 0x02, 0x00, 0x00, 0x00, 0x93 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xFF, 0xFF, 0xFF, 0xFF
|
||||
.global BAR_SUBMENU_2
|
||||
BAR_SUBMENU_2:
|
||||
.byte 0x95, 0x45, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x96, 0x45, 0x00, 0x00
|
||||
.byte 0x05, 0x00, 0x00, 0x00, 0x97, 0x45, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x98, 0x45, 0x00, 0x00
|
||||
.byte 0x07, 0x00, 0x00, 0x00, 0x99, 0x45, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x95 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x96 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
|
||||
.byte 0x05, 0x00, 0x00, 0x00, 0x97 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x98 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
|
||||
.byte 0x07, 0x00, 0x00, 0x00, 0x99 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0xFF, 0xFF, 0xFF, 0xFF
|
||||
.global ov19_0238E2C0
|
||||
ov19_0238E2C0:
|
||||
|
|
|
|||
|
|
@ -3198,7 +3198,6 @@ _0238CC60:
|
|||
mov r2, #0
|
||||
bl sub_0200D670
|
||||
b _0238CC9C
|
||||
arm_func_end ov20_0238CC14
|
||||
_0238CC94:
|
||||
mov r0, #0
|
||||
b _0238CCB4
|
||||
|
|
@ -3206,9 +3205,6 @@ _0238CC9C:
|
|||
ldrb r0, [r6, #6]
|
||||
cmp r0, #0
|
||||
movne r0, #1
|
||||
|
||||
arm_func_start ov20_0238CCA8
|
||||
ov20_0238CCA8: ; 0x0238CCA8
|
||||
moveq r0, #0
|
||||
str r0, [r4]
|
||||
mov r0, r5
|
||||
|
|
@ -3216,8 +3212,8 @@ _0238CCB4:
|
|||
add sp, sp, #8
|
||||
ldmia sp!, {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
arm_func_end ov20_0238CCA8
|
||||
_0238CCBC: .word OVERLAY20_UNKNOWN_POINTER__NA_238D12C
|
||||
arm_func_end ov20_0238CC14
|
||||
|
||||
arm_func_start ov20_0238CCC0
|
||||
ov20_0238CCC0: ; 0x0238CCC0
|
||||
|
|
@ -3227,20 +3223,12 @@ ov20_0238CCC0: ; 0x0238CCC0
|
|||
ldr r0, [r1]
|
||||
bl ov20_0238CAE0
|
||||
cmp r0, #0
|
||||
arm_func_end ov20_0238CCC0
|
||||
|
||||
arm_func_start ov20_0238CCD8
|
||||
ov20_0238CCD8: ; 0x0238CCD8
|
||||
movle r0, #0
|
||||
ldmleia sp!, {r4, pc}
|
||||
ldr r0, _0238CD1C ; =OVERLAY20_UNKNOWN_POINTER__NA_238D12C
|
||||
ldr r0, [r0]
|
||||
bl ov20_0238CB28
|
||||
ldr r0, _0238CD1C ; =OVERLAY20_UNKNOWN_POINTER__NA_238D12C
|
||||
arm_func_end ov20_0238CCD8
|
||||
|
||||
arm_func_start ov20_0238CCF0
|
||||
ov20_0238CCF0: ; 0x0238CCF0
|
||||
ldr r0, [r0]
|
||||
ldrsb r0, [r0, #7]
|
||||
bl sub_0202F9B8
|
||||
|
|
@ -3254,7 +3242,7 @@ ov20_0238CCF0: ; 0x0238CCF0
|
|||
ldmia sp!, {r4, pc}
|
||||
.align 2, 0
|
||||
_0238CD1C: .word OVERLAY20_UNKNOWN_POINTER__NA_238D12C
|
||||
arm_func_end ov20_0238CCF0
|
||||
arm_func_end ov20_0238CCC0
|
||||
|
||||
arm_func_start ov20_0238CD20
|
||||
ov20_0238CD20: ; 0x0238CD20
|
||||
|
|
|
|||
|
|
@ -2386,7 +2386,7 @@ _0238C1A4: ; jump table
|
|||
b _0238CBD8 ; case 29
|
||||
b _0238CEFC ; case 30
|
||||
b _0238CC34 ; case 31
|
||||
b ov22_0238CC94 ; case 32
|
||||
b _0238CC94 ; case 32
|
||||
b _0238CCFC ; case 33
|
||||
b _0238CE20 ; case 34
|
||||
b _0238CD30 ; case 35
|
||||
|
|
@ -3092,25 +3092,17 @@ _0238CC34:
|
|||
ldr r1, [r1]
|
||||
strb r0, [r1, #0x4b]
|
||||
b _0238D510
|
||||
arm_func_end ov22_0238C184
|
||||
ov22_0238CC94:
|
||||
_0238CC94:
|
||||
ldr r0, _0238D200 ; =ov22_0238EB60
|
||||
bl DebugPrint0
|
||||
ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70
|
||||
ldr r2, _0238D118 ; =0x0000017F
|
||||
ldr r1, [r0]
|
||||
|
||||
arm_func_start ov22_0238CCA8
|
||||
ov22_0238CCA8: ; 0x0238CCA8
|
||||
str r2, [r1, #0x9c]
|
||||
ldr r0, [r0]
|
||||
ldrsb r0, [r0, #0x48]
|
||||
bl ShowDBox
|
||||
ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70
|
||||
arm_func_end ov22_0238CCA8
|
||||
|
||||
arm_func_start ov22_0238CCBC
|
||||
ov22_0238CCBC: ; 0x0238CCBC
|
||||
ldr r0, [r0]
|
||||
ldrsb r0, [r0, #0x48]
|
||||
bl sub_0202F2C4
|
||||
|
|
@ -3118,20 +3110,12 @@ ov22_0238CCBC: ; 0x0238CCBC
|
|||
ldr r0, [r0]
|
||||
ldrsb r0, [r0, #0x49]
|
||||
bl HidePortraitBox
|
||||
arm_func_end ov22_0238CCBC
|
||||
|
||||
arm_func_start ov22_0238CCD8
|
||||
ov22_0238CCD8: ; 0x0238CCD8
|
||||
mov r0, #4
|
||||
mov r1, #0
|
||||
mov r2, #8
|
||||
mov r3, #1
|
||||
bl sub_02042258
|
||||
ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70
|
||||
arm_func_end ov22_0238CCD8
|
||||
|
||||
arm_func_start ov22_0238CCF0
|
||||
ov22_0238CCF0: ; 0x0238CCF0
|
||||
ldr r1, [r1]
|
||||
strb r0, [r1, #0x4b]
|
||||
b _0238D510
|
||||
|
|
@ -3685,7 +3669,7 @@ _0238D518: .word ov22_0238EC00
|
|||
_0238D51C: .word ov22_0238EC10
|
||||
_0238D520: .word ov22_0238EC24
|
||||
_0238D524: .word ov22_0238EC38
|
||||
arm_func_end ov22_0238CCF0
|
||||
arm_func_end ov22_0238C184
|
||||
|
||||
arm_func_start ov22_0238D528
|
||||
ov22_0238D528: ; 0x0238D528
|
||||
|
|
|
|||
|
|
@ -2443,14 +2443,14 @@ _0238C4BC: ; jump table
|
|||
b _0238CAE8 ; case 28
|
||||
b _0238CBE8 ; case 29
|
||||
b _0238CC24 ; case 30
|
||||
b ov23_0238CCBC ; case 31
|
||||
b _0238CCBC ; case 31
|
||||
b _0238CFA0 ; case 32
|
||||
b _0238CFA0 ; case 33
|
||||
b _0238CD7C ; case 34
|
||||
b _0238CDCC ; case 35
|
||||
b _0238CFA0 ; case 36
|
||||
b _0238CC24 ; case 37
|
||||
b ov23_0238CCBC ; case 38
|
||||
b _0238CCBC ; case 38
|
||||
b _0238C864 ; case 39
|
||||
b _0238C8DC ; case 40
|
||||
b _0238CEE0 ; case 41
|
||||
|
|
@ -2951,28 +2951,17 @@ _0238CC7C:
|
|||
ldrsb r0, [r0, #0x95]
|
||||
bl sub_0202F2C4
|
||||
ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0
|
||||
arm_func_end ov23_0238C474
|
||||
|
||||
arm_func_start ov23_0238CC94
|
||||
ov23_0238CC94: ; 0x0238CC94
|
||||
mov r2, #5
|
||||
ldr r1, [r0]
|
||||
mov r3, #0x19
|
||||
str r2, [r1, #0x14]
|
||||
ldr r2, [r0]
|
||||
arm_func_end ov23_0238CC94
|
||||
|
||||
arm_func_start ov23_0238CCA8
|
||||
ov23_0238CCA8: ; 0x0238CCA8
|
||||
mov r1, #0x2c
|
||||
str r3, [r2, #0xc]
|
||||
ldr r0, [r0]
|
||||
str r1, [r0, #8]
|
||||
b _0238CFD0
|
||||
arm_func_end ov23_0238CCA8
|
||||
|
||||
arm_func_start ov23_0238CCBC
|
||||
ov23_0238CCBC: ; 0x0238CCBC
|
||||
_0238CCBC:
|
||||
ldrsb r0, [r1, #0x95]
|
||||
bl IsDBoxActive
|
||||
cmp r0, #0
|
||||
|
|
@ -2980,20 +2969,12 @@ ov23_0238CCBC: ; 0x0238CCBC
|
|||
ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0
|
||||
ldr r0, [r0]
|
||||
ldrsb r0, [r0, #0x99]
|
||||
arm_func_end ov23_0238CCBC
|
||||
|
||||
arm_func_start ov23_0238CCD8
|
||||
ov23_0238CCD8: ; 0x0238CCD8
|
||||
bl GetNormalMenuResult
|
||||
cmp r0, #1
|
||||
beq _0238CD30
|
||||
cmp r0, #4
|
||||
beq _0238CCF8
|
||||
cmp r0, #5
|
||||
arm_func_end ov23_0238CCD8
|
||||
|
||||
arm_func_start ov23_0238CCF0
|
||||
ov23_0238CCF0: ; 0x0238CCF0
|
||||
beq _0238CD30
|
||||
b _0238CFD0
|
||||
_0238CCF8:
|
||||
|
|
@ -3259,8 +3240,8 @@ _0238D088:
|
|||
ldmia sp!, {r3, r4, r5, pc}
|
||||
.align 2, 0
|
||||
_0238D090: .word OVERLAY23_UNKNOWN_POINTER__NA_238D8A0
|
||||
arm_func_end ov23_0238CCF0
|
||||
_0238D094: .word BAG_ITEMS_PTR_MIRROR
|
||||
arm_func_end ov23_0238C474
|
||||
|
||||
arm_func_start ov23_0238D098
|
||||
ov23_0238D098: ; 0x0238D098
|
||||
|
|
|
|||
|
|
@ -35,10 +35,6 @@ sub_027E0000: ; 0x027E0000
|
|||
ldr r1, _027E01AC ; =_027F7920
|
||||
mov r2, #0x20
|
||||
bl sub_037FC6AC
|
||||
arm_func_end sub_027E0000
|
||||
|
||||
arm_func_start sub_027E0078
|
||||
sub_027E0078: ; 0x027E0078
|
||||
ldr r1, _027E0190 ; =_027F7878
|
||||
ldr r0, _027E0198 ; =_027F78A0
|
||||
str r1, [r5, #0x10]
|
||||
|
|
@ -98,10 +94,6 @@ _027E0128:
|
|||
bl sub_037FD74C
|
||||
_027E0158:
|
||||
bl sub_037FE2B4
|
||||
arm_func_end sub_027E0078
|
||||
|
||||
arm_func_start sub_027E015C
|
||||
sub_027E015C: ; 0x027E015C
|
||||
ldr r1, _027E01C8 ; =sub_027E0244
|
||||
mov r0, #0xa
|
||||
bl sub_037FE39C
|
||||
|
|
@ -131,7 +123,7 @@ _027E01BC: .word _0380B2C0
|
|||
_027E01C0: .word sub_027E1CC0
|
||||
_027E01C4: .word _027F89A0
|
||||
_027E01C8: .word sub_027E0244
|
||||
arm_func_end sub_027E015C
|
||||
arm_func_end sub_027E0000
|
||||
|
||||
arm_func_start sub_027E01CC
|
||||
sub_027E01CC: ; 0x027E01CC
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user