From 40c17c906b2b3f65b3b04b1933b90238a7ac5566 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 26 May 2014 14:04:56 -0700 Subject: Remove most static wram addresses. Use labels instead. For unknown addresses, use "w
". Label overleads are still an issue. --- scripts/route15gateupstairs.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/route15gateupstairs.asm') diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index fde968bb..88b6576f 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -7,17 +7,17 @@ Route15GateUpstairsTextPointers: ; 4964d (12:564d) Route15GateUpstairsText1: ; 49651 (12:5651) db $8 - ld a, [$d7dd] + ld a, [wd7dd] bit 0, a jr nz, .asm_49683 ; 0x49657 $2a ld a, 50 ; pokemon needed ld [$ffdb], a ld a, EXP__ALL ; oak's aide reward ld [$ffdc], a - ld [$d11e], a + ld [wd11e], a call GetItemName - ld hl, $cd6d - ld de, $cc5b + ld hl, wcd6d + ld de, wcc5b ld bc, $000d call CopyData ld a, $62 @@ -25,7 +25,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651) ld a, [$ffdb] cp $1 jr nz, .asm_49689 ; 0x4967c $b - ld hl, $d7dd + ld hl, wd7dd set 0, [hl] .asm_49683 ld hl, Route15GateUpstairsText_4968c -- cgit v1.2.3 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/route15gateupstairs.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/route15gateupstairs.asm') diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index 88b6576f..2d328122 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -20,8 +20,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651) ld de, wcc5b ld bc, $000d call CopyData - ld a, $62 - call Predef ; call oak's aide script + predef OaksAideScript ; call oak's aide script ld a, [$ffdb] cp $1 jr nz, .asm_49689 ; 0x4967c $b -- cgit v1.2.3