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/mansion1.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/mansion1.asm')
| -rwxr-xr-x | scripts/mansion1.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index d658b425..6673e03b 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -53,7 +53,7 @@ Mansion1Script_Switches: ; 44316 (11:4316) xor a ld [hJoyHeld], a ld a, $4 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion1ScriptPointers: ; 44326 (11:4326) @@ -63,8 +63,8 @@ Mansion1ScriptPointers: ; 44326 (11:4326) Mansion1TextPointers: ; 4432c (11:432c) dw Mansion1Text1 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Mansion1Text4 Mansion1TrainerHeaders: ; 44334 (11:4334) |