From 4679ee99a677ac6646dd6375bd332bcffff0de1a Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sat, 2 Jan 2016 04:26:18 -0800 Subject: [PATCH] use relative labels in more places --- Lua/inject/bombtornado.asm | 8 ++++---- Lua/inject/spawn.asm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Lua/inject/bombtornado.asm b/Lua/inject/bombtornado.asm index 653330a..08c32e4 100644 --- a/Lua/inject/bombtornado.asm +++ b/Lua/inject/bombtornado.asm @@ -36,7 +36,7 @@ main: la t0, rotations li t2, @rotate_amount li t9, 0 -rotate_loop: +-: lw t1, 0(t0) mtc1 t1, F0 mtc1 t2, F1 @@ -46,7 +46,7 @@ rotate_loop: addi t0, t0, 4 addi t9, t9, 1 li at, 6 - bne t9, at, rotate_loop + bne t9, at, - nop la t0, rotations sw t0, current_rotation @@ -79,7 +79,7 @@ process_actor: // args: a0. returns nothing. // s1: result of cos lh t0, 0(a0) subiu t0, t0, @at_bomb - bne t0, r0, process_actor_return + bne t0, r0, + nop li t0, 0x45 sb t0, @actor_bomb_timer(a0) @@ -126,7 +126,7 @@ process_actor: // args: a0. returns nothing. addi t5, t5, 4 sw t5, current_rotation -process_actor_return: ++: jpop 4, s0, s1, ra rotations: diff --git a/Lua/inject/spawn.asm b/Lua/inject/spawn.asm index 6c5e09c..f29e3e2 100644 --- a/Lua/inject/spawn.asm +++ b/Lua/inject/spawn.asm @@ -164,11 +164,11 @@ is_object_loaded: li v0, 1 -: 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 addi t0, t0, 68 bne t1, r0, - nop cl v0 -is_object_loaded_return: ++: jpop 4