diff options
| -rw-r--r-- | asm/nohara_debug_menu.s | 16 | ||||
| -rw-r--r-- | data/debug_menu_nohara.s | 30 |
2 files changed, 35 insertions, 11 deletions
diff --git a/asm/nohara_debug_menu.s b/asm/nohara_debug_menu.s index 003f34798..1bc077b90 100644 --- a/asm/nohara_debug_menu.s +++ b/asm/nohara_debug_menu.s @@ -705,7 +705,7 @@ debug_sub_808F8CC: mov r2, #0x1a mov r3, #0x8 bl Menu_BlankWindowRect - ldr r0, ._69 + 8 @ gUnknown_Debug_083C4ABD + ldr r0, ._69 + 8 @ gUnknown_Debug_083C4ACC ldr r0, [r0] mov r1, #0xe mov r2, #0x7 @@ -736,7 +736,7 @@ debug_sub_808F8CC: ._69: .word gDebug_03000724 .word gUnknown_Debug_083C49CA - .word gUnknown_Debug_083C4ABD+0xf + .word gUnknown_Debug_083C4ACC .word gStringVar1 .word gMenuCallback .word debug_sub_808F93C+1 @@ -835,7 +835,7 @@ debug_sub_808F93C: mov r2, #0x1a mov r3, #0x8 bl Menu_BlankWindowRect - ldr r1, ._83 + 12 @ gUnknown_Debug_083C4ABD + ldr r1, ._83 + 12 @ gUnknown_Debug_083C4ACC ldr r0, ._83 + 8 @ gDebug_03000724 ldrb r0, [r0] lsl r0, r0, #0x2 @@ -891,7 +891,7 @@ debug_sub_808F93C: .word gMain .word gDebug_03000725 .word gDebug_03000724 - .word gUnknown_Debug_083C4ABD+0xf + .word gUnknown_Debug_083C4ACC .word gStringVar1 .word gUnknown_Debug_083C4ABD ._81: @@ -1431,7 +1431,7 @@ debug_sub_808FECC: mov r2, #0x17 mov r3, #0x8 bl Menu_BlankWindowRect - ldr r0, ._178 + 8 @ gUnknown_Debug_083C4B20 + ldr r0, ._178 + 8 @ gUnknown_Debug_083C4B24 ldr r0, [r0] mov r1, #0xe mov r2, #0x7 @@ -1462,7 +1462,7 @@ debug_sub_808FECC: ._178: .word gDebug_03000724 .word gUnknown_Debug_083C49CA - .word gUnknown_Debug_083C4B20+0x4 + .word gUnknown_Debug_083C4B24 .word gStringVar1 .word gMenuCallback .word debug_sub_808FF3C+1 @@ -1561,7 +1561,7 @@ debug_sub_808FF3C: mov r2, #0x17 mov r3, #0x8 bl Menu_BlankWindowRect - ldr r1, ._192 + 12 @ gUnknown_Debug_083C4B20 + ldr r1, ._192 + 12 @ gUnknown_Debug_083C4B24 ldr r0, ._192 + 8 @ gDebug_03000724 ldrb r0, [r0] lsl r0, r0, #0x2 @@ -1617,7 +1617,7 @@ debug_sub_808FF3C: .word gMain .word gDebug_03000725 .word gDebug_03000724 - .word gUnknown_Debug_083C4B20+0x4 + .word gUnknown_Debug_083C4B24 .word gStringVar1 .word gUnknown_Debug_083C4B20 ._190: diff --git a/data/debug_menu_nohara.s b/data/debug_menu_nohara.s index 269a0d550..8556d0ff4 100644 --- a/data/debug_menu_nohara.s +++ b/data/debug_menu_nohara.s @@ -97,7 +97,25 @@ gUnknown_Debug_083C4AAF:: @ 0x83C4AAF .string "BRAVO TRAINER$" gUnknown_Debug_083C4ABD:: @ 0x83C4ABD - .string "あいうるおかなにぬねのき んぼざくゅぼざくびぼざくサぼざくナぼざくミぼざくリぼざくュぼざくズぼざくベぼざく0ぼざく·ぼざくBIG SALE$" + .byte 1, 2, 3, 41, 5, 6, 21, 22, 23, 24, 25, 7, 0 + + .align 2 +gUnknown_Debug_083C4ACC:: + .4byte gUnknown_Debug_083C4A2E + .4byte gUnknown_Debug_083C4A35 + .4byte gUnknown_Debug_083C4A47 + .4byte gUnknown_Debug_083C4A5B + .4byte gUnknown_Debug_083C4A65 + .4byte gUnknown_Debug_083C4A70 + .4byte gUnknown_Debug_083C4A78 + .4byte gUnknown_Debug_083C4A85 + .4byte gUnknown_Debug_083C4A8E + .4byte gUnknown_Debug_083C4A99 + .4byte gUnknown_Debug_083C4AA1 + .4byte gUnknown_Debug_083C4AAF + +gDebugText_BigSale: + .string "BIG SALE$" gUnknown_Debug_083C4B05:: @ 0x83C4B05 .string "SERVICE DAY$" @@ -106,7 +124,13 @@ gUnknown_Debug_083C4B11:: @ 0x83C4B11 .string "CLEARーOUT SALE$" gUnknown_Debug_083C4B20:: @ 0x83C4B20 - .string "あいう {0xFC}ぼざくおぱざくちぱざく" + .byte 1, 2, 3, 0 + + .align 2 +gUnknown_Debug_083C4B24:: + .4byte gDebugText_BigSale + .4byte gUnknown_Debug_083C4B05 + .4byte gUnknown_Debug_083C4B11 gUnknown_Debug_083C4B30:: @ 0x83C4B30 .string "Secret type$" @@ -148,7 +172,7 @@ gUnknown_Debug_083C4B8C:: @ 0x83C4B8C .4byte gUnknown_Debug_083C4B80, debug_sub_80900AC+1 gUnknown_Debug_083C4BD4:: @ 0x83C4BD4 - .string "しえ しく しこ せか せく せこ たえ たか たこ つえ つか つこ " + .byte 0x0C, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_Debug_083C4C64:: @ 0x83C4C64 .string "TERUKUN$" |