Merge pull request pret#1926 from AsparagusEduardo/pret/pr2/EggWall

pokeemerald.sym

@@ -20406,13 +20406,13 @@
 08204234 l 00000000 PetalburgCity_WallysHouse_OnWarp
 0820423e g 00000000 PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther
 08204247 l 00000000 PetalburgCity_WallysHouse_OnFrame
-08204251 g 00000000 PetalburgCity_WallysHouse_EventScript_GiveHM03Surf
+08204251 g 00000000 PetalburgCity_WallysHouse_EventScript_GiveHMSurf
 08204278 g 00000000 PetalburgCity_WallysHouse_EventScript_WallysDad
-082042a2 g 00000000 PetalburgCity_WallysHouse_EventScript_ReceievedHM03Surf
+082042a2 g 00000000 PetalburgCity_WallysHouse_EventScript_ReceievedHMSurf
 082042ac g 00000000 PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad
 082042b6 g 00000000 PetalburgCity_WallysHouse_EventScript_PlayedWithWally
 082042c0 g 00000000 PetalburgCity_WallysHouse_EventScript_WallysMom
-082042d5 g 00000000 PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf
+082042d5 g 00000000 PetalburgCity_WallysHouse_EventScript_ReceivedHMSurf
 082042df l 00000000 PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally
 0820444d l 00000000 PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing
 0820446e l 00000000 PetalburgCity_WallysHouse_Text_PleaseExcuseUs
@@ -21244,17 +21244,17 @@
 0820febb g 00000000 MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage
 0820fece g 00000000 MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 0820fed9 g 00000000 MauvilleCity_GameCorner_EventScript_ChooseTMPrize
-0820ff2b g 00000000 MauvilleCity_GameCorner_EventScript_TM32
-0820ff3e g 00000000 MauvilleCity_GameCorner_EventScript_TM29
-0820ff51 g 00000000 MauvilleCity_GameCorner_EventScript_TM35
-0820ff64 g 00000000 MauvilleCity_GameCorner_EventScript_TM24
-0820ff77 g 00000000 MauvilleCity_GameCorner_EventScript_TM13
+0820ff2b g 00000000 MauvilleCity_GameCorner_EventScript_TMDoubleTeam
+0820ff3e g 00000000 MauvilleCity_GameCorner_EventScript_TMPsychic
+0820ff51 g 00000000 MauvilleCity_GameCorner_EventScript_TMFlamethrower
+0820ff64 g 00000000 MauvilleCity_GameCorner_EventScript_TMThunderbolt
+0820ff77 g 00000000 MauvilleCity_GameCorner_EventScript_TMIceBeam
 0820ff8a g 00000000 MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
-0820ffdd g 00000000 MauvilleCity_GameCorner_EventScript_BuyTM32
-08210017 g 00000000 MauvilleCity_GameCorner_EventScript_BuyTM29
-08210051 g 00000000 MauvilleCity_GameCorner_EventScript_BuyTM35
-0821008b g 00000000 MauvilleCity_GameCorner_EventScript_BuyTM24
-082100c5 g 00000000 MauvilleCity_GameCorner_EventScript_BuyTM13
+0820ffdd g 00000000 MauvilleCity_GameCorner_EventScript_BuyTMDoubleTeam
+08210017 g 00000000 MauvilleCity_GameCorner_EventScript_BuyTMPsychic
+08210051 g 00000000 MauvilleCity_GameCorner_EventScript_BuyTMFlamethrower
+0821008b g 00000000 MauvilleCity_GameCorner_EventScript_BuyTMThunderbolt
+082100c5 g 00000000 MauvilleCity_GameCorner_EventScript_BuyTMIceBeam
 082100ff g 00000000 MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
 0821010d g 00000000 MauvilleCity_GameCorner_EventScript_NoRoomForTM
 08210118 g 00000000 MauvilleCity_GameCorner_EventScript_CancelTMSelect
@@ -31214,7 +31214,7 @@
 08290d74 g 00000000 Route110_EventScript_ItemRareCandy
 08290d81 g 00000000 Route110_EventScript_ItemDireHit
 08290d8e g 00000000 Route110_EventScript_ItemElixir
-08290d9b g 00000000 Route111_EventScript_ItemTM37
+08290d9b g 00000000 Route111_EventScript_ItemTMSandstorm
 08290da8 g 00000000 Route111_EventScript_ItemStardust
 08290db5 g 00000000 Route111_EventScript_ItemHPUp
 08290dc2 g 00000000 Route111_EventScript_ItemElixir
@@ -31226,7 +31226,7 @@
 08290e10 g 00000000 Route114_EventScript_ItemProtein
 08290e1d g 00000000 Route114_EventScript_ItemEnergyPowder
 08290e2a g 00000000 Route115_EventScript_ItemSuperPotion
-08290e37 g 00000000 Route115_EventScript_ItemTM01
+08290e37 g 00000000 Route115_EventScript_ItemTMFocusPunch
 08290e44 g 00000000 Route115_EventScript_ItemIron
 08290e51 g 00000000 Route115_EventScript_ItemGreatBall
 08290e5e g 00000000 Route115_EventScript_ItemHealPowder
@@ -31293,12 +31293,12 @@
 08291177 g 00000000 GraniteCave_B2F_EventScript_ItemRareCandy
 08291184 g 00000000 JaggedPass_EventScript_ItemBurnHeal
 08291191 g 00000000 FieryPath_EventScript_ItemFireStone
-0829119e g 00000000 FieryPath_EventScript_ItemTM06
-082911ab g 00000000 MeteorFalls_1F_1R_EventScript_ItemTM23
+0829119e g 00000000 FieryPath_EventScript_ItemTMToxic
+082911ab g 00000000 MeteorFalls_1F_1R_EventScript_ItemTMIronTail
 082911b8 g 00000000 MeteorFalls_1F_1R_EventScript_ItemFullHeal
 082911c5 g 00000000 MeteorFalls_1F_1R_EventScript_ItemMoonStone
 082911d2 g 00000000 MeteorFalls_1F_1R_EventScript_ItemPPUP
-082911df g 00000000 MeteorFalls_B1F_2R_EventScript_ItemTM02
+082911df g 00000000 MeteorFalls_B1F_2R_EventScript_ItemTMDragonClaw
 082911ec g 00000000 NewMauville_Inside_EventScript_ItemUltraBall
 082911f9 g 00000000 NewMauville_Inside_EventScript_ItemEscapeRope
 08291206 g 00000000 NewMauville_Inside_EventScript_ItemThunderStone
@@ -31307,15 +31307,15 @@
 0829122d g 00000000 AbandonedShip_Rooms_1F_EventScript_ItemHarborMail
 0829123a g 00000000 AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope
 08291247 g 00000000 AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall
-08291254 g 00000000 AbandonedShip_Room_B1F_EventScript_ItemTM13
+08291254 g 00000000 AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam
 08291261 g 00000000 AbandonedShip_Rooms2_1F_EventScript_ItemRevive
 0829126e g 00000000 AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey
 0829127b g 00000000 AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall
 08291288 g 00000000 AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner
 08291295 g 00000000 AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone
-082912a2 g 00000000 AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18
-082912af g 00000000 ScorchedSlab_EventScript_ItemTM11
-082912bc g 00000000 SafariZone_Northwest_EventScript_ItemTM22
+082912a2 g 00000000 AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance
+082912af g 00000000 ScorchedSlab_EventScript_ItemTMSunnyDay
+082912bc g 00000000 SafariZone_Northwest_EventScript_ItemTMSolarBeam
 082912c9 g 00000000 SafariZone_North_EventScript_ItemCalcium
 082912d6 g 00000000 SafariZone_Southwest_EventScript_ItemMaxRevive
 082912e3 g 00000000 SafariZone_Northeast_EventScript_ItemNugget
@@ -31324,9 +31324,9 @@
 0829130a g 00000000 MtPyre_3F_EventScript_ItemSuperRepel
 08291317 g 00000000 MtPyre_4F_EventScript_ItemSeaIncense
 08291324 g 00000000 MtPyre_5F_EventScript_ItemLaxIncense
-08291331 g 00000000 MtPyre_6F_EventScript_ItemTM30
+08291331 g 00000000 MtPyre_6F_EventScript_ItemTMShadowBall
 0829133e g 00000000 MtPyre_Exterior_EventScript_ItemMaxPotion
-0829134b g 00000000 MtPyre_Exterior_EventScript_ItemTM48
+0829134b g 00000000 MtPyre_Exterior_EventScript_ItemTMSkillSwap
 08291358 g 00000000 AquaHideout_B1F_EventScript_ItemMasterBall
 08291365 g 00000000 AquaHideout_B1F_EventScript_ItemNugget
 08291372 g 00000000 AquaHideout_B1F_EventScript_ItemMaxElixir
@@ -31338,9 +31338,9 @@
 082913c0 g 00000000 ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl
 082913cd g 00000000 ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy
 082913da g 00000000 ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal
-082913e7 g 00000000 ShoalCave_LowTideIceRoom_EventScript_ItemTM07
+082913e7 g 00000000 ShoalCave_LowTideIceRoom_EventScript_ItemTMHail
 082913f4 g 00000000 ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce
-08291401 g 00000000 SeafloorCavern_Room9_EventScript_ItemTM26
+08291401 g 00000000 SeafloorCavern_Room9_EventScript_ItemTMEarthquake
 0829140e g 00000000 Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail
 0829141b g 00000000 Route110_TrickHousePuzzle2_EventScript_ItemHarborMail
 08291428 g 00000000 Route110_TrickHousePuzzle2_EventScript_ItemWaveMail
@@ -31352,7 +31352,7 @@
 08291476 g 00000000 Route110_TrickHousePuzzle8_EventScript_ItemBeadMail
 08291483 g 00000000 VictoryRoad_1F_EventScript_ItemMaxElixir
 08291490 g 00000000 VictoryRoad_1F_EventScript_ItemPPUp
-0829149d g 00000000 VictoryRoad_B1F_EventScript_ItemTM29
+0829149d g 00000000 VictoryRoad_B1F_EventScript_ItemTMPsychic
 082914aa g 00000000 VictoryRoad_B1F_EventScript_ItemFullRestore
 082914b7 g 00000000 VictoryRoad_B2F_EventScript_ItemFullHeal
 082914c4 g 00000000 ArtisanCave_B1F_EventScript_ItemHPUp
@@ -35050,8 +35050,8 @@
 082d9ee1 g 00000000 BattleScript_PresentHealTarget
 082d9efb g 00000000 BattleScript_AlreadyAtFullHp
 082d9f09 g 00000000 BattleScript_EffectFakeOut
-082d9f1a g 00000000 BattleScript_ButItFailedAtkStringPpReduce
-082d9f1b g 00000000 BattleScript_ButItFailedPpReduce
+082d9f1a g 00000000 BattleScript_FailedFromAtkString
+082d9f1b g 00000000 BattleScript_FailedFromPpReduce
 082d9f1c g 00000000 BattleScript_ButItFailed
 082d9f2e g 00000000 BattleScript_NotAffected
 082d9f40 g 00000000 BattleScript_EffectUproar
@@ -40616,7 +40616,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
@@ -45490,10 +45490,10 @@
 085104dc l 00000008 sAnim_Arrow_Right
 085104e4 l 0000000c sAnims_Arrow
 085104f0 l 00000018 sSpriteTemplate_Arrow
-08510508 l 00000008 sSafariBallsWindowTemplate
+08510508 l 00000008 sWindowTemplate_SafariBalls
 08510510 l 00000020 sPyramidFloorNames
-08510530 l 00000008 sPyramidFloorWindowTemplate_2
-08510538 l 00000008 sPyramidFloorWindowTemplate_1
+08510530 l 00000008 sWindowTemplate_PyramidFloor
+08510538 l 00000008 sWindowTemplate_PyramidPeak
 08510540 l 00000068 sStartMenuItems
 085105a8 l 00000004 sBgTemplates_LinkBattleSave
 085105ac l 00000010 sWindowTemplates_LinkBattleSave
@@ -48241,7 +48241,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
@@ -53802,7 +53802,7 @@
 085cd301 l 00000017 sText_LinkTrainerWantsToBattlePause
 085cd318 l 0000001d sText_TwoLinkTrainersWantToBattlePause
 085cd336 l 000000ec sGrammarMoveUsedTable
-085cd422 l 0000000a sDummyWeirdStatusString
+085cd422 l 00000008 sText_EmptyStatus
 085cd42c l 00000120 sTextOnWindowsInfo_Normal
 085cd54c l 00000114 sTextOnWindowsInfo_Arena
 085cd660 l 00000008 sBattleTextOnWindowsInfo
@@ -57698,7 +57698,7 @@
 086180d7 l 0000002e sText_TransmissionFailureTryAgain
 08618108 l 00000008 sBerryFixBgTemplates
 08618110 l 00000028 sBerryFixWindowTemplates
-08618138 l 00000020 sBerryFixPalColors
+08618138 l 00000020 sText_Pal
 08618158 l 00000003 sBerryProgramTextColors
 0861815b l 00000003 sGameTitleTextColors
 08618160 l 00000018 sBerryProgramTexts
@@ -58097,8 +58097,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 +68350,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
@@ -69249,17 +69248,17 @@
 08c2d6ac g 00000024 gBattleAnimSpritePal_PinkCloud
 08c2d6d0 g 00000028 gBattleAnimSpriteGfx_SweatDrop
 08c2d6f8 g 00000028 gBattleAnimSpritePal_SweatDrop
-08c2d720 g 00000210 gBattleStatMask_Gfx
-08c2d930 g 0000011c gBattleStatMask1_Tilemap
-08c2da4c g 0000011c gBattleStatMask2_Tilemap
-08c2db68 g 00000020 gBattleStatMask1_Pal
-08c2db88 g 00000020 gBattleStatMask2_Pal
-08c2dba8 g 00000020 gBattleStatMask3_Pal
-08c2dbc8 g 00000020 gBattleStatMask4_Pal
-08c2dbe8 g 00000020 gBattleStatMask5_Pal
-08c2dc08 g 00000020 gBattleStatMask6_Pal
-08c2dc28 g 00000020 gBattleStatMask7_Pal
-08c2dc48 g 00000020 gBattleStatMask8_Pal
+08c2d720 g 00000210 gStatAnim_Gfx
+08c2d930 g 0000011c gStatAnim_Increase_Tilemap
+08c2da4c g 0000011c gStatAnim_Decrease_Tilemap
+08c2db68 g 00000020 gStatAnim_Defense_Pal
+08c2db88 g 00000020 gStatAnim_Attack_Pal
+08c2dba8 g 00000020 gStatAnim_Accuracy_Pal
+08c2dbc8 g 00000020 gStatAnim_Speed_Pal
+08c2dbe8 g 00000020 gStatAnim_Multiple_Pal
+08c2dc08 g 00000020 gStatAnim_Evasion_Pal
+08c2dc28 g 00000020 gStatAnim_SpAttack_Pal
+08c2dc48 g 00000020 gStatAnim_SpDefense_Pal
 08c2dc68 g 0000013c gCureBubblesGfx
 08c2dda4 g 00000020 gCureBubblesPal
 08c2ddc4 g 0000011c gCureBubblesTilemap
@@ -70020,12 +70019,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
@@ -72924,11 +72923,9 @@
 08dc03f0 g 000000f8 gMailTilemap_Dream
 08dc04e8 g 00000118 gMailTilemap_Fab
 08dc0600 g 00000114 gMailTilemap_Retro
-08dc0714 g 00000020 gFrontierFactorySelectMenu_Pal
-08dc0734 g 00000020 gFrontierFactorySelectMenu_Pal2
-08dc0754 g 000002e0 gFrontierFactorySelectMenu_Gfx
-08dc0a34 g 00000160 gFrontierFactorySelectMenu_Gfx2
-08dc0b94 g 00000800 gFrontierFactorySelectMenu_Tilemap
+08dc0714 g 00000040 gFrontierFactoryMenu_Pal
+08dc0754 g 00000440 gFrontierFactoryMenu_Gfx
+08dc0b94 g 00000800 gFrontierFactoryMenu_Tilemap
 08dc1394 g 000002e0 gFrontierPassMedals_Gfx
 08dc1674 g 00000020 gFrontierPassCursor_Pal
 08dc1694 g 00000020 gFrontierPassMapCursor_Pal
@@ -73134,9 +73131,9 @@
 08dd7300 g 00000060 gTradeGba2_Pal
 08dd7360 g 00001400 gTradeGba_Gfx
 08dd8760 l 00000020 sEmptyPal
-08dd8780 g 00000040 gBerryFixGameboy_Pal
-08dd87c0 g 00000720 gBerryFixGameboy_Gfx
-08dd8ee0 g 000001a0 gBerryFixGameboy_Tilemap
+08dd8780 g 00000040 gBerryFixGbaConnect_Pal
+08dd87c0 g 00000720 gBerryFixGbaConnect_Gfx
+08dd8ee0 g 000001a0 gBerryFixGbaConnect_Tilemap
 08dd9080 g 00000060 gBerryFixGameboyLogo_Pal
 08dd90e0 g 00000638 gBerryFixGameboyLogo_Gfx
 08dd9718 g 0000015c gBerryFixGameboyLogo_Tilemap