izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

more stuff

Browse Source
This commit is contained in:
petrie911
2022-07-16 09:07:54 -05:00
parent ec5ae4f559
commit 3345717ccf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Boss_07/z_boss_07.c
+2 -3
View File
@@ -423,13 +423,13 @@ static Vec3s sRemainsEnd[REMAINS_COUNT] = {
{ -712, 0x5500, 416 },
}; // y value here is y rotation, not position
#ifdef NON_MATCHING
#ifndef NON_MATCHING
// reordering when loading Boss07_Projectile_Update
void Boss07_Init(Actor* thisx, GlobalContext* globalCtx2) {
static s16 sRemainsParams[REMAINS_COUNT] = {
MAJORA_REMAINS + REMAINS_ODOLWA,
MAJORA_REMAINS + REMAINS_GOHT,
MAJORA_REMAINS + REMAINS_GYORG,
MAJORA_REMAINS + REMAINS_GOHT,
MAJORA_REMAINS + REMAINS_TWINMOLD,
};
static EffectTireMarkInit sTopTireMarkInit = { 0, 40, { 0, 0, 15, 200 } };
@@ -485,7 +485,6 @@ void Boss07_Init(Actor* thisx, GlobalContext* globalCtx2) {
} else if (this->actor.params == MAJORA_TOP) {
this->actor.update = Boss07_Top_Update;
this->actor.draw = Boss07_Top_Draw;
Boss07_Top_SetupThrown(this, globalCtx);
this->actor.colChkInfo.damageTable = &sTopDmgTable;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, KREG(55) + 9.0f);