Extract some map data definitions

3 files changed, 257 insertions, 11 deletions

diff --git a/src/data/areaMetadata.c b/src/data/areaMetadata.c
index 8a5d1941..cee56ea9 100644
--- a/src/data/areaMetadata.c
+++ b/src/data/areaMetadata.c
@@ -165,7 +165,6 @@ const AreaHeader gAreaMetadata[] = {
     { 0, 0, 0, 0 },
 };
 
-
 const OverworldLocation gOverworldLocations[] = {
     { 0, 0, 62, 74, 0, TEXT_INDEX(TEXT_WINDCRESTS, 0x0b) },
     { 0, 75, 62, 104, 1, TEXT_INDEX(TEXT_WINDCRESTS, 0x0c) },
diff --git a/src/data/caveBorderMapData.c b/src/data/caveBorderMapData.c
new file mode 100644
index 00000000..de31603b
--- /dev/null
+++ b/src/data/caveBorderMapData.c
@@ -0,0 +1,247 @@
+#include "assets/map_offsets.h"
+#include "map.h"
+
+/*
+Tiles for the borders of the cave that are loaded during the transition.
+When the player goes inside a cave during the start of the enter transition the border metatilemap is loaded and at the
+end the metatilemap for the cave is loaded. When the player goes out of a cave during the start of the leave transition
+the border metatilemap is loaded and at the end the metatilemap for the outside is loaded.
+*/
+
+const MapDataDefinition gCaveBorder_LakeWoods_enter_start[] = {
+    { offset_gCaveBorder_LakeWoods_outside, gMapTop.mapData, MAP_COMPRESSED | 7938 },
+};
+const MapDataDefinition gCaveBorder_LakeWoods_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_LakeWoodsCave_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7938 },
+    { offset_gAreaRoomMap_LakeWoodsCave_Main_top, gMapTop.mapData, MAP_COMPRESSED | 7938 },
+};
+const MapDataDefinition* const gCaveBorder_LakeWoods_enter[] = {
+    gCaveBorder_LakeWoods_enter_start,
+    gCaveBorder_LakeWoods_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_LakeWoods_leave_start[] = {
+    { offset_gCaveBorder_LakeWoods_inside, gMapTop.mapData, MAP_COMPRESSED | 7938 },
+};
+const MapDataDefinition gCaveBorder_LakeWoods_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_MinishWoods_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7938 },
+    { offset_gAreaRoomMap_MinishWoods_Main_top, gMapTop.mapData, MAP_COMPRESSED | 7938 },
+};
+const MapDataDefinition* const gCaveBorder_LakeWoods_leave[] = {
+    gCaveBorder_LakeWoods_leave_start,
+    gCaveBorder_LakeWoods_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_HyruleTown_enter_start[] = {
+    { offset_gCaveBorder_HyruleTown_outside, gMapTop.mapData, MAP_COMPRESSED | 7560 },
+};
+const MapDataDefinition gCaveBorder_HyruleTown_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleDigCaves_Town_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7560 },
+    { offset_gAreaRoomMap_HyruleDigCaves_Town_top, gMapTop.mapData, MAP_COMPRESSED | 7560 },
+};
+const MapDataDefinition* const gCaveBorder_HyruleTown_enter[] = {
+    gCaveBorder_HyruleTown_enter_start,
+    gCaveBorder_HyruleTown_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_HyruleTown_leave_start[] = {
+    { offset_gCaveBorder_HyruleTown_inside, gMapTop.mapData, MAP_COMPRESSED | 7560 },
+};
+const MapDataDefinition gCaveBorder_HyruleTown_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleTown_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7560 },
+    { offset_gAreaRoomMap_HyruleTown_Main_top, gMapTop.mapData, MAP_COMPRESSED | 7560 },
+};
+const MapDataDefinition* const gCaveBorder_HyruleTown_leave[] = {
+    gCaveBorder_HyruleTown_leave_start,
+    gCaveBorder_HyruleTown_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_EasternHills_enter_start[] = {
+    { offset_gCaveBorder_EasternHills_outside, gMapTop.mapData, MAP_COMPRESSED | 2040 },
+};
+const MapDataDefinition gCaveBorder_EasternHills_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_DigCaves_EasternHills_bottom, gMapBottom.mapData, MAP_COMPRESSED | 2040 },
+    { offset_gAreaRoomMap_DigCaves_EasternHills_top, gMapTop.mapData, MAP_COMPRESSED | 2040 },
+};
+const MapDataDefinition* const gCaveBorder_EasternHills_enter[] = {
+    gCaveBorder_EasternHills_enter_start,
+    gCaveBorder_EasternHills_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_EasternHills_leave_start[] = {
+    { offset_gCaveBorder_EasternHills_inside, gMapTop.mapData, MAP_COMPRESSED | 2040 },
+};
+const MapDataDefinition gCaveBorder_EasternHills_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleField_EasternHillsNorth_bottom, gMapBottom.mapData,
+      MAP_COMPRESSED | 2040 },
+    { offset_gAreaRoomMap_HyruleField_EasternHillsNorth_top, gMapTop.mapData, MAP_COMPRESSED | 2040 },
+};
+const MapDataDefinition* const gCaveBorder_EasternHills_leave[] = {
+    gCaveBorder_EasternHills_leave_start,
+    gCaveBorder_EasternHills_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_Crenel_enter_start[] = {
+    { offset_gCaveBorder_Crenel_outside, gMapTop.mapData, MAP_COMPRESSED | 1824 },
+};
+const MapDataDefinition gCaveBorder_Crenel_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_CrenelDigCave_0_bottom, gMapBottom.mapData, MAP_COMPRESSED | 1984 },
+    { offset_gAreaRoomMap_CrenelDigCave_0_top, gMapTop.mapData, MAP_COMPRESSED | 1984 },
+};
+const MapDataDefinition* const gCaveBorder_Crenel_enter[] = {
+    gCaveBorder_Crenel_enter_start,
+    gCaveBorder_Crenel_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_Crenel_leave_start[] = {
+    { offset_gCaveBorder_Crenel_inside, gMapTop.mapData, MAP_COMPRESSED | 1984 },
+};
+const MapDataDefinition gCaveBorder_Crenel_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_MtCrenel_WallClimb_bottom, gMapBottom.mapData, MAP_COMPRESSED | 1824 },
+    { offset_gAreaRoomMap_MtCrenel_WallClimb_top, gMapTop.mapData, MAP_COMPRESSED | 1824 },
+};
+const MapDataDefinition* const gCaveBorder_Crenel_leave[] = {
+    gCaveBorder_Crenel_leave_start,
+    gCaveBorder_Crenel_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_VeilFalls_enter_start[] = {
+    { offset_gCaveBorder_VeilFalls_outside, gMapTop.mapData, MAP_COMPRESSED | 3780 },
+};
+const MapDataDefinition gCaveBorder_VeilFalls_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_VeilFallsDigCave_0_bottom, gMapBottom.mapData, MAP_COMPRESSED | 3780 },
+    { offset_gAreaRoomMap_VeilFallsDigCave_0_top, gMapTop.mapData, MAP_COMPRESSED | 3780 },
+};
+const MapDataDefinition* const gCaveBorder_VeilFalls_enter[] = {
+    gCaveBorder_VeilFalls_enter_start,
+    gCaveBorder_VeilFalls_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_VeilFalls_leave_start[] = {
+    { offset_gCaveBorder_VeilFalls_inside, gMapTop.mapData, MAP_COMPRESSED | 3780 },
+};
+const MapDataDefinition gCaveBorder_VeilFalls_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_VeilFalls_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 3780 },
+    { offset_gAreaRoomMap_VeilFalls_Main_top, gMapTop.mapData, MAP_COMPRESSED | 3780 },
+};
+const MapDataDefinition* const gCaveBorder_VeilFalls_leave[] = {
+    gCaveBorder_VeilFalls_leave_start,
+    gCaveBorder_VeilFalls_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_TrilbyHighlands_enter_start[] = {
+    { offset_gCaveBorder_TrilbyHighlands_outside, gMapTop.mapData, MAP_COMPRESSED | 3600 },
+};
+const MapDataDefinition gCaveBorder_TrilbyHighlands_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_DigCaves_TrilbyHighlands_bottom, gMapBottom.mapData, MAP_COMPRESSED | 3600 },
+    { offset_gAreaRoomMap_DigCaves_TrilbyHighlands_top, gMapTop.mapData, MAP_COMPRESSED | 3600 },
+};
+const MapDataDefinition* const gCaveBorder_TrilbyHighlands_enter[] = {
+    gCaveBorder_TrilbyHighlands_enter_start,
+    gCaveBorder_TrilbyHighlands_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_TrilbyHighlands_leave_start[] = {
+    { offset_gCaveBorder_TrilbyHighlands_inside, gMapTop.mapData, MAP_COMPRESSED | 3600 },
+};
+const MapDataDefinition gCaveBorder_TrilbyHighlands_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleField_TrilbyHighlands_bottom, gMapBottom.mapData,
+      MAP_COMPRESSED | 3600 },
+    { offset_gAreaRoomMap_HyruleField_TrilbyHighlands_top, gMapTop.mapData, MAP_COMPRESSED | 3600 },
+};
+const MapDataDefinition* const gCaveBorder_TrilbyHighlands_leave[] = {
+    gCaveBorder_TrilbyHighlands_leave_start,
+    gCaveBorder_TrilbyHighlands_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_CastorWilds_enter_start[] = {
+    { offset_gCaveBorder_CastorWilds_outside, gMapTop.mapData, MAP_COMPRESSED | 7560 },
+};
+const MapDataDefinition gCaveBorder_CastorWilds_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_CastorWildsDigCave_0_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7560 },
+    { offset_gAreaRoomMap_CastorWildsDigCave_0_top, gMapTop.mapData, MAP_COMPRESSED | 7560 },
+};
+const MapDataDefinition* const gCaveBorder_CastorWilds_enter[] = {
+    gCaveBorder_CastorWilds_enter_start,
+    gCaveBorder_CastorWilds_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_CastorWilds_leave_start[] = {
+    { offset_gCaveBorder_CastorWilds_inside, gMapTop.mapData, MAP_COMPRESSED | 7560 },
+};
+const MapDataDefinition gCaveBorder_CastorWilds_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_CastorWilds_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7560 },
+    { offset_gAreaRoomMap_CastorWilds_Main_top, gMapTop.mapData, MAP_COMPRESSED | 7560 },
+};
+const MapDataDefinition* const gCaveBorder_CastorWilds_leave[] = {
+    gCaveBorder_CastorWilds_leave_start,
+    gCaveBorder_CastorWilds_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_LakeHyliaNorth_enter_start[] = {
+    { offset_gCaveBorder_LakeHyliaNorth_outside, gMapTop.mapData, MAP_COMPRESSED | 5760 },
+};
+const MapDataDefinition gCaveBorder_LakeHyliaNorth_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_HyliaDigCaves_1_bottom, gMapBottom.mapData, MAP_COMPRESSED | 3402 },
+    { offset_gAreaRoomMap_HyliaDigCaves_1_top, gMapTop.mapData, MAP_COMPRESSED | 3402 },
+};
+const MapDataDefinition* const gCaveBorder_LakeHyliaNorth_enter[] = {
+    gCaveBorder_LakeHyliaNorth_enter_start,
+    gCaveBorder_LakeHyliaNorth_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_LakeHyliaNorth_leave_start[] = {
+    { offset_gCaveBorder_LakeHyliaNorth_inside, gMapTop.mapData, MAP_COMPRESSED | 3402 },
+};
+const MapDataDefinition gCaveBorder_LakeHyliaNorth_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_LakeHylia_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 5760 },
+    { offset_gAreaRoomMap_LakeHylia_Main_top, gMapTop.mapData, MAP_COMPRESSED | 5760 },
+};
+const MapDataDefinition* const gCaveBorder_LakeHyliaNorth_leave[] = {
+    gCaveBorder_LakeHyliaNorth_leave_start,
+    gCaveBorder_LakeHyliaNorth_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_LonLonRanch_enter_start[] = {
+    { offset_gCaveBorder_LonLonRanch_outside, gMapTop.mapData, MAP_COMPRESSED | 7938 },
+};
+const MapDataDefinition* const gCaveBorder_LonLonRanch_enter[] = {
+    gCaveBorder_LonLonRanch_enter_start,
+    gCaveBorder_LakeHyliaNorth_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_LonLonRanch_leave_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleField_LonLonRanch_bottom, gMapBottom.mapData, MAP_COMPRESSED | 5400 },
+    { offset_gAreaRoomMap_HyruleField_LonLonRanch_top, gMapTop.mapData, MAP_COMPRESSED | 5400 },
+};
+const MapDataDefinition* const gCaveBorder_LonLonRanch_leave[] = {
+    gCaveBorder_LakeHyliaNorth_leave_start,
+    gCaveBorder_LonLonRanch_leave_end,
+};
+
+const MapDataDefinition gCaveBorder_LakeHyliaCenter_enter_end[] = {
+    { MAP_MULTIPLE | offset_gAreaRoomMap_HyliaDigCaves_0_bottom, gMapBottom.mapData, MAP_COMPRESSED | 544 },
+    { offset_gAreaRoomMap_HyliaDigCaves_0_top, gMapTop.mapData, MAP_COMPRESSED | 544 },
+};
+const MapDataDefinition* const gCaveBorder_LakeHyliaCenter_enter[] = {
+    gCaveBorder_LakeHyliaNorth_enter_start,
+    gCaveBorder_LakeHyliaCenter_enter_end,
+};
+
+const MapDataDefinition gCaveBorder_LakeHyliaCenter_leave_start[] = {
+    { offset_gCaveBorder_LakeHyliaCenter_inside, gMapTop.mapData, MAP_COMPRESSED | 544 },
+};
+const MapDataDefinition* const gCaveBorder_LakeHyliaCenter_leave[] = {
+    gCaveBorder_LakeHyliaCenter_leave_start,
+    gCaveBorder_LakeHyliaNorth_leave_end,
+};
+
+const MapDataDefinition* const* const gCaveBorderMapData[] = {
+    gCaveBorder_LakeWoods_enter,       gCaveBorder_LakeWoods_leave,       gCaveBorder_HyruleTown_enter,
+    gCaveBorder_HyruleTown_leave,      gCaveBorder_EasternHills_enter,    gCaveBorder_EasternHills_leave,
+    gCaveBorder_Crenel_enter,          gCaveBorder_Crenel_leave,          gCaveBorder_VeilFalls_enter,
+    gCaveBorder_VeilFalls_leave,       gCaveBorder_TrilbyHighlands_enter, gCaveBorder_TrilbyHighlands_leave,
+    gCaveBorder_CastorWilds_enter,     gCaveBorder_CastorWilds_leave,     gCaveBorder_LakeHyliaNorth_enter,
+    gCaveBorder_LakeHyliaNorth_leave,  gCaveBorder_LonLonRanch_enter,     gCaveBorder_LonLonRanch_leave,
+    gCaveBorder_LakeHyliaCenter_enter, gCaveBorder_LakeHyliaCenter_leave,
+};
diff --git a/src/data/transitions.c b/src/data/transitions.c
index 4d600a86..38f0ae33 100644
--- a/src/data/transitions.c
+++ b/src/data/transitions.c
@@ -46,9 +46,9 @@ const Transition gExitList_MinishWoods_Main[] = {
     { WARP_TYPE_AREA, 0x00, 0x0088, 0x0218, 0x0218, 0x0118, 0x00, AREA_MINISH_CAVES,
       ROOM_MINISH_CAVES_MINISH_WOODS_SOUTHWEST, 1, TRANSITION_TYPE_NORMAL, 0x00, 0x00, 0x00, 0x00, 0x00 },
     { WARP_TYPE_BORDER, 0x00, 0x0000, 0x0000, 0x01d8, 0x0fff, 0x40, AREA_HYRULE_FIELD,
-      ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, 1, TRANSITION_TYPE_NORMAL, 0x06, 0x00, 0x00, 0x00, 0x00 },
+      ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, 1, TRANSITION_TYPE_NORMAL, 0x06, 0x00, 0x00, 0x00, 0x00 },
     { WARP_TYPE_BORDER, 0x00, 0x0000, 0x0000, 0x01d8, 0x00a0, 0x80, AREA_HYRULE_FIELD,
-      ROOM_HYRULE_FIELD_EASTERN_HILLLS_SOUTH, 1, TRANSITION_TYPE_NORMAL, 0x06, 0x00, 0x00, 0x00, 0x00 },
+      ROOM_HYRULE_FIELD_EASTERN_HILLS_SOUTH, 1, TRANSITION_TYPE_NORMAL, 0x06, 0x00, 0x00, 0x00, 0x00 },
     { WARP_TYPE_BORDER, 0x00, 0x0000, 0x0000, 0x0fff, 0x03b8, 0x01, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1,
       TRANSITION_TYPE_NORMAL, 0x00, 0x00, 0x00, 0x00, 0x00 },
     { WARP_TYPE_BORDER, 0x00, 0x0000, 0x0000, 0x0fff, 0x03ac, 0x02, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1,
@@ -446,9 +446,9 @@ const Transition gExitList_HyruleField_WesternWoodsCenter[] = {
 const Transition* const gExitLists_HyruleField[] = {
     [ROOM_HYRULE_FIELD_WESTERN_WOODS_SOUTH] = gExitList_HyruleField_WesternWoodSouth,
     [ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD] = gExitList_HyruleField_SouthHyruleField,
-    [ROOM_HYRULE_FIELD_EASTERN_HILLLS_SOUTH] = gExitList_HyruleField_EasternHillsSouth,
-    [ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER] = gExitList_HyruleField_EasternHillsCenter,
-    [ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH] = gExitList_HyruleField_EasternHillsNorth,
+    [ROOM_HYRULE_FIELD_EASTERN_HILLS_SOUTH] = gExitList_HyruleField_EasternHillsSouth,
+    [ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER] = gExitList_HyruleField_EasternHillsCenter,
+    [ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH] = gExitList_HyruleField_EasternHillsNorth,
     [ROOM_HYRULE_FIELD_LON_LON_RANCH] = gExitList_HyruleField_LonLonRanch,
     [ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD] = gExitList_HyruleField_NorthHyruleField,
     [ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS] = gExitList_HyruleField_TrilbyHighlands,
@@ -628,7 +628,7 @@ const Transition gExitList_Beanstalks_RuinsClimb[] = {
 const Transition gExitList_Beanstalks_EasternHillsClimb[] = {
     { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x58, 0x68, 0x3, AREA_BEANSTALKS, ROOM_BEANSTALKS_EASTERN_HILLS, 1,
       TRANSITION_TYPE_NORMAL, 0x0, 0x0, 0x0, 0x0, 0x0 },
-    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x48, 0x18, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER,
+    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x48, 0x18, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER,
       1, TRANSITION_TYPE_NORMAL, 0x0, 0x0, 0x0, 0x0, 0x0 },
     TransitionListEnd,
 };
@@ -923,7 +923,7 @@ const Transition gExitList_MinishHouseInteriors_Librari[] = {
     TransitionListEnd,
 };
 const Transition gExitList_MinishHouseInteriors_HyruleFieldExit[] = {
-    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x38, 0x35, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_SOUTH,
+    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x38, 0x35, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_SOUTH,
       1, TRANSITION_TYPE_INSTANT_MINISH, 0x4, 0x0, 0x0, 0x0, 0x0 },
     TransitionListEnd,
 };
@@ -1108,7 +1108,7 @@ const Transition gExitList_HouseInteriors2_DrLeft[] = {
     TransitionListEnd,
 };
 const Transition gExitList_HouseInteriors2_NULL1[] = {
-    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x40, 0x5c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH,
+    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x40, 0x5c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH,
       1, TRANSITION_TYPE_NORMAL, 0x4, 0x0, 0x0, 0x0, 0x0 },
     TransitionListEnd,
 };
@@ -1244,7 +1244,7 @@ const Transition gExitList_HouseInteriors4_RanchHouseEast[] = {
     TransitionListEnd,
 };
 const Transition gExitList_HouseInteriors4_FarmHouse[] = {
-    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x40, 0x5c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH,
+    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x40, 0x5c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH,
       1, TRANSITION_TYPE_NORMAL, 0x4, 0x0, 0x0, 0x0, 0x0 },
     TransitionListEnd,
 };
@@ -2273,7 +2273,7 @@ const Transition gExitList_Caves_TrilbyMittsFairyFountain[] = {
     TransitionListEnd,
 };
 const Transition gExitList_Caves_HillsKeeseChest[] = {
-    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0xa8, 0xa8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER,
+    { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0xa8, 0xa8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER,
       1, TRANSITION_TYPE_NORMAL, 0x4, 0x0, 0x0, 0x0, 0x0 },
     TransitionListEnd,
 };