From 84e1af7b7e82964a2f56feb0052fcf55d3c9dd3c Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sat, 12 Mar 2022 14:46:09 +0000 Subject: [PATCH] Merge pull request #1640 from GriffinRichards/doc-egg-hatch --- pokeemerald.sym | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index ae3d495b62..da53084138 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -3990,16 +3990,16 @@ 0807172c l 00000012 VBlankCB_EggHatch 08071740 g 00000020 EggHatch 08071760 l 00000040 Task_EggHatch -080717a0 l 0000025c CB2_EggHatch_0 +080717a0 l 0000025c CB2_LoadEggHatch 080719fc l 00000040 EggHatchSetMonNickname 08071a3c l 00000058 Task_EggHatchPlayBGM -08071a94 l 000003a0 CB2_EggHatch_1 -08071e34 l 00000056 SpriteCB_Egg_0 -08071e8c l 00000062 SpriteCB_Egg_1 -08071ef0 l 000000b4 SpriteCB_Egg_2 -08071fa4 l 00000024 SpriteCB_Egg_3 -08071fc8 l 00000080 SpriteCB_Egg_4 -08072048 l 000000a0 SpriteCB_Egg_5 +08071a94 l 000003a0 CB2_EggHatch +08071e34 l 00000056 SpriteCB_Egg_Shake1 +08071e8c l 00000062 SpriteCB_Egg_Shake2 +08071ef0 l 000000b4 SpriteCB_Egg_Shake3 +08071fa4 l 00000024 SpriteCB_Egg_WaitHatch +08071fc8 l 00000080 SpriteCB_Egg_Hatch +08072048 l 000000a0 SpriteCB_Egg_Reveal 080720e8 l 00000058 SpriteCB_EggShard 08072140 l 00000054 CreateRandomEggShardSprite 08072194 l 00000080 CreateEggShardSprite @@ -40941,16 +40941,16 @@ 0832b70c l 00000020 sEggPalette 0832b72c l 00000800 sEggHatchTiles 0832bf2c l 00000080 sEggShardTiles -0832bfac l 00000008 sOamData_EggHatch -0832bfb4 l 00000008 sSpriteAnim_EggHatch0 -0832bfbc l 00000008 sSpriteAnim_EggHatch1 -0832bfc4 l 00000008 sSpriteAnim_EggHatch2 -0832bfcc l 00000008 sSpriteAnim_EggHatch3 -0832bfd4 l 00000010 sSpriteAnimTable_EggHatch +0832bfac l 00000008 sOamData_Egg +0832bfb4 l 00000008 sSpriteAnim_Egg_Normal +0832bfbc l 00000008 sSpriteAnim_Egg_Cracked1 +0832bfc4 l 00000008 sSpriteAnim_Egg_Cracked2 +0832bfcc l 00000008 sSpriteAnim_Egg_Cracked3 +0832bfd4 l 00000010 sSpriteAnimTable_Egg 0832bfe4 l 00000008 sEggHatch_Sheet 0832bfec l 00000008 sEggShards_Sheet 0832bff4 l 00000008 sEgg_SpritePalette -0832bffc l 00000018 sSpriteTemplate_EggHatch +0832bffc l 00000018 sSpriteTemplate_Egg 0832c014 l 00000008 sOamData_EggShard 0832c01c l 00000008 sSpriteAnim_EggShard0 0832c024 l 00000008 sSpriteAnim_EggShard1