* omo_09

* omo_11

* part of omo

* 08/10/13

* more

* train toad rename

* hmm

* guard ai

* omo_02

* fix partner anim enum

* omo_15

* omo_12

* last omo

* pra_15

* reflections

* under 100 maps left

* cleanup floats

* horse

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-01-24 21:33:20 -05:00 committed by GitHub
parent 8b27ed01ef
commit a03510d8a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
513 changed files with 13640 additions and 4856 deletions

View File

@ -879,7 +879,7 @@ typedef struct BattleStatus {
/* 0x08E */ s8 initialEnemyCount; /* used for SP award bonus */ /* 0x08E */ s8 initialEnemyCount; /* used for SP award bonus */
/* 0x08F */ char unk_8F[1]; /* 0x08F */ char unk_8F[1];
/* 0x090 */ s16 unk_90; /* 0x090 */ s16 unk_90;
/* 0x092 */ s8 unk_92; /* 0x092 */ s8 reflectFlags;
/* 0x093 */ s8 unk_93; /* 0x093 */ s8 unk_93;
/* 0x094 */ s8 unk_94; /* 0x094 */ s8 unk_94;
/* 0x095 */ s8 unk_95; /* 0x095 */ s8 unk_95;
@ -2478,15 +2478,6 @@ typedef struct PartnerDMAData {
/* 0x10 */ s32 y; /* 0x10 */ s32 y;
} PartnerDMAData; // size = 0x14 } PartnerDMAData; // size = 0x14
typedef struct UnkOmo {
/* 0x00 */ f32 unk_00;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ s32 treeIndex;
} UnkOmo; // size = 0x18
typedef struct struct_D_802EB620 { typedef struct struct_D_802EB620 {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04; /* 0x04 */ s32 unk_04;

View File

@ -298,7 +298,7 @@
#define SetModelCustomGfx dead_SetModelCustomGfx #define SetModelCustomGfx dead_SetModelCustomGfx
#define SetCustomGfxBuilders dead_SetCustomGfxBuilders #define SetCustomGfxBuilders dead_SetCustomGfxBuilders
#define FindItem dead_FindItem #define FindItem dead_FindItem
#define func_802CDE68 dead_func_802CDE68 #define SetNpcRotationPivot dead_SetNpcRotationPivot
#define SetNpcPaletteSwapMode dead_SetNpcPaletteSwapMode #define SetNpcPaletteSwapMode dead_SetNpcPaletteSwapMode
#define SetNpcPaletteSwapping dead_SetNpcPaletteSwapping #define SetNpcPaletteSwapping dead_SetNpcPaletteSwapping
#define BindNpcAux dead_BindNpcAux #define BindNpcAux dead_BindNpcAux

View File

@ -476,7 +476,7 @@ enum Emoters {
EMOTER_NPC = 1 EMOTER_NPC = 1
}; };
enum Easings { enum EasingType {
EASING_LINEAR = 0, EASING_LINEAR = 0,
EASING_QUADRATIC_IN = 1, EASING_QUADRATIC_IN = 1,
EASING_CUBIC_IN = 2, EASING_CUBIC_IN = 2,
@ -831,6 +831,7 @@ enum SoundIDs {
SOUND_234 = 0x00000234, SOUND_234 = 0x00000234,
SOUND_23D = 0x0000023D, SOUND_23D = 0x0000023D,
SOUND_241 = 0x00000241, SOUND_241 = 0x00000241,
SOUND_245 = 0x00000245,
SOUND_246 = 0x00000246, SOUND_246 = 0x00000246,
SOUND_247 = 0x00000247, SOUND_247 = 0x00000247,
SOUND_248 = 0x00000248, SOUND_248 = 0x00000248,
@ -999,6 +1000,7 @@ enum SoundIDs {
SOUND_368 = 0x00000368, SOUND_368 = 0x00000368,
SOUND_369 = 0x00000369, SOUND_369 = 0x00000369,
SOUND_36B = 0x0000036B, SOUND_36B = 0x0000036B,
SOUND_36D = 0x0000036D,
SOUND_36E = 0x0000036E, SOUND_36E = 0x0000036E,
SOUND_36F = 0x0000036F, SOUND_36F = 0x0000036F,
SOUND_370 = 0x00000370, SOUND_370 = 0x00000370,
@ -3519,7 +3521,7 @@ enum RenderMode {
enum RenderTaskFlags { enum RenderTaskFlags {
RENDER_TASK_FLAG_ENABLED = 0x01, RENDER_TASK_FLAG_ENABLED = 0x01,
RENDER_TASK_FLAG_2 = 0x02, RENDER_TASK_FLAG_REFLECT_FLOOR = 0x02,
RENDER_TASK_FLAG_20 = 0x20, RENDER_TASK_FLAG_20 = 0x20,
}; };
@ -3642,15 +3644,15 @@ enum PartnerAnimIndices {
}; };
enum AnyPartnerAnims { enum AnyPartnerAnims {
PARTNER_ANIM_WALK = 0x101, PARTNER_ANIM_STILL = 0x101,
PARTNER_ANIM_JUMP = 0x102, PARTNER_ANIM_WALK = 0x102,
PARTNER_ANIM_FALL = 0x103, PARTNER_ANIM_JUMP = 0x103,
PARTNER_ANIM_FLY = 0x104, PARTNER_ANIM_FALL = 0x104,
PARTNER_ANIM_IDLE = 0x105, PARTNER_ANIM_FLY = 0x105,
PARTNER_ANIM_RUN = 0x106, PARTNER_ANIM_IDLE = 0x106,
PARTNER_ANIM_TALK = 0x107, PARTNER_ANIM_RUN = 0x107,
PARTNER_ANIM_HURT = 0x108, PARTNER_ANIM_TALK = 0x108,
PARTNER_ANIM_9 = 0x109, PARTNER_ANIM_HURT = 0x109,
}; };
enum EnemyAnimIndices { enum EnemyAnimIndices {
@ -4094,6 +4096,10 @@ enum BattleStatusFlags2 {
BS_FLAGS2_DROP_WHACKA_BUMP = 0x10000000, BS_FLAGS2_DROP_WHACKA_BUMP = 0x10000000,
}; };
enum BattleStatusReflectionFlags {
BS_REFLECT_FLOOR = 1,
};
enum BattleStates { enum BattleStates {
BATTLE_STATE_NEGATIVE_1 = -1, BATTLE_STATE_NEGATIVE_1 = -1,
BATTLE_STATE_0 = 0, BATTLE_STATE_0 = 0,
@ -4705,7 +4711,7 @@ enum GlobalOverrides {
GLOBAL_OVERRIDES_10 = 0x00000010, GLOBAL_OVERRIDES_10 = 0x00000010,
GLOBAL_OVERRIDES_ENABLE_TRANSITION_STENCIL = 0x00000020, GLOBAL_OVERRIDES_ENABLE_TRANSITION_STENCIL = 0x00000020,
GLOBAL_OVERRIDES_40 = 0x00000040, GLOBAL_OVERRIDES_40 = 0x00000040,
GLOBAL_OVERRIDES_80 = 0x00000080, GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION = 0x00000080,
GLOBAL_OVERRIDES_DISABLE_BATTLES = 0x00000100, GLOBAL_OVERRIDES_DISABLE_BATTLES = 0x00000100,
GLOBAL_OVERRIDES_200 = 0x00000200, GLOBAL_OVERRIDES_200 = 0x00000200,
GLOBAL_OVERRIDES_400 = 0x00000400, GLOBAL_OVERRIDES_400 = 0x00000400,

View File

@ -124,13 +124,13 @@ void update_hero_shadows(void);
void appendGfx_background_texture(void); void appendGfx_background_texture(void);
void appendGfx_enemy_actor(void*); void appendGfx_enemy_actor(void*);
void appendGfx_enemy_actor_blur(void*); void appendGfx_enemy_actor_blur(void*);
void appendGfx_enemy_actor_decorations(void*); void appendGfx_enemy_actor_reflection(void*);
void appendGfx_partner_actor(void*); void appendGfx_partner_actor(void*);
void appendGfx_partner_actor_blur(void*); void appendGfx_partner_actor_blur(void*);
void func_80257B88(void*); void appendGfx_partner_actor_reflection(void*);
void appendGfx_player_actor(void*); void appendGfx_player_actor(void*);
void appendGfx_player_actor_blur(Actor*); void appendGfx_player_actor_blur(Actor*);
void func_80258E14(void*); void appendGfx_player_actor_reflection(void*);
void func_80254610(Actor*); void func_80254610(Actor*);

View File

@ -98,17 +98,17 @@ typedef struct MobileAISettings {
/* 0x2C */ s32 unk_AI_2C; // probably a boolean for enable loitering after a wander movement /* 0x2C */ s32 unk_AI_2C; // probably a boolean for enable loitering after a wander movement
} MobileAISettings; // size = 0x30 } MobileAISettings; // size = 0x30
typedef struct StationaryAISettings { typedef struct GuardAISettings {
/* 0x00 */ f32 unk_00; // probably equivalent to alertRadius in MobileAISettings /* 0x00 */ f32 alertRadius;
/* 0x04 */ f32 unk_04; // probably equivalent to alertOffsetDist in MobileAISettings /* 0x04 */ f32 alertOffsetDist; // offset along npc->yaw of the test point for alert volume overlap, creates directionality to enemy 'sight'
/* 0x08 */ s32 playerSearchInterval; // how often to search for player (frames) /* 0x08 */ s32 playerSearchInterval; // how often to search for player (frames)
/* 0x0C */ f32 chaseSpeed; /* 0x0C */ f32 chaseSpeed;
/* 0x10 */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing /* 0x10 */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing
/* 0x14 */ s32 chaseUpdateInterval; // how often to re-run chase init and re-acquire player position (frames) /* 0x14 */ s32 chaseUpdateInterval; // how often to re-run chase init and re-acquire player position (frames)
/* 0x18 */ f32 chaseRadius; /* 0x18 */ f32 chaseRadius;
/* 0x1C */ f32 chaseOffsetDist; // offset along npc->yaw of the test point for alert volume overlap, creates directionality to enemy 'sight' /* 0x1C */ f32 chaseOffsetDist; // offset along npc->yaw of the test point for alert volume overlap, creates directionality to enemy 'sight'
/* 0x20 */ s32 unk_20; // probably equivalent to unk_AI_2C in MobileAISettings /* 0x20 */ s32 unk_AI_20; // probably equivalent to unk_AI_2C in MobileAISettings
} StationaryAISettings; // size = 0x24 } GuardAISettings; // size = 0x24
struct FireBarData; struct FireBarData;
typedef void (*FireBarCallback)(struct FireBarData*, s32); typedef void (*FireBarCallback)(struct FireBarData*, s32);

View File

@ -34,7 +34,7 @@ ApiStatus EndActorSpeech(Evt* script, s32 isInitialCall);
ApiStatus ShowBattleChoice(Evt* script, s32 isInitialCall); ApiStatus ShowBattleChoice(Evt* script, s32 isInitialCall);
ApiStatus OverrideBattleDmaDest(Evt* script, s32 isInitialCall); ApiStatus OverrideBattleDmaDest(Evt* script, s32 isInitialCall);
ApiStatus LoadBattleDmaData(Evt* script, s32 isInitialCall); ApiStatus LoadBattleDmaData(Evt* script, s32 isInitialCall);
ApiStatus func_802536A8(Evt* script, s32 isInitialCall); ApiStatus EnableBattleFloorReflections(Evt* script, s32 isInitialCall);
ApiStatus func_80253734(Evt* script, s32 isInitialCall); ApiStatus func_80253734(Evt* script, s32 isInitialCall);
ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall); ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall);
ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall); ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall);

View File

@ -46,6 +46,7 @@ ApiStatus ClearDefeatedEnemies(Evt* script, s32 isInitialCall);
ApiStatus SetEnemyFlagBits(Evt* script, s32 isInitialCall); ApiStatus SetEnemyFlagBits(Evt* script, s32 isInitialCall);
ApiStatus GetSelfAnimationFromTable(Evt* script, s32 isInitialCall); ApiStatus GetSelfAnimationFromTable(Evt* script, s32 isInitialCall);
ApiStatus SetBattleAsScripted(Evt* script, s32 isInitialCall); ApiStatus SetBattleAsScripted(Evt* script, s32 isInitialCall);
ApiStatus GetEncounterTriggerHitTier(Evt* script, s32 isInitialCall);
ApiStatus SetOwnerInstigatorValue(Evt* script, s32 isInitialCall); ApiStatus SetOwnerInstigatorValue(Evt* script, s32 isInitialCall);
ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall); ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall);
ApiStatus MakeEntity(Evt* script, s32 isInitialCall); ApiStatus MakeEntity(Evt* script, s32 isInitialCall);
@ -319,7 +320,7 @@ ApiStatus func_80045838(Evt* script, s32 isInitialCall);
ApiStatus ModifyGlobalOverrideFlags(Evt* script, s32 isInitialCall); ApiStatus ModifyGlobalOverrideFlags(Evt* script, s32 isInitialCall);
ApiStatus func_802CF56C(Evt* script, s32 isInitialCall); ApiStatus func_802CF56C(Evt* script, s32 isInitialCall);
ApiStatus func_802CA988(Evt* script, s32 isInitialCall); ApiStatus func_802CA988(Evt* script, s32 isInitialCall);
ApiStatus func_802CDE68(Evt* script, s32 isInitialCall); ApiStatus SetNpcRotationPivot(Evt* script, s32 isInitialCall);
ApiStatus SetSleepBubbleTimeLeft(Evt* script, s32 isInitialCall); ApiStatus SetSleepBubbleTimeLeft(Evt* script, s32 isInitialCall);
ApiStatus func_802D286C(Evt* script, s32 isInitialCall); ApiStatus func_802D286C(Evt* script, s32 isInitialCall);
ApiStatus func_802D2520(Evt* script, s32 isInitialCall); ApiStatus func_802D2520(Evt* script, s32 isInitialCall);

View File

@ -284,7 +284,7 @@ void btl_state_update_normal_start(void) {
battleStatus->cloudNineTurnsLeft = 0; battleStatus->cloudNineTurnsLeft = 0;
battleStatus->cloudNineDodgeChance = 0; battleStatus->cloudNineDodgeChance = 0;
battleStatus->cloudNineEffect = NULL; battleStatus->cloudNineEffect = NULL;
battleStatus->unk_92 = 0; battleStatus->reflectFlags = 0;
battleStatus->turboChargeTurnsLeft = 0; battleStatus->turboChargeTurnsLeft = 0;
battleStatus->turboChargeAmount = 0; battleStatus->turboChargeAmount = 0;
battleStatus->unk_8C = 0; battleStatus->unk_8C = 0;

View File

@ -162,9 +162,9 @@ void initialize_battle(void) {
gBattleStatus.flags2 = 0; gBattleStatus.flags2 = 0;
gBattleStatus.flags1 = 0; gBattleStatus.flags1 = 0;
bSavedOverrideFlags = gOverrideFlags; bSavedOverrideFlags = gOverrideFlags;
gOverrideFlags &= ~GLOBAL_OVERRIDES_80; gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
gBattleStatus.inputBitmask = -1; gBattleStatus.inputBitmask = -1;
gOverrideFlags &= ~GLOBAL_OVERRIDES_80; gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
battleStatus->pushInputBuffer[i] = 0; // @bug? why just 16 battleStatus->pushInputBuffer[i] = 0; // @bug? why just 16
@ -648,9 +648,9 @@ void btl_render_actors(void) {
queue_render_task(renderTaskPtr); queue_render_task(renderTaskPtr);
} }
if (battleStatus->unk_92 & 1) { if (battleStatus->reflectFlags & BS_REFLECT_FLOOR) {
renderTaskPtr->appendGfxArg = actor; renderTaskPtr->appendGfxArg = actor;
renderTaskPtr->appendGfx = appendGfx_enemy_actor_decorations; renderTaskPtr->appendGfx = appendGfx_enemy_actor_reflection;
renderTaskPtr->distance = actor->currentPos.z; renderTaskPtr->distance = actor->currentPos.z;
renderTaskPtr->renderMode = actor->renderMode; renderTaskPtr->renderMode = actor->renderMode;
queue_render_task(renderTaskPtr); queue_render_task(renderTaskPtr);
@ -674,9 +674,9 @@ void btl_render_actors(void) {
queue_render_task(renderTaskPtr); queue_render_task(renderTaskPtr);
} }
if (battleStatus->unk_92 & 1) { if (battleStatus->reflectFlags & BS_REFLECT_FLOOR) {
renderTaskPtr->appendGfxArg = NULL; renderTaskPtr->appendGfxArg = NULL;
renderTaskPtr->appendGfx = func_80257B88; renderTaskPtr->appendGfx = appendGfx_partner_actor_reflection;
renderTaskPtr->distance = actor->currentPos.z; renderTaskPtr->distance = actor->currentPos.z;
renderTaskPtr->renderMode = actor->renderMode; renderTaskPtr->renderMode = actor->renderMode;
queue_render_task(renderTaskPtr); queue_render_task(renderTaskPtr);
@ -699,9 +699,9 @@ void btl_render_actors(void) {
queue_render_task(renderTaskPtr); queue_render_task(renderTaskPtr);
} }
if (battleStatus->unk_92 & 1) { if (battleStatus->reflectFlags & BS_REFLECT_FLOOR) {
renderTaskPtr->appendGfxArg = NULL; renderTaskPtr->appendGfxArg = NULL;
renderTaskPtr->appendGfx = func_80258E14; renderTaskPtr->appendGfx = appendGfx_player_actor_reflection;
renderTaskPtr->distance = actor->currentPos.z; renderTaskPtr->distance = actor->currentPos.z;
renderTaskPtr->renderMode = actor->renderMode; renderTaskPtr->renderMode = actor->renderMode;
queue_render_task(renderTaskPtr); queue_render_task(renderTaskPtr);
@ -1092,10 +1092,10 @@ void btl_restore_world_cameras(void) {
playerStatus->position.y = D_8029EFB4; playerStatus->position.y = D_8029EFB4;
playerStatus->position.z = D_8029EFB8; playerStatus->position.z = D_8029EFB8;
if (bSavedOverrideFlags & GLOBAL_OVERRIDES_80) { if (bSavedOverrideFlags & GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION) {
gOverrideFlags |= GLOBAL_OVERRIDES_80; gOverrideFlags |= GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
} else { } else {
gOverrideFlags &= ~GLOBAL_OVERRIDES_80; gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
} }
if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) { if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) {

View File

@ -324,16 +324,16 @@ ApiStatus LoadBattleDmaData(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
ApiStatus func_802536A8(Evt* script, s32 isInitialCall) { ApiStatus EnableBattleFloorReflections(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus; BattleStatus* battleStatus = &gBattleStatus;
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (evt_get_variable(script, *args++) != 0) { if (evt_get_variable(script, *args++)) {
battleStatus->unk_92 |= 1; battleStatus->reflectFlags |= BS_REFLECT_FLOOR;
gOverrideFlags |= GLOBAL_OVERRIDES_80; gOverrideFlags |= GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
} else { } else {
battleStatus->unk_92 &= ~1; battleStatus->reflectFlags &= ~BS_REFLECT_FLOOR;
gOverrideFlags &= ~GLOBAL_OVERRIDES_80; gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION;
} }
return ApiStatus_DONE2; return ApiStatus_DONE2;

View File

@ -1283,13 +1283,13 @@ void appendGfx_partner_actor(void* data) {
appendGfx_npc_actor(TRUE, (s32) data); appendGfx_npc_actor(TRUE, (s32) data);
} }
void appendGfx_enemy_actor_decorations(void* data) { void appendGfx_enemy_actor_reflection(void* data) {
Actor* actor = data; Actor* actor = data;
func_802571F0(0, actor); func_802571F0(0, actor);
} }
void func_80257B88(void* data) { void appendGfx_partner_actor_reflection(void* data) {
func_802571F0(1, gBattleStatus.partnerActor); func_802571F0(1, gBattleStatus.partnerActor);
} }
@ -1791,7 +1791,7 @@ end:
_add_part_decoration(playerParts); _add_part_decoration(playerParts);
} }
void func_80258E14(void* arg0) { void appendGfx_player_actor_reflection(void* arg0) {
Matrix4f mtxRotX, mtxRotY, mtxRotZ, mtxRotation, mtxScale; Matrix4f mtxRotX, mtxRotY, mtxRotZ, mtxRotation, mtxScale;
Matrix4f mtxPivotOn, mtxPivotOff, mtxTranslate; Matrix4f mtxPivotOn, mtxPivotOff, mtxTranslate;
Matrix4f mtxTemp, mtxTransform, mtxMirror; Matrix4f mtxTemp, mtxTransform, mtxMirror;

View File

@ -693,7 +693,7 @@ EvtScript D_802975C8 = {
EVT_END_LOOP EVT_END_LOOP
EVT_WAIT(45) EVT_WAIT(45)
EVT_LOOP(5) EVT_LOOP(5)
EVT_SUBF(LVar0, EVT_FLOAT(0.220703125)) EVT_SUBF(LVar0, EVT_FLOAT(0.22))
EVT_ADDF(LVar1, EVT_FLOAT(0.2)) EVT_ADDF(LVar1, EVT_FLOAT(0.2))
EVT_CALL(SetActorScale, ACTOR_PARTNER, LVar0, LVar1, EVT_FLOAT(1.0)) EVT_CALL(SetActorScale, ACTOR_PARTNER, LVar0, LVar1, EVT_FLOAT(1.0))
EVT_WAIT(1) EVT_WAIT(1)
@ -912,7 +912,7 @@ EvtScript D_80298374 = {
EVT_END_LOOP EVT_END_LOOP
EVT_WAIT(45) EVT_WAIT(45)
EVT_LOOP(5) EVT_LOOP(5)
EVT_SUBF(LVar0, EVT_FLOAT(0.220703125)) EVT_SUBF(LVar0, EVT_FLOAT(0.22))
EVT_ADDF(LVar1, EVT_FLOAT(0.2)) EVT_ADDF(LVar1, EVT_FLOAT(0.2))
EVT_CALL(SetActorScale, ACTOR_PLAYER, LVar0, LVar1, EVT_FLOAT(1.0)) EVT_CALL(SetActorScale, ACTOR_PLAYER, LVar0, LVar1, EVT_FLOAT(1.0))
EVT_WAIT(1) EVT_WAIT(1)

View File

@ -1535,7 +1535,7 @@ void draw_item_entities(void) {
rtPtr->distance = 0; rtPtr->distance = 0;
retTask = queue_render_task(rtPtr); retTask = queue_render_task(rtPtr);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
do {} while (0); // required to match do {} while (0); // required to match

View File

@ -6144,7 +6144,7 @@ void execute_render_tasks(void) {
D_8014B7F0 = taskCount; D_8014B7F0 = taskCount;
taskList = mdl_renderTaskLists[mdl_renderTaskQueueIdx]; taskList = mdl_renderTaskLists[mdl_renderTaskQueueIdx];
if (gOverrideFlags & GLOBAL_OVERRIDES_80) { if (gOverrideFlags & GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION) {
Mtx* dispMtx; Mtx* dispMtx;
Gfx* savedGfxPos = NULL; Gfx* savedGfxPos = NULL;
@ -6155,13 +6155,13 @@ void execute_render_tasks(void) {
task = &taskList[sorted[i]]; task = &taskList[sorted[i]];
appendGfx = task->appendGfx; appendGfx = task->appendGfx;
if (task->renderMode & RENDER_TASK_FLAG_2) { if (task->renderMode & RENDER_TASK_FLAG_REFLECT_FLOOR) {
savedGfxPos = gMasterGfxPos++; savedGfxPos = gMasterGfxPos++;
} }
appendGfx(task->appendGfxArg); appendGfx(task->appendGfxArg);
if (task->renderMode & RENDER_TASK_FLAG_2) { if (task->renderMode & RENDER_TASK_FLAG_REFLECT_FLOOR) {
gSPEndDisplayList(gMasterGfxPos++); gSPEndDisplayList(gMasterGfxPos++);
gSPBranchList(savedGfxPos, gMasterGfxPos); gSPBranchList(savedGfxPos, gMasterGfxPos);
gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1);

View File

@ -56,10 +56,10 @@ EvtScript N(80232C48) = {
EVT_MULF(LVar6, EVT_FLOAT(1.01)) EVT_MULF(LVar6, EVT_FLOAT(1.01))
EVT_ADDF(LVar7, EVT_FLOAT(0.01)) EVT_ADDF(LVar7, EVT_FLOAT(0.01))
EVT_SETF(LVar8, LVar6) EVT_SETF(LVar8, LVar6)
EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 15, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0)
EVT_ADDF(LVar8, LVarA) EVT_ADDF(LVar8, LVarA)
EVT_SETF(LVar9, LVar7) EVT_SETF(LVar9, LVar7)
EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 20, 0, 90) EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90)
EVT_ADDF(LVar9, LVarA) EVT_ADDF(LVar9, LVarA)
EVT_SETF(LVarA, LVar0) EVT_SETF(LVarA, LVar0)
EVT_MULF(LVarA, EVT_FLOAT(10.0)) EVT_MULF(LVarA, EVT_FLOAT(10.0))
@ -155,8 +155,8 @@ EvtScript N(beforeBattle) = {
EVT_DIVF(LVar3, EVT_FLOAT(200.0)) EVT_DIVF(LVar3, EVT_FLOAT(200.0))
EVT_SETF(LVar4, EVT_FLOAT(1.0)) EVT_SETF(LVar4, EVT_FLOAT(1.0))
EVT_SETF(LVar5, 0) EVT_SETF(LVar5, 0)
EVT_SETF(LVar6, EVT_FLOAT(0.296875)) EVT_SETF(LVar6, EVT_FLOAT(0.296))
EVT_SETF(LVar7, EVT_FLOAT(0.296875)) EVT_SETF(LVar7, EVT_FLOAT(0.296))
EVT_SET(LVarF, LVarE) EVT_SET(LVarF, LVarE)
EVT_ADD(LVarF, 10000) EVT_ADD(LVarF, 10000)
EVT_EXEC(N(80232C48)) EVT_EXEC(N(80232C48))

View File

@ -10,8 +10,8 @@ EvtScript N(80233470) = {
EVT_SET(LVarA, LVar0) EVT_SET(LVarA, LVar0)
EVT_SET(LVarF, 0) EVT_SET(LVarF, 0)
EVT_LOOP(0) EVT_LOOP(0)
EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0)
EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0)
EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1) EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1)
EVT_ADD(LVarF, 1) EVT_ADD(LVarF, 1)
EVT_IF_GE(LVarF, 30) EVT_IF_GE(LVarF, 30)

View File

@ -2489,8 +2489,8 @@ EvtScript N(attackDirectLightning) = {
EVT_ADD(LVar5, 1) EVT_ADD(LVar5, 1)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar6) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar6)
EVT_SETF(LVar7, EVT_FLOAT(0.7255859375)) EVT_SETF(LVar7, EVT_FLOAT(0.725))
EVT_SETF(LVar8, EVT_FLOAT(0.2421875)) EVT_SETF(LVar8, EVT_FLOAT(0.242))
EVT_MULF(LVar7, LVar6) EVT_MULF(LVar7, LVar6)
EVT_MULF(LVar8, LVar6) EVT_MULF(LVar8, LVar6)
EVT_SUBF(LVar0, LVar7) EVT_SUBF(LVar0, LVar7)
@ -2539,8 +2539,8 @@ EvtScript N(attackDirectLightning) = {
EVT_ADD(LVar5, 1) EVT_ADD(LVar5, 1)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar6) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar6)
EVT_SETF(LVar7, EVT_FLOAT(0.7255859375)) EVT_SETF(LVar7, EVT_FLOAT(0.725))
EVT_SETF(LVar8, EVT_FLOAT(0.2421875)) EVT_SETF(LVar8, EVT_FLOAT(0.242))
EVT_MULF(LVar7, LVar6) EVT_MULF(LVar7, LVar6)
EVT_MULF(LVar8, LVar6) EVT_MULF(LVar8, LVar6)
EVT_SUBF(LVar0, LVar7) EVT_SUBF(LVar0, LVar7)

View File

@ -56,10 +56,10 @@ EvtScript N(80232C48) = {
EVT_MULF(LVar6, EVT_FLOAT(1.01)) EVT_MULF(LVar6, EVT_FLOAT(1.01))
EVT_ADDF(LVar7, EVT_FLOAT(0.01)) EVT_ADDF(LVar7, EVT_FLOAT(0.01))
EVT_SETF(LVar8, LVar6) EVT_SETF(LVar8, LVar6)
EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 15, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0)
EVT_ADDF(LVar8, LVarA) EVT_ADDF(LVar8, LVarA)
EVT_SETF(LVar9, LVar7) EVT_SETF(LVar9, LVar7)
EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 20, 0, 90) EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90)
EVT_ADDF(LVar9, LVarA) EVT_ADDF(LVar9, LVarA)
EVT_SETF(LVarA, LVar0) EVT_SETF(LVarA, LVar0)
EVT_MULF(LVarA, EVT_FLOAT(10.0)) EVT_MULF(LVarA, EVT_FLOAT(10.0))
@ -155,8 +155,8 @@ EvtScript N(beforeBattle) = {
EVT_DIVF(LVar3, EVT_FLOAT(200.0)) EVT_DIVF(LVar3, EVT_FLOAT(200.0))
EVT_SETF(LVar4, EVT_FLOAT(1.0)) EVT_SETF(LVar4, EVT_FLOAT(1.0))
EVT_SETF(LVar5, 0) EVT_SETF(LVar5, 0)
EVT_SETF(LVar6, EVT_FLOAT(0.296875)) EVT_SETF(LVar6, EVT_FLOAT(0.296))
EVT_SETF(LVar7, EVT_FLOAT(0.296875)) EVT_SETF(LVar7, EVT_FLOAT(0.296))
EVT_SET(LVarF, LVarE) EVT_SET(LVarF, LVarE)
EVT_ADD(LVarF, 10000) EVT_ADD(LVarF, 10000)
EVT_EXEC(N(80232C48)) EVT_EXEC(N(80232C48))

View File

@ -10,8 +10,8 @@ EvtScript N(80233470) = {
EVT_SET(LVarA, LVar0) EVT_SET(LVarA, LVar0)
EVT_SET(LVarF, 0) EVT_SET(LVarF, 0)
EVT_LOOP(0) EVT_LOOP(0)
EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0)
EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0)
EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1) EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1)
EVT_ADD(LVarF, 1) EVT_ADD(LVarF, 1)
EVT_IF_GE(LVarF, 30) EVT_IF_GE(LVarF, 30)

View File

@ -762,7 +762,7 @@ EvtScript N(healOne) = {
EVT_SUB(LVar0, 6) EVT_SUB(LVar0, 6)
EVT_ADD(LVar1, 12) EVT_ADD(LVar1, 12)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 16) EVT_SUB(LVar0, 16)
EVT_ADD(LVar1, 31) EVT_ADD(LVar1, 31)
@ -776,7 +776,7 @@ EvtScript N(healOne) = {
EVT_SUB(LVar0, 12) EVT_SUB(LVar0, 12)
EVT_ADD(LVar1, 14) EVT_ADD(LVar1, 14)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 30) EVT_SUB(LVar0, 30)
EVT_ADD(LVar1, 36) EVT_ADD(LVar1, 36)
@ -842,7 +842,7 @@ EvtScript N(healAll) = {
EVT_SUB(LVar0, 6) EVT_SUB(LVar0, 6)
EVT_ADD(LVar1, 12) EVT_ADD(LVar1, 12)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 16) EVT_SUB(LVar0, 16)
EVT_ADD(LVar1, 31) EVT_ADD(LVar1, 31)
@ -856,7 +856,7 @@ EvtScript N(healAll) = {
EVT_SUB(LVar0, 12) EVT_SUB(LVar0, 12)
EVT_ADD(LVar1, 14) EVT_ADD(LVar1, 14)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 30) EVT_SUB(LVar0, 30)
EVT_ADD(LVar1, 36) EVT_ADD(LVar1, 36)
@ -1513,7 +1513,7 @@ EvtScript N(boostAttack) = {
EVT_SUB(LVar0, 6) EVT_SUB(LVar0, 6)
EVT_ADD(LVar1, 12) EVT_ADD(LVar1, 12)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 16) EVT_SUB(LVar0, 16)
EVT_ADD(LVar1, 31) EVT_ADD(LVar1, 31)
@ -1527,7 +1527,7 @@ EvtScript N(boostAttack) = {
EVT_SUB(LVar0, 12) EVT_SUB(LVar0, 12)
EVT_ADD(LVar1, 14) EVT_ADD(LVar1, 14)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 30) EVT_SUB(LVar0, 30)
EVT_ADD(LVar1, 36) EVT_ADD(LVar1, 36)
@ -1625,7 +1625,7 @@ EvtScript N(boostDefense) = {
EVT_SUB(LVar0, 6) EVT_SUB(LVar0, 6)
EVT_ADD(LVar1, 12) EVT_ADD(LVar1, 12)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 16) EVT_SUB(LVar0, 16)
EVT_ADD(LVar1, 31) EVT_ADD(LVar1, 31)
@ -1639,7 +1639,7 @@ EvtScript N(boostDefense) = {
EVT_SUB(LVar0, 12) EVT_SUB(LVar0, 12)
EVT_ADD(LVar1, 14) EVT_ADD(LVar1, 14)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 30) EVT_SUB(LVar0, 30)
EVT_ADD(LVar1, 36) EVT_ADD(LVar1, 36)
@ -1737,7 +1737,7 @@ EvtScript N(electrify) = {
EVT_SUB(LVar0, 6) EVT_SUB(LVar0, 6)
EVT_ADD(LVar1, 12) EVT_ADD(LVar1, 12)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 16) EVT_SUB(LVar0, 16)
EVT_ADD(LVar1, 31) EVT_ADD(LVar1, 31)
@ -1751,7 +1751,7 @@ EvtScript N(electrify) = {
EVT_SUB(LVar0, 12) EVT_SUB(LVar0, 12)
EVT_ADD(LVar1, 14) EVT_ADD(LVar1, 14)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 30) EVT_SUB(LVar0, 30)
EVT_ADD(LVar1, 36) EVT_ADD(LVar1, 36)
@ -1854,7 +1854,7 @@ EvtScript N(vanish) = {
EVT_SUB(LVar0, 6) EVT_SUB(LVar0, 6)
EVT_ADD(LVar1, 12) EVT_ADD(LVar1, 12)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 16) EVT_SUB(LVar0, 16)
EVT_ADD(LVar1, 31) EVT_ADD(LVar1, 31)
@ -1868,7 +1868,7 @@ EvtScript N(vanish) = {
EVT_SUB(LVar0, 12) EVT_SUB(LVar0, 12)
EVT_ADD(LVar1, 14) EVT_ADD(LVar1, 14)
EVT_SUB(LVar2, 2) EVT_SUB(LVar2, 2)
EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LVar0, 30) EVT_SUB(LVar0, 30)
EVT_ADD(LVar1, 36) EVT_ADD(LVar1, 36)

View File

@ -519,7 +519,7 @@ EvtScript N(8021A2E8) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim04) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim04)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 180) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 180)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.001953125)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.002))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA)
EVT_IF_FLAG(LVarA, STATUS_FLAG_SHRINK) EVT_IF_FLAG(LVarA, STATUS_FLAG_SHRINK)
@ -752,7 +752,7 @@ EvtScript N(8021B22C) = {
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim11) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim11)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.001953125)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.002))
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 30) EVT_SUB(LVar0, 30)
EVT_SET(LVar1, 0) EVT_SET(LVar1, 0)
@ -803,7 +803,7 @@ EvtScript N(8021B22C) = {
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim11) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim11)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.001953125)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.002))
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar2, 1) EVT_ADD(LVar2, 1)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)

View File

@ -447,7 +447,7 @@ EvtScript N(useStarRod) = {
EVT_THREAD EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123)
EVT_ADD(LVar2, 10) EVT_ADD(LVar2, 10)
EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.0751953125)) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.075))
EVT_END_THREAD EVT_END_THREAD
EVT_ELSE EVT_ELSE
EVT_ADD(LVar0, 9) EVT_ADD(LVar0, 9)

View File

@ -706,7 +706,7 @@ EvtScript N(useStarRod) = {
EVT_THREAD EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123)
EVT_ADD(LVar2, 10) EVT_ADD(LVar2, 10)
EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.0751953125)) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.075))
EVT_END_THREAD EVT_END_THREAD
EVT_ELSE EVT_ELSE
EVT_ADD(LVar0, 9) EVT_ADD(LVar0, 9)

View File

@ -752,42 +752,42 @@ EvtScript N(initVines) = {
EVT_CALL(N(SetVineBonePos), VINE_0, 1, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 1, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_0, 1, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 1, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 2, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 3, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 4, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 5, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 6, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 7, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 7, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 8, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 8, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2)
EVT_CALL(SetPartPos, ACTOR_ENEMY1, 1, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_ENEMY1, 1, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 8) EVT_SUB(LVar0, 8)
@ -806,32 +806,32 @@ EvtScript N(initVines) = {
EVT_CALL(N(SetVineBonePos), VINE_1, 1, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 1, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_1, 1, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 1, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 2, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 3, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 4, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 5, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 6, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2)
EVT_CALL(SetPartPos, ACTOR_ENEMY2, 1, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_ENEMY2, 1, LVar0, LVar1, LVar2)
EVT_CALL(SetPartPos, ACTOR_ENEMY2, 2, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_ENEMY2, 2, LVar0, LVar1, LVar2)
@ -849,57 +849,57 @@ EvtScript N(initVines) = {
EVT_CALL(N(SetVineBonePos), VINE_2, 1, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 1, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_2, 1, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 1, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 2, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 3, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 4, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 5, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 6, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_3, 0, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 0, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_3, 0, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 0, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_3, 1, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 1, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_3, 1, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 1, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 2, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 3, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 3, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBonePos), VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 4, LVar0, LVar1, LVar2)
EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneRot), VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 4, LVar0, LVar1, LVar2)
EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0))
EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar0)
EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar0, 0)
EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 10, LVar1, LVar2, LVar3) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 10, LVar1, LVar2, LVar3)

View File

@ -743,7 +743,7 @@ EvtScript N(8021F5F8) = {
EVT_SET(LVarB, LVarC) EVT_SET(LVarB, LVarC)
EVT_END_IF EVT_END_IF
EVT_SUB(LVarB, 20) EVT_SUB(LVarB, 20)
EVT_DIVF(LVarB, EVT_FLOAT(10.5888671875)) EVT_DIVF(LVarB, EVT_FLOAT(10.588))
EVT_ADDF(LVarB, 15) EVT_ADDF(LVarB, 15)
EVT_SET(LVarA, LVarB) EVT_SET(LVarA, LVarB)
EVT_RETURN EVT_RETURN
@ -3162,7 +3162,7 @@ EvtScript N(takeTurn_80226004) = {
EVT_IF_FLAG(LVar0, 0x80000) EVT_IF_FLAG(LVar0, 0x80000)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 4) EVT_ADD(LVar1, 4)
EVT_CALL(PlayEffect, 0x33, 8, LVar0, LVar1, LVar2, EVT_FLOAT(0.5205), LVarA, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x33, 8, LVar0, LVar1, LVar2, EVT_FLOAT(0.52), LVarA, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 12) EVT_ADD(LVar1, 12)
@ -3613,7 +3613,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.4)) EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.4))
EVT_WAIT(1) EVT_WAIT(1)
EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.55078125), EVT_FLOAT(1.55078125), EVT_FLOAT(1.55078125)) EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.55), EVT_FLOAT(1.55), EVT_FLOAT(1.55))
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_WAIT(13) EVT_WAIT(13)
EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2))

View File

@ -5,15 +5,15 @@
#define NAMESPACE b_area_mac_mac_02 #define NAMESPACE b_area_mac_mac_02
EvtScript N(beforeBattle_80232930) = { EvtScript N(beforeBattle_80232930) = {
EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_802536A8, 1) EVT_CALL(EnableBattleFloorReflections, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };
EvtScript N(afterBattle_8023297C) = { EvtScript N(afterBattle_8023297C) = {
EVT_CALL(func_802536A8, 0) EVT_CALL(EnableBattleFloorReflections, FALSE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

View File

@ -373,7 +373,7 @@ EvtScript N(slingshotAttack) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, -100, 0, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, -100, 0, 0)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0))
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.001953125)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.002))
EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1) EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1)
EVT_CALL(YieldTurn) EVT_CALL(YieldTurn)
@ -389,7 +389,7 @@ EvtScript N(slingshotAttack) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0))
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.001953125)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.002))
EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1) EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1)
EVT_WAIT(2) EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE)

View File

@ -8,7 +8,7 @@
EvtScript N(beforeBattle) = { EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_802536A8, 1) EVT_CALL(EnableBattleFloorReflections, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

View File

@ -61,7 +61,7 @@ EvtScript N(80231CFC) = {
EvtScript N(beforeBattle) = { EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_802536A8, 1) EVT_CALL(EnableBattleFloorReflections, TRUE)
EVT_SET(LVar0, 17) EVT_SET(LVar0, 17)
EVT_SET(LVar1, 0) EVT_SET(LVar1, 0)
EVT_SET(LVar2, 3000) EVT_SET(LVar2, 3000)

View File

@ -70,7 +70,7 @@ EvtScript N(beforeBattle) = {
EVT_SET(LVar2, 3000) EVT_SET(LVar2, 3000)
EVT_SET(LVar3, 0) EVT_SET(LVar3, 0)
EVT_EXEC(N(802320D0)) EVT_EXEC(N(802320D0))
EVT_CALL(func_802536A8, 1) EVT_CALL(EnableBattleFloorReflections, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

View File

@ -8,7 +8,7 @@
EvtScript N(beforeBattle) = { EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_802536A8, 1) EVT_CALL(EnableBattleFloorReflections, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

View File

@ -61,7 +61,7 @@ EvtScript N(80231CFC) = {
EvtScript N(beforeBattle) = { EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_802536A8, 1) EVT_CALL(EnableBattleFloorReflections, TRUE)
EVT_SET(LVar0, 17) EVT_SET(LVar0, 17)
EVT_SET(LVar1, 0) EVT_SET(LVar1, 0)
EVT_SET(LVar2, 3000) EVT_SET(LVar2, 3000)

View File

@ -70,7 +70,7 @@ EvtScript N(beforeBattle) = {
EVT_SET(LVar2, 3000) EVT_SET(LVar2, 3000)
EVT_SET(LVar3, 0) EVT_SET(LVar3, 0)
EVT_EXEC(N(802320D0)) EVT_EXEC(N(802320D0))
EVT_CALL(func_802536A8, 1) EVT_CALL(EnableBattleFloorReflections, TRUE)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

View File

@ -315,7 +315,7 @@ EvtScript N(goombario_8021C7FC) = {
EVT_SET(LVarB, LVarC) EVT_SET(LVarB, LVarC)
EVT_END_IF EVT_END_IF
EVT_SUB(LVarB, 20) EVT_SUB(LVarB, 20)
EVT_DIVF(LVarB, EVT_FLOAT(10.5888671875)) EVT_DIVF(LVarB, EVT_FLOAT(10.588))
EVT_ADDF(LVarB, 15) EVT_ADDF(LVarB, 15)
EVT_SET(LVarA, LVarB) EVT_SET(LVarA, LVarB)
EVT_RETURN EVT_RETURN

View File

@ -177,7 +177,7 @@ EvtScript N(main) = {
EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75))
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.5)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.5))
EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.2)) EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.2))
EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.4501953125)) EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.45))
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(GetItemPower, 200, LVar0, LVar1) EVT_CALL(GetItemPower, 200, LVar0, LVar1)
EVT_CALL(ItemDamageEnemy, LVar0, 402653698, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(ItemDamageEnemy, LVar0, 402653698, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE)

View File

@ -37,7 +37,7 @@ ApiStatus N(func_802A12C4_726224)(Evt* script, s32 isInitialCall) {
#include "UseItem.inc.c" #include "UseItem.inc.c"
EvtScript N(main) = { EvtScript N(main) = {
EVT_SET_CONST(LVarA, 0x00000091) EVT_SET_CONST(LVarA, ITEM_HUSTLE_DRINK)
EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(UseItemWithEffect))
EVT_EXEC_WAIT(N(DrinkItem)) EVT_EXEC_WAIT(N(DrinkItem))
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Squish) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Squish)

View File

@ -363,7 +363,7 @@ EvtScript N(main) = {
EVT_SET(LVar8, 0) EVT_SET(LVar8, 0)
EVT_SET(LVar9, 0) EVT_SET(LVar9, 0)
EVT_CALL(SetVirtualEntityPosition, LVarA, LVar7, LVar8, LVar9) EVT_CALL(SetVirtualEntityPosition, LVarA, LVar7, LVar8, LVar9)
EVT_CALL(SetVirtualEntityScale, LVarA, EVT_FLOAT(0.7101), EVT_FLOAT(0.7101), EVT_FLOAT(0.7101)) EVT_CALL(SetVirtualEntityScale, LVarA, EVT_FLOAT(0.711), EVT_FLOAT(0.711), EVT_FLOAT(0.711))
EVT_CALL(SetVirtualEntityMoveSpeed, LVarA, EVT_FLOAT(7.0)) EVT_CALL(SetVirtualEntityMoveSpeed, LVarA, EVT_FLOAT(7.0))
EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(1.4)) EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(1.4))
EVT_CALL(SetOwnerTarget, 0, 0) EVT_CALL(SetOwnerTarget, 0, 0)

View File

@ -63,7 +63,7 @@ EvtScript D_802A1320_765F40 = {
EVT_SET(LVar6, LVar7) EVT_SET(LVar6, LVar7)
EVT_END_IF EVT_END_IF
EVT_SUB(LVar6, 20) EVT_SUB(LVar6, 20)
EVT_DIVF(LVar6, EVT_FLOAT(10.5888671875)) EVT_DIVF(LVar6, EVT_FLOAT(10.588))
EVT_ADDF(LVar6, 15) EVT_ADDF(LVar6, 15)
EVT_SET(LVarA, LVar6) EVT_SET(LVarA, LVar6)
EVT_RETURN EVT_RETURN

View File

@ -63,7 +63,7 @@ EvtScript N(D_802A1320) = {
EVT_SET(LVar6, LVar7) EVT_SET(LVar6, LVar7)
EVT_END_IF EVT_END_IF
EVT_SUB(LVar6, 20) EVT_SUB(LVar6, 20)
EVT_DIVF(LVar6, EVT_FLOAT(10.5888671875)) EVT_DIVF(LVar6, EVT_FLOAT(10.588))
EVT_ADDF(LVar6, 15) EVT_ADDF(LVar6, 15)
EVT_SET(LVarA, LVar6) EVT_SET(LVarA, LVar6)
EVT_RETURN EVT_RETURN

View File

@ -72,7 +72,7 @@ EvtScript D_802A1370_73DBD0 = {
EVT_SET(LVar6, LVar7) EVT_SET(LVar6, LVar7)
EVT_END_IF EVT_END_IF
EVT_SUB(LVar6, 20) EVT_SUB(LVar6, 20)
EVT_DIVF(LVar6, EVT_FLOAT(10.5888671875)) EVT_DIVF(LVar6, EVT_FLOAT(10.588))
EVT_ADDF(LVar6, 15) EVT_ADDF(LVar6, 15)
EVT_SET(LVarA, LVar6) EVT_SET(LVarA, LVar6)
EVT_RETURN EVT_RETURN
@ -616,7 +616,7 @@ EvtScript D_802A3188_73F9E8 = {
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5)
EVT_SUB(LVar0, LVar3) EVT_SUB(LVar0, LVar3)
EVT_SUB(LVar0, 20) EVT_SUB(LVar0, 20)
EVT_DIVF(LVar0, EVT_FLOAT(10.5888671875)) EVT_DIVF(LVar0, EVT_FLOAT(10.588))
EVT_ADDF(LVar0, 15) EVT_ADDF(LVar0, 15)
EVT_SET(LVarA, LVar0) EVT_SET(LVarA, LVar0)
EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER)

View File

@ -675,7 +675,7 @@ EvtScript D_802A3168_0073D038 = {
EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(0.35)) EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(0.35))
EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.2)) EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.2))
EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.05)) EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.05))
EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.025390625)) EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.025))
EVT_END_CHILD_THREAD EVT_END_CHILD_THREAD
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(DidActionSucceed, LVar0) EVT_CALL(DidActionSucceed, LVar0)

View File

@ -916,7 +916,7 @@ EvtScript N(calcJumpTime) = {
EVT_SET(LVarB, LVar7) EVT_SET(LVarB, LVar7)
EVT_END_IF EVT_END_IF
EVT_SUB(LVarB, 20) EVT_SUB(LVarB, 20)
EVT_DIVF(LVarB, EVT_FLOAT(10.5888671875)) EVT_DIVF(LVarB, EVT_FLOAT(10.588))
EVT_ADDF(LVarB, 15) EVT_ADDF(LVarB, 15)
EVT_SET(LVarA, LVarB) EVT_SET(LVarA, LVarB)
EVT_RETURN EVT_RETURN

View File

@ -722,7 +722,7 @@ EvtScript N(getJumpTime) = {
EVT_SET(LVarB, LVarC) EVT_SET(LVarB, LVarC)
EVT_END_IF EVT_END_IF
EVT_SUB(LVarB, 20) EVT_SUB(LVarB, 20)
EVT_DIVF(LVarB, EVT_FLOAT(10.5888671875)) EVT_DIVF(LVarB, EVT_FLOAT(10.588))
EVT_ADDF(LVarB, 15) EVT_ADDF(LVarB, 15)
EVT_SET(LVarA, LVarB) EVT_SET(LVarA, LVarB)
EVT_RETURN EVT_RETURN

View File

@ -295,7 +295,7 @@ EvtScript N(usePower) = {
EVT_ADD(LVar1, 15) EVT_ADD(LVar1, 15)
EVT_ADD(LVar2, -5) EVT_ADD(LVar2, -5)
EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 10, 0, 10) EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 10, 0, 10)
EVT_CALL(PlaySound, 0x245) EVT_CALL(PlaySound, SOUND_245)
EVT_THREAD EVT_THREAD
EVT_CALL(PlayEffect, 0x40, 2, LVar0, LVar1, LVar2, 1, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, 0x40, 2, LVar0, LVar1, LVar2, 1, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT(2) EVT_WAIT(2)

View File

@ -254,7 +254,7 @@ void aura_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E007684C(void) { void func_E007684C(void) {

View File

@ -80,7 +80,7 @@ void balloon_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_SURFACE_OPA; renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void balloon_appendGfx(void* effect) { void balloon_appendGfx(void* effect) {

View File

@ -116,7 +116,7 @@ void big_smoke_puff_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void big_smoke_puff_appendGfx(void* effect) { void big_smoke_puff_appendGfx(void* effect) {

View File

@ -104,7 +104,7 @@ void big_snowflakes_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void big_snowflakes_appendGfx(void* effect) { void big_snowflakes_appendGfx(void* effect) {

View File

@ -89,7 +89,7 @@ void blast_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
#ifdef NON_MATCHING #ifdef NON_MATCHING

View File

@ -199,7 +199,7 @@ void bombette_breaking_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void bombette_breaking_appendGfx(void* effect) { void bombette_breaking_appendGfx(void* effect) {

View File

@ -128,7 +128,7 @@ void breaking_junk_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void breaking_junk_appendGfx(void* effect) { void breaking_junk_appendGfx(void* effect) {

View File

@ -145,7 +145,7 @@ void bulb_glow_render(EffectInstance* effect) {
} }
retTask = shim_queue_render_task(renderTaskPtr); retTask = shim_queue_render_task(renderTaskPtr);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E0078274(void) { void func_E0078274(void) {

View File

@ -157,7 +157,7 @@ void butterflies_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }

View File

@ -208,7 +208,7 @@ void chapter_change_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void chapter_change_appendGfx(void* effect) { void chapter_change_appendGfx(void* effect) {

View File

@ -128,7 +128,7 @@ void chomp_drop_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void chomp_drop_appendGfx(void* effect) { void chomp_drop_appendGfx(void* effect) {

View File

@ -109,7 +109,7 @@ void cloud_puff_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void cloud_puff_appendGfx(void* effect) { void cloud_puff_appendGfx(void* effect) {

View File

@ -110,7 +110,7 @@ void cloud_trail_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void cloud_trail_appendGfx(void* effect) { void cloud_trail_appendGfx(void* effect) {

View File

@ -173,7 +173,7 @@ void cold_breath_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void cold_breath_appendGfx(void* effect) { void cold_breath_appendGfx(void* effect) {

View File

@ -236,7 +236,7 @@ void damage_stars_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void damage_stars_appendGfx(void* effect) { void damage_stars_appendGfx(void* effect) {

View File

@ -127,7 +127,7 @@ void debuff_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void debuff_appendGfx(void* effect) { void debuff_appendGfx(void* effect) {

View File

@ -123,7 +123,7 @@ void drop_leaves_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void drop_leaves_appendGfx(void* effect) { void drop_leaves_appendGfx(void* effect) {

View File

@ -122,7 +122,7 @@ void dust_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void dust_appendGfx(void* effect) { void dust_appendGfx(void* effect) {

View File

@ -208,7 +208,7 @@ void fx_3D_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E007A884(void) { void func_E007A884(void) {

View File

@ -194,7 +194,7 @@ void fx_46_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void fx_46_appendGfx(void* effect) { void fx_46_appendGfx(void* effect) {

View File

@ -204,7 +204,7 @@ void fx_63_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void fx_63_appendGfx(void* effect) { void fx_63_appendGfx(void* effect) {

View File

@ -200,7 +200,7 @@ void fx_65_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
// floats and more // floats and more

View File

@ -183,7 +183,7 @@ void fx_75_render(EffectInstance* effect) {
renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
retTask = shim_queue_render_task(renderTaskPtr); retTask = shim_queue_render_task(renderTaskPtr);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00EA664(void) { void func_E00EA664(void) {

View File

@ -104,7 +104,7 @@ void fx_86_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void fx_86_appendGfx(void* effect) { void fx_86_appendGfx(void* effect) {

View File

@ -179,7 +179,7 @@ void embers_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00E05F8(void) { void func_E00E05F8(void) {

View File

@ -198,7 +198,7 @@ void emote_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void emote_appendGfx(void* effect) { void emote_appendGfx(void* effect) {

View File

@ -126,7 +126,7 @@ void ending_decals_render(EffectInstance* effect) {
} }
retTask = shim_queue_render_task(renderTaskPtr); retTask = shim_queue_render_task(renderTaskPtr);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void ending_decals_appendGfx(void* effect) { void ending_decals_appendGfx(void* effect) {

View File

@ -218,7 +218,7 @@ void energy_orb_wave_render(EffectInstance* effect) {
} }
retTask = shim_queue_render_task(renderTaskPointer); retTask = shim_queue_render_task(renderTaskPointer);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00A4648(void) { void func_E00A4648(void) {

View File

@ -132,7 +132,7 @@ void energy_shockwave_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void energy_shockwave_appendGfx(void* effect) { void energy_shockwave_appendGfx(void* effect) {

View File

@ -118,7 +118,7 @@ void falling_leaves_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void falling_leaves_appendGfx(void* effect) { void falling_leaves_appendGfx(void* effect) {

View File

@ -175,7 +175,7 @@ void fire_breath_render(EffectInstance* effect) {
renderTaskPointer->renderMode = RENDER_MODE_2D; renderTaskPointer->renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(renderTaskPointer); retTask = shim_queue_render_task(renderTaskPointer);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void fire_breath_appendGfx(void* effect) { void fire_breath_appendGfx(void* effect) {

View File

@ -195,7 +195,7 @@ void fire_flower_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void fire_flower_appendGfx(void* effect) { void fire_flower_appendGfx(void* effect) {

View File

@ -217,7 +217,7 @@ void firework_rocket_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_SURFACE_OPA; renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void firework_rocket_appendGfx(void* effect) { void firework_rocket_appendGfx(void* effect) {

View File

@ -107,7 +107,7 @@ void floating_cloud_puff_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00D227C(void) { void func_E00D227C(void) {

View File

@ -137,7 +137,7 @@ void floating_flower_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void floating_flower_appendGfx(void* effect) { void floating_flower_appendGfx(void* effect) {

View File

@ -103,7 +103,7 @@ void floating_rock_render(EffectInstance *effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void floating_rock_appendGfx(void* effect) { void floating_rock_appendGfx(void* effect) {

View File

@ -135,7 +135,7 @@ void flower_splash_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void flower_splash_dispose(EffectInstance* effect) { void flower_splash_dispose(EffectInstance* effect) {

View File

@ -151,7 +151,7 @@ void flower_trail_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
queuedTaskPtr = shim_queue_render_task(&renderTask); queuedTaskPtr = shim_queue_render_task(&renderTask);
queuedTaskPtr->renderMode |= RENDER_TASK_FLAG_2; queuedTaskPtr->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void flower_trail_dispose(EffectInstance* effect) { void flower_trail_dispose(EffectInstance* effect) {

View File

@ -107,7 +107,7 @@ void footprint_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00183BC(EffectInstance* effect) { void func_E00183BC(EffectInstance* effect) {

View File

@ -106,7 +106,7 @@ void fright_jar_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00C2214(void) { void func_E00C2214(void) {

View File

@ -154,7 +154,7 @@ void gather_energy_pink_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void gather_energy_pink_appendGfx(void* effect) { void gather_energy_pink_appendGfx(void* effect) {

View File

@ -148,7 +148,7 @@ void gather_magic_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void gather_magic_appendGfx(void* effect) { void gather_magic_appendGfx(void* effect) {

View File

@ -101,7 +101,7 @@ void got_item_outline_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E003621C(void) { void func_E003621C(void) {

View File

@ -106,7 +106,7 @@ void hieroglyphs_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00E2210(void) { void func_E00E2210(void) {

View File

@ -144,7 +144,7 @@ void ice_pillar_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void ice_pillar_appendGfx(void* effect) { void ice_pillar_appendGfx(void* effect) {

View File

@ -127,7 +127,7 @@ void ice_shard_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void ice_shard_appendGfx(void* effect) { void ice_shard_appendGfx(void* effect) {

View File

@ -254,7 +254,7 @@ void landing_dust_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_28; renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void landing_dust_appendGfx(void* effect) { void landing_dust_appendGfx(void* effect) {

View File

@ -101,7 +101,7 @@ void lens_flare_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void lens_flare_appendGfx(void* effect) { void lens_flare_appendGfx(void* effect) {

View File

@ -254,7 +254,7 @@ void light_rays_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E006A85C(LightRaysFXData* part) { void func_E006A85C(LightRaysFXData* part) {

View File

@ -209,7 +209,7 @@ void lightning_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void lightning_appendGfx(void* effect) { void lightning_appendGfx(void* effect) {

View File

@ -163,7 +163,7 @@ void lightning_bolt_render(EffectInstance *effect) {
renderTaskPointer->renderMode = RENDER_MODE_2D; renderTaskPointer->renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(renderTaskPointer); retTask = shim_queue_render_task(renderTaskPointer);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00BC36C(void) { void func_E00BC36C(void) {

View File

@ -165,7 +165,7 @@ void lil_oink_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void lil_oink_appendGfx(void* effect) { void lil_oink_appendGfx(void* effect) {

View File

@ -120,7 +120,7 @@ void merlin_house_stars_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00A639C(void) { void func_E00A639C(void) {

View File

@ -292,7 +292,7 @@ void misc_particles_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00E4954(void) { void func_E00E4954(void) {

View File

@ -99,7 +99,7 @@ void motion_blur_flame_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void func_E00A2234(void) { void func_E00A2234(void) {

View File

@ -173,7 +173,7 @@ void moving_cloud_render(EffectInstance* effect) {
renderTask.renderMode = RENDER_MODE_2D; renderTask.renderMode = RENDER_MODE_2D;
retTask = shim_queue_render_task(&renderTask); retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_2; retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
} }
void moving_cloud_appendGfx(void* effect) { void moving_cloud_appendGfx(void* effect) {

Some files were not shown because too many files have changed in this diff Show More