diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /scripts/fanclub.asm | |
| parent | 041c4f28a3c35e31329222769534942439b70f29 (diff) | |
| parent | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/fanclub.asm')
| -rwxr-xr-x | scripts/fanclub.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index 21be1443..01d6269b 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -1,7 +1,7 @@ -FanClubScript: ; 59b70 (16:5b70) +FanClubScript: call EnableAutoTextBoxDrawing ld hl, FanClubScriptPointers - ld a, [W_FANCLUBCURSCRIPT] + ld a, [wFanClubCurScript] call JumpTable ret @@ -39,7 +39,7 @@ FanClubScript_59a44: callab CheckPikachuFaintedOrStatused ret c ld a, $1 - ld [W_FANCLUBCURSCRIPT], a + ld [wFanClubCurScript], a xor a ld [wPlayerMovingDirection], a call UpdateSprites @@ -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 "@" |