mirror of
https://github.com/zeldaret/tww.git
synced 2026-06-08 04:07:13 -04:00
Fix obj_ebomzo regalloc, link
nice const meme
This commit is contained in:
+1
-1
@@ -1637,7 +1637,7 @@ config.libs = [
|
||||
ActorRel(Matching, "d_a_obj_dragonhead", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_obj_drift"),
|
||||
ActorRel(Matching, "d_a_obj_eayogn"),
|
||||
ActorRel(NonMatching, "d_a_obj_ebomzo"),
|
||||
ActorRel(Matching, "d_a_obj_ebomzo", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_obj_ekskz"),
|
||||
ActorRel(Equivalent, "d_a_obj_eskban", extra_cflags=['-pragma "nosyminline on"']), # weak func order
|
||||
ActorRel(Matching, "d_a_obj_ferris", extra_cflags=['-pragma "nosyminline on"']),
|
||||
|
||||
@@ -121,16 +121,10 @@ void daObjEbomzo::Act_c::init_mtx() {
|
||||
|
||||
/* 00000668-00000864 .text check__Q211daObjEbomzo5Act_cFv */
|
||||
void daObjEbomzo::Act_c::check() {
|
||||
//Nonmatching
|
||||
|
||||
fopAc_ac_c* acActor;
|
||||
cXyz diffVec;
|
||||
u8 b, g, r;
|
||||
|
||||
if (mCollider.ChkTgHit()) {
|
||||
acActor = mCollider.GetTgHitAc();
|
||||
fopAc_ac_c* acActor = mCollider.GetTgHitAc();
|
||||
if (acActor) {
|
||||
diffVec = mCollider.GetC() - acActor->current.pos;
|
||||
cXyz diffVec = mCollider.GetC() - acActor->current.pos;
|
||||
if (diffVec.abs() < 100.0f) {
|
||||
mXRotRate = 8;
|
||||
current.angle.x += mXRotRate;
|
||||
@@ -141,9 +135,9 @@ void daObjEbomzo::Act_c::check() {
|
||||
fopAcM_onSwitch(this, prm_get_swSave());
|
||||
|
||||
if (!mpParticleEmitter) {
|
||||
r = tevStr.mColorK0.r;
|
||||
g = tevStr.mColorK0.g;
|
||||
b = tevStr.mColorK0.b;
|
||||
const u8 r = tevStr.mColorK0.r;
|
||||
const u8 g = tevStr.mColorK0.g;
|
||||
const u8 b = tevStr.mColorK0.b;
|
||||
mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_828E, ¤t.pos, ¤t.angle);
|
||||
if (mpParticleEmitter) mpParticleEmitter->setGlobalPrmColor(r, g, b);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user