From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 15:45:24 -0500 Subject: Sync with pokered from August 29, 2015 to April 6, 2016 --- scripts/route25.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/route25.asm') diff --git a/scripts/route25.asm b/scripts/route25.asm index 20dcc890..8df84d95 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -2,9 +2,9 @@ Route25Script: ; 515cb (14:55cb) call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25ScriptPointers - ld a, [W_ROUTE25CURSCRIPT] + ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE25CURSCRIPT], a + ld [wRoute25CurScript], a call Route25Script_515e1 ret @@ -15,8 +15,8 @@ Route25Script_515e1: ; 515e1 (14:55e1) res 4, [hl] res 7, [hl] xor a - ld [W_BILLSHOUSECURSCRIPT], a - ld hl, wd126 + ld [wBillsHouseCurScript], a + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z -- cgit v1.3.1-sl0p