From b36f793667924f868282ce979fabab3e95d642a5 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 13:57:26 -0700 Subject: Use macros for predef calls/jumps instead of static ids. --- scripts/route23.asm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'scripts/route23.asm') diff --git a/scripts/route23.asm b/scripts/route23.asm index 507db5ce..55184600 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -18,12 +18,10 @@ Route23Script_511e9: ; 511e9 (14:51e9) res 6, [hl] ld a, $7a ld [wcc4d], a - ld a, $15 - call Predef + predef ShowObject ld a, $60 ld [wcc4d], a - ld a, $11 - jp Predef + predef_jump HideObject Route23ScriptPointers: ; 51213 (14:5213) dw Route23Script0 @@ -56,8 +54,7 @@ Route23Script0: ; 51219 (14:5219) ld [wWhichTrade], a ld b, $2 ld hl, wd7ed - ld a, $10 - call Predef + predef FlagActionPredef ld a, c and a ret nz @@ -198,8 +195,7 @@ Route23Script_51346: ; 51346 (14:5346) ld c, a ld b, $2 ld hl, W_OBTAINEDBADGES - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld a, c and a jr nz, .asm_5136e @@ -216,8 +212,7 @@ Route23Script_51346: ; 51346 (14:5346) ld c, a ld b, $1 ld hl, wd7ed - ld a, $10 ; FlagActionPredef - call Predef + predef FlagActionPredef ld a, $2 ld [W_ROUTE23CURSCRIPT], a ret -- cgit v1.3.1-sl0p