summaryrefslogtreecommitdiff
path: root/scripts/mansion2.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-18 12:29:05 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-18 12:29:05 -0500
commit54c1893d579cdf6853c6a64953bae281a6075fe3 (patch)
tree11717604336caa83ddcdb1bd8b1c765d54cf708b /scripts/mansion2.asm
parenta002d01860a2c5a745e5837c4ff9f5d3c9e110fe (diff)
parentfc9af362ae65d24c66b39ea7759637cc9c1f9b0a (diff)
Merge pull request #104 from YamaArashi/master
fix variable naming
Diffstat (limited to 'scripts/mansion2.asm')
-rwxr-xr-xscripts/mansion2.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm
index 40827be1..27ccbdfb 100755
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -49,7 +49,7 @@ Mansion2Script_Switches: ; 52037 (14:6037)
xor a
ld [hJoyHeld], a
ld a, $5
- ld [H_SPRITEHEIGHT], a
+ ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion2ScriptPointers: ; 52047 (14:6047)
@@ -59,7 +59,7 @@ Mansion2ScriptPointers: ; 52047 (14:6047)
Mansion2TextPointers: ; 5204d (14:604d)
dw Mansion2Text1
- dw Predef5CText
+ dw PickUpItemText
dw Mansion2Text3
dw Mansion2Text4
dw Mansion2Text5