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

Matched overlay 20 EU

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-11-13 23:35:31 -05:00
parent 48679add17
commit 912e35de44
1 changed files with 86 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
asm/overlay_20.s
View File

@ -245,7 +245,7 @@ _0238A3EC: ; jump table
b _0238AAEC ; case 28
b _0238AB70 ; case 29
b _0238AB80 ; case 30
b ov20_0238AB14 ; case 31
b _0238AB14 ; case 31
b _0238ABA8 ; case 32
b _0238ABC4 ; case 33
b _0238ABD4 ; case 34
@ -590,7 +590,11 @@ _0238A924:
add r0, sb, #0x30
bl InitPreprocessorArgs
ldr r1, [sb, #0x84]
#ifdef EUROPE
add r0, r6, #0xc
#else
mov r0, #0x4600
#endif
ldrsh r1, [r1]
str r1, [sb, #0x40]
bl ov20_0238B340
@ -729,7 +733,7 @@ _0238AAEC:
moveq r7, #0
strne r0, [sb, #0xc]
b _0238B05C
ov20_0238AB14:
_0238AB14:
ldr r0, [sb, #0x80]
cmp r0, #2
bne _0238AB24
@ -1180,17 +1184,29 @@ _0238B130:
b _0238B288
.align 2, 0
_0238B144: .word OVERLAY20_UNKNOWN_POINTER__NA_238D120
#ifdef EUROPE
_0238B148: .word 0x0000460D
_0238B14C: .word RECYCLE_MAIN_MENU_1
_0238B150: .word 0x0000460C
_0238B154: .word 0x00004613
#else
_0238B148: .word 0x000045EE
_0238B14C: .word RECYCLE_MAIN_MENU_1
_0238B150: .word 0x000045ED
_0238B154: .word 0x000045F4
#endif
_0238B158: .word RECYCLE_MENU_CONFIRM_1
_0238B15C: .word RECYCLE_SUBMENU_2
_0238B160: .word OVERLAY20_UNKNOWN_POINTER__NA_238CF7C
_0238B164: .word RECYCLE_MENU_CONFIRM_2
_0238B168: .word RECYCLE_SUBMENU_1
#ifdef EUROPE
_0238B16C: .word 0x00004632
_0238B170: .word 0x00004633
#else
_0238B16C: .word 0x00004613
_0238B170: .word 0x00004614
#endif
_0238B174:
add r0, sp, #0x18
bl ov11_0230CCF0
@ -1864,8 +1880,13 @@ _0238BA14:
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_0238BA30: .word OVERLAY20_UNKNOWN_POINTER__NA_238D124
#ifdef EUROPE
_0238BA34: .word 0x00004637
_0238BA38: .word 0x0000463B
#else
_0238BA34: .word 0x00004618
_0238BA38: .word 0x0000461C
#endif
_0238BA3C: .word 0x00000578
arm_func_end ov20_0238B8CC
@ -1900,7 +1921,11 @@ ov20_0238BA40: ; 0x0238BA40
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0238BAAC: .word OVERLAY20_UNKNOWN_POINTER__NA_238D124
#ifdef EUROPE
_0238BAB0: .word 0x00004636
#else
_0238BAB0: .word 0x00004617
#endif
arm_func_end ov20_0238BA40
arm_func_start ov20_0238BAB4
@ -1947,8 +1972,13 @@ ov20_0238BAB4: ; 0x0238BAB4
add sp, sp, #0x154
ldmia sp!, {r3, r4, pc}
.align 2, 0
#ifdef EUROPE
_0238BB58: .word 0x0000463D
_0238BB5C: .word 0x0000463E
#else
_0238BB58: .word 0x0000461E
_0238BB5C: .word 0x0000461F
#endif
arm_func_end ov20_0238BAB4
arm_func_start ov20_0238BB60
@ -2094,9 +2124,15 @@ _0238BCEC:
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
.align 2, 0
_0238BD80: .word OVERLAY20_UNKNOWN_POINTER__NA_238D128
#ifdef EUROPE
_0238BD84: .word 0x00004641
_0238BD88: .word 0x00004640
_0238BD8C: .word 0x0000463F
#else
_0238BD84: .word 0x00004622
_0238BD88: .word 0x00004621
_0238BD8C: .word 0x00004620
#endif
arm_func_end ov20_0238BB60
arm_func_start ov20_0238BD90
@ -2312,7 +2348,11 @@ _0238C07C:
ldrsh r4, [r1]
bl InitPreprocessorArgs
mov r2, #0
#ifdef EUROPE
add r0, r4, #0xd3
#else
add r0, r4, #0xd1
#endif
add r0, r0, #0x2900
mov r0, r0, lsl #0x10
mov r1, r0, lsr #0x10
@ -2898,7 +2938,11 @@ _0238C860:
ldr r0, _0238C9FC ; =0x0000FFFF
mov r1, #0
cmp r5, r0
#ifdef EUROPE
add r0, r4, #0xd3
#else
add r0, r4, #0xd1
#endif
str r1, [sp, #0x30]
addne r1, r5, #0xbc
add r0, r0, #0x2900
@ -3354,7 +3398,11 @@ _0238CE80:
.align 2, 0
_0238CE90: .word OVERLAY20_UNKNOWN_POINTER__NA_238D12C
_0238CE94: .word 0x0000032F
#ifdef EUROPE
_0238CE98: .word 0x00004642
#else
_0238CE98: .word 0x00004623
#endif
arm_func_end ov20_0238CE3C
arm_func_start ov20_0238CE9C
@ -3392,7 +3440,11 @@ ov20_0238CE9C: ; 0x0238CE9C
ldmia sp!, {r4, r5, pc}
.align 2, 0
_0238CF18: .word OVERLAY20_UNKNOWN_POINTER__NA_238D12C
#ifdef EUROPE
_0238CF1C: .word 0x00004646
#else
_0238CF1C: .word 0x00004627
#endif
arm_func_end ov20_0238CE9C
arm_func_start ov20_0238CF20
@ -3420,34 +3472,53 @@ ov20_0238CF20: ; 0x0238CF20
add sp, sp, #0x154
ldmia sp!, {r3, r4, pc}
.align 2, 0
#ifdef EUROPE
_0238CF78: .word 0x00004647
#else
_0238CF78: .word 0x00004628
#endif
arm_func_end ov20_0238CF20
; 0x0238CF7C
.global OVERLAY20_UNKNOWN_POINTER__NA_238CF7C
OVERLAY20_UNKNOWN_POINTER__NA_238CF7C:
#ifdef EUROPE
#define OV20_DATA_OFFSET 0x1F
#else
#define OV20_DATA_OFFSET 0
#endif
.word OVERLAY20_UNKNOWN_TABLE__NA_238D014
.byte 0x00, 0x00, 0x00, 0x00
.global RECYCLE_MENU_CONFIRM_1
RECYCLE_MENU_CONFIRM_1:
.byte 0x15, 0x46, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0x16, 0x46, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0x15 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0x16 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.global RECYCLE_MENU_CONFIRM_2
RECYCLE_MENU_CONFIRM_2:
.byte 0x15, 0x46, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x16, 0x46, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00
.byte 0x15 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x16 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.global RECYCLE_SUBMENU_1
RECYCLE_SUBMENU_1:
.byte 0x07, 0x46, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0x08, 0x46, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0x07 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0x08 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.global RECYCLE_SUBMENU_2
RECYCLE_SUBMENU_2:
.byte 0xF7, 0x45, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xF9, 0x45, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0xFA, 0x45, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.hword 0x45F7 + OV20_DATA_OFFSET
.byte 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.hword 0x45F9 + OV20_DATA_OFFSET
.byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.hword 0x45FA + OV20_DATA_OFFSET
.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.global RECYCLE_MAIN_MENU_1
RECYCLE_MAIN_MENU_1:
.byte 0xEF, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x45, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0xF1, 0x45, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xF2, 0x45, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.hword 0x45EF + OV20_DATA_OFFSET
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.hword 0x45F0 + OV20_DATA_OFFSET
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.hword 0x45F1 + OV20_DATA_OFFSET
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.hword 0x45F2 + OV20_DATA_OFFSET
.byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.global OVERLAY20_UNKNOWN_TABLE__NA_238D014
OVERLAY20_UNKNOWN_TABLE__NA_238D014:
@ -3479,8 +3550,8 @@ RECYCLE_D_BOX_LAYOUT_6:
.byte 0x16, 0x02, 0x08, 0x05, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global RECYCLE_MAIN_MENU_2
RECYCLE_MAIN_MENU_2:
.byte 0x24, 0x46, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x25, 0x46, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x26, 0x46, 0x00, 0x00
.byte 0x24 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x25 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x26 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.global RECYCLE_D_BOX_LAYOUT_7
RECYCLE_D_BOX_LAYOUT_7:
@ -3504,8 +3575,8 @@ RECYCLE_D_BOX_LAYOUT1_1:
.byte 0x02, 0x02, 0x12, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global RECYCLE_MAIN_MENU_3
RECYCLE_MAIN_MENU_3:
.byte 0x25, 0x46, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x26, 0x46, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x25 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x26 + OV20_DATA_OFFSET, 0x46, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.data