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

Mr Pokemons House

Browse Source
This commit is contained in:
PikalaxALT
2016-01-06 16:59:56 -05:00
parent ce019e6347
commit 69af99da5e
10 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/pokedex.asm
View File

@@ -577,15 +577,15 @@ Jumptable_40405: ; 40405 (10:4405)
; 4040d
Function4040d: ; 4040d (10:440d)
ld b, $0
ld b, DEXMODE_NEW
jr Function40417
Function40411: ; 40411 (10:4411)
ld b, $1
ld b, DEXMODE_OLD
jr Function40417
Function40415: ; 40415 (10:4415)
ld b, $2
ld b, DEXMODE_ABC
Function40417: ; 40417 (10:4417)
ld a, [wCurrentDexMode]
cp b

10
engine/scripting.asm
View File

@@ -141,7 +141,7 @@ ScriptCommandTable: ; 96cb1
dw Script_stringtotext ; 44
dw Script_itemnotify ; 45
dw Script_pocketisfull ; 46
dw Script_textbox ; 47
dw Script_textbox ; 47
dw Script_refreshscreen ; 48
dw Script_closetext ; 49
dw Script_loadbytec2cf ; 4a
@@ -160,15 +160,15 @@ ENDC
dw Script_buttonsound ; 55
dw Script_pokepic ; 56
dw Script_closepokepic ; 57
dw Script__2dmenu ; 58
dw Script_verticalmenu ; 59
dw Script__2dmenu ; 58
dw Script_verticalmenu ; 59
dw Script_loadpikachudata ; 5a
dw Script_randomwildmon ; 5b
dw Script_loadmemtrainer ; 5c
dw Script_loadwildmon ; 5d
dw Script_loadtrainer ; 5e
dw Script_startbattle ; 5f
dw Script_reloadmapafterbattle ; 60
dw Script_reloadmapafterbattle ; 60
dw Script_catchtutorial ; 61
dw Script_trainertext ; 62
dw Script_trainerflagaction ; 63
@@ -203,7 +203,7 @@ ENDC
dw Script_encountermusic ; 80
dw Script_musicfadeout ; 81
dw Script_playmapmusic ; 82
dw Script_dontrestartmapmusic ; 83
dw Script_dontrestartmapmusic ; 83
dw Script_cry ; 84
dw Script_playsound ; 85
dw Script_waitsfx ; 86

2
engine/warp_connection.asm
View File

@@ -9,7 +9,7 @@ RunCallback_05_03: ; 1045b0
call RunMapCallback
RunCallback_03: ; 1045c4
callba ClearCmdQueue
ld a, MAPCALLBACK_PALETTES
ld a, MAPCALLBACK_CMDQUEUE
call RunMapCallback
call GetMapHeaderTimeOfDayNybble
ld [wMapTimeOfDay], a