diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-14 21:43:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-14 21:43:23 +0100 |
| commit | 95949c772e38e60fa048fb6a91dcc864929c6e83 (patch) | |
| tree | 0b7865c4822f978fd4f023c2669fc36cebf699cf /data | |
| parent | a972de7bca29f890cc130d2029c29233de29c86e (diff) | |
more of daycare done
Diffstat (limited to 'data')
| -rw-r--r-- | data/daycare.s | 2 | ||||
| -rw-r--r-- | data/specials.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/daycare.s b/data/daycare.s index 95ba024cb..483e94fae 100644 --- a/data/daycare.s +++ b/data/daycare.s @@ -18,5 +18,5 @@ gUnknown_0832B6E0:: @ 832B6E0 gUnknown_0832B6F8:: @ 832B6F8 .incbin "baserom.gba", 0x32b6f8, 0x10 -gEggName:: @ 832B708 +sJapaneseEggNickname:: @ 832B708 .string "タマゴ$" @ "tamago" ("egg" in Japanese) diff --git a/data/specials.inc b/data/specials.inc index 35491bb03..928de961b 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -193,8 +193,8 @@ gSpecials:: @ 81DBA64 def_special sub_8138B80 def_special sp0B5_daycare def_special sp0B6_daycare - def_special sub_8070728 - def_special sp0B8_daycare + def_special RejectEggFromDayCare + def_special GiveEggFromDaycare def_special sp0B9_daycare_relationship_comment def_special sub_8070C58 def_special StoreSelectedPokemonInDaycare |