mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-11 03:39:59 +00:00
Resolve last NON_MATCHING in Oceff_Storm (#139)
This commit is contained in:
parent
d35a47e044
commit
461525b40c
3 changed files with 2 additions and 19 deletions
|
@ -1,11 +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 purposee registers
|
||||
|
||||
.section .rodata
|
||||
glabel D_80BA8CA0
|
||||
|
||||
.incbin "baserom/ovl_Oceff_Storm", 0x1BC0, 0x000000F0
|
2
spec
2
spec
|
@ -3812,7 +3812,7 @@ endseg
|
|||
beginseg
|
||||
name "ovl_Oceff_Storm"
|
||||
include "build/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.o"
|
||||
include "build/data/overlays/actors/z_oceff_storm.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
|
@ -68,8 +68,6 @@ void OceffStorm_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
|||
}
|
||||
}
|
||||
|
||||
// very close from matching, single regalloc difference
|
||||
#ifdef NON_MATCHING
|
||||
void OceffStorm_DefaultAction(OceffStorm* this, GlobalContext* globalCtx) {
|
||||
if (this->counter < 20) {
|
||||
this->primColorAlpha = (s8)(this->counter * 5.0f);
|
||||
|
@ -97,10 +95,9 @@ void OceffStorm_DefaultAction(OceffStorm* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
if (this->counter > 60) {
|
||||
f32 f = this->actor.posRot.pos.y + (this->posYOff * 0.1f);
|
||||
this->actor.posRot.pos.y += this->posYOff * 0.01f;
|
||||
this->posYOff += this->posYOffAdd;
|
||||
this->posYOffAdd += 10;
|
||||
this->actor.posRot.pos.y = f;
|
||||
}
|
||||
|
||||
if (this->counter < 100) {
|
||||
|
@ -109,9 +106,6 @@ void OceffStorm_DefaultAction(OceffStorm* this, GlobalContext* globalCtx) {
|
|||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_DefaultAction.s")
|
||||
#endif
|
||||
|
||||
void OceffStorm_UnkAction(OceffStorm* this, GlobalContext* globalCtx) {
|
||||
if (this->primColorAlpha < 100) {
|
||||
|
|
Loading…
Reference in a new issue