diff --git a/pokeemerald.sym b/pokeemerald.sym index a0075184a7..d7eea4d3d7 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -688,10 +688,10 @@ 0203cf00 g 00000003 gBattlePartyCurrentOrder 0203cf04 l 00000004 sMirageTowerGfxBuffer 0203cf08 l 00000004 sMirageTowerTilemapBuffer -0203cf0c l 00000004 sUnknown_0203CF0C -0203cf10 l 00000004 sUnknown_0203CF10 +0203cf0c l 00000004 sFallingFossil +0203cf10 l 00000004 sFallingTower 0203cf14 l 00000004 sBgShakeOffsets -0203cf18 g 00000004 sMirageTowerPulseBlend +0203cf18 l 00000004 sMirageTowerPulseBlend 0203cf1c l 00000004 sMonSummaryScreen 0203cf20 g 00000001 gLastViewedMonIndex 0203cf21 l 00000001 sMoveSlotToReplace @@ -860,7 +860,7 @@ 03001294 l 00000001 sNpcId 03001298 l 00000002 sRandMonSetId 0300129c l 00000006 MultiBoot_required_data -030012a8 l 00000010 gUnknown_030012A8 +030012a8 l 00000010 sDebug_DisintegrationData 030012b8 l 00000004 sBerryFix 030012bc g 00000001 gUnknown_030012BC 030012c0 l 00000004 sRibbonDraw_Total @@ -15687,7 +15687,7 @@ 081be9c0 l 00000040 WaitCeilingCrumble 081bea00 l 00000020 FinishCeilingCrumbleTask 081bea20 l 000000b8 CreateCeilingCrumbleSprites -081bead8 l 0000004c MoveCeilingCrumbleSprite +081bead8 l 0000004c SpriteCB_CeilingCrumble 081beb24 l 00000030 SetInvisibleMirageTowerMetatiles 081beb54 g 00000014 StartMirageTowerDisintegration 081beb68 g 00000014 StartMirageTowerShake @@ -15696,9 +15696,9 @@ 081bebb4 l 00000040 UpdateBgShake 081bebf4 l 0000015c InitMirageTowerShake 081bed50 l 000002d8 DoMirageTowerDisintegration -081bf028 l 00000220 DoFossilFallAndSink -081bf248 l 00000070 sub_81BF248 -081bf2b8 l 000000cc sub_81BF2B8 +081bf028 l 00000220 Task_FossilFallAndSink +081bf248 l 00000070 SpriteCB_FallingFossil +081bf2b8 l 000000cc UpdateDisintegrationEffect 081bf384 g 00000058 CB2_InitBerryFixProgram 081bf384 l 00000000 .gcc2_compiled. 081bf3dc l 000001c8 BerryFix_Main @@ -37373,7 +37373,7 @@ 082f076a l 00000005 sOppositeFacingDirection 082f076f l 00000005 sNextFacingDirection 082f0774 l 00000008 sUnionRoomLocalIds -082f077c l 00000010 sUnknown +082f077c l 00000010 sHidePlayerFlags 082f078c l 00000002 sMovement_UnionPlayerExit 082f078e l 00000002 sMovement_UnionPlayerEnter 082f0790 l 00000200 sBgTiles_Pal @@ -48881,7 +48881,7 @@ 0857fbb0 l 00000018 gRotatingBallSpriteTemplate 0857fbc8 l 00000008 sBerryPicOamData 0857fbd0 l 00000008 sBerryPicRotatingOamData -0857fbd8 l 00000008 sSpriteAnim_857FBD8 +0857fbd8 l 00000008 sAnim_BerryPic 0857fbe0 l 00000004 sBerryPicSpriteAnimTable 0857fbe4 l 00000008 sBerryPicSpriteImageTable 0857fbec l 00000018 gBerryPicSpriteTemplate @@ -52690,8 +52690,8 @@ 085b26b4 l 00000008 sOamData_PokeblockCase 085b26bc l 00000008 sSpriteAnim_PokeblockCase 085b26c4 l 00000004 sSpriteAnimTable_PokeblockCase -085b26c8 l 00000028 sSpriteAffineAnim_85B26C8 -085b26f0 l 00000004 sSpriteAffineAnimTable_85B26F0 +085b26c8 l 00000028 sAffineAnim_PokeblockCaseShake +085b26f0 l 00000004 sAffineAnims_PokeblockCaseShake 085b26f4 g 00000008 gPokeblockCase_SpriteSheet 085b26fc g 00000008 gPokeblockCase_SpritePal 085b2704 l 00000018 sSpriteTemplate_PokeblockCase @@ -57655,26 +57655,26 @@ 08617274 l 00000020 sBlankTile_Gfx 08617294 l 00000900 sMirageTower_Gfx 08617b94 l 00000090 sMirageTowerTilemap -08617c24 l 00000020 sRootFossil_Pal -08617c44 l 00000080 sRootFossil_Gfx +08617c24 l 00000020 sFossil_Pal +08617c44 l 00000080 sFossil_Gfx 08617cc4 l 00000080 sMirageTowerCrumbles_Gfx 08617d44 l 00000020 sMirageTowerCrumbles_Palette -08617d64 g 00000030 sCeilingCrumblePositions -08617d94 g 00000010 gMirageTowerCeilingCrumbleSpriteSheets +08617d64 l 00000030 sCeilingCrumblePositions +08617d94 l 00000010 sCeilingCrumbleSpriteSheets 08617da4 l 00000048 sInvisibleMirageTowerMetatiles -08617dec l 00000008 gSpriteAnim_8617DEC -08617df4 l 00000008 gOamData_8617DF4 -08617dfc l 00000004 gSpriteAnimTable_8617DFC -08617e00 l 00000018 gUnknown_08617E00 +08617dec l 00000008 sAnim_FallingFossil +08617df4 l 00000008 sOamData_FallingFossil +08617dfc l 00000004 sAnims_FallingFossil +08617e00 l 00000018 sSpriteTemplate_FallingFossil 08617e18 g 00000008 gMirageTowerPulseBlendSettings -08617e20 l 00000008 sCeilingCrumble2AnimCmd -08617e28 l 00000004 sCeilingCrumble2AnimCmds -08617e2c l 00000008 sCeilingCrumble2OamData -08617e34 l 00000018 sCeilingCrumbleSpriteTemplate2 -08617e4c l 00000008 sCeilingCrumble1AnimCmd -08617e54 l 00000004 sCeilingCrumble1AnimCmds -08617e58 l 00000008 sCeilingCrumble1OamData -08617e60 l 00000018 sCeilingCrumbleSpriteTemplate1 +08617e20 l 00000008 sAnim_CeilingCrumbleSmall +08617e28 l 00000004 sAnims_CeilingCrumbleSmall +08617e2c l 00000008 sOamData_CeilingCrumbleSmall +08617e34 l 00000018 sSpriteTemplate_CeilingCrumbleSmall +08617e4c l 00000008 sAnim_CeilingCrumbleLarge +08617e54 l 00000004 sAnims_CeilingCrumbleLarge +08617e58 l 00000008 sOamData_CeilingCrumbleLarge +08617e60 l 00000018 sSpriteTemplate_CeilingCrumbleLarge 08617e78 l 00000015 sText_BerryProgramUpdate 08617e8d l 0000000e sText_RubySapphire 08617e9b l 00000008 sText_Emerald