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/rom_header.s | |
| parent | 7580227574d4995ec8763326c3dfefa9a486b8f5 (diff) | |
| parent | 09d4bbd57a8d810e2765f77ac7431848ca4328b2 (diff) | |
Merge branch 'master' into main
Diffstat (limited to 'asm/rom_header.s')
| -rw-r--r-- | asm/rom_header.s | 8 |
1 files changed, 4 insertions, 4 deletions
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: |