aboutsummaryrefslogtreecommitdiffstats
path: root/home
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-13 11:10:03 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-13 11:10:03 -0500
commitb88572fbccecc8d125fe8a50365751f0530d1a9a (patch)
tree46a733a0ad7259689b9b5577f109751f34f42956 /home
parentMention YELLMONS.GB in the readme (diff)
downloadpokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.tar.gz
pokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.tar.xz
pokeyellow-b88572fbccecc8d125fe8a50365751f0530d1a9a.zip
Add constants for player and rival starters
Diffstat (limited to 'home')
-rw-r--r--home/map_objects.asm2
-rw-r--r--home/text.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 51206cc5..a54e8f31 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -81,7 +81,7 @@ IsSurfingPikachuInParty::
ld b, SURF
.loop
ld a, [hl]
- cp PIKACHU
+ cp STARTER_PIKACHU
jr nz, .notPikachu
push hl
ld de, $8
diff --git a/home/text.asm b/home/text.asm
index 70fade56..3b6e229c 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -553,7 +553,7 @@ TextCommandSounds::
db TX_SOUND_GET_ITEM_2, SFX_GET_ITEM_2
db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM
db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED
- db TX_SOUND_CRY_PIKACHU, PIKACHU ; used in OakSpeech
+ db TX_SOUND_CRY_PIKACHU, STARTER_PIKACHU ; used in OakSpeech
db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12
db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused