From 35a3d1ee43c9d60c9ec1cb3e15d02bdc02080fa9 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sun, 10 Apr 2016 07:17:23 -0700 Subject: [PATCH] use relative return labels --- patch/extra.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patch/extra.asm b/patch/extra.asm index 6e7883d..8e80a9d 100644 --- a/patch/extra.asm +++ b/patch/extra.asm @@ -1,4 +1,4 @@ - ; note: we check the first byte here to determine if we've been loaded already +; note: we check the first byte here to determine if we've been loaded already .word 0xDEADBEEF ; so this can't be 0x00xxxxxx whatever: ; debugging stuff .word 0 @@ -210,13 +210,13 @@ shuffle_get: beq a0, t5, + nop addi t1, t1, 1 - beq t1, t0, shuffle_get_return + beq t1, t0, +return nop b - addi t4, t4, 4 ; 2*sizeof(halfword) +: lhu v0, 2(t4) -shuffle_get_return: ++return: jpop 4, ra, 1 unset_alt_scene: @@ -270,7 +270,7 @@ set_alt_scene: li a1, 33 jal get_event_flag li a2, 7 - beqz v0, set_alt_scene_return + beqz v0, +return nop andi t9, s0, 0x01FF andi t0, s0, 0xFE00 @@ -289,7 +289,7 @@ set_alt_scene: li at, 0xB600 addu s0, t9, at +: -set_alt_scene_return: ++return: mov v0, s0 jpop 4, s0, ra