diff options
Diffstat (limited to 'arm7/asm')
| -rw-r--r-- | arm7/asm/crt0.s | 8 | ||||
| -rw-r--r-- | arm7/asm/dtcm2.s | 24 | ||||
| -rw-r--r-- | arm7/asm/ext.s | 61 |
3 files changed, 44 insertions, 49 deletions
diff --git a/arm7/asm/crt0.s b/arm7/asm/crt0.s index d25a70dd..4e671676 100644 --- a/arm7/asm/crt0.s +++ b/arm7/asm/crt0.s @@ -1,6 +1,6 @@ .include "asm/macros.inc" .include "global.inc" - .global ARM7AutoLoad + .global _start_AutoloadDoneCallback .section .text arm_func_start _start @@ -102,9 +102,9 @@ _02380140: bcc _02380140 beq _02380110 _02380150: - b ARM7AutoLoad + b _start_AutoloadDoneCallback _2380154: .word _2380198 -ARM7AutoLoad: +_start_AutoloadDoneCallback: bx lr arm_func_end FUN_2380100 @@ -135,5 +135,3 @@ _2380198: .word SDK_AUTOLOAD_START .word SDK_STATIC_BSS_START .word SDK_STATIC_BSS_END - - .balign 16, 0 diff --git a/arm7/asm/dtcm2.s b/arm7/asm/dtcm2.s index 40b14c39..522c63c2 100644 --- a/arm7/asm/dtcm2.s +++ b/arm7/asm/dtcm2.s @@ -6284,28 +6284,28 @@ _03806664: .word _0380A3F0 arm_func_start FUN_03806668 FUN_03806668: ;@ 0x03806668 - ldr pc, _0380666C ;@ =_06006978 -_0380666C: .word _06006978 + ldr pc, _0380666C ;@ =FUNC_06006978 +_0380666C: .word FUNC_06006978 arm_func_start FUN_03806670 FUN_03806670: ;@ 0x03806670 - ldr pc, _03806674 ;@ =_060009A4 -_03806674: .word _060009A4 + ldr pc, _03806674 ;@ =FUNC_060009A4 +_03806674: .word FUNC_060009A4 arm_func_start FUN_03806678 FUN_03806678: ;@ 0x03806678 - ldr pc, _0380667C ;@ =_06000204 -_0380667C: .word _06000204 + ldr pc, _0380667C ;@ =FUNC_06000204 +_0380667C: .word FUNC_06000204 arm_func_start FUN_03806680 FUN_03806680: ;@ 0x03806680 - ldr pc, _03806684 ;@ =_06008CC4 -_03806684: .word _06008CC4 + ldr pc, _03806684 ;@ =FUNC_06008CC4 +_03806684: .word FUNC_06008CC4 arm_func_start FUN_03806688 FUN_03806688: ;@ 0x03806688 - ldr pc, _0380668C ;@ =_060001F8 -_0380668C: .word _060001F8 + ldr pc, _0380668C ;@ =FUNC_060001F8 +_0380668C: .word FUNC_060001F8 arm_func_start FUN_03806690 FUN_03806690: ;@ 0x03806690 @@ -6613,8 +6613,8 @@ _03806A8C: .word _0380A4A4 arm_func_start FUN_03806A90 FUN_03806A90: ;@ 0x03806A90 - ldr pc, _03806A94 ;@ =_06000798 -_03806A94: .word _06000798 + ldr pc, _03806A94 ;@ =FUNC_06000798 +_03806A94: .word FUNC_06000798 arm_func_start FUN_03806A98 FUN_03806A98: ;@ 0x03806A98 diff --git a/arm7/asm/ext.s b/arm7/asm/ext.s index 070645ea..7c312dce 100644 --- a/arm7/asm/ext.s +++ b/arm7/asm/ext.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - ; This file's BSS - ; Linking of BSS is a work in progress - .extern _06019980 - .extern _06019988 - .extern _060199A8 - .extern _060199B8 - .extern _060199D8 - .extern _060199E8 - .extern _06019A08 - .extern _0601AA88 - .extern _0601AEB4 - arm_func_start FUN_06000000 FUN_06000000: ; 0x06000000 ldr r1, _0600002C ; =_0601A960 @@ -29589,23 +29577,32 @@ _06019958: .word 0x00040001 .word 0x00000008 -; .section .bss -; .balign 16, 0 -; _06019980: -; .space 8 -; _06019988: -; .space 32 -; _060199A8: -; .space 16 -; _060199B8: -; .space 32 -; _060199D8: -; .space 16 -; _060199E8: -; .space 32 -; _06019A08: -; .space 16 -; _0601AA88: -; .space 1068 -; _0601AEB4: -; .space 92 + .section .bss + .balign 16, 0 + .global _06019960 +_06019960: + .space 32 +_06019980: + .space 8 +_06019988: + .space 32 +_060199A8: + .space 16 +_060199B8: + .space 32 +_060199D8: + .space 16 +_060199E8: + .space 32 +_06019A08: + .space 0xF58 + .global _0601A960 +_0601A960: + .space 0x118 +_0601AA88: + .space 0x400 + .global _0601AE88 +_0601AE88: + .space 0x2C +_0601AEB4: + .space 92 |