pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kanzure/master'

Browse Source
This commit is contained in:
yenatch
2015-05-18 02:21:14 -07:00
parent d4817060de 7563a990aa
commit 93a589795f
4 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/engine_flags.asm
View File

@@ -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

2
engine/scripting.asm
View File

@@ -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