mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Match En actors D-G (#1889)

Browse source 
* Match entity actors D-G

* Remove SET_EN_GOROIWA_SPEED

* Actually match z_en_elf.c

* GET_EN_GOROIWA_SPEED -> EN_GOROIWA_SPEED
This commit is contained in:
cadmic 2024-02-26 18:55:30 -08:00 • committed by GitHub
parent c86bf5011b
commit 1da87b1e7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 160 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -808,7 +808,6 @@ void func_80A03AB0(EnElf* this, PlayState* play) {
void EnElf_UpdateLights(EnElf* this, PlayState* play) {
s16 glowLightRadius;
Player* player;
glowLightRadius = 100;
@ -817,7 +816,8 @@ void EnElf_UpdateLights(EnElf* this, PlayState* play) {
}
if (this->fairyFlags & 0x20) {
player = GET_PLAYER(play);
Player* player = GET_PLAYER(play);
Lights_PointNoGlowSetInfo(&this->lightInfoNoGlow, player->actor.world.pos.x,
(s16)(player->actor.world.pos.y) + 60.0f, player->actor.world.pos.z, 255, 255, 255,
200);
@ -1379,9 +1379,15 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
if (player->naviTextId == 0) {
if (player->unk_664 == NULL) {
#if OOT_DEBUG
if (((gSaveContext.save.info.playerData.naviTimer >= 600) &&
(gSaveContext.save.info.playerData.naviTimer <= 3000)) ||
(nREG(89) != 0)) {
(nREG(89) != 0))
#else
if ((gSaveContext.save.info.playerData.naviTimer >= 600) &&
(gSaveContext.save.info.playerData.naviTimer <= 3000))
#endif
{
player->naviTextId = QuestHint_GetNaviTextId(play);
if (player->naviTextId == 0x15F) {
@ -1417,6 +1423,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
thisx->shape.rot.y = this->unk_2BC;
#if OOT_DEBUG
// `gSaveContext.save.info.sceneFlags[127].chest` (like in the debug string) instead of `HIGH_SCORE(HS_HBA)`
// matches too, but, with how the `SaveContext` struct is currently defined, it is an out-of-bounds read in the
// `sceneFlags` array. It is theorized the original `room_inf` (currently `sceneFlags`) was an array of length
@ -1426,6 +1433,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
if ((nREG(81) != 0) && (HIGH_SCORE(HS_HBA) != 0)) {
LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", HIGH_SCORE(HS_HBA), "../z_en_elf.c", 2595);
}
#endif
if (!Play_InCsMode(play)) {
if (gSaveContext.save.info.playerData.naviTimer < 25800) {
@ -1535,7 +1543,7 @@ void EnElf_Draw(Actor* thisx, PlayState* play) {
gDPSetRenderMode(dListHead++, G_RM_PASS, G_RM_ZB_CLD_SURF2);
}
gSPEndDisplayList(dListHead++);
gSPEndDisplayList(dListHead);
gDPSetEnvColor(POLY_XLU_DISP++, (u8)this->outerColor.r, (u8)this->outerColor.g, (u8)this->outerColor.b,
(u8)(envAlpha * alphaScale));
POLY_XLU_DISP = SkelAnime_Draw(play, this->skelAnime.skeleton, this->skelAnime.jointTable,