notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2025-02-05 13:23:23 -08:00
Code Issues Releases Wiki Activity

use relative labels in more places

Browse source
This commit is contained in:
Connor Olding 2016-01-02 04:26:18 -08:00
parent 5653e730aa
commit 4679ee99a6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Lua/inject/bombtornado.asm
View file

@ -36,7 +36,7 @@ main:
la t0, rotations la t0, rotations
li t2, @rotate_amount li t2, @rotate_amount
li t9, 0 li t9, 0
rotate_loop: -:
lw t1, 0(t0) lw t1, 0(t0)
mtc1 t1, F0 mtc1 t1, F0
mtc1 t2, F1 mtc1 t2, F1
@ -46,7 +46,7 @@ rotate_loop:
addi t0, t0, 4 addi t0, t0, 4
addi t9, t9, 1 addi t9, t9, 1
li at, 6 li at, 6
bne t9, at, rotate_loop bne t9, at, -
nop nop
la t0, rotations la t0, rotations
sw t0, current_rotation sw t0, current_rotation
@ -79,7 +79,7 @@ process_actor: // args: a0. returns nothing.
// s1: result of cos // s1: result of cos
lh t0, 0(a0) lh t0, 0(a0)
subiu t0, t0, @at_bomb subiu t0, t0, @at_bomb
bne t0, r0, process_actor_return bne t0, r0, +
nop nop
li t0, 0x45 li t0, 0x45
sb t0, @actor_bomb_timer(a0) sb t0, @actor_bomb_timer(a0)
@ -126,7 +126,7 @@ process_actor: // args: a0. returns nothing.
addi t5, t5, 4 addi t5, t5, 4
sw t5, current_rotation sw t5, current_rotation
process_actor_return: +:
jpop 4, s0, s1, ra jpop 4, s0, s1, ra
rotations: rotations:

4
Lua/inject/spawn.asm
View file

@ -164,11 +164,11 @@ is_object_loaded:
li v0, 1 li v0, 1
-: -:
lh t2, 12(t0) // item's object number lh t2, 12(t0) // item's object number
beq a0, t2, is_object_loaded_return beq a0, t2, +
subi t1, t1, 1 // TODO: double check there's no off-by-one error subi t1, t1, 1 // TODO: double check there's no off-by-one error
addi t0, t0, 68 addi t0, t0, 68
bne t1, r0, - bne t1, r0, -
nop nop
cl v0 cl v0
is_object_loaded_return: +:
jpop 4 jpop 4