mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Match BossFd_Fly (ovl_Boss_Fd OK) (#807)

Browse source
This commit is contained in:
Roman971 2021-05-15 02:25:44 +02:00 committed by GitHub
parent 8f9881ece2
commit ee539e90bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2907 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2873
asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Fly.s
View file

File diff suppressed because it is too large Load diff

13
data/overlays/actors/z_boss_fd.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_808D1FE0
.incbin "baserom/ovl_Boss_Fd", 0x7220, 0x00000690

4
spec
View file

@ -1381,11 +1381,7 @@ endseg
beginseg beginseg
name "ovl_Boss_Fd" name "ovl_Boss_Fd"
include "build/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.o" include "build/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Boss_Fd/ovl_Boss_Fd_reloc.o" include "build/src/overlays/actors/ovl_Boss_Fd/ovl_Boss_Fd_reloc.o"
#else
include "build/data/overlays/actors/z_boss_fd.reloc.o"
#endif
endseg endseg
beginseg beginseg

25
src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
View file

@ -260,10 +260,6 @@ static Vec3f sCeilingTargets[] = {
{ 0.0f, 900.0f, 243.0f }, { -243.0f, 900.0f, 100.0f }, { -243.0, 900.0f, -100.0f }, { 0.0f, 900.0f, 243.0f }, { -243.0f, 900.0f, 100.0f }, { -243.0, 900.0f, -100.0f },
}; };
#ifdef NON_MATCHING
// Somehow doesn't use rodata value D_808D1EB4 = 0.1f. It would occur after the 85.56f float
// literal in case 6 of the boss intro switch statement but before the next switch statement.
// All instructions match.
void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) { void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) {
u8 sp1CF = false; u8 sp1CF = false;
u8 temp_rand; u8 temp_rand;
@ -280,7 +276,7 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) {
f32 temp_y; f32 temp_y;
f32 temp_x; f32 temp_x;
f32 temp_z; f32 temp_z;
s32 pad19C; f32 temp;
SkelAnime_Update(&this->skelAnimeHead); SkelAnime_Update(&this->skelAnimeHead);
SkelAnime_Update(&this->skelAnimeRightArm); SkelAnime_Update(&this->skelAnimeRightArm);
@ -483,7 +479,13 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) {
this->camData.atVel.y = 85.56f; this->camData.atVel.y = 85.56f;
this->camData.atVel.z = 25.0f; this->camData.atVel.z = 25.0f;
} else { } else {
Math_ApproachF(&this->camData.shake, 2.0f, 1.0f, 0.1 * 0.08f); // the following `temp` stuff is probably fake but is required to match
// it's optimized to 1.0f because sp1CF is false at this point, but the 0.1f ends up in rodata
temp = 0.1f;
if (!sp1CF) {
temp = 1.0f;
}
Math_ApproachF(&this->camData.shake, 2.0f, temp, 0.1 * 0.08f);
this->camData.yMod = Math_CosS(this->work[BFD_MOVE_TIMER] * 0x8000) * this->camData.shake; this->camData.yMod = Math_CosS(this->work[BFD_MOVE_TIMER] * 0x8000) * this->camData.shake;
} }
if (this->timers[3] == 160) { if (this->timers[3] == 160) {
@ -1022,17 +1024,6 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) {
} }
} }
} }
#else
static Vec3f D_808D19E0 = { 0.0f, 0.0f, 0.0f };
static Vec3f D_808D19EC = { 0.0f, 0.03f, 0.0f };
static Vec3f D_808D19F8 = { 0.0f, 0.0f, 0.0f };
static Vec3f D_808D1A04 = { 0.0f, 0.0f, 0.0f };
static Vec3f D_808D1A10 = { 0.0f, 0.0f, 0.0f };
static Vec3f D_808D1A1C = { 0.0f, 0.03f, 0.0f };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Fly.s")
#endif
void BossFd_Wait(BossFd* this, GlobalContext* globalCtx) { void BossFd_Wait(BossFd* this, GlobalContext* globalCtx) {
if (this->handoffSignal == FD2_SIGNAL_FLY) { // Set by BossFd2 if (this->handoffSignal == FD2_SIGNAL_FLY) { // Set by BossFd2