dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

use $ for local labels

Browse Source
This commit is contained in:
YamaArashi
2016-01-06 20:44:58 -08:00
parent 8c312b28ab
commit c14df031ad
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/crt0.s
+14 -14
View File
@@ -54,51 +54,51 @@ InterruptMain: ; 8000248
and r1, r2, r2, lsr 16 and r1, r2, r2, lsr 16
mov r12, 0 mov r12, 0
ands r0, r1, INTR_FLAG_VCOUNT ands r0, r1, INTR_FLAG_VCOUNT
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
mov r0, 0x1 mov r0, 0x1
strh r0, [r3, OFFSET_REG_IME - 0x200] strh r0, [r3, OFFSET_REG_IME - 0x200]
ands r0, r1, INTR_FLAG_SERIAL ands r0, r1, INTR_FLAG_SERIAL
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER3 ands r0, r1, INTR_FLAG_TIMER3
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_HBLANK ands r0, r1, INTR_FLAG_HBLANK
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_VBLANK ands r0, r1, INTR_FLAG_VBLANK
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER0 ands r0, r1, INTR_FLAG_TIMER0
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER1 ands r0, r1, INTR_FLAG_TIMER1
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_TIMER2 ands r0, r1, INTR_FLAG_TIMER2
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA0 ands r0, r1, INTR_FLAG_DMA0
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA1 ands r0, r1, INTR_FLAG_DMA1
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA2 ands r0, r1, INTR_FLAG_DMA2
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_DMA3 ands r0, r1, INTR_FLAG_DMA3
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_KEYPAD ands r0, r1, INTR_FLAG_KEYPAD
bne .foundInterrupt bne $foundInterrupt
add r12, r12, 0x4 add r12, r12, 0x4
ands r0, r1, INTR_FLAG_GAMEPAK ands r0, r1, INTR_FLAG_GAMEPAK
strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200] strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200]
@loop: @loop:
bne @loop bne @loop
.foundInterrupt: $foundInterrupt:
strh r0, [r3, OFFSET_REG_IF - 0x200] strh r0, [r3, OFFSET_REG_IF - 0x200]
bic r2, r2, r0 bic r2, r2, r0
ldr r0, =0x03007868 ldr r0, =0x03007868
asm/libgcnmultiboot.s
+8 -8
View File
@@ -12,15 +12,15 @@ GameCubeMultiBoot_Hash: ; 82DED70
eors r3, r1 eors r3, r1
movs r2, 0x20 movs r2, 0x20
.loop: $loop:
lsrs r3, 1 lsrs r3, 1
bcc .skipExclusiveOr bcc $skipEor
eors r3, r4 eors r3, r4
.skipExclusiveOr: $skipEor:
subs r2, 0x1 subs r2, 0x1
bne .loop bne $loop
pop {r4,pc} pop {r4,pc}
thumb_func_end GameCubeMultiBoot_Hash thumb_func_end GameCubeMultiBoot_Hash
@@ -175,14 +175,14 @@ pool_NintendoLogo: .4byte RomHeaderNintendoLogo
GameCubeMultiBoot_ExecuteProgram: ; 82DEE84 GameCubeMultiBoot_ExecuteProgram: ; 82DEE84
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
cmp r1, 0x2 cmp r1, 0x2
bne .unableToExecute bne $unableToExecute
ldr r3, pool_InterruptRegs ldr r3, pool_InterruptRegs
movs r1, 0 movs r1, 0
strh r1, [r3, OFFSET_REG_IME - 0x200] strh r1, [r3, OFFSET_REG_IME - 0x200]
ldr r1, pool_MultiBootLoadAddr ldr r1, pool_MultiBootLoadAddr
adds r1, 0xC0 adds r1, 0xC0
bx r1 bx r1
.unableToExecute: $unableToExecute:
bx lr bx lr
thumb_func_end GameCubeMultiBoot_ExecuteProgram thumb_func_end GameCubeMultiBoot_ExecuteProgram
@@ -213,10 +213,10 @@ GameCubeMultiBoot_Init: ; 82DEE98
adds r3, GCMB_STRUCT_BASE_DEST_PTR adds r3, GCMB_STRUCT_BASE_DEST_PTR
; clear all but the last 3 fields of the struct ; clear all but the last 3 fields of the struct
.clearStructLoop: $clearStructLoop:
stm r0!, {r1} stm r0!, {r1}
cmp r0, r3 cmp r0, r3
blo .clearStructLoop blo $clearStructLoop
pop {r0,r3} pop {r0,r3}
lsrs r3, 1 lsrs r3, 1