diff options
| author | Henny022p <info@henny022.de> | 2025-03-03 13:27:44 +0000 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2025-03-09 18:57:54 +0000 |
| commit | e1f889e3cb1aa74a377d36810c4f20b6dce7e9a4 (patch) | |
| tree | ebfb43d6678d6e197affac56ce8b28ce1613088e /src/enemy | |
| parent | 58c948b8c4734bd7735edf918cae0af39771647c (diff) | |
replace ScreenTransitionData with Transition
the struct did exist twice
Diffstat (limited to 'src/enemy')
| -rw-r--r-- | src/enemy/armos.c | 4 | ||||
| -rw-r--r-- | src/enemy/mazaalHead.c | 8 | ||||
| -rw-r--r-- | src/enemy/vaatiArm.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/enemy/armos.c b/src/enemy/armos.c index 94236dee..fcdfeb7a 100644 --- a/src/enemy/armos.c +++ b/src/enemy/armos.c @@ -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); diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c index 049b32d1..5078e29a 100644 --- a/src/enemy/mazaalHead.c +++ b/src/enemy/mazaalHead.c @@ -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) { diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c index facc5527..819decc9 100644 --- a/src/enemy/vaatiArm.c +++ b/src/enemy/vaatiArm.c @@ -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 }, |