Name battle terrains; address review comments

2 files changed, 11 insertions, 1 deletions

diff --git a/include/constants/battle.h b/include/constants/battle.h
index a80038f2c..e7c9d9d17 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -298,6 +298,16 @@
 #define BATTLE_TERRAIN_CAVE         7
 #define BATTLE_TERRAIN_BUILDING     8
 #define BATTLE_TERRAIN_PLAIN        9
+#define BATTLE_TERRAIN_LINK        10
+#define BATTLE_TERRAIN_GYM         11
+#define BATTLE_TERRAIN_LEADER      12
+#define BATTLE_TERRAIN_INDOOR_2    13
+#define BATTLE_TERRAIN_INDOOR_1    14
+#define BATTLE_TERRAIN_LORELEI     15
+#define BATTLE_TERRAIN_BRUNO       16
+#define BATTLE_TERRAIN_AGATHA      17
+#define BATTLE_TERRAIN_LANCE       18
+#define BATTLE_TERRAIN_CHAMPION    19
 
 // Return value for IsRunningFromBattleImpossible. 
 #define BATTLE_RUN_SUCCESS        0
diff --git a/include/graphics.h b/include/graphics.h
index fdee97c82..dcc4c44a7 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4877,7 +4877,7 @@ extern const u32 gUnionRoomChatIcons[];
 
 //battle_bg
 extern const u32 gFile_graphics_battle_transitions_vs_frame_sheet[];
-extern const u32 gFile_graphics_battle_transitions_vs_sheet[];
+extern const u32 gVsLettersGfx[];
 extern const u32 gFile_graphics_battle_transitions_vs_frame_palette[];
 extern const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[];