summaryrefslogtreecommitdiff
path: root/scripts/ceruleanhouse2.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-09-20 00:57:27 -0400
committeryenatch <yenatch@gmail.com>2014-09-20 00:57:27 -0400
commitdff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch)
tree3618582f76f4183b6bc22c5d4743b6d171d11128 /scripts/ceruleanhouse2.asm
parent1185d69819af3493fe8ace9f576fee4b420db55e (diff)
parent2ed65d9c3e3ba60939ebe2928ffddc06a90b1876 (diff)
Merge remote-tracking branch 'YamaArashi/master'
Conflicts: constants/misc_constants.asm engine/battle/core.asm engine/menu/pokedex.asm engine/town_map.asm home.asm hram.asm
Diffstat (limited to 'scripts/ceruleanhouse2.asm')
-rwxr-xr-xscripts/ceruleanhouse2.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/ceruleanhouse2.asm b/scripts/ceruleanhouse2.asm
index a45c0fda..3fa72183 100755
--- a/scripts/ceruleanhouse2.asm
+++ b/scripts/ceruleanhouse2.asm
@@ -1,8 +1,8 @@
CeruleanHouse2Script: ; 74e09 (1d:4e09)
ld a, $1
- ld [wcf0c], a
+ ld [wAutoTextBoxDrawingControl], a
dec a
- ld [wcc3c], a
+ ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ret
CeruleanHouse2TextPointers: ; 74e13 (1d:4e13)
@@ -27,7 +27,7 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15)
ld [wcf8c], a
xor a
ld [wcf93], a
- ld [wcc35], a
+ ld [wMenuItemToSwap], a
ld a, SPECIALLISTMENU
ld [wListMenuID], a
call DisplayListMenuID