From 43f5be2c82458c1ba48188d8dd4a37007174ea8d Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 13 Feb 2026 22:43:39 -0300 Subject: [PATCH] Rename Terrain to Environment --- data/battle_anim_scripts.s | 21 +- data/battle_scripts_1.s | 4 +- .../building/anim_map.bin | Bin .../building/anim_tiles.png | Bin .../building/map.bin | Bin .../building/palette.pal | 0 .../building/palette2.pal | 0 .../building/palette3.pal | 0 .../building/tiles.png | Bin .../cave/anim_map.bin | Bin .../cave/anim_tiles.png | Bin .../cave/groudon.pal | 0 .../cave/map.bin | Bin .../cave/palette.pal | 0 .../cave/tiles.png | Bin .../long_grass/anim_map.bin | Bin .../long_grass/anim_tiles.png | Bin .../long_grass/map.bin | Bin .../long_grass/palette.pal | 0 .../long_grass/tiles.png | Bin .../plain/palette.pal | 0 .../pond_water/anim_map.bin | Bin .../pond_water/anim_tiles.png | Bin .../pond_water/map.bin | Bin .../pond_water/palette.pal | 0 .../pond_water/tiles.png | Bin .../rock/anim_map.bin | Bin .../rock/anim_tiles.png | Bin .../rock/map.bin | Bin .../rock/palette.pal | 0 .../rock/tiles.png | Bin .../sand/anim_map.bin | Bin .../sand/anim_tiles.png | Bin .../sand/map.bin | Bin .../sand/palette.pal | 0 .../sand/tiles.png | Bin .../stadium/battle_tower.pal | 0 .../stadium/map.bin | Bin .../stadium/palette1.pal | 0 .../stadium/palette2.pal | 0 .../stadium/palette3.pal | 0 .../stadium/palette4.pal | 0 .../stadium/palette5.pal | 0 .../stadium/palette6.pal | 0 .../stadium/palette7.pal | 0 .../stadium/tiles.png | Bin .../tall_grass/anim_map.bin | Bin .../tall_grass/anim_tiles.png | Bin .../tall_grass/map.bin | Bin .../tall_grass/palette.pal | 0 .../tall_grass/tiles.png | Bin .../underwater/anim_map.bin | Bin .../underwater/anim_tiles.png | Bin .../underwater/map.bin | Bin .../underwater/palette.pal | 0 .../underwater/tiles.png | Bin .../water/anim_map.bin | Bin .../water/anim_tiles.png | Bin .../water/kyogre.pal | 0 .../water/map.bin | Bin .../water/palette.pal | 0 .../water/tiles.png | Bin include/battle.h | 2 +- include/battle_controllers.h | 2 +- include/battle_setup.h | 2 +- include/constants/battle.h | 22 +- include/graphics.h | 96 ++--- include/macros/battle_script.inc | 4 +- src/battle/anim/normal.c | 28 +- src/battle_bg.c | 378 +++++++++--------- src/battle_controllers.c | 6 +- src/battle_main.c | 12 +- src/battle_script_commands.c | 76 ++-- src/battle_setup.c | 38 +- src/data/graphics.c | 120 +++--- src/debug/watanabe_debug_menu.c | 4 +- src/evolution_scene.c | 6 +- src/pokeblock_feed.c | 8 +- sym_common.txt | 2 +- 79 files changed, 426 insertions(+), 405 deletions(-) rename graphics/{battle_terrain => battle_environment}/building/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/building/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/building/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/building/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/building/palette2.pal (100%) rename graphics/{battle_terrain => battle_environment}/building/palette3.pal (100%) rename graphics/{battle_terrain => battle_environment}/building/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/cave/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/cave/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/cave/groudon.pal (100%) rename graphics/{battle_terrain => battle_environment}/cave/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/cave/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/cave/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/long_grass/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/long_grass/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/long_grass/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/long_grass/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/long_grass/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/plain/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/pond_water/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/pond_water/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/pond_water/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/pond_water/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/pond_water/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/rock/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/rock/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/rock/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/rock/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/rock/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/sand/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/sand/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/sand/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/sand/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/sand/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/stadium/battle_tower.pal (100%) rename graphics/{battle_terrain => battle_environment}/stadium/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/stadium/palette1.pal (100%) rename graphics/{battle_terrain => battle_environment}/stadium/palette2.pal (100%) rename graphics/{battle_terrain => battle_environment}/stadium/palette3.pal (100%) rename graphics/{battle_terrain => battle_environment}/stadium/palette4.pal (100%) rename graphics/{battle_terrain => battle_environment}/stadium/palette5.pal (100%) rename graphics/{battle_terrain => battle_environment}/stadium/palette6.pal (100%) rename graphics/{battle_terrain => battle_environment}/stadium/palette7.pal (100%) rename graphics/{battle_terrain => battle_environment}/stadium/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/tall_grass/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/tall_grass/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/tall_grass/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/tall_grass/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/tall_grass/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/underwater/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/underwater/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/underwater/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/underwater/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/underwater/tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/water/anim_map.bin (100%) rename graphics/{battle_terrain => battle_environment}/water/anim_tiles.png (100%) rename graphics/{battle_terrain => battle_environment}/water/kyogre.pal (100%) rename graphics/{battle_terrain => battle_environment}/water/map.bin (100%) rename graphics/{battle_terrain => battle_environment}/water/palette.pal (100%) rename graphics/{battle_terrain => battle_environment}/water/tiles.png (100%) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 0dc199a6e..07f9c8490 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,5 +1,6 @@ #define rgb(red, green, blue) (((blue)<<10)|((green)<<5)|(red)) +#include "constants/battle.h" #include "constants/battle_anim.h" #include "constants/moves.h" #include "constants/songs.h" @@ -9629,16 +9630,16 @@ Move_SKY_UPPERCUT: @ 81D53ED end Move_SECRET_POWER: @ 81D54E6 - createvisualtask AnimTask_GetBattleTerrain, 5 - jumpargeq 0, 0, Move_NEEDLE_ARM - jumpargeq 0, 1, Move_MAGICAL_LEAF - jumpargeq 0, 2, Move_MUD_SHOT - jumpargeq 0, 3, Move_WATERFALL - jumpargeq 0, 4, Move_SURF - jumpargeq 0, 5, Move_BUBBLE_BEAM - jumpargeq 0, 6, Move_ROCK_THROW - jumpargeq 0, 7, Move_BITE - jumpargeq 0, 8, Move_STRENGTH + createvisualtask AnimTask_GetBattleEnvironment, 5 + jumpargeq 0, BATTLE_ENVIRONMENT_GRASS, Move_NEEDLE_ARM + jumpargeq 0, BATTLE_ENVIRONMENT_LONG_GRASS, Move_MAGICAL_LEAF + jumpargeq 0, BATTLE_ENVIRONMENT_SAND, Move_MUD_SHOT + jumpargeq 0, BATTLE_ENVIRONMENT_UNDERWATER, Move_WATERFALL + jumpargeq 0, BATTLE_ENVIRONMENT_WATER, Move_SURF + jumpargeq 0, BATTLE_ENVIRONMENT_POND, Move_BUBBLE_BEAM + jumpargeq 0, BATTLE_ENVIRONMENT_MOUNTAIN, Move_ROCK_THROW + jumpargeq 0, BATTLE_ENVIRONMENT_CAVE, Move_BITE + jumpargeq 0, BATTLE_ENVIRONMENT_BUILDING, Move_STRENGTH goto Move_SLAM Move_TWISTER: @ 81D553A diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index ecc01d41d..9f3696e5f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2395,7 +2395,7 @@ BattleScript_EffectNaturePower: @ 81D868D attackcanceler attackstring pause 32 - callterrainattack + callenvironmentattack printstring BATTLE_TEXT_NaturePower waitmessage 64 return @@ -2924,7 +2924,7 @@ BattleScript_EffectCamouflage: @ 81D8C43 attackcanceler attackstring ppreduce - settypetoterrain BattleScript_ButItFailed + settypetoenvironment BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_TypeTransform diff --git a/graphics/battle_terrain/building/anim_map.bin b/graphics/battle_environment/building/anim_map.bin similarity index 100% rename from graphics/battle_terrain/building/anim_map.bin rename to graphics/battle_environment/building/anim_map.bin diff --git a/graphics/battle_terrain/building/anim_tiles.png b/graphics/battle_environment/building/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/building/anim_tiles.png rename to graphics/battle_environment/building/anim_tiles.png diff --git a/graphics/battle_terrain/building/map.bin b/graphics/battle_environment/building/map.bin similarity index 100% rename from graphics/battle_terrain/building/map.bin rename to graphics/battle_environment/building/map.bin diff --git a/graphics/battle_terrain/building/palette.pal b/graphics/battle_environment/building/palette.pal similarity index 100% rename from graphics/battle_terrain/building/palette.pal rename to graphics/battle_environment/building/palette.pal diff --git a/graphics/battle_terrain/building/palette2.pal b/graphics/battle_environment/building/palette2.pal similarity index 100% rename from graphics/battle_terrain/building/palette2.pal rename to graphics/battle_environment/building/palette2.pal diff --git a/graphics/battle_terrain/building/palette3.pal b/graphics/battle_environment/building/palette3.pal similarity index 100% rename from graphics/battle_terrain/building/palette3.pal rename to graphics/battle_environment/building/palette3.pal diff --git a/graphics/battle_terrain/building/tiles.png b/graphics/battle_environment/building/tiles.png similarity index 100% rename from graphics/battle_terrain/building/tiles.png rename to graphics/battle_environment/building/tiles.png diff --git a/graphics/battle_terrain/cave/anim_map.bin b/graphics/battle_environment/cave/anim_map.bin similarity index 100% rename from graphics/battle_terrain/cave/anim_map.bin rename to graphics/battle_environment/cave/anim_map.bin diff --git a/graphics/battle_terrain/cave/anim_tiles.png b/graphics/battle_environment/cave/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/cave/anim_tiles.png rename to graphics/battle_environment/cave/anim_tiles.png diff --git a/graphics/battle_terrain/cave/groudon.pal b/graphics/battle_environment/cave/groudon.pal similarity index 100% rename from graphics/battle_terrain/cave/groudon.pal rename to graphics/battle_environment/cave/groudon.pal diff --git a/graphics/battle_terrain/cave/map.bin b/graphics/battle_environment/cave/map.bin similarity index 100% rename from graphics/battle_terrain/cave/map.bin rename to graphics/battle_environment/cave/map.bin diff --git a/graphics/battle_terrain/cave/palette.pal b/graphics/battle_environment/cave/palette.pal similarity index 100% rename from graphics/battle_terrain/cave/palette.pal rename to graphics/battle_environment/cave/palette.pal diff --git a/graphics/battle_terrain/cave/tiles.png b/graphics/battle_environment/cave/tiles.png similarity index 100% rename from graphics/battle_terrain/cave/tiles.png rename to graphics/battle_environment/cave/tiles.png diff --git a/graphics/battle_terrain/long_grass/anim_map.bin b/graphics/battle_environment/long_grass/anim_map.bin similarity index 100% rename from graphics/battle_terrain/long_grass/anim_map.bin rename to graphics/battle_environment/long_grass/anim_map.bin diff --git a/graphics/battle_terrain/long_grass/anim_tiles.png b/graphics/battle_environment/long_grass/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/long_grass/anim_tiles.png rename to graphics/battle_environment/long_grass/anim_tiles.png diff --git a/graphics/battle_terrain/long_grass/map.bin b/graphics/battle_environment/long_grass/map.bin similarity index 100% rename from graphics/battle_terrain/long_grass/map.bin rename to graphics/battle_environment/long_grass/map.bin diff --git a/graphics/battle_terrain/long_grass/palette.pal b/graphics/battle_environment/long_grass/palette.pal similarity index 100% rename from graphics/battle_terrain/long_grass/palette.pal rename to graphics/battle_environment/long_grass/palette.pal diff --git a/graphics/battle_terrain/long_grass/tiles.png b/graphics/battle_environment/long_grass/tiles.png similarity index 100% rename from graphics/battle_terrain/long_grass/tiles.png rename to graphics/battle_environment/long_grass/tiles.png diff --git a/graphics/battle_terrain/plain/palette.pal b/graphics/battle_environment/plain/palette.pal similarity index 100% rename from graphics/battle_terrain/plain/palette.pal rename to graphics/battle_environment/plain/palette.pal diff --git a/graphics/battle_terrain/pond_water/anim_map.bin b/graphics/battle_environment/pond_water/anim_map.bin similarity index 100% rename from graphics/battle_terrain/pond_water/anim_map.bin rename to graphics/battle_environment/pond_water/anim_map.bin diff --git a/graphics/battle_terrain/pond_water/anim_tiles.png b/graphics/battle_environment/pond_water/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/pond_water/anim_tiles.png rename to graphics/battle_environment/pond_water/anim_tiles.png diff --git a/graphics/battle_terrain/pond_water/map.bin b/graphics/battle_environment/pond_water/map.bin similarity index 100% rename from graphics/battle_terrain/pond_water/map.bin rename to graphics/battle_environment/pond_water/map.bin diff --git a/graphics/battle_terrain/pond_water/palette.pal b/graphics/battle_environment/pond_water/palette.pal similarity index 100% rename from graphics/battle_terrain/pond_water/palette.pal rename to graphics/battle_environment/pond_water/palette.pal diff --git a/graphics/battle_terrain/pond_water/tiles.png b/graphics/battle_environment/pond_water/tiles.png similarity index 100% rename from graphics/battle_terrain/pond_water/tiles.png rename to graphics/battle_environment/pond_water/tiles.png diff --git a/graphics/battle_terrain/rock/anim_map.bin b/graphics/battle_environment/rock/anim_map.bin similarity index 100% rename from graphics/battle_terrain/rock/anim_map.bin rename to graphics/battle_environment/rock/anim_map.bin diff --git a/graphics/battle_terrain/rock/anim_tiles.png b/graphics/battle_environment/rock/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/rock/anim_tiles.png rename to graphics/battle_environment/rock/anim_tiles.png diff --git a/graphics/battle_terrain/rock/map.bin b/graphics/battle_environment/rock/map.bin similarity index 100% rename from graphics/battle_terrain/rock/map.bin rename to graphics/battle_environment/rock/map.bin diff --git a/graphics/battle_terrain/rock/palette.pal b/graphics/battle_environment/rock/palette.pal similarity index 100% rename from graphics/battle_terrain/rock/palette.pal rename to graphics/battle_environment/rock/palette.pal diff --git a/graphics/battle_terrain/rock/tiles.png b/graphics/battle_environment/rock/tiles.png similarity index 100% rename from graphics/battle_terrain/rock/tiles.png rename to graphics/battle_environment/rock/tiles.png diff --git a/graphics/battle_terrain/sand/anim_map.bin b/graphics/battle_environment/sand/anim_map.bin similarity index 100% rename from graphics/battle_terrain/sand/anim_map.bin rename to graphics/battle_environment/sand/anim_map.bin diff --git a/graphics/battle_terrain/sand/anim_tiles.png b/graphics/battle_environment/sand/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/sand/anim_tiles.png rename to graphics/battle_environment/sand/anim_tiles.png diff --git a/graphics/battle_terrain/sand/map.bin b/graphics/battle_environment/sand/map.bin similarity index 100% rename from graphics/battle_terrain/sand/map.bin rename to graphics/battle_environment/sand/map.bin diff --git a/graphics/battle_terrain/sand/palette.pal b/graphics/battle_environment/sand/palette.pal similarity index 100% rename from graphics/battle_terrain/sand/palette.pal rename to graphics/battle_environment/sand/palette.pal diff --git a/graphics/battle_terrain/sand/tiles.png b/graphics/battle_environment/sand/tiles.png similarity index 100% rename from graphics/battle_terrain/sand/tiles.png rename to graphics/battle_environment/sand/tiles.png diff --git a/graphics/battle_terrain/stadium/battle_tower.pal b/graphics/battle_environment/stadium/battle_tower.pal similarity index 100% rename from graphics/battle_terrain/stadium/battle_tower.pal rename to graphics/battle_environment/stadium/battle_tower.pal diff --git a/graphics/battle_terrain/stadium/map.bin b/graphics/battle_environment/stadium/map.bin similarity index 100% rename from graphics/battle_terrain/stadium/map.bin rename to graphics/battle_environment/stadium/map.bin diff --git a/graphics/battle_terrain/stadium/palette1.pal b/graphics/battle_environment/stadium/palette1.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette1.pal rename to graphics/battle_environment/stadium/palette1.pal diff --git a/graphics/battle_terrain/stadium/palette2.pal b/graphics/battle_environment/stadium/palette2.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette2.pal rename to graphics/battle_environment/stadium/palette2.pal diff --git a/graphics/battle_terrain/stadium/palette3.pal b/graphics/battle_environment/stadium/palette3.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette3.pal rename to graphics/battle_environment/stadium/palette3.pal diff --git a/graphics/battle_terrain/stadium/palette4.pal b/graphics/battle_environment/stadium/palette4.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette4.pal rename to graphics/battle_environment/stadium/palette4.pal diff --git a/graphics/battle_terrain/stadium/palette5.pal b/graphics/battle_environment/stadium/palette5.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette5.pal rename to graphics/battle_environment/stadium/palette5.pal diff --git a/graphics/battle_terrain/stadium/palette6.pal b/graphics/battle_environment/stadium/palette6.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette6.pal rename to graphics/battle_environment/stadium/palette6.pal diff --git a/graphics/battle_terrain/stadium/palette7.pal b/graphics/battle_environment/stadium/palette7.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette7.pal rename to graphics/battle_environment/stadium/palette7.pal diff --git a/graphics/battle_terrain/stadium/tiles.png b/graphics/battle_environment/stadium/tiles.png similarity index 100% rename from graphics/battle_terrain/stadium/tiles.png rename to graphics/battle_environment/stadium/tiles.png diff --git a/graphics/battle_terrain/tall_grass/anim_map.bin b/graphics/battle_environment/tall_grass/anim_map.bin similarity index 100% rename from graphics/battle_terrain/tall_grass/anim_map.bin rename to graphics/battle_environment/tall_grass/anim_map.bin diff --git a/graphics/battle_terrain/tall_grass/anim_tiles.png b/graphics/battle_environment/tall_grass/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/tall_grass/anim_tiles.png rename to graphics/battle_environment/tall_grass/anim_tiles.png diff --git a/graphics/battle_terrain/tall_grass/map.bin b/graphics/battle_environment/tall_grass/map.bin similarity index 100% rename from graphics/battle_terrain/tall_grass/map.bin rename to graphics/battle_environment/tall_grass/map.bin diff --git a/graphics/battle_terrain/tall_grass/palette.pal b/graphics/battle_environment/tall_grass/palette.pal similarity index 100% rename from graphics/battle_terrain/tall_grass/palette.pal rename to graphics/battle_environment/tall_grass/palette.pal diff --git a/graphics/battle_terrain/tall_grass/tiles.png b/graphics/battle_environment/tall_grass/tiles.png similarity index 100% rename from graphics/battle_terrain/tall_grass/tiles.png rename to graphics/battle_environment/tall_grass/tiles.png diff --git a/graphics/battle_terrain/underwater/anim_map.bin b/graphics/battle_environment/underwater/anim_map.bin similarity index 100% rename from graphics/battle_terrain/underwater/anim_map.bin rename to graphics/battle_environment/underwater/anim_map.bin diff --git a/graphics/battle_terrain/underwater/anim_tiles.png b/graphics/battle_environment/underwater/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/underwater/anim_tiles.png rename to graphics/battle_environment/underwater/anim_tiles.png diff --git a/graphics/battle_terrain/underwater/map.bin b/graphics/battle_environment/underwater/map.bin similarity index 100% rename from graphics/battle_terrain/underwater/map.bin rename to graphics/battle_environment/underwater/map.bin diff --git a/graphics/battle_terrain/underwater/palette.pal b/graphics/battle_environment/underwater/palette.pal similarity index 100% rename from graphics/battle_terrain/underwater/palette.pal rename to graphics/battle_environment/underwater/palette.pal diff --git a/graphics/battle_terrain/underwater/tiles.png b/graphics/battle_environment/underwater/tiles.png similarity index 100% rename from graphics/battle_terrain/underwater/tiles.png rename to graphics/battle_environment/underwater/tiles.png diff --git a/graphics/battle_terrain/water/anim_map.bin b/graphics/battle_environment/water/anim_map.bin similarity index 100% rename from graphics/battle_terrain/water/anim_map.bin rename to graphics/battle_environment/water/anim_map.bin diff --git a/graphics/battle_terrain/water/anim_tiles.png b/graphics/battle_environment/water/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/water/anim_tiles.png rename to graphics/battle_environment/water/anim_tiles.png diff --git a/graphics/battle_terrain/water/kyogre.pal b/graphics/battle_environment/water/kyogre.pal similarity index 100% rename from graphics/battle_terrain/water/kyogre.pal rename to graphics/battle_environment/water/kyogre.pal diff --git a/graphics/battle_terrain/water/map.bin b/graphics/battle_environment/water/map.bin similarity index 100% rename from graphics/battle_terrain/water/map.bin rename to graphics/battle_environment/water/map.bin diff --git a/graphics/battle_terrain/water/palette.pal b/graphics/battle_environment/water/palette.pal similarity index 100% rename from graphics/battle_terrain/water/palette.pal rename to graphics/battle_environment/water/palette.pal diff --git a/graphics/battle_terrain/water/tiles.png b/graphics/battle_environment/water/tiles.png similarity index 100% rename from graphics/battle_terrain/water/tiles.png rename to graphics/battle_environment/water/tiles.png diff --git a/include/battle.h b/include/battle.h index 59bfea1d2..01d4654ff 100644 --- a/include/battle.h +++ b/include/battle.h @@ -580,7 +580,7 @@ void BtlController_EmitHitAnimation(u8 a); //0x29 void BtlController_EmitPlaySE(u8 a, u16 sound); //0x2B void BtlController_EmitPlayFanfareOrBGM(u8 a, u16 sound); //0x2C void BtlController_EmitFaintingCry(u8 a); //0x2D -void BtlController_EmitIntroSlide(u8 a, u8 b); //0x2E +void BtlController_EmitIntroSlide(u8 bufferId, u8 environmentId); //0x2E void BtlController_EmitHidePartyStatusSummary(u8 a); //0x31 void BtlController_EmitSpriteInvisibility(u8 a, u8 b); //0x33 void BtlController_EmitBattleAnimation(u8 a, u8 b, u16 c); //0x34 diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 695daabbc..ea11d5d73 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -182,7 +182,7 @@ void BtlController_EmitCmd42(u8 a); void BtlController_EmitPlaySE(u8 a, u16 b); void BtlController_EmitPlayFanfareOrBGM(u8 a, u16 b); void BtlController_EmitFaintingCry(u8 a); -void BtlController_EmitIntroSlide(u8 a, u8 b); +void BtlController_EmitIntroSlide(u8 bufferId, u8 environmentId); void BtlController_EmitIntroTrainerBallThrow(u8 a); void BtlController_EmitDrawPartyStatusSummary(u8 a, struct HpAndStatus *hpAndStatus, u8 c); //0x30 void BtlController_EmitHidePartyStatusSummary(u8 a); diff --git a/include/battle_setup.h b/include/battle_setup.h index 1676ddde1..f6ba4dd0e 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -52,7 +52,7 @@ extern const struct TrainerEyeTrainer gTrainerEyeTrainers[56]; void BattleSetup_StartWildBattle(void); void BattleSetup_StartRoamerBattle(void); void BattleSetup_StartScriptedWildBattle(void); -s8 BattleSetup_GetTerrain(void); +s8 BattleSetup_GetEnvironmentId(void); u8 BattleSetup_GetBattleTowerBattleTransition(void); u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); void TrainerWantsBattle(u8, const u8 *); diff --git a/include/constants/battle.h b/include/constants/battle.h index 53a9c1bba..289a54ad3 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -272,17 +272,17 @@ #define MOVE_EFFECT_AFFECTS_USER 0x40 #define MOVE_EFFECT_CERTAIN 0x80 -// Battle terrain defines for gBattleTerrain. -#define BATTLE_TERRAIN_GRASS 0 -#define BATTLE_TERRAIN_LONG_GRASS 1 -#define BATTLE_TERRAIN_SAND 2 -#define BATTLE_TERRAIN_UNDERWATER 3 -#define BATTLE_TERRAIN_WATER 4 -#define BATTLE_TERRAIN_POND 5 -#define BATTLE_TERRAIN_MOUNTAIN 6 -#define BATTLE_TERRAIN_CAVE 7 -#define BATTLE_TERRAIN_BUILDING 8 -#define BATTLE_TERRAIN_PLAIN 9 +// Battle environment defines for gBattleEnvironment. +#define BATTLE_ENVIRONMENT_GRASS 0 +#define BATTLE_ENVIRONMENT_LONG_GRASS 1 +#define BATTLE_ENVIRONMENT_SAND 2 +#define BATTLE_ENVIRONMENT_UNDERWATER 3 +#define BATTLE_ENVIRONMENT_WATER 4 +#define BATTLE_ENVIRONMENT_POND 5 +#define BATTLE_ENVIRONMENT_MOUNTAIN 6 +#define BATTLE_ENVIRONMENT_CAVE 7 +#define BATTLE_ENVIRONMENT_BUILDING 8 +#define BATTLE_ENVIRONMENT_PLAIN 9 #define TARGET_SELECTED_POKEMON 0 #define TARGET_SPECIAL (1 << 0) diff --git a/include/graphics.h b/include/graphics.h index a6ccc520f..430fca6e3 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3361,64 +3361,64 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21[]; extern const u8 gContestConfetti_Gfx[]; extern const u8 gContestConfetti_Pal[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_TallGrass[]; -extern const u8 gBattleTerrainTilemap_TallGrass[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_TallGrass[]; -extern const u8 gBattleTerrainAnimTilemap_TallGrass[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_TallGrass[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_TallGrass[]; +extern const u8 gBattleEnvironmentTilemap_TallGrass[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_TallGrass[]; +extern const u8 gBattleEnvironmentAnimTilemap_TallGrass[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_TallGrass[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_LongGrass[]; -extern const u8 gBattleTerrainTilemap_LongGrass[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_LongGrass[]; -extern const u8 gBattleTerrainAnimTilemap_LongGrass[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_LongGrass[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_LongGrass[]; +extern const u8 gBattleEnvironmentTilemap_LongGrass[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_LongGrass[]; +extern const u8 gBattleEnvironmentAnimTilemap_LongGrass[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_LongGrass[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_Sand[]; -extern const u8 gBattleTerrainTilemap_Sand[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Sand[]; -extern const u8 gBattleTerrainAnimTilemap_Sand[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_Sand[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_Sand[]; +extern const u8 gBattleEnvironmentTilemap_Sand[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_Sand[]; +extern const u8 gBattleEnvironmentAnimTilemap_Sand[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_Sand[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_Underwater[]; -extern const u8 gBattleTerrainTilemap_Underwater[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Underwater[]; -extern const u8 gBattleTerrainAnimTilemap_Underwater[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_Underwater[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_Underwater[]; +extern const u8 gBattleEnvironmentTilemap_Underwater[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_Underwater[]; +extern const u8 gBattleEnvironmentAnimTilemap_Underwater[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_Underwater[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_Water[]; -extern const u8 gBattleTerrainTilemap_Water[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Water[]; -extern const u8 gBattleTerrainAnimTilemap_Water[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_Water[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_Water[]; +extern const u8 gBattleEnvironmentTilemap_Water[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_Water[]; +extern const u8 gBattleEnvironmentAnimTilemap_Water[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_Water[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_PondWater[]; -extern const u8 gBattleTerrainTilemap_PondWater[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_PondWater[]; -extern const u8 gBattleTerrainAnimTilemap_PondWater[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_PondWater[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_PondWater[]; +extern const u8 gBattleEnvironmentTilemap_PondWater[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_PondWater[]; +extern const u8 gBattleEnvironmentAnimTilemap_PondWater[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_PondWater[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_Rock[]; -extern const u8 gBattleTerrainTilemap_Rock[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Rock[]; -extern const u8 gBattleTerrainAnimTilemap_Rock[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_Rock[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_Rock[]; +extern const u8 gBattleEnvironmentTilemap_Rock[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_Rock[]; +extern const u8 gBattleEnvironmentAnimTilemap_Rock[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_Rock[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_Cave[]; -extern const u8 gBattleTerrainTilemap_Cave[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Cave[]; -extern const u8 gBattleTerrainAnimTilemap_Cave[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_Cave[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_Cave[]; +extern const u8 gBattleEnvironmentTilemap_Cave[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_Cave[]; +extern const u8 gBattleEnvironmentAnimTilemap_Cave[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_Cave[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_Building[]; -extern const u8 gBattleTerrainTilemap_Building[]; -extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_Building[]; -extern const u8 gBattleTerrainAnimTilemap_Building[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_Building[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_Building[]; +extern const u8 gBattleEnvironmentTilemap_Building[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentAnimTiles_Building[]; +extern const u8 gBattleEnvironmentAnimTilemap_Building[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_Building[]; -extern const struct CompressedSpritePalette gBattleTerrainPalette_Plain[]; +extern const struct CompressedSpritePalette gBattleEnvironmentPalette_Plain[]; -extern const struct CompressedSpriteSheet gBattleTerrainTiles_Stadium[]; -extern const u8 gBattleTerrainTilemap_Stadium[]; +extern const struct CompressedSpriteSheet gBattleEnvironmentTiles_Stadium[]; +extern const u8 gBattleEnvironmentTilemap_Stadium[]; extern const u8 gBattleWindowLargeGfx[]; extern const u8 gBattleWindowSmallGfx[]; diff --git a/include/macros/battle_script.inc b/include/macros/battle_script.inc index d92e28934..0eef14d6e 100644 --- a/include/macros/battle_script.inc +++ b/include/macros/battle_script.inc @@ -1018,7 +1018,7 @@ .byte 0xcb .endm - .macro callterrainattack + .macro callenvironmentattack .byte 0xcc .endm @@ -1166,7 +1166,7 @@ .4byte \address .endm - .macro settypetoterrain address + .macro settypetoenvironment address .byte 0xeb .4byte \address .endm diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 6961dcbc1..48cb1a7d6 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -19,7 +19,7 @@ extern u8 gBattleAnimTarget; extern u8 gHealthboxSpriteIds[]; extern u8 gBattlersCount; extern u8 gBattlerSpriteIds[]; -extern u8 gBattleTerrain; +extern u8 gBattleEnvironment; extern u16 gBattlerPartyIndexes[]; extern u8 gBattlerTarget; extern u8 gEffectBattler; @@ -1020,36 +1020,36 @@ void sub_80E2B74(u8 taskId) { u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]); - switch (gBattleTerrain) + switch (gBattleEnvironment) { - case BATTLE_TERRAIN_GRASS: + case BATTLE_ENVIRONMENT_GRASS: gBattleAnimArgs[4] = 0x0B0C; break; - case BATTLE_TERRAIN_LONG_GRASS: + case BATTLE_ENVIRONMENT_LONG_GRASS: gBattleAnimArgs[4] = 0x09E0; break; - case BATTLE_TERRAIN_SAND: + case BATTLE_ENVIRONMENT_SAND: gBattleAnimArgs[4] = 0x2F1E; break; - case BATTLE_TERRAIN_UNDERWATER: + case BATTLE_ENVIRONMENT_UNDERWATER: gBattleAnimArgs[4] = 0x4800; break; - case BATTLE_TERRAIN_WATER: + case BATTLE_ENVIRONMENT_WATER: gBattleAnimArgs[4] = 0x7ECB; break; - case BATTLE_TERRAIN_POND: + case BATTLE_ENVIRONMENT_POND: gBattleAnimArgs[4] = 0x7ECB; break; - case BATTLE_TERRAIN_MOUNTAIN: + case BATTLE_ENVIRONMENT_MOUNTAIN: gBattleAnimArgs[4] = 0x2A16; break; - case BATTLE_TERRAIN_CAVE: + case BATTLE_ENVIRONMENT_CAVE: gBattleAnimArgs[4] = 0x0D2E; break; - case BATTLE_TERRAIN_BUILDING: + case BATTLE_ENVIRONMENT_BUILDING: gBattleAnimArgs[4] = 0x7FFF; break; - case BATTLE_TERRAIN_PLAIN: + case BATTLE_ENVIRONMENT_PLAIN: gBattleAnimArgs[4] = 0x7FFF; break; } @@ -1784,9 +1784,9 @@ static void sub_80E3E64(u8 taskId) } } -void AnimTask_GetBattleTerrain(u8 taskId) +void AnimTask_GetBattleEnvironment(u8 taskId) { - gBattleAnimArgs[0] = gBattleTerrain; + gBattleAnimArgs[0] = gBattleEnvironment; DestroyAnimVisualTask(taskId); } diff --git a/src/battle_bg.c b/src/battle_bg.c index e3b890f0d..2eb37b954 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -35,20 +35,20 @@ extern u16 gBattleTypeFlags; extern struct Trainer gTrainers[]; extern u16 gTrainerBattleOpponent; -extern u8 gBattleTerrain; +extern u8 gBattleEnvironment; -extern u16 gBattleTerrainPalette_Groudon[]; -extern u16 gBattleTerrainPalette_Kyogre[]; -extern u16 gBattleTerrainPalette_BuildingLeader[]; -extern u16 gBattleTerrainPalette_StadiumSteven[]; -extern u16 gBattleTerrainPalette_BuildingGym[]; -extern u16 gBattleTerrainPalette_StadiumMagma[]; -extern u16 gBattleTerrainPalette_StadiumAqua[]; -extern u16 gBattleTerrainPalette_StadiumSidney[]; -extern u16 gBattleTerrainPalette_StadiumPhoebe[]; -extern u16 gBattleTerrainPalette_StadiumGlacia[]; -extern u16 gBattleTerrainPalette_StadiumDrake[]; -extern u16 gBattleTerrainPalette_BattleTower[]; +extern u16 gBattleEnvironmentPalette_Groudon[]; +extern u16 gBattleEnvironmentPalette_Kyogre[]; +extern u16 gBattleEnvironmentPalette_BuildingLeader[]; +extern u16 gBattleEnvironmentPalette_StadiumSteven[]; +extern u16 gBattleEnvironmentPalette_BuildingGym[]; +extern u16 gBattleEnvironmentPalette_StadiumMagma[]; +extern u16 gBattleEnvironmentPalette_StadiumAqua[]; +extern u16 gBattleEnvironmentPalette_StadiumSidney[]; +extern u16 gBattleEnvironmentPalette_StadiumPhoebe[]; +extern u16 gBattleEnvironmentPalette_StadiumGlacia[]; +extern u16 gBattleEnvironmentPalette_StadiumDrake[]; +extern u16 gBattleEnvironmentPalette_BattleTower[]; extern u8 gVersusFrameGfx[]; extern u16 gVersusFrameTilemap[]; @@ -137,77 +137,97 @@ struct BattleBackground const void *palette; }; -const struct BattleBackground gBattleTerrainTable[] = { +static const struct BattleBackground sBattleEnvironmentTable[] = { - .tileset = gBattleTerrainTiles_TallGrass, - .tilemap = gBattleTerrainTilemap_TallGrass, - .entryTileset = gBattleTerrainAnimTiles_TallGrass, - .entryTilemap = gBattleTerrainAnimTilemap_TallGrass, - .palette = gBattleTerrainPalette_TallGrass -}, -{ - .tileset = gBattleTerrainTiles_LongGrass, - .tilemap = gBattleTerrainTilemap_LongGrass, - .entryTileset = gBattleTerrainAnimTiles_LongGrass, - .entryTilemap = gBattleTerrainAnimTilemap_LongGrass, - .palette = gBattleTerrainPalette_LongGrass -}, -{ - .tileset = gBattleTerrainTiles_Sand, - .tilemap = gBattleTerrainTilemap_Sand, - .entryTileset = gBattleTerrainAnimTiles_Sand, - .entryTilemap = gBattleTerrainAnimTilemap_Sand, - .palette = gBattleTerrainPalette_Sand -}, -{ - .tileset = gBattleTerrainTiles_Underwater, - .tilemap = gBattleTerrainTilemap_Underwater, - .entryTileset = gBattleTerrainAnimTiles_Underwater, - .entryTilemap = gBattleTerrainAnimTilemap_Underwater, - .palette = gBattleTerrainPalette_Underwater -}, -{ - .tileset = gBattleTerrainTiles_Water, - .tilemap = gBattleTerrainTilemap_Water, - .entryTileset = gBattleTerrainAnimTiles_Water, - .entryTilemap = gBattleTerrainAnimTilemap_Water, - .palette = gBattleTerrainPalette_Water -}, -{ - .tileset = gBattleTerrainTiles_PondWater, - .tilemap = gBattleTerrainTilemap_PondWater, - .entryTileset = gBattleTerrainAnimTiles_PondWater, - .entryTilemap = gBattleTerrainAnimTilemap_PondWater, - .palette = gBattleTerrainPalette_PondWater -}, -{ - .tileset = gBattleTerrainTiles_Rock, - .tilemap = gBattleTerrainTilemap_Rock, - .entryTileset = gBattleTerrainAnimTiles_Rock, - .entryTilemap = gBattleTerrainAnimTilemap_Rock, - .palette = gBattleTerrainPalette_Rock -}, -{ - .tileset = gBattleTerrainTiles_Cave, - .tilemap = gBattleTerrainTilemap_Cave, - .entryTileset = gBattleTerrainAnimTiles_Cave, - .entryTilemap = gBattleTerrainAnimTilemap_Cave, - .palette = gBattleTerrainPalette_Cave -}, -{ - .tileset = gBattleTerrainTiles_Building, - .tilemap = gBattleTerrainTilemap_Building, - .entryTileset = gBattleTerrainAnimTiles_Building, - .entryTilemap = gBattleTerrainAnimTilemap_Building, - .palette = gBattleTerrainPalette_Building -}, -{ - .tileset = gBattleTerrainTiles_Building, - .tilemap = gBattleTerrainTilemap_Building, - .entryTileset = gBattleTerrainAnimTiles_Building, - .entryTilemap = gBattleTerrainAnimTilemap_Building, - .palette = gBattleTerrainPalette_Plain - } + [BATTLE_ENVIRONMENT_GRASS] = + { + .tileset = gBattleEnvironmentTiles_TallGrass, + .tilemap = gBattleEnvironmentTilemap_TallGrass, + .entryTileset = gBattleEnvironmentAnimTiles_TallGrass, + .entryTilemap = gBattleEnvironmentAnimTilemap_TallGrass, + .palette = gBattleEnvironmentPalette_TallGrass, + }, + + [BATTLE_ENVIRONMENT_LONG_GRASS] = + { + .tileset = gBattleEnvironmentTiles_LongGrass, + .tilemap = gBattleEnvironmentTilemap_LongGrass, + .entryTileset = gBattleEnvironmentAnimTiles_LongGrass, + .entryTilemap = gBattleEnvironmentAnimTilemap_LongGrass, + .palette = gBattleEnvironmentPalette_LongGrass, + }, + + [BATTLE_ENVIRONMENT_SAND] = + { + .tileset = gBattleEnvironmentTiles_Sand, + .tilemap = gBattleEnvironmentTilemap_Sand, + .entryTileset = gBattleEnvironmentAnimTiles_Sand, + .entryTilemap = gBattleEnvironmentAnimTilemap_Sand, + .palette = gBattleEnvironmentPalette_Sand, + }, + + [BATTLE_ENVIRONMENT_UNDERWATER] = + { + .tileset = gBattleEnvironmentTiles_Underwater, + .tilemap = gBattleEnvironmentTilemap_Underwater, + .entryTileset = gBattleEnvironmentAnimTiles_Underwater, + .entryTilemap = gBattleEnvironmentAnimTilemap_Underwater, + .palette = gBattleEnvironmentPalette_Underwater, + }, + + [BATTLE_ENVIRONMENT_WATER] = + { + .tileset = gBattleEnvironmentTiles_Water, + .tilemap = gBattleEnvironmentTilemap_Water, + .entryTileset = gBattleEnvironmentAnimTiles_Water, + .entryTilemap = gBattleEnvironmentAnimTilemap_Water, + .palette = gBattleEnvironmentPalette_Water, + }, + + [BATTLE_ENVIRONMENT_POND] = + { + .tileset = gBattleEnvironmentTiles_PondWater, + .tilemap = gBattleEnvironmentTilemap_PondWater, + .entryTileset = gBattleEnvironmentAnimTiles_PondWater, + .entryTilemap = gBattleEnvironmentAnimTilemap_PondWater, + .palette = gBattleEnvironmentPalette_PondWater, + }, + + [BATTLE_ENVIRONMENT_MOUNTAIN] = + { + .tileset = gBattleEnvironmentTiles_Rock, + .tilemap = gBattleEnvironmentTilemap_Rock, + .entryTileset = gBattleEnvironmentAnimTiles_Rock, + .entryTilemap = gBattleEnvironmentAnimTilemap_Rock, + .palette = gBattleEnvironmentPalette_Rock, + }, + + [BATTLE_ENVIRONMENT_CAVE] = + { + .tileset = gBattleEnvironmentTiles_Cave, + .tilemap = gBattleEnvironmentTilemap_Cave, + .entryTileset = gBattleEnvironmentAnimTiles_Cave, + .entryTilemap = gBattleEnvironmentAnimTilemap_Cave, + .palette = gBattleEnvironmentPalette_Cave, + }, + + [BATTLE_ENVIRONMENT_BUILDING] = + { + .tileset = gBattleEnvironmentTiles_Building, + .tilemap = gBattleEnvironmentTilemap_Building, + .entryTileset = gBattleEnvironmentAnimTiles_Building, + .entryTilemap = gBattleEnvironmentAnimTilemap_Building, + .palette = gBattleEnvironmentPalette_Building, + }, + + [BATTLE_ENVIRONMENT_PLAIN] = + { + .tileset = gBattleEnvironmentTiles_Building, + .tilemap = gBattleEnvironmentTilemap_Building, + .entryTileset = gBattleEnvironmentAnimTiles_Building, + .entryTilemap = gBattleEnvironmentAnimTilemap_Building, + .palette = gBattleEnvironmentPalette_Plain, + }, }; static void sub_800D6C4(void); @@ -262,23 +282,23 @@ void DrawMainBattleBackground(void) { if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER /*| BATTLE_TYPE_x2000000*/)) { - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_BattleTower, 0x20, 0x60); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) { if (gGameVersion == VERSION_RUBY) { - LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Cave, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Cave, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_Groudon, 0x20, 0x60); } else { - LZDecompressVram(gBattleTerrainTiles_Water, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Water, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Water, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_Kyogre, 0x20, 0x60); } } else @@ -288,16 +308,16 @@ void DrawMainBattleBackground(void) u8 trainerClass = gTrainers[gTrainerBattleOpponent].trainerClass; if (trainerClass == TRAINER_CLASS_LEADER) { - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_BuildingLeader, 0x20, 0x60); return; } else if (trainerClass == TRAINER_CLASS_CHAMPION) { - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumSteven, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumSteven, 0x20, 0x60); return; } } @@ -305,49 +325,49 @@ void DrawMainBattleBackground(void) switch (GetCurrentMapBattleScene()) { case MAP_BATTLE_SCENE_NORMAL: - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60); + LZDecompressVram(sBattleEnvironmentTable[gBattleEnvironment].tileset, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(sBattleEnvironmentTable[gBattleEnvironment].tilemap, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(sBattleEnvironmentTable[gBattleEnvironment].palette, 0x20, 0x60); break; case MAP_BATTLE_SCENE_GYM: - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_BuildingGym, 0x20, 0x60); break; case MAP_BATTLE_SCENE_MAGMA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumMagma, 0x20, 0x60); break; case MAP_BATTLE_SCENE_AQUA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumAqua, 0x20, 0x60); break; case MAP_BATTLE_SCENE_SIDNEY: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumSidney, 0x20, 0x60); break; case MAP_BATTLE_SCENE_PHOEBE: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumPhoebe, 0x20, 0x60); break; case MAP_BATTLE_SCENE_GLACIA: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumGlacia, 0x20, 0x60); break; case MAP_BATTLE_SCENE_DRAKE: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumDrake, 0x20, 0x60); break; case MAP_BATTLE_SCENE_BATTLE_TOWER: - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); - LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void*)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); + LoadCompressedPalette(gBattleEnvironmentPalette_BattleTower, 0x20, 0x60); break; } } @@ -652,20 +672,20 @@ void DrawBattleEntryBackground(void) } else if (gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)) { - LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(VRAM + 0x4000)); - LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)(VRAM + 0xE000)); + LZDecompressVram(gBattleEnvironmentAnimTiles_Building, (void *)(VRAM + 0x4000)); + LZDecompressVram(gBattleEnvironmentAnimTilemap_Building, (void *)(VRAM + 0xE000)); } else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) { if (gGameVersion == VERSION_RUBY) { - LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void *)(VRAM + 0x4000)); - LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void *)(VRAM + 0xE000)); + LZDecompressVram(gBattleEnvironmentAnimTiles_Cave, (void *)(VRAM + 0x4000)); + LZDecompressVram(gBattleEnvironmentAnimTilemap_Cave, (void *)(VRAM + 0xE000)); } else { - LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void *)(VRAM + 0x4000)); - LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void *)(VRAM + 0xE000)); + LZDecompressVram(gBattleEnvironmentAnimTiles_Underwater, (void *)(VRAM + 0x4000)); + LZDecompressVram(gBattleEnvironmentAnimTilemap_Underwater, (void *)(VRAM + 0xE000)); } } else @@ -674,26 +694,26 @@ void DrawBattleEntryBackground(void) { if (gTrainers[gTrainerBattleOpponent].trainerClass == 0x19) { - LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(VRAM + 0x4000)); - LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)(VRAM + 0xE000)); + LZDecompressVram(gBattleEnvironmentAnimTiles_Building, (void *)(VRAM + 0x4000)); + LZDecompressVram(gBattleEnvironmentAnimTilemap_Building, (void *)(VRAM + 0xE000)); return; } else if (gTrainers[gTrainerBattleOpponent].trainerClass == 0x20) { - LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(VRAM + 0x4000)); - LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)(VRAM + 0xE000)); + LZDecompressVram(gBattleEnvironmentAnimTiles_Building, (void *)(VRAM + 0x4000)); + LZDecompressVram(gBattleEnvironmentAnimTilemap_Building, (void *)(VRAM + 0xE000)); return; } } if (sav1_map_get_battletype() == 0) { - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void *)(VRAM + 0x4000)); - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void *)(VRAM + 0xE000)); + LZDecompressVram(sBattleEnvironmentTable[gBattleEnvironment].entryTileset, (void *)(VRAM + 0x4000)); + LZDecompressVram(sBattleEnvironmentTable[gBattleEnvironment].entryTilemap, (void *)(VRAM + 0xE000)); } else { - LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(VRAM + 0x4000)); - LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void *)(VRAM + 0xE000)); + LZDecompressVram(gBattleEnvironmentAnimTiles_Building, (void *)(VRAM + 0x4000)); + LZDecompressVram(gBattleEnvironmentAnimTilemap_Building, (void *)(VRAM + 0xE000)); } } } @@ -720,12 +740,12 @@ int LoadChosenBattleElement(u8 caseId) { if (gGameVersion == VERSION_RUBY) { - LZDecompressVram(gBattleTerrainTiles_Cave, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Cave, (void *)(BG_CHAR_ADDR(2))); break; } else { - LZDecompressVram(gBattleTerrainTiles_Water, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Water, (void *)(BG_CHAR_ADDR(2))); break; } } @@ -735,41 +755,41 @@ int LoadChosenBattleElement(u8 caseId) { if (gTrainers[gTrainerBattleOpponent].trainerClass == 0x19) { - LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void *)(BG_CHAR_ADDR(2))); break; } else if (gTrainers[gTrainerBattleOpponent].trainerClass == 0x20) { - LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); break; } } switch (sav1_map_get_battletype()) { case 0: - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(sBattleEnvironmentTable[gBattleEnvironment].tileset, (void *)(BG_CHAR_ADDR(2))); break; case 2: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); break; case 3: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); break; case 4: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); break; case 5: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); break; case 6: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); break; case 7: - LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Stadium, (void *)(BG_CHAR_ADDR(2))); break; case 1: case 8: - LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void *)(BG_CHAR_ADDR(2))); break; } break; @@ -777,7 +797,7 @@ int LoadChosenBattleElement(u8 caseId) } else { - LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void *)(BG_CHAR_ADDR(2))); break; } case 4: // tilemap @@ -787,12 +807,12 @@ int LoadChosenBattleElement(u8 caseId) { if (gGameVersion == 2) { - LZDecompressVram(gBattleTerrainTilemap_Cave, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Cave, (void *)(BG_SCREEN_ADDR(26))); break; } else { - LZDecompressVram(gBattleTerrainTilemap_Water, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Water, (void *)(BG_SCREEN_ADDR(26))); break; } } @@ -802,41 +822,41 @@ int LoadChosenBattleElement(u8 caseId) { if (gTrainers[gTrainerBattleOpponent].trainerClass == 0x19) { - LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); break; } else if (gTrainers[gTrainerBattleOpponent].trainerClass == 0x20) { - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); break; } } switch (sav1_map_get_battletype()) { case 0: - LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(sBattleEnvironmentTable[gBattleEnvironment].tilemap, (void *)(BG_SCREEN_ADDR(26))); break; case 2: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); break; case 3: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); break; case 4: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); break; case 5: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); break; case 6: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); break; case 7: - LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26))); break; case 1: case 8: - LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); break; } break; @@ -844,7 +864,7 @@ int LoadChosenBattleElement(u8 caseId) } else { - LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); + LZDecompressVram(gBattleEnvironmentTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); break; } case 5: // palette @@ -854,12 +874,12 @@ int LoadChosenBattleElement(u8 caseId) { if (gGameVersion == 2) { - LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_Groudon, 0x20, 0x60); break; } else { - LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_Kyogre, 0x20, 0x60); break; } } @@ -869,43 +889,43 @@ int LoadChosenBattleElement(u8 caseId) { if (gTrainers[gTrainerBattleOpponent].trainerClass == 0x19) { - LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_BuildingLeader, 0x20, 0x60); break; } else if (gTrainers[gTrainerBattleOpponent].trainerClass == 0x20) { - LoadCompressedPalette(gBattleTerrainPalette_StadiumSteven, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumSteven, 0x20, 0x60); break; } } switch (sav1_map_get_battletype()) { case 0: - LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60); + LoadCompressedPalette(sBattleEnvironmentTable[gBattleEnvironment].palette, 0x20, 0x60); break; case 1: - LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_BuildingGym, 0x20, 0x60); break; case 2: - LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumMagma, 0x20, 0x60); break; case 3: - LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumAqua, 0x20, 0x60); break; case 4: - LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumSidney, 0x20, 0x60); break; case 5: - LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumPhoebe, 0x20, 0x60); break; case 6: - LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumGlacia, 0x20, 0x60); break; case 7: - LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_StadiumDrake, 0x20, 0x60); break; case 8: - LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_BattleTower, 0x20, 0x60); break; } break; @@ -913,7 +933,7 @@ int LoadChosenBattleElement(u8 caseId) } else { - LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_BattleTower, 0x20, 0x60); break; } case 6: diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 9c61e74eb..1187218c4 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1109,11 +1109,11 @@ void BtlController_EmitFaintingCry(u8 a) PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); } -void BtlController_EmitIntroSlide(u8 a, u8 battleTerrain) +void BtlController_EmitIntroSlide(u8 bufferId, u8 environmentId) { gBattleBuffersTransferData[0] = 46; - gBattleBuffersTransferData[1] = battleTerrain; - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 2); + gBattleBuffersTransferData[1] = environmentId; + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2); } void BtlController_EmitIntroTrainerBallThrow(u8 a) diff --git a/src/battle_main.c b/src/battle_main.c index d846f6562..3e0199701 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -200,7 +200,7 @@ u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT]; -s8 gBattleTerrain; +s8 gBattleEnvironment; void (*gBattleMainFunc)(void); @@ -266,9 +266,9 @@ void CB2_InitBattleInternal(void) #if DEBUG if (!(gUnknown_02023A14_50 & 8)) - gBattleTerrain = BattleSetup_GetTerrain(); + gBattleEnvironment = BattleSetup_GetEnvironmentId(); #else - gBattleTerrain = BattleSetup_GetTerrain(); + gBattleEnvironment = BattleSetup_GetEnvironmentId(); #endif Text_InitWindowWithTemplate(&gWindowTemplate_Contest_MoveDescription, &gWindowTemplate_81E6C58); @@ -1960,7 +1960,7 @@ void debug_sub_801174C(void) } gBattleTypeFlags = gUnknown_Debug_821F598[i - 1]; gUnknown_02023A14_50 = 8; - gBattleTerrain = spC; + gBattleEnvironment = spC; if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) EnterSafariMode(); if (gUnknown_Debug_2023A76[0][30] >= 2 && gUnknown_Debug_2023A76[0][30] <= 4) @@ -2610,7 +2610,7 @@ void debug_sub_8012688(void) gBattle_BG2_Y = 0; gBattle_BG3_X = 0; gBattle_BG3_Y = 0; - gBattleTerrain = 9; + gBattleEnvironment = 9; sub_800D6D4(); LoadBattleTextboxAndBackground(); ResetSpriteData(); @@ -3692,7 +3692,7 @@ static void BattlePrepIntroSlide(void) if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerAtPosition(0); - BtlController_EmitIntroSlide(0, gBattleTerrain); + BtlController_EmitIntroSlide(0, gBattleEnvironment); MarkBattlerForControllerExec(gActiveBattler); gBattleMainFunc = sub_8011384; gBattleCommunication[0] = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 46000157c..b0627a20b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -63,7 +63,7 @@ extern u16 gPauseCounterBattle; extern u16 gPaydayMoney; extern u16 gRandomTurnNumber; extern u8 gBattleOutcome; -extern u8 gBattleTerrain; +extern u8 gBattleEnvironment; extern u16 gTrainerBattleOpponent; extern u8 gBattlerAttacker; extern u8 gBattlerTarget; @@ -498,7 +498,7 @@ static void atkC8_sethail(void); static void atkC9_jumpifattackandspecialattackcannotfall(void); static void atkCA_setforcedtarget(void); static void atkCB_setcharge(void); -static void atkCC_callterrainattack(void); +static void atkCC_callenvironmentattack(void); static void atkCD_cureifburnedparalysedorpoisoned(void); static void atkCE_settorment(void); static void atkCF_jumpifnodamage(void); @@ -529,7 +529,7 @@ static void atkE7_trycastformdatachange(void); static void atkE8_settypebasedhalvers(void); static void atkE9_setweatherballtype(void); static void atkEA_tryrecycleitem(void); -static void atkEB_settypetoterrain(void); +static void atkEB_settypetoenvironment(void); static void atkEC_pursuitrelated(void); static void atkEF_snatchsetbattlers(void); static void atkEE_removelightscreenreflect(void); @@ -749,7 +749,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkC9_jumpifattackandspecialattackcannotfall, atkCA_setforcedtarget, atkCB_setcharge, - atkCC_callterrainattack, + atkCC_callenvironmentattack, atkCD_cureifburnedparalysedorpoisoned, atkCE_settorment, atkCF_jumpifnodamage, @@ -780,7 +780,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkE8_settypebasedhalvers, atkE9_setweatherballtype, atkEA_tryrecycleitem, - atkEB_settypetoterrain, + atkEB_settypetoenvironment, atkEC_pursuitrelated, atkEF_snatchsetbattlers, atkEE_removelightscreenreflect, @@ -1016,18 +1016,18 @@ static const u16 sPickupItems[] = ITEM_KINGS_ROCK, 1 }; -static const u8 sTerrainToType[] = +static const u8 sEnvironmentToType[] = { - TYPE_GRASS, // tall grass - TYPE_GRASS, // long grass - TYPE_GROUND, // sand - TYPE_WATER, // underwater - TYPE_WATER, // water - TYPE_WATER, // pond water - TYPE_ROCK, // rock - TYPE_ROCK, // cave - TYPE_NORMAL, // building - TYPE_NORMAL, // plain + [BATTLE_ENVIRONMENT_GRASS] = TYPE_GRASS, + [BATTLE_ENVIRONMENT_LONG_GRASS] = TYPE_GRASS, + [BATTLE_ENVIRONMENT_SAND] = TYPE_GROUND, + [BATTLE_ENVIRONMENT_UNDERWATER] = TYPE_WATER, + [BATTLE_ENVIRONMENT_WATER] = TYPE_WATER, + [BATTLE_ENVIRONMENT_POND] = TYPE_WATER, + [BATTLE_ENVIRONMENT_MOUNTAIN] = TYPE_ROCK, + [BATTLE_ENVIRONMENT_CAVE] = TYPE_ROCK, + [BATTLE_ENVIRONMENT_BUILDING] = TYPE_NORMAL, + [BATTLE_ENVIRONMENT_PLAIN] = TYPE_NORMAL, }; static const u8 sBallCatchBonuses[] = @@ -8722,10 +8722,10 @@ static void atkCB_setcharge(void) gBattlescriptCurrInstr++; } -static void atkCC_callterrainattack(void) //nature power +static void atkCC_callenvironmentattack(void) //nature power { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gCurrentMove = sNaturePowerMoves[gBattleTerrain]; + gCurrentMove = sNaturePowerMoves[gBattleEnvironment]; gBattlerTarget = GetMoveTarget(gCurrentMove, 0); BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]); gBattlescriptCurrInstr++; @@ -9164,30 +9164,30 @@ static void atkE3_jumpifhasnohp(void) static void atkE4_getsecretpowereffect(void) { - switch (gBattleTerrain) + switch (gBattleEnvironment) { - case BATTLE_TERRAIN_GRASS: + case BATTLE_ENVIRONMENT_GRASS: gBattleCommunication[MOVE_EFFECT_BYTE] = 2; break; - case BATTLE_TERRAIN_LONG_GRASS: + case BATTLE_ENVIRONMENT_LONG_GRASS: gBattleCommunication[MOVE_EFFECT_BYTE] = 1; break; - case BATTLE_TERRAIN_SAND: + case BATTLE_ENVIRONMENT_SAND: gBattleCommunication[MOVE_EFFECT_BYTE] = 27; break; - case BATTLE_TERRAIN_UNDERWATER: + case BATTLE_ENVIRONMENT_UNDERWATER: gBattleCommunication[MOVE_EFFECT_BYTE] = 23; break; - case BATTLE_TERRAIN_WATER: + case BATTLE_ENVIRONMENT_WATER: gBattleCommunication[MOVE_EFFECT_BYTE] = 22; break; - case BATTLE_TERRAIN_POND: + case BATTLE_ENVIRONMENT_POND: gBattleCommunication[MOVE_EFFECT_BYTE] = 24; break; - case BATTLE_TERRAIN_MOUNTAIN: + case BATTLE_ENVIRONMENT_MOUNTAIN: gBattleCommunication[MOVE_EFFECT_BYTE] = 7; break; - case BATTLE_TERRAIN_CAVE: + case BATTLE_ENVIRONMENT_CAVE: gBattleCommunication[MOVE_EFFECT_BYTE] = 8; break; default: @@ -9312,15 +9312,15 @@ static void atkEA_tryrecycleitem(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkEB_settypetoterrain(void) +static void atkEB_settypetoenvironment(void) { - if (gBattleMons[gBattlerAttacker].type1 != sTerrainToType[gBattleTerrain] && gBattleMons[gBattlerAttacker].type2 != sTerrainToType[gBattleTerrain]) + if (gBattleMons[gBattlerAttacker].type1 != sEnvironmentToType[gBattleEnvironment] && gBattleMons[gBattlerAttacker].type2 != sEnvironmentToType[gBattleEnvironment]) { - gBattleMons[gBattlerAttacker].type1 = sTerrainToType[gBattleTerrain]; - gBattleMons[gBattlerAttacker].type2 = sTerrainToType[gBattleTerrain]; + gBattleMons[gBattlerAttacker].type1 = sEnvironmentToType[gBattleEnvironment]; + gBattleMons[gBattlerAttacker].type2 = sEnvironmentToType[gBattleEnvironment]; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 3; - gBattleTextBuff1[2] = sTerrainToType[gBattleTerrain]; + gBattleTextBuff1[2] = sEnvironmentToType[gBattleEnvironment]; gBattleTextBuff1[3] = 0xFF; gBattlescriptCurrInstr += 5; } @@ -9529,9 +9529,9 @@ static void atkF1_trysetcaughtmondexflags(void) } } -extern const u32 gBattleTerrainTiles_Building[]; -extern const u32 gBattleTerrainTilemap_Building[]; -extern const u32 gBattleTerrainPalette_BattleTower[]; +extern const u32 gBattleEnvironmentTiles_Building[]; +extern const u32 gBattleEnvironmentTilemap_Building[]; +extern const u32 gBattleEnvironmentPalette_BattleTower[]; static void atkF2_displaydexinfo(void) { @@ -9551,9 +9551,9 @@ static void atkF2_displaydexinfo(void) case 2: if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2 && !gTasks[gBattleCommunication[1]].isActive) { - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); - LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); - LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleEnvironmentTilemap_Building, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleEnvironmentPalette_BattleTower, 0x20, 0x60); REG_BG3CNT = 0x5a0b; gBattle_BG3_X = 0x100; BeginNormalPaletteFade(0xFFFC, 0, 16, 0, RGB(0, 0, 0)); diff --git a/src/battle_setup.c b/src/battle_setup.c index e5d0a9f53..087fd6f43 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -646,7 +646,7 @@ void CB2_EndScriptedWildBattle(void) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } -s8 BattleSetup_GetTerrain(void) +s8 BattleSetup_GetEnvironmentId(void) { u16 tileBehavior; s16 x, y; @@ -655,11 +655,11 @@ s8 BattleSetup_GetTerrain(void) tileBehavior = MapGridGetMetatileBehaviorAt(x, y); if (MetatileBehavior_IsTallGrass(tileBehavior)) - return BATTLE_TERRAIN_GRASS; + return BATTLE_ENVIRONMENT_GRASS; if (MetatileBehavior_IsLongGrass(tileBehavior)) - return BATTLE_TERRAIN_LONG_GRASS; + return BATTLE_ENVIRONMENT_LONG_GRASS; if (MetatileBehavior_IsSandOrDeepSand(tileBehavior)) - return BATTLE_TERRAIN_SAND; + return BATTLE_ENVIRONMENT_SAND; switch (gMapHeader.mapType) { case MAP_TYPE_TOWN: @@ -668,38 +668,38 @@ s8 BattleSetup_GetTerrain(void) break; case MAP_TYPE_UNDERGROUND: if (MetatileBehavior_IsIndoorEncounter(tileBehavior)) - return BATTLE_TERRAIN_BUILDING; + return BATTLE_ENVIRONMENT_BUILDING; if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) - return BATTLE_TERRAIN_POND; - return BATTLE_TERRAIN_CAVE; + return BATTLE_ENVIRONMENT_POND; + return BATTLE_ENVIRONMENT_CAVE; case MAP_TYPE_INDOOR: case MAP_TYPE_SECRET_BASE: - return BATTLE_TERRAIN_BUILDING; + return BATTLE_ENVIRONMENT_BUILDING; case MAP_TYPE_UNDERWATER: - return BATTLE_TERRAIN_UNDERWATER; + return BATTLE_ENVIRONMENT_UNDERWATER; case MAP_TYPE_6: if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) - return BATTLE_TERRAIN_WATER; - return BATTLE_TERRAIN_PLAIN; + return BATTLE_ENVIRONMENT_WATER; + return BATTLE_ENVIRONMENT_PLAIN; } if (MetatileBehavior_IsOceanWater(tileBehavior)) - return BATTLE_TERRAIN_WATER; + return BATTLE_ENVIRONMENT_WATER; if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) - return BATTLE_TERRAIN_POND; + return BATTLE_ENVIRONMENT_POND; if (MetatileBehavior_IsMountainTop(tileBehavior)) - return BATTLE_TERRAIN_MOUNTAIN; + return BATTLE_ENVIRONMENT_MOUNTAIN; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) { if (MetatileBehavior_GetBridgeType(tileBehavior)) - return BATTLE_TERRAIN_POND; + return BATTLE_ENVIRONMENT_POND; if (MetatileBehavior_IsBridge(tileBehavior) == TRUE) - return BATTLE_TERRAIN_WATER; + return BATTLE_ENVIRONMENT_WATER; } if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE113) && gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE113)) - return BATTLE_TERRAIN_SAND; + return BATTLE_ENVIRONMENT_SAND; if (GetSav1Weather() == 8) - return BATTLE_TERRAIN_SAND; - return BATTLE_TERRAIN_PLAIN; + return BATTLE_ENVIRONMENT_SAND; + return BATTLE_ENVIRONMENT_PLAIN; } static s8 GetBattleTransitionTypeByMap(void) diff --git a/src/data/graphics.c b/src/data/graphics.c index 975052e0d..8ba2f3946 100644 --- a/src/data/graphics.c +++ b/src/data/graphics.c @@ -730,68 +730,68 @@ const u8 gVersusFrameGfx[] = INCBIN_U8("graphics/battle_transitions/vs_frame.4bp const u8 gVersusFrameTilemap[] = INCBIN_U8("graphics/battle_transitions/vs_frame.bin.lz"); const u8 gVersusFramePal[] = INCBIN_U8("graphics/battle_transitions/vs_frame.gbapal.lz"); const u8 gUnknown_08E5DC2C[] = INCBIN_U8("graphics/battle_transitions/vs.4bpp.lz"); -const u8 gBattleTerrainTiles_TallGrass[] = INCBIN_U8("graphics/battle_terrain/tall_grass/tiles.4bpp.lz"); -const u8 gBattleTerrainPalette_TallGrass[] = INCBIN_U8("graphics/battle_terrain/tall_grass/palette.gbapal.lz"); -const u8 gBattleTerrainTilemap_TallGrass[] = INCBIN_U8("graphics/battle_terrain/tall_grass/map.bin.lz"); -const u8 gBattleTerrainTiles_LongGrass[] = INCBIN_U8("graphics/battle_terrain/long_grass/tiles.4bpp.lz"); -const u8 gBattleTerrainPalette_LongGrass[] = INCBIN_U8("graphics/battle_terrain/long_grass/palette.gbapal.lz"); -const u8 gBattleTerrainTilemap_LongGrass[] = INCBIN_U8("graphics/battle_terrain/long_grass/map.bin.lz"); -const u8 gBattleTerrainTiles_Sand[] = INCBIN_U8("graphics/battle_terrain/sand/tiles.4bpp.lz"); -const u8 gBattleTerrainPalette_Sand[] = INCBIN_U8("graphics/battle_terrain/sand/palette.gbapal.lz"); -const u8 gBattleTerrainTilemap_Sand[] = INCBIN_U8("graphics/battle_terrain/sand/map.bin.lz"); -const u8 gBattleTerrainTiles_Underwater[] = INCBIN_U8("graphics/battle_terrain/underwater/tiles.4bpp.lz"); -const u8 gBattleTerrainPalette_Underwater[] = INCBIN_U8("graphics/battle_terrain/underwater/palette.gbapal.lz"); -const u8 gBattleTerrainTilemap_Underwater[] = INCBIN_U8("graphics/battle_terrain/underwater/map.bin.lz"); -const u8 gBattleTerrainTiles_Water[] = INCBIN_U8("graphics/battle_terrain/water/tiles.4bpp.lz"); -const u8 gBattleTerrainPalette_Water[] = INCBIN_U8("graphics/battle_terrain/water/palette.gbapal.lz"); -const u8 gBattleTerrainTilemap_Water[] = INCBIN_U8("graphics/battle_terrain/water/map.bin.lz"); -const u8 gBattleTerrainTiles_PondWater[] = INCBIN_U8("graphics/battle_terrain/pond_water/tiles.4bpp.lz"); -const u8 gBattleTerrainPalette_PondWater[] = INCBIN_U8("graphics/battle_terrain/pond_water/palette.gbapal.lz"); -const u8 gBattleTerrainTilemap_PondWater[] = INCBIN_U8("graphics/battle_terrain/pond_water/map.bin.lz"); -const u8 gBattleTerrainTiles_Rock[] = INCBIN_U8("graphics/battle_terrain/rock/tiles.4bpp.lz"); -const u8 gBattleTerrainPalette_Rock[] = INCBIN_U8("graphics/battle_terrain/rock/palette.gbapal.lz"); -const u8 gBattleTerrainTilemap_Rock[] = INCBIN_U8("graphics/battle_terrain/rock/map.bin.lz"); -const u8 gBattleTerrainTiles_Cave[] = INCBIN_U8("graphics/battle_terrain/cave/tiles.4bpp.lz"); -const u8 gBattleTerrainPalette_Cave[] = INCBIN_U8("graphics/battle_terrain/cave/palette.gbapal.lz"); -const u8 gBattleTerrainTilemap_Cave[] = INCBIN_U8("graphics/battle_terrain/cave/map.bin.lz"); -const u8 gBattleTerrainPalette_Plain[] = INCBIN_U8("graphics/battle_terrain/plain/palette.gbapal.lz"); -const u8 gBattleTerrainTiles_Building[] = INCBIN_U8("graphics/battle_terrain/building/tiles.4bpp.lz"); +const u8 gBattleEnvironmentTiles_TallGrass[] = INCBIN_U8("graphics/battle_environment/tall_grass/tiles.4bpp.lz"); +const u8 gBattleEnvironmentPalette_TallGrass[] = INCBIN_U8("graphics/battle_environment/tall_grass/palette.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_TallGrass[] = INCBIN_U8("graphics/battle_environment/tall_grass/map.bin.lz"); +const u8 gBattleEnvironmentTiles_LongGrass[] = INCBIN_U8("graphics/battle_environment/long_grass/tiles.4bpp.lz"); +const u8 gBattleEnvironmentPalette_LongGrass[] = INCBIN_U8("graphics/battle_environment/long_grass/palette.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_LongGrass[] = INCBIN_U8("graphics/battle_environment/long_grass/map.bin.lz"); +const u8 gBattleEnvironmentTiles_Sand[] = INCBIN_U8("graphics/battle_environment/sand/tiles.4bpp.lz"); +const u8 gBattleEnvironmentPalette_Sand[] = INCBIN_U8("graphics/battle_environment/sand/palette.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_Sand[] = INCBIN_U8("graphics/battle_environment/sand/map.bin.lz"); +const u8 gBattleEnvironmentTiles_Underwater[] = INCBIN_U8("graphics/battle_environment/underwater/tiles.4bpp.lz"); +const u8 gBattleEnvironmentPalette_Underwater[] = INCBIN_U8("graphics/battle_environment/underwater/palette.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_Underwater[] = INCBIN_U8("graphics/battle_environment/underwater/map.bin.lz"); +const u8 gBattleEnvironmentTiles_Water[] = INCBIN_U8("graphics/battle_environment/water/tiles.4bpp.lz"); +const u8 gBattleEnvironmentPalette_Water[] = INCBIN_U8("graphics/battle_environment/water/palette.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_Water[] = INCBIN_U8("graphics/battle_environment/water/map.bin.lz"); +const u8 gBattleEnvironmentTiles_PondWater[] = INCBIN_U8("graphics/battle_environment/pond_water/tiles.4bpp.lz"); +const u8 gBattleEnvironmentPalette_PondWater[] = INCBIN_U8("graphics/battle_environment/pond_water/palette.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_PondWater[] = INCBIN_U8("graphics/battle_environment/pond_water/map.bin.lz"); +const u8 gBattleEnvironmentTiles_Rock[] = INCBIN_U8("graphics/battle_environment/rock/tiles.4bpp.lz"); +const u8 gBattleEnvironmentPalette_Rock[] = INCBIN_U8("graphics/battle_environment/rock/palette.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_Rock[] = INCBIN_U8("graphics/battle_environment/rock/map.bin.lz"); +const u8 gBattleEnvironmentTiles_Cave[] = INCBIN_U8("graphics/battle_environment/cave/tiles.4bpp.lz"); +const u8 gBattleEnvironmentPalette_Cave[] = INCBIN_U8("graphics/battle_environment/cave/palette.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_Cave[] = INCBIN_U8("graphics/battle_environment/cave/map.bin.lz"); +const u8 gBattleEnvironmentPalette_Plain[] = INCBIN_U8("graphics/battle_environment/plain/palette.gbapal.lz"); +const u8 gBattleEnvironmentTiles_Building[] = INCBIN_U8("graphics/battle_environment/building/tiles.4bpp.lz"); // this is also used for link battles -const u8 gBattleTerrainPalette_BattleTower[] = INCBIN_U8("graphics/battle_terrain/stadium/battle_tower.gbapal.lz"); -const u8 gBattleTerrainTilemap_Building[] = INCBIN_U8("graphics/battle_terrain/building/map.bin.lz"); -const u8 gBattleTerrainTiles_Stadium[] = INCBIN_U8("graphics/battle_terrain/stadium/tiles.4bpp.lz"); -const u8 gBattleTerrainTilemap_Stadium[] = INCBIN_U8("graphics/battle_terrain/stadium/map.bin.lz"); -const u8 gBattleTerrainPalette_Building[] = INCBIN_U8("graphics/battle_terrain/building/palette.gbapal.lz"); -const u8 gBattleTerrainPalette_Kyogre[] = INCBIN_U8("graphics/battle_terrain/water/kyogre.gbapal.lz"); -const u8 gBattleTerrainPalette_Groudon[] = INCBIN_U8("graphics/battle_terrain/cave/groudon.gbapal.lz"); -const u8 gBattleTerrainPalette_BuildingGym[] = INCBIN_U8("graphics/battle_terrain/building/palette2.gbapal.lz"); -const u8 gBattleTerrainPalette_BuildingLeader[] = INCBIN_U8("graphics/battle_terrain/building/palette3.gbapal.lz"); -const u8 gBattleTerrainPalette_StadiumAqua[] = INCBIN_U8("graphics/battle_terrain/stadium/palette1.gbapal.lz"); -const u8 gBattleTerrainPalette_StadiumMagma[] = INCBIN_U8("graphics/battle_terrain/stadium/palette2.gbapal.lz"); -const u8 gBattleTerrainPalette_StadiumSidney[] = INCBIN_U8("graphics/battle_terrain/stadium/palette3.gbapal.lz"); -const u8 gBattleTerrainPalette_StadiumPhoebe[] = INCBIN_U8("graphics/battle_terrain/stadium/palette4.gbapal.lz"); -const u8 gBattleTerrainPalette_StadiumGlacia[] = INCBIN_U8("graphics/battle_terrain/stadium/palette5.gbapal.lz"); -const u8 gBattleTerrainPalette_StadiumDrake[] = INCBIN_U8("graphics/battle_terrain/stadium/palette6.gbapal.lz"); -const u8 gBattleTerrainPalette_StadiumSteven[] = INCBIN_U8("graphics/battle_terrain/stadium/palette7.gbapal.lz"); -const u8 gBattleTerrainAnimTiles_TallGrass[] = INCBIN_U8("graphics/battle_terrain/tall_grass/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_TallGrass[] = INCBIN_U8("graphics/battle_terrain/tall_grass/anim_map.bin.lz"); -const u8 gBattleTerrainAnimTiles_LongGrass[] = INCBIN_U8("graphics/battle_terrain/long_grass/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U8("graphics/battle_terrain/long_grass/anim_map.bin.lz"); -const u8 gBattleTerrainAnimTiles_Sand[] = INCBIN_U8("graphics/battle_terrain/sand/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_Sand[] = INCBIN_U8("graphics/battle_terrain/sand/anim_map.bin.lz"); -const u8 gBattleTerrainAnimTiles_Underwater[] = INCBIN_U8("graphics/battle_terrain/underwater/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_Underwater[] = INCBIN_U8("graphics/battle_terrain/underwater/anim_map.bin.lz"); -const u8 gBattleTerrainAnimTiles_Water[] = INCBIN_U8("graphics/battle_terrain/water/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_Water[] = INCBIN_U8("graphics/battle_terrain/water/anim_map.bin.lz"); -const u8 gBattleTerrainAnimTiles_PondWater[] = INCBIN_U8("graphics/battle_terrain/pond_water/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_PondWater[] = INCBIN_U8("graphics/battle_terrain/pond_water/anim_map.bin.lz"); -const u8 gBattleTerrainAnimTiles_Rock[] = INCBIN_U8("graphics/battle_terrain/rock/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_Rock[] = INCBIN_U8("graphics/battle_terrain/rock/anim_map.bin.lz"); -const u8 gBattleTerrainAnimTiles_Cave[] = INCBIN_U8("graphics/battle_terrain/cave/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_Cave[] = INCBIN_U8("graphics/battle_terrain/cave/anim_map.bin.lz"); -const u8 gBattleTerrainAnimTiles_Building[] = INCBIN_U8("graphics/battle_terrain/building/anim_tiles.4bpp.lz"); -const u8 gBattleTerrainAnimTilemap_Building[] = INCBIN_U8("graphics/battle_terrain/building/anim_map.bin.lz"); +const u8 gBattleEnvironmentPalette_BattleTower[] = INCBIN_U8("graphics/battle_environment/stadium/battle_tower.gbapal.lz"); +const u8 gBattleEnvironmentTilemap_Building[] = INCBIN_U8("graphics/battle_environment/building/map.bin.lz"); +const u8 gBattleEnvironmentTiles_Stadium[] = INCBIN_U8("graphics/battle_environment/stadium/tiles.4bpp.lz"); +const u8 gBattleEnvironmentTilemap_Stadium[] = INCBIN_U8("graphics/battle_environment/stadium/map.bin.lz"); +const u8 gBattleEnvironmentPalette_Building[] = INCBIN_U8("graphics/battle_environment/building/palette.gbapal.lz"); +const u8 gBattleEnvironmentPalette_Kyogre[] = INCBIN_U8("graphics/battle_environment/water/kyogre.gbapal.lz"); +const u8 gBattleEnvironmentPalette_Groudon[] = INCBIN_U8("graphics/battle_environment/cave/groudon.gbapal.lz"); +const u8 gBattleEnvironmentPalette_BuildingGym[] = INCBIN_U8("graphics/battle_environment/building/palette2.gbapal.lz"); +const u8 gBattleEnvironmentPalette_BuildingLeader[] = INCBIN_U8("graphics/battle_environment/building/palette3.gbapal.lz"); +const u8 gBattleEnvironmentPalette_StadiumAqua[] = INCBIN_U8("graphics/battle_environment/stadium/palette1.gbapal.lz"); +const u8 gBattleEnvironmentPalette_StadiumMagma[] = INCBIN_U8("graphics/battle_environment/stadium/palette2.gbapal.lz"); +const u8 gBattleEnvironmentPalette_StadiumSidney[] = INCBIN_U8("graphics/battle_environment/stadium/palette3.gbapal.lz"); +const u8 gBattleEnvironmentPalette_StadiumPhoebe[] = INCBIN_U8("graphics/battle_environment/stadium/palette4.gbapal.lz"); +const u8 gBattleEnvironmentPalette_StadiumGlacia[] = INCBIN_U8("graphics/battle_environment/stadium/palette5.gbapal.lz"); +const u8 gBattleEnvironmentPalette_StadiumDrake[] = INCBIN_U8("graphics/battle_environment/stadium/palette6.gbapal.lz"); +const u8 gBattleEnvironmentPalette_StadiumSteven[] = INCBIN_U8("graphics/battle_environment/stadium/palette7.gbapal.lz"); +const u8 gBattleEnvironmentAnimTiles_TallGrass[] = INCBIN_U8("graphics/battle_environment/tall_grass/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_TallGrass[] = INCBIN_U8("graphics/battle_environment/tall_grass/anim_map.bin.lz"); +const u8 gBattleEnvironmentAnimTiles_LongGrass[] = INCBIN_U8("graphics/battle_environment/long_grass/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_LongGrass[] = INCBIN_U8("graphics/battle_environment/long_grass/anim_map.bin.lz"); +const u8 gBattleEnvironmentAnimTiles_Sand[] = INCBIN_U8("graphics/battle_environment/sand/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_Sand[] = INCBIN_U8("graphics/battle_environment/sand/anim_map.bin.lz"); +const u8 gBattleEnvironmentAnimTiles_Underwater[] = INCBIN_U8("graphics/battle_environment/underwater/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_Underwater[] = INCBIN_U8("graphics/battle_environment/underwater/anim_map.bin.lz"); +const u8 gBattleEnvironmentAnimTiles_Water[] = INCBIN_U8("graphics/battle_environment/water/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_Water[] = INCBIN_U8("graphics/battle_environment/water/anim_map.bin.lz"); +const u8 gBattleEnvironmentAnimTiles_PondWater[] = INCBIN_U8("graphics/battle_environment/pond_water/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_PondWater[] = INCBIN_U8("graphics/battle_environment/pond_water/anim_map.bin.lz"); +const u8 gBattleEnvironmentAnimTiles_Rock[] = INCBIN_U8("graphics/battle_environment/rock/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_Rock[] = INCBIN_U8("graphics/battle_environment/rock/anim_map.bin.lz"); +const u8 gBattleEnvironmentAnimTiles_Cave[] = INCBIN_U8("graphics/battle_environment/cave/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_Cave[] = INCBIN_U8("graphics/battle_environment/cave/anim_map.bin.lz"); +const u8 gBattleEnvironmentAnimTiles_Building[] = INCBIN_U8("graphics/battle_environment/building/anim_tiles.4bpp.lz"); +const u8 gBattleEnvironmentAnimTilemap_Building[] = INCBIN_U8("graphics/battle_environment/building/anim_map.bin.lz"); const u8 gBattleAnimSpriteSheet_261[] = INCBIN_U8("graphics/battle_anims/sprites/261.4bpp.lz"); const u8 gBattleAnimBackgroundTilemap_SandstormBrew[] = INCBIN_U8("graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz"); const u8 gBattleAnimBackgroundImage_SandstormBrew[] = INCBIN_U8("graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"); diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index aefd85bb2..45397ac8d 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -99,7 +99,7 @@ EWRAM_DATA struct WatanabeEwram18000_2 * gUnknown_Debug_2038A20 = NULL; u32 byte_3005E30; -extern s8 gBattleTerrain; +extern s8 gBattleEnvironment; void debug_80C3A50(u8 taskId); void debug_80C3D2C(u8 taskId); @@ -1460,7 +1460,7 @@ void debug_80C4E18(u8 taskId) else if (gMain.newKeys & START_BUTTON || gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - gBattleTerrain = gUnknown_Debug_083F814C[r6].data.type3; + gBattleEnvironment = gUnknown_Debug_083F814C[r6].data.type3; gTasks[taskId].func = debug_80C5158; } else if (gMain.newAndRepeatedKeys & DPAD_UP) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index ac30d2c3f..a19541acd 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -65,7 +65,7 @@ void nullsub_6(void); bool32 IsHMMove2(u16 move); extern struct Window gWindowTemplate_Contest_MoveDescription; -extern u8 gBattleTerrain; +extern u8 gBattleEnvironment; extern u8 gReservedSpritePaletteCount; extern u16 gMoveToLearn; extern struct SpriteTemplate gCreatingSpriteTemplate; @@ -205,7 +205,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gBattle_BG3_Y = 0; Text_InitWindowWithTemplate(&gWindowTemplate_Contest_MoveDescription, &gWindowTemplate_81E6C58); - gBattleTerrain = BATTLE_TERRAIN_PLAIN; + gBattleEnvironment = BATTLE_ENVIRONMENT_PLAIN; sub_800D6D4(); LoadBattleTextboxAndBackground(); @@ -313,7 +313,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) gBattle_BG3_Y = 0; Text_InitWindowWithTemplate(&gWindowTemplate_Contest_MoveDescription, &gWindowTemplate_81E6C58); - gBattleTerrain = BATTLE_TERRAIN_PLAIN; + gBattleEnvironment = BATTLE_ENVIRONMENT_PLAIN; sub_800D6D4(); LoadBattleTextboxAndBackground(); diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index b9f9e4f61..28937c2fc 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -40,9 +40,9 @@ extern const u8 gPokeblockBlack_Pal[]; extern const u8 gPokeblockWhite_Pal[]; extern const u8 gPokeblockGold_Pal[]; extern const u8 gPokeblock_Gfx[]; -extern const u8 gBattleTerrainTiles_Building[]; +extern const u8 gBattleEnvironmentTiles_Building[]; extern const u8 gUnknown_08E782FC[]; -extern const u8 gBattleTerrainPalette_BattleTower[]; +extern const u8 gBattleEnvironmentPalette_BattleTower[]; extern const struct CompressedSpriteSheet gUnknown_083F7F74; extern const struct CompressedSpritePalette gUnknown_083F7F7C; @@ -650,7 +650,7 @@ static bool8 sub_8147B20(struct Pokemon* mon) ePokeblockGfxState++; break; case 6: - LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM)); + LZDecompressVram(gBattleEnvironmentTiles_Building, (void*)(VRAM)); ePokeblockGfxState++; break; case 7: @@ -658,7 +658,7 @@ static bool8 sub_8147B20(struct Pokemon* mon) ePokeblockGfxState++; break; case 8: - LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); + LoadCompressedPalette(gBattleEnvironmentPalette_BattleTower, 0x20, 0x60); ePokeblockGfxState = 0; return TRUE; } diff --git a/sym_common.txt b/sym_common.txt index fca25afb0..bb34a287f 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -104,7 +104,7 @@ SYMBOL(gUnknown_03004250, 48) SYMBOL(gBattle_BG2_Y, 4) SYMBOL(gUnknown_03004284, 4) SYMBOL(gBattle_BG2_X, 4) -SYMBOL(gBattleTerrain, 4) +SYMBOL(gBattleEnvironment, 4) SYMBOL(gBattleTextBuff2, 16) SYMBOL(gBattle_BG0_Y, 4) SYMBOL(gBattle_BG0_X, 4)