From 6e8c3883e430b567f7aa8f9230e366e03610bd5a Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 8 Jun 2016 05:44:58 -0600 Subject: Part 1 of syncing with pokered. --- scripts/fanclub.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/fanclub.asm') diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index 21be1443..44c55168 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -1,4 +1,4 @@ -FanClubScript: ; 59b70 (16:5b70) +FanClubScript: call EnableAutoTextBoxDrawing ld hl, FanClubScriptPointers ld a, [W_FANCLUBCURSCRIPT] @@ -68,7 +68,7 @@ PikachuMovementScript_59a8c: db $1e db $3f -FanClubTextPointers: ; 59b84 (16:5b84) +FanClubTextPointers: dw FanClubText1 dw FanClubText2 dw FanClubText3 @@ -302,6 +302,6 @@ Text_59c2e: TX_FAR FanClubChairPrintText4 db "@" -FanClubText6: ; 59c88 (16:5c88) +FanClubText6: TX_FAR _FanClubText6 db "@" -- cgit v1.2.3 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/fanclub.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/fanclub.asm') diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index a03fd2d7..80f8247f 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -1,7 +1,7 @@ FanClubScript: ; 59b70 (16:5b70) call EnableAutoTextBoxDrawing ld hl, FanClubScriptPointers - ld a, [W_FANCLUBCURSCRIPT] + ld a, [wFanClubCurScript] call JumpTable ret @@ -39,7 +39,7 @@ FanClubScript_59a44: callab Func_fce73 ret c ld a, $1 - ld [W_FANCLUBCURSCRIPT], a + ld [wFanClubCurScript], a xor a ld [wPlayerMovingDirection], a call UpdateSprites -- cgit v1.2.3