falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace ScreenTransitionData with Transition 

the struct did exist twice
This commit is contained in:
Henny022p 2025-03-03 13:27:44 +00:00
parent 58c948b8c4
commit e1f889e3cb
15 changed files with 1640 additions and 1655 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -92,7 +92,7 @@ extern u32* sub_0805F25C(u32);
extern void sub_0805F8E4(u32 r0, WStruct* r1);
extern void sub_0806D0B0(Entity*);
extern bool32 sub_080806BC(u32, u32, u32, u32);
extern void sub_0808091C(const ScreenTransitionData* screenTransition, u32 transitionType);
extern void sub_0808091C(const Transition* screenTransition, u32 transitionType);
extern void sub_080809D4(void);
extern void sub_08080CB4(Entity*);
extern u32 sub_0808288C(Entity*, u32, u32, u32);

17
include/room.h
View File

@ -4,6 +4,7 @@
#include "entity.h"
#include "droptables.h"
#include "map.h"
#include "transitions.h"
enum RoomTransition {
TRANSITION_DEFAULT,
@ -188,20 +189,6 @@ typedef struct {
static_assert(sizeof(RoomTransition) == 0xB0);
extern RoomTransition gRoomTransition;
typedef struct {
u16 type;
u8 field_0x2[4];
s16 playerXPos;
s16 playerYPos;
u8 field_0xa;
u8 area;
u8 room;
u8 playerLayer;
u8 spawn_type;
u8 playerState;
u16 transitionSFX;
} ScreenTransitionData;
typedef struct {
u8 type;
u8 localFlag;
@ -251,6 +238,6 @@ void UnloadGFXSlots(Entity*);
void LoadSmallChestTile2(TileEntity*);
void sub_0804B0B0(u32 arg0, u32 arg1);
void DoExitTransition(const ScreenTransitionData* data);
void DoExitTransition(const Transition* data);
#endif // ROOM_H

62
include/screenTransitions.h
View File

@ -3,35 +3,35 @@
#include "room.h"
extern const ScreenTransitionData* const gWallMasterScreenTransitions[];
extern const ScreenTransitionData gUnk_0813AB58;
extern const ScreenTransitionData gUnk_0813AB6C;
extern const ScreenTransitionData gUnk_0813AB80;
extern const ScreenTransitionData gUnk_0813AB94;
extern const ScreenTransitionData gUnk_0813ABA8;
extern const ScreenTransitionData gUnk_0813ABBC;
extern const ScreenTransitionData gUnk_0813ABD0;
extern const ScreenTransitionData gUnk_0813ABE4;
extern const ScreenTransitionData gUnk_0813ABF8;
extern const ScreenTransitionData gUnk_0813AC0C;
extern const ScreenTransitionData gUnk_0813AC20;
extern const ScreenTransitionData gUnk_0813AC34;
extern const ScreenTransitionData gUnk_0813AC48;
extern const ScreenTransitionData gUnk_0813AC5C;
extern const ScreenTransitionData gUnk_0813AC70;
extern const ScreenTransitionData gUnk_0813AC84;
extern const ScreenTransitionData gUnk_0813AC98;
extern const ScreenTransitionData gUnk_0813ACAC;
extern const ScreenTransitionData gUnk_0813ACC0;
extern const ScreenTransitionData gUnk_0813ACD4;
extern const ScreenTransitionData gUnk_0813ACE8;
extern const ScreenTransitionData gUnk_0813ACFC;
extern const ScreenTransitionData gUnk_0813AD10; // w
extern const ScreenTransitionData gUnk_0813AD24; // m
extern const ScreenTransitionData gUnk_0813AD38; // l
extern const ScreenTransitionData gUnk_0813AD4C;
extern const ScreenTransitionData gUnk_0813AD60;
extern const ScreenTransitionData gUnk_0813AD74;
extern const ScreenTransitionData gUnk_0813AD88[];
extern const ScreenTransitionData gUnk_0813ADEC[];
extern const Transition* const gWallMasterScreenTransitions[];
extern const Transition gUnk_0813AB58;
extern const Transition gUnk_0813AB6C;
extern const Transition gUnk_0813AB80;
extern const Transition gUnk_0813AB94;
extern const Transition gUnk_0813ABA8;
extern const Transition gUnk_0813ABBC;
extern const Transition gUnk_0813ABD0;
extern const Transition gUnk_0813ABE4;
extern const Transition gUnk_0813ABF8;
extern const Transition gUnk_0813AC0C;
extern const Transition gUnk_0813AC20;
extern const Transition gUnk_0813AC34;
extern const Transition gUnk_0813AC48;
extern const Transition gUnk_0813AC5C;
extern const Transition gUnk_0813AC70;
extern const Transition gUnk_0813AC84;
extern const Transition gUnk_0813AC98;
extern const Transition gUnk_0813ACAC;
extern const Transition gUnk_0813ACC0;
extern const Transition gUnk_0813ACD4;
extern const Transition gUnk_0813ACE8;
extern const Transition gUnk_0813ACFC;
extern const Transition gUnk_0813AD10; // w
extern const Transition gUnk_0813AD24; // m
extern const Transition gUnk_0813AD38; // l
extern const Transition gUnk_0813AD4C;
extern const Transition gUnk_0813AD60;
extern const Transition gUnk_0813AD74;
extern const Transition gUnk_0813AD88[];
extern const Transition gUnk_0813ADEC[];
#endif // SCREENTRANSITIONS_H

2
include/subtask.h
View File

@ -95,7 +95,7 @@ u32 sub_080A6F40();
s32 sub_080A69E0();
const OverworldLocation* GetOverworldLocation(u32 x, u32 y);
void sub_080A6498(void);
void sub_080A71F4(const ScreenTransitionData* exitTransition);
void sub_080A71F4(const Transition* exitTransition);
void sub_080A6F6C(u32 textIndexOrPtr);
typedef struct {

12
include/transitions.h
View File

@ -7,7 +7,9 @@
typedef enum {
WARP_TYPE_BORDER,
WARP_TYPE_AREA,
WARP_TYPE_END_OF_LIST = -1,
WARP_TYPE_UNK2,
WARP_TYPE_UNK3,
WARP_TYPE_END_OF_LIST = 0xffff,
} WarpType;
typedef enum {
@ -27,8 +29,7 @@ typedef enum {
} TransitionType;
typedef struct Transition {
WarpType warp_type : 8;
u8 subtype;
u16 warp_type; /**< @see WarpType */
u16 startX;
u16 startY;
u16 endX;
@ -36,11 +37,10 @@ typedef struct Transition {
u8 shape;
u8 area;
RoomID room : 8;
u8 height;
u8 layer;
TransitionType transition_type : 8;
u8 facing_direction; // 0-4
u8 unk0;
u8 unk1;
u16 transitionSFX;
u8 unk2;
u8 unk3;
} Transition;

102
src/data/screenTransitions.c
View File

@ -4,72 +4,72 @@
// clang-format off
const ScreenTransitionData gUnk_0813AA54 = { 1, { 0, 0, 0, 0 }, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AA68 = { 1, { 0, 0, 0, 0 }, 0xa8, 0xb8, 0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AA7C = { 1, { 0, 0, 0, 0 }, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AA90 = { 1, { 0, 0, 0, 0 }, 0x78, 0xa8, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AAA4 = { 1, { 0, 0, 0, 0 }, 0x108, 0xf8, 0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AAB8 = { 1, { 0, 0, 0, 0 }, 0x238, 0x58, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 1, 2, 6, 0 };
const ScreenTransitionData gUnk_0813AACC = { 1, { 0, 0, 0, 0 }, 0x198, 0x1d8, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AAE0 = { 1, { 0, 0, 0, 0 }, 0x88, 0x78, 0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_ENTRANCE, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AB08 = { 1, { 0, 0, 0, 0 }, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AAF4 = { 1, { 0, 0, 0, 0 }, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const Transition gUnk_0813AA54 = { WARP_TYPE_AREA, 0, 0, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const Transition gUnk_0813AA68 = { WARP_TYPE_AREA, 0, 0, 0xa8, 0xb8, 0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 1, 2, 0, 0 };
const Transition gUnk_0813AA7C = { WARP_TYPE_AREA, 0, 0, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const Transition gUnk_0813AA90 = { WARP_TYPE_AREA, 0, 0, 0x78, 0xa8, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 1, 2, 0, 0 };
const Transition gUnk_0813AAA4 = { WARP_TYPE_AREA, 0, 0, 0x108, 0xf8, 0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 1, 2, 0, 0 };
const Transition gUnk_0813AAB8 = { WARP_TYPE_AREA, 0, 0, 0x238, 0x58, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 1, 2, 6, 0 };
const Transition gUnk_0813AACC = { WARP_TYPE_AREA, 0, 0, 0x198, 0x1d8, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 2, 0, 0 };
const Transition gUnk_0813AAE0 = { WARP_TYPE_AREA, 0, 0, 0x88, 0x78, 0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_ENTRANCE, 1, 2, 0, 0 };
const Transition gUnk_0813AB08 = { WARP_TYPE_AREA, 0, 0, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const Transition gUnk_0813AAF4 = { WARP_TYPE_AREA, 0, 0, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const ScreenTransitionData* const gWallMasterScreenTransitions[] = {
const Transition* const gWallMasterScreenTransitions[] = {
&gUnk_0813AA54, &gUnk_0813AA68, &gUnk_0813AA7C, &gUnk_0813AA90, &gUnk_0813AAA4,
&gUnk_0813AAB8, &gUnk_0813AACC, &gUnk_0813AAE0, &gUnk_0813AB08, &gUnk_0813AAF4,
};
const ScreenTransitionData unusedScreenTransition = { 1, { 0, 0, 0, 0 }, 0x48, 0x68, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 2, 0 };
const Transition unusedScreenTransition = { WARP_TYPE_AREA, 0, 0, 0x48, 0x68, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 2, 0 };
const ScreenTransitionData gUnk_0813AB58 = { 1, { 0, 0, 0, 0 }, 0x108, 0xc8, 0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 2, 2, 4, 0 };
const ScreenTransitionData gUnk_0813AB6C = { 1, { 0, 0, 0, 0 }, 0x198, 0x68, 0, AREA_RUINS, ROOM_RUINS_FORTRESS_ENTRANCE, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AB80 = { 1, { 0, 0, 0, 0 }, 0xc8, 0x48, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_4, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AB94 = { 1, { 0, 0, 0, 0 }, 0xb8, 0x5c, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 1, 1, 4, 0 };
const ScreenTransitionData gUnk_0813ABA8 = { 1, { 0, 0, 0, 0 }, 0xb8, 0x78, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 1, 0, 0, 0 };
const ScreenTransitionData gUnk_0813ABBC = { 1, { 0, 0, 0, 0 }, 0xf0, 0xbc, 0, AREA_ROYAL_VALLEY, ROOM_ROYAL_VALLEY_MAIN, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ABD0 = { 1, { 0, 0, 0, 0 }, 0x1d8, 0xd8, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GYORG_TORNADO, 2, 2, 4, 0 };
const ScreenTransitionData gUnk_0813ABE4 = { 1, { 0, 0, 0, 0 }, 0x198, 0x168, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 0, 4, 0 };
const Transition gUnk_0813AB58 = { WARP_TYPE_AREA, 0, 0, 0x108, 0xc8, 0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 2, 2, 4, 0 };
const Transition gUnk_0813AB6C = { WARP_TYPE_AREA, 0, 0, 0x198, 0x68, 0, AREA_RUINS, ROOM_RUINS_FORTRESS_ENTRANCE, 1, 0, 4, 0 };
const Transition gUnk_0813AB80 = { WARP_TYPE_AREA, 0, 0, 0xc8, 0x48, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_4, 1, 0, 4, 0 };
const Transition gUnk_0813AB94 = { WARP_TYPE_AREA, 0, 0, 0xb8, 0x5c, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 1, 1, 4, 0 };
const Transition gUnk_0813ABA8 = { WARP_TYPE_AREA, 0, 0, 0xb8, 0x78, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 1, 0, 0, 0 };
const Transition gUnk_0813ABBC = { WARP_TYPE_AREA, 0, 0, 0xf0, 0xbc, 0, AREA_ROYAL_VALLEY, ROOM_ROYAL_VALLEY_MAIN, 1, 0, 4, 0 };
const Transition gUnk_0813ABD0 = { WARP_TYPE_AREA, 0, 0, 0x1d8, 0xd8, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GYORG_TORNADO, 2, 2, 4, 0 };
const Transition gUnk_0813ABE4 = { WARP_TYPE_AREA, 0, 0, 0x198, 0x168, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 0, 4, 0 };
#if defined(EU) || defined(JP)
const ScreenTransitionData gUnk_0813ABF8 = { 1, { 0, 0, 0, 0 }, 0x128, 0x1a8, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 0, 0 };
const Transition gUnk_0813ABF8 = { WARP_TYPE_AREA, 0, 0, 0x128, 0x1a8, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 0, 0 };
#else
const ScreenTransitionData gUnk_0813ABF8 = { 1, { 0, 0, 0, 0 }, 0x128, 0x1b0, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 0, 0 };
const Transition gUnk_0813ABF8 = { WARP_TYPE_AREA, 0, 0, 0x128, 0x1b0, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 0, 0 };
#endif
const ScreenTransitionData gUnk_0813AC0C = { 1, { 0, 0, 0, 0 }, 0xb0, 0xd8, 0, AREA_VAATI_2, ROOM_VAATI_2_0, 2, 0, 0, 0 };
const ScreenTransitionData gUnk_0813AC20 = { 1, { 0, 0, 0, 0 }, 0xa8, 0x78, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 1, 0, 0, 0 };
const ScreenTransitionData gUnk_0813AC34 = { 1, { 0, 0, 0, 0 }, 0xb0, 0x88, 0, AREA_VAATI_3, ROOM_VAATI_3_0, 1, 0, 0, 0 };
const ScreenTransitionData gUnk_0813AC48 = { 1, { 0, 0, 0, 0 }, 0xb0, 0x88, 0, AREA_VAATI_3, ROOM_VAATI_3_0, 1, 1, 4, 0 };
const ScreenTransitionData gUnk_0813AC5C = { 1, { 0, 0, 0, 0 }, 0xa8, 0x88, 0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN, 1, 0, 6, 0 };
const ScreenTransitionData gUnk_0813AC70 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AC84 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_2, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AC98 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACAC = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_0, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACC0 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_1, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACD4 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACE8 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_MT_CRENEL, ROOM_MT_CRENEL_TOP, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACFC = { 1, { 0, 0, 0, 0 }, 0xa8, 0x88, 0, AREA_SANCTUARY_ENTRANCE, ROOM_SANCTUARY_ENTRANCE_MAIN, 1, 0, 6, 0 };
const ScreenTransitionData gUnk_0813AD10 = { 1, { 0, 0, 0, 0 }, 0x50, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AD24 = { 1, { 0, 0, 0, 0 }, 0x50, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AD38 = { 1, { 0, 0, 0, 0 }, 0x60, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AD4C = { 1, { 0, 0, 0, 0 }, 0x78, 0x68, 0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE, 1, 0, 0, 0 };
const ScreenTransitionData gUnk_0813AD60 = { 1, { 0, 0, 0, 0 }, 0x98, 0x88, 0, AREA_SIMONS_SIMULATION, ROOM_SIMONS_SIMULATION_0, 1, 2, 4, 0 };
const ScreenTransitionData gUnk_0813AD74 = { 1, { 0, 0, 0, 0 }, 0x50, 0x48, 0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_SIMON, 1, 0, 4, 0 };
const Transition gUnk_0813AC0C = { WARP_TYPE_AREA, 0, 0, 0xb0, 0xd8, 0, AREA_VAATI_2, ROOM_VAATI_2_0, 2, 0, 0, 0 };
const Transition gUnk_0813AC20 = { WARP_TYPE_AREA, 0, 0, 0xa8, 0x78, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 1, 0, 0, 0 };
const Transition gUnk_0813AC34 = { WARP_TYPE_AREA, 0, 0, 0xb0, 0x88, 0, AREA_VAATI_3, ROOM_VAATI_3_0, 1, 0, 0, 0 };
const Transition gUnk_0813AC48 = { WARP_TYPE_AREA, 0, 0, 0xb0, 0x88, 0, AREA_VAATI_3, ROOM_VAATI_3_0, 1, 1, 4, 0 };
const Transition gUnk_0813AC5C = { WARP_TYPE_AREA, 0, 0, 0xa8, 0x88, 0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN, 1, 0, 6, 0 };
const Transition gUnk_0813AC70 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM, 1, 0, 4, 0 };
const Transition gUnk_0813AC84 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_2, 1, 0, 4, 0 };
const Transition gUnk_0813AC98 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 0, 4, 0 };
const Transition gUnk_0813ACAC = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_0, 1, 0, 4, 0 };
const Transition gUnk_0813ACC0 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_1, 1, 0, 4, 0 };
const Transition gUnk_0813ACD4 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 1, 0, 4, 0 };
const Transition gUnk_0813ACE8 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_MT_CRENEL, ROOM_MT_CRENEL_TOP, 1, 0, 4, 0 };
const Transition gUnk_0813ACFC = { WARP_TYPE_AREA, 0, 0, 0xa8, 0x88, 0, AREA_SANCTUARY_ENTRANCE, ROOM_SANCTUARY_ENTRANCE_MAIN, 1, 0, 6, 0 };
const Transition gUnk_0813AD10 = { WARP_TYPE_AREA, 0, 0, 0x50, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM, 1, 0, 4, 0 };
const Transition gUnk_0813AD24 = { WARP_TYPE_AREA, 0, 0, 0x50, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM, 1, 0, 4, 0 };
const Transition gUnk_0813AD38 = { WARP_TYPE_AREA, 0, 0, 0x60, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM, 1, 0, 4, 0 };
const Transition gUnk_0813AD4C = { WARP_TYPE_AREA, 0, 0, 0x78, 0x68, 0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE, 1, 0, 0, 0 };
const Transition gUnk_0813AD60 = { WARP_TYPE_AREA, 0, 0, 0x98, 0x88, 0, AREA_SIMONS_SIMULATION, ROOM_SIMONS_SIMULATION_0, 1, 2, 4, 0 };
const Transition gUnk_0813AD74 = { WARP_TYPE_AREA, 0, 0, 0x50, 0x48, 0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_SIMON, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AD88[] = {
{ 1, { 0, 0, 0, 0 }, 0x128, 0x188, 0, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, 9, 4, 0},
{ 1, { 0, 0, 0, 0 }, 0x190, 0x1c0, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_BOTTOMS, 1, 10, 4, 0},
{ 1, { 0, 0, 0, 0 }, 0x1e8, 0x1f0, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 1, 10, 4, 0},
{ 1, { 0, 0, 0, 0 }, 0x268, 0x58, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 1, 10, 6, 0},
const Transition gUnk_0813AD88[] = {
{ WARP_TYPE_AREA, 0, 0, 0x128, 0x188, 0, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, 9, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x190, 0x1c0, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_BOTTOMS, 1, 10, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x1e8, 0x1f0, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 1, 10, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x268, 0x58, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 1, 10, 6, 0},
#if defined(EU)
{ 1, { 0, 0, 0, 0 }, 0x200, 0x350, 0, AREA_PALACE_OF_WINDS_BOSS, ROOM_PALACE_OF_WINDS_BOSS_0, 2, 10, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x200, 0x350, 0, AREA_PALACE_OF_WINDS_BOSS, ROOM_PALACE_OF_WINDS_BOSS_0, 2, 10, 4, 0},
#else
{ 1, { 0, 0, 0, 0 }, 0x200, 0x300, 0, AREA_PALACE_OF_WINDS_BOSS, ROOM_PALACE_OF_WINDS_BOSS_0, 2, 10, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x200, 0x300, 0, AREA_PALACE_OF_WINDS_BOSS, ROOM_PALACE_OF_WINDS_BOSS_0, 2, 10, 4, 0},
#endif
};
const ScreenTransitionData gUnk_0813ADEC[] = {
{ 1, { 0, 0, 0, 0 }, 0xb8, 0x58, 0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_ENTRANCE, 1, 0, 4, 0},
{ 1, { 0, 0, 0, 0 }, 0x248, 0x108, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 1, 0, 4, 0},
const Transition gUnk_0813ADEC[] = {
{ WARP_TYPE_AREA, 0, 0, 0xb8, 0x58, 0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_ENTRANCE, 1, 0, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x248, 0x108, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 1, 0, 4, 0},
};
// clang-format on

3010
src/data/transitions.c
View File

File diff suppressed because it is too large Load Diff

4
src/enemy/armos.c
View File

@ -18,7 +18,7 @@ typedef struct {
/*0x68*/ u8 unk_68[0x10];
/*0x78*/ u16 unk_78;
/*0x7a*/ u16 unk_7a;
/*0x7c*/ ScreenTransitionData* unk_7c;
/*0x7c*/ Transition* unk_7c;
/*0x80*/ u8 unk_80;
/*0x81*/ u8 unk_81;
/*0x82*/ u8 unk_82;
@ -134,7 +134,7 @@ void sub_0803026C(ArmosEntity* this) {
this->unk_84 = (0x47d >> this->unk_80) & 1;
}
if (super->type2 != 0) {
this->unk_7c = (ScreenTransitionData*)GetCurrentRoomProperty(super->type2);
this->unk_7c = (Transition*)GetCurrentRoomProperty(super->type2);
}
this->unk_81 = super->health;
sub_08030580(this);

8
src/enemy/mazaalHead.c
View File

@ -118,11 +118,11 @@ void (*const gUnk_080CED74[])(MazaalHeadEntity*) = {
sub_08034BA0,
};
const s8 gUnk_080CED84[] = { 0x0d, 0x10, -0xd, 0x10 };
const ScreenTransitionData gUnk_080CED88 = {
1, { 0, 0, 0, 0 }, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_PHASE_1, 1, 0, 0, 0
const Transition gUnk_080CED88 = {
1, 0, 0, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_PHASE_1, 1, 0, 0, 0
};
const ScreenTransitionData gUnk_080CED9C = {
1, { 0, 0, 0, 0 }, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_MAIN, 1, 0, 0, 0
const Transition gUnk_080CED9C = {
1, 0, 0, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_MAIN, 1, 0, 0, 0
};
void MazaalHead(MazaalHeadEntity* this) {

4
src/enemy/vaatiArm.c
View File

@ -185,8 +185,8 @@ const Coords gUnk_080D13D8[] = { { .HALF = { -0x60, 0x80 } }, { .HALF = { 0x60,
const u8 gUnk_080D13E0[] = { 0xc, 0xe, 0x10 };
const u8 gUnk_080D13E3[] = { 8, 9, 10, 4, 4, 5 };
const s8 gUnk_080D13E9[] = { -8, 8 };
const ScreenTransitionData gUnk_080D13EC = {
1, { 0, 0, 0, 0 }, 0x98, 0xb8, 0, AREA_VAATIS_ARMS, ROOM_VAATIS_ARMS_FIRST, 1, 0, 0, 0
const Transition gUnk_080D13EC = {
1, 0, 0, 0x98, 0xb8, 0, AREA_VAATIS_ARMS, ROOM_VAATIS_ARMS_FIRST, 1, 0, 0, 0
};
const u16 gUnk_080D1400[][5] = {
{ 0x8000, 0x7000, 0x6000, 0x5000, 0x4000 },

18
src/menu/kinstoneMenu.c
View File

@ -72,15 +72,15 @@ Subtask KinstoneMenu_Type4;
Subtask KinstoneMenu_Type5;
// Belongs to subtask2.c
const ScreenTransitionData gUnk_08128024[] = {
{ 1, { 0, 0, 0, 0 }, 0x98, 0xf8, 0, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 1, 12, 4, 0 },
{ 1, { 0, 0, 0, 0 }, 0xf8, 0xf8, 0, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 1, 12, 4, 0 },
{ 1, { 0, 0, 0, 0 }, 0x1e8, 0x1a8, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 1, 12, 4, 0 },
{ 1, { 0, 0, 0, 0 }, 0x278, 0x58, 0, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 1, 12, 4, 0 },
{ 1, { 0, 0, 0, 0 }, 0xa8, 0x1b8, 0, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, 12, 4, 0 },
{ 1, { 0, 0, 0, 0 }, 0x228, 0x398, 0, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 1, 12, 4, 0 },
{ 1, { 0, 0, 0, 0 }, 0x2c8, 0x128, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 1, 12, 4, 0 },
{ 1, { 0, 0, 0, 0 }, 0x128, 0x2a8, 0, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 1, 12, 4, 0 },
const Transition gUnk_08128024[] = {
{ 1, 0, 0, 0x98, 0xf8, 0, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 1, 12, 4, 0 },
{ 1, 0, 0, 0xf8, 0xf8, 0, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 1, 12, 4, 0 },
{ 1, 0, 0, 0x1e8, 0x1a8, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 1, 12, 4, 0 },
{ 1, 0, 0, 0x278, 0x58, 0, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 1, 12, 4, 0 },
{ 1, 0, 0, 0xa8, 0x1b8, 0, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, 12, 4, 0 },
{ 1, 0, 0, 0x228, 0x398, 0, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 1, 12, 4, 0 },
{ 1, 0, 0, 0x2c8, 0x128, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 1, 12, 4, 0 },
{ 1, 0, 0, 0x128, 0x2a8, 0, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 1, 12, 4, 0 },
};
u32 sub_080A3B48(void) {

6
src/npc/npc4E.c
View File

@ -35,7 +35,7 @@ extern void script_MinishVillageObjectRightStoneOpening; // Cutscene data type?
const Hitbox gUnk_08114154;
const InteractCollisionData gNpc4ECollisionData[];
const ScreenTransitionData* const gNpc4ETransitions[];
const Transition* const gNpc4ETransitions[];
const u8 gNpc4ETransitionTypes[];
const u16 gUnk_081141F4[];
@ -255,8 +255,8 @@ const InteractCollisionData gNpc4ECollisionData[] = { //
#endif
};
// Array of pointers to ScreenTransitionData
const ScreenTransitionData* const gNpc4ETransitions[] = { //
// Array of pointers to Transition
const Transition* const gNpc4ETransitions[] = { //
&gUnk_0813AB6C, &gUnk_0813ABBC, &gUnk_0813ABE4, &gUnk_0813ABF8, &gUnk_0813AC0C, &gUnk_0813AC20,
&gUnk_0813AC5C, &gUnk_0813AC70, &gUnk_0813AC84, &gUnk_0813AC98, &gUnk_0813ACAC, &gUnk_0813ACC0,
&gUnk_0813ACD4, &gUnk_0813ACE8, &gUnk_0813AC5C, &gUnk_0813ACFC

38
src/scroll.c
View File

@ -607,7 +607,7 @@ bool32 sub_080806BC(u32 x, u32 y, u32 param_3, u32 param_4) {
while (*(u16*)puVar3 != 0xffff) {
u32 uVar3 = *(u16*)puVar3;
if ((((1 << uVar3) & param_4) != 0) && (gUnk_0811E7AC[uVar3](puVar3, x, y, param_3))) {
DoExitTransition((const ScreenTransitionData*)puVar3);
DoExitTransition((const Transition*)puVar3);
return 1;
}
puVar3++;
@ -616,18 +616,16 @@ bool32 sub_080806BC(u32 x, u32 y, u32 param_3, u32 param_4) {
}
const Transition* sub_08080734(u32 param_1, u32 param_2) {
u32 warpType;
s32 iVar2;
u32 uVar4;
const Transition* puVar3;
const Transition* transition;
puVar3 = (gArea.pCurrentRoomInfo->exits);
uVar4 = 10;
while (*(u16*)puVar3 != 0xffff) {
if ((((1 << *(u16*)puVar3) & uVar4) != 0) && (sub_08080808(puVar3, param_1, param_2, 0))) {
return puVar3;
transition = gArea.pCurrentRoomInfo->exits;
uVar4 = 0xa;
while (*(u16*)transition != 0xffff) {
if ((((1 << *(u16*)transition) & uVar4) != 0) && sub_08080808(transition, param_1, param_2, 0)) {
return transition;
}
puVar3++;
transition++;
}
return NULL;
}
@ -697,7 +695,7 @@ bool32 sub_08080808(const Transition* param_1, u32 x, u32 y, u32 param_4) {
}
}
void DoExitTransition(const ScreenTransitionData* data) {
void DoExitTransition(const Transition* data) {
static void (*const gUnk_0811E7C4[])(s32) = {
sub_080808D8,
sub_080808E4,
@ -707,25 +705,25 @@ void DoExitTransition(const ScreenTransitionData* data) {
PlayerRoomStatus* status;
gRoomTransition.transitioningOut = 1;
status = &gRoomTransition.player_status;
if ((u16)data->playerXPos <= 0x3ff) {
status->start_pos_x = data->playerXPos;
if ((u16)data->endX <= 0x3ff) {
status->start_pos_x = data->endX;
} else {
status->start_pos_x = (gRoomControls.camera_target)->x.HALF.HI | 0x8000;
}
if ((u16)data->playerYPos <= 0x3ff) {
status->start_pos_y = data->playerYPos;
if ((u16)data->endY <= 0x3ff) {
status->start_pos_y = data->endY;
} else {
status->start_pos_y = (gRoomControls.camera_target)->y.HALF.HI | 0x8000;
}
status->area_next = data->area;
status->room_next = data->room;
status->layer = data->playerLayer;
status->spawn_type = data->spawn_type;
status->start_anim = data->playerState;
status->layer = data->layer;
status->spawn_type = data->transition_type;
status->start_anim = data->facing_direction;
if (data->transitionSFX != SFX_NONE) {
SoundReq(data->transitionSFX);
}
gUnk_0811E7C4[data->type](data->field_0xa);
gUnk_0811E7C4[data->warp_type](data->shape);
}
void sub_080808D8(s32 param_1) {
@ -748,7 +746,7 @@ void sub_08080910(s32 param_1) {
gRoomTransition.type = TRANSITION_CUT;
}
void sub_0808091C(const ScreenTransitionData* screenTransition, u32 transitionType) {
void sub_0808091C(const Transition* screenTransition, u32 transitionType) {
DoExitTransition(screenTransition);
gRoomTransition.type = transitionType;
}

2
src/subtask.c
View File

@ -188,7 +188,7 @@ void Subtask_Exit(void) {
}
// Used by Subtask_FastTravel and EnterPortalSubtask?
void sub_080A71F4(const ScreenTransitionData* exitTransition) {
void sub_080A71F4(const Transition* exitTransition) {
if (exitTransition != NULL) {
DoExitTransition(exitTransition);
}

8
src/subtask/subtaskFastTravel.c
View File

@ -17,7 +17,7 @@ void sub_080A6E70(void);
u32 sub_080A6D74(u32);
void sub_080A6EE0(u32 param_1);
extern const ScreenTransitionData gUnk_08128024[];
extern const Transition gUnk_08128024[];
void Subtask_FastTravel(void) {
FlushSprites();
@ -179,10 +179,10 @@ void sub_080A6EE0(u32 param_1) {
u32 x;
u32 y;
RoomHeader* roomHeader;
const ScreenTransitionData* ptr = &gUnk_08128024[param_1];
const Transition* ptr = &gUnk_08128024[param_1];
x = (u16)ptr->playerXPos;
y = (u16)ptr->playerYPos;
x = (u16)ptr->endX;
y = (u16)ptr->endY;
roomHeader = &gAreaRoomHeaders[ptr->area][ptr->room];
x += roomHeader->map_x;
y += roomHeader->map_y;