summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-05-18 02:21:14 -0700
committeryenatch <yenatch@gmail.com>2015-05-18 02:21:14 -0700
commit93a589795fba20dfc92ddac774650f73922334df (patch)
tree61e311ef4634bef99f2bdc95cd5d289ee374078d /engine
parentd4817060dea97479664c0d47202c46e6069b1186 (diff)
parent7563a990aa40d3ff6f0943cb35b8d9a0df03612e (diff)
Merge remote-tracking branch 'kanzure/master'
Diffstat (limited to 'engine')
-rw-r--r--engine/engine_flags.asm10
-rw-r--r--engine/scripting.asm2
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm
index 0d4c27e51..414604661 100644
--- a/engine/engine_flags.asm
+++ b/engine/engine_flags.asm
@@ -3,11 +3,11 @@
; location, bit
; pokegear
- dwb wd957, %00000010 ; radio card ; $0
- dwb wd957, %00000001 ; map card
- dwb wd957, %00000100 ; phone card
- dwb wd957, %00001000 ; expn card
- dwb wd957, %10000000 ; on/off
+ dwb wPokegearFlags, %00000010 ; radio card ; $0
+ dwb wPokegearFlags, %00000001 ; map card
+ dwb wPokegearFlags, %00000100 ; phone card
+ dwb wPokegearFlags, %00001000 ; expn card
+ dwb wPokegearFlags, %10000000 ; on/off
; wDaycareMan, %10000000 ; daycare 1 on
dwb wDaycareMan, %01000000 ; monster 1 and 2 are compatible
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 744cba7be..6999d624d 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -472,7 +472,7 @@ Script_loadmenudata: ; 0x96efa
ld l, a
call GetScriptByte
ld h, a
- ld de, $1d35
+ ld de, LoadMenuDataHeader
ld a, [ScriptBank]
call Function26b7
call Function1ad2