summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-29 16:24:41 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-29 16:24:41 -0400
commit9abb62033819774d7b256ee0222f7c6ece987bfe (patch)
treeade69ea7b4186c8438592bca84c1968c2d41fcbd /engine
parent92f3f9119ee7e0a1c70fcc483888baf048d7e6d9 (diff)
Pewter Pokecenter
Diffstat (limited to 'engine')
-rw-r--r--engine/bank3c.asm5
-rw-r--r--engine/bank3f.asm6
-rwxr-xr-xengine/items/items.asm2
-rw-r--r--engine/menu/bills_pc.asm2
-rwxr-xr-xengine/menu/party_menu.asm2
-rwxr-xr-xengine/overworld/cable_club_npc.asm2
-rwxr-xr-xengine/overworld/pokecenter.asm8
-rwxr-xr-xengine/pikachu_pic_animation.asm10
8 files changed, 20 insertions, 17 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index 097dfd3e..9274b8b7 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -352,7 +352,10 @@ INCLUDE "scripts/redshouse1f2.asm"
INCLUDE "scripts/oakslab2.asm"
INCLUDE "scripts/school2.asm"
INCLUDE "scripts/museum1f2.asm"
- dr $f1d98, $f220e
+INCLUDE "scripts/pewterpokecenter2.asm"
+
+Func_f1e22:
+ dr $f1e22, $f220e
INCLUDE "data/mapHeaders/beach_house.asm"
INCLUDE "scripts/beach_house.asm"
diff --git a/engine/bank3f.asm b/engine/bank3f.asm
index c8041a3a..c31fc986 100644
--- a/engine/bank3f.asm
+++ b/engine/bank3f.asm
@@ -27,7 +27,7 @@ Func_fc4fa:: ; fc4fa (3f:44fa)
bit 4, [hl]
res 4, [hl]
jr nz, .asm_fc515
- call Func_1542
+ call ResetPikachuAsleep
call Func_fc523
ld a, $ff
ld [wSpriteStateData1 + $f2], a
@@ -344,7 +344,7 @@ Func_fc6d5:: ; fc6d5 (3f:46d5)
ld a, [wFontLoaded]
bit 0, a
jp nz, asm_fc76a
- call Func_154a
+ call CheckPikachuAsleep
jp nz, asm_fc76a
ld a, [hl]
and $7f
@@ -408,7 +408,7 @@ asm_fc745: ; fc745 (3f:4745)
ld hl, wSpriteStateData2 - wSpriteStateData1
add hl, bc
ld [hl], a
- call Func_154a
+ call CheckPikachuAsleep
jr nz, .asm_fc75f
ld a, [wSpriteStateData1 + $9]
xor $4
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 5d76c37e..eca9eaef 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1765,7 +1765,7 @@ ItemUsePokeflute: ; dfbd (3:5fbd)
.notRoute16
cp a,PEWTER_POKECENTER
jr nz,.noSnorlaxOrPikachuToWakeUp
- call Func_154a
+ call CheckPikachuAsleep
jr z,.noSnorlaxOrPikachuToWakeUp
callab Func_fcb01
jr nc,.noSnorlaxOrPikachuToWakeUp
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index ce9ca5a8..97a65517 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -227,7 +227,7 @@ BillsPCDeposit: ; 2156d (8:556d)
jp c, BillsPCMenu
callab IsThisPartymonStarterPikachu_Party
jr nc, .asm_215ad
- call Func_154a
+ call CheckPikachuAsleep
jr z, .asm_215ad
ld hl, SleepingPikachuText2
call PrintText
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index 3ec0029e..8683d3cb 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -53,7 +53,7 @@ RedrawPartyMenu_: ; 11886 (4:5886)
ld [wWhichPokemon],a
callab IsThisPartymonStarterPikachu_Party
jr nc, .regularMon
- call Func_154a
+ call CheckPikachuAsleep
jr z, .regularMon
ld a, $ff
ld [hPartyMonIndex], a
diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm
index 8f279759..4170a936 100755
--- a/engine/overworld/cable_club_npc.asm
+++ b/engine/overworld/cable_club_npc.asm
@@ -1,7 +1,7 @@
CableClubNPC: ; 7035 (1:7035)
ld hl, CableClubNPCWelcomeText
call PrintText
- call Func_154a
+ call CheckPikachuAsleep
jr nz, .asm_7048
CheckEvent EVENT_GOT_POKEDEX
jp nz, .receivedPokedex
diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm
index 779d852c..3024ff7b 100755
--- a/engine/overworld/pokecenter.asm
+++ b/engine/overworld/pokecenter.asm
@@ -2,7 +2,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97)
ld a, [wCurMap]
cp PEWTER_POKECENTER
jr nz, .regularCenter
- call Func_154a
+ call CheckPikachuAsleep
jr z, .regularCenter
ld hl, LooksContentText ; if pikachu is sleeping, don't heal
call PrintText
@@ -27,7 +27,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97)
call SetLastBlackoutMap
callab IsStarterPikachuInOurParty
jr nc, .notHealingPlayerPikachu
- call Func_154a
+ call CheckPikachuAsleep
jr nz, .notHealingPlayerPikachu
call LoadCurrentMapView
call Delay3
@@ -38,7 +38,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97)
call PrintText
ld c, 64
call DelayFrames
- call Func_154a
+ call CheckPikachuAsleep
jr nz, .playerPikachuNotOnScreen
call Func_152d
callab IsStarterPikachuInOurParty
@@ -58,7 +58,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97)
ld [wLastMusicSoundID], a
ld [wNewSoundID], a
call PlaySound
- call Func_154a
+ call CheckPikachuAsleep
jr nz, .doNotReturnPikachu
callab IsStarterPikachuInOurParty
call c, Func_6eaa
diff --git a/engine/pikachu_pic_animation.asm b/engine/pikachu_pic_animation.asm
index d95eb538..c16e3e5f 100755
--- a/engine/pikachu_pic_animation.asm
+++ b/engine/pikachu_pic_animation.asm
@@ -247,7 +247,7 @@ Func_fd05e: ; fd05e (3f:505e)
bit 7, [hl]
ld a, $1d
jr z, .asm_fd0c9
- call Func_154a
+ call CheckPikachuAsleep
ld a, $1e
jr nz, .asm_fd0c9
jr .asm_fd096
@@ -255,7 +255,7 @@ Func_fd05e: ; fd05e (3f:505e)
ld a, [wCurMap]
cp PEWTER_POKECENTER
jr nz, .notPewterPokecenter
- call Func_154a
+ call CheckPikachuAsleep
ld a, $1a
jr nz, .asm_fd0c9
jr .asm_fd096
@@ -1636,7 +1636,7 @@ PikachuPewterPokecenterCheck: ; fd8d4 (3f:58d4)
ld a, [wCurMap]
cp PEWTER_POKECENTER
ret nz
- call Func_1542
+ call ResetPikachuAsleep
call Func_fcff2
ret
@@ -1644,7 +1644,7 @@ PikachuFanClubCheck: ; fd8e1 (3f:58e1)
ld a, [wCurMap]
cp POKEMON_FAN_CLUB
ret nz
- call Func_1542
+ call ResetPikachuAsleep
call Func_fcff2
ret
@@ -1652,7 +1652,7 @@ PikachuBillsHouseCheck: ; fd8ee (3f:58ee)
ld a, [wCurMap]
cp BILLS_HOUSE
ret nz
- call Func_1542
+ call ResetPikachuAsleep
ret
Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3: ; fd8f8 (3f:58f8)