mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-22 17:03:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

added WarpType enum

Browse Source 
and some cleanup
This commit is contained in:
Henny022p
2022-03-21 08:27:57 +01:00
parent 02f68affe5
commit 333709cefe
11 changed files with 2729 additions and 2388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/roomid.h
+176 -18
View File
@@ -181,6 +181,25 @@ typedef enum {
ROOM_HOUSE_INTERIORS_1_a,
ROOM_HOUSE_INTERIORS_1_b,
ROOM_HOUSE_INTERIORS_1_c,
ROOM_HOUSE_INTERIORS_1_d,
ROOM_HOUSE_INTERIORS_1_e,
ROOM_HOUSE_INTERIORS_1_f,
ROOM_HOUSE_INTERIORS_1_10,
ROOM_HOUSE_INTERIORS_1_11,
ROOM_HOUSE_INTERIORS_1_12,
ROOM_HOUSE_INTERIORS_1_13,
ROOM_HOUSE_INTERIORS_1_14,
ROOM_HOUSE_INTERIORS_1_15,
ROOM_HOUSE_INTERIORS_1_16,
ROOM_HOUSE_INTERIORS_1_17,
ROOM_HOUSE_INTERIORS_1_18,
ROOM_HOUSE_INTERIORS_1_19,
ROOM_HOUSE_INTERIORS_1_1a,
ROOM_HOUSE_INTERIORS_1_1b,
ROOM_HOUSE_INTERIORS_1_1c,
ROOM_HOUSE_INTERIORS_1_1d,
ROOM_HOUSE_INTERIORS_1_1e,
ROOM_HOUSE_INTERIORS_1_1f,
// AREA_HOUSE_INTERIORS_2
ROOM_HOUSE_INTERIORS_2_0 = 0,
ROOM_HOUSE_INTERIORS_2_1,
@@ -204,6 +223,32 @@ typedef enum {
ROOM_HOUSE_INTERIORS_2_13,
ROOM_HOUSE_INTERIORS_2_14,
ROOM_HOUSE_INTERIORS_2_15,
ROOM_HOUSE_INTERIORS_2_16,
ROOM_HOUSE_INTERIORS_2_17,
ROOM_HOUSE_INTERIORS_2_18,
ROOM_HOUSE_INTERIORS_2_19,
ROOM_HOUSE_INTERIORS_2_1a,
ROOM_HOUSE_INTERIORS_2_1b,
ROOM_HOUSE_INTERIORS_2_1c,
ROOM_HOUSE_INTERIORS_2_1d,
ROOM_HOUSE_INTERIORS_2_1e,
ROOM_HOUSE_INTERIORS_2_1f,
ROOM_HOUSE_INTERIORS_2_20,
ROOM_HOUSE_INTERIORS_2_21,
ROOM_HOUSE_INTERIORS_2_22,
ROOM_HOUSE_INTERIORS_2_23,
ROOM_HOUSE_INTERIORS_2_24,
ROOM_HOUSE_INTERIORS_2_25,
ROOM_HOUSE_INTERIORS_2_26,
ROOM_HOUSE_INTERIORS_2_27,
ROOM_HOUSE_INTERIORS_2_28,
ROOM_HOUSE_INTERIORS_2_29,
ROOM_HOUSE_INTERIORS_2_2a,
ROOM_HOUSE_INTERIORS_2_2b,
ROOM_HOUSE_INTERIORS_2_2c,
ROOM_HOUSE_INTERIORS_2_2d,
ROOM_HOUSE_INTERIORS_2_2e,
ROOM_HOUSE_INTERIORS_2_2f,
// AREA_HOUSE_INTERIORS_3
ROOM_HOUSE_INTERIORS_3_0 = 0,
ROOM_HOUSE_INTERIORS_3_1,
@@ -214,6 +259,13 @@ typedef enum {
ROOM_HOUSE_INTERIORS_3_6,
ROOM_HOUSE_INTERIORS_3_7,
ROOM_HOUSE_INTERIORS_3_8,
ROOM_HOUSE_INTERIORS_3_9,
ROOM_HOUSE_INTERIORS_3_a,
ROOM_HOUSE_INTERIORS_3_b,
ROOM_HOUSE_INTERIORS_3_c,
ROOM_HOUSE_INTERIORS_3_d,
ROOM_HOUSE_INTERIORS_3_e,
ROOM_HOUSE_INTERIORS_3_f,
// AREA_TREE_INTERIORS
ROOM_TREE_INTERIORS_0 = 0,
ROOM_TREE_INTERIORS_1,
@@ -245,6 +297,8 @@ typedef enum {
ROOM_TREE_INTERIORS_1b,
ROOM_TREE_INTERIORS_1c,
ROOM_TREE_INTERIORS_1d,
ROOM_TREE_INTERIORS_1e,
ROOM_TREE_INTERIORS_1f,
// AREA_DOJOS
ROOM_DOJOS_0 = 0,
ROOM_DOJOS_1,
@@ -257,6 +311,11 @@ typedef enum {
ROOM_DOJOS_8,
ROOM_DOJOS_9,
ROOM_DOJOS_a,
ROOM_DOJOS_b,
ROOM_DOJOS_c,
ROOM_DOJOS_d,
ROOM_DOJOS_e,
ROOM_DOJOS_f,
// AREA_CRENEL_CAVES
ROOM_CRENEL_CAVES_0 = 0,
ROOM_CRENEL_CAVES_1,
@@ -277,6 +336,29 @@ typedef enum {
ROOM_CRENEL_CAVES_10,
// AREA_MINISH_CRACKS
ROOM_MINISH_CRACKS_0 = 0,
ROOM_MINISH_CRACKS_1,
ROOM_MINISH_CRACKS_2,
ROOM_MINISH_CRACKS_3,
ROOM_MINISH_CRACKS_4,
ROOM_MINISH_CRACKS_5,
ROOM_MINISH_CRACKS_6,
ROOM_MINISH_CRACKS_7,
ROOM_MINISH_CRACKS_8,
ROOM_MINISH_CRACKS_9,
ROOM_MINISH_CRACKS_a,
ROOM_MINISH_CRACKS_b,
ROOM_MINISH_CRACKS_c,
ROOM_MINISH_CRACKS_d,
ROOM_MINISH_CRACKS_e,
ROOM_MINISH_CRACKS_f,
ROOM_MINISH_CRACKS_10,
ROOM_MINISH_CRACKS_11,
ROOM_MINISH_CRACKS_12,
ROOM_MINISH_CRACKS_13,
ROOM_MINISH_CRACKS_14,
ROOM_MINISH_CRACKS_15,
ROOM_MINISH_CRACKS_16,
ROOM_MINISH_CRACKS_17,
// AREA_HOUSE_INTERIORS_4
ROOM_HOUSE_INTERIORS_4_0 = 0,
ROOM_HOUSE_INTERIORS_4_1,
@@ -284,21 +366,45 @@ typedef enum {
ROOM_HOUSE_INTERIORS_4_3,
ROOM_HOUSE_INTERIORS_4_4,
ROOM_HOUSE_INTERIORS_4_5,
ROOM_HOUSE_INTERIORS_4_6,
ROOM_HOUSE_INTERIORS_4_7,
ROOM_HOUSE_INTERIORS_4_8,
ROOM_HOUSE_INTERIORS_4_9,
ROOM_HOUSE_INTERIORS_4_a,
ROOM_HOUSE_INTERIORS_4_b,
ROOM_HOUSE_INTERIORS_4_c,
ROOM_HOUSE_INTERIORS_4_d,
ROOM_HOUSE_INTERIORS_4_e,
ROOM_HOUSE_INTERIORS_4_f,
// AREA_GREAT_FAIRIES
ROOM_GREAT_FAIRIES_0 = 0,
ROOM_GREAT_FAIRIES_1,
ROOM_GREAT_FAIRIES_2,
ROOM_GREAT_FAIRIES_GRAVEYARD = 0,
ROOM_GREAT_FAIRIES_MINISH_WOODS,
ROOM_GREAT_FAIRIES_CRENEL,
ROOM_GREAT_FAIRIES_NOT_IMPLEMENTED,
// AREA_CASTOR_CAVES
ROOM_CASTOR_CAVES_0 = 0,
ROOM_CASTOR_CAVES_1,
ROOM_CASTOR_CAVES_2,
ROOM_CASTOR_CAVES_3,
ROOM_CASTOR_CAVES_4,
ROOM_CASTOR_CAVES_5,
ROOM_CASTOR_CAVES_6,
ROOM_CASTOR_CAVES_7,
// AREA_CASTOR_DARKNUT
ROOM_CASTOR_DARKNUT_0 = 0,
ROOM_CASTOR_DARKNUT_1,
// AREA_ARMOS_INTERIORS
ROOM_ARMOS_INTERIORS_0 = 0,
ROOM_ARMOS_INTERIORS_1,
ROOM_ARMOS_INTERIORS_2,
ROOM_ARMOS_INTERIORS_3,
ROOM_ARMOS_INTERIORS_4,
ROOM_ARMOS_INTERIORS_5,
ROOM_ARMOS_INTERIORS_6,
ROOM_ARMOS_INTERIORS_7,
ROOM_ARMOS_INTERIORS_8,
ROOM_ARMOS_INTERIORS_9,
ROOM_ARMOS_INTERIORS_a,
// AREA_TOWN_MINISH_HOLES
ROOM_TOWN_MINISH_HOLES_0 = 0,
ROOM_TOWN_MINISH_HOLES_1,
@@ -318,8 +424,13 @@ typedef enum {
ROOM_TOWN_MINISH_HOLES_f,
ROOM_TOWN_MINISH_HOLES_10,
ROOM_TOWN_MINISH_HOLES_11,
ROOM_TOWN_MINISH_HOLES_12,
ROOM_TOWN_MINISH_HOLES_13,
// AREA_MINISH_RAFTERS
ROOM_MINISH_RAFTERS_0 = 0,
ROOM_MINISH_RAFTERS_1,
ROOM_MINISH_RAFTERS_2,
ROOM_MINISH_RAFTERS_3,
// AREA_GORON_CAVE
ROOM_GORON_CAVE_0 = 0,
ROOM_GORON_CAVE_1,
@@ -366,24 +477,32 @@ typedef enum {
ROOM_VEIL_FALLS_CAVES_7,
ROOM_VEIL_FALLS_CAVES_8,
ROOM_VEIL_FALLS_CAVES_9,
ROOM_VEIL_FALLS_CAVES_a,
ROOM_VEIL_FALLS_CAVES_b,
ROOM_VEIL_FALLS_CAVES_c,
ROOM_VEIL_FALLS_CAVES_d,
ROOM_VEIL_FALLS_CAVES_e,
ROOM_VEIL_FALLS_CAVES_f,
// AREA_ROYAL_VALLEY_GRAVES
ROOM_ROYAL_VALLEY_GRAVES_0 = 0,
ROOM_ROYAL_VALLEY_GRAVES_1,
ROOM_ROYAL_VALLEY_GRAVES_HEART_PIECE = 0,
ROOM_ROYAL_VALLEY_GRAVES_GINA,
// AREA_MINISH_CAVES
ROOM_MINISH_CAVES_0 = 0,
ROOM_MINISH_CAVES_1,
ROOM_MINISH_CAVES_BEAN_PESTO = 0,
ROOM_MINISH_CAVES_SOUTHEAST_WATER_1,
ROOM_MINISH_CAVES_2,
ROOM_MINISH_CAVES_3,
ROOM_MINISH_CAVES_4,
ROOM_MINISH_CAVES_5,
ROOM_MINISH_CAVES_RUINS,
ROOM_MINISH_CAVES_OUTSIDE_LINKS_HOUSE,
ROOM_MINISH_CAVES_MINISH_WOODS_NORTH_1,
ROOM_MINISH_CAVES_6,
ROOM_MINISH_CAVES_7,
ROOM_MINISH_CAVES_8,
ROOM_MINISH_CAVES_9,
ROOM_MINISH_CAVES_LAKE_HYLIA_NORTH,
ROOM_MINISH_CAVES_LAKE_HYLIA_LIBRARI,
ROOM_MINISH_CAVES_MINISH_WOODS_SOUTHWEST,
// AREA_CASTLE_GARDEN_MINISH_HOLES
ROOM_CASTLE_GARDEN_MINISH_HOLES_0 = 0,
ROOM_CASTLE_GARDEN_MINISH_HOLES_1,
// AREA_37
ROOM_37_0 = 0,
ROOM_37_1,
// AREA_EZLO_CUTSCENE
ROOM_EZLO_CUTSCENE_0 = 0,
// AREA_NULL_39
@@ -492,6 +611,15 @@ typedef enum {
ROOM_CAVE_OF_FLAMES_15,
ROOM_CAVE_OF_FLAMES_16,
ROOM_CAVE_OF_FLAMES_17,
ROOM_CAVE_OF_FLAMES_18,
ROOM_CAVE_OF_FLAMES_19,
ROOM_CAVE_OF_FLAMES_1a,
ROOM_CAVE_OF_FLAMES_1b,
ROOM_CAVE_OF_FLAMES_1c,
ROOM_CAVE_OF_FLAMES_1d,
ROOM_CAVE_OF_FLAMES_1e,
ROOM_CAVE_OF_FLAMES_1f,
ROOM_CAVE_OF_FLAMES_20,
// AREA_CAVE_OF_FLAMES_BOSS
ROOM_CAVE_OF_FLAMES_BOSS_0 = 0,
// AREA_NULL_52
@@ -544,10 +672,14 @@ typedef enum {
ROOM_FORTRESS_OF_WINDS_22,
ROOM_FORTRESS_OF_WINDS_23,
ROOM_FORTRESS_OF_WINDS_24,
ROOM_FORTRESS_OF_WINDS_25,
ROOM_FORTRESS_OF_WINDS_26,
ROOM_FORTRESS_OF_WINDS_27,
// AREA_FORTRESS_OF_WINDS_TOP
ROOM_FORTRESS_OF_WINDS_TOP_0 = 0,
// AREA_INNER_MAZAAL
ROOM_INNER_MAZAAL_0 = 0,
ROOM_INNER_MAZAAL_1,
// AREA_NULL_5B
ROOM_NULL_5B_0 = 0,
// AREA_NULL_5C
@@ -610,6 +742,19 @@ typedef enum {
ROOM_TEMPLE_OF_DROPLETS_30,
ROOM_TEMPLE_OF_DROPLETS_31,
ROOM_TEMPLE_OF_DROPLETS_32,
ROOM_TEMPLE_OF_DROPLETS_33,
ROOM_TEMPLE_OF_DROPLETS_34,
ROOM_TEMPLE_OF_DROPLETS_35,
ROOM_TEMPLE_OF_DROPLETS_36,
ROOM_TEMPLE_OF_DROPLETS_37,
ROOM_TEMPLE_OF_DROPLETS_38,
ROOM_TEMPLE_OF_DROPLETS_39,
ROOM_TEMPLE_OF_DROPLETS_3a,
ROOM_TEMPLE_OF_DROPLETS_3b,
ROOM_TEMPLE_OF_DROPLETS_3c,
ROOM_TEMPLE_OF_DROPLETS_3d,
ROOM_TEMPLE_OF_DROPLETS_3e,
ROOM_TEMPLE_OF_DROPLETS_3f,
// AREA_NULL_61
ROOM_NULL_61_0 = 0,
// AREA_HYRULE_TOWN_MINISH_CAVES
@@ -700,6 +845,7 @@ typedef enum {
ROOM_PALACE_OF_WINDS_30,
ROOM_PALACE_OF_WINDS_31,
ROOM_PALACE_OF_WINDS_32,
ROOM_PALACE_OF_WINDS_33,
// AREA_PALACE_OF_WINDS_BOSS
ROOM_PALACE_OF_WINDS_BOSS_0 = 0,
// AREA_NULL_72
@@ -715,9 +861,9 @@ typedef enum {
// AREA_77
ROOM_77_0 = 0,
// AREA_SANCTUARY
ROOM_SANCTUARY_0 = 0,
ROOM_SANCTUARY_1,
ROOM_SANCTUARY_2,
ROOM_SANCTUARY_HALL = 0,
ROOM_SANCTUARY_MAIN,
ROOM_SANCTUARY_STAINED_GLASS,
// AREA_NULL_79
ROOM_NULL_79_0 = 0,
// AREA_NULL_7A
@@ -737,8 +883,12 @@ typedef enum {
ROOM_HYRULE_CASTLE_1,
ROOM_HYRULE_CASTLE_2,
ROOM_HYRULE_CASTLE_3,
ROOM_HYRULE_CASTLE_4,
ROOM_HYRULE_CASTLE_5,
ROOM_HYRULE_CASTLE_6,
ROOM_HYRULE_CASTLE_7,
// AREA_SANCTUARY_ENTRANCE
ROOM_SANCTUARY_ENTRANCE_0 = 0,
ROOM_SANCTUARY_ENTRANCE_MAIN = 0,
// AREA_NULL_82
ROOM_NULL_82_0 = 0,
// AREA_NULL_83
@@ -809,6 +959,13 @@ typedef enum {
ROOM_DARK_HYRULE_CASTLE_36,
ROOM_DARK_HYRULE_CASTLE_37,
ROOM_DARK_HYRULE_CASTLE_38,
ROOM_DARK_HYRULE_CASTLE_39,
ROOM_DARK_HYRULE_CASTLE_3a,
ROOM_DARK_HYRULE_CASTLE_3b,
ROOM_DARK_HYRULE_CASTLE_3c,
ROOM_DARK_HYRULE_CASTLE_3d,
ROOM_DARK_HYRULE_CASTLE_3e,
ROOM_DARK_HYRULE_CASTLE_3f,
// AREA_DARK_HYRULE_CASTLE_OUTSIDE
ROOM_DARK_HYRULE_CASTLE_OUTSIDE_0 = 0,
ROOM_DARK_HYRULE_CASTLE_OUTSIDE_1,
@@ -819,7 +976,8 @@ typedef enum {
ROOM_DARK_HYRULE_CASTLE_OUTSIDE_6,
ROOM_DARK_HYRULE_CASTLE_OUTSIDE_7,
// AREA_VAATIS_ARMS
ROOM_VAATIS_ARMS_0 = 0,
ROOM_VAATIS_ARMS_FIRST = 0,
ROOM_VAATIS_ARMS_SECOND,
// AREA_VAATI_3
ROOM_VAATI_3_0 = 0,
// AREA_VAATI_2
include/transitions.h
+7 -1
View File
@@ -3,8 +3,14 @@
#include "global.h"
#include "roomid.h"
typedef enum {
WARP_TYPE_0,
WARP_TYPE_1,
WARP_TYPE_END_OF_LIST = -1,
} WarpType;
typedef struct Transition {
u8 warp_type;
WarpType warp_type : 8;
u8 subtype;
u16 startX;
u16 startY;