From e3cd414d69b77e77dbb87870d62a9b5fada54bb3 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 23 Jun 2024 14:42:24 -0500 Subject: [PATCH] Matched JP --- asm/overlay_34.s | 104 +++++++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 40 deletions(-) diff --git a/asm/overlay_34.s b/asm/overlay_34.s index ddfe51cb..0b57851b 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -133,20 +133,20 @@ _022DC3F8: bl ov34_022DC86C bl ov34_022DCDCC _022DC404: -#ifdef EUROPE - mov fp, #2 - mov r8, #1 - ldr r5, _022DC59C ; =ov34_022DD0A0 - ldr r4, _022DC5A0 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD080 - mov r6, fp - mov r7, r8 -#else +#ifdef NORTH_AMERICA mov r8, #1 mov fp, #2 ldr r5, _022DC59C ; =ov34_022DD0A0 ldr r4, _022DC5A0 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD080 mov r7, r8 mov r6, r8 +#else + mov fp, #2 + mov r8, #1 + ldr r5, _022DC59C ; =ov34_022DD0A0 + ldr r4, _022DC5A0 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD080 + mov r6, fp + mov r7, r8 #endif mov sb, fp mov sl, #0 @@ -192,15 +192,7 @@ _022DC4A0: mov r1, #0 str r8, [sp] ldr r0, _022DC5A8 ; =ov34_022DCFF4 -#ifdef EUROPE - mov r2, r1 - mov r3, r1 - str r8, [sp, #4] - bl sub_02052060 - mov r0, #0x1e - bl ov34_022DC958 - str r7, [r5, #0xc] -#else +#ifdef NORTH_AMERICA str r8, [sp, #4] mov r2, r1 mov r3, r1 @@ -218,6 +210,14 @@ _022DC4A0: mov r0, #0x1e bl ov34_022DC86C str r6, [r5, #0xc] +#else + mov r2, r1 + mov r3, r1 + str r8, [sp, #4] + bl sub_02052060 + mov r0, #0x1e + bl ov34_022DC958 + str r7, [r5, #0xc] #endif b _022DC54C _022DC508: @@ -230,14 +230,7 @@ _022DC508: bgt _022DC54C mov r0, #0x1e bl ov34_022DC970 -#ifdef EUROPE - str r6, [r5, #0xc] - b _022DC54C -_022DC53C: - mov r0, #0 - bl ov34_022DC8B8 - str fp, [r5, #0xc] -#else +#ifdef NORTH_AMERICA mov r0, #0x1e bl ov34_022DC908 str fp, [r5, #0xc] @@ -247,6 +240,13 @@ _022DC53C: bl ov34_022DC8B8 mov r0, #2 str r0, [r5, #0xc] +#else + str r6, [r5, #0xc] + b _022DC54C +_022DC53C: + mov r0, #0 + bl ov34_022DC8B8 + str fp, [r5, #0xc] #endif _022DC54C: bl sub_02006E14 @@ -276,7 +276,7 @@ _022DC59C: .word ov34_022DD0A0 _022DC5A0: .word OVERLAY34_UNKNOWN_POINTER__NA_22DD080 _022DC5A4: .word ov34_022DC5B0 _022DC5A8: .word ov34_022DCFF4 -#ifndef EUROPE +#ifdef NORTH_AMERICA _022DC5AC: .word ov34_022DD004 #endif arm_func_end ExplorersOfSkyMain @@ -328,10 +328,10 @@ _022DC64C: cmp r0, #3 mov r0, #0 bne _022DC678 -#ifdef EUROPE - mov r1, #0x100 -#else +#ifdef NORTH_AMERICA mov r1, r0 +#else + mov r1, #0x100 #endif bl sub_02008F3C mov r0, #1 @@ -341,10 +341,10 @@ _022DC64C: bl sub_02008ED0 b _022DC6C4 _022DC678: -#ifdef EUROPE - mov r1, r0 -#else +#ifdef NORTH_AMERICA sub r1, r0, #0x100 +#else + mov r1, r0 #endif bl sub_02008F3C mov r0, #1 @@ -560,7 +560,7 @@ _022DC900: .word ov34_022DD0B0 _022DC904: .word ov34_022DD104 arm_func_end ov34_022DC8B8 -#ifndef EUROPE +#ifdef NORTH_AMERICA arm_func_start ov34_022DC908 ov34_022DC908: ; 0x022DC908 stmdb sp!, {r4, lr} @@ -834,7 +834,11 @@ ov34_022DCBF4: ; 0x022DCBF4 ldr r3, _022DCC84 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD084 ldr r1, _022DCC8C ; =0x00000408 ldr ip, [r3] +#ifdef JAPAN + add r2, r1, #0xde +#else ldr r2, _022DCC90 ; =0x00000255 +#endif strb r0, [ip, #1] ldr r0, [r3] mov r3, #0 @@ -852,7 +856,9 @@ ov34_022DCBF4: ; 0x022DCBF4 _022DCC84: .word OVERLAY34_UNKNOWN_POINTER__NA_22DD084 _022DCC88: .word START_MENU_ITEMS_CONFIRM _022DCC8C: .word 0x00000408 +#ifndef JAPAN _022DCC90: .word 0x00000255 +#endif arm_func_end ov34_022DCBF4 arm_func_start ov34_022DCC94 @@ -1005,8 +1011,10 @@ ov34_022DCDF4: ; 0x022DCDF4 _022DCE7C: .word OVERLAY34_UNKNOWN_POINTER__NA_22DD08C _022DCE80: .word DUNGEON_DEBUG_MENU_ITEMS _022DCE84: .word 0x00000408 -#ifdef EUROPE +#if defined(EUROPE) _022DCE88: .word 0x00003D1E +#elif defined(JAPAN) +_022DCE88: .word 0x0000050E #else _022DCE88: .word 0x00003D1C #endif @@ -1127,7 +1135,7 @@ _022DCFF0: .word OVERLAY34_UNKNOWN_POINTER__NA_22DD08C .global ov34_022DCFF4 ov34_022DCFF4: .byte 0x42, 0x41, 0x43, 0x4B, 0x2F, 0x6E, 0x5F, 0x6C, 0x6F, 0x67, 0x6F, 0x2E, 0x62, 0x67, 0x70, 0x00 -#ifndef EUROPE +#ifdef NORTH_AMERICA .global ov34_022DD004 ov34_022DD004: .byte 0x42, 0x41, 0x43, 0x4B, 0x2F, 0x77, 0x5F, 0x65, 0x73, 0x72, 0x62, 0x2E, 0x62, 0x67, 0x70, 0x00 @@ -1140,7 +1148,16 @@ OVERLAY34_UNKNOWN_STRUCT__NA_22DD014: .word ov34_022DCCE0 .global START_MENU_ITEMS_CONFIRM START_MENU_ITEMS_CONFIRM: - .byte 0x56, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x57, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 +#ifdef JAPAN + .byte 0xE7, 0x04, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00 + .byte 0xE8, 0x04, 0x00, 0x00 +#else + .byte 0x56, 0x02, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00 + .byte 0x57, 0x02, 0x00, 0x00 +#endif + .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .global OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C: @@ -1150,14 +1167,21 @@ OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C: .word ov34_022DCED8 .global DUNGEON_DEBUG_MENU_ITEMS DUNGEON_DEBUG_MENU_ITEMS: -#ifdef EUROPE +#if defined(EUROPE) #define DUNGEON_DEBUG_MENU_OFFSET 2 +#elif defined(JAPAN) +#define DUNGEON_DEBUG_MENU_OFFSET -0x380E #else #define DUNGEON_DEBUG_MENU_OFFSET 0 #endif - .byte 0x1D + DUNGEON_DEBUG_MENU_OFFSET, 0x3D, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x1E + DUNGEON_DEBUG_MENU_OFFSET, 0x3D, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1F + DUNGEON_DEBUG_MENU_OFFSET, 0x3D, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 - .byte 0x20 + DUNGEON_DEBUG_MENU_OFFSET, 0x3D, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .word 0x3D1D + DUNGEON_DEBUG_MENU_OFFSET + .byte 0x02, 0x00, 0x00, 0x00 + .word 0x3D1E + DUNGEON_DEBUG_MENU_OFFSET + .byte 0x03, 0x00, 0x00, 0x00 + .word 0x3D1F + DUNGEON_DEBUG_MENU_OFFSET + .byte 0x04, 0x00, 0x00, 0x00 + .word 0x3D20 + DUNGEON_DEBUG_MENU_OFFSET + .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .data .global OVERLAY34_UNKNOWN_POINTER__NA_22DD080