diff options
| author | Henny022p <info@henny022.de> | 2022-03-23 19:14:17 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2022-03-23 19:14:17 +0100 |
| commit | d7fe306a49d47109795bd0bc1087eaf967fbf21b (patch) | |
| tree | 6c459ab9869970e1905491289e214c407d635f48 /src | |
| parent | 333709cefe6e304fd691a809fdd968e2746ff243 (diff) | |
more room names
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/transitions.c | 1687 | ||||
| -rw-r--r-- | src/roomInit.c | 240 | ||||
| -rw-r--r-- | src/title.c | 2 |
3 files changed, 975 insertions, 954 deletions
diff --git a/src/data/transitions.c b/src/data/transitions.c index ba9ffae1..d85f87d9 100644 --- a/src/data/transitions.c +++ b/src/data/transitions.c @@ -2,12 +2,10 @@ #include "area.h" #include "roomid.h" -// this terminates a list of Transitions -#define TransitionListEnd \ - { WARP_TYPE_END_OF_LIST, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } +// clang-format off -// some dev made a mistake and put above Terminator at the end of some lists of pointers -#define TransitionListEndBUG (void*)0x0000ffff, NULL, NULL, NULL, NULL +// this terminates a list of Transitions +#define TransitionListEnd { WARP_TYPE_END_OF_LIST, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } const Transition gExitList_NoExitList[] = { TransitionListEnd }; const Transition* const gExitLists_NoExit[] = { @@ -28,16 +26,16 @@ const Transition* const gExitLists_NoExit[] = { const Transition gExitList_MinishWoods_Main[] = { { WARP_TYPE_1, 0x00, 0x0138, 0x0318, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, - ROOM_MINISH_HOUSE_INTERIORS_26, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x01c8, 0x0258, 0x00a8, 0x00d8, 0x00, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x01, 0x00, + ROOM_MINISH_HOUSE_INTERIORS_MINISH_WOODS_BOMB, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { WARP_TYPE_1, 0x00, 0x01c8, 0x0258, 0x00a8, 0x00d8, 0x00, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0x00, 0x03a8, 0x0010, 0x0078, 0x0088, 0x02, AREA_BEANSTALKS, ROOM_BEANSTALKS_EASTERN_HILLS, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0210, 0x01c8, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1d, 0x01, 0x00, + { WARP_TYPE_1, 0x00, 0x0210, 0x01c8, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_MINISH_WOODS_BUSINESS_SCRUB, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0070, 0x0048, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1b, 0x01, 0x00, + { WARP_TYPE_1, 0x00, 0x0070, 0x0048, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_MINISH_WOODS_GREAT_FAIRY, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x02c0, 0x0048, 0x0078, 0x0088, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_0, 0x01, 0x00, + { WARP_TYPE_1, 0x00, 0x02c0, 0x0048, 0x0078, 0x0088, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_WITCH_HUT, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0x00, 0x03b8, 0x0038, 0x0078, 0x0108, 0x00, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_MINISH_WOODS_NORTH_1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, @@ -62,16 +60,16 @@ const Transition* const gExitLists_MinishWoods[] = { }; const Transition gExitList_LakeHylia_Main[] = { - { WARP_TYPE_1, 0, 0x02a0, 0x0378, 0x0078, 0x00a0, 0x02, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_5, 0x01, + { WARP_TYPE_1, 0, 0x02a0, 0x0378, 0x0078, 0x00a0, 0x02, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_MAYOR_LAKE_CABIN, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0, 0x0120, 0x0038, 0x0078, 0x0078, 0x02, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_14, 0x01, + { WARP_TYPE_1, 0, 0x0120, 0x0038, 0x0078, 0x0078, 0x02, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_STOCKWELL_LAKE_HOUSE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0, 0x0100, 0x02b8, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_13, 0x01, 0x00, + { WARP_TYPE_1, 0, 0x0100, 0x02b8, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_WAVEBLADE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0, 0x00c8, 0x0198, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_27, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0, 0x01e8, 0x01a8, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_23, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { WARP_TYPE_1, 0, 0x00c8, 0x0198, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_LAKE_HYLIA_OCARINA, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { WARP_TYPE_1, 0, 0x01e8, 0x01a8, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_LIBRARI, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0, 0x02b8, 0x0058, 0x0188, 0x01a8, 0x00, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_LAKE_HYLIA_NORTH, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0, 0x0148, 0x0374, 0x0248, 0x01a8, 0x00, AREA_LAKE_WOODS_CAVE, ROOM_LAKE_WOODS_CAVE_MAIN, 0x01, 0x00, @@ -96,17 +94,17 @@ const Transition* const gExitLists_LakeHylia[] = { }; const Transition gExitList_CastorWilds_Main[] = { - { WARP_TYPE_1, 0, 0x0248, 0x0032, 0x0038, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_1, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x0248, 0x0032, 0x0038, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_NORTH, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x0288, 0x0032, 0x0128, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_1, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x0288, 0x0032, 0x0128, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_NORTH, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x01a8, 0x01a2, 0x0088, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_3, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x01a8, 0x01a2, 0x0088, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_DARKNUT, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x02d8, 0x0382, 0x0078, 0x0098, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_0, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x02d8, 0x0382, 0x0078, 0x0098, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_SOUTH, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x03c8, 0x0038, 0x0078, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_4, 1, 0, 0, 0, 0, 0, + { WARP_TYPE_1, 0, 0x03c8, 0x0038, 0x0078, 0x0078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_HEART_PIECE, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0x0038, 0x02d4, 0x0078, 0x0088, 0x00, AREA_DOJOS, ROOM_DOJOS_4, 1, 0, 0, 0, 0, 0, 0 }, + { WARP_TYPE_1, 0, 0x0038, 0x02d4, 0x0078, 0x0088, 0x00, AREA_DOJOS, ROOM_DOJOS_SWIFTBLADE_I, 1, 0, 0, 0, 0, 0, 0 }, { WARP_TYPE_1, 0, 0x03b8, 0x02f8, 0x0078, 0x01f8, 0x00, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_SOUTHEAST_WATER_1, 1, 0, 0, 0, 0, 0, 0 }, { WARP_TYPE_0, 0, 0x0000, 0x0000, 0x0008, 0x0fff, 0x08, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_WESTERN_WOODS_NORTH, 1, @@ -120,7 +118,7 @@ const Transition* const gExitLists_CastorWilds[] = { const Transition gExitList_Ruins_Entrance[] = { { WARP_TYPE_0, 0, 0x00, 0x00, 0x0fff, 0x3b8, 0x01, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 1, 0, 0, 0, 0, 0, 0 }, - { WARP_TYPE_1, 0, 0xc8, 0x38, 0x0078, 0x078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_2, 1, 0, 0, 0, 0, 0, 0 }, + { WARP_TYPE_1, 0, 0xc8, 0x38, 0x0078, 0x078, 0x00, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_WIND_RUINS, 1, 0, 0, 0, 0, 0, 0 }, TransitionListEnd, }; const Transition gExitList_Ruins_Beanstalk[] = { @@ -131,7 +129,7 @@ const Transition gExitList_Ruins_LadderToTektites[] = { TransitionListEnd, }; const Transition gExitList_Ruins_FortressEntrance[] = { - { WARP_TYPE_0, 0, 0, 0, 0x1d8, 0xb0, 3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 1, 0, 0, 0, 0, + { WARP_TYPE_0, 0, 0, 0, 0x1d8, 0xb0, 3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 1, 0, 0, 0, 0, 0, 0 }, TransitionListEnd, }; @@ -145,65 +143,65 @@ const Transition* const gExitLists_Ruins[] = { }; const Transition gExitList_HyruleTown_0[] = { - { WARP_TYPE_1, 0x00, 0x02c8, 0x0138, 0x0068, 0x0098, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_0, 0x01, + { WARP_TYPE_1, 0x00, 0x02c8, 0x0138, 0x0068, 0x0098, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_MAYOR, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0308, 0x0120, 0x00e8, 0x0070, 0x01, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_0, 0x01, + { WARP_TYPE_1, 0x00, 0x0308, 0x0120, 0x00e8, 0x0070, 0x01, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_MAYOR, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0048, 0x00a8, 0x0078, 0x0090, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_1, 0x01, + { WARP_TYPE_1, 0x00, 0x0048, 0x00a8, 0x0078, 0x0090, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_POST_OFFICE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0138, 0x0048, 0x0078, 0x0088, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_2, 0x01, + { WARP_TYPE_1, 0x00, 0x0138, 0x0048, 0x0078, 0x0088, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_2F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0168, 0x00a8, 0x00e8, 0x00d8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_3, 0x01, + { WARP_TYPE_1, 0x00, 0x0168, 0x00a8, 0x00e8, 0x00d8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_1F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0388, 0x0258, 0x0068, 0x0078, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x01, + { WARP_TYPE_1, 0x00, 0x0388, 0x0258, 0x0068, 0x0078, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0368, 0x01b8, 0x0068, 0x0078, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_8, 0x01, + { WARP_TYPE_1, 0x00, 0x0368, 0x01b8, 0x0068, 0x0078, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_WEST_2F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x03a8, 0x0218, 0x0048, 0x01a8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_9, 0x01, + { WARP_TYPE_1, 0x00, 0x03a8, 0x0218, 0x0048, 0x01a8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_2F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x02c8, 0x0098, 0x0078, 0x00c8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_b, 0x01, + { WARP_TYPE_1, 0x00, 0x02c8, 0x0098, 0x0078, 0x00c8, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_SCHOOL_WEST, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0328, 0x0068, 0x00d8, 0x0088, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_c, 0x01, + { WARP_TYPE_1, 0x00, 0x0328, 0x0068, 0x00d8, 0x0088, 0x00, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_SCHOOL_EAST, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0258, 0x02e8, 0x0078, 0x00a8, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_0, 0x01, + { WARP_TYPE_1, 0x00, 0x0258, 0x02e8, 0x0078, 0x00a8, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_STOCKWELL_SHOP, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0198, 0x02e8, 0x0078, 0x00a8, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_1, 0x01, + { WARP_TYPE_1, 0x00, 0x0198, 0x02e8, 0x0078, 0x00a8, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_CAFE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0178, 0x0210, 0x00c8, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_2, 0x01, + { WARP_TYPE_1, 0x00, 0x0178, 0x0210, 0x00c8, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_REM_SHOE_SHOP, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0278, 0x01f0, 0x0028, 0x0090, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_3, 0x01, + { WARP_TYPE_1, 0x00, 0x0278, 0x01f0, 0x0028, 0x0090, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BAKERY, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0178, 0x0250, 0x00c8, 0x0070, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_4, 0x01, + { WARP_TYPE_1, 0x00, 0x0178, 0x0250, 0x00c8, 0x0070, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_SIMON, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0178, 0x0290, 0x00c8, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_5, 0x01, + { WARP_TYPE_1, 0x00, 0x0178, 0x0290, 0x00c8, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_FIGURINE_HOUSE, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0138, 0x0290, 0x0028, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_5, 0x01, + { WARP_TYPE_1, 0x00, 0x0138, 0x0290, 0x0028, 0x0060, 0x01, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_FIGURINE_HOUSE, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0298, 0x0258, 0x0078, 0x0088, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_6, 0x01, + { WARP_TYPE_1, 0x00, 0x0298, 0x0258, 0x0078, 0x0088, 0x00, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0090, 0x02c8, 0x0078, 0x0098, 0x02, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_0, 0x01, + { WARP_TYPE_1, 0x00, 0x0090, 0x02c8, 0x0078, 0x0098, 0x02, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_CARPENTER, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0098, 0x0168, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_0, 0x01, + { WARP_TYPE_1, 0x00, 0x0098, 0x0168, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_STRANGER, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0038, 0x0248, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_4, 0x01, + { WARP_TYPE_1, 0x00, 0x0038, 0x0248, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_DR_LEFT, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x02e8, 0x02f0, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_6, 0x01, + { WARP_TYPE_1, 0x00, 0x02e8, 0x02f0, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_ROMIO, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0348, 0x02f8, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_7, 0x01, + { WARP_TYPE_1, 0x00, 0x0348, 0x02f8, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_JULIETTA, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x03b8, 0x0358, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_c, 0x01, + { WARP_TYPE_1, 0x00, 0x03b8, 0x0358, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_CUCCO, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0138, 0x0388, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_1, 0x01, + { WARP_TYPE_1, 0x00, 0x0138, 0x0388, 0x0078, 0x0098, 0x00, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_SWIFTBLADE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0x00, 0x0038, 0x01a8, 0x0078, 0x0078, 0x00, AREA_MINISH_HOUSE_INTERIORS, - ROOM_MINISH_HOUSE_INTERIORS_25, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0050, 0x0378, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_10, 0x01, 0x00, + ROOM_MINISH_HOUSE_INTERIORS_HYRULE_TOWN, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { WARP_TYPE_1, 0x00, 0x0050, 0x0378, 0x0078, 0x0078, 0x02, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_STAIRS_TO_CARLOV, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x00f0, 0x0188, 0x0078, 0x0078, 0x02, AREA_CAVES, ROOM_CAVES_b, 0x01, 0x00, 0x00, 0x00, 0x00, + { WARP_TYPE_1, 0x00, 0x00f0, 0x0188, 0x0078, 0x0078, 0x02, AREA_CAVES, ROOM_CAVES_HYRULE_TOWN_WATERFALL, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x0040, 0x01b8, 0x0078, 0x0098, 0x02, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_1, 0x01, + { WARP_TYPE_1, 0x00, 0x0040, 0x01b8, 0x0078, 0x0098, 0x02, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_WEST_ORACLE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { WARP_TYPE_1, 0x00, 0x02b8, 0x0360, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_9, 0x01, + { WARP_TYPE_1, 0x00, 0x02b8, 0x0360, 0x0078, 0x0078, 0x00, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_EAST_ORACLE, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_1, 0x00, 0x0338, 0x0134, 0x0288, 0x0118, 0x00, AREA_HYRULE_TOWN_UNDERGROUND, ROOM_HYRULE_TOWN_UNDERGROUND_0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, @@ -227,18 +225,18 @@ const Transition gExitList_HyruleTown_1[] = { TransitionListEnd, }; const Transition* const gExitLists_FestivalTown[] = { - [ROOM_FESTIVAL_TOWN_0] = gExitList_HyruleTown_1, + [ROOM_FESTIVAL_TOWN_MAIN] = gExitList_HyruleTown_1, }; const Transition gExitList_MtCrenel_MountainTop[] = { - { WARP_TYPE_1, 0x0, 0x328, 0x34, 0x1a8, 0x28, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x328, 0x34, 0x1a8, 0x28, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BLOCK_PUSHING, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_WALL_CLIMB, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MtCrenel_WallClimb[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x58, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_e, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x58, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_HERMIT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x148, 0x1e8, 0x78, 0xf8, 0x0, AREA_GREAT_FAIRIES, ROOM_GREAT_FAIRIES_CRENEL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, @@ -247,51 +245,51 @@ const Transition gExitList_MtCrenel_WallClimb[] = { TransitionListEnd, }; const Transition gExitList_MtCrenel_CaveOfFlamesEntrance[] = { - { WARP_TYPE_1, 0x0, 0x128, 0x18, 0x58, 0x1b8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x128, 0x18, 0x58, 0x1b8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BLOCK_PUSHING, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x208, 0x18, 0x298, 0x1b8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x208, 0x18, 0x298, 0x1b8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BLOCK_PUSHING, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0xb8, 0xb8, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1d8, 0xb8, 0xb8, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_PILLAR_CAVE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x238, 0xb8, 0x48, 0x1c8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_2, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x238, 0xb8, 0x48, 0x1c8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BRIDGE_SWITCH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x188, 0xf8, 0xb8, 0x98, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_3, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x188, 0xf8, 0xb8, 0x98, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_EXIT_TO_MINES, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x208, 0x148, 0x78, 0xf0, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_10, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x208, 0x148, 0x78, 0xf0, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_TO_GRAYBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1e8, 0x1d8, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_4, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1e8, 0x1d8, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_GRIP_RING, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x68, 0x72, 0x88, 0xa8, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_3, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x68, 0x72, 0x88, 0xa8, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MtCrenel_GustJarShortcut[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x48, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_5, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x48, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2f8, 0x28, 0x38, 0x98, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_6, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2f8, 0x28, 0x38, 0x98, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_SPINY_CHU_PUZZLE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x348, 0x58, 0xb8, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_7, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x348, 0x58, 0xb8, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_CHUCHU_POT_CHEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x108, 0x78, 0x118, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_8, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x108, 0x78, 0x118, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_WATER_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MtCrenel_Entrance[] = { - { WARP_TYPE_1, 0x0, 0x298, 0x28, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_9, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x298, 0x28, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_RUPEE_FAIRY_FOUINTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x198, 0xd8, 0x1f8, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_a, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x198, 0xd8, 0x1f8, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_HELMASAUR_HALLWAY, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x138, 0x138, 0xb8, 0x138, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_b, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x138, 0x138, 0xb8, 0x138, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_MUSHROOM_KEESE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2d8, 0x188, 0x78, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_c, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2d8, 0x188, 0x78, 0x88, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_LADDER_TO_SPRING_WATER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x198, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_d, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x198, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BOMB_BUSINESS_SCRUB, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x3b8, 0x168, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_f, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x3b8, 0x168, 0x78, 0x78, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_HINT_SCRUB, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x1c8, 0x18, 0x98, 0x1a8, 0x0, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_BEAN_PESTO, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2d8, 0x154, 0x78, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_c, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2d8, 0x154, 0x78, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_LADDER_TO_SPRING_WATER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x8, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, @@ -306,53 +304,53 @@ const Transition* const gExitLists_MtCrenel[] = { }; const Transition gExitList_HyruleField_WesternWoodSouth[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x28, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_20, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0xb8, 0x28, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_SOUTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_SouthHyruleField[] = { - { WARP_TYPE_1, 0x0, 0x290, 0x188, 0x78, 0x78, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_10, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x290, 0x188, 0x78, 0x78, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x3a0, 0x228, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_12, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x3a0, 0x228, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_SOUTH_HYRULE_FIELD_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0xa8, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_9, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x58, 0x118, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_10, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x118, 0xa8, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_SOUTH_HYRULE_FIELD_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x58, 0x118, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_SOUTH_HYRULE_FIELD_RUPEE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x178, 0xd8, 0x78, 0xb8, 0x0, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_OUTSIDE_LINKS_HOUSE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x48, 0x1c8, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_21, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x48, 0x1c8, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_SOUTH_HYRULE_FIELD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1f8, 0x3b8, 0x3, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_EasternHillsSouth[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_24, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_EXIT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0x3c8, 0x8, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_EasternHillsCenter[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x98, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_13, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0xa8, 0x98, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_HILLS_KEESE_CHEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_EasternHillsNorth[] = { - { WARP_TYPE_1, 0x0, 0x40, 0x48, 0x78, 0x88, 0x2, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_4, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x40, 0x48, 0x78, 0x88, 0x2, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_FARM_HOUSE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0xc, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_LonLonRanch[] = { - { WARP_TYPE_1, 0x0, 0x158, 0x278, 0x68, 0x78, 0x0, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_2, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x158, 0x278, 0x68, 0x78, 0x0, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x188, 0x278, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_3, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x188, 0x278, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_EAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xe8, 0x1b4, 0xa8, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_c, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1f8, 0x208, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_f, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0x354, 0x78, 0x78, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xe8, 0x1b4, 0xa8, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_LON_LON_RANCH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1f8, 0x208, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_LON_LON_RANCH_WALLET, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x88, 0x354, 0x78, 0x78, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_STAIRS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x154, 0x38, 0x28, 0x0, AREA_CAVES, ROOM_CAVES_c, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0xb8, 0x154, 0x38, 0x28, 0x0, AREA_CAVES, ROOM_CAVES_LON_LON_RANCH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x3e8, 0x1, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1c8, 0x3e8, 0x2, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, @@ -366,21 +364,21 @@ const Transition gExitList_HyruleField_LonLonRanch[] = { const Transition gExitList_HyruleField_NorthHyruleField[] = { { WARP_TYPE_1, 0x0, 0x1f8, 0x38, 0x1f8, 0x208, 0x3, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1b0, 0x128, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_15, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1b0, 0x128, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_NORTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x240, 0x128, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_16, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x240, 0x128, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_NORTHEAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1b0, 0x188, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_17, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1b0, 0x188, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_SOUTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x240, 0x188, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_18, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x240, 0x188, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_SOUTHEAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2f0, 0x138, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1a, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2f0, 0x138, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1f8, 0x154, 0xa8, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0x138, 0x108, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x138, 0x1e8, 0x78, 0xc8, 0x0, AREA_CAVES, ROOM_CAVES_15, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xf4, 0x38, 0x58, 0x0, AREA_CAVES, ROOM_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0xf4, 0x118, 0x58, 0x0, AREA_CAVES, ROOM_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1f8, 0x154, 0xa8, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x108, 0x138, 0x108, 0xd8, 0x0, AREA_CAVES, ROOM_CAVES_TO_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x138, 0x1e8, 0x78, 0xc8, 0x0, AREA_CAVES, ROOM_CAVES_HEART_PIECE_HALLWAY, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x88, 0xf4, 0x38, 0x58, 0x0, AREA_CAVES, ROOM_CAVES_TO_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x118, 0xf4, 0x118, 0x58, 0x0, AREA_CAVES, ROOM_CAVES_TO_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x208, 0x3, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1f8, 0x18, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, @@ -392,15 +390,15 @@ const Transition gExitList_HyruleField_NorthHyruleField[] = { TransitionListEnd, }; const Transition gExitList_HyruleField_TrilbyHighlands[] = { - { WARP_TYPE_1, 0x0, 0x40, 0x388, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_11, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x40, 0x388, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_PERCYS_TREEHOUSE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0x222, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_7, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x2a8, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_11, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x198, 0x2b2, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_8, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0x94, 0x88, 0x68, 0x0, AREA_DIG_CAVES, ROOM_DIG_CAVES_3, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0 }, - { WARP_TYPE_1, 0x0, 0x98, 0x284, 0x38, 0x38, 0x0, AREA_CAVES, ROOM_CAVES_e, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x284, 0x128, 0x38, 0x0, AREA_CAVES, ROOM_CAVES_e, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x88, 0x222, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_KEESE_CHEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x38, 0x2a8, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_RUPEE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x198, 0x2b2, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x88, 0x94, 0x88, 0x68, 0x0, AREA_DIG_CAVES, ROOM_DIG_CAVES_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x98, 0x284, 0x38, 0x38, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x118, 0x284, 0x128, 0x38, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x3e8, 0x1, AREA_ROYAL_VALLEY, ROOM_ROYAL_VALLEY_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xf0, 0x8, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, @@ -410,14 +408,14 @@ const Transition gExitList_HyruleField_TrilbyHighlands[] = { TransitionListEnd, }; const Transition gExitList_HyruleField_WesternWoodsNorth[] = { - { WARP_TYPE_1, 0x0, 0xa0, 0x1e8, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_19, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa0, 0x1e8, 0x78, 0x78, 0x2, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_WESTERN_WOODS_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x3e8, 0xfff, 0x40, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HyruleField_WesternWoodsCenter[] = { - { WARP_TYPE_1, 0x0, 0x90, 0x48, 0x78, 0x88, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_8, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x90, 0x48, 0x78, 0x88, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_PERCY, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -438,27 +436,27 @@ const Transition* const gExitLists_HyruleField[] = { const Transition gExitList_CastleGarden_Main[] = { { WARP_TYPE_1, 0x0, 0x1f8, 0x28, 0xd8, 0x208, 0x2, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x308, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_0, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x308, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_EAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xe8, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_1, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xe8, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x68, 0x74, 0x68, 0x1a8, 0x0, AREA_HYRULE_CASTLE_CELLAR, ROOM_HYRULE_CASTLE_CELLAR_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x3a8, 0x184, 0x78, 0x68, 0x0, AREA_DOJOS, ROOM_DOJOS_a, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x3a8, 0x184, 0x78, 0x68, 0x0, AREA_DOJOS, ROOM_DOJOS_TO_GRIMBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1f8, 0x48, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gUnk_08134FBC[] = { - { WARP_TYPE_1, 0x0, 0x1f8, 0x28, 0x198, 0x1f0, 0x2, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_0, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x1f8, 0x28, 0x198, 0x1f0, 0x2, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x308, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_0, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x308, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_EAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xe8, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_1, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xe8, 0x48, 0x78, 0x78, 0x0, AREA_GARDEN_FOUNTAINS, ROOM_GARDEN_FOUNTAINS_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x68, 0x74, 0x68, 0x1a8, 0x0, AREA_HYRULE_CASTLE_CELLAR, ROOM_HYRULE_CASTLE_CELLAR_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x3a8, 0x184, 0x78, 0x68, 0x0, AREA_DOJOS, ROOM_DOJOS_a, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x3a8, 0x184, 0x78, 0x68, 0x0, AREA_DOJOS, ROOM_DOJOS_TO_GRIMBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1f8, 0x48, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -473,7 +471,7 @@ const Transition* const gExitLists_CastleGarden[] = { }; const Transition gExitList_CloudTops_House[] = { - { WARP_TYPE_1, 0x0, 0x1e8, 0x158, 0x78, 0x138, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_0, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1e8, 0x158, 0x78, 0x138, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -482,9 +480,9 @@ const Transition* const gExitLists_CloudTops[] = { }; const Transition gExitList_RoyalValley_Main[] = { - { WARP_TYPE_1, 0x0, 0xf0, 0x28, 0x88, 0x78, 0x2, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_8, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xf0, 0x28, 0x88, 0x78, 0x2, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1a0, 0x198, 0x78, 0x78, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_12, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1a0, 0x198, 0x78, 0x78, 0x2, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_DAMPE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x198, 0x2a8, 0x78, 0xf8, 0x0, AREA_GREAT_FAIRIES, ROOM_GREAT_FAIRIES_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, @@ -525,23 +523,23 @@ const Transition* const gExitLists_RoyalValley[] = { }; const Transition gExitList_VeilFalls_Main[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x22, 0x38, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_0, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x22, 0x38, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x158, 0x22, 0x118, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_0, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x158, 0x22, 0x118, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x42, 0xb8, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_1, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x118, 0x42, 0xb8, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x1e2, 0x38, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_3, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x1e2, 0x38, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xd8, 0x1c2, 0x98, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_4, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xd8, 0x1c2, 0x98, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_EXIT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xd8, 0x142, 0x98, 0x118, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_7, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xd8, 0x142, 0x98, 0x118, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_BLOCK_PUZZLE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0xc2, 0xb8, 0x118, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_8, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0xc2, 0xb8, 0x118, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_RUPEE_PATH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x78, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_9, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x78, 0x78, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xc8, 0x74, 0x38, 0x108, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_1, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xc8, 0x74, 0x38, 0x108, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x10, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_LON_LON_RANCH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -658,26 +656,26 @@ const Transition* const gExitLists_HyruleDigCaves[] = { }; const Transition gExitList_MinishVillage_Main[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x88, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_0, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x70, 0x68, 0x50, 0x1, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_1, 0x1, - 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x258, 0x58, 0xe8, 0xb8, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_2, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0x228, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_3, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x168, 0x1d8, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_4, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1a8, 0x208, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_5, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1e8, 0x2d8, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_7, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x48, 0x248, 0x78, 0xc8, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_8, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x378, 0x288, 0x78, 0x140, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_9, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x368, 0x234, 0x58, 0x100, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_9, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x88, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_GENTARI_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x38, 0x70, 0x68, 0x50, 0x1, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_GENTARI_EXIT, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x258, 0x58, 0xe8, 0xb8, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_FESTARI, + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x128, 0x228, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_RED, + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x168, 0x1d8, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_GREEN, + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1a8, 0x208, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_BLUE, + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1e8, 0x2d8, 0x78, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_SHOE_MINISH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x48, 0x248, 0x78, 0xc8, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_POT_MINISH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x378, 0x288, 0x78, 0x140, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_BARREL_MINISH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x368, 0x234, 0x58, 0x100, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_BARREL_MINISH, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x18, 0x30, AREA_MINISH_PATHS, ROOM_MINISH_PATHS_MINISH_VILLAGE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1c8, 0x338, 0x1, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, @@ -687,8 +685,8 @@ const Transition gExitList_MinishVillage_Main[] = { TransitionListEnd, }; const Transition gExitList_MinishVillage_SideHouse[] = { - { WARP_TYPE_1, 0x0, 0x138, 0x68, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_6, 0x1, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x138, 0x68, 0x80, 0x78, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_SIDE_AREA, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_MinishVillage[] = { @@ -703,12 +701,12 @@ const Transition gExitList_MelarisMine_Main[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x70, 0x12c, 0xbc, 0x138, 0x0, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x1, 0x6, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x220, 0x78, 0x28, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_10, 0x1, - 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x228, 0x220, 0x78, 0x28, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_11, 0x1, - 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x280, 0x11c, 0x24, 0x56, 0x0, AREA_MINISH_HOUSE_INTERIORS, ROOM_MINISH_HOUSE_INTERIORS_12, 0x1, - 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0xa8, 0x220, 0x78, 0x28, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHWEST, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x228, 0x220, 0x78, 0x28, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHEAST, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x280, 0x11c, 0x24, 0x56, 0x0, AREA_MINISH_HOUSE_INTERIORS, + ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_EAST, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_MelarisMine[] = { @@ -742,7 +740,7 @@ const Transition gExitList_MinishPaths_LonLonRanch[] = { const Transition gExitList_MinishPaths_MayorsCabin[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2a8, 0x31a, 0x3, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x48, 0x30, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_5, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x48, 0x30, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_MAYOR_LAKE_CABIN, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -788,14 +786,14 @@ const Transition* const gExitLists_CrenelMinishPaths[] = { const Transition gExitList_DigCaves1_TrilbyHighlands[] = { { WARP_TYPE_1, 0x0, 0x88, 0x44, 0x88, 0x78, 0x0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1a8, 0x78, 0xb8, 0x28, 0x0, AREA_CAVES, ROOM_CAVES_12, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x1a8, 0x78, 0xb8, 0x28, 0x0, AREA_CAVES, ROOM_CAVES_TRILBY_MITTS_FAIRY_FOUNTAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DigCaves1[] = { - [ROOM_DIG_CAVES_0] = gExitList_NoExitList, + [ROOM_DIG_CAVES_EASTERN_HILLS] = gExitList_NoExitList, [ROOM_DIG_CAVES_1] = gExitList_NoExitList, [ROOM_DIG_CAVES_2] = gExitList_NoExitList, - [ROOM_DIG_CAVES_3] = gExitList_DigCaves1_TrilbyHighlands, + [ROOM_DIG_CAVES_TRILBY_HIGHLANDS] = gExitList_DigCaves1_TrilbyHighlands, }; const Transition gExitList_MinishHouseInteriors_GentariMain[] = { @@ -882,7 +880,7 @@ const Transition gExitList_MinishHouseInteriors_HyruleFieldSouthwest[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_MinishHouseInteriors_HyruleFieldOutsideLinksHouse[] = { +const Transition gExitList_MinishHouseInteriors_SouthHyruleField[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x48, 0x1d4, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -918,25 +916,25 @@ const Transition gExitList_MinishHouseInteriors_LakeHyliaOcarina[] = { TransitionListEnd, }; const Transition* const gExitLists_MinishHouseInteriors[] = { - [ROOM_MINISH_HOUSE_INTERIORS_0] = gExitList_MinishHouseInteriors_GentariMain, - [ROOM_MINISH_HOUSE_INTERIORS_1] = gExitList_MinishHouseInteriors_GentariExit, - [ROOM_MINISH_HOUSE_INTERIORS_2] = gExitList_MinishHouseInteriors_Festari, - [ROOM_MINISH_HOUSE_INTERIORS_3] = gExitList_MinishHouseInteriors_Red, - [ROOM_MINISH_HOUSE_INTERIORS_4] = gExitList_MinishHouseInteriors_Green, - [ROOM_MINISH_HOUSE_INTERIORS_5] = gExitList_MinishHouseInteriors_Blue, - [ROOM_MINISH_HOUSE_INTERIORS_6] = gExitList_MinishHouseInteriors_SideArea, - [ROOM_MINISH_HOUSE_INTERIORS_7] = gExitList_MinishHouseInteriors_ShoeMinish, - [ROOM_MINISH_HOUSE_INTERIORS_8] = gExitList_MinishHouseInteriors_PotMinish, - [ROOM_MINISH_HOUSE_INTERIORS_9] = gExitList_MinishHouseInteriors_BarrelMinish, - [ROOM_MINISH_HOUSE_INTERIORS_a] = gExitList_MinishHouseInteriors_NULL1, - [ROOM_MINISH_HOUSE_INTERIORS_b] = gExitList_MinishHouseInteriors_NULL2, + [ROOM_MINISH_HOUSE_INTERIORS_GENTARI_MAIN] = gExitList_MinishHouseInteriors_GentariMain, + [ROOM_MINISH_HOUSE_INTERIORS_GENTARI_EXIT] = gExitList_MinishHouseInteriors_GentariExit, + [ROOM_MINISH_HOUSE_INTERIORS_FESTARI] = gExitList_MinishHouseInteriors_Festari, + [ROOM_MINISH_HOUSE_INTERIORS_RED] = gExitList_MinishHouseInteriors_Red, + [ROOM_MINISH_HOUSE_INTERIORS_GREEN] = gExitList_MinishHouseInteriors_Green, + [ROOM_MINISH_HOUSE_INTERIORS_BLUE] = gExitList_MinishHouseInteriors_Blue, + [ROOM_MINISH_HOUSE_INTERIORS_SIDE_AREA] = gExitList_MinishHouseInteriors_SideArea, + [ROOM_MINISH_HOUSE_INTERIORS_SHOE_MINISH] = gExitList_MinishHouseInteriors_ShoeMinish, + [ROOM_MINISH_HOUSE_INTERIORS_POT_MINISH] = gExitList_MinishHouseInteriors_PotMinish, + [ROOM_MINISH_HOUSE_INTERIORS_BARREL_MINISH] = gExitList_MinishHouseInteriors_BarrelMinish, + [ROOM_MINISH_HOUSE_INTERIORS_NULL1] = gExitList_MinishHouseInteriors_NULL1, + [ROOM_MINISH_HOUSE_INTERIORS_NULL2] = gExitList_MinishHouseInteriors_NULL2, [ROOM_MINISH_HOUSE_INTERIORS_c] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_d] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_e] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_f] = gExitList_NoExitList, - [ROOM_MINISH_HOUSE_INTERIORS_10] = gExitList_MinishHouseInteriors_MelariMinesSouthwest, - [ROOM_MINISH_HOUSE_INTERIORS_11] = gExitList_MinishHouseInteriors_MelariMinesSoutheast, - [ROOM_MINISH_HOUSE_INTERIORS_12] = gExitList_MinishHouseInteriors_MelariMinesEast, + [ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHWEST] = gExitList_MinishHouseInteriors_MelariMinesSouthwest, + [ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_SOUTHEAST] = gExitList_MinishHouseInteriors_MelariMinesSoutheast, + [ROOM_MINISH_HOUSE_INTERIORS_MELARI_MINES_EAST] = gExitList_MinishHouseInteriors_MelariMinesEast, [ROOM_MINISH_HOUSE_INTERIORS_13] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_14] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_15] = gExitList_NoExitList, @@ -950,85 +948,85 @@ const Transition* const gExitLists_MinishHouseInteriors[] = { [ROOM_MINISH_HOUSE_INTERIORS_1d] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_1e] = gExitList_NoExitList, [ROOM_MINISH_HOUSE_INTERIORS_1f] = gExitList_NoExitList, - [ROOM_MINISH_HOUSE_INTERIORS_20] = gExitList_MinishHouseInteriors_HyruleFieldSouthwest, - [ROOM_MINISH_HOUSE_INTERIORS_21] = gExitList_MinishHouseInteriors_HyruleFieldOutsideLinksHouse, - [ROOM_MINISH_HOUSE_INTERIORS_22] = gExitList_MinishHouseInteriors_NextToKnuckle, - [ROOM_MINISH_HOUSE_INTERIORS_23] = gExitList_MinishHouseInteriors_Librari, - [ROOM_MINISH_HOUSE_INTERIORS_24] = gExitList_MinishHouseInteriors_HyruleFieldExit, - [ROOM_MINISH_HOUSE_INTERIORS_25] = gExitList_MinishHouseInteriors_HyruleTown, - [ROOM_MINISH_HOUSE_INTERIORS_26] = gExitList_MinishHouseInteriors_MinishWoodsBomb, - [ROOM_MINISH_HOUSE_INTERIORS_27] = gExitList_MinishHouseInteriors_LakeHyliaOcarina, + [ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_SOUTHWEST] = gExitList_MinishHouseInteriors_HyruleFieldSouthwest, + [ROOM_MINISH_HOUSE_INTERIORS_SOUTH_HYRULE_FIELD] = gExitList_MinishHouseInteriors_SouthHyruleField, + [ROOM_MINISH_HOUSE_INTERIORS_NEXT_TO_KNUCKLE] = gExitList_MinishHouseInteriors_NextToKnuckle, + [ROOM_MINISH_HOUSE_INTERIORS_LIBRARI] = gExitList_MinishHouseInteriors_Librari, + [ROOM_MINISH_HOUSE_INTERIORS_HYRULE_FIELD_EXIT] = gExitList_MinishHouseInteriors_HyruleFieldExit, + [ROOM_MINISH_HOUSE_INTERIORS_HYRULE_TOWN] = gExitList_MinishHouseInteriors_HyruleTown, + [ROOM_MINISH_HOUSE_INTERIORS_MINISH_WOODS_BOMB] = gExitList_MinishHouseInteriors_MinishWoodsBomb, + [ROOM_MINISH_HOUSE_INTERIORS_LAKE_HYLIA_OCARINA] = gExitList_MinishHouseInteriors_LakeHyliaOcarina, }; const Transition gExitList_OuterFortressOfWinds_EntranceHall[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x22, 0x78, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_23, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x22, 0x78, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WIZZROBE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0x22, 0x68, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_20, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x128, 0x22, 0x68, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0x22, 0x78, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_21, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1d8, 0x22, 0x78, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x288, 0x22, 0x68, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_22, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x288, 0x22, 0x68, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x88, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_24, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x88, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_HEART_PIECE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0x28, 0x30, AREA_RUINS, ROOM_RUINS_FORTRESS_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_OuterFortressOfWinds_2F[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x22, 0x88, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_17, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x22, 0x88, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_STALFOS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0x92, 0x88, 0x170, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_19, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1d8, 0x92, 0x88, 0x170, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAIN_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x288, 0x92, 0x88, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1d, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x288, 0x92, 0x88, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x28, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1b, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x28, 0xb0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_BOSS_KEY, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0xd8, 0x128, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x128, 0xd8, 0x128, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0xd8, 0x1d8, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x1d8, 0xd8, 0x1d8, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x288, 0xd8, 0x288, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x288, 0xd8, 0x288, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0xd8, 0x338, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x338, 0xd8, 0x338, 0x68, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_OuterFortressOfWinds_3F[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x22, 0x78, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_3, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x68, 0x22, 0x78, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_PIT_PLATFORMS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0x22, 0x198, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_4, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x1d8, 0x22, 0x198, 0xa0, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x2e8, 0x22, 0x198, 0x178, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_2, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x2e8, 0x22, 0x198, 0x178, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x1f8, 0x178, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_2, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x338, 0x22, 0x1f8, 0x178, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1d8, 0x84, 0x1d8, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, + { WARP_TYPE_1, 0x0, 0x1d8, 0x84, 0x1d8, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x288, 0x84, 0x288, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, + { WARP_TYPE_1, 0x0, 0x288, 0x84, 0x288, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x338, 0x84, 0x338, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, + { WARP_TYPE_1, 0x0, 0x338, 0x84, 0x338, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0x84, 0x128, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, + { WARP_TYPE_1, 0x0, 0x128, 0x84, 0x128, 0xf8, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_OuterFortressOfWinds_MoleMitts[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x22, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_18, 0x2, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x22, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_ENTRANCE_MOLE_MITTS, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_OuterFortressOfWinds_SmallKey[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x22, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1a, 0x2, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x22, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MINISH_HOLE, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_OuterFortressOfWinds[] = { - [ROOM_OUTER_FORTRESS_OF_WINDS_0] = gExitList_OuterFortressOfWinds_EntranceHall, - [ROOM_OUTER_FORTRESS_OF_WINDS_1] = gExitList_OuterFortressOfWinds_2F, - [ROOM_OUTER_FORTRESS_OF_WINDS_2] = gExitList_OuterFortressOfWinds_3F, - [ROOM_OUTER_FORTRESS_OF_WINDS_3] = gExitList_OuterFortressOfWinds_MoleMitts, - [ROOM_OUTER_FORTRESS_OF_WINDS_4] = gExitList_OuterFortressOfWinds_SmallKey, + [ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL] = gExitList_OuterFortressOfWinds_EntranceHall, + [ROOM_OUTER_FORTRESS_OF_WINDS_2F] = gExitList_OuterFortressOfWinds_2F, + [ROOM_OUTER_FORTRESS_OF_WINDS_3F] = gExitList_OuterFortressOfWinds_3F, + [ROOM_OUTER_FORTRESS_OF_WINDS_MOLE_MITTS] = gExitList_OuterFortressOfWinds_MoleMitts, + [ROOM_OUTER_FORTRESS_OF_WINDS_SMALL_KEY] = gExitList_OuterFortressOfWinds_SmallKey, }; const Transition gExitList_HyliaDigCaves_North[] = { @@ -1123,7 +1121,7 @@ const Transition gExitList_HouseInteriors2_Cucco[] = { TransitionListEnd, }; const Transition gExitList_HouseInteriors2_LinksHouseEntrance[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x28, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_15, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x28, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_BEDROOM, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x290, 0x19c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -1137,39 +1135,39 @@ const Transition gExitList_HouseInteriors2_Dampe[] = { const Transition gExitList_HouseInteriors2_NULL2[] = { TransitionListEnd, }; -const Transition gExitList_HouseInteriors2_Stockwell[] = { +const Transition gExitList_HouseInteriors2_StockwellLakeHouse[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x120, 0x4c, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors2_LinksHouseBedroom[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x28, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_10, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x28, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_HouseInteriors2[] = { - [ROOM_HOUSE_INTERIORS_2_0] = gExitList_HouseInteriors2_Stranger, - [ROOM_HOUSE_INTERIORS_2_1] = gExitList_HouseInteriors2_WestOracle, + [ROOM_HOUSE_INTERIORS_2_STRANGER] = gExitList_HouseInteriors2_Stranger, + [ROOM_HOUSE_INTERIORS_2_WEST_ORACLE] = gExitList_HouseInteriors2_WestOracle, [ROOM_HOUSE_INTERIORS_2_2] = gExitList_HouseInteriors2_2, [ROOM_HOUSE_INTERIORS_2_3] = gExitList_HouseInteriors2_3, - [ROOM_HOUSE_INTERIORS_2_4] = gExitList_HouseInteriors2_DrLeft, + [ROOM_HOUSE_INTERIORS_2_DR_LEFT] = gExitList_HouseInteriors2_DrLeft, [ROOM_HOUSE_INTERIORS_2_5] = gExitList_HouseInteriors2_NULL1, - [ROOM_HOUSE_INTERIORS_2_6] = gExitList_HouseInteriors2_Romio, - [ROOM_HOUSE_INTERIORS_2_7] = gExitList_HouseInteriors2_Julietta, - [ROOM_HOUSE_INTERIORS_2_8] = gExitList_HouseInteriors2_Percy, - [ROOM_HOUSE_INTERIORS_2_9] = gExitList_HouseInteriors2_EastOracle, + [ROOM_HOUSE_INTERIORS_2_ROMIO] = gExitList_HouseInteriors2_Romio, + [ROOM_HOUSE_INTERIORS_2_JULIETTA] = gExitList_HouseInteriors2_Julietta, + [ROOM_HOUSE_INTERIORS_2_PERCY] = gExitList_HouseInteriors2_Percy, + [ROOM_HOUSE_INTERIORS_2_EAST_ORACLE] = gExitList_HouseInteriors2_EastOracle, [ROOM_HOUSE_INTERIORS_2_a] = gExitList_HouseInteriors2_A, [ROOM_HOUSE_INTERIORS_2_b] = gExitList_HouseInteriors2_B, - [ROOM_HOUSE_INTERIORS_2_c] = gExitList_HouseInteriors2_Cucco, + [ROOM_HOUSE_INTERIORS_2_CUCCO] = gExitList_HouseInteriors2_Cucco, [ROOM_HOUSE_INTERIORS_2_d] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_2_e] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_2_f] = gExitList_NoExitList, - [ROOM_HOUSE_INTERIORS_2_10] = gExitList_HouseInteriors2_LinksHouseEntrance, - [ROOM_HOUSE_INTERIORS_2_11] = gExitList_NoExitList, - [ROOM_HOUSE_INTERIORS_2_12] = gExitList_HouseInteriors2_Dampe, + [ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_ENTRANCE] = gExitList_HouseInteriors2_LinksHouseEntrance, + [ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_SMITH] = gExitList_NoExitList, + [ROOM_HOUSE_INTERIORS_2_DAMPE] = gExitList_HouseInteriors2_Dampe, [ROOM_HOUSE_INTERIORS_2_13] = gExitList_HouseInteriors2_NULL2, - [ROOM_HOUSE_INTERIORS_2_14] = gExitList_HouseInteriors2_Stockwell, - [ROOM_HOUSE_INTERIORS_2_15] = gExitList_HouseInteriors2_LinksHouseBedroom, + [ROOM_HOUSE_INTERIORS_2_STOCKWELL_LAKE_HOUSE] = gExitList_HouseInteriors2_StockwellLakeHouse, + [ROOM_HOUSE_INTERIORS_2_LINKS_HOUSE_BEDROOM] = gExitList_HouseInteriors2_LinksHouseBedroom, [ROOM_HOUSE_INTERIORS_2_16] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_2_17] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_2_18] = gExitList_NoExitList, @@ -1223,18 +1221,18 @@ const Transition gExitList_HouseInteriors4_FarmHouse[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_HouseInteriors4_Mayor[] = { +const Transition gExitList_HouseInteriors4_MayorLakeCabin[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2a0, 0x38c, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_HouseInteriors4[] = { - [ROOM_HOUSE_INTERIORS_4_0] = gExitList_HouseInteriors4_Carpenter, - [ROOM_HOUSE_INTERIORS_4_1] = gExitList_HouseInteriors4_Swiftblade, - [ROOM_HOUSE_INTERIORS_4_2] = gExitList_HouseInteriors4_RanchHouseWest, - [ROOM_HOUSE_INTERIORS_4_3] = gExitList_HouseInteriors4_RanchHouseEast, - [ROOM_HOUSE_INTERIORS_4_4] = gExitList_HouseInteriors4_FarmHouse, - [ROOM_HOUSE_INTERIORS_4_5] = gExitList_HouseInteriors4_Mayor, + [ROOM_HOUSE_INTERIORS_4_CARPENTER] = gExitList_HouseInteriors4_Carpenter, + [ROOM_HOUSE_INTERIORS_4_SWIFTBLADE] = gExitList_HouseInteriors4_Swiftblade, + [ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_WEST] = gExitList_HouseInteriors4_RanchHouseWest, + [ROOM_HOUSE_INTERIORS_4_RANCH_HOUSE_EAST] = gExitList_HouseInteriors4_RanchHouseEast, + [ROOM_HOUSE_INTERIORS_4_FARM_HOUSE] = gExitList_HouseInteriors4_FarmHouse, + [ROOM_HOUSE_INTERIORS_4_MAYOR_LAKE_CABIN] = gExitList_HouseInteriors4_MayorLakeCabin, [ROOM_HOUSE_INTERIORS_4_6] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_4_7] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_4_8] = gExitList_NoExitList, @@ -1253,7 +1251,7 @@ const Transition gExitList_GreatFairies_Graveyard[] = { TransitionListEnd, }; const Transition gExitList_GreatFairies_MinishWoods[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1b, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_MINISH_WOODS_GREAT_FAIRY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1304,30 +1302,30 @@ const Transition gExitList_HouseInteriors3_FigurineHouse[] = { const Transition gExitList_HouseInteriors3_BorlovEntrance[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x298, 0x26c, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x78, 0x3, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_8, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x78, 0x3, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors3_Carlov[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x60, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_10, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x60, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_STAIRS_TO_CARLOV, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors3_Borlov[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x68, 0x30, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_6, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x68, 0x30, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_HouseInteriors3[] = { - [ROOM_HOUSE_INTERIORS_3_0] = gExitList_HouseInteriors3_StockwellShop, - [ROOM_HOUSE_INTERIORS_3_1] = gExitList_HouseInteriors3_Cafe, - [ROOM_HOUSE_INTERIORS_3_2] = gExitList_HouseInteriors3_RemShoeShop, - [ROOM_HOUSE_INTERIORS_3_3] = gExitList_HouseInteriors3_Bakery, - [ROOM_HOUSE_INTERIORS_3_4] = gExitList_HouseInteriors3_Simon, - [ROOM_HOUSE_INTERIORS_3_5] = gExitList_HouseInteriors3_FigurineHouse, - [ROOM_HOUSE_INTERIORS_3_6] = gExitList_HouseInteriors3_BorlovEntrance, - [ROOM_HOUSE_INTERIORS_3_7] = gExitList_HouseInteriors3_Carlov, - [ROOM_HOUSE_INTERIORS_3_8] = gExitList_HouseInteriors3_Borlov, + [ROOM_HOUSE_INTERIORS_3_STOCKWELL_SHOP] = gExitList_HouseInteriors3_StockwellShop, + [ROOM_HOUSE_INTERIORS_3_CAFE] = gExitList_HouseInteriors3_Cafe, + [ROOM_HOUSE_INTERIORS_3_REM_SHOE_SHOP] = gExitList_HouseInteriors3_RemShoeShop, + [ROOM_HOUSE_INTERIORS_3_BAKERY] = gExitList_HouseInteriors3_Bakery, + [ROOM_HOUSE_INTERIORS_3_SIMON] = gExitList_HouseInteriors3_Simon, + [ROOM_HOUSE_INTERIORS_3_FIGURINE_HOUSE] = gExitList_HouseInteriors3_FigurineHouse, + [ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE] = gExitList_HouseInteriors3_BorlovEntrance, + [ROOM_HOUSE_INTERIORS_3_CARLOV] = gExitList_HouseInteriors3_Carlov, + [ROOM_HOUSE_INTERIORS_3_BORLOV] = gExitList_HouseInteriors3_Borlov, [ROOM_HOUSE_INTERIORS_3_9] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_3_a] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_3_b] = gExitList_NoExitList, @@ -1352,42 +1350,42 @@ const Transition gExitList_HouseInteriors1_PostOffice[] = { const Transition gExitList_HouseInteriors1_Library2F[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x138, 0x58, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x78, 0x18, 0x68, 0x28, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_3, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x78, 0x18, 0x68, 0x28, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_Library1F[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x168, 0xb8, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x68, 0x18, 0x78, 0x28, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_2, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x68, 0x18, 0x78, 0x28, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_Inn1F[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x388, 0x268, 0x10, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x78, 0x18, 0x98, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_5, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x18, 0x98, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x18, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_6, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x18, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xf8, 0x18, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_7, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xf8, 0x18, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x38, 0xb8, 0x168, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_9, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x118, 0x38, 0xb8, 0x168, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_2F, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_InnWestRoom[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_InnMiddleRoom[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_HouseInteriors1_InnEastRoom[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0x28, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1399,7 +1397,7 @@ const Transition gExitList_HouseInteriors1_InnWest2F[] = { const Transition gExitList_HouseInteriors1_InnEast2F[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x3a8, 0x230, 0x10, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x178, 0x118, 0x48, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_4, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xb8, 0x178, 0x118, 0x48, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1416,19 +1414,19 @@ const Transition gExitList_HouseInteriors1_SchoolEast[] = { TransitionListEnd, }; const Transition* const gExitLists_HouseInteriors1[] = { - [ROOM_HOUSE_INTERIORS_1_0] = gExitList_HouseInteriors1_Mayor, - [ROOM_HOUSE_INTERIORS_1_1] = gExitList_HouseInteriors1_PostOffice, - [ROOM_HOUSE_INTERIORS_1_2] = gExitList_HouseInteriors1_Library2F, - [ROOM_HOUSE_INTERIORS_1_3] = gExitList_HouseInteriors1_Library1F, - [ROOM_HOUSE_INTERIORS_1_4] = gExitList_HouseInteriors1_Inn1F, - [ROOM_HOUSE_INTERIORS_1_5] = gExitList_HouseInteriors1_InnWestRoom, - [ROOM_HOUSE_INTERIORS_1_6] = gExitList_HouseInteriors1_InnMiddleRoom, - [ROOM_HOUSE_INTERIORS_1_7] = gExitList_HouseInteriors1_InnEastRoom, - [ROOM_HOUSE_INTERIORS_1_8] = gExitList_HouseInteriors1_InnWest2F, - [ROOM_HOUSE_INTERIORS_1_9] = gExitList_HouseInteriors1_InnEast2F, - [ROOM_HOUSE_INTERIORS_1_a] = gExitList_NoExitList, - [ROOM_HOUSE_INTERIORS_1_b] = gExitList_HouseInteriors1_SchoolWest, - [ROOM_HOUSE_INTERIORS_1_c] = gExitList_HouseInteriors1_SchoolEast, + [ROOM_HOUSE_INTERIORS_1_MAYOR] = gExitList_HouseInteriors1_Mayor, + [ROOM_HOUSE_INTERIORS_1_POST_OFFICE] = gExitList_HouseInteriors1_PostOffice, + [ROOM_HOUSE_INTERIORS_1_LIBRARY_2F] = gExitList_HouseInteriors1_Library2F, + [ROOM_HOUSE_INTERIORS_1_LIBRARY_1F] = gExitList_HouseInteriors1_Library1F, + [ROOM_HOUSE_INTERIORS_1_INN_1F] = gExitList_HouseInteriors1_Inn1F, + [ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM] = gExitList_HouseInteriors1_InnWestRoom, + [ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM] = gExitList_HouseInteriors1_InnMiddleRoom, + [ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM] = gExitList_HouseInteriors1_InnEastRoom, + [ROOM_HOUSE_INTERIORS_1_INN_WEST_2F] = gExitList_HouseInteriors1_InnWest2F, + [ROOM_HOUSE_INTERIORS_1_INN_EAST_2F] = gExitList_HouseInteriors1_InnEast2F, + [ROOM_HOUSE_INTERIORS_1_INN_MINISH_HEART_PIECE] = gExitList_NoExitList, + [ROOM_HOUSE_INTERIORS_1_SCHOOL_WEST] = gExitList_HouseInteriors1_SchoolWest, + [ROOM_HOUSE_INTERIORS_1_SCHOOL_EAST] = gExitList_HouseInteriors1_SchoolEast, [ROOM_HOUSE_INTERIORS_1_d] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_1_e] = gExitList_NoExitList, [ROOM_HOUSE_INTERIORS_1_f] = gExitList_NoExitList, @@ -1456,7 +1454,7 @@ const Transition gExitList_TreeInteriors_WitchHut[] = { TransitionListEnd, }; const Transition gExitList_TreeInteriors_StairsToCarlov[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_7, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_CARLOV, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x50, 0x388, 0x30, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -1472,8 +1470,8 @@ const Transition gExitList_TreeInteriors_HeartPiece[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_StairsToBladeBrother[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x98, 0x0, AREA_DOJOS, ROOM_DOJOS_6, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, +const Transition gExitList_TreeInteriors_Waveblade[] = { + { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x98, 0x0, AREA_DOJOS, ROOM_DOJOS_WAVEBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x100, 0x2c8, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -1484,41 +1482,41 @@ const Transition gExitList_TreeInteriors_14[] = { TransitionListEnd, }; const Transition gExitList_TreeInteriors_BoomerangNorthwest[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x48, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x48, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1b0, 0x138, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TreeInteriors_BoomerangNortheast[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x108, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x108, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x240, 0x138, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TreeInteriors_BoomerangSouthwest[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x48, 0xf8, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x48, 0xf8, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1b0, 0x198, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TreeInteriors_BoomerangSoutheast[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x108, 0xf8, 0x0, AREA_CAVES, ROOM_CAVES_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x54, 0x108, 0xf8, 0x0, AREA_CAVES, ROOM_CAVES_BOOMERANG, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x240, 0x198, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_HeartPieceSouthwestField[] = { +const Transition gExitList_TreeInteriors_WesternWoodsHeartPiece[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa0, 0x1f8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_WESTERN_WOODS_NORTH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_StairsToFairyFountain[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_16, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, +const Transition gExitList_TreeInteriors_NorthHyruleFieldFairyFountain[] = { + { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2f0, 0x148, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_StairsToWalletFairy[] = { +const Transition gExitList_TreeInteriors_MinishWoodsGreatFairy[] = { { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0xf8, 0x0, AREA_GREAT_FAIRIES, ROOM_GREAT_FAIRIES_MINISH_WOODS, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x70, 0x58, 0x30, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, @@ -1530,8 +1528,8 @@ const Transition gExitList_TreeInteriors_1C[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_TreeInteriors_StairsToBusinessScrub[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_17, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, +const Transition gExitList_TreeInteriors_MinishWoodsBusinessScrub[] = { + { WARP_TYPE_1, 0x0, 0x78, 0x48, 0x78, 0x78, 0x0, AREA_CAVES, ROOM_CAVES_KINSTONE_BUSINESS_SCRUB, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x210, 0x1d8, 0x30, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -1539,13 +1537,13 @@ const Transition gExitList_TreeInteriors_StairsToBusinessScrub[] = { const Transition gExitList_TreeInteriors_1E[] = { TransitionListEnd, }; -const Transition gExitList_TreeInteriors_1F[] = { +const Transition gExitList_TreeInteriors_UnusedHeartContainer[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1e0, 0x1b8, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_TreeInteriors[] = { - [ROOM_TREE_INTERIORS_0] = gExitList_TreeInteriors_WitchHut, + [ROOM_TREE_INTERIORS_WITCH_HUT] = gExitList_TreeInteriors_WitchHut, [ROOM_TREE_INTERIORS_1] = gExitList_NoExitList, [ROOM_TREE_INTERIORS_2] = gExitList_NoExitList, [ROOM_TREE_INTERIORS_3] = gExitList_NoExitList, @@ -1561,26 +1559,26 @@ const Transition* const gExitLists_TreeInteriors[] = { [ROOM_TREE_INTERIORS_d] = gExitList_NoExitList, [ROOM_TREE_INTERIORS_e] = gExitList_NoExitList, [ROOM_TREE_INTERIORS_f] = gExitList_NoExitList, - [ROOM_TREE_INTERIORS_10] = gExitList_TreeInteriors_StairsToCarlov, - [ROOM_TREE_INTERIORS_11] = gExitList_TreeInteriors_PercysTreehouse, - [ROOM_TREE_INTERIORS_12] = gExitList_TreeInteriors_HeartPiece, - [ROOM_TREE_INTERIORS_13] = gExitList_TreeInteriors_StairsToBladeBrother, + [ROOM_TREE_INTERIORS_STAIRS_TO_CARLOV] = gExitList_TreeInteriors_StairsToCarlov, + [ROOM_TREE_INTERIORS_PERCYS_TREEHOUSE] = gExitList_TreeInteriors_PercysTreehouse, + [ROOM_TREE_INTERIORS_SOUTH_HYRULE_FIELD_HEART_PIECE] = gExitList_TreeInteriors_HeartPiece, + [ROOM_TREE_INTERIORS_WAVEBLADE] = gExitList_TreeInteriors_Waveblade, [ROOM_TREE_INTERIORS_14] = gExitList_TreeInteriors_14, - [ROOM_TREE_INTERIORS_15] = gExitList_TreeInteriors_BoomerangNorthwest, - [ROOM_TREE_INTERIORS_16] = gExitList_TreeInteriors_BoomerangNortheast, - [ROOM_TREE_INTERIORS_17] = gExitList_TreeInteriors_BoomerangSouthwest, - [ROOM_TREE_INTERIORS_18] = gExitList_TreeInteriors_BoomerangSoutheast, - [ROOM_TREE_INTERIORS_19] = gExitList_TreeInteriors_HeartPieceSouthwestField, - [ROOM_TREE_INTERIORS_1a] = gExitList_TreeInteriors_StairsToFairyFountain, - [ROOM_TREE_INTERIORS_1b] = gExitList_TreeInteriors_StairsToWalletFairy, + [ROOM_TREE_INTERIORS_BOOMERANG_NORTHWEST] = gExitList_TreeInteriors_BoomerangNorthwest, + [ROOM_TREE_INTERIORS_BOOMERANG_NORTHEAST] = gExitList_TreeInteriors_BoomerangNortheast, + [ROOM_TREE_INTERIORS_BOOMERANG_SOUTHWEST] = gExitList_TreeInteriors_BoomerangSouthwest, + [ROOM_TREE_INTERIORS_BOOMERANG_SOUTHEAST] = gExitList_TreeInteriors_BoomerangSoutheast, + [ROOM_TREE_INTERIORS_WESTERN_WOODS_HEART_PIECE] = gExitList_TreeInteriors_WesternWoodsHeartPiece, + [ROOM_TREE_INTERIORS_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN] = gExitList_TreeInteriors_NorthHyruleFieldFairyFountain, + [ROOM_TREE_INTERIORS_MINISH_WOODS_GREAT_FAIRY] = gExitList_TreeInteriors_MinishWoodsGreatFairy, [ROOM_TREE_INTERIORS_1c] = gExitList_TreeInteriors_1C, - [ROOM_TREE_INTERIORS_1d] = gExitList_TreeInteriors_StairsToBusinessScrub, + [ROOM_TREE_INTERIORS_MINISH_WOODS_BUSINESS_SCRUB] = gExitList_TreeInteriors_MinishWoodsBusinessScrub, [ROOM_TREE_INTERIORS_1e] = gExitList_TreeInteriors_1E, - [ROOM_TREE_INTERIORS_1f] = gExitList_TreeInteriors_1F, + [ROOM_TREE_INTERIORS_UNUSED_HEART_CONTAINER] = gExitList_TreeInteriors_UnusedHeartContainer, }; const Transition gExitList_Dojos_Grayblade[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x20, 0x30, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_10, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x20, 0x30, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_TO_GRAYBLADE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1590,7 +1588,7 @@ const Transition gExitList_Dojos_Swiftblade[] = { TransitionListEnd, }; const Transition gExitList_Dojos_Waveblade[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_13, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_WAVEBLADE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1615,14 +1613,22 @@ const Transition gExitList_Dojos_ToScarblade[] = { TransitionListEnd, }; const Transition* const gExitLists_Dojos[] = { - [ROOM_DOJOS_0] = gExitList_Dojos_Grayblade, [ROOM_DOJOS_1] = gExitList_NoExitList, - [ROOM_DOJOS_2] = gExitList_NoExitList, [ROOM_DOJOS_3] = gExitList_NoExitList, - [ROOM_DOJOS_4] = gExitList_Dojos_Swiftblade, [ROOM_DOJOS_5] = gExitList_NoExitList, - [ROOM_DOJOS_6] = gExitList_Dojos_Waveblade, [ROOM_DOJOS_7] = gExitList_NoExitList, - [ROOM_DOJOS_8] = gExitList_NoExitList, [ROOM_DOJOS_9] = gExitList_NoExitList, - [ROOM_DOJOS_a] = gExitList_Dojos_ToGrimblade, [ROOM_DOJOS_b] = gExitList_Dojos_ToSplitblade, - [ROOM_DOJOS_c] = gExitList_Dojos_ToGreatblade, [ROOM_DOJOS_d] = gExitList_Dojos_ToScarblade, - [ROOM_DOJOS_e] = gExitList_NoExitList, [ROOM_DOJOS_f] = gExitList_NoExitList, + [ROOM_DOJOS_GRAYBLADE] = gExitList_Dojos_Grayblade, + [ROOM_DOJOS_SPLITBLADE] = gExitList_NoExitList, + [ROOM_DOJOS_GREATBLADE] = gExitList_NoExitList, + [ROOM_DOJOS_SCARBLADE] = gExitList_NoExitList, + [ROOM_DOJOS_SWIFTBLADE_I] = gExitList_Dojos_Swiftblade, + [ROOM_DOJOS_GRIMBLADE] = gExitList_NoExitList, + [ROOM_DOJOS_WAVEBLADE] = gExitList_Dojos_Waveblade, + [ROOM_DOJOS_7] = gExitList_NoExitList, + [ROOM_DOJOS_8] = gExitList_NoExitList, + [ROOM_DOJOS_9] = gExitList_NoExitList, + [ROOM_DOJOS_TO_GRIMBLADE] = gExitList_Dojos_ToGrimblade, + [ROOM_DOJOS_TO_SPLITBLADE] = gExitList_Dojos_ToSplitblade, + [ROOM_DOJOS_TO_GREATBLADE] = gExitList_Dojos_ToGreatblade, + [ROOM_DOJOS_TO_SCARBLADE] = gExitList_Dojos_ToScarblade, + [ROOM_DOJOS_e] = gExitList_NoExitList, + [ROOM_DOJOS_f] = gExitList_NoExitList, }; const Transition gExitList_MinishCracks_LonLonRanchNorth[] = { @@ -1653,7 +1659,7 @@ const Transition gExitList_MinishCracks_EastHyruleCastle[] = { const Transition gExitList_MinishCracks_5[] = { TransitionListEnd, }; -const Transition gExitList_MinishCracks_CastleWildsBowHole[] = { +const Transition gExitList_MinishCracks_CastorWildsBow[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x28, 0x54, 0x3, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -1696,20 +1702,20 @@ const Transition gExitList_MinishCracks_11[] = { TransitionListEnd, }; const Transition* const gExitLists_MinishCracks[] = { - [ROOM_MINISH_CRACKS_0] = gExitList_MinishCracks_LonLonRanchNorth, - [ROOM_MINISH_CRACKS_1] = gExitList_MinishCracks_LakeHyliaEast, - [ROOM_MINISH_CRACKS_2] = gExitList_MinishCracks_HyruleCastleGarden, - [ROOM_MINISH_CRACKS_3] = gExitList_MinishCracks_MtCrenel, - [ROOM_MINISH_CRACKS_4] = gExitList_MinishCracks_EastHyruleCastle, + [ROOM_MINISH_CRACKS_LON_LON_RANCH_NORTH] = gExitList_MinishCracks_LonLonRanchNorth, + [ROOM_MINISH_CRACKS_LAKE_HYLIA_EAST] = gExitList_MinishCracks_LakeHyliaEast, + [ROOM_MINISH_CRACKS_HYRULE_CASTLE_GARDEN] = gExitList_MinishCracks_HyruleCastleGarden, + [ROOM_MINISH_CRACKS_MT_CRENEL] = gExitList_MinishCracks_MtCrenel, + [ROOM_MINISH_CRACKS_EAST_HYRULE_CASTLE] = gExitList_MinishCracks_EastHyruleCastle, [ROOM_MINISH_CRACKS_5] = gExitList_MinishCracks_5, - [ROOM_MINISH_CRACKS_6] = gExitList_MinishCracks_CastleWildsBowHole, - [ROOM_MINISH_CRACKS_7] = gExitList_MinishCracks_RuinsEntrance, - [ROOM_MINISH_CRACKS_8] = gExitList_MinishCracks_MinishWoodsSouth, - [ROOM_MINISH_CRACKS_9] = gExitList_MinishCracks_CastorWildsNorth, - [ROOM_MINISH_CRACKS_a] = gExitList_MinishCracks_CastorWildsWest, - [ROOM_MINISH_CRACKS_b] = gExitList_MinishCracks_CastorWildsMiddle, - [ROOM_MINISH_CRACKS_c] = gExitList_MinishCracks_RuinsTektite, - [ROOM_MINISH_CRACKS_d] = gExitList_MinishCracks_CastorWildsNextToBow, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_BOW] = gExitList_MinishCracks_CastorWildsBow, + [ROOM_MINISH_CRACKS_RUINS_ENTRANCE] = gExitList_MinishCracks_RuinsEntrance, + [ROOM_MINISH_CRACKS_MINISH_WOODS_SOUTH] = gExitList_MinishCracks_MinishWoodsSouth, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_NORTH] = gExitList_MinishCracks_CastorWildsNorth, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_WEST] = gExitList_MinishCracks_CastorWildsWest, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_MIDDLE] = gExitList_MinishCracks_CastorWildsMiddle, + [ROOM_MINISH_CRACKS_RUINS_TEKTITE] = gExitList_MinishCracks_RuinsTektite, + [ROOM_MINISH_CRACKS_CASTOR_WILDS_NEXT_TO_BOW] = gExitList_MinishCracks_CastorWildsNextToBow, [ROOM_MINISH_CRACKS_e] = gExitList_NoExitList, [ROOM_MINISH_CRACKS_f] = gExitList_NoExitList, [ROOM_MINISH_CRACKS_10] = gExitList_NoExitList, @@ -1729,28 +1735,28 @@ const Transition gExitList_CrenelCaves_BlockPushing[] = { 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0x28, 0x20, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x238, 0xb8, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_2, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x238, 0xb8, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BRIDGE_SWITCH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_PillarCave[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0xc8, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_3, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_EXIT_TO_MINES, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_BridgeSwitch[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x238, 0xc8, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x238, 0xc8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_0, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0x238, 0xc8, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_BLOCK_PUSHING, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_ExitToMines[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x188, 0x108, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_1, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_PILLAR_CAVE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1767,14 +1773,14 @@ const Transition gExitList_CrenelCaves_FairyFountain[] = { const Transition gExitList_CrenelCaves_SpinyChuPuzzle[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2f8, 0x38, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CENTER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_7, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x38, 0x38, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_CHUCHU_POT_CHEST, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_ChuchuPotChest[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x348, 0x68, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CENTER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0x28, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_6, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x28, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_SPINY_CHU_PUZZLE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1791,18 +1797,18 @@ const Transition gExitList_CrenelCaves_RupeeFairyFountain[] = { const Transition gExitList_CrenelCaves_HelmasaurHallway[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0xe8, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x68, 0x18, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_b, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x68, 0x18, 0xb8, 0x48, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_MUSHROOM_KEESE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CrenelCaves_MushroomKeese[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x138, 0x148, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x68, 0x28, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_a, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0x68, 0x28, 0x0, AREA_CRENEL_CAVES, ROOM_CRENEL_CAVES_HELMASAUR_HALLWAY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_CrenelCaves_LadderToGreenWater[] = { +const Transition gExitList_CrenelCaves_LadderToSpringWater[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2d8, 0x198, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x2d8, 0x138, 0x3, AREA_MT_CRENEL, ROOM_MT_CRENEL_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, @@ -1825,29 +1831,29 @@ const Transition gExitList_CrenelCaves_HintScrub[] = { TransitionListEnd, }; const Transition gExitList_CrenelCaves_ToGrayblade[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0xa0, 0x3, AREA_DOJOS, ROOM_DOJOS_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0xa0, 0x3, AREA_DOJOS, ROOM_DOJOS_GRAYBLADE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0x158, 0x30, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_CrenelCaves[] = { - [ROOM_CRENEL_CAVES_0] = gExitList_CrenelCaves_BlockPushing, - [ROOM_CRENEL_CAVES_1] = gExitList_CrenelCaves_PillarCave, - [ROOM_CRENEL_CAVES_2] = gExitList_CrenelCaves_BridgeSwitch, - [ROOM_CRENEL_CAVES_3] = gExitList_CrenelCaves_ExitToMines, - [ROOM_CRENEL_CAVES_4] = gExitList_CrenelCaves_GripRing, - [ROOM_CRENEL_CAVES_5] = gExitList_CrenelCaves_FairyFountain, - [ROOM_CRENEL_CAVES_6] = gExitList_CrenelCaves_SpinyChuPuzzle, - [ROOM_CRENEL_CAVES_7] = gExitList_CrenelCaves_ChuchuPotChest, - [ROOM_CRENEL_CAVES_8] = gExitList_CrenelCaves_WaterHeartPiece, - [ROOM_CRENEL_CAVES_9] = gExitList_CrenelCaves_RupeeFairyFountain, - [ROOM_CRENEL_CAVES_a] = gExitList_CrenelCaves_HelmasaurHallway, - [ROOM_CRENEL_CAVES_b] = gExitList_CrenelCaves_MushroomKeese, - [ROOM_CRENEL_CAVES_c] = gExitList_CrenelCaves_LadderToGreenWater, - [ROOM_CRENEL_CAVES_d] = gExitList_CrenelCaves_BombBusinessScrub, - [ROOM_CRENEL_CAVES_e] = gExitList_CrenelCaves_Hermit, - [ROOM_CRENEL_CAVES_f] = gExitList_CrenelCaves_HintScrub, - [ROOM_CRENEL_CAVES_10] = gExitList_CrenelCaves_ToGrayblade, + [ROOM_CRENEL_CAVES_BLOCK_PUSHING] = gExitList_CrenelCaves_BlockPushing, + [ROOM_CRENEL_CAVES_PILLAR_CAVE] = gExitList_CrenelCaves_PillarCave, + [ROOM_CRENEL_CAVES_BRIDGE_SWITCH] = gExitList_CrenelCaves_BridgeSwitch, + [ROOM_CRENEL_CAVES_EXIT_TO_MINES] = gExitList_CrenelCaves_ExitToMines, + [ROOM_CRENEL_CAVES_GRIP_RING] = gExitList_CrenelCaves_GripRing, + [ROOM_CRENEL_CAVES_FAIRY_FOUNTAIN] = gExitList_CrenelCaves_FairyFountain, + [ROOM_CRENEL_CAVES_SPINY_CHU_PUZZLE] = gExitList_CrenelCaves_SpinyChuPuzzle, + [ROOM_CRENEL_CAVES_CHUCHU_POT_CHEST] = gExitList_CrenelCaves_ChuchuPotChest, + [ROOM_CRENEL_CAVES_WATER_HEART_PIECE] = gExitList_CrenelCaves_WaterHeartPiece, + [ROOM_CRENEL_CAVES_RUPEE_FAIRY_FOUINTAIN] = gExitList_CrenelCaves_RupeeFairyFountain, + [ROOM_CRENEL_CAVES_HELMASAUR_HALLWAY] = gExitList_CrenelCaves_HelmasaurHallway, + [ROOM_CRENEL_CAVES_MUSHROOM_KEESE] = gExitList_CrenelCaves_MushroomKeese, + [ROOM_CRENEL_CAVES_LADDER_TO_SPRING_WATER] = gExitList_CrenelCaves_LadderToSpringWater, + [ROOM_CRENEL_CAVES_BOMB_BUSINESS_SCRUB] = gExitList_CrenelCaves_BombBusinessScrub, + [ROOM_CRENEL_CAVES_HERMIT] = gExitList_CrenelCaves_Hermit, + [ROOM_CRENEL_CAVES_HINT_SCRUB] = gExitList_CrenelCaves_HintScrub, + [ROOM_CRENEL_CAVES_TO_GRAYBLADE] = gExitList_CrenelCaves_ToGrayblade, }; const Transition gExitList_CastorCaves_South[] = { @@ -1868,7 +1874,7 @@ const Transition gExitList_CastorCaves_WindRuins[] = { TransitionListEnd, }; const Transition gExitList_CastorCaves_Darknut[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x18, 0x188, 0x28, 0x0, AREA_CASTOR_DARKNUT, ROOM_CASTOR_DARKNUT_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x68, 0x18, 0x188, 0x28, 0x0, AREA_CASTOR_DARKNUT, ROOM_CASTOR_DARKNUT_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1a8, 0x1b8, 0x30, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -1880,11 +1886,11 @@ const Transition gExitList_CastorCaves_HeartPiece[] = { TransitionListEnd, }; const Transition* const gExitLists_CastorCaves[] = { - [ROOM_CASTOR_CAVES_0] = gExitList_CastorCaves_South, - [ROOM_CASTOR_CAVES_1] = gExitList_CastorCaves_North, - [ROOM_CASTOR_CAVES_2] = gExitList_CastorCaves_WindRuins, - [ROOM_CASTOR_CAVES_3] = gExitList_CastorCaves_Darknut, - [ROOM_CASTOR_CAVES_4] = gExitList_CastorCaves_HeartPiece, + [ROOM_CASTOR_CAVES_SOUTH] = gExitList_CastorCaves_South, + [ROOM_CASTOR_CAVES_NORTH] = gExitList_CastorCaves_North, + [ROOM_CASTOR_CAVES_WIND_RUINS] = gExitList_CastorCaves_WindRuins, + [ROOM_CASTOR_CAVES_DARKNUT] = gExitList_CastorCaves_Darknut, + [ROOM_CASTOR_CAVES_HEART_PIECE] = gExitList_CastorCaves_HeartPiece, [ROOM_CASTOR_CAVES_5] = gExitList_NoExitList, [ROOM_CASTOR_CAVES_6] = gExitList_NoExitList, [ROOM_CASTOR_CAVES_7] = gExitList_NoExitList, @@ -1894,13 +1900,13 @@ const Transition gExitList_CastorDarknut_Main[] = { TransitionListEnd, }; const Transition gExitList_CastorDarknut_Hall[] = { - { WARP_TYPE_1, 0x0, 0x188, 0x18, 0x68, 0x28, 0x0, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_3, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x188, 0x18, 0x68, 0x28, 0x0, AREA_CASTOR_CAVES, ROOM_CASTOR_CAVES_DARKNUT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_CastorDarknut[] = { - [ROOM_CASTOR_DARKNUT_0] = gExitList_CastorDarknut_Main, - [ROOM_CASTOR_DARKNUT_1] = gExitList_CastorDarknut_Hall, + [ROOM_CASTOR_DARKNUT_MAIN] = gExitList_CastorDarknut_Main, + [ROOM_CASTOR_DARKNUT_HALL] = gExitList_CastorDarknut_Hall, NULL, NULL, }; @@ -1951,79 +1957,79 @@ const Transition gExitList_ArmosInteriors_8[] = { TransitionListEnd, }; const Transition gExitList_ArmosInteriors_FortressOfWindsLeft[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc8, 0x58, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc8, 0x58, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_ArmosInteriors_FortressOfWindsRight[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc8, 0x58, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc8, 0x58, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_ArmosInteriors[] = { - [ROOM_ARMOS_INTERIORS_0] = gExitList_ArmosInteriors_RuinsEntranceNorth, - [ROOM_ARMOS_INTERIORS_1] = gExitList_ArmosInteriors_RuinsEntranceSouth, - [ROOM_ARMOS_INTERIORS_2] = gExitList_ArmosInteriors_RuinsLeft, - [ROOM_ARMOS_INTERIORS_3] = gExitList_ArmosInteriors_RuinsMiddleLeft, - [ROOM_ARMOS_INTERIORS_4] = gExitList_ArmosInteriors_RuinsMiddleRight, - [ROOM_ARMOS_INTERIORS_5] = gExitList_ArmosInteriors_RuinsRight, + [ROOM_ARMOS_INTERIORS_RUINS_ENTRANCE_NORTH] = gExitList_ArmosInteriors_RuinsEntranceNorth, + [ROOM_ARMOS_INTERIORS_RUINS_ENTRANCE_SOUTH] = gExitList_ArmosInteriors_RuinsEntranceSouth, + [ROOM_ARMOS_INTERIORS_RUINS_LEFT] = gExitList_ArmosInteriors_RuinsLeft, + [ROOM_ARMOS_INTERIORS_RUINS_MIDDLE_LEFT] = gExitList_ArmosInteriors_RuinsMiddleLeft, + [ROOM_ARMOS_INTERIORS_RUINS_MIDDLE_RIGHT] = gExitList_ArmosInteriors_RuinsMiddleRight, + [ROOM_ARMOS_INTERIORS_RUINS_RIGHT] = gExitList_ArmosInteriors_RuinsRight, [ROOM_ARMOS_INTERIORS_6] = gExitList_ArmosInteriors_6, - [ROOM_ARMOS_INTERIORS_7] = gExitList_ArmosInteriors_RuinsGrassPath, + [ROOM_ARMOS_INTERIORS_RUINS_GRASS_PATH] = gExitList_ArmosInteriors_RuinsGrassPath, [ROOM_ARMOS_INTERIORS_8] = gExitList_ArmosInteriors_8, - [ROOM_ARMOS_INTERIORS_9] = gExitList_ArmosInteriors_FortressOfWindsLeft, - [ROOM_ARMOS_INTERIORS_a] = gExitList_ArmosInteriors_FortressOfWindsRight, + [ROOM_ARMOS_INTERIORS_FORTRESS_LEFT] = gExitList_ArmosInteriors_FortressOfWindsLeft, + [ROOM_ARMOS_INTERIORS_FORTRESS_RIGHT] = gExitList_ArmosInteriors_FortressOfWindsRight, }; const Transition gExitList_TownMinishHoles_MayorsHouse[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x2c, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_0, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x2c, 0x30, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_MAYOR, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_WestOracle[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc, 0x38, 0xc, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_1, 0x1, 0x1, 0x2, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc, 0x38, 0xc, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_WEST_ORACLE, 0x1, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_DrLeft[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x44, 0x30, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_4, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x44, 0x30, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_DR_LEFT, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_Carpenter[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc, 0x68, 0xc, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_0, 0x1, 0x1, 0x2, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xc, 0x68, 0xc, AREA_HOUSE_INTERIORS_4, ROOM_HOUSE_INTERIORS_4_CARPENTER, 0x1, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_Cafe[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xcc, 0x48, 0xc0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_1, 0x1, 0x1, 0x6, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xcc, 0x48, 0xc0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_CAFE, 0x1, 0x1, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_LibraryBookshelf[] = { - { WARP_TYPE_1, 0x0, 0x100, 0xc8, 0x78, 0xc0, 0x0, AREA_TOWN_MINISH_HOLES, ROOM_TOWN_MINISH_HOLES_11, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x100, 0xc8, 0x78, 0xc0, 0x0, AREA_TOWN_MINISH_HOLES, ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKS_HOUSE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x3e, 0x3c, 0x10, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x3e, 0x3c, 0x10, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_2F, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x54, 0x3c, 0x20, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x54, 0x3c, 0x20, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_LIBRARY_2F, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_LibrariBookHouse[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0xd8, 0x30, AREA_TOWN_MINISH_HOLES, ROOM_TOWN_MINISH_HOLES_10, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0xd8, 0x30, AREA_TOWN_MINISH_HOLES, ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKSHELF, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TownMinishHoles_RemShoeShop[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x74, 0x64, 0x30, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_2, 0x1, 0x1, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x74, 0x64, 0x30, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_REM_SHOE_SHOP, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_TownMinishHoles[] = { - [ROOM_TOWN_MINISH_HOLES_0] = gExitList_TownMinishHoles_MayorsHouse, - [ROOM_TOWN_MINISH_HOLES_1] = gExitList_TownMinishHoles_WestOracle, - [ROOM_TOWN_MINISH_HOLES_2] = gExitList_TownMinishHoles_DrLeft, - [ROOM_TOWN_MINISH_HOLES_3] = gExitList_TownMinishHoles_Carpenter, - [ROOM_TOWN_MINISH_HOLES_4] = gExitList_TownMinishHoles_Cafe, + [ROOM_TOWN_MINISH_HOLES_MAYORS_HOUSE] = gExitList_TownMinishHoles_MayorsHouse, + [ROOM_TOWN_MINISH_HOLES_WEST_ORACLE] = gExitList_TownMinishHoles_WestOracle, + [ROOM_TOWN_MINISH_HOLES_DR_LEFT] = gExitList_TownMinishHoles_DrLeft, + [ROOM_TOWN_MINISH_HOLES_CARPENTER] = gExitList_TownMinishHoles_Carpenter, + [ROOM_TOWN_MINISH_HOLES_CAFE] = gExitList_TownMinishHoles_Cafe, [ROOM_TOWN_MINISH_HOLES_5] = gExitList_NoExitList, [ROOM_TOWN_MINISH_HOLES_6] = gExitList_NoExitList, [ROOM_TOWN_MINISH_HOLES_7] = gExitList_NoExitList, @@ -2035,99 +2041,99 @@ const Transition* const gExitLists_TownMinishHoles[] = { [ROOM_TOWN_MINISH_HOLES_d] = gExitList_NoExitList, [ROOM_TOWN_MINISH_HOLES_e] = gExitList_NoExitList, [ROOM_TOWN_MINISH_HOLES_f] = gExitList_NoExitList, - [ROOM_TOWN_MINISH_HOLES_10] = gExitList_TownMinishHoles_LibraryBookshelf, - [ROOM_TOWN_MINISH_HOLES_11] = gExitList_TownMinishHoles_LibrariBookHouse, - [ROOM_TOWN_MINISH_HOLES_12] = gExitList_TownMinishHoles_RemShoeShop, + [ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKSHELF] = gExitList_TownMinishHoles_LibraryBookshelf, + [ROOM_TOWN_MINISH_HOLES_LIBRARY_BOOKS_HOUSE] = gExitList_TownMinishHoles_LibrariBookHouse, + [ROOM_TOWN_MINISH_HOLES_REM_SHOE_SHOP] = gExitList_TownMinishHoles_RemShoeShop, [ROOM_TOWN_MINISH_HOLES_13] = gExitList_NoExitList, }; const Transition gExitList_MinishRafters_Cafe[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x18, 0x48, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_1, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x38, 0x18, 0x48, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_CAFE, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1bc, 0x2b4, 0xc, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x2, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MinishRafters_Stockwell[] = { - { WARP_TYPE_1, 0x0, 0x198, 0x18, 0xac, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_0, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x198, 0x18, 0xac, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_STOCKWELL_SHOP, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x238, 0x2b4, 0xc0, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x2, 0x1, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MinishRafters_DrLeft[] = { - { WARP_TYPE_1, 0x0, 0xe8, 0x18, 0x88, 0x2c, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_4, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0xe8, 0x18, 0x88, 0x2c, 0x0, AREA_HOUSE_INTERIORS_2, ROOM_HOUSE_INTERIORS_2_DR_LEFT, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_MinishRafters_Bakery[] = { - { WARP_TYPE_1, 0x0, 0x48, 0x18, 0x48, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_3, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x48, 0x18, 0x48, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BAKERY, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x148, 0x18, 0x88, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_3, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x148, 0x18, 0x88, 0x2c, 0x0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BAKERY, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_MinishRafters[] = { - [ROOM_MINISH_RAFTERS_0] = gExitList_MinishRafters_Cafe, - [ROOM_MINISH_RAFTERS_1] = gExitList_MinishRafters_Stockwell, - [ROOM_MINISH_RAFTERS_2] = gExitList_MinishRafters_DrLeft, - [ROOM_MINISH_RAFTERS_3] = gExitList_MinishRafters_Bakery, + [ROOM_MINISH_RAFTERS_CAFE] = gExitList_MinishRafters_Cafe, + [ROOM_MINISH_RAFTERS_STOCKWELL] = gExitList_MinishRafters_Stockwell, + [ROOM_MINISH_RAFTERS_DR_LEFT] = gExitList_MinishRafters_DrLeft, + [ROOM_MINISH_RAFTERS_BAKERY] = gExitList_MinishRafters_Bakery, }; -const Transition gExitList_GoronCave_StairsToCave[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x38, 0x78, 0x278, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, +const Transition gExitList_GoronCave_Stairs[] = { + { WARP_TYPE_1, 0x0, 0x78, 0x38, 0x78, 0x278, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x368, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_LON_LON_RANCH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_GoronCave_Main[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x288, 0x78, 0x48, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_0, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x288, 0x78, 0x48, 0x0, AREA_GORON_CAVE, ROOM_GORON_CAVE_STAIRS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_GoronCave[] = { - [ROOM_GORON_CAVE_0] = gExitList_GoronCave_StairsToCave, - [ROOM_GORON_CAVE_1] = gExitList_GoronCave_Main, + [ROOM_GORON_CAVE_STAIRS] = gExitList_GoronCave_Stairs, + [ROOM_GORON_CAVE_MAIN] = gExitList_GoronCave_Main, }; const Transition gExitList_WindTribeTower_Entrance[] = { - { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_1, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1e8, 0x168, 0x30, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_WindTribeTower_Floor2[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_0, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_2, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_2, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_WindTribeTower_Floor3[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_1, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_3, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_3, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_WindTribeTower_Floor4[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_2, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0xe8, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_2, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x88, 0xe8, 0xb8, 0x148, 0x0, AREA_WIND_TRIBE_TOWER_ROOF, ROOM_WIND_TRIBE_TOWER_ROOF_0, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_WindTribeTower[] = { - [ROOM_WIND_TRIBE_TOWER_0] = gExitList_WindTribeTower_Entrance, - [ROOM_WIND_TRIBE_TOWER_1] = gExitList_WindTribeTower_Floor2, - [ROOM_WIND_TRIBE_TOWER_2] = gExitList_WindTribeTower_Floor3, - [ROOM_WIND_TRIBE_TOWER_3] = gExitList_WindTribeTower_Floor4, + [ROOM_WIND_TRIBE_TOWER_ENTRANCE] = gExitList_WindTribeTower_Entrance, + [ROOM_WIND_TRIBE_TOWER_FLOOR_1] = gExitList_WindTribeTower_Floor2, + [ROOM_WIND_TRIBE_TOWER_FLOOR_2] = gExitList_WindTribeTower_Floor3, + [ROOM_WIND_TRIBE_TOWER_FLOOR_3] = gExitList_WindTribeTower_Floor4, }; const Transition gExitList_WindTribeTowerRoof_Main[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x138, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_3, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xb8, 0x138, 0x88, 0xf8, 0x0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_FLOOR_3, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -2136,13 +2142,13 @@ const Transition* const gExitLists_WindTribeTowerRoof[] = { }; const Transition gExitList_Caves_Boomerang[] = { - { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_15, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_NORTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_16, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_NORTHEAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x48, 0xd8, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_17, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x48, 0xd8, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_SOUTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_18, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x78, 0x38, 0x0, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_BOOMERANG_SOUTHEAST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0xa8, 0xb8, 0x1f8, 0x138, 0x0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, @@ -2153,7 +2159,7 @@ const Transition gExitList_Caves_ToGraveyard[] = { 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x118, 0x38, 0x118, 0xd8, 0x0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x138, 0x98, 0x78, 0x48, 0x0, AREA_CAVES, ROOM_CAVES_15, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x138, 0x98, 0x78, 0x48, 0x0, AREA_CAVES, ROOM_CAVES_HEART_PIECE_HALLWAY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x108, 0x148, 0x20, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -2172,17 +2178,17 @@ const Transition gExitList_Caves_4[] = { const Transition gExitList_Caves_5[] = { TransitionListEnd, }; -const Transition gExitList_Caves_KeeseChest[] = { +const Transition gExitList_Caves_TrilbyKeeseChest[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x238, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_FairyFountainTrilbyHighlands[] = { +const Transition gExitList_Caves_TrilbyFairyFountain[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0x2c8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_FairyFountainLinksHouse[] = { +const Transition gExitList_Caves_SouthHyruleFieldFairyFountain[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x118, 0xb8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -2214,22 +2220,22 @@ const Transition gExitList_Caves_LonLonRanchWallet[] = { 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_RupeeLinksHouse[] = { +const Transition gExitList_Caves_SouthHyruleFieldRupee[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x58, 0x128, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_RupeeTrilbyHighlands[] = { +const Transition gExitList_Caves_TrilbyRupee[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x2b8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_FairyFountainMoleMitts[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1a8, 0x68, 0x3, AREA_DIG_CAVES, ROOM_DIG_CAVES_3, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0 }, +const Transition gExitList_Caves_TrilbyMittsFairyFountain[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1a8, 0x68, 0x3, AREA_DIG_CAVES, ROOM_DIG_CAVES_TRILBY_HIGHLANDS, 0x1, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_KeeseChestSoutheastHyrule[] = { +const Transition gExitList_Caves_HillsKeeseChest[] = { { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0xa8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, @@ -2238,50 +2244,50 @@ const Transition gExitList_Caves_BottleBusinessScrub[] = { TransitionListEnd, }; const Transition gExitList_Caves_HeartPieceHallway[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x38, 0x138, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_1, 0x0, 0x78, 0x38, 0x138, 0x88, 0x0, AREA_CAVES, ROOM_CAVES_TO_GRAVEYARD, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x138, 0x1f8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_Caves_FairyFountainBoomerang[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1a, 0x1, 0x0, 0x4, 0x0, +const Transition gExitList_Caves_NorthHyruleFieldFairyFountain[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_Caves_KinstoneBusinessScrub[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_1d, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x58, 0x30, AREA_TREE_INTERIORS, ROOM_TREE_INTERIORS_MINISH_WOODS_BUSINESS_SCRUB, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_Caves[] = { - [ROOM_CAVES_0] = gExitList_Caves_Boomerang, - [ROOM_CAVES_1] = gExitList_Caves_ToGraveyard, + [ROOM_CAVES_BOOMERANG] = gExitList_Caves_Boomerang, + [ROOM_CAVES_TO_GRAVEYARD] = gExitList_Caves_ToGraveyard, [ROOM_CAVES_2] = gExitList_Caves_2, [ROOM_CAVES_3] = gExitList_Caves_3, [ROOM_CAVES_4] = gExitList_Caves_4, [ROOM_CAVES_5] = gExitList_Caves_5, [ROOM_CAVES_6] = gExitList_NoExitList, - [ROOM_CAVES_7] = gExitList_Caves_KeeseChest, - [ROOM_CAVES_8] = gExitList_Caves_FairyFountainTrilbyHighlands, - [ROOM_CAVES_9] = gExitList_Caves_FairyFountainLinksHouse, + [ROOM_CAVES_TRILBY_KEESE_CHEST] = gExitList_Caves_TrilbyKeeseChest, + [ROOM_CAVES_TRILBY_FAIRY_FOUNTAIN] = gExitList_Caves_TrilbyFairyFountain, + [ROOM_CAVES_SOUTH_HYRULE_FIELD_FAIRY_FOUNTAIN] = gExitList_Caves_SouthHyruleFieldFairyFountain, [ROOM_CAVES_a] = gExitList_Caves_A, - [ROOM_CAVES_b] = gExitList_Caves_HyruleTownWaterfall, - [ROOM_CAVES_c] = gExitList_Caves_LonLonRanch, - [ROOM_CAVES_d] = gExitList_NoExitList, - [ROOM_CAVES_e] = gExitList_Caves_TrilbyHighlands, - [ROOM_CAVES_f] = gExitList_Caves_LonLonRanchWallet, - [ROOM_CAVES_10] = gExitList_Caves_RupeeLinksHouse, - [ROOM_CAVES_11] = gExitList_Caves_RupeeTrilbyHighlands, - [ROOM_CAVES_12] = gExitList_Caves_FairyFountainMoleMitts, - [ROOM_CAVES_13] = gExitList_Caves_KeeseChestSoutheastHyrule, - [ROOM_CAVES_14] = gExitList_Caves_BottleBusinessScrub, - [ROOM_CAVES_15] = gExitList_Caves_HeartPieceHallway, - [ROOM_CAVES_16] = gExitList_Caves_FairyFountainBoomerang, - [ROOM_CAVES_17] = gExitList_Caves_KinstoneBusinessScrub, + [ROOM_CAVES_HYRULE_TOWN_WATERFALL] = gExitList_Caves_HyruleTownWaterfall, + [ROOM_CAVES_LON_LON_RANCH] = gExitList_Caves_LonLonRanch, + [ROOM_CAVES_LON_LON_RANCH_SECRET] = gExitList_NoExitList, + [ROOM_CAVES_TRILBY_HIGHLANDS] = gExitList_Caves_TrilbyHighlands, + [ROOM_CAVES_LON_LON_RANCH_WALLET] = gExitList_Caves_LonLonRanchWallet, + [ROOM_CAVES_SOUTH_HYRULE_FIELD_RUPEE] = gExitList_Caves_SouthHyruleFieldRupee, + [ROOM_CAVES_TRILBY_RUPEE] = gExitList_Caves_TrilbyRupee, + [ROOM_CAVES_TRILBY_MITTS_FAIRY_FOUNTAIN] = gExitList_Caves_TrilbyMittsFairyFountain, + [ROOM_CAVES_HILLS_KEESE_CHEST] = gExitList_Caves_HillsKeeseChest, + [ROOM_CAVES_BOTTLE_BUSINESS_SCRUB] = gExitList_Caves_BottleBusinessScrub, + [ROOM_CAVES_HEART_PIECE_HALLWAY] = gExitList_Caves_HeartPieceHallway, + [ROOM_CAVES_NORTH_HYRULE_FIELD_FAIRY_FOUNTAIN] = gExitList_Caves_NorthHyruleFieldFairyFountain, + [ROOM_CAVES_KINSTONE_BUSINESS_SCRUB] = gExitList_Caves_KinstoneBusinessScrub, }; const Transition gExitList_VeilFallsCaves_Hallway2F[] = { - { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0x78, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0x78, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x38, 0x10, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -2290,9 +2296,9 @@ const Transition gExitList_VeilFallsCaves_Hallway2F[] = { TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_Hallway1F[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x18, 0x98, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_8, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x18, 0x98, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_RUPEE_PATH, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x78, 0x18, 0xd8, 0x38, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_0, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x18, 0xd8, 0x38, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0xb8, 0x8c, 0x118, 0x58, 0x0, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -2301,40 +2307,40 @@ const Transition gExitList_VeilFallsCaves_Hallway1F[] = { TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_Entrance[] = { - { WARP_TYPE_1, 0x0, 0x128, 0x18, 0x58, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_4, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x128, 0x18, 0x58, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_EXIT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x1f8, 0x30, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_Exit[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x128, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_3, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x128, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xd8, 0x1d8, 0x30, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_SecretChest[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x38, 0x98, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_6, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x58, 0x38, 0x98, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_STAIRCASE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_SecretStaircases[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x38, 0x98, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_7, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x58, 0x38, 0x98, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_BLOCK_PUZZLE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x98, 0x38, 0x58, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_5, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x98, 0x38, 0x58, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_SECRET_CHEST, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_BlockPuzzle[] = { - { WARP_TYPE_1, 0x0, 0x98, 0x38, 0x58, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_6, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x98, 0x38, 0x58, 0x48, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_STAIRCASE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xd8, 0x158, 0x30, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_VeilFallsCaves_RupeePath[] = { - { WARP_TYPE_1, 0x0, 0x98, 0x18, 0x38, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_1, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x98, 0x18, 0x38, 0x28, 0x0, AREA_VEIL_FALLS_CAVES, ROOM_VEIL_FALLS_CAVES_HALLWAY_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0xd8, 0x30, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -2346,16 +2352,16 @@ const Transition gExitList_VeilFallsCaves_HeartPiece[] = { TransitionListEnd, }; const Transition* const gExitLists_VeilFallsCaves[] = { - [ROOM_VEIL_FALLS_CAVES_0] = gExitList_VeilFallsCaves_Hallway2F, - [ROOM_VEIL_FALLS_CAVES_1] = gExitList_VeilFallsCaves_Hallway1F, - [ROOM_VEIL_FALLS_CAVES_2] = gExitList_NoExitList, - [ROOM_VEIL_FALLS_CAVES_3] = gExitList_VeilFallsCaves_Entrance, - [ROOM_VEIL_FALLS_CAVES_4] = gExitList_VeilFallsCaves_Exit, - [ROOM_VEIL_FALLS_CAVES_5] = gExitList_VeilFallsCaves_SecretChest, - [ROOM_VEIL_FALLS_CAVES_6] = gExitList_VeilFallsCaves_SecretStaircases, - [ROOM_VEIL_FALLS_CAVES_7] = gExitList_VeilFallsCaves_BlockPuzzle, - [ROOM_VEIL_FALLS_CAVES_8] = gExitList_VeilFallsCaves_RupeePath, - [ROOM_VEIL_FALLS_CAVES_9] = gExitList_VeilFallsCaves_HeartPiece, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_2F] = gExitList_VeilFallsCaves_Hallway2F, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_1F] = gExitList_VeilFallsCaves_Hallway1F, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_ROOM] = gExitList_NoExitList, + [ROOM_VEIL_FALLS_CAVES_ENTRANCE] = gExitList_VeilFallsCaves_Entrance, + [ROOM_VEIL_FALLS_CAVES_EXIT] = gExitList_VeilFallsCaves_Exit, + [ROOM_VEIL_FALLS_CAVES_SECRET_CHEST] = gExitList_VeilFallsCaves_SecretChest, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_SECRET_STAIRCASE] = gExitList_VeilFallsCaves_SecretStaircases, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_BLOCK_PUZZLE] = gExitList_VeilFallsCaves_BlockPuzzle, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_RUPEE_PATH] = gExitList_VeilFallsCaves_RupeePath, + [ROOM_VEIL_FALLS_CAVES_HALLWAY_HEART_PIECE] = gExitList_VeilFallsCaves_HeartPiece, [ROOM_VEIL_FALLS_CAVES_a] = gExitList_NoExitList, [ROOM_VEIL_FALLS_CAVES_b] = gExitList_NoExitList, [ROOM_VEIL_FALLS_CAVES_c] = gExitList_NoExitList, @@ -2471,7 +2477,7 @@ const Transition* const gExitLists_37[] = { const Transition gExitList_HyruleTownUnderground_Main[] = { { WARP_TYPE_1, 0x0, 0x288, 0xf8, 0x338, 0x118, 0x0, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x168, 0x18, 0x78, 0x38, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_b, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x168, 0x18, 0x78, 0x38, 0x0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_SCHOOL_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x48, 0xf8, 0x188, 0x208, 0x0, AREA_HYRULE_DIG_CAVES, ROOM_HYRULE_DIG_CAVES_TOWN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, @@ -2539,8 +2545,8 @@ const Transition gExitList_GardenFountains_West[] = { TransitionListEnd, }; const Transition* const gExitLists_GardenFountains[] = { - [ROOM_GARDEN_FOUNTAINS_0] = gExitList_GardenFountains_East, - [ROOM_GARDEN_FOUNTAINS_1] = gExitList_GardenFountains_West, + [ROOM_GARDEN_FOUNTAINS_EAST] = gExitList_GardenFountains_East, + [ROOM_GARDEN_FOUNTAINS_WEST] = gExitList_GardenFountains_West, }; const Transition gExitList_GreatFairies_Entrance[] = { @@ -2564,112 +2570,112 @@ const Transition* const gExitLists_40[] = { }; const Transition gExitList_DeepwoodShrine_StairsToB1[] = { - { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0xc8, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_12, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0xc8, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_COMPASS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_BluePortal[] = { #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x38, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_6, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x38, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Map[] = { #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x18, 0xfff, 0xc, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_6, 0x1, 0x0, 0x2, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x18, 0xfff, 0xc, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Button[] = { #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1b8, 0xfff, 0xc0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_6, 0x1, 0x0, 0x6, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1b8, 0xfff, 0xc0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Lever[] = { #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x168, 0x3, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_6, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x168, 0x3, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Barrel[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x88, 0x50, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_20, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x88, 0x50, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x88, 0xa0, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_20, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x118, 0x88, 0xa0, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xb8, 0x108, 0x50, 0x70, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_20, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xb8, 0x108, 0x50, 0x70, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x118, 0x108, 0xa0, 0x70, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_20, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x118, 0x108, 0xa0, 0x70, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, #ifdef EU - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc8, 0x3, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_1, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc8, 0x3, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BLUE_PORTAL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x28, 0xfff, 0xc, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_7, 0x1, 0x0, 0x2, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x28, 0xfff, 0xc, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BUTTON, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x38, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_a, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x38, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_LEVER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xe8, 0xfff, 0xc0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_5, 0x1, 0x0, 0x6, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xe8, 0xfff, 0xc0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_MAP, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, #endif TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Entrance[] = { - { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x48, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_17, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x48, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x108, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_17, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x108, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x64, 0x30, AREA_DEEPWOOD_SHRINE_ENTRY, ROOM_DEEPWOOD_SHRINE_ENTRY_0, 0x1, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x64, 0x30, AREA_DEEPWOOD_SHRINE_ENTRY, ROOM_DEEPWOOD_SHRINE_ENTRY_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_Compass[] = { - { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0xc8, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_2, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0xc8, 0x38, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_STAIRS_TO_B1, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DeepwoodShrineBoss_Main[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x8, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_17, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0x8, 0x30, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DeepwoodShrine_PreBoss[] = { - { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x48, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x48, 0x68, 0x48, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x108, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x108, 0x68, 0x108, 0x78, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xd8, 0x3, AREA_DEEPWOOD_SHRINE_BOSS, ROOM_DEEPWOOD_SHRINE_BOSS_0, 0x1, 0x3, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xd8, 0x3, AREA_DEEPWOOD_SHRINE_BOSS, ROOM_DEEPWOOD_SHRINE_BOSS_MAIN, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DeepwoodShrine[] = { - [ROOM_DEEPWOOD_SHRINE_0] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_1] = gExitList_DeepwoodShrine_BluePortal, - [ROOM_DEEPWOOD_SHRINE_2] = gExitList_DeepwoodShrine_StairsToB1, - [ROOM_DEEPWOOD_SHRINE_3] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_4] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_5] = gExitList_DeepwoodShrine_Map, - [ROOM_DEEPWOOD_SHRINE_6] = gExitList_DeepwoodShrine_Barrel, - [ROOM_DEEPWOOD_SHRINE_7] = gExitList_DeepwoodShrine_Button, - [ROOM_DEEPWOOD_SHRINE_8] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_9] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_a] = gExitList_DeepwoodShrine_Lever, - [ROOM_DEEPWOOD_SHRINE_b] = gExitList_DeepwoodShrine_Entrance, + [ROOM_DEEPWOOD_SHRINE_MADDERPILLAR] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_BLUE_PORTAL] = gExitList_DeepwoodShrine_BluePortal, + [ROOM_DEEPWOOD_SHRINE_STAIRS_TO_B1] = gExitList_DeepwoodShrine_StairsToB1, + [ROOM_DEEPWOOD_SHRINE_POT_BRIDGE] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_DOUBLE_STATUE] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_MAP] = gExitList_DeepwoodShrine_Map, + [ROOM_DEEPWOOD_SHRINE_BARREL] = gExitList_DeepwoodShrine_Barrel, + [ROOM_DEEPWOOD_SHRINE_BUTTON] = gExitList_DeepwoodShrine_Button, + [ROOM_DEEPWOOD_SHRINE_MULLDOZER] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_PILLARS] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_LEVER] = gExitList_DeepwoodShrine_Lever, + [ROOM_DEEPWOOD_SHRINE_ENTRANCE] = gExitList_DeepwoodShrine_Entrance, [ROOM_DEEPWOOD_SHRINE_c] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_d] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_e] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_f] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_10] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_11] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_12] = gExitList_DeepwoodShrine_Compass, + [ROOM_DEEPWOOD_SHRINE_TORCHES] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_BOSS_KEY] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_COMPASS] = gExitList_DeepwoodShrine_Compass, [ROOM_DEEPWOOD_SHRINE_13] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_14] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_15] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_LILY_PAD_WEST] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_LILY_PAD_EAST] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_16] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_17] = gExitList_DeepwoodShrine_PreBoss, + [ROOM_DEEPWOOD_SHRINE_BOSS_DOOR] = gExitList_DeepwoodShrine_PreBoss, [ROOM_DEEPWOOD_SHRINE_18] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_19] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_1a] = gExitList_NoExitList, @@ -2678,15 +2684,15 @@ const Transition* const gExitLists_DeepwoodShrine[] = { [ROOM_DEEPWOOD_SHRINE_1d] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_1e] = gExitList_NoExitList, [ROOM_DEEPWOOD_SHRINE_1f] = gExitList_NoExitList, - [ROOM_DEEPWOOD_SHRINE_20] = gExitList_NoExitList, + [ROOM_DEEPWOOD_SHRINE_INSIDE_BARREL] = gExitList_NoExitList, }; const Transition* const gExitLists_DeepwoodShrineBoss[] = { - [ROOM_DEEPWOOD_SHRINE_BOSS_0] = gExitList_DeepwoodShrineBoss_Main, + [ROOM_DEEPWOOD_SHRINE_BOSS_MAIN] = gExitList_DeepwoodShrineBoss_Main, }; const Transition gExitList_DeepwoodShrineEntry_Main[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x58, 0xa8, 0xd8, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x1, 0x0, 0x0, 0x88, + { WARP_TYPE_1, 0x0, 0x78, 0x58, 0xa8, 0xd8, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x1, 0x0, 0x0, 0x88, 0x1, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1c8, 0x272, 0x30, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -2697,11 +2703,11 @@ const Transition gExitList_DeepwoodShrineEntry_Main[] = { TransitionListEnd, }; const Transition* const gExitLists_DeepwoodShrineEntry[] = { - [ROOM_DEEPWOOD_SHRINE_ENTRY_0] = gExitList_DeepwoodShrineEntry_Main, + [ROOM_DEEPWOOD_SHRINE_ENTRY_MAIN] = gExitList_DeepwoodShrineEntry_Main, }; const Transition gExitList_CaveOfFlames_AfterCane[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x38, 0x1a8, 0x38, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_10, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x38, 0x1a8, 0x38, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MINISH_SPIKES, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -2711,55 +2717,55 @@ const Transition gExitList_CaveOfFlames_Entrance[] = { TransitionListEnd, }; const Transition gExitList_CaveOfFlames_MainCart[] = { - { WARP_TYPE_1, 0x0, 0x1f8, 0x38, 0x88, 0x28, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_5, 0x2, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x1f8, 0x38, 0x88, 0x28, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_NORTH_ENTRANCE, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CaveOfFlames_NorthEntrance[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x1f8, 0x48, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_4, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x1f8, 0x48, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CaveOfFlames_MinishSpikes[] = { - { WARP_TYPE_1, 0x0, 0x1a8, 0x28, 0x88, 0x48, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_0, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_1, 0x0, 0x1a8, 0x28, 0x88, 0x48, 0x0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_AFTER_CANE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CaveOfFlames_BeforeGleerok[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x28, 0x30, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_17, 0x1, 0x0, 0x4, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x28, 0x30, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_CaveOfFlames_BossDoor[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc0, 0x1, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_12, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc0, 0x1, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BEFORE_GLEEROK, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_CaveOfFlames[] = { - [ROOM_CAVE_OF_FLAMES_0] = gExitList_CaveOfFlames_AfterCane, - [ROOM_CAVE_OF_FLAMES_1] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_2] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_3] = gExitList_CaveOfFlames_Entrance, - [ROOM_CAVE_OF_FLAMES_4] = gExitList_CaveOfFlames_MainCart, - [ROOM_CAVE_OF_FLAMES_5] = gExitList_CaveOfFlames_NorthEntrance, - [ROOM_CAVE_OF_FLAMES_6] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_7] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_8] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_9] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_AFTER_CANE] = gExitList_CaveOfFlames_AfterCane, + [ROOM_CAVE_OF_FLAMES_SPINY_CHU] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_CART_TO_SPINY_CHU] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_ENTRANCE] = gExitList_CaveOfFlames_Entrance, + [ROOM_CAVE_OF_FLAMES_MAIN_CART] = gExitList_CaveOfFlames_MainCart, + [ROOM_CAVE_OF_FLAMES_NORTH_ENTRANCE] = gExitList_CaveOfFlames_NorthEntrance, + [ROOM_CAVE_OF_FLAMES_CART_WEST] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_HELMASAUR_FIGHT] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_ROLLOBITE_LAVA_ROOM] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_MINISH_LAVA_ROOM] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_a] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_b] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_c] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_d] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_e] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_f] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_10] = gExitList_CaveOfFlames_MinishSpikes, - [ROOM_CAVE_OF_FLAMES_11] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_12] = gExitList_CaveOfFlames_BeforeGleerok, - [ROOM_CAVE_OF_FLAMES_13] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_14] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_15] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_16] = gExitList_NoExitList, - [ROOM_CAVE_OF_FLAMES_17] = gExitList_CaveOfFlames_BossDoor, + [ROOM_CAVE_OF_FLAMES_MINISH_SPIKES] = gExitList_CaveOfFlames_MinishSpikes, + [ROOM_CAVE_OF_FLAMES_TOMPAS_DOOM] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_BEFORE_GLEEROK] = gExitList_CaveOfFlames_BeforeGleerok, + [ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH1] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH2] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_COMPASS] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_BOB_OMB_WALL] = gExitList_NoExitList, + [ROOM_CAVE_OF_FLAMES_BOSS_DOOR] = gExitList_CaveOfFlames_BossDoor, [ROOM_CAVE_OF_FLAMES_18] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_19] = gExitList_NoExitList, [ROOM_CAVE_OF_FLAMES_1a] = gExitList_NoExitList, @@ -2772,110 +2778,110 @@ const Transition* const gExitLists_CaveOfFlames[] = { }; const Transition gExitList_FortressOfWinds_BeforeMazaal[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_4, 0x1, 0x3, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER, 0x1, 0x3, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_EastKeyLever[] = { - { WARP_TYPE_1, 0x0, 0x198, 0x198, 0x2e8, 0x38, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x198, 0x198, 0x2e8, 0x38, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x1f8, 0x198, 0x338, 0x38, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, + { WARP_TYPE_1, 0x0, 0x1f8, 0x198, 0x338, 0x38, 0x0, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_PitPlatforms[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x68, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x68, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_WestKeyLever[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc8, 0x3, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1, 0x1, 0x3, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xc8, 0x3, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_BEFORE_MAZAAL, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_Mazaal[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x18, 0xa0, 0x18c, 0x0, AREA_FORTRESS_OF_WINDS_TOP, ROOM_FORTRESS_OF_WINDS_TOP_0, 0x1, + { WARP_TYPE_1, 0x0, 0xb8, 0x18, 0xa0, 0x18c, 0x0, AREA_FORTRESS_OF_WINDS_TOP, ROOM_FORTRESS_OF_WINDS_TOP_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_Stalfos[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_EntranceMoleMitts[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xb0, 0x3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_3, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xb0, 0x3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_MOLE_MITTS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_Main2F[] = { - { WARP_TYPE_1, 0x0, 0x88, 0xf8, 0x78, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_21, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0xf8, 0x78, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0xa8, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0xa8, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_MinishHole[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x68, 0xb0, 0x3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_4, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x68, 0xb0, 0x3, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_SMALL_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_BossKey[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x338, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x338, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_WestStairs2F[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x28, 0x68, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_20, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x28, 0x68, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_EastStairs2F[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x28, 0x68, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_22, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x28, 0x68, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x288, 0xa8, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_1, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x288, 0xa8, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_WestStairs1F[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x28, 0x88, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1c, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x68, 0x28, 0x88, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x128, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x128, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_CenterStairs1F[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x28, 0x88, 0x108, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_19, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x78, 0x28, 0x88, 0x108, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAIN_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x1d8, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_EastStairs1F[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x28, 0x88, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_1d, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x68, 0x28, 0x88, 0x38, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x288, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x288, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_Wizzrobe[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x78, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_FortressOfWinds_HeartPiece[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x338, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_0, 0x1, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x338, 0x38, 0x30, AREA_OUTER_FORTRESS_OF_WINDS, ROOM_OUTER_FORTRESS_OF_WINDS_ENTRANCE_HALL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_FortressOfWinds[] = { - [ROOM_FORTRESS_OF_WINDS_0] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_1] = gExitList_FortressOfWinds_BeforeMazaal, - [ROOM_FORTRESS_OF_WINDS_2] = gExitList_FortressOfWinds_EastKeyLever, - [ROOM_FORTRESS_OF_WINDS_3] = gExitList_FortressOfWinds_PitPlatforms, - [ROOM_FORTRESS_OF_WINDS_4] = gExitList_FortressOfWinds_WestKeyLever, + [ROOM_FORTRESS_OF_WINDS_DOUBLE_EYEGORE] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_BEFORE_MAZAAL] = gExitList_FortressOfWinds_BeforeMazaal, + [ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER] = gExitList_FortressOfWinds_EastKeyLever, + [ROOM_FORTRESS_OF_WINDS_PIT_PLATFORMS] = gExitList_FortressOfWinds_PitPlatforms, + [ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER] = gExitList_FortressOfWinds_WestKeyLever, [ROOM_FORTRESS_OF_WINDS_5] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_6] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_7] = gExitList_NoExitList, @@ -2887,189 +2893,189 @@ const Transition* const gExitLists_FortressOfWinds[] = { [ROOM_FORTRESS_OF_WINDS_d] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_e] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_f] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_10] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_11] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_12] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_13] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_14] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_15] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_16] = gExitList_FortressOfWinds_Mazaal, - [ROOM_FORTRESS_OF_WINDS_17] = gExitList_FortressOfWinds_Stalfos, - [ROOM_FORTRESS_OF_WINDS_18] = gExitList_FortressOfWinds_EntranceMoleMitts, - [ROOM_FORTRESS_OF_WINDS_19] = gExitList_FortressOfWinds_Main2F, - [ROOM_FORTRESS_OF_WINDS_1a] = gExitList_FortressOfWinds_MinishHole, - [ROOM_FORTRESS_OF_WINDS_1b] = gExitList_FortressOfWinds_BossKey, - [ROOM_FORTRESS_OF_WINDS_1c] = gExitList_FortressOfWinds_WestStairs2F, - [ROOM_FORTRESS_OF_WINDS_1d] = gExitList_FortressOfWinds_EastStairs2F, + [ROOM_FORTRESS_OF_WINDS_DARKNUT_ROOM] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_ARROW_EYE_BRIDGE] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_NORTH_SPLIT_PATH_PIT] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_WALLMASTER_MINISH_PORTAL] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_PILLAR_CLONE_BUTTONS] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_ROTATING_SPIKE_TRAPS] = gExitList_NoExitList, + [ROOM_FORTRESS_OF_WINDS_MAZAAL] = gExitList_FortressOfWinds_Mazaal, + [ROOM_FORTRESS_OF_WINDS_STALFOS] = gExitList_FortressOfWinds_Stalfos, + [ROOM_FORTRESS_OF_WINDS_ENTRANCE_MOLE_MITTS] = gExitList_FortressOfWinds_EntranceMoleMitts, + [ROOM_FORTRESS_OF_WINDS_MAIN_2F] = gExitList_FortressOfWinds_Main2F, + [ROOM_FORTRESS_OF_WINDS_MINISH_HOLE] = gExitList_FortressOfWinds_MinishHole, + [ROOM_FORTRESS_OF_WINDS_BOSS_KEY] = gExitList_FortressOfWinds_BossKey, + [ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F] = gExitList_FortressOfWinds_WestStairs2F, + [ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F] = gExitList_FortressOfWinds_EastStairs2F, [ROOM_FORTRESS_OF_WINDS_1e] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_1f] = gExitList_NoExitList, - [ROOM_FORTRESS_OF_WINDS_20] = gExitList_FortressOfWinds_WestStairs1F, - [ROOM_FORTRESS_OF_WINDS_21] = gExitList_FortressOfWinds_CenterStairs1F, - [ROOM_FORTRESS_OF_WINDS_22] = gExitList_FortressOfWinds_EastStairs1F, - [ROOM_FORTRESS_OF_WINDS_23] = gExitList_FortressOfWinds_Wizzrobe, - [ROOM_FORTRESS_OF_WINDS_24] = gExitList_FortressOfWinds_HeartPiece, + [ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F] = gExitList_FortressOfWinds_WestStairs1F, + [ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F] = gExitList_FortressOfWinds_CenterStairs1F, + [ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F] = gExitList_FortressOfWinds_EastStairs1F, + [ROOM_FORTRESS_OF_WINDS_WIZZROBE] = gExitList_FortressOfWinds_Wizzrobe, + [ROOM_FORTRESS_OF_WINDS_HEART_PIECE] = gExitList_FortressOfWinds_HeartPiece, [ROOM_FORTRESS_OF_WINDS_25] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_26] = gExitList_NoExitList, [ROOM_FORTRESS_OF_WINDS_27] = gExitList_NoExitList, }; const Transition gExitList_FortressOfWindsTop_Main[] = { - { WARP_TYPE_1, 0x0, 0xa0, 0x1a0, 0xb8, 0x28, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_16, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xa0, 0x1a0, 0xb8, 0x28, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_FortressOfWindsTop[] = { - [ROOM_FORTRESS_OF_WINDS_TOP_0] = gExitList_FortressOfWindsTop_Main, + [ROOM_FORTRESS_OF_WINDS_TOP_MAIN] = gExitList_FortressOfWindsTop_Main, }; const Transition gExitList_InnerMazaal_Main[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x11c, 0xb8, 0x5c, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_16, 0x1, 0x1, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x11c, 0xb8, 0x5c, 0x0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_InnerMazaal[] = { - [ROOM_INNER_MAZAAL_0] = gExitList_InnerMazaal_Main, - [ROOM_INNER_MAZAAL_1] = gExitList_InnerMazaal_Main, + [ROOM_INNER_MAZAAL_MAIN] = gExitList_InnerMazaal_Main, + [ROOM_INNER_MAZAAL_PHASE_1] = gExitList_InnerMazaal_Main, }; const Transition gExitList_TempleOfDroplets_WestHole[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_20, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BOSS_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_EastHole[] = { - { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0xd8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_21, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0xd8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTH_SMALL_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_HoleToBlueChuchu[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x6, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_2e, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xc8, 0x28, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BigBlueChuchu[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xb8, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_f, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0xb8, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BigBlueChuchuKey[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x28, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_2e, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x28, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BossKey[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_0, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_HOLE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_NorthSmallKey[] = { - { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0xd8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_2, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xd8, 0x28, 0xd8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_EAST_HOLE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BlueChuchuKeyLever[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0xc8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_b, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0xc8, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_11, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0x58, 0x38, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_Entrance[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x18, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_WaterfallNortheast[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x18, 0xfff, 0xc, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x2, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x18, 0xfff, 0xc, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_Element[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_7, 0x1, 0x0, 0x6, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xf8, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHEAST, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x4, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_9, 0x1, 0x0, 0x2, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x4, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ICE_CORNER, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x8, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_b, 0x1, 0x0, 0x2, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x8, 0xfff, 0x8, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY, 0x1, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x178, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_3, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x178, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x28, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_e, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x28, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BIG_OCTO, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_IceCorner[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x6, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x208, 0xfff, 0xc0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BigOcto[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x178, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_8, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x178, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_NorthwestStairs[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_24, 0x2, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_ICE_BRIDGE, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_ScissorsMiniboss[] = { - { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_25, 0x2, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_STAIRS_TO_SCISSORS_MINIBOSS, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_WaterfallSouthwest[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x170, 0x38, 0x18, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_31, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x38, 0x170, 0x38, 0x18, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_WEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_ToBigBlueChuchu[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x58, 0x58, 0x68, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_32, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x58, 0x58, 0x68, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_COMPASS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x8, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_10, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xfff, 0x8, 0x30, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_BlockCloneIceBridge[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_4, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0x88, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTHWEST_STAIRS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_StairsToScissorsMiniboss[] = { - { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_5, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xc8, 0x18, 0xc8, 0x28, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_SCISSORS_MINIBOSS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_LilypadWestB2[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x168, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_d, 0x1, 0x0, 0x0, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x38, 0x168, 0x3, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHWEST, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_TempleOfDroplets_CompassRoom[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x58, 0x58, 0x68, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_f, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x58, 0x58, 0x58, 0x68, 0x0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_TempleOfDroplets[] = { - [ROOM_TEMPLE_OF_DROPLETS_0] = gExitList_TempleOfDroplets_WestHole, - [ROOM_TEMPLE_OF_DROPLETS_1] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2] = gExitList_TempleOfDroplets_EastHole, - [ROOM_TEMPLE_OF_DROPLETS_3] = gExitList_TempleOfDroplets_Entrance, - [ROOM_TEMPLE_OF_DROPLETS_4] = gExitList_TempleOfDroplets_NorthwestStairs, - [ROOM_TEMPLE_OF_DROPLETS_5] = gExitList_TempleOfDroplets_ScissorsMiniboss, - [ROOM_TEMPLE_OF_DROPLETS_6] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_7] = gExitList_TempleOfDroplets_WaterfallNortheast, - [ROOM_TEMPLE_OF_DROPLETS_8] = gExitList_TempleOfDroplets_Element, - [ROOM_TEMPLE_OF_DROPLETS_9] = gExitList_TempleOfDroplets_IceCorner, - [ROOM_TEMPLE_OF_DROPLETS_a] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_b] = gExitList_TempleOfDroplets_HoleToBlueChuchu, - [ROOM_TEMPLE_OF_DROPLETS_c] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_d] = gExitList_TempleOfDroplets_WaterfallSouthwest, - [ROOM_TEMPLE_OF_DROPLETS_e] = gExitList_TempleOfDroplets_BigOcto, - [ROOM_TEMPLE_OF_DROPLETS_f] = gExitList_TempleOfDroplets_ToBigBlueChuchu, - [ROOM_TEMPLE_OF_DROPLETS_10] = gExitList_TempleOfDroplets_BigBlueChuchu, - [ROOM_TEMPLE_OF_DROPLETS_11] = gExitList_TempleOfDroplets_BigBlueChuchuKey, + [ROOM_TEMPLE_OF_DROPLETS_WEST_HOLE] = gExitList_TempleOfDroplets_WestHole, + [ROOM_TEMPLE_OF_DROPLETS_NORTH_SPLIT_ROOM] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_EAST_HOLE] = gExitList_TempleOfDroplets_EastHole, + [ROOM_TEMPLE_OF_DROPLETS_ENTRANCE] = gExitList_TempleOfDroplets_Entrance, + [ROOM_TEMPLE_OF_DROPLETS_NORTHWEST_STAIRS] = gExitList_TempleOfDroplets_NorthwestStairs, + [ROOM_TEMPLE_OF_DROPLETS_SCISSORS_MINIBOSS] = gExitList_TempleOfDroplets_ScissorsMiniboss, + [ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHWEST] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHEAST] = gExitList_TempleOfDroplets_WaterfallNortheast, + [ROOM_TEMPLE_OF_DROPLETS_ELEMENT] = gExitList_TempleOfDroplets_Element, + [ROOM_TEMPLE_OF_DROPLETS_ICE_CORNER] = gExitList_TempleOfDroplets_IceCorner, + [ROOM_TEMPLE_OF_DROPLETS_ICE_PIT_MAZE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY] = gExitList_TempleOfDroplets_HoleToBlueChuchu, + [ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHEAST] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHWEST] = gExitList_TempleOfDroplets_WaterfallSouthwest, + [ROOM_TEMPLE_OF_DROPLETS_BIG_OCTO] = gExitList_TempleOfDroplets_BigOcto, + [ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU] = gExitList_TempleOfDroplets_ToBigBlueChuchu, + [ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU] = gExitList_TempleOfDroplets_BigBlueChuchu, + [ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY] = gExitList_TempleOfDroplets_BigBlueChuchuKey, [ROOM_TEMPLE_OF_DROPLETS_12] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_13] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_14] = gExitList_NoExitList, @@ -3084,29 +3090,29 @@ const Transition* const gExitLists_TempleOfDroplets[] = { [ROOM_TEMPLE_OF_DROPLETS_1d] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_1e] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_1f] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_20] = gExitList_TempleOfDroplets_BossKey, - [ROOM_TEMPLE_OF_DROPLETS_21] = gExitList_TempleOfDroplets_NorthSmallKey, - [ROOM_TEMPLE_OF_DROPLETS_22] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_23] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_24] = gExitList_TempleOfDroplets_BlockCloneIceBridge, - [ROOM_TEMPLE_OF_DROPLETS_25] = gExitList_TempleOfDroplets_StairsToScissorsMiniboss, - [ROOM_TEMPLE_OF_DROPLETS_26] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_27] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_28] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BOSS_KEY] = gExitList_TempleOfDroplets_BossKey, + [ROOM_TEMPLE_OF_DROPLETS_NORTH_SMALL_KEY] = gExitList_TempleOfDroplets_NorthSmallKey, + [ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_BUTTON_PUZZLE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_PUZZLE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_ICE_BRIDGE] = gExitList_TempleOfDroplets_BlockCloneIceBridge, + [ROOM_TEMPLE_OF_DROPLETS_STAIRS_TO_SCISSORS_MINIBOSS] = gExitList_TempleOfDroplets_StairsToScissorsMiniboss, + [ROOM_TEMPLE_OF_DROPLETS_SPIKE_BAR_FLIPPER_ROOM] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_9_LANTERNS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_LILYPAD_ICE_BLOCKS] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_29] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2a] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2b] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2c] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2d] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_2e] = gExitList_TempleOfDroplets_BlueChuchuKeyLever, - [ROOM_TEMPLE_OF_DROPLETS_2f] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_30] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_31] = gExitList_TempleOfDroplets_LilypadWestB2, - [ROOM_TEMPLE_OF_DROPLETS_32] = gExitList_TempleOfDroplets_CompassRoom, - [ROOM_TEMPLE_OF_DROPLETS_33] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_34] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_35] = gExitList_NoExitList, - [ROOM_TEMPLE_OF_DROPLETS_36] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_MULLDOZERS_FIRE_BARS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_DARK_MAZE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_TWIN_MADDERPILLARS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_AFTER_TWIN_MADDERPILLARS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER] = gExitList_TempleOfDroplets_BlueChuchuKeyLever, + [ROOM_TEMPLE_OF_DROPLETS_MULLDOZER_KEY] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_BEFORE_TWIN_MADDERPILLARS] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_WEST] = gExitList_TempleOfDroplets_LilypadWestB2, + [ROOM_TEMPLE_OF_DROPLETS_COMPASS] = gExitList_TempleOfDroplets_CompassRoom, + [ROOM_TEMPLE_OF_DROPLETS_DARK_SCISSOR_BEETLES] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_MIDDLE] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_ICE_MADDERPILLAR] = gExitList_NoExitList, + [ROOM_TEMPLE_OF_DROPLETS_FLAMEBAR_BLOCK_PUZZLE] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_37] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_38] = gExitList_NoExitList, [ROOM_TEMPLE_OF_DROPLETS_39] = gExitList_NoExitList, @@ -3119,7 +3125,7 @@ const Transition* const gExitLists_TempleOfDroplets[] = { }; const Transition gExitList_61_0[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x58, 0xa8, 0xd8, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_b, 0x1, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0x58, 0xa8, 0xd8, 0x0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x118, 0x174, 0x30, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 0x1, 0x1, 0x4, 0x0, 0x0, 0x0, 0x0 }, @@ -3133,19 +3139,19 @@ const Transition gExitList_RoyalCrypt_WaterRope[] = { TransitionListEnd, }; const Transition gExitList_RoyalCrypt_Gibdo[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x12e, 0x128, 0x48, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_4, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x12e, 0x128, 0x48, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_KEY_BLOCK, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_RoyalCrypt_KeyBlock[] = { - { WARP_TYPE_1, 0x0, 0x128, 0x38, 0xa8, 0x118, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_2, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x128, 0x38, 0xa8, 0x118, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_GIBDO, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x128, 0x16e, 0x88, 0x48, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_7, 0x1, 0x0, 0x4, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x128, 0x16e, 0x88, 0x48, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_MUSHROOM_PIT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_RoyalCrypt_MushroomPit[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x38, 0x128, 0x158, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_4, 0x1, 0x0, 0x0, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x38, 0x128, 0x158, 0x0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_KEY_BLOCK, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -3155,11 +3161,15 @@ const Transition gExitList_RoyalCrypt_Entrance[] = { TransitionListEnd, }; const Transition* const gExitLists_RoyalCrypt[] = { - [ROOM_ROYAL_CRYPT_0] = gExitList_NoExitList, [ROOM_ROYAL_CRYPT_1] = gExitList_RoyalCrypt_WaterRope, - [ROOM_ROYAL_CRYPT_2] = gExitList_RoyalCrypt_Gibdo, [ROOM_ROYAL_CRYPT_3] = gExitList_NoExitList, - [ROOM_ROYAL_CRYPT_4] = gExitList_RoyalCrypt_KeyBlock, [ROOM_ROYAL_CRYPT_5] = gExitList_NoExitList, - [ROOM_ROYAL_CRYPT_6] = gExitList_NoExitList, [ROOM_ROYAL_CRYPT_7] = gExitList_RoyalCrypt_MushroomPit, - [ROOM_ROYAL_CRYPT_8] = gExitList_RoyalCrypt_Entrance, + [ROOM_ROYAL_CRYPT_0] = gExitList_NoExitList, + [ROOM_ROYAL_CRYPT_WATER_ROPE] = gExitList_RoyalCrypt_WaterRope, + [ROOM_ROYAL_CRYPT_GIBDO] = gExitList_RoyalCrypt_Gibdo, + [ROOM_ROYAL_CRYPT_3] = gExitList_NoExitList, + [ROOM_ROYAL_CRYPT_KEY_BLOCK] = gExitList_RoyalCrypt_KeyBlock, + [ROOM_ROYAL_CRYPT_5] = gExitList_NoExitList, + [ROOM_ROYAL_CRYPT_6] = gExitList_NoExitList, + [ROOM_ROYAL_CRYPT_MUSHROOM_PIT] = gExitList_RoyalCrypt_MushroomPit, + [ROOM_ROYAL_CRYPT_ENTRANCE] = gExitList_RoyalCrypt_Entrance, }; const Transition gExitList_PalaceOfWinds_0[] = { @@ -3342,305 +3352,311 @@ const Transition* const gExitLists_PalaceOfWinds[] = { [ROOM_PALACE_OF_WINDS_31] = gExitList_NoExitList, [ROOM_PALACE_OF_WINDS_32] = gExitList_PalaceOfWinds_50, [ROOM_PALACE_OF_WINDS_33] = gExitList_NoExitList, - TransitionListEndBUG, }; -const Transition gExitList_DarkHyruleCastle_0[] = { - { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x108, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_37, 0x2, 0x0, +const Transition gExitList_Unused1[] = { + TransitionListEnd, +}; + +const Transition gExitList_DarkHyruleCastle_1FEntrance[] = { + { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x108, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_MAP, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x228, 0xd8, 0x228, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_37, 0x2, 0x0, + { WARP_TYPE_1, 0x0, 0x228, 0xd8, 0x228, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_MAP, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x198, 0x220, 0x1f8, 0x38, 0x2, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_1[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_7, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_3FTopLeftTower[] = { + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_2[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_d, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_3FTopRightTower[] = { + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_3[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_19, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_3FBottomLeftTower[] = { + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_4[] = { - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x118, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1d, 0x1, 0x0, +const Transition gExitList_DarkHyruleCastle_3FBottomRightTower[] = { + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x118, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_5[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0xe8, 0x3, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_6, 0x1, 0x0, 0x0, +const Transition gExitList_DarkHyruleCastle_3FKeatonHallToVaati[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xa8, 0xe8, 0x3, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x190, 0x88, 0x28, 0x0, AREA_DARK_HYRULE_CASTLE_BRIDGE, ROOM_DARK_HYRULE_CASTLE_BRIDGE_0, + { WARP_TYPE_1, 0x0, 0xa8, 0x190, 0x88, 0x28, 0x0, AREA_DARK_HYRULE_CASTLE_BRIDGE, ROOM_DARK_HYRULE_CASTLE_BRIDGE_MAIN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_6[] = { +const Transition gExitList_DarkHyruleCastle_3FTripleDarknut[] = { { WARP_TYPE_1, 0x0, 0xa8, 0x28, 0x78, 0x168, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, - ROOM_DARK_HYRULE_CASTLE_OUTSIDE_0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x18, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_5, 0x1, 0x0, 0x4, + ROOM_DARK_HYRULE_CASTLE_OUTSIDE_ZELDA_STATUE_PLATFORM, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0xb8, 0x18, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_7[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_2FTopLeftTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TOP_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1e, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_TOP_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x88, 0xd8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_2, + { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x88, 0xd8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHWEST, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_13[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_2FTopRightTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_21, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x88, 0xd8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_3, + { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x88, 0xd8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHEAST, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_18[] = { - { WARP_TYPE_1, 0x0, 0xf0, 0x5c, 0x44, 0x5e, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_4, +const Transition gExitList_DarkHyruleCastle_2FRight[] = { + { WARP_TYPE_1, 0x0, 0xf0, 0x5c, 0x44, 0x5e, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_EAST, 0x2, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xf0, 0xec, 0x44, 0xee, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_4, + { WARP_TYPE_1, 0x0, 0xf0, 0xec, 0x44, 0xee, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_EAST, 0x2, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_20[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x118, 0x3, AREA_DARK_HYRULE_CASTLE_BRIDGE, ROOM_DARK_HYRULE_CASTLE_BRIDGE_0, +const Transition gExitList_DarkHyruleCastle_2FBossDoor[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x118, 0x3, AREA_DARK_HYRULE_CASTLE_BRIDGE, ROOM_DARK_HYRULE_CASTLE_BRIDGE_MAIN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_23[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0xd8, 0x30, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_6, +const Transition gExitList_DarkHyruleCastle_2FEntrance[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x198, 0xd8, 0x30, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTH, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_25[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_2FBottomLeftTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2b, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0xa8, 0x38, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x78, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_5, + { WARP_TYPE_1, 0x0, 0x88, 0xc0, 0x78, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHWEST, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_26[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xd8, 0x30, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_6, +const Transition gExitList_DarkHyruleCastle_2FBottomLeftGhini[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0xd8, 0x30, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTH, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_28[] = { - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x188, 0x3, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_1, +const Transition gExitList_DarkHyruleCastle_B1Entrance[] = { + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x188, 0x3, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_29[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x108, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_4, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_2FBottomRightTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x108, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0xa8, 0x108, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2c, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0xa8, 0x108, 0x68, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, { WARP_TYPE_1, 0x0, 0x88, 0x190, 0x88, 0x288, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, - ROOM_DARK_HYRULE_CASTLE_OUTSIDE_7, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHEAST, 0x2, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_30[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_7, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FTopLeftTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_31[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x48, 0x88, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2d, 0x1, 0x0, 0x0, +const Transition gExitList_DarkHyruleCastle_1FThroneRoom[] = { + { WARP_TYPE_1, 0x0, 0x88, 0x48, 0x88, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BELOW_THRONE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_32[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0xb8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2e, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FCompass[] = { + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0xb8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BELOW_COMPASS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_33[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_d, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FTopRightTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_34[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x68, 0x88, 0x78, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2f, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FBeforeThrone[] = { + { WARP_TYPE_1, 0x0, 0x88, 0x68, 0x88, 0x78, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BEFORE_THRONE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_43[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_19, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_1FBottomLeftTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_44[] = { - { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x118, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1d, 0x1, 0x0, +const Transition gExitList_DarkHyruleCastle_1FBottomRightTower[] = { + { WARP_TYPE_1, 0x0, 0x68, 0x38, 0xa8, 0x118, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_45[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x48, 0x88, 0x58, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1f, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_B1BelowThrone[] = { + { WARP_TYPE_1, 0x0, 0x88, 0x48, 0x88, 0x58, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_46[] = { - { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0xb8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_20, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_B1BelowCompass[] = { + { WARP_TYPE_1, 0x0, 0xb8, 0x38, 0xb8, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_COMPASS, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_47[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x68, 0x88, 0x58, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_22, 0x1, 0x0, 0x0, +const Transition gExitList_DarkHyruleCastle_B1BeforeThrone[] = { + { WARP_TYPE_1, 0x0, 0x88, 0x68, 0x88, 0x58, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BEFORE_THRONE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_48[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x28, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_38, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_B1ToPrison[] = { + { WARP_TYPE_1, 0x0, 0x58, 0x28, 0x58, 0x28, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B2_TO_PRISON, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_55[] = { - { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x108, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_0, 0x1, 0x0, +const Transition gExitList_DarkHyruleCastle_B1Map[] = { + { WARP_TYPE_1, 0x0, 0x108, 0xd8, 0x108, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x228, 0xd8, 0x228, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_0, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x228, 0xd8, 0x228, 0xe8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; -const Transition gExitList_DarkHyruleCastle_56[] = { - { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_30, 0x1, 0x0, 0x4, +const Transition gExitList_DarkHyruleCastle_B2ToPrison[] = { + { WARP_TYPE_1, 0x0, 0x58, 0x18, 0x58, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DarkHyruleCastle[] = { - [ROOM_DARK_HYRULE_CASTLE_0] = gExitList_DarkHyruleCastle_0, - [ROOM_DARK_HYRULE_CASTLE_1] = gExitList_DarkHyruleCastle_1, - [ROOM_DARK_HYRULE_CASTLE_2] = gExitList_DarkHyruleCastle_2, - [ROOM_DARK_HYRULE_CASTLE_3] = gExitList_DarkHyruleCastle_3, - [ROOM_DARK_HYRULE_CASTLE_4] = gExitList_DarkHyruleCastle_4, - [ROOM_DARK_HYRULE_CASTLE_5] = gExitList_DarkHyruleCastle_5, - [ROOM_DARK_HYRULE_CASTLE_6] = gExitList_DarkHyruleCastle_6, - [ROOM_DARK_HYRULE_CASTLE_7] = gExitList_DarkHyruleCastle_7, - [ROOM_DARK_HYRULE_CASTLE_8] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_9] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_a] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_b] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_c] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_d] = gExitList_DarkHyruleCastle_13, - [ROOM_DARK_HYRULE_CASTLE_e] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_f] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_10] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_11] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_12] = gExitList_DarkHyruleCastle_18, - [ROOM_DARK_HYRULE_CASTLE_13] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_14] = gExitList_DarkHyruleCastle_20, - [ROOM_DARK_HYRULE_CASTLE_15] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_16] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_17] = gExitList_DarkHyruleCastle_23, - [ROOM_DARK_HYRULE_CASTLE_18] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_19] = gExitList_DarkHyruleCastle_25, - [ROOM_DARK_HYRULE_CASTLE_1a] = gExitList_DarkHyruleCastle_26, + [ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE] = gExitList_DarkHyruleCastle_1FEntrance, + [ROOM_DARK_HYRULE_CASTLE_3F_TOP_LEFT_TOWER] = gExitList_DarkHyruleCastle_3FTopLeftTower, + [ROOM_DARK_HYRULE_CASTLE_3F_TOP_RIGHT_TOWER] = gExitList_DarkHyruleCastle_3FTopRightTower, + [ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_LEFT_TOWER] = gExitList_DarkHyruleCastle_3FBottomLeftTower, + [ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_RIGHT_TOWER] = gExitList_DarkHyruleCastle_3FBottomRightTower, + [ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI] = gExitList_DarkHyruleCastle_3FKeatonHallToVaati, + [ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT] = gExitList_DarkHyruleCastle_3FTripleDarknut, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER] = gExitList_DarkHyruleCastle_2FTopLeftTower, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_CORNER] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BOSS_KEY] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BLUE_WARP] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_GHINI] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_TORCHES] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER] = gExitList_DarkHyruleCastle_2FTopRightTower, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_DARKNUT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_SPARKS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_DARKNUTS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_RIGHT] = gExitList_DarkHyruleCastle_2FRight, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_DARKNUTS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BOSS_DOOR] = gExitList_DarkHyruleCastle_2FBossDoor, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_DARKNUT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_CORNER_PUZZLE] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_ENTRANCE] = gExitList_DarkHyruleCastle_2FEntrance, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_CORNER] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER] = gExitList_DarkHyruleCastle_2FBottomLeftTower, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_GHINI] = gExitList_DarkHyruleCastle_2FBottomLeftGhini, [ROOM_DARK_HYRULE_CASTLE_1b] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_1c] = gExitList_DarkHyruleCastle_28, - [ROOM_DARK_HYRULE_CASTLE_1d] = gExitList_DarkHyruleCastle_29, - [ROOM_DARK_HYRULE_CASTLE_1e] = gExitList_DarkHyruleCastle_30, - [ROOM_DARK_HYRULE_CASTLE_1f] = gExitList_DarkHyruleCastle_31, - [ROOM_DARK_HYRULE_CASTLE_20] = gExitList_DarkHyruleCastle_32, - [ROOM_DARK_HYRULE_CASTLE_21] = gExitList_DarkHyruleCastle_33, - [ROOM_DARK_HYRULE_CASTLE_22] = gExitList_DarkHyruleCastle_34, - [ROOM_DARK_HYRULE_CASTLE_23] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_24] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_25] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_26] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_27] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_28] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_29] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_2a] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_2b] = gExitList_DarkHyruleCastle_43, - [ROOM_DARK_HYRULE_CASTLE_2c] = gExitList_DarkHyruleCastle_44, - [ROOM_DARK_HYRULE_CASTLE_2d] = gExitList_DarkHyruleCastle_45, - [ROOM_DARK_HYRULE_CASTLE_2e] = gExitList_DarkHyruleCastle_46, - [ROOM_DARK_HYRULE_CASTLE_2f] = gExitList_DarkHyruleCastle_47, - [ROOM_DARK_HYRULE_CASTLE_30] = gExitList_DarkHyruleCastle_48, - [ROOM_DARK_HYRULE_CASTLE_31] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_32] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_33] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_34] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_35] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_36] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_37] = gExitList_DarkHyruleCastle_55, - [ROOM_DARK_HYRULE_CASTLE_38] = gExitList_DarkHyruleCastle_56, - [ROOM_DARK_HYRULE_CASTLE_39] = gExitList_NoExitList, - [ROOM_DARK_HYRULE_CASTLE_3a] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_ENTRANCE] = gExitList_DarkHyruleCastle_B1Entrance, + [ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER] = gExitList_DarkHyruleCastle_2FBottomRightTower, + [ROOM_DARK_HYRULE_CASTLE_1F_TOP_LEFT_TOWER] = gExitList_DarkHyruleCastle_1FTopLeftTower, + [ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM] = gExitList_DarkHyruleCastle_1FThroneRoom, + [ROOM_DARK_HYRULE_CASTLE_1F_COMPASS] = gExitList_DarkHyruleCastle_1FCompass, + [ROOM_DARK_HYRULE_CASTLE_1F_TOP_RIGHT_TOWER] = gExitList_DarkHyruleCastle_1FTopRightTower, + [ROOM_DARK_HYRULE_CASTLE_1F_BEFORE_THRONE] = gExitList_DarkHyruleCastle_1FBeforeThrone, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_RIGHT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_RIGHT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_RIGHT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_LEFT_TOWER] = gExitList_DarkHyruleCastle_1FBottomLeftTower, + [ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_RIGHT_TOWER] = gExitList_DarkHyruleCastle_1FBottomRightTower, + [ROOM_DARK_HYRULE_CASTLE_B1_BELOW_THRONE] = gExitList_DarkHyruleCastle_B1BelowThrone, + [ROOM_DARK_HYRULE_CASTLE_B1_BELOW_COMPASS] = gExitList_DarkHyruleCastle_B1BelowCompass, + [ROOM_DARK_HYRULE_CASTLE_B1_BEFORE_THRONE] = gExitList_DarkHyruleCastle_B1BeforeThrone, + [ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON] = gExitList_DarkHyruleCastle_B1ToPrison, + [ROOM_DARK_HYRULE_CASTLE_B1_BOMB_WALL] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_KEATONS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON_FIREBAR] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_CANNONS] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_LEFT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_RIGHT] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B1_MAP] = gExitList_DarkHyruleCastle_B1Map, + [ROOM_DARK_HYRULE_CASTLE_B2_TO_PRISON] = gExitList_DarkHyruleCastle_B2ToPrison, + [ROOM_DARK_HYRULE_CASTLE_B2_PRISON] = gExitList_NoExitList, + [ROOM_DARK_HYRULE_CASTLE_B2_DROPDOWN] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3b] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3c] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3d] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3e] = gExitList_NoExitList, [ROOM_DARK_HYRULE_CASTLE_3f] = gExitList_NoExitList, - TransitionListEndBUG, +}; + +const Transition gExitList_Unused2[] = { + TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_ZeldaStatuePlatform[] = { - { WARP_TYPE_1, 0x0, 0x78, 0x178, 0xa8, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_6, 0x1, 0x0, 0x4, + { WARP_TYPE_1, 0x0, 0x78, 0x178, 0xa8, 0x38, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_Garden[] = { { WARP_TYPE_1, 0x0, 0x88, 0x38, 0xc8, 0x1e8, 0x0, AREA_SANCTUARY, ROOM_SANCTUARY_HALL, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x18, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1c, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x18, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_ENTRANCE, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideNorthwest[] = { - { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xa8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_7, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xa8, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideNortheast[] = { - { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xb0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_d, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xb0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideEast[] = { - { WARP_TYPE_1, 0x0, 0x38, 0x5c, 0xde, 0x5e, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_12, 0x1, 0x0, 0x6, + { WARP_TYPE_1, 0x0, 0x38, 0x5c, 0xde, 0x5e, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_RIGHT, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x38, 0xec, 0xde, 0xee, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_12, 0x1, 0x0, 0x6, + { WARP_TYPE_1, 0x0, 0x38, 0xec, 0xde, 0xee, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_RIGHT, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideSouthwest[] = { - { WARP_TYPE_1, 0x0, 0x78, 0xd8, 0x88, 0xb0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_19, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x78, 0xd8, 0x88, 0xb0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideSouth[] = { - { WARP_TYPE_1, 0x0, 0x198, 0xc8, 0x88, 0x170, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_17, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x198, 0xc8, 0x88, 0x170, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_ENTRANCE, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xa0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1a, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0xc8, 0x88, 0xa0, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_GHINI, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_DarkHyruleCastleOutside_OutsideSoutheast[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x278, 0x88, 0x178, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1d, 0x1, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x278, 0x88, 0x178, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DarkHyruleCastleOutside[] = { - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_0] = gExitList_DarkHyruleCastleOutside_ZeldaStatuePlatform, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_1] = gExitList_DarkHyruleCastleOutside_Garden, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_2] = gExitList_DarkHyruleCastleOutside_OutsideNorthwest, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_3] = gExitList_DarkHyruleCastleOutside_OutsideNortheast, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_4] = gExitList_DarkHyruleCastleOutside_OutsideEast, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_5] = gExitList_DarkHyruleCastleOutside_OutsideSouthwest, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_6] = gExitList_DarkHyruleCastleOutside_OutsideSouth, - [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_7] = gExitList_DarkHyruleCastleOutside_OutsideSoutheast, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_ZELDA_STATUE_PLATFORM] = gExitList_DarkHyruleCastleOutside_ZeldaStatuePlatform, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN] = gExitList_DarkHyruleCastleOutside_Garden, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHWEST] = gExitList_DarkHyruleCastleOutside_OutsideNorthwest, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_NORTHEAST] = gExitList_DarkHyruleCastleOutside_OutsideNortheast, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_EAST] = gExitList_DarkHyruleCastleOutside_OutsideEast, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHWEST] = gExitList_DarkHyruleCastleOutside_OutsideSouthwest, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTH] = gExitList_DarkHyruleCastleOutside_OutsideSouth, + [ROOM_DARK_HYRULE_CASTLE_OUTSIDE_SOUTHEAST] = gExitList_DarkHyruleCastleOutside_OutsideSoutheast, }; const Transition gExitList_VaatisArms_First[] = { @@ -3657,14 +3673,14 @@ const Transition* const gExitLists_VaatisArms[] = { }; const Transition gExitList_DarkHyruleCastleBridge_Main[] = { - { WARP_TYPE_1, 0x0, 0x88, 0x18, 0xa8, 0x178, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_5, 0x1, 0x0, 0x0, + { WARP_TYPE_1, 0x0, 0x88, 0x18, 0xa8, 0x178, 0x0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x28, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_14, 0x1, 0x0, 0x4, + { WARP_TYPE_0, 0x0, 0x0, 0x0, 0x88, 0x28, 0x30, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOSS_DOOR, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition* const gExitLists_DarkHyruleCastleBridge[] = { - [ROOM_DARK_HYRULE_CASTLE_BRIDGE_0] = gExitList_DarkHyruleCastleBridge_Main, + [ROOM_DARK_HYRULE_CASTLE_BRIDGE_MAIN] = gExitList_DarkHyruleCastleBridge_Main, }; const Transition gExitList_HyruleCastle_0[] = { @@ -3695,10 +3711,14 @@ const Transition gExitList_HyruleCastle_3[] = { TransitionListEnd, }; const Transition* const gExitLists_HyruleCastle[] = { - [ROOM_HYRULE_CASTLE_0] = gExitList_HyruleCastle_0, [ROOM_HYRULE_CASTLE_1] = gExitList_HyruleCastle_1, - [ROOM_HYRULE_CASTLE_2] = gExitList_NoExitList, [ROOM_HYRULE_CASTLE_3] = gExitList_HyruleCastle_3, - [ROOM_HYRULE_CASTLE_4] = gExitList_NoExitList, [ROOM_HYRULE_CASTLE_5] = gExitList_NoExitList, - [ROOM_HYRULE_CASTLE_6] = gExitList_NoExitList, [ROOM_HYRULE_CASTLE_7] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_0] = gExitList_HyruleCastle_0, + [ROOM_HYRULE_CASTLE_1] = gExitList_HyruleCastle_1, + [ROOM_HYRULE_CASTLE_2] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_3] = gExitList_HyruleCastle_3, + [ROOM_HYRULE_CASTLE_4] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_5] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_6] = gExitList_NoExitList, + [ROOM_HYRULE_CASTLE_7] = gExitList_NoExitList, }; const Transition gExitList_SanctuaryEntrance_Main[] = { @@ -3719,7 +3739,7 @@ const Transition gExitList_Sanctuary_Hall[] = { }; const Transition gUnk_0813A76C[] = { { WARP_TYPE_1, 0x0, 0xc8, 0x1fc, 0x88, 0x48, 0x0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, - ROOM_DARK_HYRULE_CASTLE_OUTSIDE_1, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, + ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; const Transition gExitList_Sanctuary_Main[] = { @@ -3895,3 +3915,4 @@ const Transition* const* const gExitLists[] = { /*AREA_97*/ gExitLists_NoExit, /*AREA_98*/ gExitLists_NoExit, }; +// clang-format on diff --git a/src/roomInit.c b/src/roomInit.c index b607424e..5437ce6f 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -921,11 +921,11 @@ u32 sub_unk3_Dojos_ToScarblade(void) { void sub_StateChange_Dojos_ToScarblade(void) { } -u32 sub_unk3_GoronCave_StairsToCave(void) { +u32 sub_unk3_GoronCave_Stairs(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave(void) { +void sub_StateChange_GoronCave_Stairs(void) { } u32 sub_unk3_GoronCave_Main(void) { @@ -1515,11 +1515,11 @@ void sub_StateChange_MinishHouseInteriors_HyruleFieldSouthwest(void) { sub_0801AFE4(); } -u32 sub_unk3_MinishHouseInteriors_HyruleFieldOutsideLinksHouse(void) { +u32 sub_unk3_MinishHouseInteriors_SouthHyruleField(void) { return 1; } -void sub_StateChange_MinishHouseInteriors_HyruleFieldOutsideLinksHouse(void) { +void sub_StateChange_MinishHouseInteriors_SouthHyruleField(void) { sub_0801AFE4(); } @@ -1891,13 +1891,13 @@ u32 sub_unk3_MinishCracks_5(void) { void sub_StateChange_MinishCracks_5(void) { } -u32 sub_unk3_MinishCracks_CastleWildsBowHole(void) { +u32 sub_unk3_MinishCracks_CastorWildsBow(void) { return 1; } extern EntityData gUnk_080DCB10; -void sub_StateChange_MinishCracks_CastleWildsBowHole(void) { +void sub_StateChange_MinishCracks_CastorWildsBow(void) { if (!GetInventoryValue(ITEM_BOW)) { LoadRoomEntityList(&gUnk_080DCB10); } @@ -3779,7 +3779,7 @@ void sub_StateChange_Dojos_ToGrimblade6(void) { extern u32 gUnk_080EB604; extern u32 gUnk_080EB5D4; -u32 sub_unk3_DarkHyruleCastle_0(void) { +u32 sub_unk3_DarkHyruleCastle_1FEntrance(void) { if (CheckGlobalFlag(ENDING)) { gRoomVars.field_0x6c[0] = &gUnk_080EB604; gRoomVars.field_0x6c[2] = 0; @@ -3796,7 +3796,7 @@ u32 sub_unk3_DarkHyruleCastle_0(void) { return 1; } -void sub_StateChange_DarkHyruleCastle_0(void) { +void sub_StateChange_DarkHyruleCastle_1FEntrance(void) { if (CheckGlobalFlag(ENDING)) { gArea.queued_bgm = gArea.bgm; } @@ -3816,42 +3816,42 @@ static void sub_0804D9B0(void) { gArea.queued_bgm = gArea.bgm; } -u32 sub_unk3_DarkHyruleCastle_1(void) { +u32 sub_unk3_DarkHyruleCastle_3FTopLeftTower(void) { return 1; } void sub_StateChange_Dojos_ToGrimblade7(void) { } -u32 sub_unk3_DarkHyruleCastle_2(void) { +u32 sub_unk3_DarkHyruleCastle_3FTopRightTower(void) { return 1; } void sub_StateChange_Dojos_ToGrimblade8(void) { } -u32 sub_unk3_DarkHyruleCastle_3(void) { +u32 sub_unk3_DarkHyruleCastle_3FBottomLeftTower(void) { return 1; } void sub_StateChange_Dojos_ToGrimblade9(void) { } -u32 sub_unk3_DarkHyruleCastle_4(void) { +u32 sub_unk3_DarkHyruleCastle_3FBottomRightTower(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade0(void) { } -u32 sub_unk3_DarkHyruleCastle_5(void) { +u32 sub_unk3_DarkHyruleCastle_3FKeatonHallToVaati(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade1(void) { } -u32 sub_unk3_DarkHyruleCastle_6(void) { +u32 sub_unk3_DarkHyruleCastle_3FTripleDarknut(void) { if (!CheckLocalFlag(0x77)) { gRoomVars.field_0x6c[0] = 0; gRoomVars.field_0x6c[2] = 0; @@ -3863,7 +3863,7 @@ extern EntityData gUnk_080EB9F4; extern EntityData gUnk_080EBAA4; extern EntityData gUnk_080EBAF4; -void sub_StateChange_DarkHyruleCastle_6(void) { +void sub_StateChange_DarkHyruleCastle_3FTripleDarknut(void) { if (!CheckLocalFlag(0x77)) { LoadRoomEntityList(&gUnk_080EB9F4); } else { @@ -3878,173 +3878,173 @@ void sub_StateChange_DarkHyruleCastle_6(void) { } } -u32 sub_unk3_DarkHyruleCastle_7(void) { +u32 sub_unk3_DarkHyruleCastle_2FTopLeftTower(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade2(void) { } -u32 sub_unk3_DarkHyruleCastle_8(void) { +u32 sub_unk3_DarkHyruleCastle_2FTopLeftCorner(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade3(void) { } -u32 sub_unk3_DarkHyruleCastle_9(void) { +u32 sub_unk3_DarkHyruleCastle_2FBossKey(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade4(void) { } -u32 sub_unk3_DarkHyruleCastle_10(void) { +u32 sub_unk3_DarkHyruleCastle_2FBlueWarp(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade5(void) { } -u32 sub_unk3_DarkHyruleCastle_11(void) { +u32 sub_unk3_DarkHyruleCastle_2FTopRightCornerGhini(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade6(void) { } -u32 sub_unk3_DarkHyruleCastle_12(void) { +u32 sub_unk3_DarkHyruleCastle_2FTopRightCornerTorches(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade7(void) { } -u32 sub_unk3_DarkHyruleCastle_13(void) { +u32 sub_unk3_DarkHyruleCastle_2FTopRightTower(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade8(void) { } -u32 sub_unk3_DarkHyruleCastle_14(void) { +u32 sub_unk3_DarkHyruleCastle_2FTopLeftDarknut(void) { return 1; } extern EntityData gUnk_080EC2CC; -void sub_StateChange_DarkHyruleCastle_14(void) { +void sub_StateChange_DarkHyruleCastle_2FTopLeftDarknut(void) { if (CheckLocalFlag(0x86) && !CheckLocalFlag(0x4c)) { LoadRoomEntityList(&gUnk_080EC2CC); } } -u32 sub_unk3_DarkHyruleCastle_15(void) { +u32 sub_unk3_DarkHyruleCastle_2FSparks(void) { return 1; } void sub_StateChange_Dojos_ToSplitblade9(void) { } -u32 sub_unk3_DarkHyruleCastle_16(void) { +u32 sub_unk3_DarkHyruleCastle_2FTopRightDarknuts(void) { return 1; } extern EntityData gUnk_080EC4E8; -void sub_StateChange_DarkHyruleCastle_16(void) { +void sub_StateChange_DarkHyruleCastle_2FTopRightDarknuts(void) { if (CheckLocalFlag(0x86) && !CheckLocalFlag(0x4d)) { LoadRoomEntityList(&gUnk_080EC4E8); } } -u32 sub_unk3_DarkHyruleCastle_17(void) { +u32 sub_unk3_DarkHyruleCastle_2FLeft(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade0(void) { } -u32 sub_unk3_DarkHyruleCastle_18(void) { +u32 sub_unk3_DarkHyruleCastle_2FRight(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade1(void) { } -u32 sub_unk3_DarkHyruleCastle_19(void) { +u32 sub_unk3_DarkHyruleCastle_2FBottomLeftDarknuts(void) { return 1; } extern EntityData gUnk_080EC820; -void sub_StateChange_DarkHyruleCastle_19(void) { +void sub_StateChange_DarkHyruleCastle_2FBottomLeftDarknuts(void) { if (CheckLocalFlag(0x86) && !CheckLocalFlag(0x53)) { LoadRoomEntityList(&gUnk_080EC820); } } -u32 sub_unk3_DarkHyruleCastle_20(void) { +u32 sub_unk3_DarkHyruleCastle_2FBossDoor(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade2(void) { } -u32 sub_unk3_DarkHyruleCastle_21(void) { +u32 sub_unk3_DarkHyruleCastle_2FBottomRightDarknut(void) { return 1; } extern EntityData gUnk_080ECA60; -void sub_StateChange_DarkHyruleCastle_21(void) { +void sub_StateChange_DarkHyruleCastle_2FBottomRightDarknut(void) { if (CheckLocalFlag(0x86) && !CheckLocalFlag(0x56)) { LoadRoomEntityList(&gUnk_080ECA60); } } -u32 sub_unk3_DarkHyruleCastle_22(void) { +u32 sub_unk3_DarkHyruleCastle_2FBottomLeftCornerPuzzle(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade3(void) { } -u32 sub_unk3_DarkHyruleCastle_23(void) { +u32 sub_unk3_DarkHyruleCastle_2FEntrance(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade4(void) { } -u32 sub_unk3_DarkHyruleCastle_24(void) { +u32 sub_unk3_DarkHyruleCastle_2FBottomLeftCorner(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade5(void) { } -u32 sub_unk3_DarkHyruleCastle_25(void) { +u32 sub_unk3_DarkHyruleCastle_2FBottomLeftTower(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade6(void) { } -u32 sub_unk3_DarkHyruleCastle_26(void) { +u32 sub_unk3_DarkHyruleCastle_2FBottomLeftGhini(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade7(void) { } -u32 sub_unk3_DarkHyruleCastle_27(void) { +u32 sub_unk3_DarkHyruleCastle_3FTopRightTower7(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade8(void) { } -u32 sub_unk3_DarkHyruleCastle_28(void) { +u32 sub_unk3_DarkHyruleCastle_B1Entrance(void) { if (CheckLocalFlag(0x79)) { gRoomVars.field_0x6c[2] = 0; } @@ -4053,7 +4053,7 @@ u32 sub_unk3_DarkHyruleCastle_28(void) { extern EntityData gUnk_080ECFCC; -void sub_StateChange_DarkHyruleCastle_28(void) { +void sub_StateChange_DarkHyruleCastle_B1Entrance(void) { if (CheckLocalFlag(0x79)) { sub_0807BB98(0x90, 1, 1, 5); LoadRoomEntityList(&gUnk_080ECFCC); @@ -4061,14 +4061,14 @@ void sub_StateChange_DarkHyruleCastle_28(void) { } } -u32 sub_unk3_DarkHyruleCastle_29(void) { +u32 sub_unk3_DarkHyruleCastle_2FBottomRightTower(void) { return 1; } void sub_StateChange_Dojos_ToGreatblade9(void) { } -u32 sub_unk3_DarkHyruleCastle_30(void) { +u32 sub_unk3_DarkHyruleCastle_1FTopLeftTower(void) { return 1; } @@ -4077,7 +4077,7 @@ void sub_StateChange_Dojos_ToScarblade0(void) { extern u32 gUnk_080ED1E4; -u32 sub_unk3_DarkHyruleCastle_31(void) { +u32 sub_unk3_DarkHyruleCastle_1FThroneRoom(void) { if (CheckGlobalFlag(ENDING)) { gRoomVars.field_0x6c[0] = &gUnk_080ED1E4; gRoomVars.field_0x6c[2] = 0; @@ -4085,160 +4085,160 @@ u32 sub_unk3_DarkHyruleCastle_31(void) { return 1; } -void sub_StateChange_DarkHyruleCastle_31(void) { +void sub_StateChange_DarkHyruleCastle_1FThroneRoom(void) { if (CheckGlobalFlag(ENDING)) { gArea.queued_bgm = gArea.bgm; } } -u32 sub_unk3_DarkHyruleCastle_32(void) { +u32 sub_unk3_DarkHyruleCastle_1FCompass(void) { return 1; } void sub_StateChange_Dojos_ToScarblade1(void) { } -u32 sub_unk3_DarkHyruleCastle_33(void) { +u32 sub_unk3_DarkHyruleCastle_1FTopRightTower(void) { return 1; } void sub_StateChange_Dojos_ToScarblade2(void) { } -u32 sub_unk3_DarkHyruleCastle_34(void) { +u32 sub_unk3_DarkHyruleCastle_1FBeforeThrone(void) { return 1; } void sub_StateChange_Dojos_ToScarblade3(void) { } -u32 sub_unk3_DarkHyruleCastle_35(void) { +u32 sub_unk3_DarkHyruleCastle_1FLoopTopLeft(void) { return 1; } void sub_StateChange_Dojos_ToScarblade4(void) { } -u32 sub_unk3_DarkHyruleCastle_36(void) { +u32 sub_unk3_DarkHyruleCastle_1FLoopTop(void) { return 1; } void sub_StateChange_Dojos_ToScarblade5(void) { } -u32 sub_unk3_DarkHyruleCastle_37(void) { +u32 sub_unk3_DarkHyruleCastle_1FLoopTopRight(void) { return 1; } void sub_StateChange_Dojos_ToScarblade6(void) { } -u32 sub_unk3_DarkHyruleCastle_38(void) { +u32 sub_unk3_DarkHyruleCastle_1FLoopLeft(void) { return 1; } void sub_StateChange_Dojos_ToScarblade7(void) { } -u32 sub_unk3_DarkHyruleCastle_39(void) { +u32 sub_unk3_DarkHyruleCastle_1FLoopRight(void) { return 1; } void sub_StateChange_Dojos_ToScarblade8(void) { } -u32 sub_unk3_DarkHyruleCastle_40(void) { +u32 sub_unk3_DarkHyruleCastle_1FLoopBottomLeft(void) { return 1; } void sub_StateChange_Dojos_ToScarblade9(void) { } -u32 sub_unk3_DarkHyruleCastle_41(void) { +u32 sub_unk3_DarkHyruleCastle_1FLoopBottom(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave0(void) { +void sub_StateChange_GoronCave_Stairs0(void) { } -u32 sub_unk3_DarkHyruleCastle_42(void) { +u32 sub_unk3_DarkHyruleCastle_1FLoopBottomRight(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave1(void) { +void sub_StateChange_GoronCave_Stairs1(void) { } -u32 sub_unk3_DarkHyruleCastle_43(void) { +u32 sub_unk3_DarkHyruleCastle_1FBottomLeftTower(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave2(void) { +void sub_StateChange_GoronCave_Stairs2(void) { } -u32 sub_unk3_DarkHyruleCastle_44(void) { +u32 sub_unk3_DarkHyruleCastle_1FBottomRightTower(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave3(void) { +void sub_StateChange_GoronCave_Stairs3(void) { } -u32 sub_unk3_DarkHyruleCastle_45(void) { +u32 sub_unk3_DarkHyruleCastle_B1BelowThrone(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave4(void) { +void sub_StateChange_GoronCave_Stairs4(void) { } -u32 sub_unk3_DarkHyruleCastle_46(void) { +u32 sub_unk3_DarkHyruleCastle_B1BelowCompass(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave5(void) { +void sub_StateChange_GoronCave_Stairs5(void) { } -u32 sub_unk3_DarkHyruleCastle_47(void) { +u32 sub_unk3_DarkHyruleCastle_B1BeforeThrone(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave6(void) { +void sub_StateChange_GoronCave_Stairs6(void) { } -u32 sub_unk3_DarkHyruleCastle_48(void) { +u32 sub_unk3_DarkHyruleCastle_B1ToPrison(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave7(void) { +void sub_StateChange_GoronCave_Stairs7(void) { } -u32 sub_unk3_DarkHyruleCastle_49(void) { +u32 sub_unk3_DarkHyruleCastle_B1BombWall(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave8(void) { +void sub_StateChange_GoronCave_Stairs8(void) { } -u32 sub_unk3_DarkHyruleCastle_50(void) { +u32 sub_unk3_DarkHyruleCastle_B1Keatons(void) { return 1; } -void sub_StateChange_GoronCave_StairsToCave9(void) { +void sub_StateChange_GoronCave_Stairs9(void) { } -u32 sub_unk3_DarkHyruleCastle_51(void) { +u32 sub_unk3_DarkHyruleCastle_B1ToPrisonFirebar(void) { return 1; } void sub_StateChange_Ruins_Beanstalk0(void) { } -u32 sub_unk3_DarkHyruleCastle_52(void) { +u32 sub_unk3_DarkHyruleCastle_B1Cannons(void) { return 1; } void sub_StateChange_Ruins_Beanstalk1(void) { } -u32 sub_unk3_DarkHyruleCastle_53(void) { +u32 sub_unk3_DarkHyruleCastle_B1Left(void) { if (CheckLocalFlag(0x79)) { gRoomVars.field_0x6c[2] = 0; gRoomVars.field_0x6c[0] = 0; @@ -4248,7 +4248,7 @@ u32 sub_unk3_DarkHyruleCastle_53(void) { extern EntityData gUnk_080EE314; -void sub_StateChange_DarkHyruleCastle_53(void) { +void sub_StateChange_DarkHyruleCastle_B1Left(void) { if (CheckLocalFlag(0x79)) { sub_0807BB98(3, 2, 5, 1); LoadRoomEntityList(&gUnk_080EE314); @@ -4256,14 +4256,14 @@ void sub_StateChange_DarkHyruleCastle_53(void) { } } -u32 sub_unk3_DarkHyruleCastle_54(void) { +u32 sub_unk3_DarkHyruleCastle_B1Right(void) { return 1; } void sub_StateChange_Ruins_Beanstalk2(void) { } -u32 sub_unk3_DarkHyruleCastle_55(void) { +u32 sub_unk3_DarkHyruleCastle_B1Map(void) { if (CheckLocalFlag(0x79)) { gRoomVars.field_0x6c[2] = 0; } @@ -4272,7 +4272,7 @@ u32 sub_unk3_DarkHyruleCastle_55(void) { extern EntityData gUnk_080EE5DC; -void sub_StateChange_DarkHyruleCastle_55(void) { +void sub_StateChange_DarkHyruleCastle_B1Map(void) { if (CheckLocalFlag(0x79)) { sub_0807BB98(0x392, 2, 2, 5); LoadRoomEntityList(&gUnk_080EE5DC); @@ -4280,26 +4280,26 @@ void sub_StateChange_DarkHyruleCastle_55(void) { } } -u32 sub_unk3_DarkHyruleCastle_56(void) { +u32 sub_unk3_DarkHyruleCastle_B2ToPrison(void) { return 1; } void sub_StateChange_Ruins_Beanstalk3(void) { } -u32 sub_unk3_DarkHyruleCastle_57(void) { +u32 sub_unk3_DarkHyruleCastle_B2Prison(void) { return 1; } extern EntityData gUnk_080EE71C; -void sub_StateChange_DarkHyruleCastle_57(void) { +void sub_StateChange_DarkHyruleCastle_B2Prison(void) { if (CheckLocalFlag(1)) { LoadRoomEntityList(&gUnk_080EE71C); } } -u32 sub_unk3_DarkHyruleCastle_58(void) { +u32 sub_unk3_DarkHyruleCastle_B2Dropdown(void) { return 1; } @@ -4950,13 +4950,13 @@ void sub_StateChange_HouseInteriors2_Dampe(void) { } } -u32 sub_unk3_HouseInteriors2_Stockwell(void) { +u32 sub_unk3_HouseInteriors2_StockwellLakeHouse(void) { return 1; } extern EntityData gUnk_080F30CC; -void sub_StateChange_HouseInteriors2_Stockwell(void) { +void sub_StateChange_HouseInteriors2_StockwellLakeHouse(void) { if ((GetInventoryValue(ITEM_QST_DOGFOOD) == 1) && !CheckGlobalFlag(BIN_DOGFOOD) && (gPlayerState.flags & PL_MINISH) == 0) { LoadRoomEntityList(&gUnk_080F30CC); @@ -5053,13 +5053,13 @@ u32 sub_unk3_HouseInteriors4_FarmHouse(void) { void sub_StateChange_Ruins_LadderToTektites0(void) { } -u32 sub_unk3_HouseInteriors4_Mayor(void) { +u32 sub_unk3_HouseInteriors4_MayorLakeCabin(void) { return 1; } extern EntityData gUnk_080F3A48; -void sub_StateChange_HouseInteriors4_Mayor(void) { +void sub_StateChange_HouseInteriors4_MayorLakeCabin(void) { if (!GetInventoryValue(ITEM_FLIPPERS) && CheckGlobalFlag(MIZUKAKI_START) && !GetInventoryValue(ITEM_QST_BOOK3)) { LoadRoomEntityList(&gUnk_080F3A48); } @@ -6133,25 +6133,25 @@ u32 sub_unk3_Caves_6(void) { void sub_StateChange_Caves_6(void) { } -u32 sub_unk3_Caves_KeeseChest(void) { +u32 sub_unk3_Caves_TrilbyKeeseChest(void) { return 1; } -void sub_StateChange_Caves_KeeseChest(void) { +void sub_StateChange_Caves_TrilbyKeeseChest(void) { } -u32 sub_unk3_Caves_FairyFountainTrilbyHighlands(void) { +u32 sub_unk3_Caves_TrilbyFairyFountain(void) { return 1; } -void sub_StateChange_Caves_FairyFountainTrilbyHighlands(void) { +void sub_StateChange_Caves_TrilbyFairyFountain(void) { } -u32 sub_unk3_Caves_FairyFountainLinksHouse(void) { +u32 sub_unk3_Caves_SouthHyruleFieldFairyFountain(void) { return 1; } -void sub_StateChange_Caves_FairyFountainLinksHouse(void) { +void sub_StateChange_Caves_SouthHyruleFieldFairyFountain(void) { } u32 sub_unk3_Caves_A(void) { @@ -6204,31 +6204,31 @@ u32 sub_unk3_Caves_LonLonRanchWallet(void) { void sub_StateChange_Caves_LonLonRanchWallet(void) { } -u32 sub_unk3_Caves_RupeeLinksHouse(void) { +u32 sub_unk3_Caves_SouthHyruleFieldRupee(void) { return 1; } -void sub_StateChange_Caves_RupeeLinksHouse(void) { +void sub_StateChange_Caves_SouthHyruleFieldRupee(void) { } -u32 sub_unk3_Caves_RupeeTrilbyHighlands(void) { +u32 sub_unk3_Caves_TrilbyRupee(void) { return 1; } -void sub_StateChange_Caves_RupeeTrilbyHighlands(void) { +void sub_StateChange_Caves_TrilbyRupee(void) { } -u32 sub_unk3_Caves_FairyFountainMoleMitts(void) { +u32 sub_unk3_Caves_TrilbyMittsFairyFountain(void) { return 1; } -void sub_StateChange_Caves_FairyFountainMoleMitts(void) { +void sub_StateChange_Caves_TrilbyMittsFairyFountain(void) { } -u32 sub_unk3_Caves_KeeseChestSoutheastHyrule(void) { +u32 sub_unk3_Caves_HillsKeeseChest(void) { return 1; } -void sub_StateChange_Caves_KeeseChestSoutheastHyrule(void) { +void sub_StateChange_Caves_HillsKeeseChest(void) { } u32 sub_unk3_Caves_BottleBusinessScrub(void) { @@ -6245,11 +6245,11 @@ u32 sub_unk3_Caves_HeartPieceHallway(void) { void sub_StateChange_Caves_HeartPieceHallway(void) { } -u32 sub_unk3_Caves_FairyFountainBoomerang(void) { +u32 sub_unk3_Caves_NorthHyruleFieldFairyFountain(void) { return 1; } -void sub_StateChange_Caves_FairyFountainBoomerang(void) { +void sub_StateChange_Caves_NorthHyruleFieldFairyFountain(void) { } u32 sub_unk3_Caves_KinstoneBusinessScrub(void) { @@ -6542,11 +6542,11 @@ u32 sub_unk3_TreeInteriors_HeartPiece(void) { void sub_StateChange_TreeInteriors_HeartPiece(void) { } -u32 sub_unk3_TreeInteriors_StairsToBladeBrother(void) { +u32 sub_unk3_TreeInteriors_Waveblade(void) { return 1; } -void sub_StateChange_TreeInteriors_StairsToBladeBrother(void) { +void sub_StateChange_TreeInteriors_Waveblade(void) { } u32 sub_unk3_TreeInteriors_14(void) { @@ -6584,25 +6584,25 @@ u32 sub_unk3_TreeInteriors_BoomerangSoutheast(void) { void sub_StateChange_TreeInteriors_BoomerangSoutheast(void) { } -u32 sub_unk3_TreeInteriors_HeartPieceSouthwestField(void) { +u32 sub_unk3_TreeInteriors_WesternWoodsHeartPiece(void) { return 1; } -void sub_StateChange_TreeInteriors_HeartPieceSouthwestField(void) { +void sub_StateChange_TreeInteriors_WesternWoodsHeartPiece(void) { } -u32 sub_unk3_TreeInteriors_StairsToFairyFountain(void) { +u32 sub_unk3_TreeInteriors_NorthHyruleFieldFairyFountain(void) { return 1; } -void sub_StateChange_TreeInteriors_StairsToFairyFountain(void) { +void sub_StateChange_TreeInteriors_NorthHyruleFieldFairyFountain(void) { } -u32 sub_unk3_TreeInteriors_StairsToWalletFairy(void) { +u32 sub_unk3_TreeInteriors_MinishWoodsGreatFairy(void) { return 1; } -void sub_StateChange_TreeInteriors_StairsToWalletFairy(void) { +void sub_StateChange_TreeInteriors_MinishWoodsGreatFairy(void) { } u32 sub_unk3_TreeInteriors_1C(void) { @@ -6612,11 +6612,11 @@ u32 sub_unk3_TreeInteriors_1C(void) { void sub_StateChange_TreeInteriors_1C(void) { } -u32 sub_unk3_TreeInteriors_StairsToBusinessScrub(void) { +u32 sub_unk3_TreeInteriors_MinishWoodsBusinessScrub(void) { return 1; } -void sub_StateChange_TreeInteriors_StairsToBusinessScrub(void) { +void sub_StateChange_TreeInteriors_MinishWoodsBusinessScrub(void) { } u32 sub_unk3_TreeInteriors_1E(void) { @@ -6626,11 +6626,11 @@ u32 sub_unk3_TreeInteriors_1E(void) { void sub_StateChange_TreeInteriors_1E(void) { } -u32 sub_unk3_TreeInteriors_1F(void) { +u32 sub_unk3_TreeInteriors_UnusedHeartContainer(void) { return 1; } -void sub_StateChange_TreeInteriors_1F(void) { +void sub_StateChange_TreeInteriors_UnusedHeartContainer(void) { } extern u32 gUnk_080FAD48; @@ -6793,11 +6793,11 @@ u32 sub_unk3_CrenelCaves_MushroomKeese(void) { void sub_StateChange_CrenelCaves_MushroomKeese(void) { } -u32 sub_unk3_CrenelCaves_LadderToGreenWater(void) { +u32 sub_unk3_CrenelCaves_LadderToSpringWater(void) { return 1; } -void sub_StateChange_CrenelCaves_LadderToGreenWater(void) { +void sub_StateChange_CrenelCaves_LadderToSpringWater(void) { } u32 sub_unk3_CrenelCaves_BombBusinessScrub(void) { diff --git a/src/title.c b/src/title.c index 0a86638e..3329f80e 100644 --- a/src/title.c +++ b/src/title.c @@ -79,7 +79,7 @@ static const SaveFile gDemoSave = { .name = "\x97\x7f\xdd", .saved_status = { .area_next = AREA_DEEPWOOD_SHRINE, - .room_next = ROOM_DEEPWOOD_SHRINE_b, + .room_next = ROOM_DEEPWOOD_SHRINE_ENTRANCE, .start_pos_x = 0xa8, .start_pos_y = 0xc8, .layer = 1, |