mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Automatically add Init data to actors (#216)
* Improve match in EnFirefly_Draw * Vestigial fishing files, add enums * Improve scripts, add ColChkInfo one * Some minor actor cleanup (static etc) * C file for Fishing, remove some local vars from variables.h * Remove comma and format * Newline * Review suggestions * Fix colchkinfoinit, add damage_table * DMG macros, format existing DamageTables * Convert preset damage tables to new format * Minor tweak to colchkinfoinit output * Manually add Fishing data and Syokudai struct vars * Automatically import data * Fix to use #if 0 * Format * Name cylinders in obj_syokudai.h * correct some ichains * Fix top-of-file comments * Redo files to include externs * Fix Fishing * #if(0) -> #if 0 * Fix mysteriously wiped actors (I blame VSCode)
This commit is contained in:
@@ -9,7 +9,15 @@ void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ArrowFire_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
// static ColliderQuadInit sQuadInit = {
|
||||
static ColliderQuadInit D_80922230 = {
|
||||
{ COLTYPE_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, OC2_TYPE_PLAYER, COLSHAPE_QUAD, },
|
||||
{ ELEMTYPE_UNK0, { 0x08000000, 0x00, 0x02 }, { 0x00000000, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_NONE, },
|
||||
{ { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
|
||||
};
|
||||
|
||||
|
||||
const ActorInit Arrow_Fire_InitVars = {
|
||||
ACTOR_ARROW_FIRE,
|
||||
ACTORCAT_ITEMACTION,
|
||||
@@ -21,7 +29,10 @@ const ActorInit Arrow_Fire_InitVars = {
|
||||
(ActorFunc)ArrowFire_Update,
|
||||
(ActorFunc)ArrowFire_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
extern ColliderQuadInit D_80922230;
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Fire_0x80920340/FireArrow_SetUpdateFunc.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ArrowIce_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Arrow_Ice_InitVars = {
|
||||
ACTOR_ARROW_ICE,
|
||||
ACTORCAT_ITEMACTION,
|
||||
@@ -21,7 +21,16 @@ const ActorInit Arrow_Ice_InitVars = {
|
||||
(ActorFunc)ArrowIce_Update,
|
||||
(ActorFunc)ArrowIce_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_809241F0[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_809241F0[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Ice_0x80922430/func_80922430.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ArrowLight_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Arrow_Light_InitVars = {
|
||||
ACTOR_ARROW_LIGHT,
|
||||
ACTORCAT_ITEMACTION,
|
||||
@@ -21,7 +21,16 @@ const ActorInit Arrow_Light_InitVars = {
|
||||
(ActorFunc)ArrowLight_Update,
|
||||
(ActorFunc)ArrowLight_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_809260A0[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_809260A0[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Arrow_Light_0x80924300/func_80924300.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgAstrBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgAstrBombwall_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgAstrBombwall_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Astr_Bombwall_InitVars = {
|
||||
ACTOR_BG_ASTR_BOMBWALL,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,37 @@ const ActorInit Bg_Astr_Bombwall_InitVars = {
|
||||
(ActorFunc)BgAstrBombwall_Update,
|
||||
(ActorFunc)BgAstrBombwall_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static ColliderTrisElementInit sTrisElementsInit[2] = {
|
||||
static ColliderTrisElementInit D_80C0A620[2] = {
|
||||
{
|
||||
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
|
||||
{ { { -70.0f, 0.0f, 3.0f }, { 70.0f, 0.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } },
|
||||
},
|
||||
{
|
||||
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
|
||||
{ { { 70.0f, 0.0f, 3.0f }, { 70.0f, 200.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } },
|
||||
},
|
||||
};
|
||||
|
||||
// static ColliderTrisInit sTrisInit = {
|
||||
static ColliderTrisInit D_80C0A698 = {
|
||||
{ COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_NONE, COLSHAPE_TRIS, },
|
||||
2, D_80C0A620, // sTrisElementsInit,
|
||||
};
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_80C0A6A8[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern ColliderTrisElementInit D_80C0A620[2];
|
||||
extern ColliderTrisInit D_80C0A698;
|
||||
extern InitChainEntry D_80C0A6A8[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C09ED0.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgBotihasira_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgBotihasira_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgBotihasira_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Botihasira_InitVars = {
|
||||
ACTOR_BG_BOTIHASIRA,
|
||||
ACTORCAT_ITEMACTION,
|
||||
@@ -21,7 +21,18 @@ const ActorInit Bg_Botihasira_InitVars = {
|
||||
(ActorFunc)BgBotihasira_Update,
|
||||
(ActorFunc)BgBotihasira_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static ColliderCylinderInit sCylinderInit = {
|
||||
static ColliderCylinderInit D_80B282F0 = {
|
||||
{ COLTYPE_METAL, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
|
||||
{ ELEMTYPE_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
|
||||
{ 27, 80, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
|
||||
extern ColliderCylinderInit D_80B282F0;
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Init.asm")
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgBreakwall_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Breakwall_InitVars = {
|
||||
ACTOR_BG_BREAKWALL,
|
||||
ACTORCAT_ITEMACTION,
|
||||
@@ -19,7 +19,19 @@ const ActorInit Bg_Breakwall_InitVars = {
|
||||
(ActorFunc)BgBreakwall_Update,
|
||||
(ActorFunc)NULL,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_808B82E0[] = {
|
||||
ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_808B82E0[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Breakwall_0x808B7360/func_808B7360.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgCraceMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgCraceMovebg_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgCraceMovebg_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Crace_Movebg_InitVars = {
|
||||
ACTOR_BG_CRACE_MOVEBG,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,8 @@ const ActorInit Bg_Crace_Movebg_InitVars = {
|
||||
(ActorFunc)BgCraceMovebg_Update,
|
||||
(ActorFunc)BgCraceMovebg_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Init.asm")
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* File: z_bg_ctower_gear.c
|
||||
* Overlay: Bg_Ctower_Gear
|
||||
* Overlay: ovl_Bg_Ctower_Gear
|
||||
* Description: Different Cogs/Organ inside Clock Tower
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* File: z_bg_ctower_rot.c
|
||||
* Overlay: ovl_Bg_CtowerRot
|
||||
* Description: Twisting path along with the Doors to Clocktower
|
||||
* Description: Twisting path along with the Doors to Clock Tower
|
||||
*/
|
||||
|
||||
#include "z_bg_ctower_rot.h"
|
||||
|
||||
@@ -8,7 +8,7 @@ void BgDanpeiMovebg_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDanpeiMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDanpeiMovebg_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Danpei_Movebg_InitVars = {
|
||||
ACTOR_BG_DANPEI_MOVEBG,
|
||||
ACTORCAT_BG,
|
||||
@@ -20,7 +20,19 @@ const ActorInit Bg_Danpei_Movebg_InitVars = {
|
||||
(ActorFunc)BgDanpeiMovebg_Update,
|
||||
(ActorFunc)NULL,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_80AF753C[] = {
|
||||
ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_80AF753C[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF6DE0.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgDblueBalance_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDblueBalance_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDblueBalance_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Dblue_Balance_InitVars = {
|
||||
ACTOR_BG_DBLUE_BALANCE,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,17 @@ const ActorInit Bg_Dblue_Balance_InitVars = {
|
||||
(ActorFunc)BgDblueBalance_Update,
|
||||
(ActorFunc)BgDblueBalance_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_80B83A98[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_80B83A98[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B823B0.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgDblueElevator_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDblueElevator_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDblueElevator_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Dblue_Elevator_InitVars = {
|
||||
ACTOR_BG_DBLUE_ELEVATOR,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,19 @@ const ActorInit Bg_Dblue_Elevator_InitVars = {
|
||||
(ActorFunc)BgDblueElevator_Update,
|
||||
(ActorFunc)BgDblueElevator_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_80B929EC[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 250, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_80B929EC[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B91F20.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgDblueMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDblueMovebg_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDblueMovebg_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Dblue_Movebg_InitVars = {
|
||||
ACTOR_BG_DBLUE_MOVEBG,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,8 @@ const ActorInit Bg_Dblue_Movebg_InitVars = {
|
||||
(ActorFunc)BgDblueMovebg_Update,
|
||||
(ActorFunc)BgDblueMovebg_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A29A80.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgDblueWaterfall_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDblueWaterfall_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDblueWaterfall_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Dblue_Waterfall_InitVars = {
|
||||
ACTOR_BG_DBLUE_WATERFALL,
|
||||
ACTORCAT_PROP,
|
||||
@@ -21,7 +21,28 @@ const ActorInit Bg_Dblue_Waterfall_InitVars = {
|
||||
(ActorFunc)BgDblueWaterfall_Update,
|
||||
(ActorFunc)BgDblueWaterfall_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static ColliderCylinderInit sCylinderInit = {
|
||||
static ColliderCylinderInit D_80B85370 = {
|
||||
{ COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_2, COLSHAPE_CYLINDER, },
|
||||
{ ELEMTYPE_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00CBFBB0, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
|
||||
{ 50, 740, -740, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_80B853A8[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern ColliderCylinderInit D_80B85370;
|
||||
extern InitChainEntry D_80B853A8[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83C80.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgDkjailIvy_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDkjailIvy_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDkjailIvy_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Dkjail_Ivy_InitVars = {
|
||||
ACTOR_BG_DKJAIL_IVY,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,28 @@ const ActorInit Bg_Dkjail_Ivy_InitVars = {
|
||||
(ActorFunc)BgDkjailIvy_Update,
|
||||
(ActorFunc)BgDkjailIvy_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static ColliderCylinderInit sCylinderInit = {
|
||||
static ColliderCylinderInit D_80ADE950 = {
|
||||
{ COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_NONE, COLSHAPE_CYLINDER, },
|
||||
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01000200, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
|
||||
{ 20, 80, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_80ADE98C[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern ColliderCylinderInit D_80ADE950;
|
||||
extern InitChainEntry D_80ADE98C[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE230.asm")
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDyYoseizo_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_Dy_Yoseizo_InitVars = {
|
||||
ACTOR_BG_DY_YOSEIZO,
|
||||
ACTORCAT_PROP,
|
||||
@@ -20,7 +20,8 @@ const ActorInit Bg_Dy_Yoseizo_InitVars = {
|
||||
(ActorFunc)BgDyYoseizo_Update,
|
||||
(ActorFunc)NULL,
|
||||
};
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Init.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgF40Block_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgF40Block_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgF40Block_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_F40_Block_InitVars = {
|
||||
ACTOR_BG_F40_BLOCK,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,19 @@ const ActorInit Bg_F40_Block_InitVars = {
|
||||
(ActorFunc)BgF40Block_Update,
|
||||
(ActorFunc)BgF40Block_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_80BC4668[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_80BC4668[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Block_0x80BC3980/func_80BC3980.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgF40Flift_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgF40Flift_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgF40Flift_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_F40_Flift_InitVars = {
|
||||
ACTOR_BG_F40_FLIFT,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,18 @@ const ActorInit Bg_F40_Flift_InitVars = {
|
||||
(ActorFunc)BgF40Flift_Update,
|
||||
(ActorFunc)BgF40Flift_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_808D7830[] = {
|
||||
ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_808D7830[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Init.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgF40Switch_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgF40Switch_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgF40Switch_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_F40_Switch_InitVars = {
|
||||
ACTOR_BG_F40_SWITCH,
|
||||
ACTORCAT_SWITCH,
|
||||
@@ -21,7 +21,19 @@ const ActorInit Bg_F40_Switch_InitVars = {
|
||||
(ActorFunc)BgF40Switch_Update,
|
||||
(ActorFunc)BgF40Switch_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_80BC4E04[] = {
|
||||
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 123, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_80BC4E04[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC47B0.asm")
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ void BgF40Swlift_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgF40Swlift_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgF40Swlift_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
#if 0
|
||||
const ActorInit Bg_F40_Swlift_InitVars = {
|
||||
ACTOR_BG_F40_SWLIFT,
|
||||
ACTORCAT_BG,
|
||||
@@ -21,7 +21,18 @@ const ActorInit Bg_F40_Swlift_InitVars = {
|
||||
(ActorFunc)BgF40Swlift_Update,
|
||||
(ActorFunc)BgF40Swlift_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
// static InitChainEntry sInitChain[] = {
|
||||
static InitChainEntry D_8096F540[] = {
|
||||
ICHAIN_F32(uncullZoneScale, 550, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE),
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
|
||||
extern InitChainEntry D_8096F540[];
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Init.asm")
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user