diff --git a/asm/overlay_15.s b/asm/overlay_15.s index b2debb66..60e95137 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -242,7 +242,7 @@ ov15_0238A468: ; 0x0238A468 bl ov15_0238A4E8 b _0238A4D4 _0238A488: - ldr r0, _0238A4E4 ; =0x0238B0CC + ldr r0, _0238A4E4 ; =ov15_0238B0CC bl DebugPrint0 ldr r0, _0238A4DC ; =ov15_0238B180 ldr r0, [r0] @@ -269,7 +269,7 @@ _0238A4D4: .align 2, 0 _0238A4DC: .word ov15_0238B180 _0238A4E0: .word 0x00001308 -_0238A4E4: .word 0x0238B0CC +_0238A4E4: .word ov15_0238B0CC arm_func_end ov15_0238A468 arm_func_start ov15_0238A4E8 @@ -316,7 +316,7 @@ _0238A56C: beq _0238A5CC tst r1, #0x80 beq _0238A5CC - ldr r0, _0238AD18 ; =0x0238B0D4 + ldr r0, _0238AD18 ; =ov15_0238B0D4 and r1, r1, #0x1f strb r1, [r3, #0x68] bl DebugPrint0 @@ -363,7 +363,7 @@ _0238A608: bl ShowMessageInDBox b _0238AD08 _0238A634: - ldr r0, _0238AD24 ; =0x0238B08C + ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2 ldr r1, _0238AD28 ; =ov15_0238ADC4 bl sub_0202F8C4 ldr r1, _0238AD10 ; =ov15_0238B180 @@ -372,21 +372,21 @@ _0238A634: ldr r0, [r1] ldrsb r0, [r0, #0x80] bl ShowDBox - ldr r0, _0238AD2C ; =0x0238B0E0 + ldr r0, _0238AD2C ; =ov15_0238B0E0 bl DebugPrint0 mov r1, #4 - ldr r0, _0238AD30 ; =0x0238B0AC + ldr r0, _0238AD30 ; =BANK_D_BOX_LAYOUT_4 str r1, [sp] ldr r1, _0238AD34 ; =0x00300013 mov r2, #0 - ldr r3, _0238AD38 ; =0x0238B054 + ldr r3, _0238AD38 ; =BANK_MAIN_MENU bl CreateNormalMenu ldr r1, _0238AD10 ; =ov15_0238B180 ldr r1, [r1] strb r0, [r1, #0x83] b _0238AD08 _0238A68C: - ldr r0, _0238AD3C ; =0x0238B0E8 + ldr r0, _0238AD3C ; =ov15_0238B0E8 bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 ldr r0, [r0] @@ -418,7 +418,7 @@ _0238A68C: bl ShowMessageInDBox b _0238AD08 _0238A708: - ldr r0, _0238AD3C ; =0x0238B0E8 + ldr r0, _0238AD3C ; =ov15_0238B0E8 mov r1, #6 str r1, [r3, #8] bl DebugPrint0 @@ -461,7 +461,7 @@ _0238A790: bl ShowMessageInDBox b _0238AD08 _0238A7AC: - ldr r0, _0238AD4C ; =0x0238B0F4 + ldr r0, _0238AD4C ; =ov15_0238B0F4 bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 mov r2, #1 @@ -491,7 +491,7 @@ _0238A7AC: bl ShowMessageInDBox b _0238AD08 _0238A820: - ldr r0, _0238AD3C ; =0x0238B0E8 + ldr r0, _0238AD3C ; =ov15_0238B0E8 bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 ldr r0, [r0] @@ -582,7 +582,7 @@ _0238A95C: mov ip, #0x50 str r0, [r2, #0x58] ldr r2, [r1] - ldr r0, _0238AD5C ; =0x0238B10C + ldr r0, _0238AD5C ; =ov15_0238B10C str r3, [r2, #0x5c] ldr r3, [r1] mov r2, #0x12 @@ -592,7 +592,7 @@ _0238A95C: ldr r1, [r1] str r2, [r1, #0x78] bl DebugPrint0 - ldr r0, _0238AD24 ; =0x0238B08C + ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2 ldr r1, _0238AD28 ; =ov15_0238ADC4 bl sub_0202F8C4 ldr r1, _0238AD10 ; =ov15_0238B180 @@ -601,7 +601,7 @@ _0238A95C: ldr r1, _0238AD60 ; =0x00001017 strb r0, [r3, #0x82] str r2, [sp] - ldr r0, _0238AD64 ; =0x0238B09C + ldr r0, _0238AD64 ; =BANK_D_BOX_LAYOUT_3 ldr r3, _0238AD68 ; =ov15_0238AE6C str r2, [sp, #4] bl sub_020305B4 @@ -651,7 +651,7 @@ _0238AA08: bl ShowMessageInDBox b _0238AD08 _0238AA88: - ldr r0, _0238AD3C ; =0x0238B0E8 + ldr r0, _0238AD3C ; =ov15_0238B0E8 bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 ldr r0, [r0] @@ -746,7 +746,7 @@ _0238ABD4: mov ip, #0x50 str r0, [r2, #0x58] ldr r2, [r1] - ldr r0, _0238AD74 ; =0x0238B114 + ldr r0, _0238AD74 ; =ov15_0238B114 str r3, [r2, #0x5c] ldr r3, [r1] mov r2, #0x12 @@ -756,7 +756,7 @@ _0238ABD4: ldr r1, [r1] str r2, [r1, #0x78] bl DebugPrint0 - ldr r0, _0238AD24 ; =0x0238B08C + ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2 ldr r1, _0238AD28 ; =ov15_0238ADC4 bl sub_0202F8C4 ldr r1, _0238AD10 ; =ov15_0238B180 @@ -765,7 +765,7 @@ _0238ABD4: ldr r1, _0238AD60 ; =0x00001017 strb r0, [r3, #0x82] str r2, [sp] - ldr r0, _0238AD64 ; =0x0238B09C + ldr r0, _0238AD64 ; =BANK_D_BOX_LAYOUT_3 ldr r3, _0238AD68 ; =ov15_0238AE6C str r2, [sp, #4] bl sub_020305B4 @@ -823,30 +823,30 @@ _0238AD08: .align 2, 0 _0238AD10: .word ov15_0238B180 _0238AD14: .word 0x00003008 -_0238AD18: .word 0x0238B0D4 +_0238AD18: .word ov15_0238B0D4 _0238AD1C: .word 0x00000376 _0238AD20: .word 0x00000377 -_0238AD24: .word 0x0238B08C +_0238AD24: .word BANK_D_BOX_LAYOUT_2 _0238AD28: .word ov15_0238ADC4 -_0238AD2C: .word 0x0238B0E0 -_0238AD30: .word 0x0238B0AC +_0238AD2C: .word ov15_0238B0E0 +_0238AD30: .word BANK_D_BOX_LAYOUT_4 _0238AD34: .word 0x00300013 -_0238AD38: .word 0x0238B054 -_0238AD3C: .word 0x0238B0E8 +_0238AD38: .word BANK_MAIN_MENU +_0238AD3C: .word ov15_0238B0E8 _0238AD40: .word 0x00003018 _0238AD44: .word 0x00000379 _0238AD48: .word 0x0000037A -_0238AD4C: .word 0x0238B0F4 +_0238AD4C: .word ov15_0238B0F4 _0238AD50: .word 0x0000037B _0238AD54: .word 0x0098967F _0238AD58: .word 0x0000037E -_0238AD5C: .word 0x0238B10C +_0238AD5C: .word ov15_0238B10C _0238AD60: .word 0x00001017 -_0238AD64: .word 0x0238B09C +_0238AD64: .word BANK_D_BOX_LAYOUT_3 _0238AD68: .word ov15_0238AE6C _0238AD6C: .word 0x0001869F _0238AD70: .word 0x00000382 -_0238AD74: .word 0x0238B114 +_0238AD74: .word ov15_0238B114 arm_func_end ov15_0238A4E8 arm_func_start ov15_0238AD78 @@ -955,7 +955,7 @@ ov15_0238AE98: ; 0x0238AE98 mvn r0, #1 cmp r1, r0 beq _0238AEC4 - ldr r0, _0238AF44 ; =0x0238B11C + ldr r0, _0238AF44 ; =ov15_0238B11C bl DebugPrint0 _0238AEC4: ldr r1, _0238AF40 ; =ov15_0238B180 @@ -964,7 +964,7 @@ _0238AEC4: ldrsb r1, [r1, #0x82] cmp r1, r0 beq _0238AEE4 - ldr r0, _0238AF48 ; =0x0238B12C + ldr r0, _0238AF48 ; =ov15_0238B12C bl DebugPrint0 _0238AEE4: ldr r1, _0238AF40 ; =ov15_0238B180 @@ -973,7 +973,7 @@ _0238AEE4: ldrsb r1, [r1, #0x83] cmp r1, r0 beq _0238AF04 - ldr r0, _0238AF4C ; =0x0238B13C + ldr r0, _0238AF4C ; =ov15_0238B13C bl DebugPrint0 _0238AF04: ldr r1, _0238AF40 ; =ov15_0238B180 @@ -982,7 +982,7 @@ _0238AF04: ldrsb r1, [r1, #0x84] cmp r1, r0 beq _0238AF24 - ldr r0, _0238AF50 ; =0x0238B150 + ldr r0, _0238AF50 ; =ov15_0238B150 bl DebugPrint0 _0238AF24: ldr r0, _0238AF40 ; =ov15_0238B180 @@ -994,10 +994,10 @@ _0238AF24: ldmia sp!, {r3, pc} .align 2, 0 _0238AF40: .word ov15_0238B180 -_0238AF44: .word 0x0238B11C -_0238AF48: .word 0x0238B12C -_0238AF4C: .word 0x0238B13C -_0238AF50: .word 0x0238B150 +_0238AF44: .word ov15_0238B11C +_0238AF48: .word ov15_0238B12C +_0238AF4C: .word ov15_0238B13C +_0238AF50: .word ov15_0238B150 arm_func_end ov15_0238AE98 ; 0x0238AF54 @@ -1017,22 +1017,63 @@ _0238AF50: .word 0x0238B150 .byte 0x00, 0x20, 0x90, 0xE5, 0x05, 0x10, 0x43, 0xE2, 0x00, 0x30, 0x82, 0xE5, 0x00, 0x00, 0x90, 0xE5 .byte 0x80, 0x10, 0xC0, 0xE5, 0x02, 0x00, 0x00, 0xEA, 0x89, 0x6F, 0xFD, 0xEB, 0x04, 0x00, 0xA0, 0xE3 .byte 0x08, 0x80, 0xBD, 0xE8, 0x01, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x80, 0xB1, 0x38, 0x02 + .global BANK_MAIN_MENU +BANK_MAIN_MENU: .byte 0x6F, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x70, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0x71, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x72, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x1E, 0x05 - .byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x1C, 0x03 - .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x08, 0x0B, 0x07 - .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00 + .byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global BANK_D_BOX_LAYOUT_2 +BANK_D_BOX_LAYOUT_2: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x1C, 0x03 + .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global BANK_D_BOX_LAYOUT_3 +BANK_D_BOX_LAYOUT_3: + .byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x08, 0x0B, 0x07 + .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global BANK_D_BOX_LAYOUT_4 +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, 0x43, 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00 - .byte 0x52, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x2D, 0x4F, 0x70 - .byte 0x65, 0x6E, 0x0A, 0x00, 0x53, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov15_0238B0CC +ov15_0238B0CC: + .byte 0x43, 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00 + .global ov15_0238B0D4 +ov15_0238B0D4: + .byte 0x52, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00 + .global ov15_0238B0E0 +ov15_0238B0E0: + .byte 0x4D, 0x2D, 0x4F, 0x70 + .byte 0x65, 0x6E, 0x0A, 0x00 + .global ov15_0238B0E8 +ov15_0238B0E8: + .byte 0x53, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00 + .global ov15_0238B0F4 +ov15_0238B0F4: .byte 0x4D, 0x65, 0x6E, 0x75, 0x5F, 0x42, 0x61, 0x6E, 0x6B, 0x5F, 0x4D, 0x6F, 0x64, 0x65, 0x5F, 0x43 - .byte 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00, 0x00, 0x50, 0x2D, 0x4F, 0x70, 0x65, 0x6E, 0x0A, 0x00 - .byte 0x47, 0x2D, 0x4F, 0x70, 0x65, 0x6E, 0x0A, 0x00, 0x6D, 0x65, 0x73, 0x20, 0x6E, 0x6F, 0x74, 0x20 - .byte 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x73, 0x75, 0x62, 0x20, 0x6E, 0x6F, 0x74, 0x20 - .byte 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x73, 0x65, 0x6C, 0x65, 0x63, 0x74, 0x20, 0x6E - .byte 0x6F, 0x74, 0x20, 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x49, 0x6E, 0x70, 0x75 + .byte 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00, 0x00 + .global ov15_0238B10C +ov15_0238B10C: + .byte 0x50, 0x2D, 0x4F, 0x70, 0x65, 0x6E, 0x0A, 0x00 + .global ov15_0238B114 +ov15_0238B114: + .byte 0x47, 0x2D, 0x4F, 0x70, 0x65, 0x6E, 0x0A, 0x00 + .global ov15_0238B11C +ov15_0238B11C: + .byte 0x6D, 0x65, 0x73, 0x20, 0x6E, 0x6F, 0x74, 0x20 + .byte 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00 + .global ov15_0238B12C +ov15_0238B12C: + .byte 0x73, 0x75, 0x62, 0x20, 0x6E, 0x6F, 0x74, 0x20 + .byte 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00 + .global ov15_0238B13C +ov15_0238B13C: + .byte 0x73, 0x65, 0x6C, 0x65, 0x63, 0x74, 0x20, 0x6E + .byte 0x6F, 0x74, 0x20, 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00 + .global ov15_0238B150 +ov15_0238B150: + .byte 0x49, 0x6E, 0x70, 0x75 .byte 0x74, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00 .data