diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | asm/rom1.5.s | 8 | ||||
| -rw-r--r-- | asm/rom2.s | 29 | ||||
| -rw-r--r-- | undefined_syms.txt | 58 |
4 files changed, 62 insertions, 35 deletions
@@ -168,7 +168,7 @@ DUMMY != mkdir -p $(ALL_DIRS) %.png: ; %.pal: ; -$(BUILD_DIR)/asm/icon.o: graphics/icon.4bpp graphics/icon.gbapal +$(BUILD_DIR)/data/icon.o: graphics/icon.4bpp graphics/icon.gbapal ### Debug Print ### diff --git a/asm/rom1.5.s b/asm/rom1.5.s index 50021ed7..fffa35a6 100644 --- a/asm/rom1.5.s +++ b/asm/rom1.5.s @@ -1,5 +1,7 @@ /* rom1.5.s TODO: Disassemble */ + .include "asm/macros.inc" + .section .text -.section .text - -.incbin "baserom.nds", 0x8EC14, 0x3EFF8 + arm_func_start FUN_0208AC14 +FUN_0208AC14: + .incbin "baserom.nds", 0x8EC14, 0x3EFF8 @@ -3,7 +3,34 @@ .section .text - .incbin "baserom.nds", 0xD9150, 0x16B30 + .incbin "baserom.nds", 0xD9150, 0x16AE0 + + arm_func_start FUN_020EBC30 +FUN_020EBC30: ; 0x020EBC30 + stmdb sp!, {r4, r5, lr} + umull r5, r4, r0, r2 + mla r4, r0, r3, r4 + mla r4, r2, r1, r4 + mov r1, r4 + mov r0, r5 + ldmia sp!, {r4, r5, lr} + bx lr + + arm_func_start FUN_020EBC50 +FUN_020EBC50: ; 0x020EBC50 + ands r2, r2, #0x3F + bxeq lr + subs r3, r2, #0x20 + bge _020EBC74 + rsb r3, r2, #0x20 + mov r1, r1, lsl r2 + orr r1, r1, r0, lsr r3 + mov r0, r0, lsl r2 + bx lr +_020EBC74: + mov r1, r0, lsl r3 + mov r0, #0x0 + bx lr arm_func_start _s32_div_f _s32_div_f: ; 0x20EBC80 diff --git a/undefined_syms.txt b/undefined_syms.txt index b68edbbe..bffce056 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1,3 +1,10 @@ +CONST_34 = 0x00000034; +CONST_3F = 0x0000003F; +FUN_01FF84A4 = 0x01FF84A4; +FUN_01FF84E4 = 0x01FF84E4; +FUN_01FF8544 = 0x01FF8544; +FUN_01FF857C = 0x01FF857C; +FUN_01FF85F0 = 0x01FF85F0; FUN_0208ACEC = 0x0208ACEC; FUN_0208AD80 = 0x0208AD80; FUN_0208AF80 = 0x0208AF80; @@ -282,10 +289,18 @@ FUN_020C9418 = 0x020C9418; FUN_020C9480 = 0x020C9480; FUN_020C94E8 = 0x020C94E8; FUN_020C9550 = 0x020C9550; +OS_SpinWait = 0x020CD380; FUN_020D5150 = 0x020D5150; FUN_020D5168 = 0x020D5168; FUN_020D5180 = 0x020D5180; FUN_020D526C = 0x020D526C; +PMi_SetLED = 0x020D5338; +PMi_SetLEDAsync = 0x020D5374; +PMi_ReadRegister = 0x020D5498; +PMi_SendSleepStart = 0x020D55C0; +PM_Init = 0x020D5764; +PMi_WaitBusy = 0x020D5884; +PMi_Lock = 0x020D58C4; FUN_020D5F40 = 0x020D5F40; FUN_020D614C = 0x020D614C; FUN_020D6320 = 0x020D6320; @@ -293,6 +308,8 @@ FUN_020D6578 = 0x020D6578; FUN_020D660C = 0x020D660C; FUN_020D66A0 = 0x020D66A0; FUN_020D66B0 = 0x020D66B0; +CARD_UnlockRom = 0x020D66C0; +CARD_LockRom = 0x020D66E0; FUN_020D6700 = 0x020D6700; FUN_020D6D7C = 0x020D6D7C; FUN_020D6DAC = 0x020D6DAC; @@ -300,6 +317,7 @@ FUN_020D6DB8 = 0x020D6DB8; FUN_020D6DC4 = 0x020D6DC4; FUN_020D6F20 = 0x020D6F20; CARD_Init = 0x020D7228; +CARDi_ReadRom = 0x020D72AC; CARD_IsPulledOut = 0x020D7D18; FUN_020D7E9C = 0x020D7E9C; FUN_020D8A4C = 0x020D8A4C; @@ -324,7 +342,9 @@ FUN_020D9B48 = 0x020D9B48; FUN_020DAD74 = 0x020DAD74; FUN_020DADD4 = 0x020DADD4; FUN_020DAF30 = 0x020DAF30; +CTRDG_IsExisting = 0x020DB68C; FUN_020DB7A8 = 0x020DB7A8; +CTRDG_Init = 0x020DBC80; FUN_020DDC5C = 0x020DDC5C; FUN_020DDCE4 = 0x020DDCE4; FUN_020DDD28 = 0x020DDD28; @@ -349,10 +369,14 @@ FUN_020EB5C4 = 0x020EB5C4; FUN_020EB7B0 = 0x020EB7B0; FUN_020EBA38 = 0x020EBA38; _ll_udiv = 0x020EBBE8; -FUN_020EBC30 = 0x020EBC30; -FUN_020EBC50 = 0x020EBC50; +gBacklightTop = 0x02106FA0; +gBacklightTop_2 = 0x02106FA0; +gUnknown2106FB8 = 0x02106FB8; +gUnknown21C48B8 = 0x021C48B8; +gUnk021C4918 = 0x021C4918; FUN_021D74E0 = 0x021D74E0; FUN_021D76AC = 0x021D76AC; +gUnk021D76C8 = 0x021D76C8; FUN_021D77C4 = 0x021D77C4; FUN_021D7800 = 0x021D7800; FUN_021D78FC = 0x021D78FC; @@ -404,6 +428,7 @@ FUN_021DAF98 = 0x021DAF98; FUN_021DB030 = 0x021DB030; FUN_021DB7E8 = 0x021DB7E8; FUN_021DB858 = 0x021DB858; +gUnk021DBE18 = 0x021DBE18; FUN_021DC174 = 0x021DC174; FUN_021DD6F0 = 0x021DD6F0; FUN_021DD718 = 0x021DD718; @@ -787,31 +812,4 @@ FUN_0224F12C = 0x0224F12C; FUN_02252534 = 0x02252534; FUN_02252538 = 0x02252538; FUN_022567E0 = 0x022567E0; -FUN_01FF84A4 = 0x01FF84A4; -FUN_01FF84E4 = 0x01FF84E4; -FUN_01FF8544 = 0x01FF8544; -FUN_01FF857C = 0x01FF857C; -FUN_01FF85F0 = 0x01FF85F0; -PMi_WaitBusy = 0x020D5884; -CTRDG_IsExisting = 0x020DB68C; -PMi_SendSleepStart = 0x020D55C0; -OS_SpinWait = 0x020CD380; -PMi_SetLED = 0x020D5338; -PMi_SetLEDAsync = 0x020D5374; -PMi_ReadRegister = 0x020D5498; -PM_Init = 0x020D5764; -PMi_Lock = 0x020D58C4; -CARD_UnlockRom = 0x020D66C0; -CARD_LockRom = 0x020D66E0; -CARDi_ReadRom = 0x020D72AC; -CTRDG_Init = 0x020DBC80; -CONST_3F = 0x0000003F; -CONST_34 = 0x00000034; -gBacklightTop = 0x2106FA0; -gBacklightTop_2 = 0x2106FA0; -gUnknown2106FB8 = 0x2106FB8; -gUnknown21C48B8 = 0x21C48B8; -gUnk021C4918 = 0x21C4918; -gUnk021D76C8 = 0x21D76C8; -gUnk021DBE18 = 0x21DBE18; -gUnk027FFC20 = 0x27FFC20; +gUnk027FFC20 = 0x027FFC20; |