diff --git a/asm/overlay_00.s b/asm/overlay_00.s index addeb05d..c1115a6f 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -108525,7 +108525,7 @@ ov00_023181D0: .byte 0x00, 0x00, 0x00, 0x00 .word ov00_02318B00 .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x61, 0x61, 0x61 + .byte 0x00, 0x00, 0x00, 0x00, 0x61, 0x61, 0x61 .global ov00_0231822B ov00_0231822B: .byte 0x17, 0x14, 0x11, 0x0d, 0x0b, 0x06, 0x0f, 0x0e, 0x09 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index ecbedbb7..8ab0dc6f 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -22740,18 +22740,45 @@ ov01_0233B558: .word ov01_02331784 .global CONTINUE_CHOICE CONTINUE_CHOICE: +#ifdef JAPAN + .byte 0x08, 0x04, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x04, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 + .byte 0x0E, 0x04, 0x00, 0x00 +#else .byte 0xE0, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xE1, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0xE6, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 + .byte 0xE6, 0x01, 0x00, 0x00 +#endif + .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 .global SUBMENU SUBMENU: - .byte 0x02, 0x00, 0x00, 0x00, 0xB5, 0x01, 0xB6, 0x01, 0x14, 0x00, 0x00, 0x00, 0xD5, 0x01, 0xD6, 0x01 + .byte 0x02, 0x00, 0x00, 0x00 +#ifdef JAPAN + .byte 0xDD, 0x03, 0xDE, 0x03, 0x14, 0x00, 0x00, 0x00, 0xFD, 0x03, 0xFE, 0x03 + .byte 0x08, 0x00, 0x00, 0x00, 0xE7, 0x03, 0xE8, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE9, 0x03, 0xEA, 0x03 + .byte 0x18, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x04, 0x07, 0x00, 0x00, 0x00, 0xE5, 0x03, 0xE6, 0x03 + .byte 0x10, 0x00, 0x00, 0x00, 0xF5, 0x03, 0xF6, 0x03, 0x21, 0x00, 0x00, 0x00, 0x05, 0x04, 0x06, 0x04 +#else + .byte 0xB5, 0x01, 0xB6, 0x01, 0x14, 0x00, 0x00, 0x00, 0xD5, 0x01, 0xD6, 0x01 .byte 0x08, 0x00, 0x00, 0x00, 0xBF, 0x01, 0xC0, 0x01, 0x09, 0x00, 0x00, 0x00, 0xC1, 0x01, 0xC2, 0x01 .byte 0x18, 0x00, 0x00, 0x00, 0xDB, 0x01, 0xDC, 0x01, 0x07, 0x00, 0x00, 0x00, 0xBD, 0x01, 0xBE, 0x01 .byte 0x10, 0x00, 0x00, 0x00, 0xCD, 0x01, 0xCE, 0x01, 0x21, 0x00, 0x00, 0x00, 0xDD, 0x01, 0xDE, 0x01 +#endif .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global MAIN_MENU MAIN_MENU: - .byte 0x02, 0x00, 0x00, 0x00, 0xB5, 0x01, 0xB6, 0x01 + .byte 0x02, 0x00, 0x00, 0x00 +#ifdef JAPAN + .byte 0xDD, 0x03, 0xDE, 0x03 + .byte 0x07, 0x00, 0x00, 0x00, 0xE5, 0x03, 0xE6, 0x03, 0x03, 0x00, 0x00, 0x00, 0xDF, 0x03, 0xE0, 0x03 + .byte 0x1A, 0x00, 0x00, 0x00, 0xE1, 0x03, 0xE2, 0x03, 0x1B, 0x00, 0x00, 0x00, 0xE1, 0x03, 0xE2, 0x03 + .byte 0x0A, 0x00, 0x00, 0x00, 0xEB, 0x03, 0xEC, 0x03, 0x0B, 0x00, 0x00, 0x00, 0xED, 0x03, 0xEE, 0x03 + .byte 0x0C, 0x00, 0x00, 0x00, 0xEF, 0x03, 0xF0, 0x03, 0x0D, 0x00, 0x00, 0x00, 0xE3, 0x03, 0xE4, 0x03 + .byte 0x0E, 0x00, 0x00, 0x00, 0xF1, 0x03, 0xF2, 0x03, 0x0F, 0x00, 0x00, 0x00, 0xF3, 0x03, 0xF4, 0x03 + .byte 0x11, 0x00, 0x00, 0x00, 0xF7, 0x03, 0xF8, 0x03, 0x12, 0x00, 0x00, 0x00, 0xF9, 0x03, 0xFA, 0x03 + .byte 0x13, 0x00, 0x00, 0x00, 0xFB, 0x03, 0xFC, 0x03, 0x19, 0x00, 0x00, 0x00, 0xDB, 0x03, 0xDC, 0x03 + .byte 0x1C, 0x00, 0x00, 0x00, 0x0A, 0x04, 0x0C, 0x04, 0x1D, 0x00, 0x00, 0x00, 0x0B, 0x04, 0x0C, 0x04 + .byte 0x1E, 0x00, 0x00, 0x00, 0x0A, 0x04, 0x0D, 0x04, 0x1F, 0x00, 0x00, 0x00, 0x0B, 0x04, 0x0D, 0x04 +#else + .byte 0xB5, 0x01, 0xB6, 0x01 .byte 0x07, 0x00, 0x00, 0x00, 0xBD, 0x01, 0xBE, 0x01, 0x03, 0x00, 0x00, 0x00, 0xB7, 0x01, 0xB8, 0x01 .byte 0x1A, 0x00, 0x00, 0x00, 0xB9, 0x01, 0xBA, 0x01, 0x1B, 0x00, 0x00, 0x00, 0xB9, 0x01, 0xBA, 0x01 .byte 0x0A, 0x00, 0x00, 0x00, 0xC3, 0x01, 0xC4, 0x01, 0x0B, 0x00, 0x00, 0x00, 0xC5, 0x01, 0xC6, 0x01 @@ -22761,6 +22788,7 @@ MAIN_MENU: .byte 0x13, 0x00, 0x00, 0x00, 0xD3, 0x01, 0xD4, 0x01, 0x19, 0x00, 0x00, 0x00, 0xB3, 0x01, 0xB4, 0x01 .byte 0x1C, 0x00, 0x00, 0x00, 0xE2, 0x01, 0xE4, 0x01, 0x1D, 0x00, 0x00, 0x00, 0xE3, 0x01, 0xE4, 0x01 .byte 0x1E, 0x00, 0x00, 0x00, 0xE2, 0x01, 0xE5, 0x01, 0x1F, 0x00, 0x00, 0x00, 0xE3, 0x01, 0xE5, 0x01 +#endif .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov01_0233B670 ov01_0233B670: @@ -22773,11 +22801,20 @@ ov01_0233B678: .global ov01_0233B6A4 ov01_0233B6A4: .byte 0x5B, 0x4D, 0x3A, 0x53 +#ifdef JAPAN + .byte 0x33, 0x5D, 0x00, 0x00 +#else .byte 0x33, 0x5D, 0x5B, 0x53, 0x3A, 0x35, 0x5D, 0x00 +#endif .global ov01_0233B6B0 ov01_0233B6B0: - .byte 0x5B, 0x4D, 0x3A, 0x52, 0x37, 0x5D, 0x5B, 0x53 + .byte 0x5B, 0x4D, 0x3A, 0x52 +#ifdef JAPAN + .byte 0x37, 0x5D, 0x00, 0x00 +#else + .byte 0x37, 0x5D, 0x5B, 0x53 .byte 0x3A, 0x35, 0x5D, 0x00 +#endif .global ov01_0233B6BC ov01_0233B6BC: .byte 0x5B, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3A, 0x30, 0x5D, 0x5B, 0x43 @@ -22808,7 +22845,11 @@ MAIN_MENU_WINDOW_PARAMS_7: .byte 0x00, 0x00, 0x00, 0x00 .global MAIN_MENU_ITEMS_CONFIRM MAIN_MENU_ITEMS_CONFIRM: +#ifdef JAPAN + .byte 0x21, 0x24, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x22, 0x24, 0x00, 0x00 +#else .byte 0xF7, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x00, 0x00 +#endif .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .global ov01_0233B764 ov01_0233B764: @@ -22850,13 +22891,35 @@ ov01_0233B800: .word ov01_02333A34 .global MAIN_DEBUG_MENU_ITEMS_1 MAIN_DEBUG_MENU_ITEMS_1: - .byte 0xEB, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0xEC, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xEE, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .byte 0xEF, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xF0, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 - .byte 0xF1, 0x01, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xF2, 0x01, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00 - .byte 0xF3, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00 - .byte 0xF5, 0x01, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0xF6, 0x01, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 +#ifdef JAPAN +#define MAIN_DEBUG_MENU_1_OFFSET 0x228 +#else +#define MAIN_DEBUG_MENU_1_OFFSET 0 +#endif + .word 0x1EB + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x02, 0x00, 0x00, 0x00 + .word 0x1EC + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x03, 0x00, 0x00, 0x00 + .word 0x1EE + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x05, 0x00, 0x00, 0x00 + .word 0x1EF + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x06, 0x00, 0x00, 0x00 + .word 0x1F0 + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x07, 0x00, 0x00, 0x00 + .word 0x1F1 + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x08, 0x00, 0x00, 0x00 + .word 0x1F2 + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x09, 0x00, 0x00, 0x00 + .word 0x1F3 + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x0A, 0x00, 0x00, 0x00 + .word 0x1F4 + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x0B, 0x00, 0x00, 0x00 + .word 0x1F5 + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x0C, 0x00, 0x00, 0x00 + .word 0x1F6 + MAIN_DEBUG_MENU_1_OFFSET + .byte 0x0D, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00 .global MAIN_MENU_WINDOW_PARAMS_10 MAIN_MENU_WINDOW_PARAMS_10: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00 @@ -22869,15 +22932,25 @@ ov01_0233B880: .word ov01_02333CB8 .global MAIN_DEBUG_MENU_ITEMS_2 MAIN_DEBUG_MENU_ITEMS_2: -#ifdef EUROPE +#if defined(EUROPE) #define MAIN_DEBUG_MENU_2_OFFSET 2 +#elif defined(JAPAN) +#define MAIN_DEBUG_MENU_2_OFFSET -0x379B #else #define MAIN_DEBUG_MENU_2_OFFSET 0 #endif - .byte 0x86 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x87 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x88 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x89 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0x85 + MAIN_DEBUG_MENU_2_OFFSET, 0x3C, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 + .word 0x3C86 + MAIN_DEBUG_MENU_2_OFFSET + .byte 0x01, 0x00, 0x00, 0x00 + .word 0x3C87 + MAIN_DEBUG_MENU_2_OFFSET + .byte 0x02, 0x00, 0x00, 0x00 + .word 0x3C88 + MAIN_DEBUG_MENU_2_OFFSET + .byte 0x03, 0x00, 0x00, 0x00 + .word 0x3C89 + MAIN_DEBUG_MENU_2_OFFSET + .byte 0x04, 0x00, 0x00, 0x00 + .word 0x3C84 + MAIN_DEBUG_MENU_2_OFFSET + .byte 0x06, 0x00, 0x00, 0x00 + .word 0x3C85 + MAIN_DEBUG_MENU_2_OFFSET + .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 .global ov01_0233B8C8 ov01_0233B8C8: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x0C, 0x1C, 0x07, 0x01, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -22889,6 +22962,40 @@ ov01_0233B8E8: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x08, 0x01, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov01_0233B8F8 ov01_0233B8F8: +#ifdef JAPAN + .byte 0xDC, 0x3B, 0xDD, 0x3B, 0xDE, 0x3B, 0xDF, 0x3B + .byte 0xE0, 0x3B, 0xE1, 0x3B, 0xE2, 0x3B, 0xE3, 0x3B, 0xE4, 0x3B, 0xE5, 0x3B, 0xE6, 0x3B, 0xE7, 0x3B + .byte 0xE8, 0x3B, 0xE9, 0x3B, 0xEA, 0x3B, 0xEB, 0x3B, 0xEC, 0x3B, 0xED, 0x3B, 0xEE, 0x3B, 0xEF, 0x3B + .byte 0xF0, 0x3B, 0xF1, 0x3B, 0xF2, 0x3B, 0xF3, 0x3B, 0xF4, 0x3B, 0xF5, 0x3B, 0xF6, 0x3B, 0xF7, 0x3B + .byte 0xF8, 0x3B, 0xF9, 0x3B, 0xFA, 0x3B, 0xFB, 0x3B, 0xFC, 0x3B, 0xFD, 0x3B, 0xFE, 0x3B, 0xFF, 0x3B + .byte 0x00, 0x3C, 0x01, 0x3C, 0x02, 0x3C, 0x03, 0x3C, 0x04, 0x3C, 0x05, 0x3C, 0x06, 0x3C, 0x07, 0x3C + .byte 0x08, 0x3C, 0x09, 0x3C, 0x0A, 0x3C, 0x0B, 0x3C, 0x0C, 0x3C, 0x0D, 0x3C, 0x0E, 0x3C, 0x0F, 0x3C + .byte 0x10, 0x3C, 0x11, 0x3C, 0x12, 0x3C, 0x13, 0x3C, 0x14, 0x3C, 0x15, 0x3C, 0x16, 0x3C, 0x17, 0x3C + .byte 0x18, 0x3C, 0x19, 0x3C, 0x1A, 0x3C, 0x1B, 0x3C, 0x1C, 0x3C, 0x1D, 0x3C, 0x1E, 0x3C, 0x1F, 0x3C + .byte 0x20, 0x3C, 0x21, 0x3C, 0x22, 0x3C, 0x23, 0x3C, 0x24, 0x3C, 0x25, 0x3C, 0x26, 0x3C, 0x27, 0x3C + .byte 0x28, 0x3C, 0x29, 0x3C, 0x2A, 0x3C, 0x2B, 0x3C, 0x2C, 0x3C, 0x2D, 0x3C, 0x2E, 0x3C, 0x2F, 0x3C + .byte 0x30, 0x3C, 0x31, 0x3C, 0x32, 0x3C, 0x33, 0x3C, 0x34, 0x3C, 0x35, 0x3C, 0x36, 0x3C, 0x37, 0x3C + .byte 0x38, 0x3C, 0x39, 0x3C, 0x3A, 0x3C, 0x3B, 0x3C, 0x3C, 0x3C, 0x3D, 0x3C, 0x3E, 0x3C, 0x3F, 0x3C + .byte 0x40, 0x3C, 0x41, 0x3C, 0x42, 0x3C, 0x43, 0x3C, 0x44, 0x3C, 0x45, 0x3C, 0x46, 0x3C, 0x47, 0x3C + .byte 0x48, 0x3C, 0x49, 0x3C, 0x4A, 0x3C, 0x4B, 0x3C, 0x4C, 0x3C, 0x4D, 0x3C, 0x4E, 0x3C, 0x4F, 0x3C + .byte 0x50, 0x3C, 0x51, 0x3C, 0x52, 0x3C, 0x53, 0x3C, 0x54, 0x3C, 0x55, 0x3C, 0x56, 0x3C, 0x57, 0x3C + .byte 0x58, 0x3C, 0x59, 0x3C, 0x5A, 0x3C, 0x5B, 0x3C, 0x5C, 0x3C, 0x5D, 0x3C, 0x5E, 0x3C, 0x5F, 0x3C + .byte 0x60, 0x3C, 0x61, 0x3C, 0x62, 0x3C, 0x63, 0x3C, 0x64, 0x3C, 0x65, 0x3C, 0x66, 0x3C, 0x67, 0x3C + .byte 0x68, 0x3C, 0x69, 0x3C, 0x6A, 0x3C, 0x6B, 0x3C, 0x6C, 0x3C, 0x6D, 0x3C, 0x6E, 0x3C, 0x6F, 0x3C + .byte 0x70, 0x3C, 0x71, 0x3C, 0x72, 0x3C, 0x73, 0x3C, 0x74, 0x3C, 0x75, 0x3C, 0x76, 0x3C, 0x77, 0x3C + .byte 0x78, 0x3C, 0x79, 0x3C, 0x7A, 0x3C, 0x7B, 0x3C, 0x7C, 0x3C, 0x7D, 0x3C, 0x7E, 0x3C, 0x7F, 0x3C + .byte 0x80, 0x3C, 0x81, 0x3C, 0x82, 0x3C, 0x83, 0x3C, 0x84, 0x3C, 0x85, 0x3C, 0x86, 0x3C, 0x87, 0x3C + .byte 0x88, 0x3C, 0x89, 0x3C, 0x8A, 0x3C, 0x8B, 0x3C, 0x8C, 0x3C, 0x8D, 0x3C, 0x8E, 0x3C, 0x8F, 0x3C + .byte 0x90, 0x3C, 0x91, 0x3C, 0x92, 0x3C, 0x93, 0x3C, 0x94, 0x3C, 0x95, 0x3C, 0x96, 0x3C, 0x97, 0x3C + .byte 0x98, 0x3C, 0x99, 0x3C, 0x9A, 0x3C, 0x9B, 0x3C, 0x9C, 0x3C, 0x9D, 0x3C, 0x9E, 0x3C, 0x9F, 0x3C + .byte 0xA0, 0x3C, 0xA1, 0x3C, 0xA2, 0x3C, 0xA3, 0x3C, 0xA4, 0x3C, 0xA5, 0x3C, 0xA6, 0x3C, 0xA7, 0x3C + .byte 0xA8, 0x3C, 0xA9, 0x3C, 0xAA, 0x3C, 0xAB, 0x3C, 0xAC, 0x3C, 0xAD, 0x3C, 0xAE, 0x3C, 0xAF, 0x3C + .byte 0xB0, 0x3C, 0xB1, 0x3C, 0xB2, 0x3C, 0xB3, 0x3C, 0xB4, 0x3C, 0xB5, 0x3C, 0xB6, 0x3C, 0xB7, 0x3C + .byte 0xB8, 0x3C, 0xB9, 0x3C, 0xBA, 0x3C, 0xBB, 0x3C, 0xBC, 0x3C, 0xBD, 0x3C, 0xBE, 0x3C, 0xBF, 0x3C + .byte 0xC0, 0x3C, 0xC1, 0x3C, 0xC2, 0x3C, 0xC3, 0x3C, 0xC4, 0x3C, 0xC5, 0x3C, 0xC6, 0x3C, 0xC7, 0x3C + .byte 0xC8, 0x3C, 0xC9, 0x3C, 0xCA, 0x3C, 0xCB, 0x3C, 0xCC, 0x3C, 0xCD, 0x3C, 0xCE, 0x3C, 0xCF, 0x3C + .byte 0xD0, 0x3C, 0xD1, 0x3C, 0xD2, 0x3C, 0xD3, 0x3C, 0xD4, 0x3C, 0xD5, 0x3C, 0xD6, 0x3C, 0xD7, 0x3C +#else .byte 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 0x00 .byte 0x09, 0x00, 0x0A, 0x00, 0x0B, 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, 0x00, 0x10, 0x00 .byte 0x11, 0x00, 0x12, 0x00, 0x13, 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00, 0x18, 0x00 @@ -22921,6 +23028,7 @@ ov01_0233B8F8: .byte 0xE9, 0x00, 0xEA, 0x00, 0xEB, 0x00, 0xEC, 0x00, 0xED, 0x00, 0xEE, 0x00, 0xEF, 0x00, 0xF0, 0x00 .byte 0xF1, 0x00, 0xF2, 0x00, 0xF3, 0x00, 0xF4, 0x00, 0xF5, 0x00, 0xF6, 0x00, 0xF7, 0x00, 0xF8, 0x00 .byte 0xF9, 0x00, 0xFA, 0x00, 0xFB, 0x00, 0xFC, 0x00 +#endif .global ov01_0233BAF0 ov01_0233BAF0: .byte 0x25, 0x73, 0x00, 0x00 @@ -22961,8 +23069,26 @@ ov01_0233BB78: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x1C, 0x06, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov01_0233BB88 ov01_0233BB88: +#ifdef JAPAN + .byte 0xE7, 0x3C, 0xE8, 0x3C, 0xE9, 0x3C, 0xEA, 0x3C + .byte 0xEB, 0x3C, 0xEC, 0x3C, 0xED, 0x3C, 0xEE, 0x3C, 0xEF, 0x3C, 0xF0, 0x3C, 0xF1, 0x3C + .global ov01_0233BB9E +ov01_0233BB9E: + .byte 0xE7, 0x3C + .byte 0xE8, 0x3C, 0xE9, 0x3C, 0xEA, 0x3C, 0xEB, 0x3C, 0xEC, 0x3C, 0xED, 0x3C, 0xEE, 0x3C, 0xEF, 0x3C + .byte 0xF0, 0x3C, 0xF1, 0x3C + .global ov01_0233BBB4 +ov01_0233BBB4: + .byte 0xE7, 0x3C, 0xE8, 0x3C, 0xE9, 0x3C, 0xEA, 0x3C, 0xEB, 0x3C, 0xEC, 0x3C + .byte 0xED, 0x3C, 0xEE, 0x3C, 0xEF, 0x3C, 0xF0, 0x3C, 0xF1, 0x3C + .global ov01_0233BBCA +ov01_0233BBCA: + .byte 0xE7, 0x3C, 0xE8, 0x3C, 0xE9, 0x3C + .byte 0xEA, 0x3C, 0xEB, 0x3C, 0xEC, 0x3C, 0xED, 0x3C, 0xEE, 0x3C, 0xEF, 0x3C, 0xF0, 0x3C, 0xE5, 0x3C + .byte 0xE6, 0x3C, 0x00, 0x00 +#else .byte 0x0C, 0x01, 0x0D, 0x01, 0x0E, 0x01, 0x0F, 0x01, 0x10, 0x01, 0x11, 0x01, 0x12, 0x01, 0x13, 0x01 - .byte 0x14, 0x01, 0x15, 0x01, 0x16, 0x01 + .byte 0x14, 0x01, 0x15, 0x01, 0x16, 0x01 .global ov01_0233BB9E ov01_0233BB9E: .byte 0x0C, 0x01, 0x0D, 0x01, 0x0E, 0x01, 0x0F, 0x01, 0x10, 0x01 @@ -22976,6 +23102,7 @@ ov01_0233BBB4: ov01_0233BBCA: .byte 0x0C, 0x01, 0x0D, 0x01, 0x0E, 0x01, 0x0F, 0x01, 0x10, 0x01, 0x11, 0x01, 0x12, 0x01 .byte 0x13, 0x01, 0x14, 0x01, 0x15, 0x01, 0x0A, 0x01, 0x0B, 0x01, 0x00, 0x00 +#endif .global ov01_0233BBE4 ov01_0233BBE4: .byte 0x0C, 0x00, 0x00, 0x00 @@ -23048,8 +23175,10 @@ ov01_0233BD0C: .word ov07_0233F758 .global ov01_0233BD1C ov01_0233BD1C: -#ifdef EUROPE +#if defined(EUROPE) .byte 0xD8, 0x36, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xD9, 0x36, 0x00, 0x00 +#elif defined(JAPAN) + .byte 0x58, 0x33, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x59, 0x33, 0x00, 0x00 #else .byte 0xD6, 0x36, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xD7, 0x36, 0x00, 0x00 #endif @@ -23109,9 +23238,12 @@ ov01_0233BE48: .byte 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x0A, 0x00, 0x00 .global ov01_0233BE70 ov01_0233BE70: -#ifdef EUROPE +#if defined(EUROPE) .byte 0x5C, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x5D, 0x37, 0x00, 0x00 +#elif defined(JAPAN) + .byte 0xDC, 0x33, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0xDD, 0x33, 0x00, 0x00 #else .byte 0x5A, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x5B, 0x37, 0x00, 0x00 @@ -23221,12 +23353,16 @@ ov01_0233C0D8: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov01_0233C0E0 ov01_0233C0E0: -#ifdef EUROPE +#if defined(EUROPE) .byte 0xAC, 0x01, 0x80, 0x00 .byte 0xAD, 0x01, 0x80, 0x00, 0xAE, 0x01, 0x80, 0x00, 0xAF, 0x01, 0x80, 0x00, 0xB0, 0x01, 0x80, 0x00 .byte 0xAC, 0x01, 0x80, 0x00, 0xAD, 0x01, 0x80, 0x00, 0xAE, 0x01, 0x80, 0x00, 0xAF, 0x01, 0x80, 0x00 .byte 0xB0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +#elif defined(JAPAN) + .byte 0x85, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x77, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 #else .byte 0x68, 0x05, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x39, 0x09, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index a64fbcd8..fc6d591c 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -53805,7 +53805,7 @@ ov02_0235249A: .global ov02_023524A0 ov02_023524A0: .byte 0x27, 0x1F, 0x25, 0x00, 0x27, 0x00, 0x23, 0x1D - .byte 0x21, 0x00, 0x59, 0x00, 0x27, 0x21 + .byte 0x21, 0x00, 0x59, 0x00, 0x27, 0x21 .global ov02_023524AE ov02_023524AE: .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00 @@ -53975,13 +53975,13 @@ ov02_02352834: .global ov02_0235283C ov02_0235283C: .byte 0x37, 0x00, 0x38, 0x00, 0x39, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00 - .byte 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x30, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00 + .byte 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x30, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00 .global ov02_02352856 ov02_02352856: .byte 0x52, 0x00 .byte 0x4C, 0x00, 0x72, 0x00, 0x4C, 0x00, 0x92, 0x00, 0x4C, 0x00, 0x52, 0x00, 0x63, 0x00, 0x72, 0x00 .byte 0x63, 0x00, 0x92, 0x00, 0x63, 0x00, 0x52, 0x00, 0x7A, 0x00, 0x72, 0x00, 0x7A, 0x00, 0x92, 0x00 - .byte 0x7A, 0x00, 0x52, 0x00, 0x91, 0x00 + .byte 0x7A, 0x00, 0x52, 0x00, 0x91, 0x00 .global ov02_0235287E ov02_0235287E: .byte 0x50, 0x00 @@ -53990,7 +53990,7 @@ ov02_02352880: .byte 0x4A, 0x00, 0x70, 0x00, 0x4A, 0x00, 0x90, 0x00 .byte 0x4A, 0x00, 0x50, 0x00, 0x61, 0x00, 0x70, 0x00, 0x61, 0x00, 0x90, 0x00, 0x61, 0x00, 0x50, 0x00 .byte 0x78, 0x00, 0x70, 0x00, 0x78, 0x00, 0x90, 0x00, 0x78, 0x00, 0x50, 0x00, 0x8F, 0x00, 0x70, 0x00 - .byte 0x8F, 0x00, 0x90, 0x00, 0x8F, 0x00, 0x02, 0x00, 0xA8, 0x00, 0x82, 0x00, 0xA8, 0x00 + .byte 0x8F, 0x00, 0x90, 0x00, 0x8F, 0x00, 0x02, 0x00, 0xA8, 0x00, 0x82, 0x00, 0xA8, 0x00 .global ov02_023528B6 ov02_023528B6: .byte 0x02, 0x0C @@ -54035,16 +54035,16 @@ ov02_02352940: .global ov02_02352948 ov02_02352948: .byte 0x63, 0x68, 0x61, 0x72, 0x2F, 0x79, 0x62, 0x42, 0x67, 0x4F, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x2E - .byte 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00 + .byte 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00 .global ov02_0235295E ov02_0235295E: .byte 0x63, 0x68, 0x61, 0x72, 0x2F, 0x79, 0x62, 0x42, 0x67, 0x4F - .byte 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x31, 0x2E, 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00, 0x00 + .byte 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x31, 0x2E, 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00, 0x00 .global ov02_02352976 ov02_02352976: .byte 0x08, 0x00 .byte 0x24, 0x00, 0xF8, 0x00, 0x44, 0x00, 0x08, 0x00, 0x50, 0x00, 0xF8, 0x00, 0x70, 0x00, 0x08, 0x00 - .byte 0x7C, 0x00, 0xF8, 0x00, 0x9C, 0x00 + .byte 0x7C, 0x00, 0xF8, 0x00, 0x9C, 0x00 .global ov02_0235298E ov02_0235298E: .byte 0x06, 0x00 @@ -54064,7 +54064,7 @@ ov02_023529A8: .global ov02_023529A9 ov02_023529A9: .byte 0x63, 0x68, 0x61, 0x72, 0x2F, 0x79, 0x62, 0x42, 0x67, 0x53, 0x74, 0x65, 0x70, 0x33, 0x31 - .byte 0x2E, 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00 + .byte 0x2E, 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00 .global ov02_023529BF ov02_023529BF: .byte 0x63, 0x68, 0x61, 0x72, 0x2F, 0x78, 0x62, 0x34, 0x41 @@ -54145,11 +54145,11 @@ ov02_02352AD8: .global ov02_02352AF4 ov02_02352AF4: .byte 0x00, 0x00, 0x01, 0x02 - .byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x03, 0x04, 0x05 + .byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x03, 0x04, 0x05 .global ov02_02352B02 ov02_02352B02: .byte 0x00, 0x29, 0x2C, 0x52, 0x53, 0x30 - .byte 0x00, 0x2A, 0x30, 0x54, 0x55, 0x00, 0x00, 0x2B, 0x00, 0x00 + .byte 0x00, 0x2A, 0x30, 0x54, 0x55, 0x00, 0x00, 0x2B, 0x00, 0x00 .global ov02_02352B12 ov02_02352B12: .byte 0x00, 0x00, 0x60, 0x00, 0xE0, 0x00 @@ -54162,16 +54162,16 @@ ov02_02352B24: .global ov02_02352B39 ov02_02352B39: .byte 0x63, 0x68, 0x61, 0x72, 0x2F, 0x79, 0x62, 0x42, 0x67, 0x53, 0x74, 0x65, 0x70, 0x32, 0x31 - .byte 0x2E, 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00 + .byte 0x2E, 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00 .global ov02_02352B4F ov02_02352B4F: .byte 0x63, 0x68, 0x61, 0x72, 0x2F, 0x6A, 0x62, 0x33, 0x4C - .byte 0x69, 0x73, 0x74, 0x42, 0x61, 0x63, 0x6B, 0x2E, 0x6E, 0x73, 0x63, 0x2E, 0x6C, 0x00 + .byte 0x69, 0x73, 0x74, 0x42, 0x61, 0x63, 0x6B, 0x2E, 0x6E, 0x73, 0x63, 0x2E, 0x6C, 0x00 .global ov02_02352B66 ov02_02352B66: .byte 0x84, 0x00 .byte 0x1B, 0x00, 0xFC, 0x00, 0x2C, 0x00, 0x84, 0x00, 0xAC, 0x00, 0xFC, 0x00, 0xBD, 0x00, 0x04, 0x00 - .byte 0xAC, 0x00, 0x7C, 0x00, 0xBD, 0x00 + .byte 0xAC, 0x00, 0x7C, 0x00, 0xBD, 0x00 .global ov02_02352B7E ov02_02352B7E: .byte 0xC8, 0x00 @@ -54207,21 +54207,21 @@ ov02_02352BE0: .global ov02_02352BE8 ov02_02352BE8: .byte 0x63, 0x68, 0x61, 0x72, 0x2F, 0x79, 0x62, 0x42, 0x67, 0x53, 0x74, 0x65, 0x70, 0x31, 0x31, 0x2E - .byte 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00 + .byte 0x6E, 0x63, 0x6C, 0x2E, 0x6C, 0x00 .global ov02_02352BFE ov02_02352BFE: .byte 0x08, 0x00 .global ov02_02352C00 ov02_02352C00: .byte 0x30, 0x00, 0x5A, 0x00, 0x30, 0x00, 0xAC, 0x00 - .byte 0x30, 0x00, 0x0C, 0x00, 0x58, 0x00, 0x5E, 0x00, 0x58, 0x00, 0xB0, 0x00, 0x58, 0x00 + .byte 0x30, 0x00, 0x0C, 0x00, 0x58, 0x00, 0x5E, 0x00, 0x58, 0x00, 0xB0, 0x00, 0x58, 0x00 .global ov02_02352C16 ov02_02352C16: .byte 0x08, 0x00 .byte 0x20, 0x00, 0x54, 0x00, 0x56, 0x00, 0x5A, 0x00, 0x20, 0x00, 0xA6, 0x00, 0x56, 0x00, 0xAC, 0x00 .byte 0x20, 0x00, 0xF8, 0x00, 0x56, 0x00, 0x08, 0x00, 0x78, 0x00, 0xF8, 0x00, 0xA0, 0x00, 0x08, 0x00 .byte 0x54, 0x00, 0x54, 0x00, 0x70, 0x00, 0x5A, 0x00, 0x54, 0x00, 0xA6, 0x00, 0x70, 0x00, 0xAC, 0x00 - .byte 0x54, 0x00, 0xF8, 0x00, 0x70, 0x00 + .byte 0x54, 0x00, 0xF8, 0x00, 0x70, 0x00 .global ov02_02352C4E ov02_02352C4E: .byte 0x06, 0x00 @@ -54311,11 +54311,11 @@ ov02_02352DC4: .byte 0x00, 0x00, 0x00, 0x00 .global ov02_02352DC8 ov02_02352DC8: - .byte 0x01, 0x00, 0x05, 0x00, 0x06, 0x04, 0x00, 0x02, 0x00, 0x06, 0x04, 0x00, 0x05, 0x00, 0x03 + .byte 0x01, 0x00, 0x05, 0x00, 0x06, 0x04, 0x00, 0x02, 0x00, 0x06, 0x04, 0x00, 0x05, 0x00, 0x03 .global ov02_02352DD7 ov02_02352DD7: .byte 0x02 - .byte 0x01, 0x03, 0x01, 0x03, 0x05, 0x01, 0x04, 0x01, 0x05, 0x07, 0x01, 0x07, 0x01, 0x06 + .byte 0x01, 0x03, 0x01, 0x03, 0x05, 0x01, 0x04, 0x01, 0x05, 0x07, 0x01, 0x07, 0x01, 0x06 .global ov02_02352DE6 ov02_02352DE6: .byte 0x20, 0x00 @@ -54338,10 +54338,10 @@ ov02_02352E10: .global ov02_02352E54 ov02_02352E54: .byte 0x08, 0x00, 0x08, 0x00 - .byte 0x01, 0x01, 0x00, 0x00, 0x01, 0x01 + .byte 0x01, 0x01, 0x00, 0x00, 0x01, 0x01 .global ov02_02352E5E ov02_02352E5E: - .byte 0x04, 0x00, 0x1D, 0x00, 0xFC, 0x00, 0x44, 0x00 + .byte 0x04, 0x00, 0x1D, 0x00, 0xFC, 0x00, 0x44, 0x00 .global ov02_02352E66 ov02_02352E66: .byte 0x00, 0x01 diff --git a/asm/overlay_08.s b/asm/overlay_08.s index 074eeadd..3c0fdd9f 100644 --- a/asm/overlay_08.s +++ b/asm/overlay_08.s @@ -2688,7 +2688,7 @@ ov08_0233E8F0: .global ov08_0233E904 ov08_0233E904: .byte 0x4A, 0x30, 0x5F, 0x30, 0x81, 0x30, 0x57, 0x30, 0x6E, 0x30, 0x82, 0x30 - .byte 0x8A, 0x30, 0x92, 0x30, 0x5F, 0x30, 0x93, 0x30, 0x51, 0x30, 0x93, 0x30, 0x00, 0x00 + .byte 0x8A, 0x30, 0x92, 0x30, 0x5F, 0x30, 0x93, 0x30, 0x51, 0x30, 0x93, 0x30, 0x00, 0x00 .global ov08_0233E91E ov08_0233E91E: .byte 0x61, 0x30 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 25f6b818..6a07f149 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -16627,10 +16627,10 @@ ov10_022DBFB2: .byte 0x00, 0x00 .global ov10_022DBFB6 ov10_022DBFB6: - .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global ov10_022DBFBA ov10_022DBFBA: - .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global ov10_022DBFBE ov10_022DBFBE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 15642e7a..d179e2b8 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -79991,7 +79991,7 @@ ov11_023224D0: .byte 0x7B, 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, 0x00, 0xFF, 0xFF .global ov11_023224DC ov11_023224DC: - .byte 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83, 0x00, 0x84, 0x00, 0xB0, 0x00, 0xFF, 0xFF + .byte 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83, 0x00, 0x84, 0x00, 0xB0, 0x00, 0xFF, 0xFF .global ov11_023224EA ov11_023224EA: .byte 0x9E, 0x00 @@ -81234,7 +81234,7 @@ ov11_02323E4E: ov11_02323E70: .byte 0x00, 0x00, 0x04, 0x00, 0x03, 0x00, 0x05, 0x00, 0x01, 0x00, 0x03, 0x00 .byte 0x04, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 - .byte 0x03, 0x00, 0x05, 0x00, 0x01, 0x00 + .byte 0x03, 0x00, 0x05, 0x00, 0x01, 0x00 .global ov11_02323E92 ov11_02323E92: .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00 diff --git a/asm/overlay_26.s b/asm/overlay_26.s index 5af3bb96..b26dbda6 100644 --- a/asm/overlay_26.s +++ b/asm/overlay_26.s @@ -991,41 +991,41 @@ _0238AE1C: .word OVERLAY26_UNKNOWN_POINTER5__NA_238AF70 .global OVERLAY26_UNKNOWN_TABLE__NA_238AE20 OVERLAY26_UNKNOWN_TABLE__NA_238AE20: - .byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 + .byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 .global ov26_0238AE26 ov26_0238AE26: .byte 0x03, 0x00, 0x18, 0x32, 0x61, 0x02 - .byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 + .byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 .global ov26_0238AE32 ov26_0238AE32: .byte 0x03, 0x00, 0x18, 0x32, 0x6C, 0x02, 0xFF, 0x00, 0x18, 0x02 .byte 0x00, 0x00 .global ov26_0238AE3E ov26_0238AE3E: - .byte 0x03, 0x00, 0x18, 0x32, 0x6B, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 + .byte 0x03, 0x00, 0x18, 0x32, 0x6B, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 .global ov26_0238AE4A ov26_0238AE4A: .byte 0x03, 0x00 - .byte 0x18, 0x32, 0x6A, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 + .byte 0x18, 0x32, 0x6A, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 .global ov26_0238AE56 ov26_0238AE56: .byte 0x03, 0x00, 0x18, 0x32, 0x68, 0x02 - .byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 + .byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 .global ov26_0238AE62 ov26_0238AE62: .byte 0x03, 0x00, 0x18, 0x32, 0x69, 0x02, 0xFF, 0x00, 0x18, 0x02 .byte 0x00, 0x00 .global ov26_0238AE6E ov26_0238AE6E: - .byte 0x03, 0x00, 0x18, 0x32, 0x65, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 + .byte 0x03, 0x00, 0x18, 0x32, 0x65, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 .global ov26_0238AE7A ov26_0238AE7A: .byte 0x03, 0x00 - .byte 0x18, 0x32, 0x64, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 + .byte 0x18, 0x32, 0x64, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 .global ov26_0238AE86 ov26_0238AE86: .byte 0x03, 0x00, 0x18, 0x32, 0x63, 0x02 - .byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 + .byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00 .global ov26_0238AE92 ov26_0238AE92: .byte 0x03, 0x00, 0x18, 0x32, 0x62, 0x02, 0xFF, 0x00, 0x18, 0x02 diff --git a/sub/asm/main.s b/sub/asm/main.s index bf899dc5..ce688466 100644 --- a/sub/asm/main.s +++ b/sub/asm/main.s @@ -27712,7 +27712,7 @@ _027F74C4: .byte 0x30, 0x00, 0x48, 0x00, 0x60, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _027F74E4 _027F74E4: - .byte 0xFF, 0xFF, 0x5A, 0x5A, 0xA5, 0xA5 + .byte 0xFF, 0xFF, 0x5A, 0x5A, 0xA5, 0xA5 .global _027F74EA _027F74EA: .byte 0x02, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00