pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 00:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fold doc 1 (#1009)

Browse Source 
* minor fold cleanup

* fold doc I

* enough

* rename

* last

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-04-07 13:18:12 -04:00 committed by GitHub
parent 314c4ef423
commit 93ed912319
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
130 changed files with 1105 additions and 1008 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -256,7 +256,7 @@ typedef struct Npc {
/* 0x09C */ s16 foldArg2;
/* 0x09E */ s16 foldArg3;
/* 0x0A0 */ s16 foldArg4;
/* 0x0A2 */ u16 foldArg5;
/* 0x0A2 */ u16 foldFlags;
/* 0x0A4 */ s8 npcID;
/* 0x0A5 */ char unk_A5;
/* 0x0A6 */ s16 collisionRadius;

6
include/dead.h
View File

@ -275,8 +275,8 @@
#define GetSelfVar dead_GetSelfVar
#define GetPlayerTargetYaw dead_GetPlayerTargetYaw
#define HidePlayerShadow dead_HidePlayerShadow
#define func_802D286C dead_func_802D286C
#define func_802D2520 dead_func_802D2520
#define SetPlayerFoldFlags dead_SetPlayerFoldFlags
#define UpdatePlayerFold dead_UpdatePlayerFold
#define SetPlayerFlagBits dead_SetPlayerFlagBits
#define func_80044238 dead_func_80044238
#define SetCamType dead_SetCamType
@ -322,7 +322,7 @@
#define GetSelfAnimationFromTable dead_GetSelfAnimationFromTable
#define EVS_NpcHitRecoil dead_EVS_NpcHitRecoil
#define SelfEnemyOverrideSyncPos dead_SelfEnemyOverrideSyncPos
#define func_802CFD30 dead_func_802CFD30
#define SetNpcFoldParams dead_SetNpcFoldParams
#define SetGroupVisibility dead_SetGroupVisibility
#define Entity_HeartBlock dead_Entity_HeartBlock
#define GetCamDistance dead_GetCamDistance

98
include/enums.h
View File

@ -5963,15 +5963,16 @@ enum FoldStateFlags {
FOLD_STATE_FLAG_ENABLED = 0x00000001,
FOLD_STATE_FLAG_G_CULL_BACK = 0x00000002,
FOLD_STATE_FLAG_G_CULL_FRONT = 0x00000004,
FOLD_STATE_FLAG_10 = 0x00000010,
FOLD_STATE_FLAG_20 = 0x00000020,
FOLD_STATE_FLAG_8 = 0x00000008,
FOLD_STATE_FLAG_SKIP_GFX_SETUP = 0x00000010,
FOLD_STATE_FLAG_SKIP_TEX_SETUP = 0x00000020,
FOLD_STATE_FLAG_40 = 0x00000040,
FOLD_STATE_FLAG_80 = 0x00000080,
FOLD_STATE_FLAG_100 = 0x00000100,
FOLD_STATE_FLAG_LOOP_ANIM = 0x00000080,
FOLD_STATE_FLAG_REVERSE_ANIM = 0x00000100, // fold animation plays backwards (from end to start)
FOLD_STATE_FLAG_200 = 0x00000200,
FOLD_STATE_FLAG_400 = 0x00000400,
FOLD_STATE_FLAG_800 = 0x00000800,
FOLD_STATE_FLAG_1000 = 0x00001000,
FOLD_STATE_FLAG_ANIM_DONE = 0x00001000,
FOLD_STATE_FLAG_2000 = 0x00002000,
FOLD_STATE_FLAG_4000 = 0x00004000,
FOLD_STATE_FLAG_8000 = 0x00008000,
@ -5983,50 +5984,73 @@ enum FoldStateFlags {
};
typedef enum FoldType {
FOLD_TYPE_NONE = 0x0,
FOLD_TYPE_1 = 0x1,
FOLD_TYPE_2 = 0x2,
FOLD_TYPE_3 = 0x3,
FOLD_TYPE_4 = 0x4,
FOLD_TYPE_5 = 0x5,
FOLD_TYPE_6 = 0x6,
FOLD_TYPE_7 = 0x7,
FOLD_TYPE_8 = 0x8, // color overlay?
FOLD_UPD_CLEAR = 0x0, // or FOLD_UPD_INIT?
FOLD_TYPE_1 = 0x1, // unused?
FOLD_TYPE_2 = 0x2, // unused?
FOLD_TYPE_3 = 0x3, // after goomba 'sticker' ambush in kmr_09 unfurls
FOLD_UPD_WAVY = 0x4, // Kolorado when injured and Sushie when underwater (* note: Sushie fold rendering is bugged and only occurs *before* going underwater)
FOLD_UPD_SET_ANIM = 0x5,
FOLD_UPD_SET_COLOR = 0x6, // modulate color (args: R, G, B)
FOLD_UPD_SET_ALPHA = 0x7, // modulate alpha (args: A)
FOLD_UPD_SET_TINT = 0x8, // modulate color+alpha (args: R, G, B, A)
FOLD_TYPE_9 = 0x9,
FOLD_TYPE_A = 0xA,
FOLD_TYPE_B = 0xB,
FOLD_TYPE_C = 0xC,
FOLD_TYPE_D = 0xD, // noisy hologram -- used for ghostly star spirits and merlar
FOLD_UPD_COLOR_BUF_SET_B = 0xB,
FOLD_UPD_COLOR_BUF_SET_C = 0xC,
FOLD_UPD_HOLOGRAM = 0xD, // ghostly star spirits and merlar (args: ???, staticAmt, ???, alphaAmt)
FOLD_TYPE_E = 0xE,
FOLD_TYPE_F = 0xF,
FOLD_TYPE_10 = 0x10,
FOLD_TYPE_11 = 0x11,
FOLD_TYPE_10 = 0x10, // unused?
FOLD_UPD_ALLOC_COLOR_BUF = 0x11, // args: count
} FoldType;
typedef enum FoldAnim {
FOLD_ANIM_SHOCK = 0x00, // used for Goombaria and Goompapa when Kammy drops the hammer block
FOLD_ANIM_SHIVER = 0x01, // used when Goombaria gives Mario a kiss
FOLD_ANIM_VERTICAL_PIPE_CURL = 0x02, // vertical pipe curl
FOLD_ANIM_HORIZONTAL_PIPE_CURL = 0x03, // horizontal pipe curl
FOLD_ANIM_STARTLE = 0x04, // used when Koopa Bros are surprised by Mario
FOLD_ANIM_FLUTTER_DOWN = 0x05, // player falling like paper
FOLD_ANIM_UNFURL = 0x06, // used by Goomba 'stickers' that ambush Mario in area_kmr
FOLD_ANIM_GET_IN_BED = 0x07, // Mario gets into bed
FOLD_ANIM_SPIRIT_CAPTURE = 0x08, // Eldstar being captured
FOLD_ANIM_UNUSED_1 = 0x09, // unused
FOLD_ANIM_UNUSED_2 = 0x0A, // unused
FOLD_ANIM_UNUSED_3 = 0x0B, // unused
FOLD_ANIM_TUTANKOOPA_GATHER = 0x0C, // tutankoopa 3
FOLD_ANIM_TUTANKOOPA_SWIRL_2 = 0x0D, // tutankoopa 2
FOLD_ANIM_TUTANKOOPA_SWIRL_1 = 0x0E, // tutankoopa 1
FOLD_ANIM_SHUFFLE_CARDS = 0x0F, // merlee spell-casting card shuffle
FOLD_ANIM_FLIP_CARD_1 = 0x10, // merlee spell-casting card flip 1
FOLD_ANIM_FLIP_CARD_2 = 0x11, // merlee spell-casting card flip 2
FOLD_ANIM_FLIP_CARD_3 = 0x12, // merlee spell-casting card flip 3
FOLD_ANIM_CYMBAL_CRUSH = 0x13, // used when Mario is crushed in a Cymbal Plant
} FoldAnim;
typedef enum FoldRenderType {
FOLD_RENDER_TYPE_0 = 0x0,
FOLD_RENDER_TYPE_1 = 0x1,
FOLD_RENDER_TYPE_2 = 0x2,
FOLD_RENDER_TYPE_3 = 0x3,
FOLD_RENDER_TYPE_4 = 0x4,
FOLD_RENDER_TYPE_5 = 0x5,
FOLD_RENDER_TYPE_6 = 0x6,
FOLD_RENDER_TYPE_7 = 0x7,
FOLD_RENDER_TYPE_8 = 0x8,
FOLD_RENDER_TYPE_9 = 0x9,
FOLD_RENDER_TYPE_A = 0xA,
FOLD_RENDER_TYPE_B = 0xB,
FOLD_RENDER_TYPE_C = 0xC,
FOLD_RENDER_TYPE_D = 0xD,
FOLD_RENDER_TYPE_E = 0xE,
FOLD_RENDER_TYPE_F = 0xF,
FOLD_RENDER_TYPE_10 = 0x10,
FOLD_RENDER_TYPE_0 = 0x0,
FOLD_RENDER_TYPE_1 = 0x1,
FOLD_RENDER_TYPE_2 = 0x2,
FOLD_RENDER_TYPE_3 = 0x3,
FOLD_RENDER_TYPE_4 = 0x4,
FOLD_RENDER_TYPE_5 = 0x5,
FOLD_RENDER_TYPE_6 = 0x6,
FOLD_RENDER_TYPE_7 = 0x7,
FOLD_RENDER_TYPE_8 = 0x8,
FOLD_RENDER_TYPE_9 = 0x9,
FOLD_RENDER_TYPE_A = 0xA,
FOLD_RENDER_TYPE_B = 0xB,
FOLD_RENDER_HOLOGRAM = 0xC,
FOLD_RENDER_TYPE_D = 0xD,
FOLD_RENDER_TYPE_E = 0xE,
FOLD_RENDER_TYPE_F = 0xF,
FOLD_RENDER_TYPE_10 = 0x10,
} FoldRenderType;
typedef enum FoldMeshType {
FOLD_MESH_TYPE_0 = 0x0,
FOLD_MESH_TYPE_1 = 0x1,
FOLD_MESH_TYPE_2 = 0x2,
FOLD_MESH_ANIMATED = 0x2,
FOLD_MESH_TYPE_3 = 0x3,
FOLD_MESH_TYPE_4 = 0x4,
} FoldMeshType;

1
include/macros.h
View File

@ -94,6 +94,7 @@
#define MAX_WORKERS 16
#define MAX_TEX_PANNERS 16
#define MAX_ITEM_ENTITIES 256
#define MAX_FOLD_STATES 90
#define MAX_STAR_PIECES 222

2
include/npc.h
View File

@ -594,7 +594,7 @@ s32 npc_get_collider_below(Npc* npc);
void func_8003D3BC(Npc* npc);
void func_8003D624(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
void npc_set_fold_params(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
void spawn_surface_effects(Npc* npc, SurfaceInteractMode mode);

8
include/script_api/common.h
View File

@ -292,8 +292,8 @@ ApiStatus func_802D2484(Evt* script, s32 isInitialCall);
ApiStatus WaitForPlayerTouchingFloor(Evt* script, s32 isInitialCall);
ApiStatus IsPlayerOnValidFloor(Evt* script, s32 isInitialCall);
ApiStatus WaitForPlayerMoveToComplete(Evt* script, s32 isInitialCall);
ApiStatus func_802CFE2C(Evt* script, s32 isInitialCall);
ApiStatus func_802CFD30(Evt* script, s32 isInitialCall);
ApiStatus SetNpcFoldFlags(Evt* script, s32 isInitialCall);
ApiStatus SetNpcFoldParams(Evt* script, s32 isInitialCall);
ApiStatus IsStartingConversation(Evt* script, s32 isInitialCall);
ApiStatus SetTimeFreezeMode(Evt* script, s32 isInitialCall);
ApiStatus CreateVirtualEntity(Evt* script, s32 isInitialCall);
@ -327,8 +327,8 @@ ApiStatus func_802CF56C(Evt* script, s32 isInitialCall);
ApiStatus func_802CA988(Evt* script, s32 isInitialCall);
ApiStatus SetNpcRotationPivot(Evt* script, s32 isInitialCall);
ApiStatus SetSleepBubbleTimeLeft(Evt* script, s32 isInitialCall);
ApiStatus func_802D286C(Evt* script, s32 isInitialCall);
ApiStatus func_802D2520(Evt* script, s32 isInitialCall);
ApiStatus SetPlayerFoldFlags(Evt* script, s32 isInitialCall);
ApiStatus UpdatePlayerFold(Evt* script, s32 isInitialCall);
ApiStatus PushSong(Evt* script, s32 isInitialCall);
ApiStatus PopSong(Evt* script, s32 isInitialCall);
ApiStatus func_802D62E4(Evt* script, s32 isInitialCall);

2
src/16c8e0.c
View File

@ -1132,7 +1132,7 @@ void btl_delete_actor(Actor* actor) {
}
if (part->idleAnimations != NULL) {
func_802DE894(part->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
func_802DE894(part->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
ASSERT(spr_free_sprite(part->spriteInstanceID) == 0);

12
src/182B30.c
View File

@ -3223,9 +3223,9 @@ void func_8025C8A0(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) {
if (part->decorationTable->unk_751 != 0) {
part->decorationTable->unk_751 = 0;
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
} else {
func_802DE894(part->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
func_802DE894(part->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
}
}
}
@ -3246,9 +3246,9 @@ void func_8025C918(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) {
decor->unk_751 = 0;
decor->unk758 = 0;
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_802DDFF8(0, FOLD_TYPE_11, 20, 0, 0, 255, 0);
func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0);
} else {
func_802DE894(part->spriteInstanceID, FOLD_TYPE_11, 20, 0, 0, 255, 0);
func_802DE894(part->spriteInstanceID, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0);
}
}
@ -3276,9 +3276,9 @@ void func_8025C918(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) {
for (i = 0; i < ARRAY_COUNT(rbuf); i++) {
color = (rbuf[i] << 0x18) | (gbuf[i] << 0x10) | (bbuf[i] << 8) | alpha;
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_TYPE_C, i, color, 0, 0xFF, 0);
func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_UPD_COLOR_BUF_SET_C, i, color, 0, 255, 0);
} else {
func_802DE894(part->spriteInstanceID, FOLD_TYPE_C, i, color, 0, 0xFF, 0);
func_802DE894(part->spriteInstanceID, FOLD_UPD_COLOR_BUF_SET_C, i, color, 0, 255, 0);
}
}

2
src/1A5830.c
View File

@ -3336,7 +3336,7 @@ ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) {
while (it != NULL) {
if (it->idleAnimations != NULL) {
func_802DE894(it->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
func_802DE894(it->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
}
it = it->nextPart;
}

4
src/38F00.c
View File

@ -70,12 +70,12 @@ EvtScript D_800939B4 = {
EVT_LOOP(30)
EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0)
EVT_CALL(func_8005DD54)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_6, LVar2, LVar2, LVar2, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_COLOR, LVar2, LVar2, LVar2, 0)
EVT_ADD(LVar0, 30)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_6, 255, 255, 255, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_COLOR, 255, 255, 255, 0)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, FALSE)
EVT_CALL(SetSelfVar, 0, 0)
EVT_CALL(func_8005DDF0)

4
src/77480.c
View File

@ -1551,7 +1551,7 @@ void appendGfx_player(void* data) {
playerStatus->animFlags = playerStatus->animFlags & ~PA_FLAG_SHIVERING;
playerStatus->shiverTime = 22;
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
func_802DDFF8(playerStatus->anim, 5, 1, 1, 1, 0, 0);
func_802DDFF8(playerStatus->anim, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHIVER, 1, 1, 0, 0);
}
if (playerStatus->shiverTime != 0) {
@ -1614,7 +1614,7 @@ void appendGfx_player_spin(void* data) {
tint = 100;
}
func_802DDFF8(0, FOLD_TYPE_6, tint, tint, tint, 255, 0);
func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_UPD_SET_COLOR, tint, tint, tint, 255, 0);
guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f);
guRotateF(mtx, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f);

4
src/7fd10_len_b40.c
View File

@ -31,8 +31,8 @@ void func_800E6860(void) {
if (gPartnerStatus.partnerActionState != PARTNER_ACTION_NONE && gPartnerStatus.actingPartner == PARTNER_BOW) {
Npc* partner = get_npc_unsafe(NPC_PARTNER);
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, FOLD_TYPE_7, 0, 0, 0, playerStatus->alpha1, 0);
func_8003D624(partner, FOLD_TYPE_7, playerStatus->alpha1, 0, 0, 0, 0);
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, FOLD_UPD_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0);
npc_set_fold_params(partner, FOLD_UPD_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0);
playerStatus->alpha2 = 0;
}
}

13
src/audio/2e230_len_2190.c
View File

@ -599,8 +599,6 @@ AuResult func_80053E58(s32 songID, BGMHeader* bgmFile) {
AuGlobals* soundData;
InitSongEntry* songInfo;
s32 i;
u32 data;
u32 offset;
u16 bkFileIndex;
soundData = gSoundGlobals;
@ -614,14 +612,11 @@ AuResult func_80053E58(s32 songID, BGMHeader* bgmFile) {
if (bkFileIndex != 0) {
bkFileEntry = &soundData->sbnFileList[bkFileIndex];
offset = (bkFileEntry->offset & 0xFFFFFF) + soundData->baseRomOffset;
fileEntry.offset = offset;
fileEntry.offset = (bkFileEntry->offset & 0xFFFFFF) + soundData->baseRomOffset;
fileEntry.data = bkFileEntry->data;
data = bkFileEntry->data;
fileEntry.data = data;
if ((data >> 0x18) == AU_FMT_BK) {
snd_load_BK(offset, i);
if ((fileEntry.data >> 0x18) == AU_FMT_BK) {
snd_load_BK(fileEntry.offset, i);
} else {
status = AU_ERROR_SBN_FORMAT_MISMATCH;
}

2
src/audio/private.h
View File

@ -54,7 +54,7 @@ Instrument* au_get_instrument(AuGlobals* globals, u32 bank, u32 patch, EnvelopeD
void au_get_bgm_player_and_file(u32 playerIndex, BGMHeader** outCurrentTrackData, BGMPlayer** outPlayer);
void au_get_bgm_player(u32 playerIndex, BGMPlayer** outPlayer);
AuResult au_load_song_files(u32 arg0, BGMHeader* arg1, BGMPlayer* arg2);
AuResult func_80053E58(s32 arg0, BGMHeader* arg1);
AuResult func_80053E58(s32 songID, BGMHeader* arg1);
BGMPlayer* func_80053F64(s32 arg0);
AuResult au_ambient_load(u32 arg0);
BGMPlayer* func_80054248(u8 arg0);

18
src/battle/area/sam2/actor/monstar.c
View File

@ -149,16 +149,16 @@ FoldImageRecPart D_8021A2B8_63F498 = {
API_CALLABLE(func_80218000_63D1E0) {
ActorPart* part = get_actor_part(get_actor(script->owner1.actorID), 1);
s32 i;
u8 sp20[20];
u8 sp38[20];
u8 sp50[20];
u8 sp68[20];
u8 colR[20];
u8 colG[20];
u8 colB[20];
u8 colA[20];
if (isInitialCall) {
script->functionTemp[1] = 0;
script->functionTemp[2] = 0;
script->functionTemp[0] = 0;
func_802DE780(part->spriteInstanceID, 0, FOLD_TYPE_11, 20, 0, 0, 255, 0);
func_802DE780(part->spriteInstanceID, 0, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0);
}
func_802DE780(part->spriteInstanceID, 1, FOLD_TYPE_F, (s32)&D_8021A2B8_63F498, 255, 0, 255, 0);
@ -168,13 +168,13 @@ API_CALLABLE(func_80218000_63D1E0) {
}
for (i = 0; i < 20; i++) {
sp20[i] = (cosine(script->functionTemp[1] + i * 25) + 1.0) * 56.0;
sp38[i] = (cosine(script->functionTemp[1] + i * 25 + 45) + 1.0) * 56.0;
sp50[i] = (cosine(script->functionTemp[1] + i * 25 + 90) + 1.0) * 56.0;
colR[i] = (cosine(script->functionTemp[1] + i * 25) + 1.0) * 56.0;
colG[i] = (cosine(script->functionTemp[1] + i * 25 + 45) + 1.0) * 56.0;
colB[i] = (cosine(script->functionTemp[1] + i * 25 + 90) + 1.0) * 56.0;
}
for (i = 0; i < 20; i++) {
func_802DE780(part->spriteInstanceID, 0, FOLD_TYPE_C, i, sp20[i] << 0x18 | sp38[i] << 0x10 | sp50[i] << 8 | 0xFF, 0, 255, 0);
func_802DE780(part->spriteInstanceID, 0, FOLD_UPD_COLOR_BUF_SET_C, i, colR[i] << 0x18 | colG[i] << 0x10 | colB[i] << 8 | 255, 0, 255, 0);
}
return ApiStatus_BLOCK;

6
src/common/UnkBowserFunc1.inc.c
View File

@ -30,7 +30,7 @@ API_CALLABLE(N(UnkBowserFunc1)) {
script->functionTemp[0] = 0;
for (i = 0; i < 10; i++) {
func_802DE780(part->spriteInstanceID, i, FOLD_TYPE_11, 20, 0, 0, 255, 0);
func_802DE780(part->spriteInstanceID, i, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0);
}
}
@ -50,7 +50,7 @@ API_CALLABLE(N(UnkBowserFunc1)) {
for (j = 0; j < 20; j++) {
colorRGBA = sp20[j] << 0x18 | sp38[j] << 0x10 | sp50[j] << 8 | 0xFF;
for (i = 0; i < 10; i++) {
func_802DE780(part->spriteInstanceID, i, FOLD_TYPE_C, j, colorRGBA, 0, 255, 0);
func_802DE780(part->spriteInstanceID, i, FOLD_UPD_COLOR_BUF_SET_C, j, colorRGBA, 0, 255, 0);
}
}
return ApiStatus_BLOCK;
@ -60,7 +60,7 @@ API_CALLABLE(N(UnkBowserFunc1)) {
colorRGBA = 255;
for (i = 0; i < 10; i++) {
// TODO find better match for opacity
func_802DE780(part->spriteInstanceID, i, FOLD_TYPE_C, j, colorRGBA, 0, opacity & 0xFFFF, 0);
func_802DE780(part->spriteInstanceID, i, FOLD_UPD_COLOR_BUF_SET_C, j, colorRGBA, 0, opacity & 0xFFFF, 0);
}
}
script->functionTemp[1] = 0;

908
src/d0a70_len_4fe0.c
View File

File diff suppressed because it is too large Load Diff

4
src/entity/BlueWarpPipe.c
View File

@ -115,7 +115,7 @@ void entity_BlueWarpPipe_enter_pipe_init(Entity* bluePipe) {
pipeData->timer = 25;
playerStatus->renderMode = RENDER_MODE_ALPHATEST;
func_802DDFF8(ANIM_Mario1_Idle, FOLD_TYPE_5, 2, 1, 1, 0, 0);
func_802DDFF8(ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0, 0);
sfx_play_sound(SOUND_ENTER_PIPE);
disable_player_shadow();
}
@ -130,7 +130,7 @@ void entity_BlueWarpPipe_enter_pipe_update(Entity* entity) {
if (pipeData->timer == -1) {
playerStatus->renderMode = RENDER_MODE_ALPHATEST;
playerStatus->position.y -= 50.0f;
func_802DDFF8(ANIM_Mario1_Idle, 0, 0, 0, 0, 0, 0);
func_802DDFF8(ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
exec_entity_commandlist(entity);
}
}

2
src/entity/jan_iwa/Plants1.c
View File

@ -309,7 +309,7 @@ void entity_CymbalPlant_idle(Entity* entity) {
if (--data->timer == 0) {
data->state++;
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
func_802DDFF8(ANIM_Mario1_Idle, 5, 19, 1, 1, 0, 0);
func_802DDFF8(ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_CYMBAL_CRUSH, 1, 1, 0, 0);
}
break;
case 3:

10
src/evt/npc_api.c
View File

@ -965,7 +965,7 @@ ApiStatus PartnerIsFlying(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus func_802CFD30(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcFoldParams(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 npcId = evt_get_variable(script, *args++);
Bytecode foldType = evt_get_variable(script, *args++);
@ -979,21 +979,21 @@ ApiStatus func_802CFD30(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
func_8003D624(npc, foldType, var2, var3, var4, var5, npc->foldArg5);
npc_set_fold_params(npc, foldType, var2, var3, var4, var5, npc->foldFlags);
return ApiStatus_DONE2;
}
ApiStatus func_802CFE2C(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcFoldFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 npcId = evt_get_variable(script, *args++);
Bytecode arg1 = *args;
Bytecode flags = *args;
Npc* npc = resolve_npc(script, npcId);
if (npc == NULL) {
return ApiStatus_DONE2;
}
npc->foldArg5 = arg1;
npc->foldFlags = flags;
return ApiStatus_DONE2;
}

44
src/evt/player_api.c
View File

@ -4,7 +4,7 @@
#include "world/partners.h"
extern Npc playerNpcData;
extern u16 D_802DB5B0;
extern u16 PlayerFoldFlags;
extern s32 D_802DB5B4[3]; // unused
Npc* playerNpc = &playerNpcData;
@ -630,78 +630,78 @@ ApiStatus WaitForPlayerInputEnabled(Evt* script, s32 isInitialCall) {
}
}
ApiStatus func_802D2520(Evt* script, s32 isInitialCall) {
ApiStatus UpdatePlayerFold(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
PlayerStatus* playerStatus = &gPlayerStatus;
s32 a0 = *args++;
s32 foldType = evt_get_variable(script, *args++);
s32 a2, a3, a4, a5;
func_802DDFF8(a0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
func_802DDFF8(a0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
switch (foldType) {
case FOLD_TYPE_NONE:
case FOLD_UPD_CLEAR:
playerStatus->renderMode = RENDER_MODE_ALPHATEST;
func_802DDFF8(a0, FOLD_TYPE_NONE, 0, 0, 0, 0, D_802DB5B0);
func_802DDFF8(a0, FOLD_UPD_CLEAR, 0, 0, 0, 0, PlayerFoldFlags);
break;
case FOLD_TYPE_2:
case FOLD_TYPE_3:
playerStatus->renderMode = RENDER_MODE_ALPHATEST;
case FOLD_TYPE_1:
func_802DDFF8(a0, foldType, 0, 0, 0, 0, D_802DB5B0);
func_802DDFF8(a0, foldType, 0, 0, 0, 0, PlayerFoldFlags);
break;
case FOLD_TYPE_4:
case FOLD_UPD_WAVY:
playerStatus->renderMode = RENDER_MODE_ALPHATEST;
a2 = evt_get_variable(script, *args++);
a3 = evt_get_variable(script, *args++);
a4 = evt_get_variable(script, *args++);
func_802DDFF8(a0, FOLD_TYPE_4, a2, a3, a4, 0, D_802DB5B0);
func_802DDFF8(a0, FOLD_UPD_WAVY, a2, a3, a4, 0, PlayerFoldFlags);
break;
case FOLD_TYPE_6:
case FOLD_UPD_SET_COLOR:
playerStatus->renderMode = RENDER_MODE_ALPHATEST;
a2 = evt_get_variable(script, *args++);
a3 = evt_get_variable(script, *args++);
a4 = evt_get_variable(script, *args++);
func_802DDFF8(a0, FOLD_TYPE_6, a2, a3, a4, 255, D_802DB5B0);
func_802DDFF8(a0, FOLD_UPD_SET_COLOR, a2, a3, a4, 255, PlayerFoldFlags);
break;
case FOLD_TYPE_7:
case FOLD_UPD_SET_ALPHA:
playerStatus->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
a5 = evt_get_variable(script, *args++);
func_802DDFF8(a0, FOLD_TYPE_7, 255, 255, 255, a5, D_802DB5B0);
func_802DDFF8(a0, FOLD_UPD_SET_ALPHA, 255, 255, 255, a5, PlayerFoldFlags);
break;
case FOLD_TYPE_8:
case FOLD_UPD_SET_TINT:
playerStatus->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
a2 = evt_get_variable(script, *args++);
a3 = evt_get_variable(script, *args++);
a4 = evt_get_variable(script, *args++);
a5 = evt_get_variable(script, *args++);
func_802DDFF8(a0, FOLD_TYPE_8, a2, a3, a4, a5, D_802DB5B0);
func_802DDFF8(a0, FOLD_UPD_SET_TINT, a2, a3, a4, a5, PlayerFoldFlags);
break;
case FOLD_TYPE_5:
case FOLD_UPD_SET_ANIM:
playerStatus->renderMode = RENDER_MODE_ALPHATEST;
a2 = evt_get_variable(script, *args++);
a3 = evt_get_variable(script, *args++);
a4 = evt_get_variable(script, *args++);
func_802DDFF8(a0, FOLD_TYPE_5, a2, a3, a4, 0, D_802DB5B0);
func_802DDFF8(a0, FOLD_UPD_SET_ANIM, a2, a3, a4, 0, PlayerFoldFlags);
break;
case FOLD_TYPE_D:
case FOLD_UPD_HOLOGRAM:
playerStatus->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
a2 = evt_get_variable(script, *args++);
a3 = evt_get_variable(script, *args++);
a4 = evt_get_variable(script, *args++);
a5 = evt_get_variable(script, *args++);
func_802DDFF8(a0, FOLD_TYPE_D, a2, a3, a4, a5, D_802DB5B0);
func_802DDFF8(a0, FOLD_UPD_HOLOGRAM, a2, a3, a4, a5, PlayerFoldFlags);
break;
}
D_802DB5B0 = 0;
PlayerFoldFlags = 0;
return ApiStatus_DONE2;
}
ApiStatus func_802D286C(Evt* script, s32 isInitialCall) {
s32 temp = *script->ptrReadPos;
ApiStatus SetPlayerFoldFlags(Evt* script, s32 isInitialCall) {
s32 foldFlags = *script->ptrReadPos;
D_802DB5B0 = temp;
PlayerFoldFlags = foldFlags;
return ApiStatus_DONE2;
}

2
src/evt/script_list.c
View File

@ -50,7 +50,7 @@ BSS s32 D_802DB26C; // unused?
// player_api
BSS Npc playerNpcData;
BSS u16 D_802DB5B0;
BSS u16 PlayerFoldFlags;
BSS s32 D_802DB5B4[3]; // unused
BSS VirtualEntityList bBattleVirtualEntityList;
BSS VirtualEntityList wWorldVirtualEntityList;

14
src/hud_element.c
View File

@ -1511,15 +1511,15 @@ void render_hud_element(HudElement* hudElement) {
case 1:
if (hudElement->flags & HUD_ELEMENT_FLAG_NO_FOLD) {
if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) {
fold_update(0, FOLD_TYPE_7, 255, 255, 255, hudElement->opacity, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, hudElement->opacity, 0);
} else {
fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
}
} else {
if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) {
fold_update(transform->foldIdx, FOLD_TYPE_7, 255, 255, 255, hudElement->opacity, 0);
fold_update(transform->foldIdx, FOLD_UPD_SET_ALPHA, 255, 255, 255, hudElement->opacity, 0);
} else {
fold_update(transform->foldIdx, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
fold_update(transform->foldIdx, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
}
}
@ -1534,12 +1534,12 @@ void render_hud_element(HudElement* hudElement) {
if (hudElement->flags & HUD_ELEMENT_FLAG_NO_FOLD) {
if (hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING) {
fold_appendGfx_component(0, &sp2A0, 0x40, sp60);
fold_appendGfx_component(0, &sp2A0, FOLD_STATE_FLAG_40, sp60);
} else {
fold_appendGfx_component(0, &sp2A0, 0x40, sp60);
fold_appendGfx_component(0, &sp2A0, FOLD_STATE_FLAG_40, sp60);
}
} else {
fold_appendGfx_component(transform->foldIdx, &sp2A0, 0x40, sp60);
fold_appendGfx_component(transform->foldIdx, &sp2A0, FOLD_STATE_FLAG_40, sp60);
}
break;
case 2:

2
src/i_spy.c
View File

@ -73,7 +73,7 @@ void appendGfx_ispy_icon(void) {
foldImage.palette = ispy_icon_3_pal;
break;
}
fold_update(0, FOLD_TYPE_7, 255, 255, 255, ISpyPtr->alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, ISpyPtr->alpha, 0);
foldImage.raster = ispy_icon_img;
foldImage.width = ispy_icon_img_width;

7
src/inspect_icon.c
View File

@ -80,9 +80,10 @@ void appendGfx_interact_prompt(void) {
sp20.xOffset = -16;
sp20.yOffset = 26;
sp20.opacity = 255;
fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0x440);
fold_update(0, FOLD_TYPE_6,
InspectIconPtr->brightness, InspectIconPtr->brightness, InspectIconPtr->brightness, 255, 0x448);
fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, FOLD_STATE_FLAG_400 | FOLD_STATE_FLAG_40);
fold_update(0, FOLD_UPD_SET_COLOR,
InspectIconPtr->brightness, InspectIconPtr->brightness, InspectIconPtr->brightness, 255,
FOLD_STATE_FLAG_400 | FOLD_STATE_FLAG_40 | FOLD_STATE_FLAG_8);
fold_appendGfx_component(0, &sp20, 0, sp78);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);

56
src/npc.c
View File

@ -141,7 +141,7 @@ s32 create_npc_impl(NpcBlueprint* blueprint, AnimID* animList, s32 isPeachNpc) {
npc->animationSpeed = 1.0f;
npc->renderYaw = 0.0f;
npc->foldType = 0;
npc->foldArg5 = 0;
npc->foldFlags = 0;
npc->collisionChannel = COLLISION_CHANNEL_20000;
npc->isFacingAway = FALSE;
npc->yawCamOffset = 0;
@ -1148,7 +1148,7 @@ void appendGfx_npc_blur(void* data) {
x = blur->x[index];
y = blur->y[index];
z = blur->z[index];
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_7, 255, 255, 255, 120 - (var_s5 * 20), 0);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_ALPHA, 255, 255, 255, 120 - (var_s5 * 20), 0);
yaw = npc->renderYaw;
guTranslateF(sp20, x, y, z);
@ -1928,7 +1928,7 @@ void npc_update_decoration_charged(Npc* npc, s32 idx) {
s32 temp3;
if (!npc->decorationInitialised[idx]) {
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_11, 20, 0, 0, 255, 0);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0);
npc->decorationInitialised[idx] = TRUE;
}
if (npc->decorationInitialised[idx] == TRUE) {
@ -1944,7 +1944,7 @@ void npc_update_decoration_charged(Npc* npc, s32 idx) {
}
for (temp3 = 255, i = 0; i < 20; i++) {
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_C, i, (sp50[i] << 24) | (sp38[i] << 16) | (sp20[i] << 8) | temp3, 0, 255, 0);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_COLOR_BUF_SET_C, i, (sp50[i] << 24) | (sp38[i] << 16) | (sp20[i] << 8) | temp3, 0, 255, 0);
}
}
}
@ -2086,76 +2086,76 @@ void func_8003D3BC(Npc* npc) {
s32 foldArg2 = npc->foldArg2;
s32 foldArg3 = npc->foldArg3;
s32 foldArg4 = npc->foldArg4;
s32 foldArg5 = npc->foldArg5;
s32 foldFlags = npc->foldFlags;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
switch (foldType) {
case FOLD_TYPE_NONE:
case FOLD_UPD_CLEAR:
npc->renderMode = RENDER_MODE_ALPHATEST;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, foldFlags);
break;
case FOLD_TYPE_2:
case FOLD_TYPE_3:
npc->renderMode = RENDER_MODE_ALPHATEST;
// fallthrough
case FOLD_TYPE_1:
func_802DE894(npc->spriteInstanceID, foldType, 0, 0, 0, 0, foldArg5);
func_802DE894(npc->spriteInstanceID, foldType, 0, 0, 0, 0, foldFlags);
break;
case FOLD_TYPE_4:
case FOLD_UPD_WAVY:
npc->renderMode = RENDER_MODE_ALPHATEST;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_4, foldArg1, foldArg2, foldArg3, 0, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_WAVY, foldArg1, foldArg2, foldArg3, 0, foldFlags);
break;
case FOLD_TYPE_6:
case FOLD_UPD_SET_COLOR:
npc->renderMode = RENDER_MODE_ALPHATEST;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_6, foldArg1, foldArg2, foldArg3, 255, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_COLOR, foldArg1, foldArg2, foldArg3, 255, foldFlags);
break;
case FOLD_TYPE_7:
case FOLD_UPD_SET_ALPHA:
npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_7, 255, 255, 255, foldArg1, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_ALPHA, 255, 255, 255, foldArg1, foldFlags);
break;
case FOLD_TYPE_8:
case FOLD_UPD_SET_TINT:
npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_8, foldArg1, foldArg2, foldArg3, foldArg4, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_TINT, foldArg1, foldArg2, foldArg3, foldArg4, foldFlags);
break;
case FOLD_TYPE_9:
npc->renderMode = RENDER_MODE_ALPHATEST;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_9, foldArg1, foldArg2, foldArg3, 255, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_9, foldArg1, foldArg2, foldArg3, 255, foldFlags);
break;
case FOLD_TYPE_A:
npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_A, foldArg1, foldArg2, foldArg3, foldArg4, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_A, foldArg1, foldArg2, foldArg3, foldArg4, foldFlags);
break;
case FOLD_TYPE_5:
case FOLD_UPD_SET_ANIM:
npc->renderMode = RENDER_MODE_ALPHATEST;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_5, foldArg1, foldArg2, foldArg3, 0, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_ANIM, foldArg1, foldArg2, foldArg3, 0, foldFlags);
break;
case FOLD_TYPE_D:
case FOLD_UPD_HOLOGRAM:
npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_D, foldArg1, foldArg2, foldArg3, foldArg4, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_UPD_HOLOGRAM, foldArg1, foldArg2, foldArg3, foldArg4, foldFlags);
break;
case FOLD_TYPE_E:
npc->renderMode = RENDER_MODE_ALPHATEST;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_E, foldArg1, foldArg2, foldArg3, 255, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_E, foldArg1, foldArg2, foldArg3, 255, foldFlags);
break;
case FOLD_TYPE_F:
npc->renderMode = RENDER_MODE_ALPHATEST;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_F, foldArg1, 255, 0, 255, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_F, foldArg1, 255, 0, 255, foldFlags);
break;
case FOLD_TYPE_10:
npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_F, foldArg1, foldArg2, 0, foldArg2, foldArg5);
func_802DE894(npc->spriteInstanceID, FOLD_TYPE_F, foldArg1, foldArg2, 0, foldArg2, foldFlags);
break;
}
}
void func_8003D624(Npc* npc, s32 foldType, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
void npc_set_fold_params(Npc* npc, s32 foldType, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
npc->foldType = foldType;
npc->foldArg1 = arg2;
npc->foldArg2 = arg3;
npc->foldArg3 = arg4;
npc->foldArg4 = arg5;
npc->foldArg5 = arg6;
npc->foldFlags = arg6;
func_8003D3BC(npc);
}

2
src/pause/pause_main.c
View File

@ -578,7 +578,7 @@ void pause_tutorial_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid
guMtxCatF(matrix2ptr, matrix1, matrix1);
guMtxF2L(matrix1, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_802DE894(gPauseTutorialSprites[i], FOLD_TYPE_6, 255, 255, 255, 255, 64);
func_802DE894(gPauseTutorialSprites[i], FOLD_UPD_SET_COLOR, 255, 255, 255, 255, 64);
spr_draw_npc_sprite(gPauseTutorialSprites[i], 0, 0, 0, matrix1);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
}

2
src/pause/pause_partners.c
View File

@ -341,7 +341,7 @@ void pause_partners_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid
} else {
color = 255.0f - offsetZ * 95.0f * 0.125f;
}
func_802DE894(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], FOLD_TYPE_6, color, color, color, 255, 0x40);
func_802DE894(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], FOLD_UPD_SET_COLOR, color, color, color, 255, 64);
spr_draw_npc_sprite(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], 0, 0, NULL, matrix);
}

2
src/pause/pause_spirits.c
View File

@ -196,7 +196,7 @@ void pause_spirits_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt
}
func_802DE894(gPauseSpiritsSpriteIDs[gPauseSpiritsIndexes[index]], FOLD_TYPE_8, color, color, color, alpha, 0x40);
func_802DE894(gPauseSpiritsSpriteIDs[gPauseSpiritsIndexes[index]], FOLD_UPD_SET_TINT, color, color, color, alpha, 64);
guTranslateF(matrix1, baseX + 22 + x, baseY + 77 + y + offsetY, 0.0f);
guRotateF(matrix2, 180.0f, 0.0f, 0.0f, 1.0f);
guMtxCatF(matrix2, matrix1, matrix1);

34
src/pause/pause_stats.c
View File

@ -594,8 +594,8 @@ void pause_stats_init(MenuPanel* panel) {
void pause_stats_handle_input(MenuPanel* panel) {
s32 initialSelection = panel->selected;
s16 adjustedBootsLevel;
s16 adjustedHammerLevel;
s16 bootsMsgIdx;
s16 hammerMsgIdx;
s32 msgOffset;
if (gPauseHeldButtons & BUTTON_STICK_LEFT) {
@ -652,33 +652,33 @@ void pause_stats_handle_input(MenuPanel* panel) {
}
msgOffset = 0;
adjustedBootsLevel = gPlayerData.bootsLevel;
adjustedHammerLevel = gPlayerData.hammerLevel;
bootsMsgIdx = gPlayerData.bootsLevel;
hammerMsgIdx = gPlayerData.hammerLevel;
adjustedBootsLevel++;
if (adjustedBootsLevel < 0) {
adjustedBootsLevel = 0;
bootsMsgIdx++;
if (bootsMsgIdx < 0) {
bootsMsgIdx = 0;
}
if (adjustedBootsLevel > 3) {
adjustedBootsLevel = 3;
if (bootsMsgIdx > 3) {
bootsMsgIdx = 3;
}
adjustedHammerLevel++;
if (adjustedHammerLevel < 0) {
adjustedHammerLevel = 0;
hammerMsgIdx++;
if (hammerMsgIdx < 0) {
hammerMsgIdx = 0;
}
if (adjustedHammerLevel > 3) {
adjustedHammerLevel = 3;
if (hammerMsgIdx > 3) {
hammerMsgIdx = 3;
}
switch (gStatsMenuEntries[panel->selected].baseMsgID) {
case PAUSE_MSG_TIP_BOOTS_1:
if (adjustedBootsLevel > 1) {
msgOffset = adjustedBootsLevel - 1;
if (bootsMsgIdx > 1) {
msgOffset = bootsMsgIdx - 1;
}
break;
case PAUSE_MSG_TIP_HAMMER_0:
msgOffset = adjustedHammerLevel;
msgOffset = hammerMsgIdx;
break;
case PAUSE_MSG_TIP_SECRETS:
if (evt_get_variable(NULL, GF_Tutorial_GotStarPiece)) {

6
src/speech_bubble.c
View File

@ -67,10 +67,10 @@ void appendGfx_speech_bubble(void) {
foldImg.xOffset = -16;
foldImg.yOffset = 26;
foldImg.opacity = 255;
fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0x440);
fold_update(0, FOLD_TYPE_6,
fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, FOLD_STATE_FLAG_400 | FOLD_STATE_FLAG_40);
fold_update(0, FOLD_UPD_SET_COLOR,
SpeechBubblePtr->brightness, SpeechBubblePtr->brightness, SpeechBubblePtr->brightness, 255, 0x440);
fold_appendGfx_component(0, &foldImg, 0x40, mtxTransform);
fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, mtxTransform);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
}

12
src/sprite.c
View File

@ -391,7 +391,7 @@ void spr_appendGfx_component(
foldImg.xOffset = -(width / 2);
foldImg.yOffset = height;
foldImg.opacity = opacity;
if (fold_appendGfx_component((u8) (u16) D_802DF540, &foldImg, 0x80000, mtxTransform) == 1) { // todo bitfield?
if (fold_appendGfx_component((u8) (u16) D_802DF540, &foldImg, FOLD_STATE_FLAG_80000, mtxTransform) == 1) { // todo bitfield?
D_802DF540 &= ~(0x80000000 | 0x40000000 | 0x20000000 | 0x10000000);
}
}
@ -1228,7 +1228,7 @@ s32 func_802DE748(s32 spriteIdx, s32 compIdx) {
}
}
void func_802DE780(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 foldArg0, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4) {
void func_802DE780(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4, s32 foldArg5) {
SpriteInstance* sprite = &SpriteInstances[spriteIdx];
SpriteComponent** componentList;
s32 i;
@ -1241,8 +1241,8 @@ void func_802DE780(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 foldArg0,
SpriteComponent* comp = *componentList;
if (compIdx == -1 || i == compIdx) {
fold_update((u8)comp->unk_4C, foldType, foldArg0, foldArg1, foldArg2, foldArg3, foldArg4);
if (foldType != FOLD_TYPE_NONE) {
fold_update((u8)comp->unk_4C, foldType, foldArg1, foldArg2, foldArg3, foldArg4, foldArg5);
if (foldType != FOLD_UPD_CLEAR) {
comp->unk_4C |= 0x10000000;
} else {
comp->unk_4C &= ~0xF0000000;
@ -1254,8 +1254,8 @@ void func_802DE780(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 foldArg0,
}
}
void func_802DE894(s32 spriteIdx, FoldType foldType, s32 foldArg0, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4) {
func_802DE780(spriteIdx, -1, foldType, foldArg0, foldArg1, foldArg2, foldArg3, foldArg4);
void func_802DE894(s32 spriteIdx, FoldType foldType, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4, s32 foldArg5) {
func_802DE780(spriteIdx, -1, foldType, foldArg1, foldArg2, foldArg3, foldArg4, foldArg5);
}
s32 func_802DE8DC(s32 spriteIdx, s32 compListIdx, s32* outX, s32* outY, s32* outZ) {

6
src/world/area_arn/arn_03/arn_03_3_npc.c
View File

@ -192,7 +192,7 @@ EvtScript N(802428CC) = {
EVT_END_IF
EVT_ADD(LVar1, 20)
EVT_CALL(SetNpcPos, NPC_Boo_05, LVar0, LVar1, LVar2)
EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_WAIT(1)
EVT_RETURN
EVT_END
@ -210,7 +210,7 @@ EvtScript N(802429D4) = {
EVT_CALL(MakeLerp, 0, 255, 40, EASING_LINEAR)
EVT_LABEL(10)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(10)
@ -233,7 +233,7 @@ EvtScript N(80242B0C) = {
EVT_CALL(MakeLerp, 255, 0, 40, EASING_LINEAR)
EVT_LABEL(10)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(10)

26
src/world/area_arn/arn_05/arn_05_3_npc.c
View File

@ -370,9 +370,9 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
EVT_SETF(LVar0, EVT_FLOAT(240.0))
EVT_LOOP(20 * DT)
EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32) (20 * DT)))
EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetNpcPos, NPC_Boo_01, 420, 300, 220)
@ -385,8 +385,8 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
EVT_SETF(LVar0, EVT_FLOAT(0.0))
EVT_LOOP(20 * DT)
EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32) (20 * DT)))
EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Flail, ANIM_Boo_Tan_Flail, 0, MSG_CH3_00A1)
@ -445,8 +445,8 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
EVT_SETF(LVar0, EVT_FLOAT(240.0))
EVT_LOOP(20 * DT)
EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32) (20 * DT)))
EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetNpcPos, NPC_Boo_01, NPC_DISPOSE_LOCATION)
@ -565,14 +565,14 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
EVT_SETF(LVar0, EVT_FLOAT(0.0))
EVT_LOOP(20 * DT)
EVT_ADDF(LVar0, EVT_FLOAT(250.0 / (s32) (20 * DT)))
EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(func_802CFD30, NPC_Boo_01, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo_02, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo_05, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_01, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_02, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_WAIT(10 * DT)
EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT))

8
src/world/area_arn/arn_07/arn_07_5_npc.c
View File

@ -133,12 +133,12 @@ EvtScript N(EVS_Scene_BossDefeated) = {
EVT_IF_NE(LVar6, PARTNER_BOW)
EVT_SET(LVar5, 8)
EVT_CALL(SetNpcPos, NPC_Bow, 257, 25, 0)
EVT_CALL(func_802CFD30, NPC_Bow, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bow, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(NpcFacePlayer, NPC_Bow, 0)
EVT_CALL(MakeLerp, 0, 240, 20 * DT, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_Bow, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bow, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP
@ -217,7 +217,7 @@ EvtScript N(EVS_Scene_BossDefeated) = {
EVT_CALL(MakeLerp, 240, 0, 20 * DT, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_Bow, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bow, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP
@ -282,7 +282,7 @@ EvtScript N(EVS_NpcIdle_Boo) = {
EVT_CALL(MakeLerp, LVar2, 240, LVar3, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP

6
src/world/area_dro/dro_02/dro_02_5_npc.c
View File

@ -318,8 +318,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 230, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(func_802D286C, 0x800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_THREAD
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
@ -339,7 +339,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerPos, -187, 0, -240)
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
EVT_CALL(PlayerMoveTo, -168, -195, 0)

16
src/world/area_dro/dro_02/npc_merlee.c
View File

@ -173,16 +173,16 @@ API_CALLABLE(N(CreateRitualCards)) {
N(CreatorScript) = script;
ret = func_8013A704(1);
fold_update(ret, FOLD_TYPE_5, 0xF, 1, 1, 0, 0x800);
fold_update(ret, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHUFFLE_CARDS, 1, 1, 0, FOLD_STATE_FLAG_800);
evt_set_variable(script, RITUAL_VAR_FOLDER_1, ret);
ret = func_8013A704(1);
fold_update(ret, FOLD_TYPE_5, 0x10, 1, 1, 0, 0x800);
fold_update(ret, FOLD_UPD_SET_ANIM, FOLD_ANIM_FLIP_CARD_1, 1, 1, 0, FOLD_STATE_FLAG_800);
evt_set_variable(script, RITUAL_VAR_FOLDER_2, ret);
ret = func_8013A704(1);
fold_update(ret, FOLD_TYPE_5, 0x11, 1, 1, 0, 0x800);
fold_update(ret, FOLD_UPD_SET_ANIM, FOLD_ANIM_FLIP_CARD_2, 1, 1, 0, FOLD_STATE_FLAG_800);
evt_set_variable(script, RITUAL_VAR_FOLDER_3, ret);
ret = func_8013A704(1);
fold_update(ret, FOLD_TYPE_5, 0x12, 1, 1, 0, 0x800);
fold_update(ret, FOLD_UPD_SET_ANIM, FOLD_ANIM_FLIP_CARD_3, 1, 1, 0, FOLD_STATE_FLAG_800);
evt_set_variable(script, RITUAL_VAR_FOLDER_4, ret);
evt_set_variable(script, RITUAL_VAR_WORKER, create_worker_world(
@ -250,7 +250,7 @@ u32 N(appendGfx_ritual_card)(RitualCard* card, Matrix4f mtxParent) {
guMtxCatF(mtxTemp, mtxParent, mtxTransform);
guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
ret = fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_1), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform);
ret = fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_1), &foldImage, FOLD_STATE_FLAG_SKIP_GFX_SETUP | FOLD_STATE_FLAG_SKIP_TEX_SETUP, mtxTransform);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
return ret;
}
@ -261,8 +261,8 @@ u32 N(appendGfx_ritual_card)(RitualCard* card, Matrix4f mtxParent) {
guMtxCatF(mtxTemp, mtxParent, mtxTransform);
guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_2), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform);
fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_3), &foldImage, FOLD_STATE_FLAG_10 | FOLD_STATE_FLAG_20, mtxTransform);
fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_2), &foldImage, FOLD_STATE_FLAG_SKIP_GFX_SETUP | FOLD_STATE_FLAG_SKIP_TEX_SETUP, mtxTransform);
fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_3), &foldImage, FOLD_STATE_FLAG_SKIP_GFX_SETUP | FOLD_STATE_FLAG_SKIP_TEX_SETUP, mtxTransform);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
guTranslateF(mtxTemp, N(RitualCards)[0].pos.x, N(RitualCards)[0].pos.y, N(RitualCards)[0].pos.z);
guMtxCatF(mtxTemp, mtxParent, mtxTransform);
@ -276,7 +276,7 @@ u32 N(appendGfx_ritual_card)(RitualCard* card, Matrix4f mtxParent) {
foldImage.xOffset = -(rasterInfo.width / 2);
foldImage.yOffset = rasterInfo.height / 2;
foldImage.opacity = 255;
ret = fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_4), &foldImage, FOLD_STATE_FLAG_10, mtxTransform);
ret = fold_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_4), &foldImage, FOLD_STATE_FLAG_SKIP_GFX_SETUP, mtxTransform);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
return ret;
}

20
src/world/area_end/common/Credits.inc.c
View File

@ -119,7 +119,7 @@ void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) {
if (alpha > 255.0f) {
alpha = 255.0;
}
fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0);
msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr);
posX += (glyphPtr->charWidth * 0.5);
@ -163,7 +163,7 @@ void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) {
} else if (chr->fadeInTime == (line->appearTime - 1)) {
fold_update(0, FOLD_TYPE_A, 80, 80, 80, alpha, 0);
} else {
fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0);
}
msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr);
@ -198,7 +198,7 @@ void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) {
if (alpha > 255.0f) {
alpha = 255.0f;
}
fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0);
scaleAmt = update_lerp(EASING_LINEAR, 0.2f, 2.0f, chr->fadeInTime, line->appearTime);
if (scaleAmt > 1.0) {
@ -241,7 +241,7 @@ void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) {
if (alpha > 255.0f) {
alpha = 255.0f;
}
fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0);
rotAngle = update_lerp(EASING_LINEAR, -75.0f, 30.0f, chr->fadeInTime, line->appearTime);
if (rotAngle >= 0.0f) {
@ -292,14 +292,14 @@ void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) {
scaleAmt = update_lerp(EASING_QUADRATIC_OUT, 2.0f, 1.0f, chr->fadeInTime, line->appearTime);
if (chr->fadeInTime == line->appearTime) {
fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
foldFlags |= FOLD_STATE_FLAG_NO_FILTERING;
} else {
f32 alpha = update_lerp(EASING_LINEAR, 16.0f, 300.0f, chr->fadeInTime, line->appearTime);
if (alpha > 255.0f) {
alpha = 255.0f;
}
fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0);
}
msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr);
@ -349,7 +349,7 @@ void N(CharAnim_HoldClearFold)(CreditsLine* line, CreditsChar* chr) {
f32 posX = chr->posX;
f32 posY = chr->posY;
fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
guTranslateF(transformMtx, posX, -posY, 0.0f);
guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]);
gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]),
@ -391,7 +391,7 @@ void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) {
f32 alpha;
alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime);
fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0);
msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr);
@ -423,7 +423,7 @@ void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) {
f32 posY = chr->posY;
alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime);
fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0);
scaleAmt = update_lerp(EASING_LINEAR, 1.0f, 0.2f, chr->fadeInTime, line->vanishTime);
msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr);
@ -458,7 +458,7 @@ void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) {
f32 posY = chr->posY;
alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime);
fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0);
fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0);
rotAngle = update_lerp(EASING_LINEAR, 0.0f, 60.0f, chr->fadeInTime, line->vanishTime);
msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr);

12
src/world/area_end/end_00/end_00_7_boos.c
View File

@ -77,9 +77,9 @@ EvtScript N(EVS_ParadePhase_Boos) = {
EVT_END_LOOP
EVT_WAIT(10 * DT)
EVT_CALL(N(SetUnusedAlpha), 255)
EVT_CALL(func_802CFD30, NPC_Boo1, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo2, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo3, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo1, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo2, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo3, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(EnableNpcShadow, NPC_Boo1, FALSE)
EVT_CALL(EnableNpcShadow, NPC_Boo2, FALSE)
EVT_CALL(EnableNpcShadow, NPC_Boo3, FALSE)
@ -97,9 +97,9 @@ EvtScript N(EVS_ParadePhase_Boos) = {
EVT_CALL(MakeLerp, 0, 255, 30 * DT, EASING_LINEAR)
EVT_LOOP(30 * DT)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_Boo1, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo2, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Boo3, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo1, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo2, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Boo3, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(EnableNpcShadow, NPC_Boo1, TRUE)

6
src/world/area_flo/flo_21/flo_21_4_npc.c
View File

@ -294,9 +294,9 @@ EvtScript N(EVS_HuffNPuff_Defeat_Flashing) = {
EVT_CALL(MakeLerp, 0, 255, 10, EASING_QUADRATIC_OUT)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_HuffNPuff_01, FOLD_TYPE_9, LVar0, LVar0, LVar0, 0)
EVT_CALL(func_802CFD30, NPC_HuffNPuff_02, FOLD_TYPE_9, LVar0, LVar0, LVar0, 0)
EVT_CALL(func_802CFD30, NPC_HuffNPuff_03, FOLD_TYPE_9, LVar0, LVar0, LVar0, 0)
EVT_CALL(SetNpcFoldParams, NPC_HuffNPuff_01, FOLD_TYPE_9, LVar0, LVar0, LVar0, 0)
EVT_CALL(SetNpcFoldParams, NPC_HuffNPuff_02, FOLD_TYPE_9, LVar0, LVar0, LVar0, 0)
EVT_CALL(SetNpcFoldParams, NPC_HuffNPuff_03, FOLD_TYPE_9, LVar0, LVar0, LVar0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP

28
src/world/area_hos/hos_01/hos_01_4_npc.c
View File

@ -386,13 +386,13 @@ EvtScript N(EVS_NpcAux_Eldstar) = {
EVT_IF_LT(LVar3, 0)
EVT_SETF(LVar3, EVT_FLOAT(0.0))
EVT_END_IF
EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Eldstar, 1, LVar2)
EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Mamar, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Skolar, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Muskular, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Misstar, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Klevar, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Kalmar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Eldstar, 1, LVar2)
EVT_CALL(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Mamar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Skolar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Muskular, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Misstar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Klevar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Kalmar, 1, LVar3)
EVT_WAIT(1)
EVT_END_LOOP
EVT_LOOP(20)
@ -408,13 +408,13 @@ EvtScript N(EVS_NpcAux_Eldstar) = {
EVT_IF_LT(LVar3, 0)
EVT_SETF(LVar3, EVT_FLOAT(0.0))
EVT_END_IF
EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Eldstar, 1, LVar2)
EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Mamar, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Skolar, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Muskular, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Misstar, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Klevar, 1, LVar3)
EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_D, 0, AB_HOS_StatcAmt_Kalmar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Eldstar, 1, LVar2)
EVT_CALL(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Mamar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Skolar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Muskular, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Misstar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Klevar, 1, LVar3)
EVT_CALL(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_HOLOGRAM, 0, AB_HOS_StatcAmt_Kalmar, 1, LVar3)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_LOOP

6
src/world/area_hos/hos_03/hos_03_6_npc.c
View File

@ -90,8 +90,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 204, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(func_802D286C, 0x800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_WAIT(61)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
EVT_THREAD
@ -108,7 +108,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_EXEC(N(EVS_SetupMusic))
EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerPos, 445, 25, 185)
EVT_CALL(PlayerMoveTo, 440, 215, 20)
EVT_RETURN

46
src/world/area_hos/hos_05/hos_05_5_intro.c
View File

@ -1108,7 +1108,7 @@ EvtScript N(EVS_CaptureSpirits) = {
EVT_END_IF
EVT_CALL(N(SetCardCaptureState1))
EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Panic)
EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_INVISIBLE, TRUE)
EVT_CALL(func_802D7B10, ArrayVar(13))
EVT_END_THREAD
@ -1136,7 +1136,7 @@ EvtScript N(EVS_CaptureSpirits) = {
EVT_END_IF
EVT_CALL(N(SetCardCaptureState1))
EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_IdleSad)
EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_INVISIBLE, TRUE)
EVT_CALL(func_802D7B10, ArrayVar(10))
EVT_END_THREAD
@ -1164,7 +1164,7 @@ EvtScript N(EVS_CaptureSpirits) = {
EVT_END_IF
EVT_CALL(N(SetCardCaptureState1))
EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Panic)
EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_INVISIBLE, TRUE)
EVT_CALL(func_802D7B10, ArrayVar(11))
EVT_END_THREAD
@ -1192,7 +1192,7 @@ EvtScript N(EVS_CaptureSpirits) = {
EVT_END_IF
EVT_CALL(N(SetCardCaptureState1))
EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Panic)
EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_INVISIBLE, TRUE)
EVT_CALL(func_802D7B10, ArrayVar(14))
EVT_END_THREAD
@ -1220,7 +1220,7 @@ EvtScript N(EVS_CaptureSpirits) = {
EVT_END_IF
EVT_CALL(N(SetCardCaptureState1))
EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Panic)
EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_INVISIBLE, TRUE)
EVT_CALL(func_802D7B10, ArrayVar(12))
EVT_END_THREAD
@ -1248,7 +1248,7 @@ EvtScript N(EVS_CaptureSpirits) = {
EVT_END_IF
EVT_CALL(N(SetCardCaptureState1))
EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Panic)
EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_INVISIBLE, TRUE)
EVT_CALL(func_802D7B10, ArrayVar(9))
EVT_END_THREAD
@ -2037,8 +2037,8 @@ EvtScript N(EVS_Scene_IntroStory) = {
EVT_CALL(LoadSettings, CAM_DEFAULT, EVT_PTR(N(IntroCamSettings6)))
EVT_CALL(N(AnimateStorybookPages))
EVT_WAIT(50 * DT)
EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bowser_Body, FOLD_UPD_SET_TINT, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bowser_Prop, FOLD_UPD_SET_TINT, 0, 0, 0, 0)
EVT_CALL(SetNpcPos, NPC_Bowser_Body, -64, 135, 85)
EVT_CALL(SetNpcPos, NPC_Bowser_Prop, -64, 135, 85)
EVT_THREAD
@ -2048,8 +2048,8 @@ EvtScript N(EVS_Scene_IntroStory) = {
EVT_IF_GT(LVar0, 255)
EVT_SET(LVar0, 255)
EVT_END_IF
EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, 0, 0, 0, LVar0)
EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, 0, 0, 0, LVar0)
EVT_CALL(SetNpcFoldParams, NPC_Bowser_Body, FOLD_UPD_SET_TINT, 0, 0, 0, LVar0)
EVT_CALL(SetNpcFoldParams, NPC_Bowser_Prop, FOLD_UPD_SET_TINT, 0, 0, 0, LVar0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD
@ -2088,8 +2088,8 @@ EvtScript N(EVS_Scene_IntroStory) = {
EVT_WAIT(5)
EVT_END_LOOP
EVT_WAIT(30 * DT)
EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, 0, 0, 0, 255)
EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, 0, 0, 0, 255)
EVT_CALL(SetNpcFoldParams, NPC_Bowser_Body, FOLD_UPD_SET_TINT, 0, 0, 0, 255)
EVT_CALL(SetNpcFoldParams, NPC_Bowser_Prop, FOLD_UPD_SET_TINT, 0, 0, 0, 255)
EVT_THREAD
EVT_SET(LVar0, 0)
EVT_LOOP(4)
@ -2097,8 +2097,8 @@ EvtScript N(EVS_Scene_IntroStory) = {
EVT_IF_GT(LVar0, 255)
EVT_SET(LVar0, 255)
EVT_END_IF
EVT_CALL(func_802CFD30, NPC_Bowser_Body, FOLD_TYPE_8, LVar0, LVar0, LVar0, 255)
EVT_CALL(func_802CFD30, NPC_Bowser_Prop, FOLD_TYPE_8, LVar0, LVar0, LVar0, 255)
EVT_CALL(SetNpcFoldParams, NPC_Bowser_Body, FOLD_UPD_SET_TINT, LVar0, LVar0, LVar0, 255)
EVT_CALL(SetNpcFoldParams, NPC_Bowser_Prop, FOLD_UPD_SET_TINT, LVar0, LVar0, LVar0, 255)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD
@ -2421,20 +2421,20 @@ EvtScript N(EVS_Scene_IntroStory) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(28)
EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_5, 8, 1, 1, 0)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_SET_ANIM, FOLD_ANIM_SPIRIT_CAPTURE, 1, 1, 0)
EVT_END_THREAD
EVT_SET(LVar0, 255)
EVT_LOOP(20)
EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_WAIT(15 * DT)
EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_7, 255, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_SET_ALPHA, 255, 0, 0, 0)
EVT_PLAY_EFFECT(EFFECT_SOMETHING_ROTATING, 2, -130, 220, 130, 1, 0)
EVT_SET(ArrayVar(0), LVarF)
EVT_SET(LVar0, -130)
@ -2466,7 +2466,7 @@ EvtScript N(EVS_Scene_IntroStory) = {
EVT_END_IF
EVT_CALL(N(SetCardCaptureState1))
EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Panic)
EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_INVISIBLE, TRUE)
EVT_CALL(func_802D7B10, ArrayVar(8))
EVT_END_THREAD

4
src/world/area_isk/isk_05/isk_05_3_npc.c
View File

@ -71,7 +71,7 @@ void N(func_80241610_97F0E0)(void) {
foldImg.yOffset = (spriteRaster.height / 2);
foldImg.opacity = 255;
fold_update(ambush->foldID, FOLD_TYPE_7, 255, 255, 255, ambush->alpha, 0);
fold_update(ambush->foldID, FOLD_UPD_SET_ALPHA, 255, 255, 255, ambush->alpha, 0);
fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
}
@ -218,7 +218,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = {
EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE)
EVT_WAIT(1)
EVT_CALL(N(DestroyAmbushWorker))
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(DisablePlayerInput, FALSE)
EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_StoneChomp)))
EVT_RETURN

4
src/world/area_isk/isk_07/isk_07_7_ambush.c
View File

@ -28,10 +28,10 @@ EvtScript N(EVS_SetupSarcophagi) = {
EVT_WAIT(12)
EVT_CALL(InterpPlayerYaw, 109, 0)
EVT_WAIT(3)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 0, 1, 1, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHOCK, 1, 1, 0)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked)
EVT_WAIT(20)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_END_THREAD
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))

4
src/world/area_isk/isk_13/isk_13_3_npc.c
View File

@ -77,7 +77,7 @@ void N(func_80241610_990DF0)(void) {
foldImg.yOffset = (spriteRaster.height / 2);
foldImg.opacity = 255;
fold_update(ambush->foldID, FOLD_TYPE_8, ambush->color.r, ambush->color.g, ambush->color.b, ambush->color.a, 0);
fold_update(ambush->foldID, FOLD_UPD_SET_TINT, ambush->color.r, ambush->color.g, ambush->color.b, ambush->color.a, 0);
fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);
}
@ -268,7 +268,7 @@ EvtScript N(EVS_NpcDefeat_StoneChomp_Override) = {
EVT_SET(GF_ISK13_Defeated_StoneChomp, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE)
EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(N(DestroyAmbushWorker))
EVT_CALL(GetBattleOutcome, LVar0)
EVT_SWITCH(LVar0)

2
src/world/area_isk/isk_14/isk_14_3_npc.c
View File

@ -165,7 +165,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = {
EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE)
EVT_WAIT(1)
EVT_CALL(N(DestroyAmbushWorker))
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_4 | ENEMY_FLAG_100000, 0)
EVT_WAIT(3)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)

22
src/world/area_isk/isk_16/isk_16_3_boss.c
View File

@ -48,18 +48,18 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = {
EVT_WAIT(30 * DT)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_END_THREAD
EVT_CALL(func_802CFD30, NPC_Tutankoopa_02, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_02, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, 410, -905, 410)
EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_02, ANIM_Tutankoopa_Anim10)
EVT_CALL(MakeLerp, 0, 255, 100 * DT, EASING_QUADRATIC_IN)
EVT_LABEL(2)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_Tutankoopa_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(2)
EVT_END_IF
EVT_CALL(func_802CFD30, NPC_Tutankoopa_02, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_02, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_WAIT(30 * DT)
EVT_SET(LVar0, 255)
EVT_LOOP(60 * DT)
@ -110,17 +110,17 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = {
EVT_WAIT(59)
EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_3EF, SOUND_SPACE_MODE_0)
EVT_END_THREAD
EVT_CALL(func_802CFD30, NPC_Tutankoopa_01, FOLD_TYPE_7, 255, 0, 0, 0)
EVT_CALL(func_802CFE2C, NPC_Tutankoopa_01, 0x800)
EVT_CALL(func_802CFD30, NPC_Tutankoopa_01, FOLD_TYPE_5, 14, 2, 1, 0)
EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_01, FOLD_UPD_SET_ALPHA, 255, 0, 0, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Tutankoopa_01, FOLD_STATE_FLAG_800)
EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_01, FOLD_UPD_SET_ANIM, FOLD_ANIM_TUTANKOOPA_SWIRL_1, 2, 1, 0)
EVT_WAIT(39)
EVT_CALL(func_802CFE2C, NPC_Tutankoopa_01, 0x800)
EVT_CALL(func_802CFD30, NPC_Tutankoopa_01, FOLD_TYPE_5, 13, 2, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Tutankoopa_01, FOLD_STATE_FLAG_800)
EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_01, FOLD_UPD_SET_ANIM, FOLD_ANIM_TUTANKOOPA_SWIRL_2, 2, 1, 0)
EVT_WAIT(39)
EVT_CALL(func_802CFE2C, NPC_Tutankoopa_01, 0x0800)
EVT_CALL(func_802CFD30, NPC_Tutankoopa_01, FOLD_TYPE_5, 12, 2, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Tutankoopa_01, FOLD_STATE_FLAG_800)
EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_01, FOLD_UPD_SET_ANIM, FOLD_ANIM_TUTANKOOPA_GATHER, 2, 1, 0)
EVT_WAIT(55)
EVT_CALL(func_802CFD30, NPC_Tutankoopa_01, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_01, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, 457, -1300, 316)
EVT_WAIT(10 * DT)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 438, -800, 332)

6
src/world/area_jan/jan_03/jan_03_4_npc.c
View File

@ -175,8 +175,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 229, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(func_802D286C, 0x800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_THREAD
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
@ -196,7 +196,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerPos, 345, 0, -186)
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
EVT_CALL(PlayerMoveTo, 291, -100, 0)

6
src/world/area_kkj/kkj_20/kkj_20_4_npc.c
View File

@ -150,8 +150,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 229, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(func_802D286C, 0x800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_THREAD
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
@ -172,7 +172,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerPos, 85, 0, -85)
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
EVT_CALL(PlayerMoveTo, 60, -50, 0)

4
src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c
View File

@ -61,8 +61,8 @@ EvtScript N(EVS_NpcIdle_Kammy_Broom) = {
EVT_END_IF
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(func_802D286C, 0x2000)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 8, 0, 0, 0, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_2000)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_TINT, 0, 0, 0, 0)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(DisablePartnerAI, 0)
EVT_WAIT(1)

14
src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c
View File

@ -109,7 +109,7 @@ EvtScript N(EVS_NpcInit_Twink) = {
};
EvtScript N(EVS_NpcInit_Eldstar) = {
EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(EnableNpcShadow, NPC_Eldstar, FALSE)
EVT_CALL(SetNpcPos, NPC_Eldstar, 100, 45, 0)
EVT_RETURN
@ -117,7 +117,7 @@ EvtScript N(EVS_NpcInit_Eldstar) = {
};
EvtScript N(EVS_NpcInit_Mamar) = {
EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(EnableNpcShadow, NPC_Mamar, FALSE)
EVT_CALL(SetNpcPos, NPC_Mamar, 46, 45, -27)
EVT_RETURN
@ -125,7 +125,7 @@ EvtScript N(EVS_NpcInit_Mamar) = {
};
EvtScript N(EVS_NpcInit_Skolar) = {
EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(EnableNpcShadow, NPC_Skolar, FALSE)
EVT_CALL(SetNpcPos, NPC_Skolar, 33, 45, -95)
EVT_RETURN
@ -133,7 +133,7 @@ EvtScript N(EVS_NpcInit_Skolar) = {
};
EvtScript N(EVS_NpcInit_Muskular) = {
EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(EnableNpcShadow, NPC_Muskular, FALSE)
EVT_CALL(SetNpcPos, NPC_Muskular, 71, 45, -132)
EVT_RETURN
@ -141,7 +141,7 @@ EvtScript N(EVS_NpcInit_Muskular) = {
};
EvtScript N(EVS_NpcInit_Misstar) = {
EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(EnableNpcShadow, NPC_Misstar, FALSE)
EVT_CALL(SetNpcPos, NPC_Misstar, 131, 45, -132)
EVT_RETURN
@ -149,7 +149,7 @@ EvtScript N(EVS_NpcInit_Misstar) = {
};
EvtScript N(EVS_NpcInit_Klevar) = {
EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(EnableNpcShadow, NPC_Klevar, FALSE)
EVT_CALL(SetNpcPos, NPC_Klevar, 169, 45, -95)
EVT_RETURN
@ -157,7 +157,7 @@ EvtScript N(EVS_NpcInit_Klevar) = {
};
EvtScript N(EVS_NpcInit_Kalmar) = {
EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(EnableNpcShadow, NPC_Kalmar, FALSE)
EVT_CALL(SetNpcPos, NPC_Kalmar, 156, 45, -27)
EVT_RETURN

28
src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c
View File

@ -200,7 +200,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = {
EVT_SETF(LVar0, 0)
EVT_LOOP(20)
EVT_ADDF(LVar0, EVT_FLOAT(12.0))
EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_WAIT(10)
@ -236,21 +236,21 @@ EvtScript N(EVS_Scene_KammyDefeated) = {
EVT_SETF(LVar0, 0)
EVT_LOOP(20)
EVT_ADDF(LVar0, EVT_FLOAT(12.0))
EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(0.0))
EVT_CALL(NpcJump0, NPC_Twink_01, 140, 65, 30, 20)
EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2)

4
src/world/area_kmr/kmr_00/kmr_00_4_npc.c
View File

@ -75,12 +75,12 @@ EvtScript N(EVS_NpcAux_StarSpirit) = {
EVT_LABEL(1)
EVT_LOOP(50)
EVT_ADDF(LVar0, EVT_FLOAT(0.8))
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_D, 0, ArrayVar(0), MV_Unk_01, LVar0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_HOLOGRAM, 0, ArrayVar(0), MV_Unk_01, LVar0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_LOOP(50)
EVT_ADDF(LVar0, EVT_FLOAT(-0.8))
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_D, 0, ArrayVar(0), MV_Unk_01, LVar0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_HOLOGRAM, 0, ArrayVar(0), MV_Unk_01, LVar0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_GOTO(1)

16
src/world/area_kmr/kmr_02/kmr_02_3_npc.c
View File

@ -231,11 +231,11 @@ EvtScript N(EVS_Goombaria_RequestDolly) = {
EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.0))
EVT_CALL(NpcJump0, NPC_Goombaria, LVar0, LVar1, LVar2, 10)
EVT_WAIT(10)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 1, 1, 1, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHIVER, 1, 1, 0)
EVT_WAIT(35)
EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle)
EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_WAIT(20)
EVT_ELSE
EVT_CALL(ContinueSpeech, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0099)
@ -559,14 +559,14 @@ EvtScript N(EVS_ReturnToVillage) = {
EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.0))
EVT_CALL(NpcJump0, NPC_Goombaria, -30, 0, -19, 10)
EVT_WAIT(10 * DT)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 1, 1, 1, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHIVER, 1, 1, 0)
EVT_WAIT(35 * DT)
EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0 / DT))
EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Walk)
EVT_CALL(NpcMoveTo, NPC_Goombaria, -23, -21, 0)
EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle)
EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(PlayerMoveTo, -85, -10, 0)
EVT_CALL(PlayerFaceNpc, NPC_Goombaria, TRUE)
EVT_WAIT(20 * DT)
@ -1457,7 +1457,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = {
EVT_CALL(MakeLerp, 0, 120, 80 * DT, EASING_LINEAR)
EVT_LABEL(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_Eldstar_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(0)
@ -1517,7 +1517,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = {
EVT_CALL(MakeLerp, 60, 0, 40 * DT, EASING_LINEAR)
EVT_LABEL(6)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_Eldstar_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Eldstar_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(6)
@ -1727,11 +1727,11 @@ EvtScript N(EVS_NpcAI_Eldstar_02) = {
EVT_SETF(LVar0, EVT_FLOAT(100.0))
EVT_LABEL(1)
EVT_LOOP(50)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_D, 0, ArrayVar(0), 0, MV_Unk_01)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_HOLOGRAM, 0, ArrayVar(0), 0, MV_Unk_01)
EVT_WAIT(1)
EVT_END_LOOP
EVT_LOOP(50)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_D, 0, ArrayVar(0), 0, MV_Unk_01)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_HOLOGRAM, 0, ArrayVar(0), 0, MV_Unk_01)
EVT_WAIT(1)
EVT_END_LOOP
EVT_GOTO(1)

6
src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c
View File

@ -276,8 +276,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 114, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(func_802D286C, 0x00000800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_WAIT(61)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
EVT_THREAD
@ -295,7 +295,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_EXEC(N(EVS_SetupMusic))
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerPos, -183, 19, -341)
EVT_CALL(PlayerMoveTo, -132, -325, 20)
EVT_RETURN

24
src/world/area_kmr/kmr_02/kmr_02_7_kammy.c
View File

@ -216,15 +216,15 @@ EvtScript N(EVS_Scene_KammyStrikes) = {
EVT_EXEC_WAIT(N(EVS_SummonGateBlock))
EVT_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHoverStill)
EVT_CALL(func_802D286C, 256)
EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHoverStill, 5, 0, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_REVERSE_ANIM)
EVT_CALL(UpdatePlayerFold, ANIM_MarioW2_PanicHoverStill, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHOCK, 1, 1, 0)
EVT_WAIT(13 * DT)
EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHoverStill, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_MarioW2_PanicHoverStill, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHover)
EVT_CALL(func_802D286C, 256)
EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHover, 5, 0, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_REVERSE_ANIM)
EVT_CALL(UpdatePlayerFold, ANIM_MarioW2_PanicHover, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHOCK, 1, 1, 0)
EVT_WAIT(13 * DT)
EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHover, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_MarioW2_PanicHover, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.8))
@ -234,22 +234,22 @@ EvtScript N(EVS_Scene_KammyStrikes) = {
EVT_END_THREAD
EVT_THREAD
EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Shock)
EVT_CALL(func_802CFE2C, NPC_Goombaria, 0x100)
EVT_CALL(func_802CFD30, NPC_Goombaria, FOLD_TYPE_5, 0, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Goombaria, FOLD_STATE_FLAG_REVERSE_ANIM)
EVT_CALL(SetNpcFoldParams, NPC_Goombaria, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHOCK, 1, 1, 0)
EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.5))
EVT_CALL(GetNpcPos, NPC_Goombaria, LVar0, LVar1, LVar2)
EVT_CALL(NpcJump0, NPC_Goombaria, LVar0, LVar1, LVar2, 25 * DT)
EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LookUp)
EVT_CALL(func_802CFD30, NPC_Goombaria, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Goombaria, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_END_THREAD
EVT_CALL(func_802CFE2C, NPC_Goompapa, 0x100)
EVT_CALL(func_802CFD30, NPC_Goompapa, FOLD_TYPE_5, 0, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Goompapa, FOLD_STATE_FLAG_REVERSE_ANIM)
EVT_CALL(SetNpcFoldParams, NPC_Goompapa, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHOCK, 1, 1, 0)
EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Shock)
EVT_CALL(SetNpcJumpscale, NPC_Goompapa, EVT_FLOAT(1.2))
EVT_CALL(GetNpcPos, NPC_Goompapa, LVar0, LVar1, LVar2)
EVT_CALL(NpcJump0, NPC_Goompapa, LVar0, LVar1, LVar2, 25 * DT)
EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_LookUp)
EVT_CALL(func_802CFD30, NPC_Goompapa, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Goompapa, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_WAIT(10 * DT)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13)
EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE)

6
src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c
View File

@ -62,11 +62,11 @@ EvtScript N(EVS_Scene_FallingDown) = {
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2 / DT))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_END_THREAD
EVT_CALL(func_802D286C, 0x00002800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 5, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_2000 | FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_FLUTTER_DOWN, 1, 1, 0)
EVT_WAIT(100 * DT)
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump)
EVT_WAIT(10 * DT)

2
src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c
View File

@ -52,7 +52,7 @@ void N(appendGfx_sticker)(void* renderData) {
if (sticker->yaw != 0.0 || sticker->pitch != 0.0) {
foldFlags |= FOLD_STATE_FLAG_2000;
}
fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0);
fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0);
fold_appendGfx_component(0, &foldImage, foldFlags, mtxTransform);
gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW);

10
src/world/area_kmr/kmr_09/kmr_09_3_npc.c
View File

@ -88,11 +88,11 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = {
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_F8, SOUND_SPACE_MODE_0)
EVT_CALL(func_802CFE2C, NPC_SELF, 0x2000)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 6, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_SELF, FOLD_STATE_FLAG_2000)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ANIM, FOLD_ANIM_UNFURL, 1, 1, 0)
EVT_WAIT(15)
EVT_CALL(func_802CFE2C, NPC_SELF, 0x2000)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_3, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldFlags, NPC_SELF, FOLD_STATE_FLAG_2000)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_3, 0, 0, 0, 0)
EVT_THREAD
EVT_WAIT(2)
EVT_SETF(LVar0, EVT_FLOAT(0.0))
@ -107,7 +107,7 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = {
EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE)
EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.6))
EVT_CALL(NpcJump0, NPC_SELF, -35, 0, 25, 23)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_NO_SHADOW_RAYCAST, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)

6
src/world/area_kmr/kmr_12/kmr_12_3_npc.c
View File

@ -62,15 +62,15 @@ EvtScript N(EVS_NpcIdle_Goomba) = {
EVT_WAIT(20)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goomba_Idle)
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_F8, SOUND_SPACE_MODE_0)
EVT_CALL(func_802CFE2C, NPC_SELF, 0x2000)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 6, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_SELF, FOLD_STATE_FLAG_2000)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ANIM, FOLD_ANIM_UNFURL, 1, 1, 0)
EVT_WAIT(12)
EVT_WAIT(5)
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0)
EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE)
EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.6))
EVT_CALL(NpcJump0, NPC_SELF, -35, 0, 30, 23)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, FALSE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0)

4
src/world/area_kmr/kmr_20/kmr_20_10_npc.c
View File

@ -675,8 +675,8 @@ EvtScript N(EVS_NpcAI_ShyGuy) = {
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, SOUND_SPACE_MODE_0)
EVT_CALL(NpcJump0, NPC_SELF, 594, 30, -220, 15)
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0)
EVT_CALL(func_802CFE2C, NPC_SELF, 0x00000800)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 2, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_SELF, FOLD_STATE_FLAG_800)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar1, 10)
EVT_LOOP(30)

8
src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c
View File

@ -77,8 +77,8 @@ EvtScript N(EVS_Player_EnterPipe_Intro) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD
EVT_CALL(func_802D286C, 0x00000800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 2, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_WAIT(25)
EVT_RETURN
EVT_END
@ -107,8 +107,8 @@ EvtScript N(EVS_Luigi_EnterPipe_Intro) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD
EVT_CALL(func_802CFE2C, NPC_Scene_Luigi, 0x00000800)
EVT_CALL(func_802CFD30, NPC_Scene_Luigi, FOLD_TYPE_5, 2, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Scene_Luigi, FOLD_STATE_FLAG_800)
EVT_CALL(SetNpcFoldParams, NPC_Scene_Luigi, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_WAIT(25)
EVT_RETURN
EVT_END

8
src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c
View File

@ -149,8 +149,8 @@ EvtScript N(EVS_Player_EnterPipe_Epilogue) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD
EVT_CALL(func_802D286C, 0x00000800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 2, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_WAIT(25)
EVT_RETURN
EVT_END
@ -179,8 +179,8 @@ EvtScript N(EVS_Luigi_EnterPipe_Epilogue) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD
EVT_CALL(func_802CFE2C, NPC_Luigi_1, 0x00000800)
EVT_CALL(func_802CFD30, NPC_Luigi_1, FOLD_TYPE_5, 2, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Luigi_1, FOLD_STATE_FLAG_800)
EVT_CALL(SetNpcFoldParams, NPC_Luigi_1, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_WAIT(25)
EVT_RETURN
EVT_END

6
src/world/area_kmr/kmr_20/kmr_20_8_bed.c
View File

@ -64,8 +64,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_END_LOOP
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(func_802D286C, 0x00000800)
EVT_CALL(func_802D2520, 0x00010002, 5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, 0x00010002, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_THREAD
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
@ -99,7 +99,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_CALL(N(SetAmbienceVolumeHalf_Bed))
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerPos, -45, 30, -70)
EVT_CALL(InterpPlayerYaw, 90, 0)
EVT_CALL(SetNpcPos, NPC_PARTNER, -75, 30, -70)

4
src/world/area_kmr/kmr_22/npc/chapter_1.inc.c
View File

@ -1,13 +1,13 @@
EvtScript N(EVS_NpcInit_Eldstar) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldEldstar_Still)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_KoopaBros) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1B)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};

14
src/world/area_kmr/kmr_22/npc/chapter_2.inc.c
View File

@ -1,32 +1,32 @@
EvtScript N(EVS_NpcInit_Mamar) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMamar_Still)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_Tutankoopa) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Tutankoopa_Anim08)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_ChainChomp) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ChainChomp_Anim03)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_SELF, 5, -25, -180)
EVT_CALL(SetNpcAnimation, NPC_ChainChomp_02, ANIM_ChainChomp_Anim02)
EVT_CALL(func_802CFD30, NPC_ChainChomp_02, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_ChainChomp_02, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_ChainChomp_02, 35, -14, -180)
EVT_CALL(SetNpcAnimation, NPC_ChainChomp_03, ANIM_ChainChomp_Anim02)
EVT_CALL(func_802CFD30, NPC_ChainChomp_03, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_ChainChomp_03, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_ChainChomp_03, 52, -18, -180)
EVT_CALL(SetNpcAnimation, NPC_ChainChomp_04, ANIM_ChainChomp_Anim02)
EVT_CALL(func_802CFD30, NPC_ChainChomp_04, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_ChainChomp_04, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_ChainChomp_04, 69, -19, -180)
EVT_CALL(SetNpcAnimation, NPC_ChainChomp_05, ANIM_ChainChomp_Anim02)
EVT_CALL(func_802CFD30, NPC_ChainChomp_05, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_ChainChomp_05, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_ChainChomp_05, 86, -19, -180)
EVT_RETURN
EVT_END

4
src/world/area_kmr/kmr_22/npc/chapter_3.inc.c
View File

@ -1,13 +1,13 @@
EvtScript N(EVS_NpcInit_Skolar) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSkolar_Still)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_Tubba) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim10)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};

6
src/world/area_kmr/kmr_22/npc/chapter_4.inc.c
View File

@ -1,20 +1,20 @@
EvtScript N(EVS_NpcInit_Muskular) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMuskular_Still)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_GeneralGuy) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GeneralGuy_Anim03)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_ShyGuy) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim02)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};

2
src/world/area_kmr/kmr_22/npc/chapter_5.inc.c
View File

@ -1,6 +1,6 @@
EvtScript N(EVS_NpcInit_Misstar) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Still)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128)
EVT_RETURN
EVT_END
};

12
src/world/area_kmr/kmr_22/npc/chapter_6.inc.c
View File

@ -1,13 +1,13 @@
EvtScript N(EVS_NpcInit_Klevar) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKlevar_Still)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_HuffNPuff_Body) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim1A)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_SELF, 40, 45, 1)
EVT_RETURN
EVT_END
@ -15,7 +15,7 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Body) = {
EvtScript N(EVS_NpcInit_HuffNPuff_Face) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim1B)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_SELF, 40, 45, 1)
EVT_RETURN
EVT_END
@ -23,7 +23,7 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Face) = {
EvtScript N(EVS_NpcInit_HuffNPuff_Arms) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim1C)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_SELF, 40, 45, 1)
EVT_RETURN
EVT_END
@ -31,10 +31,10 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Arms) = {
EvtScript N(EVS_NpcInit_TuffPuff_01) = {
EVT_CALL(SetNpcAnimation, NPC_TuffPuff_01, ANIM_TuffPuff_Idle)
EVT_CALL(func_802CFD30, NPC_TuffPuff_01, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_TuffPuff_01, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_TuffPuff_01, 120, -1, -51)
EVT_CALL(SetNpcAnimation, NPC_TuffPuff_02, ANIM_TuffPuff_Idle)
EVT_CALL(func_802CFD30, NPC_TuffPuff_02, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_TuffPuff_02, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcPos, NPC_TuffPuff_02, -40, 59, 1)
EVT_RETURN
EVT_END

10
src/world/area_kmr/kmr_22/npc/chapter_7.inc.c
View File

@ -1,34 +1,34 @@
EvtScript N(EVS_NpcInit_Kalmar) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKalmar_Still)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_CrystalKing) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim09)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_IceCube) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0A)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_IceSphere) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0B)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInit_IceSpike) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0C)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};

2
src/world/area_kmr/kmr_22/npc/chapter_8.inc.c
View File

@ -1,6 +1,6 @@
EvtScript N(EVS_NpcInit_Bowser) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBowser_Talk)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_RETURN
EVT_END
};

6
src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c
View File

@ -179,9 +179,9 @@ EvtScript N(EVS_NpcAux_LavaPiranhaHead) = {
};
EvtScript N(EVS_NpcInit_LavaPiranhaHead) = {
EVT_CALL(func_802CFD30, NPC_LavaPiranhaHead, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(func_802CFD30, NPC_LavaBud_01, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(func_802CFD30, NPC_LavaBud_02, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_LavaPiranhaHead, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_LavaBud_01, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcFoldParams, NPC_LavaBud_02, FOLD_TYPE_E, 80, 80, 80, 0)
EVT_CALL(SetNpcAnimation, NPC_LavaPiranhaHead, ANIM_LavaPiranha_Anim03)
EVT_CALL(SetNpcAnimation, NPC_LavaBud_01, ANIM_LavaBud_Anim03)
EVT_CALL(SetNpcAnimation, NPC_LavaBud_02, ANIM_LavaBud_Anim03)

2
src/world/area_kmr/kmr_23/kmr_23_2_npc.c
View File

@ -528,7 +528,7 @@ EvtScript N(EVS_NpcInit_Eldstar_01) = {
EvtScript N(EVS_NpcInit_Eldstar_02) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ENEMY_ANIM_8)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 0)
EVT_CALL(SetNpcPos, NPC_SELF, 0, 94, 0)
EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
EVT_RETURN

6
src/world/area_kpa/kpa_91/kpa_91_3_npc.c
View File

@ -41,8 +41,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 114, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(func_802D286C, 0x00002800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_2000 | FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_WAIT(61)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
EVT_THREAD
@ -62,7 +62,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(SetPanTarget, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(SetPlayerPos, -139, 0, -90)
EVT_CALL(PlayerMoveTo, -102, -130, 20)

6
src/world/area_kpa/kpa_95/kpa_95_4_npc.c
View File

@ -42,8 +42,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 114, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(func_802D286C, 0x00002800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_2000 | FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_WAIT(61)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
EVT_THREAD
@ -63,7 +63,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(SetPanTarget, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(SetPlayerPos, -139, 0, -90)
EVT_CALL(PlayerMoveTo, -102, -130, 20)

4
src/world/area_kzn/common/SpinyTromp.inc.c
View File

@ -62,14 +62,14 @@ EvtScript N(D_80240D10_C7EE90) = {
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen)
EVT_WAIT(1)
EVT_CALL(N(SpinyTrompHit))
EVT_CALL(func_802D2520, ANIM_Mario1_Fallen, 4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Fallen, FOLD_UPD_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0)
EVT_LABEL(1)
EVT_WAIT(1)
EVT_IF_EQ(AF_KZN_TrompRollingDone, FALSE)
EVT_GOTO(1)
EVT_END_IF
EVT_WAIT(30)
EVT_CALL(func_802D2520, ANIM_Mario1_Fallen, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Fallen, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp)
EVT_CALL(N(UnkFunc48), 0)
EVT_LABEL(2)

4
src/world/area_kzn/kzn_17/kzn_17_3_npc.c
View File

@ -45,7 +45,7 @@ EvtScript N(EVS_Kolorado_TrompImpact) = {
EVT_CALL(SetNpcRotationPivot, NPC_Kolorado, 13)
EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250)
EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill)
EVT_CALL(func_802CFD30, NPC_Kolorado, FOLD_TYPE_4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Kolorado, FOLD_UPD_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0)
EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0)
EVT_THREAD
EVT_CALL(SetNpcCollisionSize, NPC_Kolorado, 20, 24)
@ -70,7 +70,7 @@ EvtScript N(EVS_Kolorado_HurtInit) = {
EVT_CALL(SetNpcRotationPivot, NPC_Kolorado, 13)
EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250)
EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill)
EVT_CALL(func_802CFD30, NPC_Kolorado, FOLD_TYPE_4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Kolorado, FOLD_UPD_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0)
EVT_RETURN
EVT_END
};

12
src/world/area_mac/mac_00/mac_00_12_intro.c
View File

@ -7,15 +7,15 @@ EvtScript N(EVS_PlayerExitPipe_Intro) = {
EVT_CALL(InterpPlayerYaw, 135, 0)
EVT_WAIT(2)
EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0)
EVT_CALL(func_802D286C, 0x100)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 2, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_REVERSE_ANIM)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_LOOP(40)
EVT_ADD(LVar1, 1)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(DisablePlayerPhysics, FALSE)
EVT_RETURN
@ -28,8 +28,8 @@ EvtScript N(EVS_LuigiExitPipe_Intro) = {
EVT_CALL(SetNpcYaw, NPC_Luigi_Intro, 135)
EVT_WAIT(2)
EVT_CALL(PlaySoundAtNpc, NPC_Luigi_Intro, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0)
EVT_CALL(func_802CFE2C, NPC_Luigi_Intro, 0x100)
EVT_CALL(func_802CFD30, NPC_Luigi_Intro, FOLD_TYPE_5, 2, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Luigi_Intro, FOLD_STATE_FLAG_REVERSE_ANIM)
EVT_CALL(SetNpcFoldParams, NPC_Luigi_Intro, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_CALL(SetNpcPos, NPC_Luigi_Intro, -100, -10, -370)
EVT_CALL(GetNpcPos, NPC_Luigi_Intro, LVar0, LVar1, LVar2)
EVT_LOOP(45)
@ -37,7 +37,7 @@ EvtScript N(EVS_LuigiExitPipe_Intro) = {
EVT_CALL(SetNpcPos, NPC_Luigi_Intro, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(func_802CFD30, NPC_Luigi_Intro, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Luigi_Intro, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcPos, NPC_Luigi_Intro, -100, 30, -370)
EVT_WAIT(3)
EVT_CALL(EnableNpcShadow, NPC_Luigi_Intro, TRUE)

12
src/world/area_mac/mac_00/mac_00_14_epilogue.c
View File

@ -7,15 +7,15 @@ EvtScript N(EVS_PlayerExitPipe_Epilogue) = {
EVT_CALL(InterpPlayerYaw, 135, 0)
EVT_WAIT(2)
EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0)
EVT_CALL(func_802D286C, 0x100)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 2, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_REVERSE_ANIM)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_LOOP(40)
EVT_ADD(LVar1, 1)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(DisablePlayerPhysics, FALSE)
EVT_RETURN
@ -28,8 +28,8 @@ EvtScript N(EVS_LuigiExitPipe_Epilogue) = {
EVT_CALL(SetNpcYaw, NPC_Luigi_Epilogue, 135)
EVT_WAIT(2)
EVT_CALL(PlaySoundAtNpc, NPC_Luigi_Epilogue, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0)
EVT_CALL(func_802CFE2C, NPC_Luigi_Epilogue, 0x100)
EVT_CALL(func_802CFD30, NPC_Luigi_Epilogue, FOLD_TYPE_5, 2, 1, 1, 0)
EVT_CALL(SetNpcFoldFlags, NPC_Luigi_Epilogue, FOLD_STATE_FLAG_REVERSE_ANIM)
EVT_CALL(SetNpcFoldParams, NPC_Luigi_Epilogue, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0)
EVT_CALL(SetNpcPos, NPC_Luigi_Epilogue, -100, -10, -370)
EVT_CALL(GetNpcPos, NPC_Luigi_Epilogue, LVar0, LVar1, LVar2)
EVT_LOOP(45)
@ -37,7 +37,7 @@ EvtScript N(EVS_LuigiExitPipe_Epilogue) = {
EVT_CALL(SetNpcPos, NPC_Luigi_Epilogue, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(func_802CFD30, NPC_Luigi_Epilogue, FOLD_TYPE_NONE, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Luigi_Epilogue, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetNpcPos, NPC_Luigi_Epilogue, -100, 30, -370)
EVT_WAIT(3)
EVT_CALL(EnableNpcShadow, NPC_Luigi_Epilogue, TRUE)

6
src/world/area_mac/mac_01/mac_01_9_npc.c
View File

@ -1792,8 +1792,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 263, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still)
EVT_CALL(func_802D286C, 0x800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_THREAD
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
@ -1814,7 +1814,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_EXEC(N(EVS_SetupMusic))
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
EVT_CALL(SetPlayerPos, 568, 20, -186)
EVT_CALL(PlayerMoveTo, 525, -168, 20)

4
src/world/area_mac/mac_02/npc/bootler.inc.c
View File

@ -8,7 +8,7 @@ EvtScript N(D_8024ACA4_82DF64) = {
EVT_END_IF
EVT_LOOP(10)
EVT_ADDF(LVar0, LVar1)
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_RETURN
@ -67,7 +67,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = {
EVT_WAIT(20 * DT)
EVT_SETF(LVar0, EVT_FLOAT(0.0))
EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Spook)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CALL(SetNpcYaw, NPC_SELF, 270)
EVT_CALL(SetNpcPos, NPC_SELF, 500, 50, 30)
EVT_EXEC_WAIT(N(D_8024ACA4_82DF64))

4
src/world/area_mac/machi/machi_6_misstar.c
View File

@ -49,12 +49,12 @@ EvtScript N(EVS_NpcAux_Misstar) = {
EVT_SETF(LVar0, EVT_FLOAT(40.0))
EVT_LOOP(20)
EVT_ADDF(LVar0, EVT_FLOAT(4.0))
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_LOOP(20)
EVT_ADDF(LVar0, EVT_FLOAT(-4.0))
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_GOTO(0)

10
src/world/area_mim/mim_10/mim_10_4_npc.c
View File

@ -113,7 +113,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = {
EVT_END_THREAD
EVT_CALL(DisablePlayerInput, TRUE)
EVT_CALL(SetNpcPos, NPC_Bootler, 200, 44, 0)
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_SET(MV_Unk_00, TRUE)
EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8)
EVT_WAIT(20 * DT)
@ -131,7 +131,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = {
EVT_SETF(LVar0, EVT_FLOAT(0.0))
EVT_LOOP(20 * DT)
EVT_ADDF(LVar0, EVT_FLOAT(VAR_1))
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_WAIT(20 * DT)
@ -156,7 +156,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = {
EVT_SETF(LVar0, EVT_FLOAT(240.0))
EVT_LOOP(20 * DT)
EVT_SUBF(LVar0, EVT_FLOAT(VAR_1))
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_WAIT(25 * DT)
@ -169,7 +169,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = {
EVT_SETF(LVar0, EVT_FLOAT(0.0))
EVT_LOOP(20 * DT)
EVT_ADDF(LVar0, EVT_FLOAT(VAR_1))
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD
@ -182,7 +182,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = {
EVT_SETF(LVar0, EVT_FLOAT(240.0))
EVT_LOOP(20 * DT)
EVT_SUBF(LVar0, EVT_FLOAT(VAR_1))
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_SET(GB_StoryProgress, STORY_CH3_INVITED_TO_BOOS_MANSION)

4
src/world/area_mim/mim_11/mim_11_3_gate.c
View File

@ -46,7 +46,7 @@ EvtScript N(D_80242560_BB95D0) = {
EVT_SETF(LVar0, EVT_FLOAT(0.0))
EVT_LOOP(90 * DT)
EVT_ADDF(LVar0, EVT_FLOAT(2.6667 / DT))
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0028)
@ -69,7 +69,7 @@ EvtScript N(D_80242560_BB95D0) = {
EVT_SETF(LVar0, EVT_FLOAT(240.0))
EVT_LOOP(90 * DT)
EVT_SUBF(LVar0, EVT_FLOAT(2.6667 / DT))
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(RemoveNpc, NPC_Bootler)

2
src/world/area_mim/mim_11/mim_11_5_npc.c
View File

@ -66,7 +66,7 @@ EvtScript N(EVS_NpcInit_Bootler) = {
EVT_SWITCH(GB_StoryProgress)
EVT_CASE_LT(STORY_CH3_OPENED_BOOS_MANSION_GATE)
EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_CASE_DEFAULT
EVT_CALL(RemoveNpc, NPC_SELF)
EVT_END_SWITCH

4
src/world/area_mim/mim_12/mim_12_3_main.c
View File

@ -18,8 +18,8 @@ EvtScript N(EVS_EnterMap) = {
EVT_SETF(LVar0, EVT_FLOAT(240.0))
EVT_LOOP(20)
EVT_SUBF(LVar0, EVT_FLOAT(12.0))
EVT_CALL(func_802CFD30, NPC_GateBoo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_GateBoo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GateBoo_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GateBoo_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_WAIT(10)

8
src/world/area_mim/mim_12/mim_12_5_gate.c
View File

@ -329,8 +329,8 @@ EvtScript N(EVS_Scene_UnlockGate) = {
EVT_SETF(LVar0, EVT_FLOAT(0.0))
EVT_LOOP(20 * DT)
EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT)))
EVT_CALL(func_802CFD30, NPC_GateBoo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_GateBoo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GateBoo_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GateBoo_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_WAIT(10 * DT)
@ -359,8 +359,8 @@ EvtScript N(EVS_Scene_UnlockGate) = {
EVT_SETF(LVar0, EVT_FLOAT(240.0))
EVT_LOOP(20 * DT)
EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT)))
EVT_CALL(func_802CFD30, NPC_GateBoo_01, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_GateBoo_02, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GateBoo_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GateBoo_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetNpcPos, NPC_GateBoo_01, NPC_DISPOSE_LOCATION)

6
src/world/area_nok/nok_01/nok_01_4_npc.c
View File

@ -333,8 +333,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EVT_CALL(InterpPlayerYaw, 160, 1)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still)
EVT_CALL(func_802D286C, 0x800)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0)
EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0)
EVT_THREAD
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding)
@ -354,7 +354,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = {
EvtScript N(EVS_ToadHouse_ReturnFromRest) = {
EVT_CALL(HidePlayerShadow, FALSE)
EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0)
EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0)
EVT_CALL(SetPlayerPos, -380, 0, 5)
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
EVT_CALL(PlayerMoveTo, -325, 79, 0)

2
src/world/area_obk/common/TrafficBoos.inc.c
View File

@ -101,7 +101,7 @@ EvtScript N(EVS_NpcIdle_TrafficBoo) = {
EVT_LOOP(0)
EVT_CALL(N(UpdateTrafficBooMotion))
EVT_CALL(N(UpdateTrafficBooAlpha))
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcRenderMode, NPC_SELF, RENDER_MODE_SURFACE_XLU_LAYER1)
EVT_WAIT(1)
EVT_END_LOOP

2
src/world/area_obk/obk_01/obk_01_5_jump_scare.c
View File

@ -32,7 +32,7 @@ EvtScript N(EVS_Scene_JumpScareBoo) = {
EVT_SETF(LVar0, EVT_FLOAT(240.0))
EVT_LOOP(20 * DT)
EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT)))
EVT_CALL(func_802CFD30, NPC_JumpScareBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_JumpScareBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(RemoveNpc, NPC_JumpScareBoo)

2
src/world/area_obk/obk_01/obk_01_6_npc.c
View File

@ -109,7 +109,7 @@ EvtScript N(EVS_NpcAux_TrafficBoo) = {
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(N(UpdateTrafficBooAlpha))
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_RETURN

22
src/world/area_obk/obk_04/obk_04_3_npc.c
View File

@ -34,11 +34,11 @@ API_CALLABLE(N(InitHiddenBoo)) {
void N(func_802400D0_BC7F30)(Npc* npc) {
if (npc->yaw > 340.0f || npc->yaw < 20.0f) {
npc->renderMode = RENDER_MODE_ALPHATEST;
npc->foldArg5 = 0;
func_8003D624(npc, FOLD_TYPE_NONE, 0, 0, 0, 0, npc->foldArg5);
npc->foldFlags = 0;
npc_set_fold_params(npc, FOLD_UPD_CLEAR, 0, 0, 0, 0, npc->foldFlags);
} else {
npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
func_8003D624(npc, FOLD_TYPE_7, gPlayerStatusPtr->alpha1, 255, 0, 0, npc->foldArg5);
npc_set_fold_params(npc, FOLD_UPD_SET_ALPHA, gPlayerStatusPtr->alpha1, 255, 0, 0, npc->foldFlags);
npc->foldArg1 = 255;
}
}
@ -55,14 +55,14 @@ void N(func_80240198_BC7FF8)(void) {
}
void N(func_8024022C_BC808C)(void) {
get_npc_unsafe(NPC_KeepAwayBoo1)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo2)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo3)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo4)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo5)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo6)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo7)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo8)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo1)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo2)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo3)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo4)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo5)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo6)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo7)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo8)->foldFlags = 0;
}
s32 N(SetRingMovement)(s32 arg0) {

12
src/world/area_obk/obk_04/obk_04_6_game.c
View File

@ -203,7 +203,7 @@ EvtScript N(EVS_BooAppear) = {
EVT_CALL(MakeLerp, 0, 255, 60, EASING_LINEAR)
EVT_LABEL(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, LVarA, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, LVarA, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(0)
@ -221,7 +221,7 @@ EvtScript N(EVS_BooSpookAndVanish) = {
EVT_CALL(MakeLerp, 255, 0, 60, EASING_LINEAR)
EVT_LABEL(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, LVarA, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, LVarA, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(0)
@ -290,7 +290,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_CALL(MakeLerp, 0, 255, 30, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_LeaderBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetItemAlpha, MV_KeepAwayItem, LVar0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
@ -332,7 +332,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_CALL(MakeLerp, 255, 0, 10, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_LeaderBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP
@ -377,7 +377,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_CALL(MakeLerp, 0, 255, 10, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_LeaderBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP
@ -499,7 +499,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_EXEC(N(EVS_BooSpookAndVanish))
EVT_WAIT(60)
EVT_CALL(SetNpcPos, NPC_TutorialBoo, -160, 10, -175)
EVT_CALL(func_802CFD30, NPC_TutorialBoo, FOLD_TYPE_7, 0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_TutorialBoo, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0)
EVT_SET(LVarA, NPC_TutorialBoo)
EVT_EXEC(N(EVS_BooAppear))
EVT_WAIT(60)

6
src/world/area_obk/obk_07/obk_07_6_phonograph.c
View File

@ -982,7 +982,7 @@ EvtScript N(EVS_GuardBoo_ReturnToPost) = {
EVT_CALL(MakeLerp, 180, 0, 10, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_GuardBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GuardBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP
EVT_END_IF
@ -992,7 +992,7 @@ EvtScript N(EVS_GuardBoo_ReturnToPost) = {
EVT_CALL(MakeLerp, 0, 180, 10, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_GuardBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GuardBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP
EVT_END_IF
@ -1086,7 +1086,7 @@ EvtScript N(EVS_GuardBooVanish) = {
EVT_CALL(MakeLerp, 255, 0, 60, EASING_LINEAR)
EVT_LABEL(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_GuardBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_GuardBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(0)

22
src/world/area_obk/obk_08/obk_08_5_npc.c
View File

@ -34,11 +34,11 @@ API_CALLABLE(N(func_802408A0_BD4110)) {
void N(func_80240920_BD4190)(Npc* npc) {
if (npc->yaw > 340.0f || npc->yaw < 20.0f) {
npc->renderMode = RENDER_MODE_ALPHATEST;
npc->foldArg5 = 0;
func_8003D624(npc, FOLD_TYPE_NONE, 0, 0, 0, 0, npc->foldArg5);
npc->foldFlags = 0;
npc_set_fold_params(npc, FOLD_UPD_CLEAR, 0, 0, 0, 0, npc->foldFlags);
} else {
npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2;
func_8003D624(npc, FOLD_TYPE_7, gPlayerStatusPtr->alpha1, 0, 0, 0, npc->foldArg5);
npc_set_fold_params(npc, FOLD_UPD_SET_ALPHA, gPlayerStatusPtr->alpha1, 0, 0, 0, npc->foldFlags);
npc->foldArg1 = 255;
}
}
@ -55,14 +55,14 @@ void func_802409E8_BD4258(void) {
}
void func_80240A7C_BD42EC(void) {
get_npc_unsafe(NPC_KeepAwayBoo1)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo2)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo3)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo4)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo5)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo6)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo7)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo8)->foldArg5 = 0;
get_npc_unsafe(NPC_KeepAwayBoo1)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo2)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo3)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo4)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo5)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo6)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo7)->foldFlags = 0;
get_npc_unsafe(NPC_KeepAwayBoo8)->foldFlags = 0;
}
API_CALLABLE(N(func_80240AF0_BD4360)) {

12
src/world/area_obk/obk_08/obk_08_6_game.c
View File

@ -153,7 +153,7 @@ EvtScript N(EVS_BooSpookAndVanish) = {
EVT_CALL(MakeLerp, 255, 0, 60, EASING_LINEAR)
EVT_LABEL(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, LVarA, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, LVarA, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 1)
EVT_GOTO(0)
@ -182,7 +182,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_CALL(MakeLerp, 0, 255, 30, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_LeaderBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetItemAlpha, MV_KeepAwayItem, LVar0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
@ -196,7 +196,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_CALL(MakeLerp, 255, 0, 30, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_LeaderBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetItemAlpha, MV_KeepAwayItem, LVar0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
@ -216,7 +216,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_CALL(MakeLerp, 0, 255, 30, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, NPC_LeaderBoo, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(GetNpcPos, NPC_LeaderBoo, LVar3, LVar4, LVar5)
EVT_ADD(LVar4, 20)
EVT_CALL(SetItemPos, MV_KeepAwayItem, LVar3, LVar4, LVar5)
@ -409,7 +409,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_CALL(MakeLerp, 255, 0, 20, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, MV_ItemCarrierNpc, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, MV_ItemCarrierNpc, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP
@ -421,7 +421,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = {
EVT_CALL(MakeLerp, 0, 255, 20, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)
EVT_CALL(func_802CFD30, MV_ItemCarrierNpc, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, MV_ItemCarrierNpc, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_IF_EQ(LVar1, 0)
EVT_BREAK_LOOP

4
src/world/area_obk/obk_09/obk_09_3_meet_bow.c
View File

@ -48,8 +48,8 @@ EvtScript N(EVS_Scene_MeetBow) = {
EVT_SETF(LVar0, EVT_FLOAT(0.0))
EVT_LOOP(20 * DT)
EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT)))
EVT_CALL(func_802CFD30, NPC_Bow, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(func_802CFD30, NPC_Bootler, FOLD_TYPE_7, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bow, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_WAIT(40 * DT)

2
src/world/area_obk/obk_09/obk_09_4_npc.c
View File

@ -108,7 +108,7 @@ EvtScript N(EVS_NpcInit_Skolar) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSkolar_IdleSad)
EVT_CALL(SetNpcPos, NPC_SELF, 0, NPC_DISPOSE_POS_Y, -100)
EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_7, 170, 0, 0, 0)
EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, 170, 0, 0, 0)
EVT_IF_GE(GB_StoryProgress, STORY_CH3_BOW_JOINED_PARTY)
EVT_CALL(RemoveNpc, NPC_SELF)
EVT_END_IF

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