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

T() z_boss_mo, fix z_bg_mori_elevator

This commit is contained in:
Dragorn421 2025-05-22 15:49:17 +02:00
parent 1ad8137514
commit c1ea60e6dc
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
View File

@ -218,7 +218,6 @@ void BgMoriElevator_SetPosition(BgMoriElevator* this, PlayState* play) {
this->targetY = 233.0f; this->targetY = 233.0f;
BgMoriElevator_StopMovement(this); BgMoriElevator_StopMovement(this);
} else { } else {
// "Error:Forest Temple obj elevator Room setting is dangerous(%s %d)"
PRINTF(T("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", PRINTF(T("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n",
"Error : Forest Temple obj elevator room setting is dangerous(%s %d)\n"), "Error : Forest Temple obj elevator room setting is dangerous(%s %d)\n"),
"../z_bg_mori_elevator.c", 479); "../z_bg_mori_elevator.c", 479);

13
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View File

@ -26,6 +26,7 @@
#include "sfx.h" #include "sfx.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64audio.h" #include "z64audio.h"
#include "z64effect.h" #include "z64effect.h"
@ -1785,20 +1786,17 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
} }
if (this->coreCollider.base.acFlags & AC_HIT) { if (this->coreCollider.base.acFlags & AC_HIT) {
ColliderElement* acHitElem = this->coreCollider.elem.acHitElem; ColliderElement* acHitElem = this->coreCollider.elem.acHitElem;
// "hit!!" PRINTF(T("Core_Damage_check 当り！！\n", "Core_Damage_check hit!!\n"));
PRINTF("Core_Damage_check 当り！！\n");
this->coreCollider.base.acFlags &= ~AC_HIT; this->coreCollider.base.acFlags &= ~AC_HIT;
if ((acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) { if ((acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) {
this->work[MO_TENT_ACTION_STATE] = MO_CORE_RETREAT; this->work[MO_TENT_ACTION_STATE] = MO_CORE_RETREAT;
} }
// "hit 2 !!" PRINTF(T("Core_Damage_check 当り 2 ！！\n", "Core_Damage_check hit 2 !!\n"));
PRINTF("Core_Damage_check 当り 2 ！！\n");
if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_UNDERWATER) && (this->work[MO_TENT_INVINC_TIMER] == 0)) { if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_UNDERWATER) && (this->work[MO_TENT_INVINC_TIMER] == 0)) {
u8 damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); u8 damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags);
if ((damage != 0) && (this->work[MO_TENT_ACTION_STATE] < MO_CORE_ATTACK)) { if ((damage != 0) && (this->work[MO_TENT_ACTION_STATE] < MO_CORE_ATTACK)) {
// "sword hit !!" PRINTF(T("Core_Damage_check 剣 当り！！\n", "Core_Damage_check sword hit!!\n"));
PRINTF("Core_Damage_check 剣 当り！！\n");
this->work[MO_TENT_ACTION_STATE] = MO_CORE_STUNNED; this->work[MO_TENT_ACTION_STATE] = MO_CORE_STUNNED;
this->timers[0] = 25; this->timers[0] = 25;
@ -1868,8 +1866,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
} }
} }
} }
// "end !!" PRINTF(T("Core_Damage_check 終わり ！！\n", "Core_Damage_check end !!\n"));
PRINTF("Core_Damage_check 終わり ！！\n");
PRINTF_RST(); PRINTF_RST();
} }