rh-hideout
diff --git a/‎asm/macros/battle_script.inc‎
Lines changed: 2 additions & 2 deletions b/‎asm/macros/battle_script.inc‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎data/battle_anim_scripts.s‎
Lines changed: 55 additions & 55 deletions b/‎data/battle_anim_scripts.s‎
Lines changed: 55 additions & 55 deletions
diff --git a/‎data/battle_scripts_1.s‎
Lines changed: 2 additions & 2 deletions b/‎data/battle_scripts_1.s‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎graphics/battle_terrain/building/anim_map.bin‎ renamed to ‎graphics/battle_environment/building/anim_map.bin‎ b/‎graphics/battle_terrain/building/anim_map.bin‎ renamed to ‎graphics/battle_environment/building/anim_map.bin‎
diff --git a/‎graphics/battle_terrain/building/anim_tiles.png‎ renamed to ‎graphics/battle_environment/building/anim_tiles.png‎ b/‎graphics/battle_terrain/building/anim_tiles.png‎ renamed to ‎graphics/battle_environment/building/anim_tiles.png‎
diff --git a/‎graphics/battle_terrain/building/map.bin‎ renamed to ‎graphics/battle_environment/building/map.bin‎ b/‎graphics/battle_terrain/building/map.bin‎ renamed to ‎graphics/battle_environment/building/map.bin‎
diff --git a/‎graphics/battle_terrain/building/palette.pal‎ renamed to ‎graphics/battle_environment/building/palette.pal‎ b/‎graphics/battle_terrain/building/palette.pal‎ renamed to ‎graphics/battle_environment/building/palette.pal‎
diff --git a/‎graphics/battle_terrain/building/palette2.pal‎ renamed to ‎graphics/battle_environment/building/palette2.pal‎ b/‎graphics/battle_terrain/building/palette2.pal‎ renamed to ‎graphics/battle_environment/building/palette2.pal‎
diff --git a/‎graphics/battle_terrain/building/palette3.pal‎ renamed to ‎graphics/battle_environment/building/palette3.pal‎ b/‎graphics/battle_terrain/building/palette3.pal‎ renamed to ‎graphics/battle_environment/building/palette3.pal‎
diff --git a/‎graphics/battle_terrain/building/tiles.png‎ renamed to ‎graphics/battle_environment/building/tiles.png‎ b/‎graphics/battle_terrain/building/tiles.png‎ renamed to ‎graphics/battle_environment/building/tiles.png‎
@@ -1100,7 +1100,7 @@
 	.byte \battler
 	.endm
 
-	.macro callterrainattack
+	.macro callenvironmentattack
 	.byte 0xcc
 	.endm
 
@@ -1255,7 +1255,7 @@
 	.4byte \failInstr
 	.endm
 
-	.macro settypetoterrain failInstr:req
+	.macro settypetoenvironment failInstr:req
 	.byte 0xeb
 	.4byte \failInstr
 	.endm
 
@@ -4946,7 +4946,7 @@ BattleScript_EffectNaturePower::
 	attackcanceler
 	attackstring
 	pause B_WAIT_TIME_SHORT
-	callterrainattack
+	callenvironmentattack
 	printstring STRINGID_NATUREPOWERTURNEDINTO
 	waitmessage B_WAIT_TIME_LONG
 	return
@@ -5395,7 +5395,7 @@ BattleScript_EffectCamouflage::
 	attackcanceler
 	attackstring
 	ppreduce
-	settypetoterrain BattleScript_ButItFailed
+	settypetoenvironment BattleScript_ButItFailed
 	attackanimation
 	waitanimation
 	printstring STRINGID_PKMNCHANGEDTYPE