Matched main ARM9 binary

This commit is contained in:
AnonymousRandomPerson 2024-05-14 00:04:17 -04:00
parent f9bf8c8e48
commit f8ddabbe30
4 changed files with 571 additions and 343 deletions

View File

@ -3099,10 +3099,11 @@ _01FFA7C0:
ldrsh r2, [r7, #6]
add r0, r1, #0x2a8 + AI_MOVEMENT_OFFSET_2
add r1, r1, r5, lsl #1
add r1, r1, #0xf200
#ifdef JAPAN
add r1, r1, #0xf100
ldrsh r1, [r1, #0xc4]
#else
add r1, r1, #0xf200
ldrsh r1, [r1, #0x68]
#endif
add r3, r0, #0xf000

View File

@ -23473,7 +23473,11 @@ _02067C38: .word _020A92EC
_02067C3C: .word _020B0B37
_02067C40: .word JOB_MENU_ITEMS_5
_02067C44: .word JOB_MENU_ITEMS_7
#ifdef JAPAN
_02067C48: .word 0x00003432
#else
_02067C48: .word 0x000037B0 + SUB_02067708_WORD_OFFSET
#endif
_02067C4C: .word _020A931C
_02067C50: .word _020B0B30
_02067C54: .word JOB_MENU_ITEMS_3
@ -23984,7 +23988,7 @@ _02068678: .word 0x00003462
_020682EC: .word 0x00003825 + SUB_02067C8C_WORD_OFFSET
_020682F0: .word 0x00003821 + SUB_02067C8C_WORD_OFFSET
#ifndef EUROPE
_020682F4: .word 0x00003822
_020682F4: .word 0x00003822 + SUB_02067C8C_WORD_OFFSET
#endif
_020682F8: .word 0x00003823 + SUB_02067C8C_WORD_OFFSET
#ifndef JAPAN
@ -24821,7 +24825,11 @@ _02068E2C: .word _020B0B31
_02068E30: .word 0x00003818 + SUB_020686F4_WORD_OFFSET
_02068E34: .word sub_02069598
_02068E38: .word _020B0B2D
#ifdef JAPAN
_02068E3C: .word 0x000038A2
#else
_02068E3C: .word 0x00003F1E + SUB_020686F4_WORD_OFFSET
#endif
_02068E40: .word sub_02069074
_02068E44: .word 0x00003819 + SUB_020686F4_WORD_OFFSET
_02068E48: .word _020B0B3E
@ -26608,7 +26616,7 @@ _0206A5D8:
#if defined(EUROPE)
#define SUB_02069DC0_OFFSET 2
#elif defined(JAPAN)
#define SUB_02069DC0_OFFSET -0x3C2
#define SUB_02069DC0_OFFSET -0x37E
#else
#define SUB_02069DC0_OFFSET 0
#endif
@ -26620,18 +26628,29 @@ _0206A5F0: .word sub_0206A628
_0206A5F4: .word ov01_02337B68
_0206A5F8: .word 0x000037A8 + SUB_02069DC0_OFFSET
_0206A5FC: .word 0x00002001
#ifdef JAPAN
_0206A600: .word 0x00003507
#else
_0206A600: .word 0x000038C9 + SUB_02069DC0_OFFSET
#endif
_0206A604: .word 0x0000379F + SUB_02069DC0_OFFSET
_0206A608: .word 0x00003793 + SUB_02069DC0_OFFSET
#ifdef JAPAN
_0206A60C: .word 0x000004CC
#else
_0206A60C: .word 0x0000023B
#endif
_0206A610: .word 0x00004002
_0206A614: .word 0x00004001
_0206A618: .word 0x0000379E + SUB_02069DC0_OFFSET
#ifdef JAPAN
_0206A90C: .word 0x000004CD
#endif
_0206A61C: .word 0x00004003
_0206A620: .word 0x000004CA
#else
_0206A61C: .word 0x00004003
_0206A620: .word 0x00000239
#endif
_0206A624: .word 0x000037A0 + SUB_02069DC0_OFFSET
arm_func_end sub_02069DC0
@ -26978,8 +26997,10 @@ _0206AA24:
ldmia sp!, {r4, pc}
.align 2, 0
_0206AA34: .word MAP_MARKER_PLACEMENTS
#ifdef EUROPE
#if defined(EUROPE)
_0206AA38: .word 0xFFFFFEC6
#elif defined(JAPAN)
_0206AA38: .word 0xFFFFFECD
#else
_0206AA38: .word 0xFFFFFED2
#endif

File diff suppressed because it is too large Load Diff

View File

@ -5,11 +5,11 @@
_secure: ; 0x02000000
.byte 0xFF, 0xDE, 0xFF, 0xE7, 0xFF, 0xDE, 0xFF, 0xE7, 0xFF, 0xDE, 0xFF, 0xE7, 0xFF, 0xDE, 0xB5, 0x87
.byte 0x4F, 0x8D, 0x6B, 0x7E, 0xAD, 0xA2, 0x37, 0xEB, 0x89, 0x54, 0x8E, 0xED, 0x24, 0x54, 0x6D, 0xC6
.byte 0xEE, 0x3D, 0x48, 0x2B, 0x50, 0xB1, 0x22, 0x0B, 0xE6, 0x6C
.byte 0xEE, 0x3D, 0x48, 0x2B, 0x50, 0xB1, 0x22, 0x0B, 0xE6, 0x6C, 0x4E
.global _0200002B
_0200002B:
.byte 0x4E, 0x30, 0xFE, 0xED, 0x78, 0xDE
.byte 0x30, 0xFE, 0xED, 0x78, 0xDE
.byte 0xB0, 0x21, 0x76, 0xA7, 0xD3, 0x2F, 0x11, 0x86, 0xAA, 0x94, 0xE5, 0xD7, 0x5B, 0x31, 0x2C, 0xE5
.byte 0x25, 0x69, 0xFC, 0xBC, 0x26, 0x56, 0x7C, 0xB0, 0x28, 0x46, 0xA6, 0x38, 0xE9, 0x37, 0x25, 0x24
.byte 0x79, 0x7D, 0x09, 0x90, 0x00, 0x98, 0x1C, 0x6A, 0x7F, 0x9C, 0x67, 0x97, 0x74, 0x7D, 0xA5, 0xA1