Merge pull request #515 from huderlem/battle_2

Decompile battle_2 and battle_util

2 files changed, 51 insertions, 51 deletions

diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index 88115d28a..11c05e478 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -103,59 +103,59 @@ static const u16 sBattleTowerHeldItems[] = {
 #include "../data/battle_tower/level_100_mons.h"
 
 static const u8 sMaleTrainerClasses[] = {
-    TRAINER_CLASS_RUIN_MANIAC,
-    TRAINER_CLASS_TUBER_M,
-    TRAINER_CLASS_COOL_TRAINER_M,
-    TRAINER_CLASS_RICH_BOY,
-    TRAINER_CLASS_POKEMANIAC,
-    TRAINER_CLASS_SWIMMER_M,
-    TRAINER_CLASS_BLACK_BELT,
-    TRAINER_CLASS_GUITARIST,
-    TRAINER_CLASS_KINDLER,
-    TRAINER_CLASS_CAMPER,
-    TRAINER_CLASS_BUG_MANIAC,
-    TRAINER_CLASS_PSYCHIC_M,
-    TRAINER_CLASS_GENTLEMAN,
-    TRAINER_CLASS_SCHOOL_KID_M,
-    TRAINER_CLASS_POKEFAN_M,
-    TRAINER_CLASS_EXPERT_M,
-    TRAINER_CLASS_YOUNGSTER,
-    TRAINER_CLASS_FISHERMAN,
-    TRAINER_CLASS_CYCLING_TRIATHLETE_M,
-    TRAINER_CLASS_RUNNING_TRIATHLETE_M,
-    TRAINER_CLASS_SWIMMING_TRIATHLETE_M,
-    TRAINER_CLASS_DRAGON_TAMER,
-    TRAINER_CLASS_BIRD_KEEPER,
-    TRAINER_CLASS_NINJA_BOY,
-    TRAINER_CLASS_SAILOR,
-    TRAINER_CLASS_COLLECTOR,
-    TRAINER_CLASS_POKEMON_BREEDER_M,
-    TRAINER_CLASS_POKEMON_RANGER_M,
-    TRAINER_CLASS_BUG_CATCHER,
-    TRAINER_CLASS_HIKER,
+    FACILITY_CLASS_RUIN_MANIAC,
+    FACILITY_CLASS_TUBER_M,
+    FACILITY_CLASS_COOL_TRAINER_M,
+    FACILITY_CLASS_RICH_BOY,
+    FACILITY_CLASS_POKEMANIAC,
+    FACILITY_CLASS_SWIMMER_M,
+    FACILITY_CLASS_BLACK_BELT,
+    FACILITY_CLASS_GUITARIST,
+    FACILITY_CLASS_KINDLER,
+    FACILITY_CLASS_CAMPER,
+    FACILITY_CLASS_BUG_MANIAC,
+    FACILITY_CLASS_PSYCHIC_M,
+    FACILITY_CLASS_GENTLEMAN,
+    FACILITY_CLASS_SCHOOL_KID_M,
+    FACILITY_CLASS_POKEFAN_M,
+    FACILITY_CLASS_EXPERT_M,
+    FACILITY_CLASS_YOUNGSTER,
+    FACILITY_CLASS_FISHERMAN,
+    FACILITY_CLASS_CYCLING_TRIATHLETE_M,
+    FACILITY_CLASS_RUNNING_TRIATHLETE_M,
+    FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
+    FACILITY_CLASS_DRAGON_TAMER,
+    FACILITY_CLASS_BIRD_KEEPER,
+    FACILITY_CLASS_NINJA_BOY,
+    FACILITY_CLASS_SAILOR,
+    FACILITY_CLASS_COLLECTOR,
+    FACILITY_CLASS_POKEMON_BREEDER_M,
+    FACILITY_CLASS_POKEMON_RANGER_M,
+    FACILITY_CLASS_BUG_CATCHER,
+    FACILITY_CLASS_HIKER,
 };
 
 static const u8 sFemaleTrainerClasses[] = {
-    TRAINER_CLASS_AROMA_LADY,
-    TRAINER_CLASS_TUBER_F,
-    TRAINER_CLASS_COOL_TRAINER_F,
-    TRAINER_CLASS_HEX_MANIAC,
-    TRAINER_CLASS_LADY,
-    TRAINER_CLASS_BEAUTY,
-    TRAINER_CLASS_PSYCHIC_F,
-    TRAINER_CLASS_SCHOOL_KID_F,
-    TRAINER_CLASS_POKEFAN_F,
-    TRAINER_CLASS_EXPERT_F,
-    TRAINER_CLASS_CYCLING_TRIATHLETE_F,
-    TRAINER_CLASS_RUNNING_TRIATHLETE_F,
-    TRAINER_CLASS_SWIMMING_TRIATHLETE_F,
-    TRAINER_CLASS_BATTLE_GIRL,
-    TRAINER_CLASS_PARASOL_LADY,
-    TRAINER_CLASS_SWIMMER_F,
-    TRAINER_CLASS_PICNICKER,
-    TRAINER_CLASS_POKEMON_BREEDER_F,
-    TRAINER_CLASS_POKEMON_RANGER_F,
-    TRAINER_CLASS_LASS,
+    FACILITY_CLASS_AROMA_LADY,
+    FACILITY_CLASS_TUBER_F,
+    FACILITY_CLASS_COOL_TRAINER_F,
+    FACILITY_CLASS_HEX_MANIAC,
+    FACILITY_CLASS_LADY,
+    FACILITY_CLASS_BEAUTY,
+    FACILITY_CLASS_PSYCHIC_F,
+    FACILITY_CLASS_SCHOOL_KID_F,
+    FACILITY_CLASS_POKEFAN_F,
+    FACILITY_CLASS_EXPERT_F,
+    FACILITY_CLASS_CYCLING_TRIATHLETE_F,
+    FACILITY_CLASS_RUNNING_TRIATHLETE_F,
+    FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
+    FACILITY_CLASS_BATTLE_GIRL,
+    FACILITY_CLASS_PARASOL_LADY,
+    FACILITY_CLASS_SWIMMER_F,
+    FACILITY_CLASS_PICNICKER,
+    FACILITY_CLASS_POKEMON_BREEDER_F,
+    FACILITY_CLASS_POKEMON_RANGER_F,
+    FACILITY_CLASS_LASS,
 };
 
 static const u8 sMaleTrainerGfxIds[] = {
diff --git a/src/field/tv.c b/src/field/tv.c
index d7a75a709..e88e3c72b 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -811,7 +811,7 @@ u8 sub_80BDEAC(u8 *a0)
     return lang;
 }
 
-void sub_80BDEC8(void)
+void PutPokemonTodayCaughtOnAir(void)
 {
     u8 i;
     u16 total;