diff options
| -rw-r--r-- | asm/crt0.s | 28 | ||||
| -rw-r--r-- | asm/libgcnmultiboot.s | 16 |
2 files changed, 22 insertions, 22 deletions
diff --git a/asm/crt0.s b/asm/crt0.s index efa8d9cab..4ceaba2af 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -54,51 +54,51 @@ InterruptMain: ; 8000248 and r1, r2, r2, lsr 16 mov r12, 0 ands r0, r1, INTR_FLAG_VCOUNT - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 mov r0, 0x1 strh r0, [r3, OFFSET_REG_IME - 0x200] ands r0, r1, INTR_FLAG_SERIAL - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER3 - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_HBLANK - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_VBLANK - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER0 - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER1 - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER2 - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA0 - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA1 - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA2 - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA3 - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_KEYPAD - bne .foundInterrupt + bne $foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_GAMEPAK strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200] @loop: bne @loop -.foundInterrupt: +$foundInterrupt: strh r0, [r3, OFFSET_REG_IF - 0x200] bic r2, r2, r0 ldr r0, =0x03007868 diff --git a/asm/libgcnmultiboot.s b/asm/libgcnmultiboot.s index ecd71e23a..08a61d9bf 100644 --- a/asm/libgcnmultiboot.s +++ b/asm/libgcnmultiboot.s @@ -12,15 +12,15 @@ GameCubeMultiBoot_Hash: ; 82DED70 eors r3, r1 movs r2, 0x20 -.loop: +$loop: lsrs r3, 1 - bcc .skipExclusiveOr + bcc $skipEor eors r3, r4 -.skipExclusiveOr: +$skipEor: subs r2, 0x1 - bne .loop + bne $loop pop {r4,pc} thumb_func_end GameCubeMultiBoot_Hash @@ -175,14 +175,14 @@ pool_NintendoLogo: .4byte RomHeaderNintendoLogo GameCubeMultiBoot_ExecuteProgram: ; 82DEE84 ldrb r1, [r0, 0x2] cmp r1, 0x2 - bne .unableToExecute + bne $unableToExecute ldr r3, pool_InterruptRegs movs r1, 0 strh r1, [r3, OFFSET_REG_IME - 0x200] ldr r1, pool_MultiBootLoadAddr adds r1, 0xC0 bx r1 -.unableToExecute: +$unableToExecute: bx lr thumb_func_end GameCubeMultiBoot_ExecuteProgram @@ -213,10 +213,10 @@ GameCubeMultiBoot_Init: ; 82DEE98 adds r3, GCMB_STRUCT_BASE_DEST_PTR ; clear all but the last 3 fields of the struct -.clearStructLoop: +$clearStructLoop: stm r0!, {r1} cmp r0, r3 - blo .clearStructLoop + blo $clearStructLoop pop {r0,r3} lsrs r3, 1 |