diff options
| -rw-r--r-- | asm/macros/function.inc | 4 | ||||
| -rw-r--r-- | asm/secure.s | 12 | ||||
| -rw-r--r-- | undefined_syms.txt | 35 |
3 files changed, 12 insertions, 39 deletions
diff --git a/asm/macros/function.inc b/asm/macros/function.inc index 4e0afcb7..6b9e5f40 100644 --- a/asm/macros/function.inc +++ b/asm/macros/function.inc @@ -1,5 +1,5 @@ .macro arm_func_start name - .align 2, 0 + .balign 4, 0 .global \name .arm .endm @@ -9,7 +9,7 @@ .endm .macro thumb_func_start name - .align 2, 0 + .balign 4, 0 .global \name .thumb .endm diff --git a/asm/secure.s b/asm/secure.s index 05d39175..18313c93 100644 --- a/asm/secure.s +++ b/asm/secure.s @@ -3,9 +3,17 @@ .section .text -.incbin "baserom.nds", 0x4000, 0x5F2 +.incbin "baserom.nds", 0x4000, 0x19E - thumb_func_start FUN_020005F2 + non_word_aligned_thumb_func_start FUN_0200019E +FUN_0200019E: ; 0x0200019E + swi 13 + bx lr + thumb_func_end FUN_0200019E + +.incbin "baserom.nds", 0x41A2, 0x450 + + non_word_aligned_thumb_func_start FUN_020005F2 FUN_020005F2: swi 3 bx lr diff --git a/undefined_syms.txt b/undefined_syms.txt index ac00b4f0..b68edbbe 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1,36 +1,3 @@ -FUN_0200019E = 0x0200019E; -FUN_02000DF4 = 0x02000DF4; -FUN_02000E0C = 0x02000E0C; -FUN_02000E7C = 0x02000E7C; -FUN_02000EE8 = 0x02000EE8; -FUN_02000F18 = 0x02000F18; -FUN_02000FA4 = 0x02000FA4; -FUN_02000FE8 = 0x02000FE8; -FUN_02002C14 = 0x02002C14; -FUN_02002C50 = 0x02002C50; -FUN_02003B98 = 0x02003B98; -FUN_02003C10 = 0x02003C10; -FUN_0200A2AC = 0x0200A2AC; -FUN_0200A318 = 0x0200A318; -FUN_0200E2D8 = 0x0200E2D8; -FUN_0201259C = 0x0201259C; -FUN_020125D4 = 0x020125D4; -FUN_02015E30 = 0x02015E30; -FUN_02015E60 = 0x02015E60; -FUN_020163BC = 0x020163BC; -FUN_02016438 = 0x02016438; -FUN_02016464 = 0x02016464; -FUN_0201B5CC = 0x0201B5CC; -FUN_02020AFC = 0x02020AFC; -FUN_02022294 = 0x02022294; -FUN_020222C4 = 0x020222C4; -FUN_0202254C = 0x0202254C; -FUN_020227FC = 0x020227FC; -FUN_02029EF8 = 0x02029EF8; -FUN_0202FB80 = 0x0202FB80; -FUN_020337E8 = 0x020337E8; -FUN_02034188 = 0x02034188; -FUN_02089D90 = 0x02089D90; FUN_0208ACEC = 0x0208ACEC; FUN_0208AD80 = 0x0208AD80; FUN_0208AF80 = 0x0208AF80; @@ -825,11 +792,9 @@ FUN_01FF84E4 = 0x01FF84E4; FUN_01FF8544 = 0x01FF8544; FUN_01FF857C = 0x01FF857C; FUN_01FF85F0 = 0x01FF85F0; -FUN_020005F2 = 0x020005F2; PMi_WaitBusy = 0x020D5884; CTRDG_IsExisting = 0x020DB68C; PMi_SendSleepStart = 0x020D55C0; -MIi_UncompressBackward = 0x02000950; OS_SpinWait = 0x020CD380; PMi_SetLED = 0x020D5338; PMi_SetLEDAsync = 0x020D5374; |