Merge pull request #2014 from Bassoonian/battleterrain

pokeemerald.sym

@@ -104,7 +104,7 @@
 02022f78 g 00000010 gBattleTextBuff3
 02022f88 l 00000064 sFlickerArray
 02022fec g 00000004 gBattleTypeFlags
-02022ff0 g 00000001 gBattleTerrain
+02022ff0 g 00000001 gBattleEnvironment
 02022ff4 g 00000004 gUnusedFirstBattleVar1
 02022ff8 g 00000060 gMultiPartnerParty
 02023058 l 00000004 sMultiPartnerPartyBuffer
@@ -3307,7 +3307,7 @@
 08054aa0 l 0000009c Cmd_trymemento
 08054b3c l 0000004c Cmd_setforcedtarget
 08054b88 l 00000064 Cmd_setcharge
-08054bec l 00000074 Cmd_callterrainattack
+08054bec l 00000074 Cmd_callenvironmentattack
 08054c60 l 00000084 Cmd_cureifburnedparalysedorpoisoned
 08054ce4 l 00000058 Cmd_settorment
 08054d3c l 0000005c Cmd_jumpifnodamage
@@ -3338,7 +3338,7 @@
 08055ea4 l 000000b8 Cmd_settypebasedhalvers
 08055f5c l 000000b8 Cmd_setweatherballtype
 08056014 l 000000a8 Cmd_tryrecycleitem
-080560bc l 000000b0 Cmd_settypetoterrain
+080560bc l 000000b0 Cmd_settypetoenvironment
 0805616c l 000000c4 Cmd_pursuitdoubles
 08056230 l 00000054 Cmd_snatchsetbattlers
 08056284 l 0000007c Cmd_removelightscreenreflect
@@ -7083,7 +7083,7 @@
 080b0a74 g 00000084 StartRegiBattle
 080b0af8 l 00000074 CB2_EndWildBattle
 080b0b6c l 00000064 CB2_EndScriptedWildBattle
-080b0bd0 g 00000152 BattleSetup_GetTerrainId
+080b0bd0 g 00000152 BattleSetup_GetEnvironmentId
 080b0d24 l 00000062 GetBattleTransitionTypeByMap
 080b0d88 l 00000060 GetSumOfPlayerPartyLevel
 080b0de8 l 000000e0 GetSumOfEnemyPartyLevel
@@ -10288,7 +10288,7 @@
 08115228 l 0000001a AnimDirtPlumeParticle_Step
 08115244 l 00000098 AnimDigDirtMound
 081152dc g 000000d0 AnimTask_HorizontalShake
-081153ac l 000000f8 AnimTask_ShakeTerrain
+081153ac l 000000f8 AnimTask_ShakePlatforms
 081154a4 l 000000e4 AnimTask_ShakeBattlers
 08115588 l 00000078 SetBattlersXOffsetForShake
 08115600 g 00000028 AnimTask_IsPowerOver99
@@ -10318,11 +10318,11 @@
 08115eb8 l 00000058 AnimTask_FlashAnimTagWithColor_Step2
 08115f10 g 00000084 AnimTask_InvertScreenColor
 08115f94 g 00000110 AnimTask_TintPalettes
-081160a4 l 000000a4 AnimShakeMonOrBattleTerrain
-08116148 l 000000ac AnimShakeMonOrBattleTerrain_Step
-081161f4 l 000000ae AnimShakeMonOrBattleTerrain_UpdateCoordOffsetEnabled
-081162a4 g 00000054 AnimTask_ShakeBattleTerrain
-081162f8 l 00000090 AnimTask_ShakeBattleTerrain_Step
+081160a4 l 000000a4 AnimShakeMonOrBattlePlatforms
+08116148 l 000000ac AnimShakeMonOrBattlePlatforms_Step
+081161f4 l 000000ae AnimShakeMonOrBattlePlatforms_UpdateCoordOffsetEnabled
+081162a4 g 00000054 AnimTask_ShakeBattlePlatforms
+081162f8 l 00000090 AnimTask_ShakeBattlePlatforms_Step
 08116388 l 00000048 AnimHitSplatBasic
 081163d0 l 00000050 AnimHitSplatPersistent
 08116420 l 00000038 AnimHitSplatHandleInvert
@@ -10361,7 +10361,7 @@
 081177e4 g 00000070 AnimTask_SetAllNonAttackersInvisiblity
 08117854 g 0000020c StartMonScrollingBgMask
 08117a60 l 000001c4 UpdateMonScrollingBgMask
-08117c24 g 00000020 AnimTask_GetBattleTerrain
+08117c24 g 00000020 AnimTask_GetBattleEnvironment
 08117c44 g 0000002c AnimTask_AllocBackupPalBuffer
 08117c70 g 00000030 AnimTask_FreeBackupPalBuffer
 08117ca0 g 0000009c AnimTask_CopyPalUnfadedToBackup
@@ -40262,7 +40262,7 @@
 0831aa18 l 000000c8 sStandardBattleWindowTemplates
 0831aae0 l 000000c0 sBattleArenaWindowTemplates
 0831aba0 g 00000008 gBattleWindowTemplates
-0831aba8 l 000000c8 sBattleTerrainTable
+0831aba8 l 000000c8 sBattleEnvironmentTable
 0831ac70 l 0000000c sIntroScanlineParams16Bit
 0831ac7c l 0000000c sIntroScanlineParams32Bit
 0831ac88 g 00000018 gUnusedBattleInitSprite
@@ -40390,7 +40390,7 @@
 0831c440 l 00000024 sPickupItems
 0831c464 l 00000016 sRarePickupItems
 0831c47a l 00000009 sPickupProbabilities
-0831c483 l 0000000a sTerrainToType
+0831c483 l 0000000a sEnvironmentToType
 0831c48d l 00000004 sBallCatchBonuses
 0831c494 g 00000064 gBattlePalaceNatureToMoveGroupLikelihood
 0831c4f8 l 00000019 sBattlePalaceNatureToFlavorTextId
@@ -50604,7 +50604,7 @@
 085972a4 l 00000018 sAnim_CirclingSparkle
 085972bc l 00000004 sAnims_CirclingSparkle
 085972c0 l 00000018 sCirclingSparkleSpriteTemplate
-085972d8 g 00000018 gShakeMonOrTerrainSpriteTemplate
+085972d8 g 00000018 gShakeMonOrPlatformSpriteTemplate
 085972f0 l 00000010 sAffineAnim_HitSplat_0
 08597300 l 00000018 sAffineAnim_HitSplat_1
 08597318 l 00000018 sAffineAnim_HitSplat_2
@@ -71902,71 +71902,71 @@
 08d779d8 g 0000010c gBattleVSFrame_Tilemap
 08d77ae4 g 00000028 gBattleVSFrame_Pal
 08d77b0c g 0000025c gVsLettersGfx
-08d77d68 g 000005b0 gBattleTerrainTiles_TallGrass
-08d78318 g 00000038 gBattleTerrainPalette_TallGrass
-08d78350 g 000002b0 gBattleTerrainTilemap_TallGrass
-08d78600 g 00000678 gBattleTerrainTiles_LongGrass
-08d78c78 g 00000040 gBattleTerrainPalette_LongGrass
-08d78cb8 g 000002b0 gBattleTerrainTilemap_LongGrass
-08d78f68 g 000005f8 gBattleTerrainTiles_Sand
-08d79560 g 00000048 gBattleTerrainPalette_Sand
-08d795a8 g 000002b0 gBattleTerrainTilemap_Sand
-08d79858 g 000005b8 gBattleTerrainTiles_Underwater
-08d79e10 g 00000048 gBattleTerrainPalette_Underwater
-08d79e58 g 000002b0 gBattleTerrainTilemap_Underwater
-08d7a108 g 000005d4 gBattleTerrainTiles_Water
-08d7a6dc g 00000044 gBattleTerrainPalette_Water
-08d7a720 g 000002b0 gBattleTerrainTilemap_Water
-08d7a9d0 g 000005a8 gBattleTerrainTiles_PondWater
-08d7af78 g 00000040 gBattleTerrainPalette_PondWater
-08d7afb8 g 000002b0 gBattleTerrainTilemap_PondWater
-08d7b268 g 000005c0 gBattleTerrainTiles_Rock
-08d7b828 g 0000003c gBattleTerrainPalette_Rock
-08d7b864 g 000002b0 gBattleTerrainTilemap_Rock
-08d7bb14 g 000005f8 gBattleTerrainTiles_Cave
-08d7c10c g 00000048 gBattleTerrainPalette_Cave
-08d7c154 g 000002b0 gBattleTerrainTilemap_Cave
-08d7c404 g 0000003c gBattleTerrainPalette_Plain
-08d7c440 g 000005ac gBattleTerrainTiles_Building
-08d7c9ec g 0000003c gBattleTerrainPalette_Frontier
-08d7ca28 g 000002b0 gBattleTerrainTilemap_Building
-08d7ccd8 g 00000608 gBattleTerrainTiles_Stadium
-08d7d2e0 g 000002b0 gBattleTerrainTilemap_Stadium
-08d7d590 g 00000674 gBattleTerrainTiles_Rayquaza
-08d7dc04 g 000002b0 gBattleTerrainTilemap_Rayquaza
-08d7deb4 g 00000040 gBattleTerrainPalette_Building
-08d7def4 g 0000003c gBattleTerrainPalette_Kyogre
-08d7df30 g 00000058 gBattleTerrainPalette_Groudon
-08d7df88 g 0000003c gBattleTerrainPalette_BuildingGym
-08d7dfc4 g 0000003c gBattleTerrainPalette_BuildingLeader
-08d7e000 g 00000060 gBattleTerrainPalette_StadiumAqua
-08d7e060 g 0000006c gBattleTerrainPalette_StadiumMagma
-08d7e0cc g 00000050 gBattleTerrainPalette_StadiumSidney
-08d7e11c g 00000048 gBattleTerrainPalette_StadiumPhoebe
-08d7e164 g 00000044 gBattleTerrainPalette_StadiumGlacia
-08d7e1a8 g 00000050 gBattleTerrainPalette_StadiumDrake
-08d7e1f8 g 0000003c gBattleTerrainPalette_StadiumWallace
-08d7e234 g 0000004c gBattleTerrainPalette_Rayquaza
-08d7e280 g 00000588 gBattleTerrainAnimTiles_TallGrass
-08d7e808 g 000001bc gBattleTerrainAnimTilemap_TallGrass
-08d7e9c4 g 00000710 gBattleTerrainAnimTiles_LongGrass
-08d7f0d4 g 00000238 gBattleTerrainAnimTilemap_LongGrass
-08d7f30c g 00000544 gBattleTerrainAnimTiles_Sand
-08d7f850 g 000001a8 gBattleTerrainAnimTilemap_Sand
-08d7f9f8 g 000004cc gBattleTerrainAnimTiles_Underwater
-08d7fec4 g 00000190 gBattleTerrainAnimTilemap_Underwater
-08d80054 g 0000060c gBattleTerrainAnimTiles_Water
-08d80660 g 000001a4 gBattleTerrainAnimTilemap_Water
-08d80804 g 0000054c gBattleTerrainAnimTiles_PondWater
-08d80d50 g 0000014c gBattleTerrainAnimTilemap_PondWater
-08d80e9c g 000005e0 gBattleTerrainAnimTiles_Rock
-08d8147c g 00000194 gBattleTerrainAnimTilemap_Rock
-08d81610 g 0000081c gBattleTerrainAnimTiles_Cave
-08d81e2c g 000002a8 gBattleTerrainAnimTilemap_Cave
-08d820d4 g 00000410 gBattleTerrainAnimTiles_Building
-08d824e4 g 00000124 gBattleTerrainAnimTilemap_Building
-08d82608 g 00000668 gBattleTerrainAnimTiles_Rayquaza
-08d82c70 g 000002a0 gBattleTerrainAnimTilemap_Rayquaza
+08d77d68 g 000005b0 gBattleEnvironmentTiles_TallGrass
+08d78318 g 00000038 gBattleEnvironmentPalette_TallGrass
+08d78350 g 000002b0 gBattleEnvironmentTilemap_TallGrass
+08d78600 g 00000678 gBattleEnvironmentTiles_LongGrass
+08d78c78 g 00000040 gBattleEnvironmentPalette_LongGrass
+08d78cb8 g 000002b0 gBattleEnvironmentTilemap_LongGrass
+08d78f68 g 000005f8 gBattleEnvironmentTiles_Sand
+08d79560 g 00000048 gBattleEnvironmentPalette_Sand
+08d795a8 g 000002b0 gBattleEnvironmentTilemap_Sand
+08d79858 g 000005b8 gBattleEnvironmentTiles_Underwater
+08d79e10 g 00000048 gBattleEnvironmentPalette_Underwater
+08d79e58 g 000002b0 gBattleEnvironmentTilemap_Underwater
+08d7a108 g 000005d4 gBattleEnvironmentTiles_Water
+08d7a6dc g 00000044 gBattleEnvironmentPalette_Water
+08d7a720 g 000002b0 gBattleEnvironmentTilemap_Water
+08d7a9d0 g 000005a8 gBattleEnvironmentTiles_PondWater
+08d7af78 g 00000040 gBattleEnvironmentPalette_PondWater
+08d7afb8 g 000002b0 gBattleEnvironmentTilemap_PondWater
+08d7b268 g 000005c0 gBattleEnvironmentTiles_Rock
+08d7b828 g 0000003c gBattleEnvironmentPalette_Rock
+08d7b864 g 000002b0 gBattleEnvironmentTilemap_Rock
+08d7bb14 g 000005f8 gBattleEnvironmentTiles_Cave
+08d7c10c g 00000048 gBattleEnvironmentPalette_Cave
+08d7c154 g 000002b0 gBattleEnvironmentTilemap_Cave
+08d7c404 g 0000003c gBattleEnvironmentPalette_Plain
+08d7c440 g 000005ac gBattleEnvironmentTiles_Building
+08d7c9ec g 0000003c gBattleEnvironmentPalette_Frontier
+08d7ca28 g 000002b0 gBattleEnvironmentTilemap_Building
+08d7ccd8 g 00000608 gBattleEnvironmentTiles_Stadium
+08d7d2e0 g 000002b0 gBattleEnvironmentTilemap_Stadium
+08d7d590 g 00000674 gBattleEnvironmentTiles_Rayquaza
+08d7dc04 g 000002b0 gBattleEnvironmentTilemap_Rayquaza
+08d7deb4 g 00000040 gBattleEnvironmentPalette_Building
+08d7def4 g 0000003c gBattleEnvironmentPalette_Kyogre
+08d7df30 g 00000058 gBattleEnvironmentPalette_Groudon
+08d7df88 g 0000003c gBattleEnvironmentPalette_BuildingGym
+08d7dfc4 g 0000003c gBattleEnvironmentPalette_BuildingLeader
+08d7e000 g 00000060 gBattleEnvironmentPalette_StadiumAqua
+08d7e060 g 0000006c gBattleEnvironmentPalette_StadiumMagma
+08d7e0cc g 00000050 gBattleEnvironmentPalette_StadiumSidney
+08d7e11c g 00000048 gBattleEnvironmentPalette_StadiumPhoebe
+08d7e164 g 00000044 gBattleEnvironmentPalette_StadiumGlacia
+08d7e1a8 g 00000050 gBattleEnvironmentPalette_StadiumDrake
+08d7e1f8 g 0000003c gBattleEnvironmentPalette_StadiumWallace
+08d7e234 g 0000004c gBattleEnvironmentPalette_Rayquaza
+08d7e280 g 00000588 gBattleEnvironmentAnimTiles_TallGrass
+08d7e808 g 000001bc gBattleEnvironmentAnimTilemap_TallGrass
+08d7e9c4 g 00000710 gBattleEnvironmentAnimTiles_LongGrass
+08d7f0d4 g 00000238 gBattleEnvironmentAnimTilemap_LongGrass
+08d7f30c g 00000544 gBattleEnvironmentAnimTiles_Sand
+08d7f850 g 000001a8 gBattleEnvironmentAnimTilemap_Sand
+08d7f9f8 g 000004cc gBattleEnvironmentAnimTiles_Underwater
+08d7fec4 g 00000190 gBattleEnvironmentAnimTilemap_Underwater
+08d80054 g 0000060c gBattleEnvironmentAnimTiles_Water
+08d80660 g 000001a4 gBattleEnvironmentAnimTilemap_Water
+08d80804 g 0000054c gBattleEnvironmentAnimTiles_PondWater
+08d80d50 g 0000014c gBattleEnvironmentAnimTilemap_PondWater
+08d80e9c g 000005e0 gBattleEnvironmentAnimTiles_Rock
+08d8147c g 00000194 gBattleEnvironmentAnimTilemap_Rock
+08d81610 g 0000081c gBattleEnvironmentAnimTiles_Cave
+08d81e2c g 000002a8 gBattleEnvironmentAnimTilemap_Cave
+08d820d4 g 00000410 gBattleEnvironmentAnimTiles_Building
+08d824e4 g 00000124 gBattleEnvironmentAnimTilemap_Building
+08d82608 g 00000668 gBattleEnvironmentAnimTiles_Rayquaza
+08d82c70 g 000002a0 gBattleEnvironmentAnimTilemap_Rayquaza
 08d82f10 g 000005ec gDomeTourneyTree_Gfx
 08d834fc g 00000404 gDomeTourneyLine_Gfx
 08d83900 g 0000022c gDomeTourneyTree_Tilemap