mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-26 23:37:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

[n64-jp-1.1] Boss03 (#1872)

Browse Source 
* [n64-jp-1.1] Boss03

* PR suggestions
This commit is contained in:
Derek Hensley
2026-08-25 19:56:01 -07:00
committed by GitHub
parent f30be363ec
commit 0b4547d329
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Boss_03/z_boss_03.c
+26 -6
View File
@@ -50,6 +50,7 @@
*/
#include "z_boss_03.h"
#include "vt.h"
#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
#include "overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h"
#include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
@@ -480,6 +481,12 @@ void Boss03_Init(Actor* thisx, PlayState* play2) {
return;
}
PRINTF(VT_FGCOL(CYAN) T(" ☆ ボス１発生 ☆ \n", " ☆ Boss 1 appears ☆ \n") VT_RST);
#if MM_VERSION < N64_US
if (1) {}
#endif
this->actor.world.pos = sGyorgInitialPos;
// Since Boss03_RandZeroOne is only used on this Init function, the resulting values end up being deterministic
@@ -622,12 +629,19 @@ void func_809E34B8(Boss03* this, PlayState* play) {
// Player is above water && Player is standing on ground
if ((this->waterHeight < player->actor.world.pos.y) && (player->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
Boss03_SetupPrepareCharge(this, play);
} else if ((player->transformation != PLAYER_FORM_GORON) && (player->transformation != PLAYER_FORM_DEKU)) {
if (KREG(70) == 0) {
Boss03_SetupChasePlayer(this, play);
} else if (this->numSpawnedSmallFish <= 0) {
Boss03_SetupChasePlayer(this, play);
}
return;
}
#if MM_VERSION >= N64_US
if ((player->transformation == PLAYER_FORM_GORON) || (player->transformation == PLAYER_FORM_DEKU)) {
return;
}
#endif
if (KREG(70) == 0) {
Boss03_SetupChasePlayer(this, play);
} else if (this->numSpawnedSmallFish <= 0) {
Boss03_SetupChasePlayer(this, play);
}
}
}
@@ -1956,6 +1970,12 @@ void Boss03_Update(Actor* thisx, PlayState* play2) {
s16 j;
f32 yRot;
PRINTF("FISH COUNT %d\n", this->numSpawnedSmallFish);
#if MM_VERSION < N64_US
if (1) {}
#endif
this->actor.hintId = TATL_HINT_ID_GYORG;
if (!D_809E9842 && (player->actor.world.pos.y < (PLATFORM_HEIGHT + 5.0f))) {