Changed type1 and type2 to be consistent (pret#2021)

pokeemerald.sym

@@ -1,4 +1,4 @@
-02000000 g 00000000 gHeap
+02000000 g 0001c000 gHeap
 02000000 l 00000000 EWRAM_START
 02000000 l 00000000 ewram
 0201c000 g 00004000 gDecompressionBuffer
@@ -130,7 +130,7 @@
 020241ee g 00000002 gCalledMove
 020241f0 g 00000004 gBattleMoveDamage
 020241f4 g 00000004 gHpDealt
-020241f8 g 00000010 gTakenDmg
+020241f8 g 00000010 gBideDmg
 02024208 g 00000002 gLastUsedItem
 0202420a g 00000001 gLastUsedAbility
 0202420b g 00000001 gBattlerAttacker
@@ -157,7 +157,7 @@
 0202427c g 00000001 gMoveResultFlags
 02024280 g 00000004 gHitMarker
 02024284 l 00000004 sUnusedBattlersArray
-02024288 g 00000004 gTakenDmgByBattler
+02024288 g 00000004 gBideTarget
 0202428c g 00000001 gUnusedFirstBattleVar2
 0202428e g 00000004 gSideStatuses
 02024294 g 00000018 gSideTimers
@@ -1064,7 +1064,6 @@
 03007894 g 00000004 gRfuStatic
 03007898 g 00000004 gRfuFixed
 030078a0 g 0000000c gRfuSIO32Id
-030078ac g 00000000 end
 03007ff0 l 00000000 SOUND_INFO_PTR
 03007ff8 l 00000000 INTR_CHECK
 03007ffa l 00000000 SOFT_RESET_DIRECT_BUF
@@ -3790,7 +3789,7 @@
 0806ad9c g 0000066c SetBoxMonData
 0806b408 g 0000000a CopyMon
 0806b414 g 0000007c GiveMonToPlayer
-0806b490 l 000000aa SendMonToPC
+0806b490 l 000000aa CopyMonToPC
 0806b53c g 00000044 CalculatePlayerPartyCount
 0806b580 g 00000044 CalculateEnemyPartyCount
 0806b5c4 g 00000074 GetMonsStateToDoubles
@@ -5079,14 +5078,14 @@
 0808ed08 g 0000002c UpdateObjectEventsForCameraUpdate
 0808ed34 g 00000044 AddCameraObject
 0808ed78 l 00000028 SpriteCB_CameraObject
-0808eda0 l 0000003c CameraObject_0
-0808eddc l 00000038 CameraObject_1
-0808ee14 l 00000030 CameraObject_2
+0808eda0 l 0000003c CameraObject_Init
+0808eddc l 00000038 CameraObject_UpdateMove
+0808ee14 l 00000030 CameraObject_UpdateFrozen
 0808ee44 l 00000046 FindCameraSprite
-0808ee8c g 0000001c CameraObjectReset1
+0808ee8c g 0000001c CameraObjectReset
 0808eea8 g 0000001a CameraObjectSetFollowedSpriteId
 0808eec4 l 00000018 CameraObjectGetFollowedSpriteId
-0808eedc g 0000000e CameraObjectReset2
+0808eedc g 0000000e CameraObjectFreeze
 0808eeec g 00000062 CopySprite
 0808ef50 g 00000070 CreateCopySpriteAt
 0808efc0 g 00000042 SetObjectEventDirection
@@ -6161,8 +6160,8 @@
 0809bbdc g 0000000c ScrCmd_freerotatingtilepuzzle
 0809bbe8 g 00000014 ScrCmd_selectapproachingtrainer
 0809bbfc g 00000048 ScrCmd_lockfortrainer
-0809bc44 g 00000038 ScrCmd_setmonmodernfatefulencounter
-0809bc7c g 00000038 ScrCmd_checkmonmodernfatefulencounter
+0809bc44 g 00000038 ScrCmd_setmodernfatefulencounter
+0809bc7c g 00000038 ScrCmd_checkmodernfatefulencounter
 0809bcb4 g 00000028 ScrCmd_trywondercardscript
 0809bcdc g 00000092 ScrCmd_warpspinenter
 0809bd70 g 00000044 ScrCmd_setmonmetlocation
@@ -6816,7 +6815,7 @@
 080aa4ec l 0000005c CreatePressStartBanner
 080aa548 l 0000005c CreateCopyrightBanner
 080aa5a4 l 000000b0 SpriteCB_PokemonLogoShine
-080aa654 l 00000026 SpriteCB_PokemonLogoShine2
+080aa654 l 00000026 SpriteCB_PokemonLogoShine_Fast
 080aa67c l 00000104 StartPokemonLogoShine
 080aa780 l 00000024 VBlankCB
 080aa7a4 g 00000388 CB2_InitTitleScreen
@@ -40616,7 +40615,7 @@
 08323aea l 00000018 sSeakingLevelUpLearnset
 08323b02 l 0000001a sStaryuLevelUpLearnset
 08323b1c l 0000000c sStarmieLevelUpLearnset
-08323b28 l 00000020 sMrmimeLevelUpLearnset
+08323b28 l 00000020 sMrMimeLevelUpLearnset
 08323b48 l 00000018 sScytherLevelUpLearnset
 08323b60 l 0000001c sJynxLevelUpLearnset
 08323b7c l 00000014 sElectabuzzLevelUpLearnset
@@ -41264,7 +41263,10 @@
 08339cbe l 00000005 sBerryMasterBerries
 08339cc3 l 00000005 sNumPlayersToSpeedDivisor
 08339cc8 l 0000000a sBlackPokeblockFlavorFlags
-08339cd2 l 00000042 sUnused
+08339cd2 l 0000000d sJPText_GoodTvReady
+08339cdf l 0000000d sJPText_BadTvReady
+08339cec l 00000019 sJPText_Flavors
+08339d05 l 0000000f sUnused
 08339d14 l 00000008 sBlenderRecordWindowTemplate
 08339d1c l 00000020 sContestWinnerPicDummy
 08339d3c l 00000008 sDummyWarpData
@@ -47386,16 +47388,16 @@
 08540030 l 00000018 sVersionBannerRightSpriteTemplate
 08540048 l 00000010 sSpriteSheet_EmeraldVersion
 08540058 l 00000008 sOamData_CopyrightBanner
-08540060 l 00000008 sCopyrightBannerAnim0
-08540068 l 00000008 sCopyrightBannerAnim1
-08540070 l 00000008 sCopyrightBannerAnim2
-08540078 l 00000008 sCopyrightBannerAnim3
-08540080 l 00000008 sCopyrightBannerAnim4
-08540088 l 00000008 sCopyrightBannerAnim5
-08540090 l 00000008 sCopyrightBannerAnim6
-08540098 l 00000008 sCopyrightBannerAnim7
-085400a0 l 00000008 sCopyrightBannerAnim8
-085400a8 l 00000008 sCopyrightBannerAnim9
+08540060 l 00000008 sAnim_PressStart_0
+08540068 l 00000008 sAnim_PressStart_1
+08540070 l 00000008 sAnim_PressStart_2
+08540078 l 00000008 sAnim_PressStart_3
+08540080 l 00000008 sAnim_PressStart_4
+08540088 l 00000008 sAnim_Copyright_0
+08540090 l 00000008 sAnim_Copyright_1
+08540098 l 00000008 sAnim_Copyright_2
+085400a0 l 00000008 sAnim_Copyright_3
+085400a8 l 00000008 sAnim_Copyright_4
 085400b0 l 00000028 sStartCopyrightBannerAnimTable
 085400d8 l 00000018 sStartCopyrightBannerSpriteTemplate
 085400f0 l 00000010 sSpriteSheet_PressStart
@@ -48241,7 +48243,7 @@
 08561951 g 00000094 gSeakingPokedexText
 085619e5 g 000000a0 gStaryuPokedexText
 08561a85 g 00000085 gStarmiePokedexText
-08561b0a g 0000009c gMrmimePokedexText
+08561b0a g 0000009c gMrMimePokedexText
 08561ba6 g 0000008c gScytherPokedexText
 08561c32 g 000000a0 gJynxPokedexText
 08561cd2 g 000000a5 gElectabuzzPokedexText
@@ -50371,9 +50373,7 @@
 0859614c l 00000008 sAnim_PoisonProjectile
 08596154 l 00000008 sAnim_AcidPoisonDroplet
 0859615c l 00000008 sAnim_SludgeBombHit
-08596164 l 00000004 sAnims_PoisonProjectile
-08596168 l 00000004 sAnims_AcidPoisonDroplet
-0859616c l 00000004 sAnims_SludgeBombHit
+08596164 l 0000000c sAnims_PoisonProjectile
 08596170 l 00000020 sAffineAnim_PoisonProjectile
 08596190 l 00000010 sAffineAnim_SludgeBombHit
 085961a0 l 00000004 sAffineAnims_PoisonProjectile
@@ -52537,10 +52537,9 @@
 085a80a0 l 00000008 sSubspriteTable_DigitalDisplay_Unused1
 085a80a8 l 00000018 sSubsprites_DigitalDisplay_Win
 085a80c0 l 00000008 sSubspriteTable_DigitalDisplay_Win
-085a80c8 l 00000004 sSubsprites_DigitalDisplay_Smoke
-085a80cc l 00000004 sSubsprites_DigitalDisplay_Unused2
-085a80d0 l 00000008 sSubspriteTable_DigitalDisplay_Smoke
-085a80d8 l 00000008 sSubspriteTable_DigitalDisplay_Unused2
+085a80c8 l 00000004 sSubsprites_DigitalDisplay_SmokeBig
+085a80cc l 00000004 sSubsprites_DigitalDisplay_SmokeSmall
+085a80d0 l 00000010 sSubspriteTable_DigitalDisplay_Smoke
 085a80e0 l 00000030 sSubsprites_DigitalDisplay_Pokeball
 085a8110 l 00000008 sSubspriteTable_DigitalDisplay_Pokeball
 085a8118 l 0000000c sSubsprites_DigitalDisplay_DPad
@@ -58097,8 +58096,7 @@
 0861ccec l 00000028 sPageSkillsTemplate
 0861cd14 l 00000018 sPageMovesTemplate
 0861cd2c l 00000027 sTextColors
-0861cd53 l 00000080 sAButton_Gfx
-0861cdd3 l 00000080 sBButton_Gfx
+0861cd53 l 00000100 sButtons_Gfx
 0861ce54 l 00000010 sTextPrinterFunctions
 0861ce64 l 00000010 sTextPrinterTasks
 0861ce74 l 00000007 sMemoNatureTextColor
@@ -68351,7 +68349,7 @@
 08b2e18c g 000007a4 gMonFrontPic_Seaking
 08b2e930 g 00000534 gMonFrontPic_Staryu
 08b2ee64 g 0000066c gMonFrontPic_Starmie
-08b2f4d0 g 0000063c gMonFrontPic_Mrmime
+08b2f4d0 g 0000063c gMonFrontPic_MrMime
 08b2fb0c g 00000840 gMonFrontPic_Scyther
 08b3034c g 00000894 gMonFrontPic_Jynx
 08b30be0 g 000007e8 gMonFrontPic_Electabuzz
@@ -70020,12 +70018,12 @@
 08c8396c g 00000028 gMonShinyPalette_Starmie
 08c83994 g 00000400 gMonIcon_Starmie
 08c83d94 g 00000020 gMonFootprint_Starmie
-08c83db4 g 000003b0 gMonStillFrontPic_Mrmime
-08c84164 g 00000028 gMonPalette_Mrmime
-08c8418c g 00000334 gMonBackPic_Mrmime
-08c844c0 g 00000028 gMonShinyPalette_Mrmime
-08c844e8 g 00000400 gMonIcon_Mrmime
-08c848e8 g 00000020 gMonFootprint_Mrmime
+08c83db4 g 000003b0 gMonStillFrontPic_MrMime
+08c84164 g 00000028 gMonPalette_MrMime
+08c8418c g 00000334 gMonBackPic_MrMime
+08c844c0 g 00000028 gMonShinyPalette_MrMime
+08c844e8 g 00000400 gMonIcon_MrMime
+08c848e8 g 00000020 gMonFootprint_MrMime
 08c84908 g 000004ac gMonStillFrontPic_Scyther
 08c84db4 g 00000028 gMonPalette_Scyther
 08c84ddc g 000003a8 gMonBackPic_Scyther
@@ -72932,8 +72930,7 @@
 08dc1694 g 00000020 gFrontierPassMapCursor_Pal
 08dc16b4 g 00000020 gFrontierPassMedalsSilver_Pal
 08dc16d4 g 00000020 gFrontierPassMedalsGold_Pal
-08dc16f4 g 00000060 gPokedexBgHoenn_Pal
-08dc1754 g 00000060 gPokedexCaughtScreen_Pal
+08dc16f4 g 000000c0 gPokedexBgHoenn_Pal
 08dc17b4 g 000000c0 gPokedexSearchResults_Pal
 08dc1874 g 000000c0 gPokedexBgNational_Pal
 08dc1934 g 00000a18 gPokedexMenu_Gfx