diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-12 17:44:30 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-12 17:44:30 -0400 |
| commit | 4a7f4cf494b45f74f74edde0a9574989aabd8175 (patch) | |
| tree | 6b040feffc2c4b86885fbe638fa9dfdd92e8c8ce /asm | |
| parent | 7580227574d4995ec8763326c3dfefa9a486b8f5 (diff) | |
| parent | 09d4bbd57a8d810e2765f77ac7431848ca4328b2 (diff) | |
Merge branch 'master' into main
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/main.s | 6 | ||||
| -rw-r--r-- | asm/rom2.s | 2 | ||||
| -rw-r--r-- | asm/rom3.s | 5 | ||||
| -rw-r--r-- | asm/rom_header.s | 8 |
4 files changed, 13 insertions, 8 deletions
@@ -2,8 +2,8 @@ .text - arm_func_start Entry_ARM9 -Entry_ARM9: @ 0x02000800 + arm_func_start Entry +Entry: @ 0x02000800 mov ip, #0x4000000 str ip, [ip, #0x208] _02000808: @@ -86,7 +86,7 @@ _0200092C: .4byte 0x027FFF9C _02000930: .4byte 0x01FF8000 _02000934: .4byte 0x02000C55 @ NdsMain _02000938: .4byte 0xFFFF0000 - arm_func_end Entry_ARM9 + arm_func_end Entry arm_func_start sub_200093C sub_200093C: @@ -10,4 +10,4 @@ sub_20EC5CC: .global sub_20EC694 sub_20EC694: -.incbin "baserom.nds", 0xF0694, 0x3F0F96C +.incbin "baserom.nds", 0xF0694, 0x1b090 diff --git a/asm/rom3.s b/asm/rom3.s new file mode 100644 index 00000000..ddb524ba --- /dev/null +++ b/asm/rom3.s @@ -0,0 +1,5 @@ +/* rom3.s TODO: Disassemble */ + +.section .text + +.incbin "baserom.nds", 0x10B724, 0x3EF48DC diff --git a/asm/rom_header.s b/asm/rom_header.s index e850d0f8..2dc62ad5 100644 --- a/asm/rom_header.s +++ b/asm/rom_header.s @@ -29,13 +29,13 @@ RomVersion: .space 1 ARM9ROMOffset: -.word 0x00004000 +.word _arm9SegmentRomStart ARM9EntryAddress: -.word 0x02000800 +.word Entry ARM9RAMAddress: -.word 0x02000000 +.word _arm9SegmentStart ARM9CodeSize: -.word 0x00107724 +.word _arm9SegmentSize ARM7ROMOffset: .word 0x0030D000 ARM7EntryAddress: |