Matched overlay 19 JP

This commit is contained in:
AnonymousRandomPerson 2024-06-20 18:24:04 -05:00
parent 7e01f55d9a
commit ed7aaf46cd

View File

@ -678,12 +678,16 @@ _0238AA08:
bl InitPreprocessorArgs
str r5, [sp, #0x988]
ldrh r1, [r4, #2]
#ifdef EUROPE
#if defined(EUROPE)
add r0, r5, #0xd3
add r0, r0, #0x2900
#elif defined(JAPAN)
add r0, r5, #0xce
add r0, r0, #0x4100
#else
add r0, r5, #0xd1
#endif
add r0, r0, #0x2900
#endif
str r1, [sp, #0x99c]
ldrh r1, [r4, #2]
mov r2, #0
@ -1380,8 +1384,10 @@ _0238B3B4:
str r0, [r8]
b _0238C598
.align 2, 0
#ifdef EUROPE
#if defined(EUROPE)
#define OV19_0238A4A4_OFFSET 0x1F
#elif defined(JAPAN)
#define OV19_0238A4A4_OFFSET -0xC1C
#else
#define OV19_0238A4A4_OFFSET 0
#endif
@ -1403,7 +1409,11 @@ _0238B45C: .word 0x00003F02
_0238B460: .word 0x00004594 + OV19_0238A4A4_OFFSET
_0238B464: .word BAR_WINDOW_PARAMS_2
_0238B468: .word 0x00001013
#ifdef JAPAN
_0238B46C: .word 0x00001D3C
#else
_0238B46C: .word 0x000008E4
#endif
_0238B470: .word BAR_WINDOW_PARAMS_3
_0238B474: .word BAR_SUBMENU_ITEMS_2
_0238B478: .word BAR_MENU_ITEMS_CONFIRM_1
@ -1444,11 +1454,19 @@ _0238B4A4:
_0238B4F8:
add r0, sp, #0x610
bl InitPreprocessorArgs
#ifdef JAPAN
ldr r1, [r8, #0xd4]
mov r0, #0x1c
orr r3, r1, #0x20000
add r2, sp, #0x610
rsb r1, r0, #0x39c0
#else
ldr r0, [r8, #0xd4]
ldr r1, _0238C488 ; =0x000045C0
orr r3, r0, #0x20000
add r2, sp, #0x610
mov r0, #0x1c
#endif
str r3, [sp, #0x610]
bl sub_02046BE8
mov r0, #0x25
@ -2316,7 +2334,11 @@ _0238C174:
_0238C180:
bl ov19_0238D450
ldr r1, _0238C4F4 ; =BAR_MENU_ITEMS_CONFIRM_2
#ifdef JAPAN
mov r0, #0x39c0
#else
ldr r0, _0238C4F8 ; =0x000045DC
#endif
str r1, [sp]
str r0, [sp, #4]
add r4, sp, #0x398
@ -2526,6 +2548,7 @@ _0238C46C:
_0238C480:
bl ov19_0238D310
b _0238C598
#ifndef JAPAN
.align 2, 0
_0238C488: .word 0x000045C0 + OV19_0238A4A4_OFFSET
_0238C48C: .word OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238
@ -2564,6 +2587,7 @@ _0238C504: .word 0x000045DF + OV19_0238A4A4_OFFSET
#ifndef EUROPE
_0238C508: .word 0x000045E1 + OV19_0238A4A4_OFFSET
#endif
#endif
_0238C50C:
bl sub_02046C78
cmp r0, #0
@ -2592,6 +2616,40 @@ _0238C558:
mov r1, #0
strh r1, [r0]
b _0238C598
#ifdef JAPAN
.align 2, 0
_0238C48C: .word OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238
_0238C490: .word 0x00003996
_0238C494: .word ov19_0238E18A
_0238C498: .word ov19_0238E17E
_0238C49C: .word ov19_0238E190
_0238C4A0: .word 0x0000399D
_0238C4A4: .word 0x000039BA
_0238C4A8: .word 0x000039BB
_0238C4AC: .word 0x000039B8
_0238C4B0: .word 0x000039B9
_0238C4B4: .word 0x0000068A
_0238C4B8: .word 0x000039C7
_0238C4BC: .word 0x000039C8
_0238C4C0: .word 0x000039C9
_0238C4C4: .word 0x000039CA
_0238C4C8: .word OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC
_0238C4CC: .word ov19_0238E2C0
_0238C4D0: .word 0x000039CB
_0238C4D4: .word 0x000039A5
_0238C4D8: .word 0x000039BD
_0238C4DC: .word 0x000039BE
_0238C4E0: .word ov19_0238E1BC
_0238C4E4: .word ov19_0238E1C4
_0238C4E8: .word 0x000039BF
_0238C4EC: .word OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4
_0238C4F0: .word ov19_0238E1AC
_0238C4F4: .word BAR_MENU_ITEMS_CONFIRM_2
_0238C4FC: .word ov19_0238E1B4
_0238C500: .word 0x00000163
_0238C504: .word 0x000039C3
_0238C508: .word 0x000039C5
#endif
_0238C570:
add r0, r8, #0x100
ldrsh r1, [r0]
@ -2869,9 +2927,12 @@ _0238C8E8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
.align 2, 0
_0238C8F4: .word ov11_02324DB0
#ifdef EUROPE
#if defined(EUROPE)
_0238C8F8: .word 0x00004608
_0238C8FC: .word 0x00004607
#elif defined(JAPAN)
_0238C8F8: .word 0x000039CD
_0238C8FC: .word 0x000039CC
#else
_0238C8F8: .word 0x000045E9
_0238C8FC: .word 0x000045E8
@ -2939,9 +3000,12 @@ ov19_0238C900: ; 0x0238C900
.align 2, 0
_0238C9E0: .word ov11_02324DB0
_0238C9E4: .word OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC
#ifdef EUROPE
#if defined(EUROPE)
_0238C9E8: .word 0x0000460A
_0238C9EC: .word 0x00004609
#elif defined(JAPAN)
_0238C9E8: .word 0x000039CF
_0238C9EC: .word 0x000039CE
#else
_0238C9E8: .word 0x000045EB
_0238C9EC: .word 0x000045EA
@ -3030,8 +3094,10 @@ _0238CABC:
.align 2, 0
_0238CB20: .word ov11_02324DB0
_0238CB24: .word 0x0000068A
#ifdef EUROPE
#if defined(EUROPE)
_0238CB28: .word 0x000045F7
#elif defined(JAPAN)
_0238CB28: .word 0x000039BC
#else
_0238CB28: .word 0x000045D8
#endif
@ -3076,8 +3142,10 @@ ov19_0238CB2C: ; 0x0238CB2C
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0238CBB8: .word ov11_02324DB0
#ifdef EUROPE
#if defined(EUROPE)
_0238CBBC: .word 0x0000460B
#elif defined(JAPAN)
_0238CBBC: .word 0x000039D0
#else
_0238CBBC: .word 0x000045EC
#endif
@ -3168,8 +3236,10 @@ _0238CCC4:
_0238CCDC: .word ov11_02324DB0
_0238CCE0: .word ov19_0238E2C0
_0238CCE4: .word ov19_0238E2C4
#ifdef EUROPE
#if defined(EUROPE)
_0238CCE8: .word 0x00004601
#elif defined(JAPAN)
_0238CCE8: .word 0x000039C6
#else
_0238CCE8: .word 0x000045E2
#endif
@ -3610,8 +3680,10 @@ _0238D300:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0238D308: .word ov11_02324DB0
#ifdef EUROPE
#if defined(EUROPE)
_0238D30C: .word 0x000045FF
#elif defined(JAPAN)
_0238D30C: .word 0x000039C4
#else
_0238D30C: .word 0x000045E0
#endif
@ -4365,32 +4437,35 @@ 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:
#ifdef EUROPE
#if defined(EUROPE)
#define OVERLAY19_STRING_IDS_OFFSET 0x1F
#elif defined(JAPAN)
#define OVERLAY19_STRING_IDS_OFFSET -0xC1C
#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
.hword 0x45CA + OVERLAY19_STRING_IDS_OFFSET, 0x45C6 + OVERLAY19_STRING_IDS_OFFSET
.hword 0x45C2 + OVERLAY19_STRING_IDS_OFFSET
.global ov19_0238E17E
ov19_0238E17E:
.byte 0xB6 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xB7 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xB8 + OVERLAY19_STRING_IDS_OFFSET, 0x45
.hword 0x45B6 + OVERLAY19_STRING_IDS_OFFSET, 0x45B7 + OVERLAY19_STRING_IDS_OFFSET, 0x45B8 + OVERLAY19_STRING_IDS_OFFSET
.global ov19_0238E184
ov19_0238E184:
.byte 0xCB + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC7 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC3 + OVERLAY19_STRING_IDS_OFFSET, 0x45
.hword 0x45CB + OVERLAY19_STRING_IDS_OFFSET, 0x45C7 + OVERLAY19_STRING_IDS_OFFSET, 0x45C3 + OVERLAY19_STRING_IDS_OFFSET
.global ov19_0238E18A
ov19_0238E18A:
.byte 0xB3 + OVERLAY19_STRING_IDS_OFFSET, 0x45
.byte 0xB4 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xB5 + OVERLAY19_STRING_IDS_OFFSET, 0x45
.hword 0x45B3 + OVERLAY19_STRING_IDS_OFFSET
.hword 0x45B4 + OVERLAY19_STRING_IDS_OFFSET, 0x45B5 + OVERLAY19_STRING_IDS_OFFSET
.global ov19_0238E190
ov19_0238E190:
.byte 0xB9 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xBA + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xBB + OVERLAY19_STRING_IDS_OFFSET, 0x45
.hword 0x45B9 + OVERLAY19_STRING_IDS_OFFSET, 0x45BA + OVERLAY19_STRING_IDS_OFFSET, 0x45BB + OVERLAY19_STRING_IDS_OFFSET
.global ov19_0238E196
ov19_0238E196:
.byte 0xCD + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC9 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC5 + OVERLAY19_STRING_IDS_OFFSET, 0x45
.hword 0x45CD + OVERLAY19_STRING_IDS_OFFSET, 0x45C9 + OVERLAY19_STRING_IDS_OFFSET, 0x45C5 + OVERLAY19_STRING_IDS_OFFSET
.global ov19_0238E19C
ov19_0238E19C:
.byte 0xCC + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC8 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0xC4 + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
.hword 0x45CC + OVERLAY19_STRING_IDS_OFFSET, 0x45C8 + OVERLAY19_STRING_IDS_OFFSET, 0x45C4 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x00, 0x00
.global OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4
OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4:
.byte 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
@ -4408,7 +4483,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 + 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
.hword 0x45CE + OVERLAY19_STRING_IDS_OFFSET, 0x45CF + OVERLAY19_STRING_IDS_OFFSET, 0x45D0 + OVERLAY19_STRING_IDS_OFFSET, 0x45D1 + OVERLAY19_STRING_IDS_OFFSET, 0x45D2 + OVERLAY19_STRING_IDS_OFFSET, 0x45D3 + OVERLAY19_STRING_IDS_OFFSET
.global BAR_WINDOW_PARAMS_1
BAR_WINDOW_PARAMS_1:
.byte 0x00, 0x00, 0x00, 0x00
@ -4423,33 +4498,52 @@ BAR_WINDOW_PARAMS_3:
.byte 0x14, 0x02, 0x0A, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global BAR_MENU_ITEMS_CONFIRM_1
BAR_MENU_ITEMS_CONFIRM_1:
.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
.word 0x459B + OVERLAY19_STRING_IDS_OFFSET
.byte 0x08, 0x00, 0x00, 0x00
.word 0x459C + OVERLAY19_STRING_IDS_OFFSET
.byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xFF, 0xFF, 0xFF, 0xFF
.global BAR_MENU_ITEMS_CONFIRM_2
BAR_MENU_ITEMS_CONFIRM_2:
.byte 0xDD + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xDE + OVERLAY19_STRING_IDS_OFFSET, 0x45, 0x00, 0x00
.word 0x45DD + OVERLAY19_STRING_IDS_OFFSET
.byte 0x08, 0x00, 0x00, 0x00
.word 0x45DE + OVERLAY19_STRING_IDS_OFFSET
.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 + 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
.hword 0x45A0 + OVERLAY19_STRING_IDS_OFFSET, 0x45A2 + OVERLAY19_STRING_IDS_OFFSET
.hword 0x45A5 + OVERLAY19_STRING_IDS_OFFSET, 0x45A6 + OVERLAY19_STRING_IDS_OFFSET, 0x45A7 + OVERLAY19_STRING_IDS_OFFSET, 0x45A9 + OVERLAY19_STRING_IDS_OFFSET, 0x45AA + OVERLAY19_STRING_IDS_OFFSET, 0x45AB + OVERLAY19_STRING_IDS_OFFSET, 0x45AC + OVERLAY19_STRING_IDS_OFFSET, 0x45AE + OVERLAY19_STRING_IDS_OFFSET
.hword 0x45AF + OVERLAY19_STRING_IDS_OFFSET, 0x45B0 + OVERLAY19_STRING_IDS_OFFSET
.global BAR_MAIN_MENU_ITEMS
BAR_MAIN_MENU_ITEMS:
.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
.word 0x4588 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x01, 0x00, 0x00, 0x00
.word 0x4589 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x02, 0x00, 0x00, 0x00
.word 0x458A + OVERLAY19_STRING_IDS_OFFSET
.byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xFF, 0xFF, 0xFF, 0xFF
.global BAR_SUBMENU_ITEMS_1
BAR_SUBMENU_ITEMS_1:
.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
.word 0x4591 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x03, 0x00, 0x00, 0x00
.word 0x4592 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x02, 0x00, 0x00, 0x00
.word 0x4593 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xFF, 0xFF, 0xFF, 0xFF
.global BAR_SUBMENU_ITEMS_2
BAR_SUBMENU_ITEMS_2:
.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
.word 0x4595 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x04, 0x00, 0x00, 0x00
.word 0x4596 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x05, 0x00, 0x00, 0x00
.word 0x4597 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x06, 0x00, 0x00, 0x00
.word 0x4598 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x07, 0x00, 0x00, 0x00
.word 0x4599 + OVERLAY19_STRING_IDS_OFFSET
.byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xFF, 0xFF, 0xFF, 0xFF
.global ov19_0238E2C0
ov19_0238E2C0: