diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-18 12:29:05 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-18 12:29:05 -0500 |
| commit | 54c1893d579cdf6853c6a64953bae281a6075fe3 (patch) | |
| tree | 11717604336caa83ddcdb1bd8b1c765d54cf708b /scripts/route12.asm | |
| parent | Clean up map connections (diff) | |
| parent | fix variable naming (diff) | |
| download | pokeyellow-54c1893d579cdf6853c6a64953bae281a6075fe3.tar.gz pokeyellow-54c1893d579cdf6853c6a64953bae281a6075fe3.tar.xz pokeyellow-54c1893d579cdf6853c6a64953bae281a6075fe3.zip | |
Merge pull request #104 from YamaArashi/master
fix variable naming
Diffstat (limited to 'scripts/route12.asm')
| -rwxr-xr-x | scripts/route12.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/route12.asm b/scripts/route12.asm index eed676b3..8fe9d8f7 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -28,7 +28,7 @@ Route12Script0: ; 59619 (16:5619) res 6, [hl] jp z, CheckFightingMapTrainers ld a, $d - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX ld [W_CUROPPONENT], a @@ -51,7 +51,7 @@ Route12Script3: ; 5964c (16:564c) cp $2 jr z, .asm_59664 ld a, $e - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_59664 ld hl, wd7d8 @@ -71,8 +71,8 @@ Route12TextPointers: ; 59675 (16:5675) dw Route12Text6 dw Route12Text7 dw Route12Text8 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Route12Text11 dw Route12Text12 dw Route12Text13 |