summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-24 03:07:53 -0700
committerYamaArashi <shadow962@live.com>2016-10-24 03:07:53 -0700
commite9e147fe7d075ddfb1467dc91f3f1a0dd4adf99b (patch)
treece510a42d54927dc58c735f35e7d70543ec0ea31 /data
parent92e63e2577ecf03539f486f40d7f6d563c607d11 (diff)
rename more functions
Diffstat (limited to 'data')
-rw-r--r--data/data2.s2
-rw-r--r--data/specials.s8
2 files changed, 5 insertions, 5 deletions
diff --git a/data/data2.s b/data/data2.s
index 62ab6f901..0370630c0 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -2167,7 +2167,7 @@ gSpriteAnimTable_820A408:: @ 820A408
.align 2
gSpriteTemplate_820A418:: @ 820A418
- spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, sub_80435A4
+ spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, SpriteCB_EggShard
@ The values are Q8.8 fixed-point numbers.
.align 1
diff --git a/data/specials.s b/data/specials.s
index 4b0087182..0d79f0368 100644
--- a/data/specials.s
+++ b/data/specials.s
@@ -188,13 +188,13 @@ gSpecials::
.4byte sp0B9_daycare_relationship_comment
.4byte sub_8042328
.4byte daycare_send
- .4byte sub_8042888
- .4byte sub_8042824
+ .4byte ChooseSendDaycareMon
+ .4byte ShowDaycareLevelMenu
.4byte sub_80417B8
.4byte sub_8041770
.4byte sub_8041648
- .4byte sub_8042AA8
- .4byte sub_8042C80
+ .4byte ScriptHatchMon
+ .4byte EggHatch
.4byte sub_8042B4C
.4byte sub_811043C
.4byte sub_80B7CE8