Merge pull request #174 from garakmon/object_event

Dissassemble Event Object Data

1 files changed, 102 insertions, 102 deletions

diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 19d44d7cc..dd00bf854 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -30,7 +30,7 @@
 #include "constants/layouts.h"
 #include "constants/trainers.h"
 #include "constants/facility_trainer_classes.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
 
 struct UnkStruct_203F458
 {
@@ -113,102 +113,102 @@ extern const u8 gUnknown_83FE998[];
 extern const u8 *const gUnknown_83FE9C4[];
 
 static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
-    {MAP_OBJ_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY,       FEMALE},
-    {MAP_OBJ_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC,      MALE},
-    {MAP_OBJ_GFX_TUBER_F,        FACILITY_CLASS_TUBER,            FEMALE},
-    {MAP_OBJ_GFX_TUBER_M_2,      FACILITY_CLASS_TUBER_2,          MALE},
-    {MAP_OBJ_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER,      MALE},
-    {MAP_OBJ_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_2,    FEMALE},
-    {MAP_OBJ_GFX_SUPER_NERD,     FACILITY_CLASS_HEX_MANIAC,       MALE},
-    {MAP_OBJ_GFX_WOMAN_2,        FACILITY_CLASS_LADY,             FEMALE},
-    {MAP_OBJ_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY,           FEMALE},
-    {MAP_OBJ_GFX_BOY,            FACILITY_CLASS_RICH_BOY,         MALE},
-    {MAP_OBJ_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC,       MALE},
-    {MAP_OBJ_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE,     MALE},
-    {MAP_OBJ_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT,       MALE},
-    {MAP_OBJ_GFX_ROCKER,         FACILITY_CLASS_GUITARIST,        MALE},
-    {MAP_OBJ_GFX_ROCKER,         FACILITY_CLASS_KINDLER,          MALE},
-    {MAP_OBJ_GFX_CAMPER,         FACILITY_CLASS_CAMPER,           MALE},
-    {MAP_OBJ_GFX_SUPER_NERD,     FACILITY_CLASS_BUG_MANIAC,       MALE},
-    {MAP_OBJ_GFX_BOY,            FACILITY_CLASS_PSYCHIC,          MALE},
-    {MAP_OBJ_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_2,        FEMALE},
-    {MAP_OBJ_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN,        MALE},
-    {MAP_OBJ_GFX_BOY,            FACILITY_CLASS_SCHOOL_KID,       MALE},
-    {MAP_OBJ_GFX_WOMAN_1,        FACILITY_CLASS_SCHOOL_KID_2,     FEMALE},
-    {MAP_OBJ_GFX_BALDING_MAN,    FACILITY_CLASS_POKEFAN,          MALE},
-    {MAP_OBJ_GFX_WOMAN_3,        FACILITY_CLASS_POKEFAN_2,        FEMALE},
-    {MAP_OBJ_GFX_OLD_MAN_1,      FACILITY_CLASS_EXPERT,           MALE},
-    {MAP_OBJ_GFX_OLD_WOMAN,      FACILITY_CLASS_EXPERT_2,         FEMALE},
-    {MAP_OBJ_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER,        MALE},
-    {MAP_OBJ_GFX_FISHER,         FACILITY_CLASS_FISHERMAN,        MALE},
-    {MAP_OBJ_GFX_COOLTRAINER_M,  FACILITY_CLASS_DRAGON_TAMER,     MALE},
-    {MAP_OBJ_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER,      MALE},
-    {MAP_OBJ_GFX_LITTLE_BOY,     FACILITY_CLASS_NINJA_BOY,        MALE},
-    {MAP_OBJ_GFX_BATTLE_GIRL,    FACILITY_CLASS_BATTLE_GIRL,      FEMALE},
-    {MAP_OBJ_GFX_BEAUTY,         FACILITY_CLASS_PARASOL_LADY,     FEMALE},
-    {MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE,   FEMALE},
-    {MAP_OBJ_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER,        FEMALE},
-    {MAP_OBJ_GFX_SAILOR,         FACILITY_CLASS_SAILOR,           MALE},
-    {MAP_OBJ_GFX_FAT_MAN,        FACILITY_CLASS_COLLECTOR,        MALE},
-    {MAP_OBJ_GFX_MAN,            FACILITY_CLASS_PKMN_BREEDER,     MALE},
-    {MAP_OBJ_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_2,   FEMALE},
-    {MAP_OBJ_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER,      MALE},
-    {MAP_OBJ_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_2,    FEMALE},
-    {MAP_OBJ_GFX_LASS,           FACILITY_CLASS_LASS,             FEMALE},
-    {MAP_OBJ_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER,      MALE},
-    {MAP_OBJ_GFX_HIKER,          FACILITY_CLASS_HIKER,            MALE},
-    {MAP_OBJ_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER_2,      MALE},
-    {MAP_OBJ_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER_2,    MALE},
-    {MAP_OBJ_GFX_LASS,           FACILITY_CLASS_LASS_2,           FEMALE},
-    {MAP_OBJ_GFX_SAILOR,         FACILITY_CLASS_SAILOR_2,         MALE},
-    {MAP_OBJ_GFX_CAMPER,         FACILITY_CLASS_CAMPER_2,         MALE},
-    {MAP_OBJ_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER_2,      FEMALE},
-    {MAP_OBJ_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC_2,     MALE},
-    {MAP_OBJ_GFX_SUPER_NERD,     FACILITY_CLASS_SUPER_NERD,       MALE},
-    {MAP_OBJ_GFX_HIKER,          FACILITY_CLASS_HIKER_2,          MALE},
-    {MAP_OBJ_GFX_BIKER,          FACILITY_CLASS_BIKER,            MALE},
-    {MAP_OBJ_GFX_SUPER_NERD,     FACILITY_CLASS_BURGLAR,          MALE},
-    {MAP_OBJ_GFX_BALDING_MAN,    FACILITY_CLASS_ENGINEER,         MALE},
-    {MAP_OBJ_GFX_FISHER,         FACILITY_CLASS_FISHERMAN_2,      MALE},
-    {MAP_OBJ_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2,   MALE},
-    {MAP_OBJ_GFX_BIKER,          FACILITY_CLASS_CUE_BALL,         MALE},
-    {MAP_OBJ_GFX_OLD_MAN_1,      FACILITY_CLASS_GAMER,            MALE},
-    {MAP_OBJ_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY_2,         FEMALE},
-    {MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
-    {MAP_OBJ_GFX_BOY,            FACILITY_CLASS_PSYCHIC_3,        MALE},
-    {MAP_OBJ_GFX_ROCKER,         FACILITY_CLASS_ROCKER,           MALE},
-    {MAP_OBJ_GFX_ROCKER,         FACILITY_CLASS_JUGGLER,          MALE},
-    {MAP_OBJ_GFX_MAN,            FACILITY_CLASS_TAMER,            MALE},
-    {MAP_OBJ_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER_2,    MALE},
-    {MAP_OBJ_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT_2,     MALE},
-    {MAP_OBJ_GFX_SCIENTIST,      FACILITY_CLASS_SCIENTIST,        MALE},
-    {MAP_OBJ_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER_3,    MALE},
-    {MAP_OBJ_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_4,    FEMALE},
-    {MAP_OBJ_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN_2,      MALE},
-    {MAP_OBJ_GFX_CHANNELER,      FACILITY_CLASS_CHANNELER,        FEMALE},
-    {MAP_OBJ_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_4,        FEMALE},
-    {MAP_OBJ_GFX_BATTLE_GIRL,    FACILITY_CLASS_CRUSH_GIRL,       FEMALE},
-    {MAP_OBJ_GFX_TUBER_F,        FACILITY_CLASS_TUBER_3,          FEMALE},
-    {MAP_OBJ_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_3,   FEMALE},
-    {MAP_OBJ_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER_3,    MALE},
-    {MAP_OBJ_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_4,    FEMALE},
-    {MAP_OBJ_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY_2,     FEMALE},
-    {MAP_OBJ_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC_2,    MALE},
-    {MAP_OBJ_GFX_WOMAN_2,        FACILITY_CLASS_LADY_2,           FEMALE},
-    {MAP_OBJ_GFX_LASS,           FACILITY_CLASS_PAINTER,          FEMALE}
+    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY,       FEMALE},
+    {OBJECT_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC,      MALE},
+    {OBJECT_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER,            FEMALE},
+    {OBJECT_EVENT_GFX_TUBER_M_2,      FACILITY_CLASS_TUBER_2,          MALE},
+    {OBJECT_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER,      MALE},
+    {OBJECT_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_2,    FEMALE},
+    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_HEX_MANIAC,       MALE},
+    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY,             FEMALE},
+    {OBJECT_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY,           FEMALE},
+    {OBJECT_EVENT_GFX_BOY,            FACILITY_CLASS_RICH_BOY,         MALE},
+    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC,       MALE},
+    {OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE,     MALE},
+    {OBJECT_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT,       MALE},
+    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_GUITARIST,        MALE},
+    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_KINDLER,          MALE},
+    {OBJECT_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER,           MALE},
+    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BUG_MANIAC,       MALE},
+    {OBJECT_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC,          MALE},
+    {OBJECT_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_2,        FEMALE},
+    {OBJECT_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN,        MALE},
+    {OBJECT_EVENT_GFX_BOY,            FACILITY_CLASS_SCHOOL_KID,       MALE},
+    {OBJECT_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SCHOOL_KID_2,     FEMALE},
+    {OBJECT_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_POKEFAN,          MALE},
+    {OBJECT_EVENT_GFX_WOMAN_3,        FACILITY_CLASS_POKEFAN_2,        FEMALE},
+    {OBJECT_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_EXPERT,           MALE},
+    {OBJECT_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_EXPERT_2,         FEMALE},
+    {OBJECT_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER,        MALE},
+    {OBJECT_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN,        MALE},
+    {OBJECT_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_DRAGON_TAMER,     MALE},
+    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER,      MALE},
+    {OBJECT_EVENT_GFX_LITTLE_BOY,     FACILITY_CLASS_NINJA_BOY,        MALE},
+    {OBJECT_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_BATTLE_GIRL,      FEMALE},
+    {OBJECT_EVENT_GFX_BEAUTY,         FACILITY_CLASS_PARASOL_LADY,     FEMALE},
+    {OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE,   FEMALE},
+    {OBJECT_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER,        FEMALE},
+    {OBJECT_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR,           MALE},
+    {OBJECT_EVENT_GFX_FAT_MAN,        FACILITY_CLASS_COLLECTOR,        MALE},
+    {OBJECT_EVENT_GFX_MAN,            FACILITY_CLASS_PKMN_BREEDER,     MALE},
+    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_2,   FEMALE},
+    {OBJECT_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER,      MALE},
+    {OBJECT_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_2,    FEMALE},
+    {OBJECT_EVENT_GFX_LASS,           FACILITY_CLASS_LASS,             FEMALE},
+    {OBJECT_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER,      MALE},
+    {OBJECT_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER,            MALE},
+    {OBJECT_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER_2,      MALE},
+    {OBJECT_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER_2,    MALE},
+    {OBJECT_EVENT_GFX_LASS,           FACILITY_CLASS_LASS_2,           FEMALE},
+    {OBJECT_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR_2,         MALE},
+    {OBJECT_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER_2,         MALE},
+    {OBJECT_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER_2,      FEMALE},
+    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC_2,     MALE},
+    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_SUPER_NERD,       MALE},
+    {OBJECT_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER_2,          MALE},
+    {OBJECT_EVENT_GFX_BIKER,          FACILITY_CLASS_BIKER,            MALE},
+    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BURGLAR,          MALE},
+    {OBJECT_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_ENGINEER,         MALE},
+    {OBJECT_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN_2,      MALE},
+    {OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2,   MALE},
+    {OBJECT_EVENT_GFX_BIKER,          FACILITY_CLASS_CUE_BALL,         MALE},
+    {OBJECT_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_GAMER,            MALE},
+    {OBJECT_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY_2,         FEMALE},
+    {OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
+    {OBJECT_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC_3,        MALE},
+    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_ROCKER,           MALE},
+    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_JUGGLER,          MALE},
+    {OBJECT_EVENT_GFX_MAN,            FACILITY_CLASS_TAMER,            MALE},
+    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER_2,    MALE},
+    {OBJECT_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT_2,     MALE},
+    {OBJECT_EVENT_GFX_SCIENTIST,      FACILITY_CLASS_SCIENTIST,        MALE},
+    {OBJECT_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER_3,    MALE},
+    {OBJECT_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_4,    FEMALE},
+    {OBJECT_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN_2,      MALE},
+    {OBJECT_EVENT_GFX_CHANNELER,      FACILITY_CLASS_CHANNELER,        FEMALE},
+    {OBJECT_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_4,        FEMALE},
+    {OBJECT_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_CRUSH_GIRL,       FEMALE},
+    {OBJECT_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER_3,          FEMALE},
+    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_3,   FEMALE},
+    {OBJECT_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER_3,    MALE},
+    {OBJECT_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_4,    FEMALE},
+    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY_2,     FEMALE},
+    {OBJECT_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC_2,    MALE},
+    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY_2,           FEMALE},
+    {OBJECT_EVENT_GFX_LASS,           FACILITY_CLASS_PAINTER,          FEMALE}
 };
 
 static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = {
-    {MAP_OBJ_GFX_BEAUTY,         MAP_OBJ_GFX_WOMAN_1,        FACILITY_CLASS_SR_AND_JR,      FEMALE, FEMALE},
-    {MAP_OBJ_GFX_LITTLE_GIRL,    MAP_OBJ_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS,          FEMALE, FEMALE},
-    {MAP_OBJ_GFX_BEAUTY,         MAP_OBJ_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE,   FEMALE, MALE},
-    {MAP_OBJ_GFX_OLD_MAN_1,      MAP_OBJ_GFX_OLD_WOMAN,      FACILITY_CLASS_OLD_COUPLE,     MALE, FEMALE},
-    {MAP_OBJ_GFX_TUBER_M_2,      MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO,    MALE, FEMALE},
-    {MAP_OBJ_GFX_LITTLE_GIRL,    MAP_OBJ_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS_2,        FEMALE, FEMALE},
-    {MAP_OBJ_GFX_COOLTRAINER_M,  MAP_OBJ_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOL_COUPLE,    MALE, FEMALE},
-    {MAP_OBJ_GFX_BEAUTY,         MAP_OBJ_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
-    {MAP_OBJ_GFX_BATTLE_GIRL,    MAP_OBJ_GFX_BLACKBELT,      FACILITY_CLASS_CRUSH_KIN,      FEMALE, MALE},
-    {MAP_OBJ_GFX_SWIMMER_F_LAND, MAP_OBJ_GFX_TUBER_M_2,      FACILITY_CLASS_SIS_AND_BRO_2,  FEMALE, MALE}
+    {OBJECT_EVENT_GFX_BEAUTY,         OBJECT_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SR_AND_JR,      FEMALE, FEMALE},
+    {OBJECT_EVENT_GFX_LITTLE_GIRL,    OBJECT_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS,          FEMALE, FEMALE},
+    {OBJECT_EVENT_GFX_BEAUTY,         OBJECT_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE,   FEMALE, MALE},
+    {OBJECT_EVENT_GFX_OLD_MAN_1,      OBJECT_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_OLD_COUPLE,     MALE, FEMALE},
+    {OBJECT_EVENT_GFX_TUBER_M_2,      OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO,    MALE, FEMALE},
+    {OBJECT_EVENT_GFX_LITTLE_GIRL,    OBJECT_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS_2,        FEMALE, FEMALE},
+    {OBJECT_EVENT_GFX_COOLTRAINER_M,  OBJECT_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOL_COUPLE,    MALE, FEMALE},
+    {OBJECT_EVENT_GFX_BEAUTY,         OBJECT_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
+    {OBJECT_EVENT_GFX_BATTLE_GIRL,    OBJECT_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_CRUSH_KIN,      FEMALE, MALE},
+    {OBJECT_EVENT_GFX_SWIMMER_F_LAND, OBJECT_EVENT_GFX_TUBER_M_2,      FACILITY_CLASS_SIS_AND_BRO_2,  FEMALE, MALE}
 };
 
 static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] = {
@@ -521,7 +521,7 @@ static void sub_815DC8C(void) // fakematching
     const struct TrainerTowerFloor *const * r7;
 
     sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState));
-    sTrainerTowerState->floorIdx = gMapHeader.mapDataId - 42;
+    sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - 42;
     if (sub_815D834() == TRUE)
         CEReaderTool_LoadTrainerTower(&sTrainerTowerState->unk_0004);
     else
@@ -628,7 +628,7 @@ static void sub_815DD2C(void)
 
 static void sub_815DD44(void)
 {
-    if (gMapHeader.mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count)
+    if (gMapHeader.mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count)
     {
         gSpecialVar_Result = 3;
         SetCurrentMapLayout(LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF);
@@ -674,8 +674,8 @@ static void SetTrainerTowerNPCGraphics(void)
         }
         else
         {
-            r1  = MAP_OBJ_GFX_YOUNGSTER;
-            r4_ = MAP_OBJ_GFX_YOUNGSTER;
+            r1  = OBJECT_EVENT_GFX_YOUNGSTER;
+            r4_ = OBJECT_EVENT_GFX_YOUNGSTER;
         }
         VarSet(VAR_OBJ_GFX_ID_0, r1);
         VarSet(VAR_OBJ_GFX_ID_3, r4_);
@@ -692,7 +692,7 @@ static void SetTrainerTowerNPCGraphics(void)
             if (r3 != NELEMS(sSingleBattleTrainerInfo))
                 r1 = sSingleBattleTrainerInfo[r3].mapObjGfx;
             else
-                r1 = MAP_OBJ_GFX_YOUNGSTER;
+                r1 = OBJECT_EVENT_GFX_YOUNGSTER;
             switch (r4)
             {
             case 0:
@@ -831,8 +831,8 @@ static void sub_815E1F0(void)
 
 static void TTSpecial_HasReachedTheRoof(void)
 {
-    u16 mapDataId = gMapHeader.mapDataId;
-    if (mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx)
+    u16 mapLayoutId = gMapHeader.mapLayoutId;
+    if (mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx)
         gSpecialVar_Result = FALSE;
     else
         gSpecialVar_Result = TRUE;
@@ -1008,7 +1008,7 @@ static void sub_815E8CC(void)
 
 static void sub_815E908(void)
 {
-    if (gMapHeader.mapDataId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0)
+    if (gMapHeader.mapLayoutId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0)
     {
         gSpecialVar_Result = FALSE;
     }