diff --git a/include/common_structs.h b/include/common_structs.h index 672b105b9a..1697c8ad6b 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -251,12 +251,12 @@ typedef struct Npc { /* 0x08E */ s16 duration; // TODO: name less vaguely /* 0x090 */ Vec3s homePos; /* 0x096 */ s16 unk_96; - /* 0x098 */ s16 foldType; - /* 0x09A */ s16 foldArg1; - /* 0x09C */ s16 foldArg2; - /* 0x09E */ s16 foldArg3; - /* 0x0A0 */ s16 foldArg4; - /* 0x0A2 */ u16 foldFlags; + /* 0x098 */ s16 imgfxType; + /* 0x09A */ s16 imgfxArg1; + /* 0x09C */ s16 imgfxArg2; + /* 0x09E */ s16 imgfxArg3; + /* 0x0A0 */ s16 imgfxArg4; + /* 0x0A2 */ u16 imgfxFlags; /* 0x0A4 */ s8 npcID; /* 0x0A5 */ char unk_A5; /* 0x0A6 */ s16 collisionDiameter; @@ -764,7 +764,7 @@ typedef struct Camera { /* 0x000 */ u16 flags; /* 0x002 */ s16 moveFlags; /* 0x004 */ s16 updateMode; - /* 0x006 */ s16 unk_06; + /* 0x006 */ s16 needsInit; /* 0x008 */ s16 isChangingMap; /* 0x00A */ s16 viewportW; /* 0x00C */ s16 viewportH; @@ -2273,17 +2273,17 @@ typedef struct SpriteRasterInfo { /* 0x0C */ s32 height; } SpriteRasterInfo; // size = 0x10 -typedef struct UnkEntityStruct { - /* 0x00 */ s32 foldID; - /* 0x04 */ s32 entityID; +typedef struct KnockdownData { + /* 0x00 */ s32 imgfxIdx; + /* 0x04 */ s32 workerID; /* 0x08 */ s32 spriteIndex; /* 0x0C */ s32 rasterIndex; /* 0x10 */ Vec3f pos; /* 0x1C */ Vec3f rot; /* 0x28 */ Vec3f scale; - /* 0x34 */ f32 unk_34; - /* 0x38 */ f32 unk_38; -} UnkEntityStruct; // size = 0x3C + /* 0x34 */ f32 width; + /* 0x38 */ f32 height; +} KnockdownData; // size = 0x3C typedef struct VirtualEntity { /* 0x00 */ s32 entityModelIndex; @@ -2358,33 +2358,36 @@ typedef struct SpriteShadingProfile { /* 0xAF */ u8 ambientPower; // ? } SpriteShadingProfile; // size = 0xB0 -typedef struct FoldImageRecPart { +typedef struct ImgFXOverlayTexture { + /* 0x00 */ IMG_PTR raster; + /* 0x04 */ PAL_PTR palette; + /* 0x08 */ u16 width; + /* 0x0A */ u16 height; + /* 0x0C */ s32 offsetX; + /* 0x10 */ s32 offsetY; + /* 0x14 */ Gfx* displayList; +} ImgFXOverlayTexture; // size = 0x18 + +typedef struct ImgFXTexture { /* 0x00 */ IMG_PTR raster; /* 0x04 */ PAL_PTR palette; /* 0x08 */ u16 width; /* 0x0A */ u16 height; /* 0x0C */ s16 xOffset; /* 0x0E */ s16 yOffset; - /* 0x10 */ u8 opacity; // alpha? + /* 0x10 */ u8 alpha; /* 0x11 */ char unk_11[3]; /* 0x14 */ Gfx* dlist; -} FoldImageRecPart; // size = 0x18 +} ImgFXTexture; // size = 0x18 -typedef struct FoldImageRec { - /* 0x00 */ IMG_PTR raster; - /* 0x04 */ PAL_PTR palette; - /* 0x08 */ u16 width; - /* 0x0A */ u16 height; - /* 0x0C */ s16 xOffset; - /* 0x0E */ s16 yOffset; - /* 0x10 */ u8 unk_10; // alpha? - /* 0x11 */ char unk_11[0x7]; +typedef struct ImgFXWorkingTexture { + /* 0x00 */ ImgFXTexture tex; /* 0x18 */ s16 unk_18; /* 0x1A */ char unk_1A[0x4]; /* 0x1E */ s16 unk_1E; /* 0x20 */ char unk_20[0x4]; /* 0x24 */ u8 alphaMultiplier; -} FoldImageRec; // size = 0x25 +} ImgFXWorkingTexture; // size = 0x25 typedef struct SongUpdateEvent { /* 0x00 */ s32 songName; diff --git a/include/dead.h b/include/dead.h index 82752ca3c9..7192b5e1bf 100644 --- a/include/dead.h +++ b/include/dead.h @@ -275,8 +275,8 @@ #define GetSelfVar dead_GetSelfVar #define GetPlayerTargetYaw dead_GetPlayerTargetYaw #define HidePlayerShadow dead_HidePlayerShadow -#define SetPlayerFoldFlags dead_SetPlayerFoldFlags -#define UpdatePlayerFold dead_UpdatePlayerFold +#define SetPlayerImgFXFlags dead_SetPlayerImgFXFlags +#define UpdatePlayerImgFX dead_UpdatePlayerImgFX #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 SetNpcFoldParams dead_SetNpcFoldParams +#define SetNpcImgFXParams dead_SetNpcImgFXParams #define SetGroupVisibility dead_SetGroupVisibility #define Entity_HeartBlock dead_Entity_HeartBlock #define GetCamDistance dead_GetCamDistance diff --git a/include/enums.h b/include/enums.h index 1e5c0d3071..903b7d44a8 100644 --- a/include/enums.h +++ b/include/enums.h @@ -5461,7 +5461,7 @@ enum CameraInitDataFlags { enum CameraFlags { CAMERA_FLAG_1 = 0x00000001, - CAMERA_FLAG_ENABLED = 0x00000002, + CAMERA_FLAG_DISABLED = 0x00000002, CAMERA_FLAG_LEAD_PLAYER = 0x00000004, CAMERA_FLAG_SHAKING = 0x00000008, CAMERA_FLAG_ORTHO = 0x00000010, @@ -5501,12 +5501,12 @@ enum CameraMoveFlags { }; enum CameraUpdateType { - CAM_UPDATE_MODE_0 = 0, - CAM_UPDATE_MODE_1 = 1, + CAM_UPDATE_MODE_INIT = 0, + CAM_UPDATE_UNUSED_1 = 1, CAM_UPDATE_MODE_2 = 2, - CAM_UPDATE_MODE_3 = 3, - CAM_UPDATE_MODE_4 = 4, - CAM_UPDATE_MODE_5 = 5, + CAM_UPDATE_FROM_ZONE = 3, + CAM_UPDATE_UNUSED_4 = 4, + CAM_UPDATE_UNUSED_5 = 5, CAM_UPDATE_MODE_6 = 6, }; @@ -5959,101 +5959,119 @@ enum NpcDropFlags { NPC_DROP_FLAG_80 = 0x80, }; -enum FoldStateFlags { - FOLD_STATE_FLAG_ENABLED = 0x00000001, - FOLD_STATE_FLAG_G_CULL_BACK = 0x00000002, - FOLD_STATE_FLAG_G_CULL_FRONT = 0x00000004, - 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_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_ANIM_DONE = 0x00001000, - FOLD_STATE_FLAG_2000 = 0x00002000, - FOLD_STATE_FLAG_4000 = 0x00004000, - FOLD_STATE_FLAG_8000 = 0x00008000, - FOLD_STATE_FLAG_NO_FILTERING = 0x00010000, - FOLD_STATE_FLAG_20000 = 0x00020000, - FOLD_STATE_FLAG_40000 = 0x00040000, - FOLD_STATE_FLAG_80000 = 0x00080000, - FOLD_STATE_FLAG_100000 = 0x00100000, +enum ImgFXStateFlags { + IMGFX_FLAG_IN_USE = 0x00000001, + IMGFX_FLAG_G_CULL_BACK = 0x00000002, + IMGFX_FLAG_G_CULL_FRONT = 0x00000004, + IMGFX_FLAG_8 = 0x00000008, + IMGFX_FLAG_SKIP_GFX_SETUP = 0x00000010, + IMGFX_FLAG_SKIP_TEX_SETUP = 0x00000020, + IMGFX_FLAG_40 = 0x00000040, + IMGFX_FLAG_LOOP_ANIM = 0x00000080, + IMGFX_FLAG_REVERSE_ANIM = 0x00000100, // fold animation plays backwards (from end to start) + IMGFX_FLAG_200 = 0x00000200, + IMGFX_FLAG_400 = 0x00000400, + IMGFX_FLAG_800 = 0x00000800, + IMGFX_FLAG_ANIM_DONE = 0x00001000, + IMGFX_FLAG_2000 = 0x00002000, + IMGFX_FLAG_4000 = 0x00004000, + IMGFX_FLAG_8000 = 0x00008000, + IMGFX_FLAG_NO_FILTERING = 0x00010000, + IMGFX_FLAG_20000 = 0x00020000, + IMGFX_FLAG_40000 = 0x00040000, + IMGFX_FLAG_80000 = 0x00080000, + IMGFX_FLAG_100000 = 0x00100000, }; -typedef enum FoldType { - 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_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, // unused? - FOLD_UPD_ALLOC_COLOR_BUF = 0x11, // args: count -} FoldType; +typedef enum ImgFXType { + IMGFX_CLEAR = 0x0, + IMGFX_UNK_1 = 0x1, // unused? + IMGFX_UNK_2 = 0x2, // unused? + IMGFX_RESET = 0x3, // after goomba 'sticker' ambush in kmr_09 unfurls. might be to force-terminate ANIM. + IMGFX_SET_WAVY = 0x4, // Kolorado when injured and Sushie when underwater (* note: Sushie fold rendering is bugged and only occurs *before* going underwater) + IMGFX_SET_ANIM = 0x5, + IMGFX_SET_COLOR = 0x6, // modulate color (args: R, G, B) + IMGFX_SET_ALPHA = 0x7, // modulate alpha (args: A) + IMGFX_SET_TINT = 0x8, // modulate color+alpha (args: R, G, B, A) + IMGFX_SET_WHITE_FADE = 0x9, + IMGFX_SET_CREDITS_FADE = 0xA, + IMGFX_COLOR_BUF_SET_MULTIPLY = 0xB, + IMGFX_COLOR_BUF_SET_MODULATE = 0xC, + IMGFX_HOLOGRAM = 0xD, // ghostly star spirits and merlar (args: ???, staticAmt, ???, alphaAmt) + IMGFX_FILL_COLOR = 0xE, // used to create boss silhouettes in chapter introduction sceens + IMGFX_OVERLAY = 0xF, + IMGFX_OVERLAY_XLU = 0x10, // unused? + IMGFX_ALLOC_COLOR_BUF = 0x11, // args: count +} ImgFXType; -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 ImgFXAnim { + IMGFX_ANIM_SHOCK = 0x00, // used for Goombaria and Goompapa when Kammy drops the hammer block + IMGFX_ANIM_SHIVER = 0x01, // used when Goombaria gives Mario a kiss + IMGFX_ANIM_VERTICAL_PIPE_CURL = 0x02, // vertical pipe curl + IMGFX_ANIM_HORIZONTAL_PIPE_CURL = 0x03, // horizontal pipe curl + IMGFX_ANIM_STARTLE = 0x04, // used when Koopa Bros are surprised by Mario + IMGFX_ANIM_FLUTTER_DOWN = 0x05, // player falling like paper + IMGFX_ANIM_UNFURL = 0x06, // used by Goomba 'stickers' that ambush Mario in area_kmr + IMGFX_ANIM_GET_IN_BED = 0x07, // Mario gets into bed + IMGFX_ANIM_SPIRIT_CAPTURE = 0x08, // Eldstar being captured + IMGFX_ANIM_UNUSED_1 = 0x09, // unused + IMGFX_ANIM_UNUSED_2 = 0x0A, // unused + IMGFX_ANIM_UNUSED_3 = 0x0B, // unused + IMGFX_ANIM_TUTANKOOPA_GATHER = 0x0C, // tutankoopa 3 + IMGFX_ANIM_TUTANKOOPA_SWIRL_2 = 0x0D, // tutankoopa 2 + IMGFX_ANIM_TUTANKOOPA_SWIRL_1 = 0x0E, // tutankoopa 1 + IMGFX_ANIM_SHUFFLE_CARDS = 0x0F, // merlee spell-casting card shuffle + IMGFX_ANIM_FLIP_CARD_1 = 0x10, // merlee spell-casting card flip 1 + IMGFX_ANIM_FLIP_CARD_2 = 0x11, // merlee spell-casting card flip 2 + IMGFX_ANIM_FLIP_CARD_3 = 0x12, // merlee spell-casting card flip 3 + IMGFX_ANIM_CYMBAL_CRUSH = 0x13, // used when Mario is crushed in a Cymbal Plant +} ImgFXAnim; -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_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 ImgFXRenderType { + IMGFX_RENDER_DEFAULT = 0x00, + IMGFX_RENDER_MULTIPLY_RGB = 0x01, + IMGFX_RENDER_MULTIPLY_ALPHA = 0x02, + IMGFX_RENDER_MULTIPLY_RGBA = 0x03, + IMGFX_RENDER_MODULATE_PRIM_RGB = 0x04, + IMGFX_RENDER_MODULATE_PRIM_RGBA = 0x05, + IMGFX_RENDER_MULTIPLY_SHADE_RGB = 0x06, + IMGFX_RENDER_MULTIPLY_SHADE_ALPHA = 0x07, + IMGFX_RENDER_MULTIPLY_SHADE_RGBA = 0x08, + IMGFX_RENDER_MODULATE_SHADE_RGB = 0x09, + IMGFX_RENDER_MODULATE_SHADE_RGBA = 0x0A, + IMGFX_RENDER_ANIM = 0x0B, + IMGFX_RENDER_HOLOGRAM = 0x0C, + IMGFX_RENDER_COLOR_FILL = 0x0D, + IMGFX_RENDER_OVERLAY_RGB = 0x0E, + IMGFX_RENDER_OVERLAY_RGBA = 0x0F, + IMGFX_RENDER_UNUSED = 0x10, +} ImgFXRenderType; -typedef enum FoldMeshType { - FOLD_MESH_TYPE_0 = 0x0, - FOLD_MESH_TYPE_1 = 0x1, - FOLD_MESH_ANIMATED = 0x2, - FOLD_MESH_TYPE_3 = 0x3, - FOLD_MESH_TYPE_4 = 0x4, -} FoldMeshType; +enum ImgFXRenderModeFlags { + IMGFX_RENDER_NO_OVERRIDE = 1, +}; + +typedef enum ImgFXMeshType { + IMGFX_MESH_DEFAULT = 0x0, + IMGFX_MESH_GRID_WAVY = 0x1, + IMGFX_MESH_ANIMATED = 0x2, + IMGFX_MESH_GRID_UNUSED = 0x3, + IMGFX_MESH_STRIP = 0x4, +} ImgFXMeshType; + +enum ImgFXHologramTypes { + IMGFX_HOLOGRAM_NOISE = 0, + IMGFX_HOLOGRAM_DITHER = 1, + IMGFX_HOLOGRAM_THRESHOLD = 2, +}; + +enum SpriteCompImgFXFlags { + SPR_IMGFX_FLAG_10000000 = 0x10000000, + SPR_IMGFX_FLAG_20000000 = 0x20000000, + SPR_IMGFX_FLAG_40000000 = 0x40000000, + SPR_IMGFX_FLAG_80000000 = 0x80000000, + SPR_IMGFX_FLAG_ALL = 0xF0000000, +}; enum MoveType { MOVE_TYPE_NONE = 0, diff --git a/include/functions.h b/include/functions.h index 170244b1ef..de44a9297f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -791,10 +791,10 @@ s32 create_worker_world(WorldArgs, WorldArgs); void init_entity_models(void); f32 phys_get_spin_history(s32 lag, s32* x, s32* y, s32* z); -void fold_update(u32, FoldType, s32, s32, s32, s32, s32); -s32 fold_appendGfx_component(s32, FoldImageRecPart*, u32, Matrix4f); -void func_8013A6E8(void); -s32 func_8013A704(s32); +void imgfx_update(u32, ImgFXType, s32, s32, s32, s32, s32); +s32 imgfx_appendGfx_component(s32, ImgFXTexture*, u32, Matrix4f); +void imgfx_update_cache(void); +s32 imgfx_get_free_instances(s32); void free_worker(s32); s32 ai_check_fwd_collisions(Npc* npc, f32 arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5); @@ -983,7 +983,7 @@ void func_8025DBC8(ActorPart*, s32); void func_8025DD40(ActorPart*, s32); void func_8025DE88(ActorPart*, s32); void status_menu_ignore_changes(void); -void func_8013A854(u32); +void imgfx_release_instance(u32); void set_script_flags(Evt* script, s32 flags); void clear_script_flags(Evt* script, s32 flags); diff --git a/include/macros.h b/include/macros.h index 7a6df11319..6e5c88a1ea 100644 --- a/include/macros.h +++ b/include/macros.h @@ -94,7 +94,7 @@ #define MAX_WORKERS 16 #define MAX_TEX_PANNERS 16 #define MAX_ITEM_ENTITIES 256 -#define MAX_FOLD_STATES 90 +#define MAX_IMGFX_INSTANCES 90 #define MAX_STAR_PIECES 222 diff --git a/include/npc.h b/include/npc.h index 97ac152fc9..b542baf903 100644 --- a/include/npc.h +++ b/include/npc.h @@ -594,7 +594,7 @@ s32 npc_get_collider_below(Npc* npc); void func_8003D3BC(Npc* npc); -void npc_set_fold_params(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); +void npc_set_imgfx_params(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); void spawn_surface_effects(Npc* npc, SurfaceInteractMode mode); diff --git a/include/script_api/common.h b/include/script_api/common.h index 7ded692aa1..059ad8c7f5 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -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 SetNpcFoldFlags(Evt* script, s32 isInitialCall); -ApiStatus SetNpcFoldParams(Evt* script, s32 isInitialCall); +ApiStatus SetNpcImgFXFlags(Evt* script, s32 isInitialCall); +ApiStatus SetNpcImgFXParams(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 SetPlayerFoldFlags(Evt* script, s32 isInitialCall); -ApiStatus UpdatePlayerFold(Evt* script, s32 isInitialCall); +ApiStatus SetPlayerImgFXFlags(Evt* script, s32 isInitialCall); +ApiStatus UpdatePlayerImgFX(Evt* script, s32 isInitialCall); ApiStatus PushSong(Evt* script, s32 isInitialCall); ApiStatus PopSong(Evt* script, s32 isInitialCall); ApiStatus func_802D62E4(Evt* script, s32 isInitialCall); diff --git a/include/script_api/macros.h b/include/script_api/macros.h index 8ee125681d..995623ee5b 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -724,22 +724,22 @@ // only set perspective to standard values #define EVT_SETUP_CAMERA_MINIMAL() \ - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) #define EVT_SETUP_CAMERA_DEFAULT() \ - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) \ + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) \ EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \ EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) #define EVT_SETUP_CAMERA_NO_LEAD() \ - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) \ + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) \ EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \ EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) \ EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) // same as EVT_SETUP_CAMERA_NO_LEAD with calls reordered #define EVT_SETUP_CAMERA_ALT_NO_LEAD() \ - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) \ + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) \ EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \ EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) \ EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/16F740.c b/src/16F740.c index 8c1ff6ae14..1899f2599b 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -255,9 +255,9 @@ void btl_state_update_normal_start(void) { battleStatus->damageTaken = 0; battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; battleStatus->actionCommandMode = ACTION_COMMAND_MODE_NOT_LEARNED; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; if (is_ability_active(ABILITY_MYSTERY_SCROLL)) { battleStatus->actionCommandMode = ACTION_COMMAND_MODE_LEARNED; } diff --git a/src/16c8e0.c b/src/16c8e0.c index e6f2083da6..2107525b2d 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -1132,7 +1132,7 @@ void btl_delete_actor(Actor* actor) { } if (part->idleAnimations != NULL) { - func_802DE894(part->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_npc_imgfx_all(part->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, 0); ASSERT(spr_free_sprite(part->spriteInstanceID) == 0); diff --git a/src/182B30.c b/src/182B30.c index c5f9db0966..19a926bc76 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -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_UPD_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_all(PLAYER_SPRITE_MAIN, IMGFX_CLEAR, 0, 0, 0, 0, 0); } else { - func_802DE894(part->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_npc_imgfx_all(part->spriteInstanceID, IMGFX_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(PLAYER_SPRITE_MAIN, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); + set_player_imgfx_all(PLAYER_SPRITE_MAIN, IMGFX_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); } else { - func_802DE894(part->spriteInstanceID, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); + set_npc_imgfx_all(part->spriteInstanceID, IMGFX_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_UPD_COLOR_BUF_SET_C, i, color, 0, 255, 0); + set_player_imgfx_all(PLAYER_SPRITE_MAIN, IMGFX_COLOR_BUF_SET_MODULATE, i, color, 0, 255, 0); } else { - func_802DE894(part->spriteInstanceID, FOLD_UPD_COLOR_BUF_SET_C, i, color, 0, 255, 0); + set_npc_imgfx_all(part->spriteInstanceID, IMGFX_COLOR_BUF_SET_MODULATE, i, color, 0, 255, 0); } } diff --git a/src/1A5830.c b/src/1A5830.c index 422902c7c3..199ad414d0 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -3336,7 +3336,7 @@ ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) { while (it != NULL) { if (it->idleAnimations != NULL) { - func_802DE894(it->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_npc_imgfx_all(it->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, 0); } it = it->nextPart; } diff --git a/src/38F00.c b/src/38F00.c index 36071c7d0b..34e12bf80a 100644 --- a/src/38F00.c +++ b/src/38F00.c @@ -70,12 +70,12 @@ EvtScript D_800939B4 = { EVT_LOOP(30) EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0) EVT_CALL(func_8005DD54) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_COLOR, LVar2, LVar2, LVar2, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_COLOR, 255, 255, 255, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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) diff --git a/src/77480.c b/src/77480.c index bb28983f0f..fdf7497711 100644 --- a/src/77480.c +++ b/src/77480.c @@ -1480,11 +1480,11 @@ void render_player_model(void) { } playerStatus->renderMode = renderModeTemp; - func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 7, 0, 0, 0, playerStatus->alpha1, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); } else { playerStatus->renderMode = RENDER_MODE_ALPHATEST; - func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); } } @@ -1542,7 +1542,7 @@ void appendGfx_player(void* data) { guMtxCatF(sp20, spA0, sp20); guTranslateF(sp60, 0.0f, playerStatus->colliderHeight * 0.5f, 0.0f); guMtxCatF(sp20, sp60, sp20); - guScaleF(spE0, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_D, SPRITE_WORLD_SCALE_D); + guScaleF(spE0, SPRITE_WORLD_SCALE_D, SPRITE_WORLD_SCALE_D, SPRITE_WORLD_SCALE_D); guMtxCatF(sp20, spE0, sp20); guTranslateF(sp60, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); guMtxCatF(sp20, sp60, sp20); @@ -1550,14 +1550,14 @@ void appendGfx_player(void* data) { if (playerStatus->animFlags & PA_FLAG_SHIVERING) { 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, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHIVER, 1, 1, 0, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_all(playerStatus->anim, IMGFX_SET_ANIM, IMGFX_ANIM_SHIVER, 1, 1, 0, 0); } if (playerStatus->shiverTime != 0) { playerStatus->shiverTime--; if (playerStatus->shiverTime == 0) { - func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); } } @@ -1614,7 +1614,7 @@ void appendGfx_player_spin(void* data) { tint = 100; } - func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_UPD_SET_COLOR, tint, tint, tint, 255, 0); + set_player_imgfx_all(PLAYER_SPRITE_MAIN, IMGFX_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); @@ -1633,7 +1633,7 @@ void appendGfx_player_spin(void* data) { px = playerStatus->position.x; pz = playerStatus->position.z; - func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 7, 0, 0, 0, 64, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_SET_ALPHA, 0, 0, 0, 64, 0); guRotateF(mtx, yaw, 0.0f, -1.0f, 0.0f); guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); guRotateF(mtx, blurAngle, 0.0f, 1.0f, 0.0f); diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index 3e3114805e..42cf077415 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -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_UPD_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); - npc_set_fold_params(partner, FOLD_UPD_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); + npc_set_imgfx_params(partner, IMGFX_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); playerStatus->alpha2 = 0; } } diff --git a/src/8800.c b/src/8800.c index 01f32beaa1..6e8d2afcc2 100644 --- a/src/8800.c +++ b/src/8800.c @@ -15,213 +15,217 @@ void update_cameras(void) { for (i = 0; i < ARRAY_COUNT(gCameras); i++) { Camera* cam = &gCameras[i]; + s32 sx; + s32 sy; + s32 sz; - if (cam->flags != 0 && !(cam->flags & CAMERA_FLAG_ENABLED)) { - s32 sx; - s32 sy; - s32 sz; - - gCurrentCamID = i; - - switch (cam->updateMode) { - case CAM_UPDATE_MODE_3: - update_camera_zone_interp(cam); - break; - case CAM_UPDATE_MODE_0: - update_camera_mode_0(cam); - break; - case CAM_UPDATE_MODE_1: - update_camera_mode_1(cam); - break; - case CAM_UPDATE_MODE_2: - update_camera_mode_2(cam); - break; - case CAM_UPDATE_MODE_4: - update_camera_mode_4(cam); - break; - case CAM_UPDATE_MODE_5: - update_camera_mode_5(cam); - break; - case CAM_UPDATE_MODE_6: - default: - update_camera_mode_6(cam); - break; - } - - guLookAtReflectF(cam->viewMtxPlayer, &gDisplayContext->lookAt, cam->lookAt_eye.x, cam->lookAt_eye.y, cam->lookAt_eye.z, cam->lookAt_obj.x, cam->lookAt_obj.y, cam->lookAt_obj.z, 0, 1.0f, 0); - - if (!(cam->flags & CAMERA_FLAG_ORTHO)) { - if (cam->flags & CAMERA_FLAG_LEAD_PLAYER) { - create_camera_leadplayer_matrix(cam); - } - - guPerspectiveF(cam->perspectiveMatrix, &cam->perspNorm, cam->vfov, (f32) cam->viewportW / (f32) cam->viewportH, (f32) cam->nearClip, (f32) cam->farClip, 1.0f); - - if (cam->flags & CAMERA_FLAG_SHAKING) { - guMtxCatF(cam->viewMtxShaking, cam->perspectiveMatrix, cam->perspectiveMatrix); - } - - if (cam->flags & CAMERA_FLAG_LEAD_PLAYER) { - guMtxCatF(cam->viewMtxLeading, cam->perspectiveMatrix, cam->perspectiveMatrix); - } - - guMtxCatF(cam->viewMtxPlayer, cam->perspectiveMatrix, cam->perspectiveMatrix); - } else { - f32 w = cam->viewportW; - f32 h = cam->viewportH; - - guOrthoF(cam->perspectiveMatrix, -w * 0.5, w * 0.5, -h * 0.5, h * 0.5, -1000.0f, 1000.0f, 1.0f); - } - - get_screen_coords(0, cam->targetPos.x, cam->targetPos.y, cam->targetPos.z, &sx, &sy, &sz); - cam->targetScreenCoords.x = sx; - cam->targetScreenCoords.y = sy; - cam->targetScreenCoords.z = sz; + if (cam->flags == 0 || cam->flags & CAMERA_FLAG_DISABLED) { + continue; } + + gCurrentCamID = i; + + switch (cam->updateMode) { + case CAM_UPDATE_FROM_ZONE: + update_camera_zone_interp(cam); + break; + case CAM_UPDATE_MODE_INIT: + update_camera_mode_0(cam); + break; + case CAM_UPDATE_UNUSED_1: + update_camera_mode_1(cam); + break; + case CAM_UPDATE_MODE_2: + update_camera_mode_2(cam); + break; + case CAM_UPDATE_UNUSED_4: + update_camera_mode_4(cam); + break; + case CAM_UPDATE_UNUSED_5: + update_camera_mode_5(cam); + break; + case CAM_UPDATE_MODE_6: + default: + update_camera_mode_6(cam); + break; + } + + guLookAtReflectF(cam->viewMtxPlayer, &gDisplayContext->lookAt, cam->lookAt_eye.x, cam->lookAt_eye.y, cam->lookAt_eye.z, cam->lookAt_obj.x, cam->lookAt_obj.y, cam->lookAt_obj.z, 0, 1.0f, 0); + + if (!(cam->flags & CAMERA_FLAG_ORTHO)) { + if (cam->flags & CAMERA_FLAG_LEAD_PLAYER) { + create_camera_leadplayer_matrix(cam); + } + + guPerspectiveF(cam->perspectiveMatrix, &cam->perspNorm, cam->vfov, (f32) cam->viewportW / (f32) cam->viewportH, (f32) cam->nearClip, (f32) cam->farClip, 1.0f); + + if (cam->flags & CAMERA_FLAG_SHAKING) { + guMtxCatF(cam->viewMtxShaking, cam->perspectiveMatrix, cam->perspectiveMatrix); + } + + if (cam->flags & CAMERA_FLAG_LEAD_PLAYER) { + guMtxCatF(cam->viewMtxLeading, cam->perspectiveMatrix, cam->perspectiveMatrix); + } + + guMtxCatF(cam->viewMtxPlayer, cam->perspectiveMatrix, cam->perspectiveMatrix); + } else { + f32 w = cam->viewportW; + f32 h = cam->viewportH; + + guOrthoF(cam->perspectiveMatrix, -w * 0.5, w * 0.5, -h * 0.5, h * 0.5, -1000.0f, 1000.0f, 1.0f); + } + + get_screen_coords(0, cam->targetPos.x, cam->targetPos.y, cam->targetPos.z, &sx, &sy, &sz); + cam->targetScreenCoords.x = sx; + cam->targetScreenCoords.y = sy; + cam->targetScreenCoords.z = sz; } - gCurrentCamID = 0; + gCurrentCamID = CAM_DEFAULT; } -void render_frame(s32 flag) { +void render_frame(s32 isSecondPass) { s32 camID; - if (!flag) { - gCurrentCamID = 0; + if (!isSecondPass) { + gCurrentCamID = CAM_DEFAULT; func_80116698(); } - if (flag) { + if (isSecondPass) { camID = CAM_3; } else { camID = CAM_DEFAULT; } - flag = 1 - flag; // toggle flag 0/1 + // first pass: loop uses camIDs from CAM_DEFAULT to CAM_3 - 1 + // second pass: loop only uses CAM_3 + isSecondPass = 1 - isSecondPass; - for (; camID < ARRAY_COUNT(gCameras) - flag; camID++) { + for (; camID < ARRAY_COUNT(gCameras) - isSecondPass; camID++) { Camera* camera = &gCameras[camID]; + u16 matrixListPos; - if (camera->flags != 0 && !(camera->flags & (CAMERA_FLAG_80 | CAMERA_FLAG_ENABLED))) { - u16 matrixListPos; + if (camera->flags == 0 || (camera->flags & (CAMERA_FLAG_80 | CAMERA_FLAG_DISABLED))) { + continue; + } - gCurrentCamID = camID; + gCurrentCamID = camID; - if (camera->fpDoPreRender != NULL) { - camera->fpDoPreRender(camera); - } else { - s32 ulx; - s32 uly; - s32 lrx; - s32 lry; + if (camera->fpDoPreRender != NULL) { + camera->fpDoPreRender(camera); + } else { + s32 ulx; + s32 uly; + s32 lrx; + s32 lry; - gSPViewport(gMainGfxPos++, &camera->vp); - gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | - G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPTexture(gMainGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); - gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); - gDPPipelineMode(gMainGfxPos++, G_PM_NPRIMITIVE); + gSPViewport(gMainGfxPos++, &camera->vp); + gSPClearGeometryMode(gMainGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPTexture(gMainGfxPos++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); + gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); + gDPPipelineMode(gMainGfxPos++, G_PM_NPRIMITIVE); - ulx = camera->viewportStartX; - uly = camera->viewportStartY; - lrx = ulx + camera->viewportW; - lry = uly + camera->viewportH; + ulx = camera->viewportStartX; + uly = camera->viewportStartY; + lrx = ulx + camera->viewportW; + lry = uly + camera->viewportH; - if (ulx < 0) { - ulx = 0; - } - if (uly < 0) { - uly = 0; - } - if (lrx < 1) { - lrx = 1; - } - if (lry < 1) { - lry = 1; - } - - if (ulx > SCREEN_WIDTH - 1) { - ulx = SCREEN_WIDTH - 1; - } - if (uly > SCREEN_HEIGHT - 1) { - uly = SCREEN_HEIGHT - 1; - } - if (lrx > SCREEN_WIDTH) { - lrx = SCREEN_WIDTH; - } - if (lry > SCREEN_HEIGHT) { - lry = SCREEN_HEIGHT; - } - - gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); - gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); - gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); - gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); - gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); - gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); - gDPSetCombineMode(gMainGfxPos++, G_CC_SHADE, G_CC_SHADE); - gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); - gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); - gSPClipRatio(gMainGfxPos++, FRUSTRATIO_2); - gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, - osVirtualToPhysical(nuGfxCfb_ptr)); - gDPPipeSync(gMainGfxPos++); - - if (!(camera->flags & CAMERA_FLAG_ORTHO)) { - gSPPerspNormalize(gMainGfxPos++, camera->perspNorm); - } - - guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); - gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | - G_MTX_PROJECTION); + if (ulx < 0) { + ulx = 0; + } + if (uly < 0) { + uly = 0; + } + if (lrx < 1) { + lrx = 1; + } + if (lry < 1) { + lry = 1; } - camera->unkMatrix = &gDisplayContext->matrixStack[gMatrixListPos]; - matrixListPos = gMatrixListPos++; - guRotate(&gDisplayContext->matrixStack[matrixListPos], -camera->trueRotation.x, 0.0f, 1.0f, 0.0f); - camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82; - camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_83; + if (ulx > SCREEN_WIDTH - 1) { + ulx = SCREEN_WIDTH - 1; + } + if (uly > SCREEN_HEIGHT - 1) { + uly = SCREEN_HEIGHT - 1; + } + if (lrx > SCREEN_WIDTH) { + lrx = SCREEN_WIDTH; + } + if (lry > SCREEN_HEIGHT) { + lry = SCREEN_HEIGHT; + } + + gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); + gDPSetTextureLUT(gMainGfxPos++, G_TT_NONE); + gDPSetTextureDetail(gMainGfxPos++, G_TD_CLAMP); + gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMainGfxPos++, G_TF_BILERP); + gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); + gDPSetCombineMode(gMainGfxPos++, G_CC_SHADE, G_CC_SHADE); + gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); + gDPSetRenderMode(gMainGfxPos++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPSetColorDither(gMainGfxPos++, G_CD_DISABLE); + gSPClipRatio(gMainGfxPos++, FRUSTRATIO_2); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + osVirtualToPhysical(nuGfxCfb_ptr)); + gDPPipeSync(gMainGfxPos++); if (!(camera->flags & CAMERA_FLAG_ORTHO)) { - if (gCurrentCamID != CAM_3) { - if (!(camera->flags & CAMERA_FLAG_RENDER_ENTITIES)) { - render_entities(); - } - if (!(camera->flags & CAMERA_FLAG_RENDER_MODELS)) { - render_models(); - } - render_player(); - render_npcs(); - render_workers_world(); - render_effects_world(); - execute_render_tasks(); - render_hud_elements_world(); - } else { - guOrthoF(camera->perspectiveMatrix, 0.0f, SCREEN_WIDTH, -SCREEN_HEIGHT, 0.0f, -1000.0f, 1000.0f, - 1.0f); - guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); - gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | - G_MTX_LOAD | G_MTX_PROJECTION); - render_hud_elements_world(); - render_item_entities(); - } - } else { - render_workers_world(); - execute_render_tasks(); + gSPPerspNormalize(gMainGfxPos++, camera->perspNorm); } - if (camera->fpDoPostRender != NULL) { - camera->fpDoPostRender(camera); - } - - gDPPipeSync(gMainGfxPos++); - gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, - osVirtualToPhysical(nuGfxCfb_ptr)); - gDPPipeSync(gMainGfxPos++); + guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | + G_MTX_PROJECTION); } + + camera->unkMatrix = &gDisplayContext->matrixStack[gMatrixListPos]; + matrixListPos = gMatrixListPos++; + guRotate(&gDisplayContext->matrixStack[matrixListPos], -camera->trueRotation.x, 0.0f, 1.0f, 0.0f); + camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82; + camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_83; + + if (!(camera->flags & CAMERA_FLAG_ORTHO)) { + if (gCurrentCamID != CAM_3) { + if (!(camera->flags & CAMERA_FLAG_RENDER_ENTITIES)) { + render_entities(); + } + if (!(camera->flags & CAMERA_FLAG_RENDER_MODELS)) { + render_models(); + } + render_player(); + render_npcs(); + render_workers_world(); + render_effects_world(); + execute_render_tasks(); + render_hud_elements_world(); + } else { + guOrthoF(camera->perspectiveMatrix, 0.0f, SCREEN_WIDTH, -SCREEN_HEIGHT, 0.0f, -1000.0f, 1000.0f, + 1.0f); + guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); + gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | + G_MTX_LOAD | G_MTX_PROJECTION); + render_hud_elements_world(); + render_item_entities(); + } + } else { + render_workers_world(); + execute_render_tasks(); + } + + if (camera->fpDoPostRender != NULL) { + camera->fpDoPostRender(camera); + } + + gDPPipeSync(gMainGfxPos++); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, + osVirtualToPhysical(nuGfxCfb_ptr)); + gDPPipeSync(gMainGfxPos++); } } @@ -236,8 +240,8 @@ void create_cameras_a(void) { gCameras[i].flags = 0; } - camDataPtr->flags = CAMERA_FLAG_ENABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_0; + camDataPtr->flags = CAMERA_FLAG_DISABLED; + camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 0; @@ -247,8 +251,8 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAG_ENABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_0; + camDataPtr->flags = CAMERA_FLAG_DISABLED; + camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 160; @@ -258,8 +262,8 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAG_ENABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_0; + camDataPtr->flags = CAMERA_FLAG_DISABLED; + camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 0; @@ -269,8 +273,8 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAG_ENABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_0; + camDataPtr->flags = CAMERA_FLAG_DISABLED; + camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 160; @@ -290,8 +294,8 @@ void create_cameras_b(void) { gCameras[i].flags = 0; } - camDataPtr->flags = CAMERA_FLAG_ENABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_0; + camDataPtr->flags = CAMERA_FLAG_DISABLED; + camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 0; @@ -301,8 +305,8 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAG_ENABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_0; + camDataPtr->flags = CAMERA_FLAG_DISABLED; + camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 160; @@ -312,8 +316,8 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAG_ENABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_0; + camDataPtr->flags = CAMERA_FLAG_DISABLED; + camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 0; @@ -323,8 +327,8 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAG_ENABLED; - camDataPtr->updateMode = CAM_UPDATE_MODE_0; + camDataPtr->flags = CAMERA_FLAG_DISABLED; + camDataPtr->updateMode = CAM_UPDATE_MODE_INIT; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; camDataPtr->viewStartX = 160; @@ -364,7 +368,7 @@ Camera* initialize_next_camera(CameraInitData* initData) { camera->trueRotation.y = 0.0f; camera->trueRotation.z = 0.0f; camera->updateMode = initData->updateMode; - camera->unk_06 = TRUE; + camera->needsInit = TRUE; camera->nearClip = initData->nearClip; camera->farClip = initData->farClip; camera->vfov = initData->vfov; diff --git a/src/9d10_len_1080.c b/src/9d10_len_1080.c index 30b9ede9c1..5b0047f011 100644 --- a/src/9d10_len_1080.c +++ b/src/9d10_len_1080.c @@ -39,8 +39,8 @@ void update_camera_mode_4(Camera* camera) { camera->trueRotation.x = camera->unk_70; camera->currentBoomLength = camera->lookAt_dist * D_8009A5EC; camera->currentYOffset = camera->auxBoomPitch * D_8009A5EC; - if (camera->unk_06) { - camera->unk_06 = FALSE; + if (camera->needsInit) { + camera->needsInit = FALSE; camera->unk_98 = 0.0f; camera->unk_9C = 0.0f; camera->lookAt_obj.x = camera->lookAt_obj_target.x; @@ -124,8 +124,8 @@ void update_camera_mode_2(Camera *camera) { camera->currentYOffset = camera->auxBoomPitch * D_8009A5EC; camera->currentBoomYaw = camera->auxPitch; camera->trueRotation.x = camera->unk_70; - if (camera->unk_06) { - camera->unk_06 = 0; + if (camera->needsInit) { + camera->needsInit = FALSE; camera->unk_98 = 0.0f; camera->unk_9C = 0.0f; @@ -278,8 +278,8 @@ void update_camera_mode_1(Camera* camera) { f32 new_var2; f32 tmp1; - if (camera->unk_06) { - camera->unk_06 = FALSE; + if (camera->needsInit) { + camera->needsInit = FALSE; deltaX = camera->lookAt_obj_target.x; deltaZ2 = camera->lookAt_obj_target.z; @@ -413,25 +413,25 @@ void update_camera_mode_1(Camera* camera) { } void update_camera_mode_0(Camera* camera) { - f32 xTemp; - f32 yTemp; - f32 zTemp; + f32 dx; + f32 dy; + f32 dz; - if (camera->unk_06) { + if (camera->needsInit) { camera->lookAt_obj.x = 0.0f; camera->lookAt_obj.y = 0.0f; camera->lookAt_obj.z = 0.0f; - camera->unk_06 = FALSE; + camera->needsInit = FALSE; camera->lookAt_eye.x = camera->lookAt_obj.x; camera->lookAt_eye.y = camera->lookAt_obj.y; camera->lookAt_eye.z = camera->lookAt_obj.z - (1000.0f / D_8009A5EC); } camera->currentYaw = atan2(camera->lookAt_eye.x, camera->lookAt_eye.z, camera->lookAt_obj.x, camera->lookAt_obj.z); - xTemp = camera->lookAt_obj.x - camera->lookAt_eye.x; - yTemp = camera->lookAt_obj.y - camera->lookAt_eye.y; - zTemp = camera->lookAt_obj.z - camera->lookAt_eye.z; - camera->currentBlendedYawNegated = -atan2(0.0f, 0.0f, xTemp, zTemp); - xTemp = -sqrtf(SQ(xTemp) + SQ(zTemp)); - camera->currentPitch = atan2(0.0f, 0.0f, yTemp, xTemp); + dx = camera->lookAt_obj.x - camera->lookAt_eye.x; + dy = camera->lookAt_obj.y - camera->lookAt_eye.y; + dz = camera->lookAt_obj.z - camera->lookAt_eye.z; + camera->currentBlendedYawNegated = -atan2(0.0f, 0.0f, dx, dz); + dx = -sqrtf(SQ(dx) + SQ(dz)); + camera->currentPitch = atan2(0.0f, 0.0f, dy, dx); } diff --git a/src/B0E0.c b/src/B0E0.c index be913f2a06..741fba003f 100644 --- a/src/B0E0.c +++ b/src/B0E0.c @@ -22,8 +22,8 @@ void update_camera_mode_unused(Camera* camera) { f32 deltaZ2; f32 boomYaw; - if (camera->unk_06 || camera->isChangingMap) { - camera->unk_06 = FALSE; + if (camera->needsInit || camera->isChangingMap) { + camera->needsInit = FALSE; camera->isChangingMap = FALSE; camera->auxPitch = 0; camera->auxBoomLength = 100; @@ -91,11 +91,11 @@ void update_camera_mode_5(Camera* camera) { camera->currentBoomLength = 690.0f; camera->currentYOffset = 47.0f; - if (camera->unk_06) { + if (camera->needsInit) { camera->unk_550 = 0.0f; camera->unk_70 = 0.0f; camera->trueRotation.x = 0.0f; - camera->unk_06 = FALSE; + camera->needsInit = FALSE; camera->unk_554 = 0; camera->lookAt_obj.x = camera->targetPos.x; camera->lookAt_obj.y = camera->targetPos.y + camera->currentYOffset; diff --git a/src/C50A0.c b/src/C50A0.c index fa25ff4163..6ec23e0c65 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -658,7 +658,7 @@ void draw_coin_sparkles(ItemEntity* itemEntity) { Matrix4f sp58; Matrix4f sp98; Matrix4f spD8; - FoldImageRecPart foldImage; + ImgFXTexture ifxImg; x = D_80155D8C; y = D_80155D8E; @@ -687,14 +687,14 @@ void draw_coin_sparkles(ItemEntity* itemEntity) { gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); - foldImage.raster = itemEntity->sparkleRaster; - foldImage.palette = itemEntity->sparklePalette; - foldImage.width = itemEntity->sparkleWidth; - foldImage.height = itemEntity->sparkleHeight; - foldImage.xOffset = -itemEntity->sparkleWidth / 2; - foldImage.yOffset = itemEntity->sparkleHeight / 2; - foldImage.opacity = 255; - fold_appendGfx_component(0, &foldImage, 0, spD8); + ifxImg.raster = itemEntity->sparkleRaster; + ifxImg.palette = itemEntity->sparklePalette; + ifxImg.width = itemEntity->sparkleWidth; + ifxImg.height = itemEntity->sparkleHeight; + ifxImg.xOffset = -itemEntity->sparkleWidth / 2; + ifxImg.yOffset = itemEntity->sparkleHeight / 2; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, 0, spD8); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); gDPPipeSync(gMainGfxPos++); diff --git a/src/ad90_len_2880.c b/src/ad90_len_2880.c index c6870472ea..391f9e1341 100644 --- a/src/ad90_len_2880.c +++ b/src/ad90_len_2880.c @@ -11,9 +11,10 @@ void update_camera_mode_6(Camera* camera) { f32 deltaZ2; f32 boomYaw; f32 new_var; + f32 planarDist; - if (camera->unk_06 != 0 || camera->isChangingMap) { - camera->unk_06 = 0; + if (camera->needsInit || camera->isChangingMap) { + camera->needsInit = FALSE; camera->isChangingMap = FALSE; camera->auxPitch = 0; camera->auxBoomLength = 100; @@ -30,7 +31,7 @@ void update_camera_mode_6(Camera* camera) { } if (camera->auxPitch == 0) { camera->lookAt_obj.x = camera->lookAt_obj_target.x + camera->targetPos.x; - camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->targetPos.y + camera->auxBoomZOffset * 0.00390625; + camera->lookAt_obj.y = camera->lookAt_obj_target.y + camera->targetPos.y + camera->auxBoomZOffset / 256.0; camera->lookAt_obj.z = camera->lookAt_obj_target.z + camera->targetPos.z; camera->trueRotation.x = camera->auxBoomYaw; camera->currentBoomYaw = camera->auxBoomPitch; @@ -42,10 +43,10 @@ void update_camera_mode_6(Camera* camera) { deltaX = 0.0f; deltaY = 0.0f; deltaZ = camera->currentBoomLength; - deltaX2 = deltaX; - deltaY2 = deltaY; + deltaX2 = 0.0f; + deltaY2 = 0.0f; boomYaw = deltaX = -deltaY2; - deltaZ2 = deltaZ; + deltaZ2 = camera->currentBoomLength; new_var = boomYaw; deltaX = deltaX2; deltaY = cosBoom * deltaY2 + deltaZ2 * sinBoom; @@ -66,7 +67,8 @@ void update_camera_mode_6(Camera* camera) { deltaY = camera->lookAt_obj.y - camera->lookAt_eye.y; deltaZ = camera->lookAt_obj.z - camera->lookAt_eye.z; camera->currentBlendedYawNegated = -atan2(0.0f, 0.0f, deltaX, deltaZ); - camera->currentPitch = atan2(0.0f, 0.0f, deltaY, -sqrtf(SQ(deltaX) + SQ(deltaZ))); + planarDist = sqrtf(SQ(deltaX) + SQ(deltaZ)); + camera->currentPitch = atan2(0.0f, 0.0f, deltaY, -planarDist); gBattleStatus.camLookatObjPos.x = camera->lookAt_obj.x; gBattleStatus.camLookatObjPos.y = camera->lookAt_obj.y; gBattleStatus.camLookatObjPos.z = camera->lookAt_obj.z; diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index 2fcd96a7e3..80796bab58 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -199,12 +199,11 @@ API_CALLABLE(N(update_effect)) { actorPart = get_actor_part(actor, 1); if (actorPart->currentAnimation == ANIM_BigLanternGhost_Anim0C) { - func_802DE8DC(actor->partsTable->spriteInstanceID, 0, &partX, &partY, &partZ); + spr_get_comp_position(actor->partsTable->spriteInstanceID, 0, &partX, &partY, &partZ); } else { - func_802DE8DC(actor->partsTable->spriteInstanceID, 1, &partX, &partY, &partZ); + spr_get_comp_position(actor->partsTable->spriteInstanceID, 1, &partX, &partY, &partZ); } - partY += 20; f24 = (f32)partX * SPRITE_WORLD_SCALE_D; diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index e6cce93d5f..abd72039d5 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -135,15 +135,14 @@ EvtScript N(init) = { #include "battle/area/sam2/actor/img.png.inc.c" #include "battle/area/sam2/actor/img.pal.inc.c" -FoldImageRecPart D_8021A2B8_63F498 = { +ImgFXOverlayTexture N(MonstarDetailTexture) = { .raster = battle_area_sam2_actor_img_png, .palette = battle_area_sam2_actor_img_pal, .width = battle_area_sam2_actor_img_png_width, .height = battle_area_sam2_actor_img_png_height, - .xOffset = -1, - .yOffset = -4, - .opacity = 0, - .dlist = N(dlist), + .offsetX = -4, + .offsetY = 0, + .displayList = N(dlist), }; API_CALLABLE(func_80218000_63D1E0) { @@ -158,10 +157,10 @@ API_CALLABLE(func_80218000_63D1E0) { script->functionTemp[1] = 0; script->functionTemp[2] = 0; script->functionTemp[0] = 0; - func_802DE780(part->spriteInstanceID, 0, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); + set_npc_imgfx_comp(part->spriteInstanceID, 0, IMGFX_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); } - func_802DE780(part->spriteInstanceID, 1, FOLD_TYPE_F, (s32)&D_8021A2B8_63F498, 255, 0, 255, 0); + set_npc_imgfx_comp(part->spriteInstanceID, 1, IMGFX_OVERLAY, (s32)&N(MonstarDetailTexture), 255, 0, 255, 0); script->functionTemp[1] += 10; if (script->functionTemp[1] >= 360) { script->functionTemp[1] %= 360; @@ -174,7 +173,7 @@ API_CALLABLE(func_80218000_63D1E0) { } for (i = 0; i < 20; i++) { - 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); + set_npc_imgfx_comp(part->spriteInstanceID, 0, IMGFX_COLOR_BUF_SET_MODULATE, i, colR[i] << 0x18 | colG[i] << 0x10 | colB[i] << 8 | 255, 0, 255, 0); } return ApiStatus_BLOCK; diff --git a/src/common/UnkBowserFunc1.inc.c b/src/common/UnkBowserFunc1.inc.c index f4c4dcb713..96b6fd734d 100644 --- a/src/common/UnkBowserFunc1.inc.c +++ b/src/common/UnkBowserFunc1.inc.c @@ -30,7 +30,7 @@ API_CALLABLE(N(UnkBowserFunc1)) { script->functionTemp[0] = 0; for (i = 0; i < 10; i++) { - func_802DE780(part->spriteInstanceID, i, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); + set_npc_imgfx_comp(part->spriteInstanceID, i, IMGFX_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_UPD_COLOR_BUF_SET_C, j, colorRGBA, 0, 255, 0); + set_npc_imgfx_comp(part->spriteInstanceID, i, IMGFX_COLOR_BUF_SET_MODULATE, 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_UPD_COLOR_BUF_SET_C, j, colorRGBA, 0, opacity & 0xFFFF, 0); + set_npc_imgfx_comp(part->spriteInstanceID, i, IMGFX_COLOR_BUF_SET_MODULATE, j, colorRGBA, 0, opacity & 0xFFFF, 0); } } script->functionTemp[1] = 0; diff --git a/src/d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c index 70d932daf8..b3e80e7049 100644 --- a/src/d0a70_len_4fe0.c +++ b/src/d0a70_len_4fe0.c @@ -4,19 +4,32 @@ #if VERSION_IQUE // TODO: remove if section is split in iQue release -extern Addr fold_gfx_data_ROM_START; +extern Addr imgfx_gfx_data_ROM_START; #endif -typedef union FoldIntVars { +typedef union ImgFXIntVars { s32 raw[2][4]; - Color4i color[2]; - s32 savedArgs[2][4]; + struct { + s32 anim[4]; + s32 color[4]; + } args; + // type-specific anim args (sharing first 0x10 bytes) struct { s32 type; + s32 interval; // always 1 or 2 in practice + s32 step; // always 1 in practice } anim; struct { Vec3i mag; } wavy; + // type-specific color args (sharing second 0x10 bytes) + struct { + char unk_00[0x10]; + s32 r; + s32 g; + s32 b; + s32 a; + } color; struct { char unk_00[0x10]; s32 mode; @@ -24,10 +37,16 @@ typedef union FoldIntVars { char unk_18[4]; s32 alphaAmt; } hologram; -} FoldIntVars; + struct { + char unk_00[0x10]; + ImgFXOverlayTexture* pattern; + s32 alpha; + } overlay; +} ImgFXIntVars; -typedef union FoldFloatVars { +typedef union ImgFXFloatVars { f32 raw[2][4]; + // type-specific anim state (sharing first 0x10 bytes) struct { f32 curFrame; f32 curIdx; @@ -37,26 +56,32 @@ typedef union FoldFloatVars { f32 phase2; f32 phase3; } wavy; -} FoldFloatVars; + // type-specific color state (sharing second 0x10 bytes) + struct { + char unk_00[0x10]; + f32 posX; + f32 posY; + } overlay; +} ImgFXFloatVars; -typedef struct { +typedef struct ImgFXState { /* 0x00 */ u8 arrayIdx; /* 0x01 */ u8 meshType; /* 0x02 */ u8 renderType; /* 0x03 */ u8 subdivX; /* 0x04 */ u8 subdivY; - /* 0x05 */ s8 savedType1; - /* 0x06 */ s8 savedType2; + /* 0x05 */ s8 lastAnimCmd; + /* 0x06 */ s8 lastColorCmd; /* 0x07 */ char unk_07[0x1]; /* 0x08 */ u16 firstVtxIdx; /* 0x0A */ u16 lastVtxIdx; /* 0x0C */ u16 unk_0C; /* 0x0E */ s16 unk_0E; - /* 0x10 */ s16 unk_10; + /* 0x10 */ s16 nextIdx; /* 0x14 */ s32 flags; /* 0x18 */ char unk_18[0x4]; - /* 0x1C */ FoldIntVars ints; - /* 0x3C */ FoldFloatVars floats; + /* 0x1C */ ImgFXIntVars ints; + /* 0x3C */ ImgFXFloatVars floats; /* 0x5C */ Color_RGBA8* colorBuf; /* 0x60 */ u16 colorBufCount; /* 0x62 */ char unk_62[0x2]; @@ -64,73 +89,63 @@ typedef struct { /* 0x68 */ Vtx* vtxBufs[2]; /* 0x70 */ Gfx* gfxBufs[2]; /* 0x78 */ s32 otherModeL; -} FoldState; // size = 0x7C +} ImgFXState; // size = 0x7C -typedef struct FoldDataCache { +typedef struct ImgFXCacheEntry { /* 0x00 */ s32* data; /* 0x04 */ u8 staleCooldownTimer; /* 0x05 */ u8 usingContextualHeap; /* 0x06 */ char unk_06[0x2]; -} FoldDataCache; // size = 0x8 +} ImgFXCacheEntry; // size = 0x8 -typedef struct FoldAnimHeader { +typedef struct ImgFXAnimHeader { /* 0x00 */ s32 keyframesOffset; /* 0x04 */ Gfx* gfxOffset; // Gfx for creating mesh from vertices /* 0x08 */ u16 vtxCount; // conserved across keyframes /* 0x0A */ u16 gfxCount; /* 0x0C */ u16 keyframesCount; /* 0x0E */ u16 flags; -} FoldAnimHeader; // size = 0x10 +} ImgFXAnimHeader; // size = 0x10 -enum FoldAnimFlags { - FOLD_ANIM_FLAG_ABSOLUTE_COORDS = 1, // image-relative (in percent) when unset +enum ImgFXAnimFlags { + IMGFX_ANIM_FLAG_ABSOLUTE_COORDS = 1, // image-relative (in percent) when unset }; -typedef struct FoldRenderMode { +typedef struct ImgFXRenderMode { /* 0x0 */ s32 mode1; /* 0x4 */ s32 mode2; /* 0x8 */ u8 flags; // only checks TRUE so far. some kind of switch? -} FoldRenderMode; // size = 0xC +} ImgFXRenderMode; // size = 0xC -typedef struct UnkFoldStruct { - /* 0x00 */ s32 raster; - /* 0x04 */ s32 palette; - /* 0x08 */ u16 width; - /* 0x0A */ u16 height; - /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ Gfx* unk_14; -} UnkFoldStruct; // size = 0x18 - -// 'compressed' vertex data for animated fold keyframes -typedef struct FoldVtx { +// 'compressed' vertex data for animated image fx keyframes +typedef struct ImgFXVtx { /* 0x00 */ s16 ob[3]; /* 0x06 */ u8 tc[2]; /* 0x08 */ s8 cn[3]; /* 0x0B */ char unk_0B; -} FoldVtx; // size = 0x0C +} ImgFXVtx; // size = 0x0C -typedef FoldState FoldStateList[MAX_FOLD_STATES]; +typedef ImgFXState ImgFXInstanceList[MAX_IMGFX_INSTANCES]; extern HeapNode heap_spriteHead; // BSS -extern FoldImageRec D_80156920; -extern Vtx* D_80156948[2]; -extern Vtx* fold_vtxBuf; -extern FoldStateList* D_80156954; +extern ImgFXWorkingTexture ImgFXCurrentTexture; +extern Vtx* ImgFXVtxBuffers[2]; +extern Vtx* imgfx_vtxBuf; +extern ImgFXInstanceList* ImgFXInstances; extern s8 D_80156958[2]; extern s32 D_80156960[2]; extern s32 D_80156968[2]; extern s8 D_80156970; -extern FoldAnimHeader FoldAnimHeaders[4]; +extern ImgFXAnimHeader ImgFXAnimHeaders[4]; // Data -FoldImageRec* fold_currentImage = &D_80156920; +ImgFXWorkingTexture* ImgFXCurrentTexturePtr = &ImgFXCurrentTexture; -u16 fold_vtxCount = 0; +u16 imgfx_vtxCount = 0; -Lights2 FoldLights = gdSPDefLights2(144, 144, 144, 255, 255, 255, 0, 0, 120, 255, 255, 255, 0, 0, 136); +Lights2 ImgFXLights = gdSPDefLights2(144, 144, 144, 255, 255, 255, 0, 0, 120, 255, 255, 255, 0, 0, 136); Vp D_8014EE40 = { .vp = { @@ -146,9 +161,9 @@ Vp D_8014EE50 = { } }; -u16 FoldVtxBufferCapacity = 300; +u16 ImgFXVtxBufferCapacity = 300; -Gfx DefaultFoldSetupGfx[] = { +Gfx DefaultImgFXSetupGfx[] = { gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), @@ -159,85 +174,85 @@ Gfx DefaultFoldSetupGfx[] = { }; //TODO figure out bits -FoldRenderMode D_8014EE98[17] = { - [FOLD_RENDER_TYPE_0] { 0x00441208, 0x00111208, FALSE }, - [FOLD_RENDER_TYPE_1] { 0x00441208, 0x00111208, FALSE }, - [FOLD_RENDER_TYPE_2] { 0x00404B40, 0x00104B40, TRUE }, - [FOLD_RENDER_TYPE_3] { 0x00404B40, 0x00104B40, TRUE }, - [FOLD_RENDER_TYPE_4] { 0x00441208, 0x00111208, FALSE }, - [FOLD_RENDER_TYPE_5] { 0x00404B40, 0x00104B40, TRUE }, - [FOLD_RENDER_TYPE_6] { 0x00441208, 0x00111208, FALSE }, - [FOLD_RENDER_TYPE_7] { 0x00404B40, 0x00104B40, TRUE }, - [FOLD_RENDER_TYPE_8] { 0x00404B40, 0x00104B40, TRUE }, - [FOLD_RENDER_TYPE_9] { 0x00441208, 0x00111208, FALSE }, - [FOLD_RENDER_TYPE_A] { 0x00404B40, 0x00104B40, TRUE }, - [FOLD_RENDER_TYPE_B] { 0x00441208, 0x00111208, FALSE }, - [FOLD_RENDER_HOLOGRAM] { 0x00404B40, 0x00104B40, TRUE }, - [FOLD_RENDER_TYPE_D] { 0x00441208, 0x00111208, FALSE }, - [FOLD_RENDER_TYPE_E] { 0x00441208, 0x00111208, FALSE }, - [FOLD_RENDER_TYPE_F] { 0x00404B40, 0x00104B40, TRUE }, - [FOLD_RENDER_TYPE_10] { 0x00441208, 0x00111208, FALSE }, +ImgFXRenderMode ImgFXRenderModes[] = { + [IMGFX_RENDER_DEFAULT] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_MULTIPLY_RGB] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_MULTIPLY_ALPHA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MULTIPLY_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MODULATE_PRIM_RGB] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_MODULATE_PRIM_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MULTIPLY_SHADE_RGB] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_MULTIPLY_SHADE_ALPHA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MULTIPLY_SHADE_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_MODULATE_SHADE_RGB] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_MODULATE_SHADE_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_ANIM] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_HOLOGRAM] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_COLOR_FILL] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_OVERLAY_RGB] { 0x00441208, 0x00111208, 0 }, + [IMGFX_RENDER_OVERLAY_RGBA] { 0x00404B40, 0x00104B40, IMGFX_RENDER_NO_OVERRIDE }, + [IMGFX_RENDER_UNUSED] { 0x00441208, 0x00111208, 0 }, }; -// all relative to fold_gfx_data_ROM_START -s32 FoldAnimOffsets[] = { - [FOLD_ANIM_SHOCK] 0x14358, - [FOLD_ANIM_SHIVER] 0x18200, - [FOLD_ANIM_VERTICAL_PIPE_CURL] 0x1A858, - [FOLD_ANIM_HORIZONTAL_PIPE_CURL] 0x1E830, - [FOLD_ANIM_STARTLE] 0x29458, - [FOLD_ANIM_FLUTTER_DOWN] 0x314E0, - [FOLD_ANIM_UNFURL] 0x33498, - [FOLD_ANIM_GET_IN_BED] 0x38988, - [FOLD_ANIM_SPIRIT_CAPTURE] 0x39228, - [FOLD_ANIM_UNUSED_1] 0x5B7A8, - [FOLD_ANIM_UNUSED_2] 0x7CF10, - [FOLD_ANIM_UNUSED_3] 0x86490, - [FOLD_ANIM_TUTANKOOPA_GATHER] 0x96258, - [FOLD_ANIM_TUTANKOOPA_SWIRL_2] 0xA1820, - [FOLD_ANIM_TUTANKOOPA_SWIRL_1] 0xACDE8, - [FOLD_ANIM_SHUFFLE_CARDS] 0xBBF68, - [FOLD_ANIM_FLIP_CARD_1] 0xC0490, - [FOLD_ANIM_FLIP_CARD_2] 0xC49B8, - [FOLD_ANIM_FLIP_CARD_3] 0xC6150, - [FOLD_ANIM_CYMBAL_CRUSH] 0xCA380, +// all relative to imgfx_gfx_data_ROM_START +s32 ImgFXAnimOffsets[] = { + [IMGFX_ANIM_SHOCK] 0x14358, + [IMGFX_ANIM_SHIVER] 0x18200, + [IMGFX_ANIM_VERTICAL_PIPE_CURL] 0x1A858, + [IMGFX_ANIM_HORIZONTAL_PIPE_CURL] 0x1E830, + [IMGFX_ANIM_STARTLE] 0x29458, + [IMGFX_ANIM_FLUTTER_DOWN] 0x314E0, + [IMGFX_ANIM_UNFURL] 0x33498, + [IMGFX_ANIM_GET_IN_BED] 0x38988, + [IMGFX_ANIM_SPIRIT_CAPTURE] 0x39228, + [IMGFX_ANIM_UNUSED_1] 0x5B7A8, + [IMGFX_ANIM_UNUSED_2] 0x7CF10, + [IMGFX_ANIM_UNUSED_3] 0x86490, + [IMGFX_ANIM_TUTANKOOPA_GATHER] 0x96258, + [IMGFX_ANIM_TUTANKOOPA_SWIRL_2] 0xA1820, + [IMGFX_ANIM_TUTANKOOPA_SWIRL_1] 0xACDE8, + [IMGFX_ANIM_SHUFFLE_CARDS] 0xBBF68, + [IMGFX_ANIM_FLIP_CARD_1] 0xC0490, + [IMGFX_ANIM_FLIP_CARD_2] 0xC49B8, + [IMGFX_ANIM_FLIP_CARD_3] 0xC6150, + [IMGFX_ANIM_CYMBAL_CRUSH] 0xCA380, }; -extern FoldDataCache fold_gfxDataCache[8]; +extern ImgFXCacheEntry ImgFXDataCache[8]; -void fold_clear_state_gfx(FoldState* state); -void fold_clear_state_data(FoldState* state); -void fold_init_state(FoldState* state); -void func_8013B0EC(FoldState* state); -void func_8013B1B0(FoldState* state, Matrix4f mtx); -void fold_mesh_make_strip(FoldState* state); -void fold_mesh_make_grid(FoldState* state); -//FoldAnimHeader* fold_load_anim(FoldState* state); -void fold_mesh_anim_update(FoldState* state); -void func_8013CFA8(FoldState*, Matrix4f mtx); -void func_8013DAB4(FoldState*, Matrix4f mtx); -void func_8013E2F0(FoldState*, Matrix4f mtx); -void func_8013E904(FoldState*, Matrix4f mtx); -void fold_wavy_init(FoldState* state); -void fold_mesh_wavy_update(FoldState* state); -void fold_mesh_load_colors(FoldState* state); +void imgfx_cache_instance_data(ImgFXState* state); +void imgfx_clear_instance_data(ImgFXState* state); +void imgfx_init_instance(ImgFXState* state); +void imgfx_make_mesh(ImgFXState* state); +void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx); +void imgfx_mesh_make_strip(ImgFXState* state); +void imgfx_mesh_make_grid(ImgFXState* state); +//ImgFXAnimHeader* imgfx_load_anim(ImgFXState* state); +void imgfx_mesh_anim_update(ImgFXState* state); +void imgfx_appendGfx_mesh_basic(ImgFXState*, Matrix4f mtx); +void imgfx_appendGfx_mesh_grid(ImgFXState*, Matrix4f mtx); +void imgfx_appendGfx_mesh_anim(ImgFXState*, Matrix4f mtx); +void imgfx_appendGfx_mesh_strip(ImgFXState*, Matrix4f mtx); +void imgfx_wavy_init(ImgFXState* state); +void imgfx_mesh_make_wavy(ImgFXState* state); +void imgfx_mesh_load_colors(ImgFXState* state); -void fold_set_vtx_buf_capacity(s16 arg0) { - FoldVtxBufferCapacity = arg0; +void imgfx_set_vtx_buf_capacity(s16 arg0) { + ImgFXVtxBufferCapacity = arg0; } -void fold_init(void) { +void imgfx_init(void) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80156948); i++) { - D_80156948[i] = _heap_malloc(&heap_spriteHead, FoldVtxBufferCapacity * sizeof(Vtx)); + for (i = 0; i < ARRAY_COUNT(ImgFXVtxBuffers); i++) { + ImgFXVtxBuffers[i] = _heap_malloc(&heap_spriteHead, ImgFXVtxBufferCapacity * sizeof(Vtx)); } - D_80156954 = (FoldStateList*)_heap_malloc(&heap_spriteHead, ARRAY_COUNT(*D_80156954) * sizeof((*D_80156954)[0])); + ImgFXInstances = (ImgFXInstanceList*)_heap_malloc(&heap_spriteHead, sizeof(ImgFXInstanceList)); - for (i = 0; i < ARRAY_COUNT(*D_80156954); i++) { - fold_init_state(&(*D_80156954)[i]); - fold_clear_state_data(&(*D_80156954)[i]); + for (i = 0; i < ARRAY_COUNT(*ImgFXInstances); i++) { + imgfx_init_instance(&(*ImgFXInstances)[i]); + imgfx_clear_instance_data(&(*ImgFXInstances)[i]); } for (i = 0; i < ARRAY_COUNT(D_80156958); i++) { @@ -247,190 +262,193 @@ void fold_init(void) { D_80156970 = 0; } - for (i = 0; i < ARRAY_COUNT(fold_gfxDataCache); i++) { - fold_gfxDataCache[i].data = NULL; - fold_gfxDataCache[i].staleCooldownTimer = 0; - fold_gfxDataCache[i].usingContextualHeap = FALSE; + for (i = 0; i < ARRAY_COUNT(ImgFXDataCache); i++) { + ImgFXDataCache[i].data = NULL; + ImgFXDataCache[i].staleCooldownTimer = 0; + ImgFXDataCache[i].usingContextualHeap = FALSE; } - fold_vtxCount = 0; - fold_vtxBuf = D_80156948[gCurrentDisplayContextIndex]; + imgfx_vtxCount = 0; + imgfx_vtxBuf = ImgFXVtxBuffers[gCurrentDisplayContextIndex]; } void func_8013A4D0(void) { s32 i; - fold_vtxBuf = D_80156948[gCurrentDisplayContextIndex]; - fold_vtxCount = 0; - fold_init_state(&(*D_80156954)[0]); + imgfx_vtxBuf = ImgFXVtxBuffers[gCurrentDisplayContextIndex]; + imgfx_vtxCount = 0; + imgfx_init_instance(&(*ImgFXInstances)[0]); - (*D_80156954)[0].flags |= FOLD_STATE_FLAG_ENABLED; + (*ImgFXInstances)[0].flags |= IMGFX_FLAG_IN_USE; - for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if (((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED) && (*D_80156954)[i].savedType1 != FOLD_UPD_SET_ANIM) { - fold_clear_state_gfx(&(*D_80156954)[i]); + for (i = 1; i < ARRAY_COUNT(*ImgFXInstances); i++) { + if (((*ImgFXInstances)[i].flags & IMGFX_FLAG_IN_USE) && (*ImgFXInstances)[i].lastAnimCmd != IMGFX_SET_ANIM) { + imgfx_cache_instance_data(&(*ImgFXInstances)[i]); } } - for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if ((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED && (*D_80156954)[i].colorBuf != NULL) { - if ((*D_80156954)[i].savedType2 == FOLD_UPD_COLOR_BUF_SET_B) { + for (i = 1; i < ARRAY_COUNT(*ImgFXInstances); i++) { + if ((*ImgFXInstances)[i].flags & IMGFX_FLAG_IN_USE && (*ImgFXInstances)[i].colorBuf != NULL) { + if ((*ImgFXInstances)[i].lastColorCmd == IMGFX_COLOR_BUF_SET_MULTIPLY) { continue; } - if ((*D_80156954)[i].savedType2 == FOLD_UPD_COLOR_BUF_SET_C) { + if ((*ImgFXInstances)[i].lastColorCmd == IMGFX_COLOR_BUF_SET_MODULATE) { continue; } - general_heap_free((*D_80156954)[i].colorBuf); - (*D_80156954)[i].colorBuf = NULL; - (*D_80156954)[i].colorBufCount = 0; + general_heap_free((*ImgFXInstances)[i].colorBuf); + (*ImgFXInstances)[i].colorBuf = NULL; + (*ImgFXInstances)[i].colorBufCount = 0; } } } -void fold_add_to_gfx_cache(void* data, s8 usingContextualHeap) { +void imgfx_add_to_cache(void* data, s8 usingContextualHeap) { s32 i; - for (i = 0; i < ARRAY_COUNT(fold_gfxDataCache); i++) { - if (fold_gfxDataCache[i].data == NULL) { - fold_gfxDataCache[i].data = data; - fold_gfxDataCache[i].staleCooldownTimer = 4; - fold_gfxDataCache[i].usingContextualHeap = usingContextualHeap; + for (i = 0; i < ARRAY_COUNT(ImgFXDataCache); i++) { + if (ImgFXDataCache[i].data == NULL) { + ImgFXDataCache[i].data = data; + ImgFXDataCache[i].staleCooldownTimer = 4; + ImgFXDataCache[i].usingContextualHeap = usingContextualHeap; return; } } } -void fold_update_gfx_cache(void) { +void imgfx_update_cache_impl(void) { s32 i; - for (i = 0; i < ARRAY_COUNT(fold_gfxDataCache); i++) { - if (fold_gfxDataCache[i].data != NULL) { - fold_gfxDataCache[i].staleCooldownTimer--; + for (i = 0; i < ARRAY_COUNT(ImgFXDataCache); i++) { + if (ImgFXDataCache[i].data != NULL) { + ImgFXDataCache[i].staleCooldownTimer--; - if (fold_gfxDataCache[i].staleCooldownTimer == 0) { - if (fold_gfxDataCache[i].usingContextualHeap) { - heap_free(fold_gfxDataCache[i].data); - fold_gfxDataCache[i].data = NULL; + if (ImgFXDataCache[i].staleCooldownTimer == 0) { + if (ImgFXDataCache[i].usingContextualHeap) { + heap_free(ImgFXDataCache[i].data); + ImgFXDataCache[i].data = NULL; } else { - general_heap_free(fold_gfxDataCache[i].data); - fold_gfxDataCache[i].data = NULL; + general_heap_free(ImgFXDataCache[i].data); + ImgFXDataCache[i].data = NULL; } - fold_gfxDataCache[i].staleCooldownTimer = 0; - fold_gfxDataCache[i].usingContextualHeap = FALSE; + ImgFXDataCache[i].staleCooldownTimer = 0; + ImgFXDataCache[i].usingContextualHeap = FALSE; } } } } -void func_8013A6E8(void) { - fold_update_gfx_cache(); +void imgfx_update_cache(void) { + imgfx_update_cache_impl(); } -s32 func_8013A704(s32 arg0) { - s32 count; - s32 cond; +// request some number of imgfx instances. returns the id of the first assigned instance, or -1 if not enough are free. +s32 imgfx_get_free_instances(s32 count) { + s32 numAssigned; + s32 foundAny; s32 iPrev; - s32 ret; + s32 firstIdx; s32 i; - count = 0; - for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if (!((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED)) { - count++; + numAssigned = 0; + for (i = 1; i < ARRAY_COUNT(*ImgFXInstances); i++) { + if (!((*ImgFXInstances)[i].flags & IMGFX_FLAG_IN_USE)) { + numAssigned++; } } - if (count < arg0) { + if (numAssigned < count) { return -1; } - ret = 0; - cond = FALSE; - count = 0; + firstIdx = 0; + foundAny = FALSE; + numAssigned = 0; iPrev = -1; - for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if (!((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED)) { - if (!cond) { - ret = i; - cond = TRUE; - } else { - (*D_80156954)[iPrev].unk_10 = i; - } + for (i = 1; i < ARRAY_COUNT(*ImgFXInstances); i++) { + if ((*ImgFXInstances)[i].flags & IMGFX_FLAG_IN_USE) { + continue; + } - (*D_80156954)[i].arrayIdx = i; - fold_init_state(&(*D_80156954)[i]); - count++; - (*D_80156954)[i].flags |= FOLD_STATE_FLAG_ENABLED; - iPrev = i; - if (count == arg0) { - (*D_80156954)[i].unk_10 = -1; - break; - } + if (!foundAny) { + firstIdx = i; + foundAny = TRUE; + } else { + (*ImgFXInstances)[iPrev].nextIdx = i; + } + + (*ImgFXInstances)[i].arrayIdx = i; + imgfx_init_instance(&(*ImgFXInstances)[i]); + numAssigned++; + (*ImgFXInstances)[i].flags |= IMGFX_FLAG_IN_USE; + iPrev = i; + if (numAssigned == count) { + (*ImgFXInstances)[i].nextIdx = -1; + break; } } - return ret; + return firstIdx; } -void func_8013A854(u32 idx) { - if (idx < MAX_FOLD_STATES) { - (*D_80156954)[idx].flags = 0; - (*D_80156954)[idx].unk_10 = -1; +void imgfx_release_instance(u32 idx) { + if (idx < MAX_IMGFX_INSTANCES) { + (*ImgFXInstances)[idx].flags = 0; + (*ImgFXInstances)[idx].nextIdx = -1; } } -void func_8013A888(u32 idx) { - if (idx < MAX_FOLD_STATES) { - s32 temp_s0; +void imgfx_release_instance_chain(u32 idx) { + if (idx < MAX_IMGFX_INSTANCES) { + s32 next; do { - temp_s0 = (*D_80156954)[idx].unk_10; - func_8013A854(idx); - idx = temp_s0; - } while (temp_s0 != -1); + next = (*ImgFXInstances)[idx].nextIdx; + imgfx_release_instance(idx); + idx = next; + } while (next != -1); } } -s16 func_8013A8E0(s32 idx) { - if (idx < 0 || idx >= MAX_FOLD_STATES) { +s32 imgfx_get_next_instance(s32 idx) { + if (idx < 0 || idx >= MAX_IMGFX_INSTANCES) { return -1; } - if (idx >= MAX_FOLD_STATES) { + if (idx >= MAX_IMGFX_INSTANCES) { return 0xFF; } else { - return (*D_80156954)[idx].unk_10; + return (*ImgFXInstances)[idx].nextIdx; } } -FoldState* fold_get_state(s32 idx) { - return &(*D_80156954)[idx]; +ImgFXState* imgfx_get_instance(s32 idx) { + return &(*ImgFXInstances)[idx]; } -void fold_clear_state_gfx(FoldState* state) { +void imgfx_cache_instance_data(ImgFXState* state) { if (state->curAnimOffset != NULL) { state->curAnimOffset = NULL; } if (state->vtxBufs[0] != NULL) { - fold_add_to_gfx_cache(state->vtxBufs[0], TRUE); + imgfx_add_to_cache(state->vtxBufs[0], TRUE); state->vtxBufs[0] = NULL; } if (state->vtxBufs[1] != NULL) { - fold_add_to_gfx_cache(state->vtxBufs[1], TRUE); + imgfx_add_to_cache(state->vtxBufs[1], TRUE); state->vtxBufs[1] = NULL; } if (state->gfxBufs[0] != NULL) { - fold_add_to_gfx_cache(state->gfxBufs[0], TRUE); + imgfx_add_to_cache(state->gfxBufs[0], TRUE); state->gfxBufs[0] = NULL; } if (state->gfxBufs[1] != NULL) { - fold_add_to_gfx_cache(state->gfxBufs[1], TRUE); + imgfx_add_to_cache(state->gfxBufs[1], TRUE); state->gfxBufs[1] = NULL; } } -void fold_clear_state_data(FoldState* state) { +void imgfx_clear_instance_data(ImgFXState* state) { state->curAnimOffset = NULL; state->vtxBufs[0] = NULL; state->vtxBufs[1] = NULL; @@ -440,16 +458,16 @@ void fold_clear_state_data(FoldState* state) { state->colorBufCount = 0; } -void fold_init_state(FoldState* state) { +void imgfx_init_instance(ImgFXState* state) { s32 i; s32 j; - state->unk_10 = -1; - state->savedType1 = FOLD_UPD_CLEAR; - state->savedType2 = FOLD_UPD_CLEAR; + state->nextIdx = -1; + state->lastAnimCmd = IMGFX_CLEAR; + state->lastColorCmd = IMGFX_CLEAR; state->flags = 0; - state->meshType = FOLD_MESH_TYPE_0; - state->renderType = FOLD_RENDER_TYPE_0; + state->meshType = IMGFX_MESH_DEFAULT; + state->renderType = IMGFX_RENDER_DEFAULT; state->firstVtxIdx = 0; state->lastVtxIdx = 0; state->unk_0C = 0; @@ -474,273 +492,280 @@ void fold_init_state(FoldState* state) { } } -void fold_update(u32 idx, FoldType type, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4, s32 flags) { - FoldState* state = &(*D_80156954)[idx]; +void imgfx_update(u32 idx, ImgFXType type, s32 imgfxArg1, s32 imgfxArg2, s32 imgfxArg3, s32 imgfxArg4, s32 flags) { + ImgFXState* state = &(*ImgFXInstances)[idx]; s32 oldFlags; s32 t1; u8 r, g, b, a; - if (!(state->flags & FOLD_STATE_FLAG_ENABLED) || (idx >= MAX_FOLD_STATES)) { + if (!(state->flags & IMGFX_FLAG_IN_USE) || (idx >= MAX_IMGFX_INSTANCES)) { return; } switch (type) { - case FOLD_UPD_CLEAR: - case FOLD_TYPE_3: + case IMGFX_CLEAR: + case IMGFX_RESET: oldFlags = state->flags; - fold_clear_state_gfx(state); - fold_init_state(state); + imgfx_cache_instance_data(state); + imgfx_init_instance(state); state->flags = oldFlags; - state->savedType1 = FOLD_UPD_CLEAR; - state->savedType2 = FOLD_UPD_CLEAR; - state->meshType = FOLD_MESH_TYPE_0; - state->renderType = FOLD_RENDER_TYPE_0; + state->lastAnimCmd = IMGFX_CLEAR; + state->lastColorCmd = IMGFX_CLEAR; + state->meshType = IMGFX_MESH_DEFAULT; + state->renderType = IMGFX_RENDER_DEFAULT; state->ints.raw[0][0] = -1; state->ints.raw[1][0] = -1; - state->flags &= FOLD_STATE_FLAG_ENABLED; + state->flags &= IMGFX_FLAG_IN_USE; if (flags != 0) { state->flags |= flags; } else { state->flags |= flags; // required to match } return; - case FOLD_TYPE_1: - state->savedType1 = FOLD_UPD_CLEAR; - state->renderType = FOLD_RENDER_TYPE_0; + case IMGFX_UNK_1: + state->lastAnimCmd = IMGFX_CLEAR; + state->renderType = IMGFX_RENDER_DEFAULT; state->ints.raw[0][0] = -1; return; - case FOLD_TYPE_2: - state->savedType2 = FOLD_UPD_CLEAR; - state->meshType = FOLD_MESH_TYPE_0; + case IMGFX_UNK_2: + state->lastColorCmd = IMGFX_CLEAR; + state->meshType = IMGFX_MESH_DEFAULT; state->ints.raw[1][0] = -1; return; - case FOLD_UPD_ALLOC_COLOR_BUF: + case IMGFX_ALLOC_COLOR_BUF: if (state->colorBuf != NULL) { heap_free(state->colorBuf); } - state->colorBufCount = foldArg1 * 4; + state->colorBufCount = imgfxArg1 * 4; state->colorBuf = heap_malloc(state->colorBufCount); return; - case FOLD_TYPE_F: - case FOLD_TYPE_10: - if (type == state->savedType2 && foldArg1 == state->ints.raw[1][0] && foldArg2 == state->ints.raw[1][1]) { + case IMGFX_OVERLAY: + case IMGFX_OVERLAY_XLU: + if (type == state->lastColorCmd + && imgfxArg1 == (s32) state->ints.overlay.pattern + && imgfxArg2 == state->ints.overlay.alpha + ) { + // no paramaters have changed return; } break; - case FOLD_UPD_SET_ANIM: - if (state->savedType1 == type && state->ints.raw[0][0] == foldArg1 && state->ints.raw[0][1] == foldArg2 && - state->ints.raw[0][2] == foldArg3) - { + case IMGFX_SET_ANIM: + if (state->lastAnimCmd == type + && state->ints.anim.type == imgfxArg1 + && state->ints.anim.interval == imgfxArg2 + && state->ints.anim.step == imgfxArg3 + ) { + // no paramaters have changed return; } break; default: - if (type != FOLD_UPD_HOLOGRAM && state->savedType2 == FOLD_UPD_HOLOGRAM) { - state->meshType = FOLD_MESH_TYPE_0; + if (type != IMGFX_HOLOGRAM && state->lastColorCmd == IMGFX_HOLOGRAM) { + state->meshType = IMGFX_MESH_DEFAULT; state->subdivX = 1; state->subdivY = 1; } break; } - if (type != FOLD_UPD_SET_ANIM && state->savedType1 == FOLD_UPD_SET_ANIM) { - state->savedType1 = FOLD_UPD_CLEAR; + if (type != IMGFX_SET_ANIM && state->lastAnimCmd == IMGFX_SET_ANIM) { + state->lastAnimCmd = IMGFX_CLEAR; } - if (type == FOLD_UPD_WAVY || type == FOLD_UPD_SET_ANIM) { - state->savedType1 = type; - state->ints.savedArgs[0][0] = foldArg1; - state->ints.savedArgs[0][1] = foldArg2; - state->ints.savedArgs[0][2] = foldArg3; - state->ints.savedArgs[0][3] = foldArg4; - } else if (type >= FOLD_UPD_SET_COLOR && type <= FOLD_TYPE_10) { - state->savedType2 = type; - state->ints.savedArgs[1][0] = foldArg1; - state->ints.savedArgs[1][1] = foldArg2; - state->ints.savedArgs[1][2] = foldArg3; - state->ints.savedArgs[1][3] = foldArg4; + if (type == IMGFX_SET_WAVY || type == IMGFX_SET_ANIM) { + state->lastAnimCmd = type; + state->ints.args.anim[0] = imgfxArg1; + state->ints.args.anim[1] = imgfxArg2; + state->ints.args.anim[2] = imgfxArg3; + state->ints.args.anim[3] = imgfxArg4; + } else if (type >= IMGFX_SET_COLOR && type <= IMGFX_OVERLAY_XLU) { + state->lastColorCmd = type; + state->ints.args.color[0] = imgfxArg1; + state->ints.args.color[1] = imgfxArg2; + state->ints.args.color[2] = imgfxArg3; + state->ints.args.color[3] = imgfxArg4; } - state->flags &= FOLD_STATE_FLAG_ENABLED; + state->flags &= IMGFX_FLAG_IN_USE; if (flags != 0) { state->flags |= flags; } - state->meshType = FOLD_MESH_TYPE_0; + state->meshType = IMGFX_MESH_DEFAULT; switch (type) { - case FOLD_TYPE_3: - state->meshType = FOLD_MESH_TYPE_0; - state->renderType = FOLD_RENDER_TYPE_0; + case IMGFX_RESET: + state->meshType = IMGFX_MESH_DEFAULT; + state->renderType = IMGFX_RENDER_DEFAULT; break; - case FOLD_UPD_WAVY: + case IMGFX_SET_WAVY: state->subdivX = 4; state->subdivY = 4; - state->meshType = FOLD_MESH_TYPE_1; - fold_wavy_init(state); + state->meshType = IMGFX_MESH_GRID_WAVY; + imgfx_wavy_init(state); break; - case FOLD_UPD_SET_ANIM: - state->meshType = FOLD_MESH_ANIMATED; - state->renderType = FOLD_RENDER_TYPE_B; + case IMGFX_SET_ANIM: + state->meshType = IMGFX_MESH_ANIMATED; + state->renderType = IMGFX_RENDER_ANIM; state->floats.anim.curFrame = 0.0f; state->floats.anim.curIdx = 0.0f; - state->flags |= FOLD_STATE_FLAG_200; + state->flags |= IMGFX_FLAG_200; break; - case FOLD_UPD_SET_COLOR: - case FOLD_UPD_SET_ALPHA: - case FOLD_UPD_SET_TINT: - if (foldArg1 >= 255 && foldArg2 >= 255 && foldArg3 >= 255 && foldArg4 >= 255) { + case IMGFX_SET_COLOR: + case IMGFX_SET_ALPHA: + case IMGFX_SET_TINT: + if (imgfxArg1 >= 255 && imgfxArg2 >= 255 && imgfxArg3 >= 255 && imgfxArg4 >= 255) { // no color + no transparency - state->renderType = FOLD_RENDER_TYPE_0; - } else if (foldArg4 >= 255) { + state->renderType = IMGFX_RENDER_DEFAULT; + } else if (imgfxArg4 >= 255) { // some color + no transparency - state->renderType = FOLD_RENDER_TYPE_1; - } else if (foldArg1 >= 255 && foldArg2 >= 255 && foldArg3 >= 255) { + state->renderType = IMGFX_RENDER_MULTIPLY_RGB; + } else if (imgfxArg1 >= 255 && imgfxArg2 >= 255 && imgfxArg3 >= 255) { // no color + transparency - state->renderType = FOLD_RENDER_TYPE_2; + state->renderType = IMGFX_RENDER_MULTIPLY_ALPHA; } else { // some color + transparency - state->renderType = FOLD_RENDER_TYPE_3; + state->renderType = IMGFX_RENDER_MULTIPLY_RGBA; } break; - case FOLD_TYPE_9: - case FOLD_TYPE_A: - if (foldArg4 == 255.0) { - state->renderType = FOLD_RENDER_TYPE_4; + case IMGFX_SET_WHITE_FADE: + case IMGFX_SET_CREDITS_FADE: + if (imgfxArg4 == 255.0) { + state->renderType = IMGFX_RENDER_MODULATE_PRIM_RGB; } else { - state->renderType = FOLD_RENDER_TYPE_5; + state->renderType = IMGFX_RENDER_MODULATE_PRIM_RGBA; } break; - case FOLD_UPD_COLOR_BUF_SET_B: - if (foldArg1 < state->colorBufCount) { + case IMGFX_COLOR_BUF_SET_MULTIPLY: + if (imgfxArg1 < state->colorBufCount) { // unpack and store color - r = (foldArg2 & 0xFF000000) >> 24; - g = (foldArg2 & 0xFF0000) >> 16; - b = (foldArg2 & 0xFF00) >> 8; - a = (foldArg2 & 0xFF); - state->colorBuf[foldArg1].r = r; - state->colorBuf[foldArg1].g = g; - state->colorBuf[foldArg1].b = b; - state->colorBuf[foldArg1].a = a; + r = (imgfxArg2 & 0xFF000000) >> 24; + g = (imgfxArg2 & 0xFF0000) >> 16; + b = (imgfxArg2 & 0xFF00) >> 8; + a = (imgfxArg2 & 0xFF); + state->colorBuf[imgfxArg1].r = r; + state->colorBuf[imgfxArg1].g = g; + state->colorBuf[imgfxArg1].b = b; + state->colorBuf[imgfxArg1].a = a; - state->meshType = FOLD_MESH_TYPE_0; + state->meshType = IMGFX_MESH_DEFAULT; if (a == 255) { - state->renderType = FOLD_RENDER_TYPE_6; + state->renderType = IMGFX_RENDER_MULTIPLY_SHADE_RGB; } else { - state->renderType = FOLD_RENDER_TYPE_8; + state->renderType = IMGFX_RENDER_MULTIPLY_SHADE_RGBA; } } break; - case FOLD_UPD_COLOR_BUF_SET_C: - if (foldArg1 < state->colorBufCount) { + case IMGFX_COLOR_BUF_SET_MODULATE: + if (imgfxArg1 < state->colorBufCount) { // unpack and store color - r = (foldArg2 & 0xFF000000) >> 24; - g = (foldArg2 & 0xFF0000) >> 16; - b = (foldArg2 & 0xFF00) >> 8; - a = (foldArg2 & 0xFF); - state->colorBuf[foldArg1].r = r; - state->colorBuf[foldArg1].g = g; - state->colorBuf[foldArg1].b = b; - state->colorBuf[foldArg1].a = a; + r = (imgfxArg2 & 0xFF000000) >> 24; + g = (imgfxArg2 & 0xFF0000) >> 16; + b = (imgfxArg2 & 0xFF00) >> 8; + a = (imgfxArg2 & 0xFF); + state->colorBuf[imgfxArg1].r = r; + state->colorBuf[imgfxArg1].g = g; + state->colorBuf[imgfxArg1].b = b; + state->colorBuf[imgfxArg1].a = a; - state->meshType = FOLD_MESH_TYPE_0; + state->meshType = IMGFX_MESH_DEFAULT; if (a == 255) { - state->renderType = FOLD_RENDER_TYPE_9; + state->renderType = IMGFX_RENDER_MODULATE_SHADE_RGB; } else { - state->renderType = FOLD_RENDER_TYPE_A; + state->renderType = IMGFX_RENDER_MODULATE_SHADE_RGBA; } } break; - case FOLD_UPD_HOLOGRAM: - state->renderType = FOLD_RENDER_HOLOGRAM; + case IMGFX_HOLOGRAM: + state->renderType = IMGFX_RENDER_HOLOGRAM; break; - case FOLD_TYPE_E: - state->renderType = FOLD_RENDER_TYPE_D; + case IMGFX_FILL_COLOR: + state->renderType = IMGFX_RENDER_COLOR_FILL; break; - case FOLD_TYPE_F: - case FOLD_TYPE_10: - state->meshType = FOLD_MESH_TYPE_4; - if (foldArg2 >= 255) { - state->renderType = FOLD_RENDER_TYPE_E; + case IMGFX_OVERLAY: + case IMGFX_OVERLAY_XLU: + state->meshType = IMGFX_MESH_STRIP; + if (imgfxArg2 >= 255) { + state->renderType = IMGFX_RENDER_OVERLAY_RGB; } else { - state->renderType = FOLD_RENDER_TYPE_F; + state->renderType = IMGFX_RENDER_OVERLAY_RGBA; } - state->floats.raw[1][0] = 0.0f; - state->floats.raw[1][1] = 0.0f; + state->floats.overlay.posX = 0.0f; + state->floats.overlay.posY = 0.0f; break; } } -void fold_set_state_flags(s32 idx, u16 flagBits, s32 mode) { - if ((*D_80156954)[idx].flags & FOLD_STATE_FLAG_ENABLED) { +void imgfx_set_state_flags(s32 idx, u16 flagBits, s32 mode) { + if ((*ImgFXInstances)[idx].flags & IMGFX_FLAG_IN_USE) { if (mode) { - (*D_80156954)[idx].flags |= flagBits; + (*ImgFXInstances)[idx].flags |= flagBits; } else { - (*D_80156954)[idx].flags &= ~flagBits; + (*ImgFXInstances)[idx].flags &= ~flagBits; } } } -s32 fold_appendGfx_component(s32 idx, FoldImageRecPart* image, u32 flagBits, Matrix4f mtx) { - FoldState* state = &(*D_80156954)[idx]; +s32 imgfx_appendGfx_component(s32 idx, ImgFXTexture* ifxImg, u32 flagBits, Matrix4f mtx) { + ImgFXState* state = &(*ImgFXInstances)[idx]; s32 ret = 0; - if (image->opacity == 0) { + if (ifxImg->alpha == 0) { return 0; } state->arrayIdx = idx; state->flags |= flagBits; - fold_currentImage->raster = image->raster; - fold_currentImage->palette = image->palette; - fold_currentImage->width = image->width; - fold_currentImage->height = image->height; - fold_currentImage->xOffset = image->xOffset; - fold_currentImage->yOffset = image->yOffset; - fold_currentImage->unk_18 = 0; - fold_currentImage->unk_1E = 0; - fold_currentImage->alphaMultiplier = image->opacity; + ImgFXCurrentTexturePtr->tex.raster = ifxImg->raster; + ImgFXCurrentTexturePtr->tex.palette = ifxImg->palette; + ImgFXCurrentTexturePtr->tex.width = ifxImg->width; + ImgFXCurrentTexturePtr->tex.height = ifxImg->height; + ImgFXCurrentTexturePtr->tex.xOffset = ifxImg->xOffset; + ImgFXCurrentTexturePtr->tex.yOffset = ifxImg->yOffset; + ImgFXCurrentTexturePtr->unk_18 = 0; + ImgFXCurrentTexturePtr->unk_1E = 0; + ImgFXCurrentTexturePtr->alphaMultiplier = ifxImg->alpha; - if ((u32)idx >= MAX_FOLD_STATES) { + if (idx < 0 || idx >= MAX_IMGFX_INSTANCES) { return 0; } - if (idx >= MAX_FOLD_STATES || state == NULL) { + if (idx >= MAX_IMGFX_INSTANCES || state == NULL) { return 0; } - func_8013B0EC(state); - func_8013B1B0(state, mtx); + imgfx_make_mesh(state); + imgfx_appendGfx_mesh(state, mtx); - if (state->flags & FOLD_STATE_FLAG_ANIM_DONE) { + if (state->flags & IMGFX_FLAG_ANIM_DONE) { state->ints.raw[0][0] = -1; state->ints.raw[1][0] = -1; - state->savedType1 = FOLD_UPD_CLEAR; + state->lastAnimCmd = IMGFX_CLEAR; state->meshType = 0; - state->renderType = FOLD_RENDER_TYPE_0; - state->flags &= ~(FOLD_STATE_FLAG_ANIM_DONE | FOLD_STATE_FLAG_800 | FOLD_STATE_FLAG_REVERSE_ANIM | FOLD_STATE_FLAG_LOOP_ANIM); - fold_clear_state_gfx(state); + state->renderType = IMGFX_RENDER_DEFAULT; + state->flags &= ~(IMGFX_FLAG_ANIM_DONE | IMGFX_FLAG_800 | IMGFX_FLAG_REVERSE_ANIM | IMGFX_FLAG_LOOP_ANIM); + imgfx_cache_instance_data(state); ret = 1; - } else if (state->flags & FOLD_STATE_FLAG_4000) { + } else if (state->flags & IMGFX_FLAG_4000) { ret = 2; - } else if (state->flags & FOLD_STATE_FLAG_20000) { - state->savedType1 = FOLD_UPD_CLEAR; - state->savedType2 = FOLD_UPD_CLEAR; - state->meshType = FOLD_MESH_TYPE_0; - state->renderType = FOLD_RENDER_TYPE_0; + } else if (state->flags & IMGFX_FLAG_20000) { + state->lastAnimCmd = IMGFX_CLEAR; + state->lastColorCmd = IMGFX_CLEAR; + state->meshType = IMGFX_MESH_DEFAULT; + state->renderType = IMGFX_RENDER_DEFAULT; state->ints.raw[0][0] = -1; state->ints.raw[1][0] = -1; - state->flags &= FOLD_STATE_FLAG_ENABLED; + state->flags &= IMGFX_FLAG_IN_USE; ret = 1; } return ret; } -void func_8013B0EC(FoldState* state) { +void imgfx_make_mesh(ImgFXState* state) { switch (state->meshType) { - case FOLD_MESH_TYPE_3: + case IMGFX_MESH_GRID_UNUSED: if (state->ints.raw[1][2] == 0) { state->subdivX = 1; state->subdivY = 16; @@ -748,40 +773,41 @@ void func_8013B0EC(FoldState* state) { state->subdivX = 1; state->subdivY = 1; } - case FOLD_MESH_TYPE_1: - fold_mesh_make_grid(state); + // fallthrough + case IMGFX_MESH_GRID_WAVY: + imgfx_mesh_make_grid(state); break; - case FOLD_MESH_ANIMATED: - fold_mesh_anim_update(state); + case IMGFX_MESH_ANIMATED: + imgfx_mesh_anim_update(state); break; - case FOLD_MESH_TYPE_0: - case FOLD_MESH_TYPE_4: - fold_mesh_make_strip(state); + case IMGFX_MESH_DEFAULT: + case IMGFX_MESH_STRIP: + imgfx_mesh_make_strip(state); break; default: return; } - if (state->savedType1 == FOLD_UPD_WAVY) { - fold_mesh_wavy_update(state); + if (state->lastAnimCmd == IMGFX_SET_WAVY) { + imgfx_mesh_make_wavy(state); } - switch (state->savedType2) { - case FOLD_UPD_COLOR_BUF_SET_B: - case FOLD_UPD_COLOR_BUF_SET_C: - fold_mesh_load_colors(state); + switch (state->lastColorCmd) { + case IMGFX_COLOR_BUF_SET_MULTIPLY: + case IMGFX_COLOR_BUF_SET_MODULATE: + imgfx_mesh_load_colors(state); break; } } -void func_8013B1B0(FoldState* state, Matrix4f mtx) { - s16 cond = FALSE; - s32 primAlpha = state->ints.color[1].a; +void imgfx_appendGfx_mesh(ImgFXState* state, Matrix4f mtx) { + s16 skipModeChange = FALSE; + s32 primAlpha = state->ints.color.a; s32 renderType = state->renderType; s8 angle1; s8 angle2; - f32 foldImgAlpha; - FoldRenderMode* fold; + f32 ifxImgAlpha; + ImgFXRenderMode* renderMode; s32 mode1; s32 mode2; s32 dirX1; @@ -789,62 +815,63 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { gDPPipeSync(gMainGfxPos++); - if (!(state->flags & FOLD_STATE_FLAG_SKIP_GFX_SETUP)) { - gSPDisplayList(gMainGfxPos++, DefaultFoldSetupGfx); - if (state->flags & FOLD_STATE_FLAG_NO_FILTERING) { + if (!(state->flags & IMGFX_FLAG_SKIP_GFX_SETUP)) { + gSPDisplayList(gMainGfxPos++, DefaultImgFXSetupGfx); + if (state->flags & IMGFX_FLAG_NO_FILTERING) { gDPSetTextureFilter(gMainGfxPos++, G_TF_POINT); } - if (state->flags & FOLD_STATE_FLAG_G_CULL_BACK) { + if (state->flags & IMGFX_FLAG_G_CULL_BACK) { gSPSetGeometryMode(gMainGfxPos++, G_CULL_BACK); } - if (state->flags & FOLD_STATE_FLAG_G_CULL_FRONT) { + if (state->flags & IMGFX_FLAG_G_CULL_FRONT) { gSPSetGeometryMode(gMainGfxPos++, G_CULL_FRONT); } - fold = &D_8014EE98[state->renderType]; + renderMode = &ImgFXRenderModes[state->renderType]; - mode1 = fold->mode1; - mode2 = fold->mode2; - if (fold->flags & FOLD_STATE_FLAG_ENABLED) { - cond = TRUE; + mode1 = renderMode->mode1; + mode2 = renderMode->mode2; + if (renderMode->flags & IMGFX_RENDER_NO_OVERRIDE) { + skipModeChange = TRUE; } - foldImgAlpha = (f32) fold_currentImage->alphaMultiplier / 255.0; + ifxImgAlpha = (f32) ImgFXCurrentTexturePtr->alphaMultiplier / 255.0; - if (!cond && (fold_currentImage->alphaMultiplier < 255)) { - state->ints.color[1].a = 255; + // some modes dont support alpha < 255 and must be replaced + if (!skipModeChange && (ImgFXCurrentTexturePtr->alphaMultiplier < 255)) { + state->ints.color.a = 255; switch (state->renderType) { - case FOLD_RENDER_TYPE_0: - case FOLD_RENDER_TYPE_B: - renderType = FOLD_RENDER_TYPE_2; + case IMGFX_RENDER_DEFAULT: + case IMGFX_RENDER_ANIM: + renderType = IMGFX_RENDER_MULTIPLY_ALPHA; break; - case FOLD_RENDER_TYPE_1: - case FOLD_RENDER_TYPE_4: - renderType = FOLD_RENDER_TYPE_3; + case IMGFX_RENDER_MULTIPLY_RGB: + case IMGFX_RENDER_MODULATE_PRIM_RGB: + renderType = IMGFX_RENDER_MULTIPLY_RGBA; break; - case FOLD_RENDER_TYPE_9: - renderType = FOLD_RENDER_TYPE_A; + case IMGFX_RENDER_MODULATE_SHADE_RGB: + renderType = IMGFX_RENDER_MODULATE_SHADE_RGBA; break; } - primAlpha = state->ints.color[1].a * foldImgAlpha; + primAlpha = state->ints.color.a * ifxImgAlpha; //TODO figure out bits mode1 = 0x404B40; mode2 = 0x104B40; - cond = TRUE; + skipModeChange = TRUE; } - if ((state->flags & FOLD_STATE_FLAG_400) && !cond) { + if ((state->flags & IMGFX_FLAG_400) && !skipModeChange) { mode1 &= ~CVG_DST_FULL; mode2 &= ~CVG_DST_FULL; mode1 |= (ALPHA_CVG_SEL | IM_RD); mode2 |= (ALPHA_CVG_SEL | IM_RD); } - if (state->flags & FOLD_STATE_FLAG_40) { + if (state->flags & IMGFX_FLAG_40) { gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER); } else { gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER); - if (cond) { + if (skipModeChange) { mode1 |= Z_CMP; mode2 |= Z_CMP; } else { @@ -856,72 +883,98 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { gDPSetRenderMode(gMainGfxPos++, mode1, mode2); switch (renderType) { - case FOLD_RENDER_TYPE_1: + case IMGFX_RENDER_MULTIPLY_RGB: + // color: texture * prim + // alpha: texture gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); - gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color[1].r, state->ints.color[1].g, - state->ints.color[1].b, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color.r, state->ints.color.g, + state->ints.color.b, 0); break; - case FOLD_RENDER_TYPE_2: + case IMGFX_RENDER_MULTIPLY_ALPHA: + // color: texture + // alpha: texture * prim if (primAlpha <= 0) { return; } - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, - TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gMainGfxPos++, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, primAlpha); break; - case FOLD_RENDER_TYPE_3: + case IMGFX_RENDER_MULTIPLY_RGBA: + // color: texture * prim + // alpha: texture * prim if (primAlpha <= 0) { return; } gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color[1].r, state->ints.color[1].g, - state->ints.color[1].b, primAlpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color.r, state->ints.color.g, + state->ints.color.b, primAlpha); break; - case FOLD_RENDER_TYPE_4: - gDPSetCombineLERP(gMainGfxPos++, 1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0, 1, PRIMITIVE, - TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0); - gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color[1].r, state->ints.color[1].g, - state->ints.color[1].b, 0); + case IMGFX_RENDER_MODULATE_PRIM_RGB: + // color: lerp from prim color to 1 based on texture intensity + // alpha: texture + gDPSetCombineLERP(gMainGfxPos++, + 1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0, + 1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, TEXEL0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color.r, state->ints.color.g, + state->ints.color.b, 0); break; - case FOLD_RENDER_TYPE_5: + case IMGFX_RENDER_MODULATE_PRIM_RGBA: + // color: lerp from prim color to 1 based on texture intensity + // alpha: texture * vtx if (primAlpha <= 0) { return; } - gDPSetCombineLERP(gMainGfxPos++, 1, 0, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 1, 0, TEXEL0, - PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color[1].r, state->ints.color[1].g, - state->ints.color[1].b, primAlpha); + gDPSetCombineLERP(gMainGfxPos++, + 1, 0, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, + 1, 0, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color.r, state->ints.color.g, + state->ints.color.b, primAlpha); break; - case FOLD_RENDER_TYPE_6: + case IMGFX_RENDER_MULTIPLY_SHADE_RGB: + // color: modulate vtx color by texture intensity + // alpha: texture gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; - case FOLD_RENDER_TYPE_9: - gDPSetCombineLERP(gMainGfxPos++, 1, SHADE, TEXEL0, SHADE, 0, 0, 0, TEXEL0, 1, SHADE, TEXEL0, SHADE, - 0, 0, 0, TEXEL0); + case IMGFX_RENDER_MODULATE_SHADE_RGB: + // color: lerp from vtx color to 1 based on texture intensity + // alpha: texture + gDPSetCombineLERP(gMainGfxPos++, + 1, SHADE, TEXEL0, SHADE, 0, 0, 0, TEXEL0, + 1, SHADE, TEXEL0, SHADE, 0, 0, 0, TEXEL0); gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; - case FOLD_RENDER_TYPE_7: - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, - SHADE, 0); + case IMGFX_RENDER_MULTIPLY_SHADE_ALPHA: + // color: texture + // alpha: texture * vtx color + gDPSetCombineLERP(gMainGfxPos++, + 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, + 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; - case FOLD_RENDER_TYPE_8: + case IMGFX_RENDER_MULTIPLY_SHADE_RGBA: + // color: modulate vtx color by texture intensity + // alpha: modulate vtx alpha by texture intensity gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; - case FOLD_RENDER_TYPE_A: - gDPSetCombineLERP(gMainGfxPos++, 1, SHADE, TEXEL0, SHADE, TEXEL0, 0, SHADE, 0, 1, SHADE, TEXEL0, - SHADE, TEXEL0, 0, SHADE, 0); + case IMGFX_RENDER_MODULATE_SHADE_RGBA: + // color: lerp from vtx color to 1 based on texture intensity + // alpha: vtx color * texture + gDPSetCombineLERP(gMainGfxPos++, + 1, SHADE, TEXEL0, SHADE, TEXEL0, 0, SHADE, 0, + 1, SHADE, TEXEL0, SHADE, TEXEL0, 0, SHADE, 0); gSPSetGeometryMode(gMainGfxPos++, G_SHADE | G_SHADING_SMOOTH); gSPClearGeometryMode(gMainGfxPos++, G_LIGHTING); break; - case FOLD_RENDER_TYPE_B: - if (state->flags & (FOLD_STATE_FLAG_2000 | FOLD_STATE_FLAG_8000)) { + case IMGFX_RENDER_ANIM: + if (state->flags & (IMGFX_FLAG_2000 | IMGFX_FLAG_8000)) { Camera* currentCam = &gCameras[gCurrentCameraID]; gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); @@ -931,164 +984,190 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { angle2 = cosine(currentCam->currentYaw + 90.0f) * 120.0f; dirX1 = -angle1; dirZ2 = -angle2; - FoldLights.l[0].l.dir[0] = dirX1; - FoldLights.l[1].l.dir[0] = angle1; - FoldLights.l[0].l.dir[2] = angle2; - FoldLights.l[1].l.dir[2] = dirZ2; - gSPSetLights2(gMainGfxPos++, FoldLights); + ImgFXLights.l[0].l.dir[0] = dirX1; + ImgFXLights.l[1].l.dir[0] = angle1; + ImgFXLights.l[0].l.dir[2] = angle2; + ImgFXLights.l[1].l.dir[2] = dirZ2; + gSPSetLights2(gMainGfxPos++, ImgFXLights); break; } gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); break; - case FOLD_RENDER_HOLOGRAM: - if (state->ints.hologram.mode == 0) { - primAlpha = state->ints.hologram.alphaAmt * foldImgAlpha; - gDPSetCombineLERP(gMainGfxPos++, NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, - NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + case IMGFX_RENDER_HOLOGRAM: + if (state->ints.hologram.mode == IMGFX_HOLOGRAM_NOISE) { + primAlpha = state->ints.hologram.alphaAmt * ifxImgAlpha; + // color: blend texure and noise + // alpha: texure * prim + gDPSetCombineLERP(gMainGfxPos++, + NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + NOISE, PRIMITIVE, PRIMITIVE, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.hologram.noiseAmt, state->ints.hologram.noiseAmt, state->ints.hologram.noiseAmt, primAlpha); - } else if (state->ints.hologram.mode == 1) { - primAlpha = state->ints.hologram.alphaAmt * foldImgAlpha; - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, - TEXEL0, 0, PRIMITIVE, 0); + } else if (state->ints.hologram.mode == IMGFX_HOLOGRAM_DITHER) { + primAlpha = state->ints.hologram.alphaAmt * ifxImgAlpha; + // color: texture + // alpha: texture * prim + gDPSetCombineLERP(gMainGfxPos++, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, primAlpha); gDPSetAlphaCompare(gMainGfxPos++, G_AC_DITHER); - } else if (state->ints.hologram.mode == 2) { + } else if (state->ints.hologram.mode == IMGFX_HOLOGRAM_THRESHOLD) { s32 blendAlpha = state->ints.hologram.alphaAmt + state->ints.hologram.noiseAmt; if (blendAlpha > 255) { blendAlpha = 255; } - - primAlpha = state->ints.hologram.alphaAmt * foldImgAlpha; - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, - TEXEL0, 0, PRIMITIVE, 0); + primAlpha = state->ints.hologram.alphaAmt * ifxImgAlpha; + // color: texture + // alpha: texture * prim + gDPSetCombineLERP(gMainGfxPos++, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); gDPSetAlphaDither(gMainGfxPos++, G_AD_NOISE); gDPSetAlphaCompare(gMainGfxPos++, G_AC_THRESHOLD); gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, primAlpha); gDPSetBlendColor(gMainGfxPos++, 0, 0, 0, blendAlpha); } break; - case FOLD_RENDER_TYPE_D: - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, - TEXEL0); - gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color[1].r, state->ints.color[1].g, - state->ints.color[1].b, 0); + case IMGFX_RENDER_COLOR_FILL: + // color: prim + // alpha: texture + gDPSetCombineLERP(gMainGfxPos++, + 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, + 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, state->ints.color.r, state->ints.color.g, + state->ints.color.b, 0); break; - case FOLD_RENDER_TYPE_0: - case FOLD_RENDER_TYPE_E: - case FOLD_RENDER_TYPE_10: + case IMGFX_RENDER_DEFAULT: + case IMGFX_RENDER_OVERLAY_RGB: + case IMGFX_RENDER_UNUSED: + // color: texture + // alpha: texture gDPSetCombineMode(gMainGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); break; - case FOLD_RENDER_TYPE_F: - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, - PRIMITIVE, 0); - gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, state->ints.raw[1][1]); + case IMGFX_RENDER_OVERLAY_RGBA: + // color: texture + // alpha: texture * prim + gDPSetCombineLERP(gMainGfxPos++, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, state->ints.overlay.alpha); break; } } switch (state->meshType) { - case FOLD_MESH_TYPE_0: - func_8013CFA8(state, mtx); + case IMGFX_MESH_DEFAULT: + imgfx_appendGfx_mesh_basic(state, mtx); break; - case FOLD_MESH_TYPE_1: - case FOLD_MESH_TYPE_3: - func_8013DAB4(state, mtx); + case IMGFX_MESH_GRID_WAVY: + case IMGFX_MESH_GRID_UNUSED: + imgfx_appendGfx_mesh_grid(state, mtx); break; - case FOLD_MESH_ANIMATED: - func_8013E2F0(state, mtx); + case IMGFX_MESH_ANIMATED: + imgfx_appendGfx_mesh_anim(state, mtx); break; - case FOLD_MESH_TYPE_4: - func_8013CFA8(state, mtx); + case IMGFX_MESH_STRIP: + imgfx_appendGfx_mesh_basic(state, mtx); gDPPipeSync(gMainGfxPos++); - func_8013E904(state, mtx); + imgfx_appendGfx_mesh_strip(state, mtx); break; } gDPPipeSync(gMainGfxPos++); - if (state->renderType == FOLD_RENDER_HOLOGRAM) { + if (state->renderType == IMGFX_RENDER_HOLOGRAM) { gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); gDPSetAlphaDither(gMainGfxPos++, G_AD_DISABLE); } } -void fold_mesh_make_strip(FoldState* state) { - s32 yOffset; - s32 xOffset; - s32 widthIncrement; - s32 heightIncrement; - s32 heightIncrement120; +void imgfx_mesh_make_strip(ImgFXState* state) { + s32 offsetY; + s32 offsetX; + s32 stepY; + s32 rightColor; + s32 leftColor; s32 temp2; - s32 i; + s32 nextY; - widthIncrement = 0x1000 / fold_currentImage->width; - if (widthIncrement > fold_currentImage->height) { - widthIncrement = fold_currentImage->height; + stepY = (128 * 32) / ImgFXCurrentTexturePtr->tex.width; + if (stepY > ImgFXCurrentTexturePtr->tex.height) { + stepY = ImgFXCurrentTexturePtr->tex.height; } - xOffset = fold_currentImage->xOffset; - yOffset = fold_currentImage->yOffset; - state->firstVtxIdx = fold_vtxCount; + offsetX = ImgFXCurrentTexturePtr->tex.xOffset; + offsetY = ImgFXCurrentTexturePtr->tex.yOffset; + state->firstVtxIdx = imgfx_vtxCount; - fold_vtxBuf[fold_vtxCount].v.ob[0] = xOffset; - fold_vtxBuf[fold_vtxCount].v.ob[1] = yOffset; - fold_vtxBuf[fold_vtxCount].v.ob[2] = 0; - fold_vtxBuf[fold_vtxCount].v.tc[0] = 0x2000; - fold_vtxBuf[fold_vtxCount].v.tc[1] = temp2 = 0x2000; // required to match - fold_vtxBuf[fold_vtxCount].v.cn[0] = 240; - fold_vtxBuf[fold_vtxCount].v.cn[1] = 240; - fold_vtxBuf[fold_vtxCount].v.cn[2] = 240; - fold_vtxBuf[fold_vtxCount + 1].v.ob[0] = fold_currentImage->width + xOffset; - fold_vtxBuf[fold_vtxCount + 1].v.ob[1] = yOffset; - fold_vtxBuf[fold_vtxCount + 1].v.ob[2] = 0; - fold_vtxBuf[fold_vtxCount + 1].v.tc[0] = (fold_currentImage->width + 256) * 32; - fold_vtxBuf[fold_vtxCount + 1].v.tc[1] = temp2; - fold_vtxBuf[fold_vtxCount + 1].v.cn[0] = 120; - fold_vtxBuf[fold_vtxCount + 1].v.cn[1] = 120; - fold_vtxBuf[fold_vtxCount + 1].v.cn[2] = 120; + // create first pair of vertices to begin the strip + // 'left' side + imgfx_vtxBuf[imgfx_vtxCount].v.ob[0] = offsetX; + imgfx_vtxBuf[imgfx_vtxCount].v.ob[1] = offsetY; + imgfx_vtxBuf[imgfx_vtxCount].v.ob[2] = 0; + imgfx_vtxBuf[imgfx_vtxCount].v.tc[0] = (0 + 256) * 32; + imgfx_vtxBuf[imgfx_vtxCount].v.tc[1] = temp2 = (0 + 256) * 32; // required to match + imgfx_vtxBuf[imgfx_vtxCount].v.cn[0] = 240; + imgfx_vtxBuf[imgfx_vtxCount].v.cn[1] = 240; + imgfx_vtxBuf[imgfx_vtxCount].v.cn[2] = 240; + // 'right' side + imgfx_vtxBuf[imgfx_vtxCount + 1].v.ob[0] = ImgFXCurrentTexturePtr->tex.width + offsetX; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.ob[1] = offsetY; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.ob[2] = 0; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.tc[0] = (ImgFXCurrentTexturePtr->tex.width + 256) * 32; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.tc[1] = temp2; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.cn[0] = 120; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.cn[1] = 120; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.cn[2] = 120; - for (i = widthIncrement; ; i += widthIncrement) { - heightIncrement = (i * 120) / fold_currentImage->height; - heightIncrement120 = heightIncrement + 120; - fold_vtxCount += 2; - fold_vtxBuf[fold_vtxCount].v.ob[0] = xOffset; - fold_vtxBuf[fold_vtxCount].v.ob[1] = yOffset - widthIncrement; - fold_vtxBuf[fold_vtxCount].v.ob[2] = 0; - fold_vtxBuf[fold_vtxCount].v.tc[0] = 0x2000; - fold_vtxBuf[fold_vtxCount].v.tc[1] = (i + 256) * 32; - fold_vtxBuf[fold_vtxCount].v.cn[0] = heightIncrement120; - fold_vtxBuf[fold_vtxCount].v.cn[1] = heightIncrement120; - fold_vtxBuf[fold_vtxCount].v.cn[2] = heightIncrement120; - fold_vtxBuf[fold_vtxCount + 1].v.ob[0] = fold_currentImage->width + xOffset; - fold_vtxBuf[fold_vtxCount + 1].v.ob[1] = yOffset - widthIncrement; - fold_vtxBuf[fold_vtxCount + 1].v.ob[2] = 0; - fold_vtxBuf[fold_vtxCount + 1].v.tc[0] = (fold_currentImage->width + 256) * 32; - fold_vtxBuf[fold_vtxCount + 1].v.tc[1] = (i + 256) * 32; - fold_vtxBuf[fold_vtxCount + 1].v.cn[0] = heightIncrement; - fold_vtxBuf[fold_vtxCount + 1].v.cn[1] = heightIncrement; - fold_vtxBuf[fold_vtxCount + 1].v.cn[2] = heightIncrement; + // create remaining pairs of vertices along the strip + nextY = stepY; + while (TRUE) { + rightColor = (nextY * 120) / ImgFXCurrentTexturePtr->tex.height; + leftColor = rightColor + 120; + imgfx_vtxCount += 2; - if (i != fold_currentImage->height) { - yOffset -= widthIncrement; - if (fold_currentImage->height < i + widthIncrement) { - widthIncrement = fold_currentImage->height - i; + // 'left' side + imgfx_vtxBuf[imgfx_vtxCount].v.ob[0] = offsetX; + imgfx_vtxBuf[imgfx_vtxCount].v.ob[1] = offsetY - stepY; + imgfx_vtxBuf[imgfx_vtxCount].v.ob[2] = 0; + imgfx_vtxBuf[imgfx_vtxCount].v.tc[0] = (0 + 256) * 32; + imgfx_vtxBuf[imgfx_vtxCount].v.tc[1] = (nextY + 256) * 32; + imgfx_vtxBuf[imgfx_vtxCount].v.cn[0] = leftColor; + imgfx_vtxBuf[imgfx_vtxCount].v.cn[1] = leftColor; + imgfx_vtxBuf[imgfx_vtxCount].v.cn[2] = leftColor; + + // 'right' side + imgfx_vtxBuf[imgfx_vtxCount + 1].v.ob[0] = ImgFXCurrentTexturePtr->tex.width + offsetX; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.ob[1] = offsetY - stepY; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.ob[2] = 0; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.tc[0] = (ImgFXCurrentTexturePtr->tex.width + 256) * 32; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.tc[1] = (nextY + 256) * 32; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.cn[0] = rightColor; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.cn[1] = rightColor; + imgfx_vtxBuf[imgfx_vtxCount + 1].v.cn[2] = rightColor; + + if (nextY != ImgFXCurrentTexturePtr->tex.height) { + offsetY -= stepY; + if (ImgFXCurrentTexturePtr->tex.height < nextY + stepY) { + stepY = ImgFXCurrentTexturePtr->tex.height - nextY; } } else { - fold_vtxCount += 2; + imgfx_vtxCount += 2; break; } + nextY += stepY; } - state->lastVtxIdx = fold_vtxCount - 1; + state->lastVtxIdx = imgfx_vtxCount - 1; state->subdivX = 1; state->subdivY = ((state->lastVtxIdx - state->firstVtxIdx) - 1) / 2; } -void fold_mesh_make_grid(FoldState* state) { +void imgfx_mesh_make_grid(ImgFXState* state) { f32 divSizeX; f32 divSizeY; f32 posX; @@ -1098,46 +1177,46 @@ void fold_mesh_make_grid(FoldState* state) { Vtx* vtx; s32 i; - state->firstVtxIdx = fold_vtxCount; - divSizeX = fold_currentImage->width / (f32) state->subdivX; - divSizeY = fold_currentImage->height / (f32) state->subdivY; - posY = fold_currentImage->yOffset; + state->firstVtxIdx = imgfx_vtxCount; + divSizeX = ImgFXCurrentTexturePtr->tex.width / (f32) state->subdivX; + divSizeY = ImgFXCurrentTexturePtr->tex.height / (f32) state->subdivY; + posY = ImgFXCurrentTexturePtr->tex.yOffset; texV = 0.0f; - vtx = &fold_vtxBuf[fold_vtxCount]; + vtx = &imgfx_vtxBuf[imgfx_vtxCount]; for (i = 0; i <= state->subdivY; i++) { s32 j; if (i == state->subdivY) { - texV = fold_currentImage->height; - posY = fold_currentImage->yOffset - fold_currentImage->height; + texV = ImgFXCurrentTexturePtr->tex.height; + posY = ImgFXCurrentTexturePtr->tex.yOffset - ImgFXCurrentTexturePtr->tex.height; } - posX = fold_currentImage->xOffset; + posX = ImgFXCurrentTexturePtr->tex.xOffset; texU = 0.0f; for (j = 0; j <= state->subdivX; vtx++, j++) { if (j == state->subdivX) { - texU = fold_currentImage->width; - posX = fold_currentImage->xOffset + fold_currentImage->width; + texU = ImgFXCurrentTexturePtr->tex.width; + posX = ImgFXCurrentTexturePtr->tex.xOffset + ImgFXCurrentTexturePtr->tex.width; } vtx->n.ob[0] = posX; vtx->n.ob[1] = posY; vtx->n.ob[2] = 0; vtx->n.tc[0] = ((s32) texU + 256) * 32; vtx->n.tc[1] = ((s32) texV + 256) * 32; - fold_vtxCount++; + imgfx_vtxCount++; posX += divSizeX; texU += divSizeX; } posY -= divSizeY; texV += divSizeY; } - state->lastVtxIdx = fold_vtxCount - 1; + state->lastVtxIdx = imgfx_vtxCount - 1; } -FoldAnimHeader* fold_load_anim(FoldState* state) { - u8* romStart = FoldAnimOffsets[state->ints.anim.type] + fold_gfx_data_ROM_START; - FoldAnimHeader* anim = &FoldAnimHeaders[state->arrayIdx]; +ImgFXAnimHeader* imgfx_load_anim(ImgFXState* state) { + u8* romStart = ImgFXAnimOffsets[state->ints.anim.type] + imgfx_gfx_data_ROM_START; + ImgFXAnimHeader* anim = &ImgFXAnimHeaders[state->arrayIdx]; if (state->curAnimOffset != romStart) { u8* romEnd; @@ -1148,21 +1227,21 @@ FoldAnimHeader* fold_load_anim(FoldState* state) { dma_copy(state->curAnimOffset, state->curAnimOffset + sizeof(*anim), anim); if (state->vtxBufs[0] != NULL) { - fold_add_to_gfx_cache(state->vtxBufs[0], 1); + imgfx_add_to_cache(state->vtxBufs[0], 1); state->vtxBufs[0] = NULL; } if (state->vtxBufs[1] != NULL) { - fold_add_to_gfx_cache(state->vtxBufs[1], 1); + imgfx_add_to_cache(state->vtxBufs[1], 1); state->vtxBufs[1] = NULL; } if (state->gfxBufs[0] != NULL) { - fold_add_to_gfx_cache(state->gfxBufs[0], 1); + imgfx_add_to_cache(state->gfxBufs[0], 1); state->gfxBufs[0] = NULL; } if (state->gfxBufs[1] != NULL) { - // fold_add_to_gfx_cache(state->gfxBufs[1], 1); + // imgfx_add_to_cache(state->gfxBufs[1], 1); romEnd = (u8*) state->gfxBufs[1]; // required to match - fold_add_to_gfx_cache(state->gfxBufs[1], 1); + imgfx_add_to_cache(state->gfxBufs[1], 1); state->gfxBufs[1] = NULL; } state->vtxBufs[0] = heap_malloc(anim->vtxCount * sizeof(Vtx)); @@ -1170,7 +1249,7 @@ FoldAnimHeader* fold_load_anim(FoldState* state) { state->gfxBufs[0] = heap_malloc(anim->gfxCount * sizeof(Gfx)); state->gfxBufs[1] = heap_malloc(anim->gfxCount * sizeof(Gfx)); - romStart = fold_gfx_data_ROM_START + (s32)anim->gfxOffset; + romStart = imgfx_gfx_data_ROM_START + (s32)anim->gfxOffset; romEnd = romStart + anim->gfxCount * sizeof(Gfx); dma_copy(romStart, romEnd, state->gfxBufs[0]); dma_copy(romStart, romEnd, state->gfxBufs[1]); @@ -1189,6 +1268,9 @@ FoldAnimHeader* fold_load_anim(FoldState* state) { // If this command is a vertex command, adjust the vertex buffer address if (cmd == G_VTX) { + // ImgFXVtx structs are 0xC bytes while Vtx are 0x10, so we need a (4/3) scaling factor + // to compute a new, equivalent Vtx[i] address for an existing ImgFXVtx[i] address. + // Unfortunately, using sizeof here does not match. gfxBuffer[j-1].words.w1 = ((((s32) gfxBuffer[j-1].words.w1 - anim->keyframesOffset) / 3) * 4) + (s32) state->vtxBufs[i]; } @@ -1199,16 +1281,16 @@ FoldAnimHeader* fold_load_anim(FoldState* state) { return anim; } -void fold_mesh_anim_update(FoldState* state) { +void imgfx_mesh_anim_update(ImgFXState* state) { s32 absKeyframeInterval; s32 nextKeyIdx; s32 curKeyIdx; - FoldVtx* curKeyframe = NULL; - FoldVtx* nextKeyframe = NULL; - s32 keyframeInterval = state->ints.raw[0][1]; - s32 animStep = state->ints.raw[0][2]; + ImgFXVtx* curKeyframe = NULL; + ImgFXVtx* nextKeyframe = NULL; + s32 keyframeInterval = state->ints.anim.interval; + s32 animStep = state->ints.anim.step; s32 curSubframe = state->floats.anim.curFrame; - FoldAnimHeader* header = fold_load_anim(state); + ImgFXAnimHeader* header = imgfx_load_anim(state); u8* romStart; f32 lerpAlpha; s32 i; @@ -1217,22 +1299,22 @@ void fold_mesh_anim_update(FoldState* state) { return; } - if (state->flags & FOLD_STATE_FLAG_200) { - state->flags &= ~FOLD_STATE_FLAG_200; - if (state->flags & FOLD_STATE_FLAG_REVERSE_ANIM) { + if (state->flags & IMGFX_FLAG_200) { + state->flags &= ~IMGFX_FLAG_200; + if (state->flags & IMGFX_FLAG_REVERSE_ANIM) { state->floats.anim.curIdx = header->keyframesCount - 1; } } curKeyIdx = state->floats.anim.curIdx; absKeyframeInterval = abs(keyframeInterval); - if (state->flags & FOLD_STATE_FLAG_4000) { + if (state->flags & IMGFX_FLAG_4000) { nextKeyIdx = curKeyIdx; } else { - if (state->flags & FOLD_STATE_FLAG_REVERSE_ANIM) { + if (state->flags & IMGFX_FLAG_REVERSE_ANIM) { nextKeyIdx = curKeyIdx - 1; if (nextKeyIdx < 0) { nextKeyIdx = curKeyIdx; - if (state->flags & FOLD_STATE_FLAG_LOOP_ANIM) { + if (state->flags & IMGFX_FLAG_LOOP_ANIM) { nextKeyIdx = header->keyframesCount - 1; } } @@ -1240,7 +1322,7 @@ void fold_mesh_anim_update(FoldState* state) { nextKeyIdx = curKeyIdx + 1; if (nextKeyIdx == header->keyframesCount) { nextKeyIdx = curKeyIdx; - if (state->flags & FOLD_STATE_FLAG_LOOP_ANIM) { + if (state->flags & IMGFX_FLAG_LOOP_ANIM) { nextKeyIdx = 0; } } @@ -1248,34 +1330,34 @@ void fold_mesh_anim_update(FoldState* state) { } // find the current + next keyframe vertex data - curKeyframe = heap_malloc(header->vtxCount * sizeof(FoldVtx)); - romStart = (u8*)((s32)fold_gfx_data_ROM_START + header->keyframesOffset + curKeyIdx * header->vtxCount * sizeof(FoldVtx)); - dma_copy(romStart, romStart + header->vtxCount * sizeof(FoldVtx), curKeyframe); + curKeyframe = heap_malloc(header->vtxCount * sizeof(ImgFXVtx)); + romStart = (u8*)((s32)imgfx_gfx_data_ROM_START + header->keyframesOffset + curKeyIdx * header->vtxCount * sizeof(ImgFXVtx)); + dma_copy(romStart, romStart + header->vtxCount * sizeof(ImgFXVtx), curKeyframe); if (keyframeInterval > 1) { nextKeyframe = heap_malloc(header->vtxCount * sizeof(*nextKeyframe)); - romStart = (u8*)((s32)fold_gfx_data_ROM_START + header->keyframesOffset + nextKeyIdx * header->vtxCount * sizeof(FoldVtx)); - dma_copy(romStart, romStart + header->vtxCount * sizeof(FoldVtx), nextKeyframe); + romStart = (u8*)((s32)imgfx_gfx_data_ROM_START + header->keyframesOffset + nextKeyIdx * header->vtxCount * sizeof(ImgFXVtx)); + dma_copy(romStart, romStart + header->vtxCount * sizeof(ImgFXVtx), nextKeyframe); } lerpAlpha = (f32) curSubframe / (f32) keyframeInterval; for (i = 0; i < header->vtxCount; i++) { - if (state->meshType != FOLD_MESH_ANIMATED) { + if (state->meshType != IMGFX_MESH_ANIMATED) { return; } if (keyframeInterval > 1) { - // get vertex position - if (header->flags & FOLD_ANIM_FLAG_ABSOLUTE_COORDS) { + // get vertex position, interpolated between keyframes + if (header->flags & IMGFX_ANIM_FLAG_ABSOLUTE_COORDS) { state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[0] = (s16)(curKeyframe[i].ob[0] + (nextKeyframe[i].ob[0] - curKeyframe[i].ob[0]) * lerpAlpha); state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[1] = (s16)(curKeyframe[i].ob[1] + (nextKeyframe[i].ob[1] - curKeyframe[i].ob[1]) * lerpAlpha); state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[2] = (s16)(curKeyframe[i].ob[2] + (nextKeyframe[i].ob[2] - curKeyframe[i].ob[2]) * lerpAlpha); } else { - state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[0] = (s16)(curKeyframe[i].ob[0] + (nextKeyframe[i].ob[0] - curKeyframe[i].ob[0]) * lerpAlpha) * 0.01 * fold_currentImage->width; - state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[1] = (s16)(curKeyframe[i].ob[1] + (nextKeyframe[i].ob[1] - curKeyframe[i].ob[1]) * lerpAlpha) * 0.01 * fold_currentImage->height; - state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[2] = (s16)(curKeyframe[i].ob[2] + (nextKeyframe[i].ob[2] - curKeyframe[i].ob[2]) * lerpAlpha) * 0.01 * ((fold_currentImage->width + fold_currentImage->height) / 2); + state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[0] = (s16)(curKeyframe[i].ob[0] + (nextKeyframe[i].ob[0] - curKeyframe[i].ob[0]) * lerpAlpha) * 0.01 * ImgFXCurrentTexturePtr->tex.width; + state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[1] = (s16)(curKeyframe[i].ob[1] + (nextKeyframe[i].ob[1] - curKeyframe[i].ob[1]) * lerpAlpha) * 0.01 * ImgFXCurrentTexturePtr->tex.height; + state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[2] = (s16)(curKeyframe[i].ob[2] + (nextKeyframe[i].ob[2] - curKeyframe[i].ob[2]) * lerpAlpha) * 0.01 * ((ImgFXCurrentTexturePtr->tex.width + ImgFXCurrentTexturePtr->tex.height) / 2); } // get vertex color - if (state->flags & (FOLD_STATE_FLAG_8000 | FOLD_STATE_FLAG_2000)) { + if (state->flags & (IMGFX_FLAG_2000 | IMGFX_FLAG_8000)) { state->vtxBufs[gCurrentDisplayContextIndex][i].v.cn[0] = (s16)(curKeyframe[i].cn[0] + (nextKeyframe[i].cn[0] - curKeyframe[i].cn[0]) * lerpAlpha); state->vtxBufs[gCurrentDisplayContextIndex][i].v.cn[1] = (s16)(curKeyframe[i].cn[1] + (nextKeyframe[i].cn[1] - curKeyframe[i].cn[1]) * lerpAlpha); state->vtxBufs[gCurrentDisplayContextIndex][i].v.cn[2] = (s16)(curKeyframe[i].cn[2] + (nextKeyframe[i].cn[2] - curKeyframe[i].cn[2]) * lerpAlpha); @@ -1286,17 +1368,17 @@ void fold_mesh_anim_update(FoldState* state) { } } else { // get vertex position - if (header->flags & FOLD_ANIM_FLAG_ABSOLUTE_COORDS) { + if (header->flags & IMGFX_ANIM_FLAG_ABSOLUTE_COORDS) { state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[0] = curKeyframe[i].ob[0]; state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[1] = curKeyframe[i].ob[1]; state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[2] = curKeyframe[i].ob[2]; } else { - state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[0] = curKeyframe[i].ob[0] * 0.01 * fold_currentImage->width; - state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[1] = curKeyframe[i].ob[1] * 0.01 * fold_currentImage->height; - state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[2] = curKeyframe[i].ob[2] * 0.01 * ((fold_currentImage->width + fold_currentImage->height) / 2); + state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[0] = curKeyframe[i].ob[0] * 0.01 * ImgFXCurrentTexturePtr->tex.width; + state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[1] = curKeyframe[i].ob[1] * 0.01 * ImgFXCurrentTexturePtr->tex.height; + state->vtxBufs[gCurrentDisplayContextIndex][i].v.ob[2] = curKeyframe[i].ob[2] * 0.01 * ((ImgFXCurrentTexturePtr->tex.width + ImgFXCurrentTexturePtr->tex.height) / 2); } // get vertex color - if (state->flags & (FOLD_STATE_FLAG_8000 | FOLD_STATE_FLAG_2000)) { + if (state->flags & (IMGFX_FLAG_2000 | IMGFX_FLAG_8000)) { state->vtxBufs[gCurrentDisplayContextIndex][i].v.cn[0] = curKeyframe[i].cn[0]; state->vtxBufs[gCurrentDisplayContextIndex][i].v.cn[1] = curKeyframe[i].cn[1]; state->vtxBufs[gCurrentDisplayContextIndex][i].v.cn[2] = curKeyframe[i].cn[2]; @@ -1307,12 +1389,12 @@ void fold_mesh_anim_update(FoldState* state) { } } // get vertex tex coords - if (header->flags & FOLD_ANIM_FLAG_ABSOLUTE_COORDS) { + if (header->flags & IMGFX_ANIM_FLAG_ABSOLUTE_COORDS) { state->vtxBufs[gCurrentDisplayContextIndex][i].v.tc[0] = (curKeyframe[i].tc[0] + 256) * 32; state->vtxBufs[gCurrentDisplayContextIndex][i].v.tc[1] = (curKeyframe[i].tc[1] + 256) * 32; } else { - state->vtxBufs[gCurrentDisplayContextIndex][i].v.tc[0] = ((s32)(curKeyframe[i].tc[0] * 0.01 * fold_currentImage->width) + 256) * 32; - state->vtxBufs[gCurrentDisplayContextIndex][i].v.tc[1] = ((s32)(curKeyframe[i].tc[1] * 0.01 * fold_currentImage->height) + 256) * 32; + state->vtxBufs[gCurrentDisplayContextIndex][i].v.tc[0] = ((s32)(curKeyframe[i].tc[0] * 0.01 * ImgFXCurrentTexturePtr->tex.width) + 256) * 32; + state->vtxBufs[gCurrentDisplayContextIndex][i].v.tc[1] = ((s32)(curKeyframe[i].tc[1] * 0.01 * ImgFXCurrentTexturePtr->tex.height) + 256) * 32; } } @@ -1331,31 +1413,31 @@ void fold_mesh_anim_update(FoldState* state) { if (keyframeInterval > 0) { curSubframe++; if (curSubframe >= keyframeInterval) { - if (state->flags & FOLD_STATE_FLAG_REVERSE_ANIM) { + if (state->flags & IMGFX_FLAG_REVERSE_ANIM) { curKeyIdx--; if (curKeyIdx < 0) { - if (state->flags & FOLD_STATE_FLAG_LOOP_ANIM) { + if (state->flags & IMGFX_FLAG_LOOP_ANIM) { curKeyIdx = header->keyframesCount - 1; } else { - if (state->flags & FOLD_STATE_FLAG_800) { + if (state->flags & IMGFX_FLAG_800) { curKeyIdx = 0; - state->flags |= FOLD_STATE_FLAG_4000; + state->flags |= IMGFX_FLAG_4000; } else { - state->flags |= FOLD_STATE_FLAG_ANIM_DONE; + state->flags |= IMGFX_FLAG_ANIM_DONE; } } } } else { curKeyIdx++; if (curKeyIdx >= header->keyframesCount) { - if (state->flags & FOLD_STATE_FLAG_LOOP_ANIM) { + if (state->flags & IMGFX_FLAG_LOOP_ANIM) { curKeyIdx = 0; } else { - if (state->flags & FOLD_STATE_FLAG_800) { + if (state->flags & IMGFX_FLAG_800) { curKeyIdx--; - state->flags |= FOLD_STATE_FLAG_4000; + state->flags |= IMGFX_FLAG_4000; } else { - state->flags |= FOLD_STATE_FLAG_ANIM_DONE; + state->flags |= IMGFX_FLAG_ANIM_DONE; } } } @@ -1363,31 +1445,31 @@ void fold_mesh_anim_update(FoldState* state) { curSubframe = 0; } } else if (keyframeInterval < 0) { - if (state->flags & FOLD_STATE_FLAG_REVERSE_ANIM) { + if (state->flags & IMGFX_FLAG_REVERSE_ANIM) { curKeyIdx -= absKeyframeInterval; if (curKeyIdx < 0) { - if (state->flags & FOLD_STATE_FLAG_LOOP_ANIM) { + if (state->flags & IMGFX_FLAG_LOOP_ANIM) { curKeyIdx += header->keyframesCount; } else { - if (state->flags & FOLD_STATE_FLAG_800) { + if (state->flags & IMGFX_FLAG_800) { curKeyIdx = 0; - state->flags |= FOLD_STATE_FLAG_4000; + state->flags |= IMGFX_FLAG_4000; } else { - state->flags |= FOLD_STATE_FLAG_ANIM_DONE; + state->flags |= IMGFX_FLAG_ANIM_DONE; } } } } else { curKeyIdx += absKeyframeInterval; if (curKeyIdx >= header->keyframesCount) { - if (state->flags & FOLD_STATE_FLAG_LOOP_ANIM) { + if (state->flags & IMGFX_FLAG_LOOP_ANIM) { curKeyIdx %= header->keyframesCount; } else { - if (state->flags & FOLD_STATE_FLAG_800) { + if (state->flags & IMGFX_FLAG_800) { curKeyIdx = header->keyframesCount - 1; - state->flags |= FOLD_STATE_FLAG_4000; + state->flags |= IMGFX_FLAG_4000; } else { - state->flags |= FOLD_STATE_FLAG_ANIM_DONE; + state->flags |= IMGFX_FLAG_ANIM_DONE; } } } @@ -1398,38 +1480,38 @@ void fold_mesh_anim_update(FoldState* state) { state->floats.anim.curIdx = curKeyIdx; } -void func_8013CFA8(FoldState* state, Matrix4f mtx) { +void imgfx_appendGfx_mesh_basic(ImgFXState* state, Matrix4f mtx) { s32 i; - if (!(state->flags & FOLD_STATE_FLAG_SKIP_TEX_SETUP)) { + if (!(state->flags & IMGFX_FLAG_SKIP_TEX_SETUP)) { gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMainGfxPos++, 0, fold_currentImage->palette); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, ImgFXCurrentTexturePtr->tex.palette); } i = state->firstVtxIdx; while (TRUE) { Camera* cam; - s32 uls = (fold_vtxBuf[i + 0].v.tc[0] >> 0x5) - 0x100; - s32 ult = (fold_vtxBuf[i + 0].v.tc[1] >> 0x5) - 0x100; - s32 lrs = (fold_vtxBuf[i + 3].v.tc[0] >> 0x5) - 0x100; - s32 lrt = (fold_vtxBuf[i + 3].v.tc[1] >> 0x5) - 0x100; - s32 someFlags = FOLD_STATE_FLAG_100000 | FOLD_STATE_FLAG_80000; + s32 uls = (imgfx_vtxBuf[i + 0].v.tc[0] >> 0x5) - 256; + s32 ult = (imgfx_vtxBuf[i + 0].v.tc[1] >> 0x5) - 256; + s32 lrs = (imgfx_vtxBuf[i + 3].v.tc[0] >> 0x5) - 256; + s32 lrt = (imgfx_vtxBuf[i + 3].v.tc[1] >> 0x5) - 256; + s32 someFlags = IMGFX_FLAG_100000 | IMGFX_FLAG_80000; s32 alpha; s32 alpha2; - if (!(state->flags & FOLD_STATE_FLAG_SKIP_TEX_SETUP)) { + if (!(state->flags & IMGFX_FLAG_SKIP_TEX_SETUP)) { if ((gSpriteShadingProfile->flags & 1) && (state->arrayIdx != 0) && (state->flags & someFlags) - && ( state->renderType == FOLD_RENDER_TYPE_0 - || state->renderType == FOLD_RENDER_TYPE_2 - || state->renderType == FOLD_RENDER_TYPE_F - || state->renderType == FOLD_RENDER_TYPE_7) + && ( state->renderType == IMGFX_RENDER_DEFAULT + || state->renderType == IMGFX_RENDER_MULTIPLY_ALPHA + || state->renderType == IMGFX_RENDER_OVERLAY_RGBA + || state->renderType == IMGFX_RENDER_MULTIPLY_SHADE_ALPHA) ) { gDPScrollMultiTile2_4b(gMainGfxPos++, - fold_currentImage->raster, G_IM_FMT_CI, - fold_currentImage->width, fold_currentImage->height, // img size + ImgFXCurrentTexturePtr->tex.raster, G_IM_FMT_CI, + ImgFXCurrentTexturePtr->tex.width, ImgFXCurrentTexturePtr->tex.height, // img size uls, ult, // top left lrs - 1, lrt - 1, // bottom right 0, // palette @@ -1437,25 +1519,25 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { 8, 8, // mask G_TX_NOLOD, G_TX_NOLOD, // shift, 0x100, 0x100); // scroll - gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, + gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 252, 0); alpha = 255; switch (state->renderType) { - case FOLD_RENDER_TYPE_0: + case IMGFX_RENDER_DEFAULT: break; - case FOLD_RENDER_TYPE_2: - case FOLD_RENDER_TYPE_F: - alpha = state->ints.color[1].a; + case IMGFX_RENDER_MULTIPLY_ALPHA: + case IMGFX_RENDER_OVERLAY_RGBA: + alpha = state->ints.color.a; break; - case FOLD_RENDER_TYPE_7: + case IMGFX_RENDER_MULTIPLY_SHADE_ALPHA: alpha = -1; break; } - if ((gSpriteShadingProfile->flags & 2) && (D_80156954[0][0].arrayIdx != 0) && (state->flags & someFlags)) { + if ((gSpriteShadingProfile->flags & 2) && ((*ImgFXInstances)[0].arrayIdx != 0) && (state->flags & someFlags)) { cam = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { @@ -1475,15 +1557,15 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { 0, 0, 0, 0, COMBINED); } - gSPVertex(gMainGfxPos++, &fold_vtxBuf[i], 4, 0); + gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[i], 4, 0); gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); gDPPipeSync(gMainGfxPos++); } create_shading_palette(mtx, uls, ult, lrs, lrt, alpha, state->otherModeL); } else { gDPScrollTextureTile_4b(gMainGfxPos++, - fold_currentImage->raster, G_IM_FMT_CI, - fold_currentImage->width, fold_currentImage->height, // img size + ImgFXCurrentTexturePtr->tex.raster, G_IM_FMT_CI, + ImgFXCurrentTexturePtr->tex.width, ImgFXCurrentTexturePtr->tex.height, // img size uls, ult, // top left lrs - 1, lrt - 1, // bottom right 0, // palette @@ -1509,14 +1591,14 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { } switch (state->renderType) { - case FOLD_RENDER_TYPE_0: + case IMGFX_RENDER_DEFAULT: alpha2 = 255; break; - case FOLD_RENDER_TYPE_2: - case FOLD_RENDER_TYPE_F: - alpha2 = state->ints.color[1].a; + case IMGFX_RENDER_MULTIPLY_ALPHA: + case IMGFX_RENDER_OVERLAY_RGBA: + alpha2 = state->ints.color.a; break; - case FOLD_RENDER_TYPE_7: + case IMGFX_RENDER_MULTIPLY_SHADE_ALPHA: alpha2 = -1; break; } @@ -1529,7 +1611,7 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { ENVIRONMENT, 0, TEXEL0, 0); } - gSPVertex(gMainGfxPos++, &fold_vtxBuf[i], 4, 0); + gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[i], 4, 0); gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); gDPPipeSync(gMainGfxPos++); @@ -1548,7 +1630,7 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { } } - if ((gSpriteShadingProfile->flags & 2) && D_80156954[0][0].arrayIdx != 0 && (state->flags & someFlags)) { + if ((gSpriteShadingProfile->flags & 2) && (*ImgFXInstances)[0].arrayIdx != 0 && (state->flags & someFlags)) { cam = &gCameras[gCurrentCamID]; if (gGameStatusPtr->isBattle == 2) { gSPViewport(gMainGfxPos++, &D_8014EE40); @@ -1559,7 +1641,7 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { } } - gSPVertex(gMainGfxPos++, &fold_vtxBuf[i], 4, 0); + gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[i], 4, 0); gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); if (i + 3 >= state->lastVtxIdx) { @@ -1570,13 +1652,13 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { } } -void func_8013DAB4(FoldState* state, Matrix4f mtx) { +void imgfx_appendGfx_mesh_grid(ImgFXState* state, Matrix4f mtx) { s32 i, j; s32 firstVtxIdx; - if (!(state->flags & FOLD_STATE_FLAG_SKIP_TEX_SETUP)) { + if (!(state->flags & IMGFX_FLAG_SKIP_TEX_SETUP)) { gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMainGfxPos++, 0, fold_currentImage->palette); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, ImgFXCurrentTexturePtr->tex.palette); } firstVtxIdx = state->firstVtxIdx; @@ -1586,19 +1668,19 @@ void func_8013DAB4(FoldState* state, Matrix4f mtx) { s32 urIdx = firstVtxIdx + i * (state->subdivX + 1) + j + 1; s32 llIdx = firstVtxIdx + (i + 1) * (state->subdivX + 1) + j; s32 lrIdx = firstVtxIdx + (i + 1) * (state->subdivX + 1) + j + 1; - if (!(state->flags & FOLD_STATE_FLAG_SKIP_TEX_SETUP)) { + if (!(state->flags & IMGFX_FLAG_SKIP_TEX_SETUP)) { if ((gSpriteShadingProfile->flags & 1) && - (*D_80156954)[0].arrayIdx != 0 && - (state->flags & (FOLD_STATE_FLAG_100000 | FOLD_STATE_FLAG_80000)) && - (state->renderType == FOLD_RENDER_TYPE_0 - || state->renderType == FOLD_RENDER_TYPE_2 - || state->renderType == FOLD_RENDER_TYPE_7)) { + (*ImgFXInstances)[0].arrayIdx != 0 && + (state->flags & (IMGFX_FLAG_100000 | IMGFX_FLAG_80000)) && + (state->renderType == IMGFX_RENDER_DEFAULT + || state->renderType == IMGFX_RENDER_MULTIPLY_ALPHA + || state->renderType == IMGFX_RENDER_MULTIPLY_SHADE_ALPHA)) { s32 alpha = 255; gDPScrollMultiTile2_4b(gMainGfxPos++, - fold_currentImage->raster, G_IM_FMT_CI, - fold_currentImage->width, fold_currentImage->height, // img size - (fold_vtxBuf[ulIdx].v.tc[0] >> 5) - 0x100, (fold_vtxBuf[ulIdx].v.tc[1] >> 5) - 0x100, // top left - (fold_vtxBuf[lrIdx].v.tc[0] >> 5) - 0x100 - 1, (fold_vtxBuf[lrIdx].v.tc[1] >> 5) - 0x100 - 1, // bottom right + ImgFXCurrentTexturePtr->tex.raster, G_IM_FMT_CI, + ImgFXCurrentTexturePtr->tex.width, ImgFXCurrentTexturePtr->tex.height, // img size + (imgfx_vtxBuf[ulIdx].v.tc[0] >> 5) - 0x100, (imgfx_vtxBuf[ulIdx].v.tc[1] >> 5) - 0x100, // top left + (imgfx_vtxBuf[lrIdx].v.tc[0] >> 5) - 0x100 - 1, (imgfx_vtxBuf[lrIdx].v.tc[1] >> 5) - 0x100 - 1, // bottom right 0, // palette G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, // clamp wrap mirror 8, 8, // mask @@ -1607,27 +1689,27 @@ void func_8013DAB4(FoldState* state, Matrix4f mtx) { gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 63 << 2, 0); switch (state->renderType) { - case FOLD_RENDER_TYPE_0: + case IMGFX_RENDER_DEFAULT: alpha = 255; break; - case FOLD_RENDER_TYPE_2: - alpha = state->ints.color[1].a; + case IMGFX_RENDER_MULTIPLY_ALPHA: + alpha = state->ints.color.a; break; - case FOLD_RENDER_TYPE_7: + case IMGFX_RENDER_MULTIPLY_SHADE_ALPHA: alpha = -1; break; } create_shading_palette(mtx, - (fold_vtxBuf[ulIdx].v.tc[0] >> 5) - 0x100, (fold_vtxBuf[ulIdx].v.tc[1] >> 5) - 0x100, - (fold_vtxBuf[lrIdx].v.tc[0] >> 5) - 0x100, (fold_vtxBuf[lrIdx].v.tc[1] >> 5) - 0x100, + (imgfx_vtxBuf[ulIdx].v.tc[0] >> 5) - 0x100, (imgfx_vtxBuf[ulIdx].v.tc[1] >> 5) - 0x100, + (imgfx_vtxBuf[lrIdx].v.tc[0] >> 5) - 0x100, (imgfx_vtxBuf[lrIdx].v.tc[1] >> 5) - 0x100, alpha, state->otherModeL); } else { gDPScrollTextureTile_4b(gMainGfxPos++, - fold_currentImage->raster, G_IM_FMT_CI, - fold_currentImage->width, fold_currentImage->height, // img size - (fold_vtxBuf[ulIdx].v.tc[0] >> 5) - 0x100, (fold_vtxBuf[ulIdx].v.tc[1] >> 5) - 0x100, // top left - (fold_vtxBuf[lrIdx].v.tc[0] >> 5) - 0x100 - 1, (fold_vtxBuf[lrIdx].v.tc[1] >> 5) - 0x100 - 1, // bottom right + ImgFXCurrentTexturePtr->tex.raster, G_IM_FMT_CI, + ImgFXCurrentTexturePtr->tex.width, ImgFXCurrentTexturePtr->tex.height, // img size + (imgfx_vtxBuf[ulIdx].v.tc[0] >> 5) - 0x100, (imgfx_vtxBuf[ulIdx].v.tc[1] >> 5) - 0x100, // top left + (imgfx_vtxBuf[lrIdx].v.tc[0] >> 5) - 0x100 - 1, (imgfx_vtxBuf[lrIdx].v.tc[1] >> 5) - 0x100 - 1, // bottom right 0, // palette G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, // clamp wrap mirror 8, 8, // mask @@ -1636,16 +1718,16 @@ void func_8013DAB4(FoldState* state, Matrix4f mtx) { } } - gSPVertex(gMainGfxPos++, &fold_vtxBuf[ulIdx], 1, 0); - gSPVertex(gMainGfxPos++, &fold_vtxBuf[urIdx], 1, 1); - gSPVertex(gMainGfxPos++, &fold_vtxBuf[llIdx], 1, 2); - gSPVertex(gMainGfxPos++, &fold_vtxBuf[lrIdx], 1, 3); + gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[ulIdx], 1, 0); + gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[urIdx], 1, 1); + gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[llIdx], 1, 2); + gSPVertex(gMainGfxPos++, &imgfx_vtxBuf[lrIdx], 1, 3); gSP2Triangles(gMainGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0); } } } -void func_8013E2F0(FoldState* state, Matrix4f mtx) { +void imgfx_appendGfx_mesh_anim(ImgFXState* state, Matrix4f mtx) { if (state->vtxBufs[gCurrentDisplayContextIndex] == NULL || state->gfxBufs[gCurrentDisplayContextIndex] == NULL) { return; } @@ -1653,20 +1735,20 @@ void func_8013E2F0(FoldState* state, Matrix4f mtx) { guScale(&gDisplayContext->matrixStack[gMatrixListPos], 0.1f, 0.1f, 0.1f); gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - if (!(state->flags & FOLD_STATE_FLAG_SKIP_TEX_SETUP)) { + if (!(state->flags & IMGFX_FLAG_SKIP_TEX_SETUP)) { gDPSetTextureLUT(gMainGfxPos++, G_TT_RGBA16); - gDPLoadTLUT_pal16(gMainGfxPos++, 0, fold_currentImage->palette); + gDPLoadTLUT_pal16(gMainGfxPos++, 0, ImgFXCurrentTexturePtr->tex.palette); if ((gSpriteShadingProfile->flags & 1) - && (state->flags & (FOLD_STATE_FLAG_100000 | FOLD_STATE_FLAG_80000)) - && (state->renderType == FOLD_RENDER_TYPE_0 - || state->renderType == FOLD_RENDER_TYPE_2 - || state->renderType == FOLD_RENDER_TYPE_7 - || state->renderType == FOLD_RENDER_TYPE_B) + && (state->flags & (IMGFX_FLAG_100000 | IMGFX_FLAG_80000)) + && (state->renderType == IMGFX_RENDER_DEFAULT + || state->renderType == IMGFX_RENDER_MULTIPLY_ALPHA + || state->renderType == IMGFX_RENDER_MULTIPLY_SHADE_ALPHA + || state->renderType == IMGFX_RENDER_ANIM) ) { s32 alpha = 255; - gDPScrollMultiTile2_4b(gMainGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, - fold_currentImage->width, fold_currentImage->height, - 0, 0, fold_currentImage->width - 1, fold_currentImage->height - 1, 0, + gDPScrollMultiTile2_4b(gMainGfxPos++, ImgFXCurrentTexturePtr->tex.raster, G_IM_FMT_CI, + ImgFXCurrentTexturePtr->tex.width, ImgFXCurrentTexturePtr->tex.height, + 0, 0, ImgFXCurrentTexturePtr->tex.width - 1, ImgFXCurrentTexturePtr->tex.height - 1, 0, G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD, 256, 256); gDPSetTile(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, @@ -1674,23 +1756,23 @@ void func_8013E2F0(FoldState* state, Matrix4f mtx) { gDPSetTileSize(gMainGfxPos++, 2, 0, 0, 252, 0); switch (state->renderType) { - case FOLD_RENDER_TYPE_0: - case FOLD_RENDER_TYPE_B: + case IMGFX_RENDER_DEFAULT: + case IMGFX_RENDER_ANIM: alpha = 255; break; - case FOLD_RENDER_TYPE_2: - alpha = state->ints.color[1].a; + case IMGFX_RENDER_MULTIPLY_ALPHA: + alpha = state->ints.color.a; break; - case FOLD_RENDER_TYPE_7: + case IMGFX_RENDER_MULTIPLY_SHADE_ALPHA: alpha = -1; break; } - create_shading_palette(mtx, 0, 0, fold_currentImage->width, fold_currentImage->height, alpha, state->otherModeL); + create_shading_palette(mtx, 0, 0, ImgFXCurrentTexturePtr->tex.width, ImgFXCurrentTexturePtr->tex.height, alpha, state->otherModeL); } else { - gDPScrollTextureTile_4b(gMainGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, - fold_currentImage->width, fold_currentImage->height, - 0, 0, fold_currentImage->width - 1, fold_currentImage->height - 1, 0, + gDPScrollTextureTile_4b(gMainGfxPos++, ImgFXCurrentTexturePtr->tex.raster, G_IM_FMT_CI, + ImgFXCurrentTexturePtr->tex.width, ImgFXCurrentTexturePtr->tex.height, + 0, 0, ImgFXCurrentTexturePtr->tex.width - 1, ImgFXCurrentTexturePtr->tex.height - 1, 0, G_TX_CLAMP, G_TX_CLAMP, 8, 8, G_TX_NOLOD, G_TX_NOLOD, 256, 256); } @@ -1699,21 +1781,23 @@ void func_8013E2F0(FoldState* state, Matrix4f mtx) { gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } -void func_8013E904(FoldState* state, Matrix4f mtx) { - UnkFoldStruct* ufs = (UnkFoldStruct*)state->ints.raw[1][0]; +void imgfx_appendGfx_mesh_strip(ImgFXState* state, Matrix4f mtx) { + ImgFXOverlayTexture* ufs = state->ints.overlay.pattern; s32 shifts = integer_log(ufs->width, 2); s32 shiftt = integer_log(ufs->height, 2); s32 uls, ult; s32 lrs, lrt; - guScale(&gDisplayContext->matrixStack[gMatrixListPos], (f32)fold_currentImage->width / 100.0, (f32)fold_currentImage->height / 100.0, 1.0f); + guScale(&gDisplayContext->matrixStack[gMatrixListPos], (f32)ImgFXCurrentTexturePtr->tex.width / 100.0, (f32)ImgFXCurrentTexturePtr->tex.height / 100.0, 1.0f); gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetRenderMode(gMainGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); - if (state->renderType == FOLD_RENDER_TYPE_F) { - s32 temp = state->ints.raw[1][1]; - gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, temp); - gDPSetCombineLERP(gMainGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); + if (state->renderType == IMGFX_RENDER_OVERLAY_RGBA) { + s32 alpha = state->ints.overlay.alpha; + gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); + gDPSetCombineLERP(gMainGfxPos++, + TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, + TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0); } else { gDPSetCombineMode(gMainGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } @@ -1724,25 +1808,25 @@ void func_8013E904(FoldState* state, Matrix4f mtx) { G_TX_WRAP, G_TX_WRAP, shifts, shiftt, G_TX_NOLOD, G_TX_NOLOD, 256, 256); - uls = state->floats.raw[1][0]; - ult = state->floats.raw[1][1]; - lrs = ufs->width * 4 + state->floats.raw[1][0]; - lrt = ufs->height * 4 + state->floats.raw[1][1]; + uls = state->floats.overlay.posX; + ult = state->floats.overlay.posY; + lrs = ufs->width * 4 + state->floats.overlay.posX; + lrt = ufs->height * 4 + state->floats.overlay.posY; gDPSetTileSize(gMainGfxPos++, G_TX_RENDERTILE, uls, ult, lrs, lrt); - state->floats.raw[1][0] = (s32)(state->floats.raw[1][0] + ufs->unk_0C) % (ufs->width * 4); - state->floats.raw[1][1] = (s32)(state->floats.raw[1][1] + ufs->unk_10) % (ufs->height * 4); - gSPDisplayList(gMainGfxPos++, ufs->unk_14); + state->floats.overlay.posX = (s32)(state->floats.overlay.posX + ufs->offsetX) % (ufs->width * 4); + state->floats.overlay.posY = (s32)(state->floats.overlay.posY + ufs->offsetY) % (ufs->height * 4); + gSPDisplayList(gMainGfxPos++, ufs->displayList); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } -void fold_wavy_init(FoldState* state) { +void imgfx_wavy_init(ImgFXState* state) { state->floats.wavy.phase1 = 0.0f; state->floats.wavy.phase2 = 50.0f; state->floats.wavy.phase3 = 30.0f; } -void fold_mesh_wavy_update(FoldState* state) { +void imgfx_mesh_make_wavy(ImgFXState* state) { Vtx* v1; Vtx* v2; Vtx* v3; @@ -1801,15 +1885,15 @@ void fold_mesh_wavy_update(FoldState* state) { angle3 = state->floats.wavy.phase3 + (angleInc * 45) + (sign * 180); //TODO find better match - v1 = (Vtx*)((state->firstVtxIdx + i) * sizeof(Vtx) + (s32)fold_vtxBuf); + v1 = (Vtx*)((state->firstVtxIdx + i) * sizeof(Vtx) + (s32)imgfx_vtxBuf); vx = v1->v.ob[0]; v1->v.ob[0] = (vx + (sin_rad(angle1) * state->ints.wavy.mag.x)); // @bug? should be sin_deg? - v2 = (Vtx*)((state->firstVtxIdx + i) * sizeof(Vtx) + (s32)fold_vtxBuf); + v2 = (Vtx*)((state->firstVtxIdx + i) * sizeof(Vtx) + (s32)imgfx_vtxBuf); vy = v2->v.ob[1]; v2->v.ob[1] = (vy + (sin_rad(angle2) * state->ints.wavy.mag.y)); - v3 = (Vtx*)((state->firstVtxIdx + i) * sizeof(Vtx) + (s32)fold_vtxBuf); + v3 = (Vtx*)((state->firstVtxIdx + i) * sizeof(Vtx) + (s32)imgfx_vtxBuf); vz = v3->v.ob[2]; v3->v.ob[2] = (vz + (sin_rad(angle3) * state->ints.wavy.mag.z)); @@ -1821,15 +1905,15 @@ void fold_mesh_wavy_update(FoldState* state) { } } -void fold_mesh_load_colors(FoldState* state) { - f32 alpha = (f32)fold_currentImage->alphaMultiplier / 255.0; +void imgfx_mesh_load_colors(ImgFXState* state) { + f32 alpha = (f32)ImgFXCurrentTexturePtr->alphaMultiplier / 255.0; s32 vtxCount = state->lastVtxIdx - state->firstVtxIdx; s32 i; for (i = 0; i <= vtxCount; i++) { - fold_vtxBuf[state->firstVtxIdx + i].v.cn[0] = state->colorBuf[i].r; - fold_vtxBuf[state->firstVtxIdx + i].v.cn[1] = state->colorBuf[i].g; - fold_vtxBuf[state->firstVtxIdx + i].v.cn[2] = state->colorBuf[i].b; - fold_vtxBuf[state->firstVtxIdx + i].v.cn[3] = state->colorBuf[i].a * alpha; + imgfx_vtxBuf[state->firstVtxIdx + i].v.cn[0] = state->colorBuf[i].r; + imgfx_vtxBuf[state->firstVtxIdx + i].v.cn[1] = state->colorBuf[i].g; + imgfx_vtxBuf[state->firstVtxIdx + i].v.cn[2] = state->colorBuf[i].b; + imgfx_vtxBuf[state->firstVtxIdx + i].v.cn[3] = state->colorBuf[i].a * alpha; } } diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index 061ad13fbe..bf430878bd 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -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_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0, 0); + set_player_imgfx_all(ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_all(ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0, 0); exec_entity_commandlist(entity); } } diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c index 65b4f53f23..ffd9b07664 100644 --- a/src/entity/jan_iwa/Plants1.c +++ b/src/entity/jan_iwa/Plants1.c @@ -308,8 +308,8 @@ void entity_CymbalPlant_idle(Entity* entity) { case 2: if (--data->timer == 0) { data->state++; - func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0); - func_802DDFF8(ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_CYMBAL_CRUSH, 1, 1, 0, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_all(ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_CYMBAL_CRUSH, 1, 1, 0, 0); } break; case 3: @@ -328,7 +328,7 @@ void entity_CymbalPlant_idle(Entity* entity) { case 5: if (--data->timer == 0) { data->state++; - func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); enable_player_input(); playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; } diff --git a/src/entity_model.c b/src/entity_model.c index f8babc9b11..e6bdb33205 100644 --- a/src/entity_model.c +++ b/src/entity_model.c @@ -244,8 +244,8 @@ void make_entity_model_mtx_flipZ(Matrix4f mtx) { void appendGfx_entity_model(EntityModel* model) { Matrix4f mtx; Matrix4f mtx2; - FoldImageRecPart foldImage; - Matrix4f foldMtx; + ImgFXTexture ifxImg; + Matrix4f imgfxMtx; gDisplayContext->matrixStack[gMatrixListPos] = model->transform; gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -393,15 +393,15 @@ void appendGfx_entity_model(EntityModel* model) { gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); imageData = model->gfx.imageData; - foldImage.raster = imageData->raster; - foldImage.palette = imageData->defaultPal; - foldImage.width = imageData->width; - foldImage.height = imageData->height; - foldImage.xOffset = -imageData->width / 2; - foldImage.yOffset = imageData->height / 2; - foldImage.opacity = 255; - guMtxL2F(foldMtx, &model->transform); - fold_appendGfx_component(0, &foldImage, 0, foldMtx); + ifxImg.raster = imageData->raster; + ifxImg.palette = imageData->defaultPal; + ifxImg.width = imageData->width; + ifxImg.height = imageData->height; + ifxImg.xOffset = -imageData->width / 2; + ifxImg.yOffset = imageData->height / 2; + ifxImg.alpha = 255; + guMtxL2F(imgfxMtx, &model->transform); + imgfx_appendGfx_component(0, &ifxImg, 0, imgfxMtx); } gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); @@ -551,8 +551,8 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { EntityModel* model = (*gCurrentEntityModelList)[modelIdx & ~0x800]; Matrix4f mtx; Matrix4f mtx2; - FoldImageRecPart foldImage; - Matrix4f foldMtx; + ImgFXTexture ifxImg; + Matrix4f imgfxMtx; if (model == NULL) { return; @@ -702,15 +702,15 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); imageData = model->gfx.imageData; - foldImage.raster = imageData->raster; - foldImage.palette = imageData->defaultPal; - foldImage.width = imageData->width; - foldImage.height = imageData->height; - foldImage.xOffset = -imageData->width / 2; - foldImage.yOffset = imageData->height / 2; - foldImage.opacity = 255; - guMtxL2F(foldMtx, &model->transform); - fold_appendGfx_component(0, &foldImage, 0, foldMtx); + ifxImg.raster = imageData->raster; + ifxImg.palette = imageData->defaultPal; + ifxImg.width = imageData->width; + ifxImg.height = imageData->height; + ifxImg.xOffset = -imageData->width / 2; + ifxImg.yOffset = imageData->height / 2; + ifxImg.alpha = 255; + guMtxL2F(imgfxMtx, &model->transform); + imgfx_appendGfx_component(0, &ifxImg, 0, imgfxMtx); } gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index da989c4f55..e623ba1595 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -21,9 +21,9 @@ ApiStatus SetCamEnabled(Evt* script, s32 isInitialCall) { s32 enabled = evt_get_variable(script, *args++); if (!enabled) { - gCameras[id].flags |= CAMERA_FLAG_ENABLED; + gCameras[id].flags |= CAMERA_FLAG_DISABLED; } else { - gCameras[id].flags &= ~CAMERA_FLAG_ENABLED; + gCameras[id].flags &= ~CAMERA_FLAG_DISABLED; } return ApiStatus_DONE2; } @@ -51,7 +51,7 @@ ApiStatus SetCamPerspective(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[id]; camera->updateMode = mode; - camera->unk_06 = TRUE; + camera->needsInit = TRUE; camera->isChangingMap = TRUE; camera->vfov = vfov; @@ -67,7 +67,7 @@ ApiStatus func_802CA90C(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[id]; camera->updateMode = mode; - camera->unk_06 = FALSE; + camera->needsInit = FALSE; return ApiStatus_DONE2; } @@ -81,7 +81,7 @@ ApiStatus func_802CA988(Evt* script, s32 isInitialCall) { f32 dx, dy, dz; gCameras[id].updateMode = CAM_UPDATE_MODE_2; - gCameras[id].unk_06 = FALSE; + gCameras[id].needsInit = FALSE; gCameras[id].auxPitch = -round(gCameras[id].currentPitch); gCameras[id].auxBoomLength = -gCameras[id].currentBlendedYawNegated; diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index ffc8af7cad..e69d5cb7b7 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -965,10 +965,10 @@ ApiStatus PartnerIsFlying(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus SetNpcFoldParams(Evt* script, s32 isInitialCall) { +ApiStatus SetNpcImgFXParams(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 npcId = evt_get_variable(script, *args++); - Bytecode foldType = evt_get_variable(script, *args++); + Bytecode imgfxType = evt_get_variable(script, *args++); Bytecode var2 = evt_get_variable(script, *args++); Bytecode var3 = evt_get_variable(script, *args++); Bytecode var4 = evt_get_variable(script, *args++); @@ -979,11 +979,11 @@ ApiStatus SetNpcFoldParams(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - npc_set_fold_params(npc, foldType, var2, var3, var4, var5, npc->foldFlags); + npc_set_imgfx_params(npc, imgfxType, var2, var3, var4, var5, npc->imgfxFlags); return ApiStatus_DONE2; } -ApiStatus SetNpcFoldFlags(Evt* script, s32 isInitialCall) { +ApiStatus SetNpcImgFXFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 npcId = evt_get_variable(script, *args++); Bytecode flags = *args; @@ -993,7 +993,7 @@ ApiStatus SetNpcFoldFlags(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - npc->foldFlags = flags; + npc->imgfxFlags = flags; return ApiStatus_DONE2; } diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 18066778b0..7d6fbfe754 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -4,7 +4,7 @@ #include "world/partners.h" extern Npc playerNpcData; -extern u16 PlayerFoldFlags; +extern u16 PlayerImgFXFlags; extern s32 D_802DB5B4[3]; // unused Npc* playerNpc = &playerNpcData; @@ -630,78 +630,78 @@ ApiStatus WaitForPlayerInputEnabled(Evt* script, s32 isInitialCall) { } } -ApiStatus UpdatePlayerFold(Evt* script, s32 isInitialCall) { +ApiStatus UpdatePlayerImgFX(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; s32 a0 = *args++; - s32 foldType = evt_get_variable(script, *args++); + s32 imgfxType = evt_get_variable(script, *args++); s32 a2, a3, a4, a5; - func_802DDFF8(a0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_all(a0, IMGFX_CLEAR, 0, 0, 0, 0, 0); - switch (foldType) { - case FOLD_UPD_CLEAR: + switch (imgfxType) { + case IMGFX_CLEAR: playerStatus->renderMode = RENDER_MODE_ALPHATEST; - func_802DDFF8(a0, FOLD_UPD_CLEAR, 0, 0, 0, 0, PlayerFoldFlags); + set_player_imgfx_all(a0, IMGFX_CLEAR, 0, 0, 0, 0, PlayerImgFXFlags); break; - case FOLD_TYPE_2: - case FOLD_TYPE_3: + case IMGFX_UNK_2: + case IMGFX_RESET: playerStatus->renderMode = RENDER_MODE_ALPHATEST; - case FOLD_TYPE_1: - func_802DDFF8(a0, foldType, 0, 0, 0, 0, PlayerFoldFlags); + case IMGFX_UNK_1: + set_player_imgfx_all(a0, imgfxType, 0, 0, 0, 0, PlayerImgFXFlags); break; - case FOLD_UPD_WAVY: + case IMGFX_SET_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_UPD_WAVY, a2, a3, a4, 0, PlayerFoldFlags); + set_player_imgfx_all(a0, IMGFX_SET_WAVY, a2, a3, a4, 0, PlayerImgFXFlags); break; - case FOLD_UPD_SET_COLOR: + case IMGFX_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_UPD_SET_COLOR, a2, a3, a4, 255, PlayerFoldFlags); + set_player_imgfx_all(a0, IMGFX_SET_COLOR, a2, a3, a4, 255, PlayerImgFXFlags); break; - case FOLD_UPD_SET_ALPHA: + case IMGFX_SET_ALPHA: playerStatus->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; a5 = evt_get_variable(script, *args++); - func_802DDFF8(a0, FOLD_UPD_SET_ALPHA, 255, 255, 255, a5, PlayerFoldFlags); + set_player_imgfx_all(a0, IMGFX_SET_ALPHA, 255, 255, 255, a5, PlayerImgFXFlags); break; - case FOLD_UPD_SET_TINT: + case IMGFX_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_UPD_SET_TINT, a2, a3, a4, a5, PlayerFoldFlags); + set_player_imgfx_all(a0, IMGFX_SET_TINT, a2, a3, a4, a5, PlayerImgFXFlags); break; - case FOLD_UPD_SET_ANIM: + case IMGFX_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_UPD_SET_ANIM, a2, a3, a4, 0, PlayerFoldFlags); + set_player_imgfx_all(a0, IMGFX_SET_ANIM, a2, a3, a4, 0, PlayerImgFXFlags); break; - case FOLD_UPD_HOLOGRAM: + case IMGFX_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_UPD_HOLOGRAM, a2, a3, a4, a5, PlayerFoldFlags); + set_player_imgfx_all(a0, IMGFX_HOLOGRAM, a2, a3, a4, a5, PlayerImgFXFlags); break; } - PlayerFoldFlags = 0; + PlayerImgFXFlags = 0; return ApiStatus_DONE2; } -ApiStatus SetPlayerFoldFlags(Evt* script, s32 isInitialCall) { - s32 foldFlags = *script->ptrReadPos; +ApiStatus SetPlayerImgFXFlags(Evt* script, s32 isInitialCall) { + s32 imgfxFlags = *script->ptrReadPos; - PlayerFoldFlags = foldFlags; + PlayerImgFXFlags = imgfxFlags; return ApiStatus_DONE2; } diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 23ef994729..f5dda44cc0 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -50,7 +50,7 @@ BSS s32 D_802DB26C; // unused? // player_api BSS Npc playerNpcData; -BSS u16 PlayerFoldFlags; +BSS u16 PlayerImgFXFlags; BSS s32 D_802DB5B4[3]; // unused BSS VirtualEntityList bBattleVirtualEntityList; BSS VirtualEntityList wWorldVirtualEntityList; diff --git a/src/hud_element.c b/src/hud_element.c index 906e6ec571..21a7be78eb 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -688,7 +688,7 @@ void init_hud_element_list(void) { void func_801413F8(void) { set_cam_viewport(CAM_3, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); gCameras[CAM_3].updateMode = CAM_UPDATE_MODE_2; - gCameras[CAM_3].unk_06 = TRUE; + gCameras[CAM_3].needsInit = TRUE; gCameras[CAM_3].lookAt_dist = 15551; gCameras[CAM_3].nearClip = CAM_NEAR_CLIP; gCameras[CAM_3].auxPitch = 0; @@ -1417,7 +1417,7 @@ void render_hud_element(HudElement* hudElement) { Matrix4f sp1E0; Matrix4f sp220; Matrix4f sp260; - FoldImageRecPart sp2A0; + ImgFXTexture ifxImg; f32 xScaleFactor, yScaleFactor; s32 height, width; HudTransform* transform; @@ -1511,35 +1511,35 @@ 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_UPD_SET_ALPHA, 255, 255, 255, hudElement->opacity, 0); + imgfx_update(0, IMGFX_SET_ALPHA, 255, 255, 255, hudElement->opacity, 0); } else { - fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, 0); } } else { if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { - fold_update(transform->foldIdx, FOLD_UPD_SET_ALPHA, 255, 255, 255, hudElement->opacity, 0); + imgfx_update(transform->imgfxIdx, IMGFX_SET_ALPHA, 255, 255, 255, hudElement->opacity, 0); } else { - fold_update(transform->foldIdx, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + imgfx_update(transform->imgfxIdx, IMGFX_CLEAR, 0, 0, 0, 0, 0); } } - sp2A0.raster = hudElement->imageAddr; + ifxImg.raster = hudElement->imageAddr; palette = (u16*) hudElement->paletteAddr; - sp2A0.width = width; - sp2A0.height = height; - sp2A0.xOffset = -width / 2; - sp2A0.yOffset = height / 2; - sp2A0.opacity = 255; - sp2A0.palette = palette; + ifxImg.width = width; + ifxImg.height = height; + ifxImg.xOffset = -width / 2; + ifxImg.yOffset = height / 2; + ifxImg.alpha = 255; + ifxImg.palette = palette; if (hudElement->flags & HUD_ELEMENT_FLAG_NO_FOLD) { if (hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING) { - fold_appendGfx_component(0, &sp2A0, FOLD_STATE_FLAG_40, sp60); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, sp60); } else { - fold_appendGfx_component(0, &sp2A0, FOLD_STATE_FLAG_40, sp60); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, sp60); } } else { - fold_appendGfx_component(transform->foldIdx, &sp2A0, FOLD_STATE_FLAG_40, sp60); + imgfx_appendGfx_component(transform->imgfxIdx, &ifxImg, IMGFX_FLAG_40, sp60); } break; case 2: @@ -1722,7 +1722,7 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { Camera* camera = &gCameras[camID]; if (arg1 > 0) { - if (!camera->flags || (camera->flags & CAMERA_FLAG_ENABLED)) { + if (camera->flags == 0 || (camera->flags & CAMERA_FLAG_DISABLED)) { return; } @@ -2116,7 +2116,7 @@ void hud_element_create_transform_A(s32 id) { element->hudTransform = transform; ASSERT(transform != NULL); element->flags |= HUD_ELEMENT_FLAG_TRANSFORM; - transform->foldIdx = func_8013A704(1); + transform->imgfxIdx = imgfx_get_free_instances(1); transform->position.x = 0.0f; transform->position.y = 0.0f; transform->position.z = 0.0f; @@ -2138,7 +2138,7 @@ void hud_element_create_transform_B(s32 id) { element->hudTransform = transform; ASSERT(transform != NULL); element->flags |= HUD_ELEMENT_FLAG_TRANSFORM | HUD_ELEMENT_FLAG_NO_FOLD; - transform->foldIdx = 0; + transform->imgfxIdx = 0; transform->position.x = 0.0f; transform->position.y = 0.0f; transform->position.z = 0.0f; @@ -2158,7 +2158,7 @@ void hud_element_create_transform_C(s32 id) { element->hudTransform = transform; ASSERT(transform != NULL); element->flags |= HUD_ELEMENT_FLAG_40000000 | HUD_ELEMENT_FLAG_NO_FOLD | HUD_ELEMENT_FLAG_TRANSFORM; - transform->foldIdx = 0; + transform->imgfxIdx = 0; transform->position.x = 0.0f; transform->position.y = 0.0f; transform->position.z = 0.0f; @@ -2176,7 +2176,7 @@ void hud_element_free_transform(s32 id) { HudTransform* hudTransform = hudElement->hudTransform; if (!(hudElement->flags & HUD_ELEMENT_FLAG_NO_FOLD)) { - func_8013A854(hudTransform->foldIdx); + imgfx_release_instance(hudTransform->imgfxIdx); } heap_free(hudElement->hudTransform); diff --git a/src/hud_element.h b/src/hud_element.h index b5f338cf1c..f149adbb1d 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -167,7 +167,7 @@ typedef struct VtxRect { } VtxRect; // size = 0x40 typedef struct HudTransform { - /* 0x00 */ s32 foldIdx; + /* 0x00 */ s32 imgfxIdx; /* 0x04 */ Vec3f position; /* 0x10 */ Vec3f rotation; /* 0x1C */ Vec3f scale; diff --git a/src/i_spy.c b/src/i_spy.c index 9b36ab1012..8e5adc7842 100644 --- a/src/i_spy.c +++ b/src/i_spy.c @@ -33,7 +33,7 @@ void ispy_notification_update(void); void appendGfx_ispy_icon(void) { Matrix4f matrix1; Matrix4f matrix2; - FoldImageRecPart foldImage; + ImgFXTexture ifxImg; s32 flashPhase; if (gPlayerStatus.animFlags & PA_FLAG_ISPY_VISIBLE) { @@ -58,31 +58,31 @@ void appendGfx_ispy_icon(void) { case 1: case 2: case 3: - foldImage.palette = ispy_icon_1_pal; + ifxImg.palette = ispy_icon_1_pal; break; case 4: case 5: case 6: case 7: - foldImage.palette = ispy_icon_2_pal; + ifxImg.palette = ispy_icon_2_pal; break; case 8: case 9: case 10: case 11: - foldImage.palette = ispy_icon_3_pal; + ifxImg.palette = ispy_icon_3_pal; break; } - fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, ISpyPtr->alpha, 0); + imgfx_update(0, IMGFX_SET_ALPHA, 255, 255, 255, ISpyPtr->alpha, 0); - foldImage.raster = ispy_icon_img; - foldImage.width = ispy_icon_img_width; - foldImage.height = ispy_icon_img_height; - foldImage.xOffset = -28; - foldImage.yOffset = 46; - foldImage.opacity = 255; + ifxImg.raster = ispy_icon_img; + ifxImg.width = ispy_icon_img_width; + ifxImg.height = ispy_icon_img_height; + ifxImg.xOffset = -28; + ifxImg.yOffset = 46; + ifxImg.alpha = 255; - fold_appendGfx_component(0, &foldImage, 0, matrix2); + imgfx_appendGfx_component(0, &ifxImg, 0, matrix2); gSPPopMatrix(gMainGfxPos++, 0); } } diff --git a/src/inspect_icon.c b/src/inspect_icon.c index 485ea487dd..ef761f2b67 100644 --- a/src/inspect_icon.c +++ b/src/inspect_icon.c @@ -58,7 +58,7 @@ void interact_inspect_setup(void) { } void appendGfx_interact_prompt(void) { - FoldImageRecPart sp20; + ImgFXTexture ifxImg; Matrix4f sp38, sp78; if (gPlayerStatus.animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) { @@ -73,18 +73,18 @@ void appendGfx_interact_prompt(void) { G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, &inspect_icon_gfx); - sp20.raster = inspect_icon_img; - sp20.palette = inspect_icon_pal; - sp20.width = inspect_icon_img_width; - sp20.height = inspect_icon_img_height; - sp20.xOffset = -16; - sp20.yOffset = 26; - sp20.opacity = 255; - 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, + ifxImg.raster = inspect_icon_img; + ifxImg.palette = inspect_icon_pal; + ifxImg.width = inspect_icon_img_width; + ifxImg.height = inspect_icon_img_height; + ifxImg.xOffset = -16; + ifxImg.yOffset = 26; + ifxImg.alpha = 255; + imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, IMGFX_FLAG_400 | IMGFX_FLAG_40); + imgfx_update(0, IMGFX_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); + IMGFX_FLAG_400 | IMGFX_FLAG_40 | IMGFX_FLAG_8); + imgfx_appendGfx_component(0, &ifxImg, 0, sp78); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/main_loop.c b/src/main_loop.c index 03901e0ddf..fe6859cfb7 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -187,7 +187,7 @@ void gfx_draw_frame(void) { spr_render_init(); if (!(gOverrideFlags & GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD)) { - render_frame(0); + render_frame(FALSE); } player_render_interact_prompts(); @@ -203,7 +203,7 @@ void gfx_draw_frame(void) { } if (!(gOverrideFlags & GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD) && !gGameStatusPtr->disableScripts) { - render_frame(1); + render_frame(TRUE); } if (!(gOverrideFlags & (GLOBAL_OVERRIDES_MESSAGES_IN_FRONT_OF_CURTAINS | GLOBAL_OVERRIDES_10))) { diff --git a/src/npc.c b/src/npc.c index a93d11512e..466bcde1b7 100644 --- a/src/npc.c +++ b/src/npc.c @@ -140,8 +140,8 @@ s32 create_npc_impl(NpcBlueprint* blueprint, AnimID* animList, s32 isPeachNpc) { npc->currentAnim = blueprint->initialAnim; npc->animationSpeed = 1.0f; npc->renderYaw = 0.0f; - npc->foldType = 0; - npc->foldFlags = 0; + npc->imgfxType = IMGFX_CLEAR; + npc->imgfxFlags = 0; npc->collisionChannel = COLLISION_CHANNEL_20000; npc->isFacingAway = FALSE; npc->yawCamOffset = 0; @@ -864,7 +864,7 @@ void appendGfx_npc(void* data) { } } else { npc_draw_with_palswap(npc, renderYaw, mtx1); - npc->animNotifyValue = func_802DDEC4(1); + npc->animNotifyValue = func_802DDEC4(PLAYER_SPRITE_AUX1); } if (npc->flags & NPC_FLAG_REFLECT_WALL) { @@ -1147,7 +1147,7 @@ void appendGfx_npc_blur(void* data) { x = blur->x[index]; y = blur->y[index]; z = blur->z[index]; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_ALPHA, 255, 255, 255, 120 - (var_s5 * 20), 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_ALPHA, 255, 255, 255, 120 - (var_s5 * 20), 0); yaw = npc->renderYaw; guTranslateF(sp20, x, y, z); @@ -1927,7 +1927,7 @@ void npc_update_decoration_charged(Npc* npc, s32 idx) { s32 temp3; if (!npc->decorationInitialised[idx]) { - func_802DE894(npc->spriteInstanceID, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); npc->decorationInitialised[idx] = TRUE; } if (npc->decorationInitialised[idx] == TRUE) { @@ -1943,7 +1943,7 @@ void npc_update_decoration_charged(Npc* npc, s32 idx) { } for (temp3 = 255, i = 0; i < 20; i++) { - func_802DE894(npc->spriteInstanceID, FOLD_UPD_COLOR_BUF_SET_C, i, (sp50[i] << 24) | (sp38[i] << 16) | (sp20[i] << 8) | temp3, 0, 255, 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_COLOR_BUF_SET_MODULATE, i, (sp50[i] << 24) | (sp38[i] << 16) | (sp20[i] << 8) | temp3, 0, 255, 0); } } } @@ -2080,81 +2080,81 @@ s32 npc_get_collider_below(Npc* npc) { } void func_8003D3BC(Npc* npc) { - s32 foldType = npc->foldType; - s32 foldArg1 = npc->foldArg1; - s32 foldArg2 = npc->foldArg2; - s32 foldArg3 = npc->foldArg3; - s32 foldArg4 = npc->foldArg4; - s32 foldFlags = npc->foldFlags; + s32 imgfxType = npc->imgfxType; + s32 imgfxArg1 = npc->imgfxArg1; + s32 imgfxArg2 = npc->imgfxArg2; + s32 imgfxArg3 = npc->imgfxArg3; + s32 imgfxArg4 = npc->imgfxArg4; + s32 imgfxFlags = npc->imgfxFlags; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, 0); - switch (foldType) { - case FOLD_UPD_CLEAR: + switch (imgfxType) { + case IMGFX_CLEAR: npc->renderMode = RENDER_MODE_ALPHATEST; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, imgfxFlags); break; - case FOLD_TYPE_2: - case FOLD_TYPE_3: + case IMGFX_UNK_2: + case IMGFX_RESET: npc->renderMode = RENDER_MODE_ALPHATEST; // fallthrough - case FOLD_TYPE_1: - func_802DE894(npc->spriteInstanceID, foldType, 0, 0, 0, 0, foldFlags); + case IMGFX_UNK_1: + set_npc_imgfx_all(npc->spriteInstanceID, imgfxType, 0, 0, 0, 0, imgfxFlags); break; - case FOLD_UPD_WAVY: + case IMGFX_SET_WAVY: npc->renderMode = RENDER_MODE_ALPHATEST; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_WAVY, foldArg1, foldArg2, foldArg3, 0, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_WAVY, imgfxArg1, imgfxArg2, imgfxArg3, 0, imgfxFlags); break; - case FOLD_UPD_SET_COLOR: + case IMGFX_SET_COLOR: npc->renderMode = RENDER_MODE_ALPHATEST; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_COLOR, foldArg1, foldArg2, foldArg3, 255, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_COLOR, imgfxArg1, imgfxArg2, imgfxArg3, 255, imgfxFlags); break; - case FOLD_UPD_SET_ALPHA: + case IMGFX_SET_ALPHA: npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_ALPHA, 255, 255, 255, foldArg1, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_ALPHA, 255, 255, 255, imgfxArg1, imgfxFlags); break; - case FOLD_UPD_SET_TINT: + case IMGFX_SET_TINT: npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_TINT, foldArg1, foldArg2, foldArg3, foldArg4, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_TINT, imgfxArg1, imgfxArg2, imgfxArg3, imgfxArg4, imgfxFlags); break; - case FOLD_TYPE_9: + case IMGFX_SET_WHITE_FADE: npc->renderMode = RENDER_MODE_ALPHATEST; - func_802DE894(npc->spriteInstanceID, FOLD_TYPE_9, foldArg1, foldArg2, foldArg3, 255, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_WHITE_FADE, imgfxArg1, imgfxArg2, imgfxArg3, 255, imgfxFlags); break; - case FOLD_TYPE_A: + case IMGFX_SET_CREDITS_FADE: npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - func_802DE894(npc->spriteInstanceID, FOLD_TYPE_A, foldArg1, foldArg2, foldArg3, foldArg4, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_CREDITS_FADE, imgfxArg1, imgfxArg2, imgfxArg3, imgfxArg4, imgfxFlags); break; - case FOLD_UPD_SET_ANIM: + case IMGFX_SET_ANIM: npc->renderMode = RENDER_MODE_ALPHATEST; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_ANIM, foldArg1, foldArg2, foldArg3, 0, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_ANIM, imgfxArg1, imgfxArg2, imgfxArg3, 0, imgfxFlags); break; - case FOLD_UPD_HOLOGRAM: + case IMGFX_HOLOGRAM: npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_HOLOGRAM, foldArg1, foldArg2, foldArg3, foldArg4, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_HOLOGRAM, imgfxArg1, imgfxArg2, imgfxArg3, imgfxArg4, imgfxFlags); break; - case FOLD_TYPE_E: + case IMGFX_FILL_COLOR: npc->renderMode = RENDER_MODE_ALPHATEST; - func_802DE894(npc->spriteInstanceID, FOLD_TYPE_E, foldArg1, foldArg2, foldArg3, 255, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_FILL_COLOR, imgfxArg1, imgfxArg2, imgfxArg3, 255, imgfxFlags); break; - case FOLD_TYPE_F: + case IMGFX_OVERLAY: npc->renderMode = RENDER_MODE_ALPHATEST; - func_802DE894(npc->spriteInstanceID, FOLD_TYPE_F, foldArg1, 255, 0, 255, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_OVERLAY, imgfxArg1, 255, 0, 255, imgfxFlags); break; - case FOLD_TYPE_10: + case IMGFX_OVERLAY_XLU: npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - func_802DE894(npc->spriteInstanceID, FOLD_TYPE_F, foldArg1, foldArg2, 0, foldArg2, foldFlags); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_OVERLAY, imgfxArg1, imgfxArg2, 0, imgfxArg2, imgfxFlags); break; } } -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->foldFlags = arg6; +void npc_set_imgfx_params(Npc* npc, s32 imgfxType, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { + npc->imgfxType = imgfxType; + npc->imgfxArg1 = arg2; + npc->imgfxArg2 = arg3; + npc->imgfxArg3 = arg4; + npc->imgfxArg4 = arg5; + npc->imgfxFlags = arg6; func_8003D3BC(npc); } diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index 95df2c4b11..faf84b74e0 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -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_UPD_SET_COLOR, 255, 255, 255, 255, 64); + set_npc_imgfx_all(gPauseTutorialSprites[i], IMGFX_SET_COLOR, 255, 255, 255, 255, 64); spr_draw_npc_sprite(gPauseTutorialSprites[i], 0, 0, 0, matrix1); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/pause/pause_partners.c b/src/pause/pause_partners.c index 890cd56868..2239edac4a 100644 --- a/src/pause/pause_partners.c +++ b/src/pause/pause_partners.c @@ -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_UPD_SET_COLOR, color, color, color, 255, 64); + set_npc_imgfx_all(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], IMGFX_SET_COLOR, color, color, color, 255, 64); spr_draw_npc_sprite(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], 0, 0, NULL, matrix); } diff --git a/src/pause/pause_spirits.c b/src/pause/pause_spirits.c index d81a8ccd11..d0d833cdee 100644 --- a/src/pause/pause_spirits.c +++ b/src/pause/pause_spirits.c @@ -196,7 +196,7 @@ void pause_spirits_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt } - func_802DE894(gPauseSpiritsSpriteIDs[gPauseSpiritsIndexes[index]], FOLD_UPD_SET_TINT, color, color, color, alpha, 64); + set_npc_imgfx_all(gPauseSpiritsSpriteIDs[gPauseSpiritsIndexes[index]], IMGFX_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); diff --git a/src/pulse_stone.c b/src/pulse_stone.c index 5711660d3e..2eec47b177 100644 --- a/src/pulse_stone.c +++ b/src/pulse_stone.c @@ -80,7 +80,7 @@ void pulse_stone_notification_setup(void) { void appendGfx_pulse_stone_icon(void) { PlayerStatus* playerStatus = &gPlayerStatus; Matrix4f sp18, sp58; - FoldImageRecPart part; + ImgFXTexture ifxImg; s32 pingDelay; s32 dx, dy; @@ -124,7 +124,7 @@ void appendGfx_pulse_stone_icon(void) { break; } - part.palette = pulse_stone_icon_1_pal; + ifxImg.palette = pulse_stone_icon_1_pal; if (pingDelay >= 0) { PulseStonePtr->pingTime++; if (PulseStonePtr->pingTime >= pingDelay + 2) { @@ -132,19 +132,19 @@ void appendGfx_pulse_stone_icon(void) { sfx_play_sound_at_player(SOUND_7D, SOUND_SPACE_MODE_0); } if (PulseStonePtr->pingTime < 2) { - part.palette = pulse_stone_icon_2_pal; + ifxImg.palette = pulse_stone_icon_2_pal; } else { - part.palette = pulse_stone_icon_1_pal; + ifxImg.palette = pulse_stone_icon_1_pal; } } - part.raster = pulse_stone_icon_img; - part.width = pulse_stone_icon_img_width; - part.height = pulse_stone_icon_img_height; - part.xOffset = -28; - part.yOffset = 46; - part.opacity = 255; - fold_appendGfx_component(0, &part, 0, sp58); + ifxImg.raster = pulse_stone_icon_img; + ifxImg.width = pulse_stone_icon_img_width; + ifxImg.height = pulse_stone_icon_img_height; + ifxImg.xOffset = -28; + ifxImg.yOffset = 46; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, 0, sp58); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/speech_bubble.c b/src/speech_bubble.c index 74ca264fbc..0def59631e 100644 --- a/src/speech_bubble.c +++ b/src/speech_bubble.c @@ -45,7 +45,7 @@ void interact_speech_setup(void) { } void appendGfx_speech_bubble(void) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; Matrix4f mtxTemp, mtxTransform; if (gPlayerStatus.animFlags & PA_FLAG_SPEECH_PROMPT_AVAILABLE) { @@ -60,17 +60,17 @@ void appendGfx_speech_bubble(void) { G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, &speech_bubble_gfx); - foldImg.raster = speech_bubble_img; - foldImg.palette = speech_bubble_pal; - foldImg.width = speech_bubble_img_width; - foldImg.height = speech_bubble_img_height; - foldImg.xOffset = -16; - foldImg.yOffset = 26; - foldImg.opacity = 255; - 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, + ifxImg.raster = speech_bubble_img; + ifxImg.palette = speech_bubble_pal; + ifxImg.width = speech_bubble_img_width; + ifxImg.height = speech_bubble_img_height; + ifxImg.xOffset = -16; + ifxImg.yOffset = 26; + ifxImg.alpha = 255; + imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, IMGFX_FLAG_400 | IMGFX_FLAG_40); + imgfx_update(0, IMGFX_SET_COLOR, SpeechBubblePtr->brightness, SpeechBubblePtr->brightness, SpeechBubblePtr->brightness, 255, 0x440); - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, mtxTransform); + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, mtxTransform); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/sprite.c b/src/sprite.c index 6a7124e86a..15bee9391e 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -326,7 +326,7 @@ void spr_appendGfx_component( { Matrix4f mtxTransform; Matrix4f mtxTemp; - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; s32 quadIndex; Quad* quad; s32 width; @@ -376,7 +376,7 @@ void spr_appendGfx_component( height = cache->height; quadIndex = cache->quadCacheIndex; quad = NULL; - if (!(D_802DF540 & (0x80000000 | 0x40000000 | 0x20000000 | 0x10000000))) { + if (!(D_802DF540 & SPR_IMGFX_FLAG_ALL)) { quad = spr_get_quad_for_size(&quadIndex, width, height); cache->quadCacheIndex = quadIndex; } @@ -384,15 +384,15 @@ void spr_appendGfx_component( if (quad != NULL) { spr_appendGfx_component_flat(quad, cache->image, palette, width, height, rotY, mtxTransform, (u8) opacity); } else { - foldImg.raster = cache->image; - foldImg.palette = palette; - foldImg.width = width; - foldImg.height = height; - foldImg.xOffset = -(width / 2); - foldImg.yOffset = height; - foldImg.opacity = opacity; - if (fold_appendGfx_component((u8) (u16) D_802DF540, &foldImg, FOLD_STATE_FLAG_80000, mtxTransform) == 1) { // todo bitfield? - D_802DF540 &= ~(0x80000000 | 0x40000000 | 0x20000000 | 0x10000000); + ifxImg.raster = cache->image; + ifxImg.palette = palette; + ifxImg.width = width; + ifxImg.height = height; + ifxImg.xOffset = -(width / 2); + ifxImg.yOffset = height; + ifxImg.alpha = opacity; + if (imgfx_appendGfx_component((u8) D_802DF540, &ifxImg, IMGFX_FLAG_80000, mtxTransform) == 1) { + D_802DF540 &= ~SPR_IMGFX_FLAG_ALL; } } gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); @@ -452,7 +452,7 @@ void spr_draw_component(s32 drawOpts, SpriteComponent* component, SpriteAnimComp if (drawOpts & DRAW_SPRITE_USE_PLAYER_RASTERS) { cacheEntry->image = spr_get_player_raster(component->currentRaster & 0xFFF, D_802DF57C); } - D_802DF540 = component->unk_4C; + D_802DF540 = component->imgfxIdx; pal = palettes[paletteIdx]; spr_appendGfx_component( @@ -466,7 +466,7 @@ void spr_draw_component(s32 drawOpts, SpriteComponent* component, SpriteAnimComp component->scale.z, drawOpts, pal, mtx ); - component->unk_4C = D_802DF540; + component->imgfxIdx = D_802DF540; } } @@ -774,7 +774,7 @@ void spr_init_sprites(s32 playerSpriteSet) { spr_allocateBtlComponentsOnWorldHeap = FALSE; _heap_create(&heap_spriteHead, 0x40000); - fold_init(); + imgfx_init(); for (i = 0; i < ARRAY_COUNT(spr_playerSprites); i++) { SpriteAnimData** playerSprites = spr_playerSprites; @@ -843,7 +843,7 @@ s32 spr_update_player_sprite(s32 spriteInstanceID, s32 animID, f32 timeScale) { spr_playerCurrentAnimInfo[instanceIdx].componentList = compList; while (*compList != PTR_LIST_END) { component = *compList; - component->unk_4C = func_8013A704(1); + component->imgfxIdx = imgfx_get_free_instances(1); compList++; } } @@ -969,11 +969,11 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 alphaIn, PAL_PTR* return TRUE; } -s32 func_802DDEC4(s32 arg0) { - return spr_playerCurrentAnimInfo[arg0].notifyValue; +s32 func_802DDEC4(s32 spriteIdx) { + return spr_playerCurrentAnimInfo[spriteIdx].notifyValue; } -void func_802DDEE4(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { +void set_player_imgfx_comp(s32 spriteIdx, s32 compIdx, ImgFXType imgfx, s32 imgfxArg1, s32 imgfxArg2, s32 imgfxArg3, s32 imgfxArg4, s32 flags) { SpriteComponent* component; SpriteComponent** componentListIt; s32 i; @@ -985,11 +985,11 @@ void func_802DDEE4(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 arg3, s32 while (*componentListIt != PTR_LIST_END) { component = *componentListIt; if (compIdx == -1 || i == compIdx) { - fold_update(component->unk_4C & 0xFF, foldType, arg3, arg4, arg5, arg6, arg7); - if (foldType != 0) { - component->unk_4C |= 0x10000000; + imgfx_update(component->imgfxIdx & 0xFF, imgfx, imgfxArg1, imgfxArg2, imgfxArg3, imgfxArg4, flags); + if (imgfx != IMGFX_CLEAR) { + component->imgfxIdx |= SPR_IMGFX_FLAG_10000000; } else { - component->unk_4C &= ~0xF0000000; + component->imgfxIdx &= ~SPR_IMGFX_FLAG_ALL; } } componentListIt++; @@ -998,8 +998,9 @@ void func_802DDEE4(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 arg3, s32 } } -void func_802DDFF8(s32 animID, FoldType foldType, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { - func_802DDEE4(PLAYER_SPRITE_MAIN, -1, foldType, arg2, arg3, arg4, arg5, arg6); +// applied to all components +void set_player_imgfx_all(s32 animID, ImgFXType imgfxType, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, imgfxType, arg2, arg3, arg4, arg5, arg6); } void spr_get_player_raster_info(SpriteRasterInfo* out, s32 playerSpriteID, s32 rasterIndex) { @@ -1067,7 +1068,7 @@ s32 spr_load_npc_sprite(s32 animID, u32* extraAnimList) { SpriteInstances[listIndex].componentList = compList; while (*compList != PTR_LIST_END) { SpriteComponent* comp = *compList; - comp->unk_4C = func_8013A704(1); + comp->imgfxIdx = imgfx_get_free_instances(1); compList++; } SpriteInstances[listIndex].spriteIndex = spriteIndex; @@ -1194,7 +1195,7 @@ s32 spr_free_sprite(s32 spriteInstanceID) { compList = sprite->componentList; while (*compList != PTR_LIST_END) { SpriteComponent* comp = *compList; - func_8013A854(comp->unk_4C & 0xFF); + imgfx_release_instance(comp->imgfxIdx & 0xFF); compList++; } @@ -1218,17 +1219,17 @@ s32 spr_free_sprite(s32 spriteInstanceID) { return 0; } -s32 func_802DE748(s32 spriteIdx, s32 compIdx) { +s32 get_npc_comp_imgfx_idx(s32 spriteIdx, s32 compIdx) { SpriteComponent** componentList = SpriteInstances[spriteIdx].componentList; if (componentList == NULL) { return -1; } else { - return componentList[compIdx]->unk_4C & 0xFF; + return componentList[compIdx]->imgfxIdx & 0xFF; } } -void func_802DE780(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 foldArg1, s32 foldArg2, s32 foldArg3, s32 foldArg4, s32 foldArg5) { +void set_npc_imgfx_comp(s32 spriteIdx, s32 compIdx, ImgFXType imgfx, s32 imgfxArg1, s32 imgfxArg2, s32 imgfxArg3, s32 imgfxArg4, s32 imgfxArg5) { SpriteInstance* sprite = &SpriteInstances[spriteIdx]; SpriteComponent** componentList; s32 i; @@ -1241,11 +1242,11 @@ void func_802DE780(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 foldArg1, SpriteComponent* comp = *componentList; if (compIdx == -1 || i == compIdx) { - fold_update((u8)comp->unk_4C, foldType, foldArg1, foldArg2, foldArg3, foldArg4, foldArg5); - if (foldType != FOLD_UPD_CLEAR) { - comp->unk_4C |= 0x10000000; + imgfx_update((u8)comp->imgfxIdx, imgfx, imgfxArg1, imgfxArg2, imgfxArg3, imgfxArg4, imgfxArg5); + if (imgfx != IMGFX_CLEAR) { + comp->imgfxIdx |= SPR_IMGFX_FLAG_10000000; } else { - comp->unk_4C &= ~0xF0000000; + comp->imgfxIdx &= ~SPR_IMGFX_FLAG_ALL; } } componentList++; @@ -1254,11 +1255,11 @@ void func_802DE780(s32 spriteIdx, s32 compIdx, FoldType foldType, s32 foldArg1, } } -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); +void set_npc_imgfx_all(s32 spriteIdx, ImgFXType imgfxType, s32 imgfxArg1, s32 imgfxArg2, s32 imgfxArg3, s32 imgfxArg4, s32 imgfxArg5) { + set_npc_imgfx_comp(spriteIdx, -1, imgfxType, imgfxArg1, imgfxArg2, imgfxArg3, imgfxArg4, imgfxArg5); } -s32 func_802DE8DC(s32 spriteIdx, s32 compListIdx, s32* outX, s32* outY, s32* outZ) { +s32 spr_get_comp_position(s32 spriteIdx, s32 compListIdx, s32* outX, s32* outY, s32* outZ) { SpriteInstance* sprite = &SpriteInstances[spriteIdx]; SpriteAnimComponent** animCompList; SpriteAnimComponent* anim; diff --git a/src/sprite.h b/src/sprite.h index 4ca27c7262..1269071bf9 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -45,7 +45,7 @@ typedef struct SpriteComponent { /* 0x28 */ Vec3f compPos; /* 0x34 */ Vec3i rotation; /* 0x40 */ Vec3f scale; - /* 0x4C */ s32 unk_4C; + /* 0x4C */ s32 imgfxIdx; } SpriteComponent; // size = 0x50 typedef struct PlayerCurrentAnimInfo { @@ -119,7 +119,7 @@ extern Gfx D_802DF490[]; extern f32 spr_animUpdateTimeScale; extern PlayerSpriteSet spr_playerSpriteSets[7]; -void fold_init(void); +void imgfx_init(void); void spr_init_sprites(s32 playerSpriteSet); @@ -133,9 +133,9 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 arg2, PAL_PTR* pal s32 func_802DDEC4(s32 arg0); -void func_802DDEE4(s32, s32, FoldType, s32, s32, s32, s32, s32); +void set_player_imgfx_comp(s32, s32, ImgFXType, s32, s32, s32, s32, s32); -void func_802DDFF8(s32, FoldType, s32, s32, s32, s32, s32); +void set_player_imgfx_all(s32, ImgFXType, s32, s32, s32, s32, s32); IMG_PTR spr_get_player_raster(s32 rasterIndex, s32 playerSpriteID); @@ -154,13 +154,13 @@ s32 spr_get_notify_value(s32 arg0); s32 spr_free_sprite(s32 spriteInstanceID); -s32 func_802DE748(s32, s32); // TODO +s32 get_npc_comp_imgfx_idx(s32, s32); -void func_802DE780(s32, s32, FoldType, s32, s32, s32, s32, s32); +void set_npc_imgfx_comp(s32, s32, ImgFXType, s32, s32, s32, s32, s32); -void func_802DE894(s32 arg0, FoldType arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); +void set_npc_imgfx_all(s32 arg0, ImgFXType arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); -s32 func_802DE8DC(s32 spriteIdx, s32 compListIdx, s32* outX, s32* outY, s32* outZ); +s32 spr_get_comp_position(s32 spriteIdx, s32 compListIdx, s32* outX, s32* outY, s32* outZ); s32 spr_get_npc_raster_info(SpriteRasterInfo* out, s32 npcSpriteID, s32 rasterIndex); diff --git a/src/sprite_shading.c b/src/sprite_shading.c index 9c2da83ad7..c5f0da6471 100644 --- a/src/sprite_shading.c +++ b/src/sprite_shading.c @@ -6,7 +6,7 @@ extern SpriteShadingProfile wSpriteShadingProfile; extern SpriteShadingProfile bSpriteShadingProfile; extern SpriteShadingProfile wSpriteShadingProfileAux; extern SpriteShadingProfile bSpriteShadingProfileAux; -extern s8 D_80159880[0x20]; +extern PAL_BIN SpriteShadingPalette[16]; void appendGfx_shading_palette(Matrix4f mtx, s32 uls, s32 ult, s32 lrs, s32 lrt, s32 alpha, f32 shadowX, f32 shadowY, f32 shadowZ, @@ -384,7 +384,7 @@ void appendGfx_shading_palette( gDPSetPrimColor(gMainGfxPos++, 0, 0, shadowR, shadowG, shadowB, alpha); gDPSetCombineLERP(gMainGfxPos++, TEXEL1, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, COMBINED, TEXEL0, COMBINED_ALPHA, TEXEL0, PRIMITIVE, 0, TEXEL0, 0); - gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_80159880); + gDPSetColorImage(gMainGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, SpriteShadingPalette); gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 0, 0, 16, 1); gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, 4, 18, @@ -409,7 +409,7 @@ void appendGfx_shading_palette( camera->viewportStartY + camera->viewportH ); - gDPLoadTLUT_pal16(gMainGfxPos++, 1, D_80159880); + gDPLoadTLUT_pal16(gMainGfxPos++, 1, SpriteShadingPalette); gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, 4, 18, G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | @@ -442,8 +442,12 @@ void func_801491E4(Matrix4f mtx, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 alp gDPSetPrimColor(gMainGfxPos++, 0, 0, 0, 0, 0, alpha); if (alpha == 255) { - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, + 0, 0, 0, TEXEL1, 0, 0, 0, TEXEL1, + 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); } else { - gDPSetCombineLERP(gMainGfxPos++, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gMainGfxPos++, + 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, + 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); } } diff --git a/src/state_file_select.c b/src/state_file_select.c index 1e218fd1af..da3e916f53 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -59,14 +59,14 @@ void state_init_file_select(void) { hud_element_clear_cache(); load_model_textures(0, 0, 0); gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6; - gCameras[CAM_DEFAULT].unk_06 = 1; + gCameras[CAM_DEFAULT].needsInit = TRUE; gCameras[CAM_DEFAULT].nearClip = 16; gCameras[CAM_DEFAULT].farClip = 4096; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; gCurrentCameraID = CAM_DEFAULT; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_3].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_3].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_DEFAULT].vfov = 25.0f; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; diff --git a/src/state_logos.c b/src/state_logos.c index 1ace20ba8a..92188e0a4c 100644 --- a/src/state_logos.c +++ b/src/state_logos.c @@ -69,15 +69,15 @@ void state_init_logos(void) { nuContRmbForceStop(); create_cameras_a(); gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6; - gCameras[CAM_DEFAULT].unk_06 = TRUE; + gCameras[CAM_DEFAULT].needsInit = TRUE; gCameras[CAM_DEFAULT].nearClip = 16; gCameras[CAM_DEFAULT].farClip = 4096; gCurrentCameraID = CAM_DEFAULT; gCameras[CAM_DEFAULT].vfov = 25.0f; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_3].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_3].flags |= CAMERA_FLAG_DISABLED; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 2b2b71094b..a5f93fa4ba 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -117,15 +117,15 @@ void state_init_title_screen(void) { create_cameras_a(); gCameras[CAM_DEFAULT].updateMode = CAM_UPDATE_MODE_6; - gCameras[CAM_DEFAULT].unk_06 = TRUE; + gCameras[CAM_DEFAULT].needsInit = TRUE; gCameras[CAM_DEFAULT].nearClip = CAM_NEAR_CLIP; gCameras[CAM_DEFAULT].farClip = CAM_FAR_CLIP; gCurrentCameraID = CAM_DEFAULT; gCameras[CAM_DEFAULT].vfov = 25.0f; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_3].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_3].flags |= CAMERA_FLAG_DISABLED; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; @@ -370,8 +370,8 @@ void appendGfx_title_screen(void) { gDPSetTextureConvert(gMainGfxPos++, G_TC_FILT); gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); - render_frame(0); - render_frame(1); + render_frame(FALSE); + render_frame(TRUE); } void draw_title_screen_NOP(void) { diff --git a/src/state_world.c b/src/state_world.c index fcc14b4f23..3838794adc 100644 --- a/src/state_world.c +++ b/src/state_world.c @@ -20,7 +20,7 @@ void state_step_world(void) { void state_drawUI_world(void) { draw_status_ui(); draw_encounter_ui(); - func_8013A6E8(); + imgfx_update_cache(); } void state_world_draw_aux_ui(void) { diff --git a/src/world/area_arn/arn_03/arn_03_3_npc.c b/src/world/area_arn/arn_03/arn_03_3_npc.c index 8ec8a63e22..61903d300a 100644 --- a/src/world/area_arn/arn_03/arn_03_3_npc.c +++ b/src/world/area_arn/arn_03/arn_03_3_npc.c @@ -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(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_05, IMGFX_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(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_05, IMGFX_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(SetNpcFoldParams, NPC_Boo_05, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_05, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c b/src/world/area_arn/arn_05/arn_05_3_npc.c index ef28025a6e..0806ed7ecf 100644 --- a/src/world/area_arn/arn_05/arn_05_3_npc.c +++ b/src/world/area_arn/arn_05/arn_05_3_npc.c @@ -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(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_CALL(SetNpcImgFXParams, NPC_Boo_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_02, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_05, IMGFX_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(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(SetNpcImgFXParams, NPC_Boo_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_02, IMGFX_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(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(SetNpcImgFXParams, NPC_Boo_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_02, IMGFX_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(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_CALL(SetNpcImgFXParams, NPC_Boo_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_02, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_05, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP - 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_CALL(SetNpcImgFXParams, NPC_Boo_01, IMGFX_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_02, IMGFX_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo_05, IMGFX_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)) diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c index cf3b8d4799..dc30124f1a 100644 --- a/src/world/area_arn/arn_07/arn_07_5_npc.c +++ b/src/world/area_arn/arn_07/arn_07_5_npc.c @@ -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(SetNpcFoldParams, NPC_Bow, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bow, IMGFX_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(SetNpcFoldParams, NPC_Bow, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bow, IMGFX_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(SetNpcFoldParams, NPC_Bow, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bow, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP diff --git a/src/world/area_dgb/dgb_05/dgb_05_3_hole.c b/src/world/area_dgb/dgb_05/dgb_05_3_hole.c index edfeb12d0b..7345cd2929 100644 --- a/src/world/area_dgb/dgb_05/dgb_05_3_hole.c +++ b/src/world/area_dgb/dgb_05/dgb_05_3_hole.c @@ -16,7 +16,7 @@ API_CALLABLE(N(AwaitFallDownHole)) { EvtScript N(EVS_SetupHole) = { EVT_CALL(N(AwaitFallInHole)) - EVT_CALL(func_802CA988, 0, LVar2, LVar3, LVar4, LVar5) + EVT_CALL(func_802CA988, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) EVT_CALL(N(AwaitFallDownHole)) EVT_SET(GF_DGB05_BoardedFloor, TRUE) EVT_CALL(GotoMap, EVT_PTR("dgb_06"), dgb_06_ENTRY_1) diff --git a/src/world/area_dgb/dgb_10/dgb_10_3_hole.c b/src/world/area_dgb/dgb_10/dgb_10_3_hole.c index 0c97b4734a..4f1d04ae07 100644 --- a/src/world/area_dgb/dgb_10/dgb_10_3_hole.c +++ b/src/world/area_dgb/dgb_10/dgb_10_3_hole.c @@ -32,7 +32,7 @@ API_CALLABLE(N(AwaitFallDownHole)) { EvtScript N(EVS_SetupHoles) = { EVT_CALL(N(AwaitFallInHole)) - EVT_CALL(func_802CA988, 0, LVar2, LVar3, LVar4, LVar5) + EVT_CALL(func_802CA988, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) EVT_CALL(N(AwaitFallDownHole)) #if VERSION_PAL EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index 895cd8b03f..1c15ab50e8 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -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(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -187, 0, -240) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -168, -195, 0) diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index d80f85220f..fdea29ee93 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -168,22 +168,22 @@ API_CALLABLE(N(UndarkenWorld)) { } API_CALLABLE(N(CreateRitualCards)) { - s32 ret; + s32 imgfxIdx; N(CreatorScript) = script; - ret = func_8013A704(1); - 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_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_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_UPD_SET_ANIM, FOLD_ANIM_FLIP_CARD_3, 1, 1, 0, FOLD_STATE_FLAG_800); - evt_set_variable(script, RITUAL_VAR_FOLDER_4, ret); + imgfxIdx = imgfx_get_free_instances(1); + imgfx_update(imgfxIdx, IMGFX_SET_ANIM, IMGFX_ANIM_SHUFFLE_CARDS, 1, 1, 0, IMGFX_FLAG_800); + evt_set_variable(script, RITUAL_VAR_FOLDER_1, imgfxIdx); + imgfxIdx = imgfx_get_free_instances(1); + imgfx_update(imgfxIdx, IMGFX_SET_ANIM, IMGFX_ANIM_FLIP_CARD_1, 1, 1, 0, IMGFX_FLAG_800); + evt_set_variable(script, RITUAL_VAR_FOLDER_2, imgfxIdx); + imgfxIdx = imgfx_get_free_instances(1); + imgfx_update(imgfxIdx, IMGFX_SET_ANIM, IMGFX_ANIM_FLIP_CARD_2, 1, 1, 0, IMGFX_FLAG_800); + evt_set_variable(script, RITUAL_VAR_FOLDER_3, imgfxIdx); + imgfxIdx = imgfx_get_free_instances(1); + imgfx_update(imgfxIdx, IMGFX_SET_ANIM, IMGFX_ANIM_FLIP_CARD_3, 1, 1, 0, IMGFX_FLAG_800); + evt_set_variable(script, RITUAL_VAR_FOLDER_4, imgfxIdx); evt_set_variable(script, RITUAL_VAR_WORKER, create_worker_world( N(card_worker_update), @@ -192,10 +192,10 @@ API_CALLABLE(N(CreateRitualCards)) { } API_CALLABLE(N(DestroyRitualCards)) { - func_8013A854(evt_get_variable(script, RITUAL_VAR_FOLDER_1)); - func_8013A854(evt_get_variable(script, RITUAL_VAR_FOLDER_2)); - func_8013A854(evt_get_variable(script, RITUAL_VAR_FOLDER_3)); - func_8013A854(evt_get_variable(script, RITUAL_VAR_FOLDER_4)); + imgfx_release_instance(evt_get_variable(script, RITUAL_VAR_FOLDER_1)); + imgfx_release_instance(evt_get_variable(script, RITUAL_VAR_FOLDER_2)); + imgfx_release_instance(evt_get_variable(script, RITUAL_VAR_FOLDER_3)); + imgfx_release_instance(evt_get_variable(script, RITUAL_VAR_FOLDER_4)); free_worker(evt_get_variable(script, RITUAL_VAR_WORKER)); return ApiStatus_DONE2; } @@ -203,7 +203,7 @@ API_CALLABLE(N(DestroyRitualCards)) { u32 N(appendGfx_ritual_card)(RitualCard* card, Matrix4f mtxParent) { Matrix4f mtxTransform; Matrix4f mtxTemp; - FoldImageRecPart foldImage; + ImgFXTexture ifxImg; SpriteRasterInfo rasterInfo; s32 ret; @@ -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_SKIP_GFX_SETUP | FOLD_STATE_FLAG_SKIP_TEX_SETUP, mtxTransform); + ret = imgfx_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_1), &ifxImg, IMGFX_FLAG_SKIP_GFX_SETUP | IMGFX_FLAG_SKIP_TEX_SETUP, mtxTransform); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); return ret; } @@ -261,22 +261,22 @@ 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_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); + imgfx_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_2), &ifxImg, IMGFX_FLAG_SKIP_GFX_SETUP | IMGFX_FLAG_SKIP_TEX_SETUP, mtxTransform); + imgfx_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_3), &ifxImg, IMGFX_FLAG_SKIP_GFX_SETUP | IMGFX_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); guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); spr_get_player_raster_info(&rasterInfo, card->spriteID, card->rasterIndex); - foldImage.raster = rasterInfo.raster; - foldImage.palette = rasterInfo.defaultPal; - foldImage.width = rasterInfo.width; - foldImage.height = rasterInfo.height; - 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_SKIP_GFX_SETUP, mtxTransform); + ifxImg.raster = rasterInfo.raster; + ifxImg.palette = rasterInfo.defaultPal; + ifxImg.width = rasterInfo.width; + ifxImg.height = rasterInfo.height; + ifxImg.xOffset = -(rasterInfo.width / 2); + ifxImg.yOffset = rasterInfo.height / 2; + ifxImg.alpha = 255; + ret = imgfx_appendGfx_component(evt_get_variable(N(CreatorScript), RITUAL_VAR_FOLDER_4), &ifxImg, IMGFX_FLAG_SKIP_GFX_SETUP, mtxTransform); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); return ret; } diff --git a/src/world/area_end/common/Credits.inc.c b/src/world/area_end/common/Credits.inc.c index c863e307f7..76400cbedd 100644 --- a/src/world/area_end/common/Credits.inc.c +++ b/src/world/area_end/common/Credits.inc.c @@ -107,7 +107,7 @@ s32 N(CreditsBufferIndex) = 0; // unused void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx; @@ -119,7 +119,7 @@ void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { if (alpha > 255.0f) { alpha = 255.0; } - fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0); + imgfx_update(0, IMGFX_SET_ALPHA, 255, 255, 255, alpha, 0); msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); posX += (glyphPtr->charWidth * 0.5); @@ -128,21 +128,21 @@ void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx; @@ -155,15 +155,15 @@ void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { alpha = 255.0; } if (chr->fadeInTime == (line->appearTime - 4)) { - fold_update(0, FOLD_TYPE_A, 64, 64, 64, alpha, 0); + imgfx_update(0, IMGFX_SET_CREDITS_FADE, 64, 64, 64, alpha, 0); } else if (chr->fadeInTime == (line->appearTime - 3)) { - fold_update(0, FOLD_TYPE_A, 96, 96, 96, alpha, 0); + imgfx_update(0, IMGFX_SET_CREDITS_FADE, 96, 96, 96, alpha, 0); } else if (chr->fadeInTime == (line->appearTime - 2)) { - fold_update(0, FOLD_TYPE_A, 127, 127, 127, alpha, 0); + imgfx_update(0, IMGFX_SET_CREDITS_FADE, 127, 127, 127, alpha, 0); } else if (chr->fadeInTime == (line->appearTime - 1)) { - fold_update(0, FOLD_TYPE_A, 80, 80, 80, alpha, 0); + imgfx_update(0, IMGFX_SET_CREDITS_FADE, 80, 80, 80, alpha, 0); } else { - fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0); + imgfx_update(0, IMGFX_SET_ALPHA, 255, 255, 255, alpha, 0); } msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); @@ -173,19 +173,19 @@ void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx, tempMtx; @@ -198,7 +198,7 @@ void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { if (alpha > 255.0f) { alpha = 255.0f; } - fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0); + imgfx_update(0, IMGFX_SET_ALPHA, 255, 255, 255, alpha, 0); scaleAmt = update_lerp(EASING_LINEAR, 0.2f, 2.0f, chr->fadeInTime, line->appearTime); if (scaleAmt > 1.0) { @@ -216,20 +216,20 @@ void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx, tempMtx; @@ -241,7 +241,7 @@ void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { if (alpha > 255.0f) { alpha = 255.0f; } - fold_update(0, FOLD_UPD_SET_ALPHA, 255, 255, 255, alpha, 0); + imgfx_update(0, IMGFX_SET_ALPHA, 255, 255, 255, alpha, 0); rotAngle = update_lerp(EASING_LINEAR, -75.0f, 30.0f, chr->fadeInTime, line->appearTime); if (rotAngle >= 0.0f) { @@ -260,27 +260,27 @@ void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx, tempMtx; f32 posX, posY, scaleAmt, rotAngle; f32 startX = (line->posX + line->msgWidth) - 16; f32 startY = line->posY + 60; - u32 foldFlags = FOLD_STATE_FLAG_40; + u32 imgfxFlags = IMGFX_FLAG_40; posX = update_lerp(EASING_COS_IN_OUT, startX, chr->posX, chr->fadeInTime, line->appearTime); posY = update_lerp(EASING_CUBIC_OUT, startY, chr->posY, chr->fadeInTime, line->appearTime); @@ -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_UPD_CLEAR, 0, 0, 0, 0, 0); - foldFlags |= FOLD_STATE_FLAG_NO_FILTERING; + imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, 0); + imgfxFlags |= IMGFX_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_UPD_SET_ALPHA, 255, 255, 255, alpha, 0); + imgfx_update(0, IMGFX_SET_ALPHA, 255, 255, 255, alpha, 0); } msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); @@ -313,14 +313,14 @@ void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, foldFlags, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, imgfxFlags, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -341,29 +341,29 @@ void N(CharAnim_FadeIn_5)(CreditsLine* line, CreditsChar* chr) { } // unused -void N(CharAnim_HoldClearFold)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; +void N(CharAnim_HoldClearImgFX)(CreditsLine* line, CreditsChar* chr) { + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx; f32 posX = chr->posX; f32 posY = chr->posY; - fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + imgfx_update(0, IMGFX_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++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40000 | IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -382,7 +382,7 @@ void N(CharAnim_Hold)(CreditsLine* line, CreditsChar* chr) { // unused void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx; @@ -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_UPD_SET_ALPHA, 255, 255, 255, alpha, 0); + imgfx_update(0, IMGFX_SET_ALPHA, 255, 255, 255, alpha, 0); msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); @@ -401,20 +401,20 @@ void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) { gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx, tempMtx; @@ -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_UPD_SET_ALPHA, 255, 255, 255, alpha, 0); + imgfx_update(0, IMGFX_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); @@ -436,20 +436,20 @@ void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) { gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_40, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; MesasgeFontGlyphData glyph; MesasgeFontGlyphData* glyphPtr = &glyph; Matrix4f transformMtx, tempMtx; @@ -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_UPD_SET_ALPHA, 255, 255, 255, alpha, 0); + imgfx_update(0, IMGFX_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); @@ -471,14 +471,14 @@ void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { gSPMatrix(gMainGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); + ifxImg.raster = glyphPtr->raster; + ifxImg.palette = glyphPtr->palette; + ifxImg.width = glyphPtr->texSize.x; + ifxImg.height = glyphPtr->texSize.y; + ifxImg.xOffset = -(glyphPtr->charWidth * 0.5); + ifxImg.yOffset = 0; + ifxImg.alpha = 255; + imgfx_appendGfx_component(0, &ifxImg, IMGFX_FLAG_NO_FILTERING | IMGFX_FLAG_40, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/world/area_end/end_00/end_00_1_main.c b/src/world/area_end/end_00/end_00_1_main.c index b219bd6d62..250164b480 100644 --- a/src/world/area_end/end_00/end_00_1_main.c +++ b/src/world/area_end/end_00/end_00_1_main.c @@ -1,7 +1,7 @@ #include "end_00.h" EvtScript N(EVS_Main) = { - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 35, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 35, 16, 4096) EVT_CALL(SetCamViewport, CAM_DEFAULT, 15, 28, 290, 128) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_end/end_00/end_00_7_boos.c b/src/world/area_end/end_00/end_00_7_boos.c index 220f866b7b..2296bd35e4 100644 --- a/src/world/area_end/end_00/end_00_7_boos.c +++ b/src/world/area_end/end_00/end_00_7_boos.c @@ -77,9 +77,9 @@ EvtScript N(EVS_ParadePhase_Boos) = { EVT_END_LOOP EVT_WAIT(10 * DT) EVT_CALL(N(SetUnusedAlpha), 255) - 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(SetNpcImgFXParams, NPC_Boo1, IMGFX_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo2, IMGFX_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo3, IMGFX_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(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_CALL(SetNpcImgFXParams, NPC_Boo1, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo2, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Boo3, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(EnableNpcShadow, NPC_Boo1, TRUE) diff --git a/src/world/area_end/end_01/end_01_1_main.c b/src/world/area_end/end_01/end_01_1_main.c index 5f50b21148..6225644257 100644 --- a/src/world/area_end/end_01/end_01_1_main.c +++ b/src/world/area_end/end_01/end_01_1_main.c @@ -6,7 +6,7 @@ API_CALLABLE(N(WidenCameraFOV)) { } EvtScript N(EVS_Main) = { - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamViewport, CAM_DEFAULT, 15, 28, 290, 128) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c index 7708173ea5..0b4ee16188 100644 --- a/src/world/area_flo/flo_21/flo_21_4_npc.c +++ b/src/world/area_flo/flo_21/flo_21_4_npc.c @@ -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(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_CALL(SetNpcImgFXParams, NPC_HuffNPuff_01, IMGFX_SET_WHITE_FADE, LVar0, LVar0, LVar0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_HuffNPuff_02, IMGFX_SET_WHITE_FADE, LVar0, LVar0, LVar0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_HuffNPuff_03, IMGFX_SET_WHITE_FADE, LVar0, LVar0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP diff --git a/src/world/area_hos/hos_01/hos_01_4_npc.c b/src/world/area_hos/hos_01/hos_01_4_npc.c index bc083c38bd..1bc8ac81ca 100644 --- a/src/world/area_hos/hos_01/hos_01_4_npc.c +++ b/src/world/area_hos/hos_01/hos_01_4_npc.c @@ -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(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_CALL(SetNpcImgFXParams, NPC_Eldstar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Eldstar, 1, LVar2) + EVT_CALL(SetNpcImgFXParams, NPC_Mamar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Mamar, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Skolar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Skolar, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Muskular, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Muskular, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Misstar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Misstar, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Klevar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Klevar, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Kalmar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, 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(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_CALL(SetNpcImgFXParams, NPC_Eldstar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Eldstar, 1, LVar2) + EVT_CALL(SetNpcImgFXParams, NPC_Mamar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Mamar, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Skolar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Skolar, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Muskular, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Muskular, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Misstar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Misstar, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Klevar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Klevar, 1, LVar3) + EVT_CALL(SetNpcImgFXParams, NPC_Kalmar, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, AB_HOS_StatcAmt_Kalmar, 1, LVar3) EVT_WAIT(1) EVT_END_LOOP EVT_END_LOOP diff --git a/src/world/area_hos/hos_03/hos_03_6_npc.c b/src/world/area_hos/hos_03/hos_03_6_npc.c index 6cc4f13c10..515b466eda 100644 --- a/src/world/area_hos/hos_03/hos_03_6_npc.c +++ b/src/world/area_hos/hos_03/hos_03_6_npc.c @@ -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(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, 445, 25, 185) EVT_CALL(PlayerMoveTo, 440, 215, 20) EVT_RETURN diff --git a/src/world/area_hos/hos_04/hos_04_7_starship.c b/src/world/area_hos/hos_04/hos_04_7_starship.c index ae123846f0..ad60ab2f5a 100644 --- a/src/world/area_hos/hos_04/hos_04_7_starship.c +++ b/src/world/area_hos/hos_04/hos_04_7_starship.c @@ -26,7 +26,7 @@ EvtScript N(EVS_Starship_FlyingAway) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 45, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 45, 16, 4096) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -280, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, -280, 0, 0) EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE) diff --git a/src/world/area_hos/hos_05/hos_05_4_npc.c b/src/world/area_hos/hos_05/hos_05_4_npc.c index b6ef55bd7d..3762a3c42b 100644 --- a/src/world/area_hos/hos_05/hos_05_4_npc.c +++ b/src/world/area_hos/hos_05/hos_05_4_npc.c @@ -278,7 +278,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Back) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o616, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetZoneEnabled, ZONE_o622, FALSE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index 5bbf32c091..84e838b6e9 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -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(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Klevar, IMGFX_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(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Skolar, IMGFX_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(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Muskular, IMGFX_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(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kalmar, IMGFX_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(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Misstar, IMGFX_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(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Mamar, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(9)) EVT_END_THREAD @@ -1743,7 +1743,7 @@ API_CALLABLE(N(AnimateStorybookPages)) { N(StoryGraphicsPtr)->frontImgPosX = 0; N(StoryGraphicsPtr)->frontImgPosY = 0; } - gCameras[CAM_DEFAULT].flags &= ~CAMERA_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags &= ~CAMERA_FLAG_DISABLED; N(StoryPageState)++; } } @@ -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(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(SetNpcImgFXParams, NPC_Bowser_Body, IMGFX_SET_TINT, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bowser_Prop, IMGFX_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(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_CALL(SetNpcImgFXParams, NPC_Bowser_Body, IMGFX_SET_TINT, 0, 0, 0, LVar0) + EVT_CALL(SetNpcImgFXParams, NPC_Bowser_Prop, IMGFX_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(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_CALL(SetNpcImgFXParams, NPC_Bowser_Body, IMGFX_SET_TINT, 0, 0, 0, 255) + EVT_CALL(SetNpcImgFXParams, NPC_Bowser_Prop, IMGFX_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(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_CALL(SetNpcImgFXParams, NPC_Bowser_Body, IMGFX_SET_TINT, LVar0, LVar0, LVar0, 255) + EVT_CALL(SetNpcImgFXParams, NPC_Bowser_Prop, IMGFX_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(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_SET_ANIM, FOLD_ANIM_SPIRIT_CAPTURE, 1, 1, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Eldstar, IMGFX_SET_ANIM, IMGFX_ANIM_SPIRIT_CAPTURE, 1, 1, 0) EVT_END_THREAD EVT_SET(LVar0, 255) EVT_LOOP(20) - 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_CALL(SetNpcImgFXParams, NPC_Mamar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Skolar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Muskular, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Misstar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Klevar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kalmar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(15 * DT) - EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_SET_ALPHA, 255, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Eldstar, IMGFX_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(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Eldstar, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_INVISIBLE, TRUE) EVT_CALL(func_802D7B10, ArrayVar(8)) EVT_END_THREAD diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index a7c0a38e12..7d3d8df3b6 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -4,7 +4,7 @@ #include "world/common/enemy/StoneChomp.inc.c" typedef struct StoneChompAmbushIsk05 { - /* 0x00 */ s32 foldID; + /* 0x00 */ s32 imgfxIdx; /* 0x04 */ s32 workerID; /* 0x08 */ s32 spriteIndex; /* 0x0C */ s32 rasterIndex; @@ -22,7 +22,7 @@ StoneChompAmbushIsk05 N(ChompAmbush) = {}; void N(func_80241610_97F0E0)(void) { StoneChompAmbushIsk05* ambush = &N(ChompAmbush); Camera* cam = &gCameras[gCurrentCameraID]; - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; SpriteRasterInfo spriteRaster; Matrix4f transformMtx, tempMtx; @@ -63,16 +63,16 @@ void N(func_80241610_97F0E0)(void) { G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); spr_get_npc_raster_info(&spriteRaster, ambush->spriteIndex, ambush->rasterIndex); - foldImg.raster = spriteRaster.raster; - foldImg.palette = spriteRaster.defaultPal; - ambush->width = foldImg.width = spriteRaster.width; - ambush->height = foldImg.height = spriteRaster.height; - foldImg.xOffset = -(spriteRaster.width / 2); - foldImg.yOffset = (spriteRaster.height / 2); - foldImg.opacity = 255; + ifxImg.raster = spriteRaster.raster; + ifxImg.palette = spriteRaster.defaultPal; + ambush->width = ifxImg.width = spriteRaster.width; + ambush->height = ifxImg.height = spriteRaster.height; + ifxImg.xOffset = -(spriteRaster.width / 2); + ifxImg.yOffset = (spriteRaster.height / 2); + ifxImg.alpha = 255; - fold_update(ambush->foldID, FOLD_UPD_SET_ALPHA, 255, 255, 255, ambush->alpha, 0); - fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx); + imgfx_update(ambush->imgfxIdx, IMGFX_SET_ALPHA, 255, 255, 255, ambush->alpha, 0); + imgfx_appendGfx_component(ambush->imgfxIdx, &ifxImg, 0, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -99,7 +99,7 @@ API_CALLABLE(N(func_80241B28_97F5F8)) { ambush->renderYaw = 85.0f; ambush->alpha = 0.0f; - ambush->foldID = 0; + ambush->imgfxIdx = 0; ambush->workerID = create_worker_frontUI(NULL, N(func_80241610_97F0E0)); return ApiStatus_DONE2; } @@ -218,7 +218,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_WAIT(1) EVT_CALL(N(DestroyAmbushWorker)) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_StoneChomp))) EVT_RETURN diff --git a/src/world/area_isk/isk_07/isk_07_7_ambush.c b/src/world/area_isk/isk_07/isk_07_7_ambush.c index 1d4e02b3d6..eba9e714f3 100644 --- a/src/world/area_isk/isk_07/isk_07_7_ambush.c +++ b/src/world/area_isk/isk_07/isk_07_7_ambush.c @@ -28,10 +28,10 @@ EvtScript N(EVS_SetupSarcophagi) = { EVT_WAIT(12) EVT_CALL(InterpPlayerYaw, 109, 0) EVT_WAIT(3) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHOCK, 1, 1, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_SHOCK, 1, 1, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) EVT_WAIT(20) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/isk_13_3_npc.c index 4d839b6136..700904867d 100644 --- a/src/world/area_isk/isk_13/isk_13_3_npc.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -5,7 +5,7 @@ typedef struct StoneChompAmbushIsk13 { /* 0x00 */ s32 useBitingAnim; - /* 0x04 */ s32 foldID; + /* 0x04 */ s32 imgfxIdx; /* 0x08 */ s32 workerID; /* 0x0C */ s32 spriteIndex; /* 0x10 */ s32 rasterIndex; @@ -21,7 +21,7 @@ typedef struct StoneChompAmbushIsk13 { void N(func_80241610_990DF0)(void) { StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(NULL, MV_AmbushPtr); Camera* cam = &gCameras[gCurrentCameraID]; - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; SpriteRasterInfo spriteRaster; Matrix4f transformMtx, tempMtx; @@ -69,16 +69,16 @@ void N(func_80241610_990DF0)(void) { } } spr_get_npc_raster_info(&spriteRaster, ambush->spriteIndex, ambush->rasterIndex); - foldImg.raster = spriteRaster.raster; - foldImg.palette = spriteRaster.defaultPal; - ambush->width = foldImg.width = spriteRaster.width; - ambush->height = foldImg.height = spriteRaster.height; - foldImg.xOffset = -(spriteRaster.width / 2); - foldImg.yOffset = (spriteRaster.height / 2); - foldImg.opacity = 255; + ifxImg.raster = spriteRaster.raster; + ifxImg.palette = spriteRaster.defaultPal; + ambush->width = ifxImg.width = spriteRaster.width; + ambush->height = ifxImg.height = spriteRaster.height; + ifxImg.xOffset = -(spriteRaster.width / 2); + ifxImg.yOffset = (spriteRaster.height / 2); + ifxImg.alpha = 255; - 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); + imgfx_update(ambush->imgfxIdx, IMGFX_SET_TINT, ambush->color.r, ambush->color.g, ambush->color.b, ambush->color.a, 0); + imgfx_appendGfx_component(ambush->imgfxIdx, &ifxImg, 0, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -109,7 +109,7 @@ API_CALLABLE(N(func_80241BA8_991388)) { ambush->color.g = 128.0f; ambush->color.b = 255.0f; ambush->color.a = 0.0f; - ambush->foldID = 0; + ambush->imgfxIdx = 0; ambush->workerID = create_worker_frontUI(NULL, N(func_80241610_990DF0)); evt_set_variable(script, MV_AmbushPtr, (s32) ambush); @@ -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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(N(DestroyAmbushWorker)) EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/isk_14_3_npc.c index 4ff66c0b2e..d43d3114b9 100644 --- a/src/world/area_isk/isk_14/isk_14_3_npc.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -4,7 +4,7 @@ #include "world/common/enemy/StoneChomp.inc.c" typedef struct StoneChompAmbushIsk14 { - /* 0x00 */ s32 foldID; + /* 0x00 */ s32 imgfxIdx; /* 0x04 */ s32 workerID; /* 0x08 */ s32 spriteIndex; /* 0x0C */ s32 rasterIndex; @@ -21,7 +21,7 @@ static StoneChompAmbushIsk14 N(ChompAmbush); void N(func_80241610_993D40)(void) { StoneChompAmbushIsk14* ambush = &N(ChompAmbush); Camera* cam = &gCameras[gCurrentCameraID]; - FoldImageRecPart foldImg; + ImgFXTexture ifxImg; SpriteRasterInfo spriteRaster; Matrix4f transformMtx, tempMtx; @@ -62,15 +62,15 @@ void N(func_80241610_993D40)(void) { G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); spr_get_npc_raster_info(&spriteRaster, ambush->spriteIndex, ambush->rasterIndex); - foldImg.raster = spriteRaster.raster; - foldImg.palette = spriteRaster.defaultPal; - ambush->width = foldImg.width = spriteRaster.width; - ambush->height = foldImg.height = spriteRaster.height; - foldImg.xOffset = -(spriteRaster.width / 2); - foldImg.yOffset = spriteRaster.height; - foldImg.opacity = 255; + ifxImg.raster = spriteRaster.raster; + ifxImg.palette = spriteRaster.defaultPal; + ambush->width = ifxImg.width = spriteRaster.width; + ambush->height = ifxImg.height = spriteRaster.height; + ifxImg.xOffset = -(spriteRaster.width / 2); + ifxImg.yOffset = spriteRaster.height; + ifxImg.alpha = 255; - fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx); + imgfx_appendGfx_component(ambush->imgfxIdx, &ifxImg, 0, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -96,7 +96,7 @@ API_CALLABLE(N(func_80241AF0_994220)) { ambush->scale.z = SPRITE_WORLD_SCALE_F; ambush->renderYaw = 270.0f; - ambush->foldID = 0; + ambush->imgfxIdx = 0; ambush->workerID = create_worker_frontUI(NULL, N(func_80241610_993D40)); return ApiStatus_DONE2; } @@ -165,7 +165,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_WAIT(1) EVT_CALL(N(DestroyAmbushWorker)) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_4 | ENEMY_FLAG_100000, 0) EVT_WAIT(3) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) diff --git a/src/world/area_isk/isk_16/isk_16_3_boss.c b/src/world/area_isk/isk_16/isk_16_3_boss.c index c46e2d158c..948a4388b7 100644 --- a/src/world/area_isk/isk_16/isk_16_3_boss.c +++ b/src/world/area_isk/isk_16/isk_16_3_boss.c @@ -48,18 +48,18 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD - EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_02, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_02, IMGFX_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(SetNpcFoldParams, NPC_Tutankoopa_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_02, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) EVT_GOTO(2) EVT_END_IF - EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_02, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_02, IMGFX_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(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_CALL(SetNpcImgFXParams, NPC_Tutankoopa_01, IMGFX_SET_ALPHA, 255, 0, 0, 0) + EVT_CALL(SetNpcImgFXFlags, NPC_Tutankoopa_01, IMGFX_FLAG_800) + EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_01, IMGFX_SET_ANIM, IMGFX_ANIM_TUTANKOOPA_SWIRL_1, 2, 1, 0) EVT_WAIT(39) - 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_CALL(SetNpcImgFXFlags, NPC_Tutankoopa_01, IMGFX_FLAG_800) + EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_01, IMGFX_SET_ANIM, IMGFX_ANIM_TUTANKOOPA_SWIRL_2, 2, 1, 0) EVT_WAIT(39) - 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_CALL(SetNpcImgFXFlags, NPC_Tutankoopa_01, IMGFX_FLAG_800) + EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_01, IMGFX_SET_ANIM, IMGFX_ANIM_TUTANKOOPA_GATHER, 2, 1, 0) EVT_WAIT(55) - EVT_CALL(SetNpcFoldParams, NPC_Tutankoopa_01, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_01, IMGFX_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) diff --git a/src/world/area_iwa/iwa_11/iwa_11_2_main.c b/src/world/area_iwa/iwa_11/iwa_11_2_main.c index cd3853b43d..51c387e212 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_2_main.c +++ b/src/world/area_iwa/iwa_11/iwa_11_2_main.c @@ -28,7 +28,7 @@ EvtScript N(EVS_MonitorSceneSkip) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_MT_RUGGED) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 30, 16, 4096) // uses fov 25 instead of 30 + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 30, 16, 4096) // uses fov 25 instead of 30 EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_jan/jan_00/jan_00_1_main.c b/src/world/area_jan/jan_00/jan_00_1_main.c index fc18304bed..24a10e810e 100644 --- a/src/world/area_jan/jan_00/jan_00_1_main.c +++ b/src/world/area_jan/jan_00/jan_00_1_main.c @@ -30,7 +30,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/jan_03_4_npc.c index ca6f3a31a5..a86e254af4 100644 --- a/src/world/area_jan/jan_03/jan_03_4_npc.c +++ b/src/world/area_jan/jan_03/jan_03_4_npc.c @@ -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(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, 345, 0, -186) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 291, -100, 0) diff --git a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c index 8cda0f108c..e01be0d028 100644 --- a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c +++ b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c @@ -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(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, 85, 0, -85) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 60, -50, 0) diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c index 814500e0d5..e4ccba6854 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c +++ b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c @@ -61,8 +61,8 @@ EvtScript N(EVS_NpcIdle_Kammy_Broom) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_2000) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_TINT, 0, 0, 0, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_2000) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_TINT, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_WAIT(1) diff --git a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c index e4da8e5fb4..160f83e936 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c +++ b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c @@ -109,7 +109,7 @@ EvtScript N(EVS_NpcInit_Twink) = { }; EvtScript N(EVS_NpcInit_Eldstar) = { - EVT_CALL(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Eldstar, IMGFX_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(SetNpcFoldParams, NPC_Mamar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Mamar, IMGFX_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(SetNpcFoldParams, NPC_Skolar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Skolar, IMGFX_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(SetNpcFoldParams, NPC_Muskular, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Muskular, IMGFX_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(SetNpcFoldParams, NPC_Misstar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Misstar, IMGFX_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(SetNpcFoldParams, NPC_Klevar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Klevar, IMGFX_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(SetNpcFoldParams, NPC_Kalmar, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kalmar, IMGFX_SET_ALPHA, 0, 0, 0, 0) EVT_CALL(EnableNpcShadow, NPC_Kalmar, FALSE) EVT_CALL(SetNpcPos, NPC_Kalmar, 156, 45, -27) EVT_RETURN diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c index b3b93cae21..55014cb547 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c @@ -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(SetNpcFoldParams, NPC_Eldstar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Eldstar, IMGFX_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(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_CALL(SetNpcImgFXParams, NPC_Mamar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Skolar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Muskular, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Misstar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Klevar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kalmar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP - 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(SetNpcImgFXParams, NPC_Eldstar, IMGFX_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Mamar, IMGFX_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Skolar, IMGFX_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Muskular, IMGFX_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Misstar, IMGFX_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Klevar, IMGFX_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kalmar, IMGFX_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) diff --git a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c index e2f37292b8..8a9c4e89b2 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c +++ b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c @@ -75,12 +75,12 @@ EvtScript N(EVS_NpcAux_StarSpirit) = { EVT_LABEL(1) EVT_LOOP(50) EVT_ADDF(LVar0, EVT_FLOAT(0.8)) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_HOLOGRAM, 0, ArrayVar(0), MV_Unk_01, LVar0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, ArrayVar(0), MV_Unk_01, LVar0) EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(50) EVT_ADDF(LVar0, EVT_FLOAT(-0.8)) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_HOLOGRAM, 0, ArrayVar(0), MV_Unk_01, LVar0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, ArrayVar(0), MV_Unk_01, LVar0) EVT_WAIT(1) EVT_END_LOOP EVT_GOTO(1) diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index 1cc495d72a..d58c788ad3 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHIVER, 1, 1, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_SHIVER, 1, 1, 0) EVT_WAIT(35) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHIVER, 1, 1, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_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(SetNpcFoldParams, NPC_Eldstar_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Eldstar_02, IMGFX_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(SetNpcFoldParams, NPC_Eldstar_02, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Eldstar_02, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_HOLOGRAM, 0, ArrayVar(0), 0, MV_Unk_01) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, ArrayVar(0), 0, MV_Unk_01) EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(50) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_HOLOGRAM, 0, ArrayVar(0), 0, MV_Unk_01) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_HOLOGRAM, IMGFX_HOLOGRAM_NOISE, ArrayVar(0), 0, MV_Unk_01) EVT_WAIT(1) EVT_END_LOOP EVT_GOTO(1) diff --git a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c index dd6a7cdb74..ea270546c9 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c +++ b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c @@ -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(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -183, 19, -341) EVT_CALL(PlayerMoveTo, -132, -325, 20) EVT_RETURN diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c index 9ed649d6b0..9c1ad54993 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c +++ b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c @@ -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(SetPlayerFoldFlags, FOLD_STATE_FLAG_REVERSE_ANIM) - EVT_CALL(UpdatePlayerFold, ANIM_MarioW2_PanicHoverStill, FOLD_UPD_SET_ANIM, FOLD_ANIM_SHOCK, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(UpdatePlayerImgFX, ANIM_MarioW2_PanicHoverStill, IMGFX_SET_ANIM, IMGFX_ANIM_SHOCK, 1, 1, 0) EVT_WAIT(13 * DT) - EVT_CALL(UpdatePlayerFold, ANIM_MarioW2_PanicHoverStill, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_MarioW2_PanicHoverStill, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHover) - 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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(UpdatePlayerImgFX, ANIM_MarioW2_PanicHover, IMGFX_SET_ANIM, IMGFX_ANIM_SHOCK, 1, 1, 0) EVT_WAIT(13 * DT) - EVT_CALL(UpdatePlayerFold, ANIM_MarioW2_PanicHover, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_MarioW2_PanicHover, IMGFX_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(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(SetNpcImgFXFlags, NPC_Goombaria, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(SetNpcImgFXParams, NPC_Goombaria, IMGFX_SET_ANIM, IMGFX_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(SetNpcFoldParams, NPC_Goombaria, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Goombaria, IMGFX_CLEAR, 0, 0, 0, 0) EVT_END_THREAD - 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(SetNpcImgFXFlags, NPC_Goompapa, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(SetNpcImgFXParams, NPC_Goompapa, IMGFX_SET_ANIM, IMGFX_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(SetNpcFoldParams, NPC_Goompapa, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Goompapa, IMGFX_CLEAR, 0, 0, 0, 0) EVT_WAIT(10 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) diff --git a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c index 4048153441..e97deb1e86 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c +++ b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c @@ -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(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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_2000 | IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_FLUTTER_DOWN, 1, 1, 0) EVT_WAIT(100 * DT) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_WAIT(10 * DT) diff --git a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c index 2894256783..df8ad76eb7 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c +++ b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c @@ -5,7 +5,7 @@ extern s32 gItemIconRasterOffsets[]; extern s32 gItemIconPaletteOffsets[]; typedef struct StickerData { - /* 0x00 */ s32 folderID; + /* 0x00 */ s32 imgfxIdx; /* 0x04 */ s32 workerID; /* 0x08 */ Vec3f pos; /* 0x14 */ f32 pitch; @@ -20,14 +20,14 @@ typedef struct StickerData { } StickerData; void N(appendGfx_sticker)(void* renderData) { - FoldImageRecPart foldImage; + ImgFXTexture ifxImg; Matrix4f mtxTransform; Matrix4f mtxTemp; StickerData* sticker = (StickerData*) evt_get_variable(NULL, MV_StickerData); IMG_PTR img = (IMG_PTR) evt_get_variable(NULL, MV_StickerImage); PAL_PTR pal = (PAL_PTR) evt_get_variable(NULL, MV_StickerPalette); - u32 foldFlags = FOLD_STATE_FLAG_400; + u32 imgfxFlags = IMGFX_FLAG_400; gDPPipeSync(gMainGfxPos++); guTranslateF(mtxTransform, sticker->pos.x, sticker->pos.y, sticker->pos.z); @@ -41,19 +41,19 @@ void N(appendGfx_sticker)(void* renderData) { gSPMatrix(gMainGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - foldImage.raster = img; - foldImage.palette = pal; - foldImage.width = 32; - foldImage.height = 32; - foldImage.xOffset = -16; - foldImage.yOffset = 16; - foldImage.opacity = 255; + ifxImg.raster = img; + ifxImg.palette = pal; + ifxImg.width = 32; + ifxImg.height = 32; + ifxImg.xOffset = -16; + ifxImg.yOffset = 16; + ifxImg.alpha = 255; if (sticker->yaw != 0.0 || sticker->pitch != 0.0) { - foldFlags |= FOLD_STATE_FLAG_2000; + imgfxFlags |= IMGFX_FLAG_2000; } - fold_update(0, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); - fold_appendGfx_component(0, &foldImage, foldFlags, mtxTransform); + imgfx_update(0, IMGFX_CLEAR, 0, 0, 0, 0, 0); + imgfx_appendGfx_component(0, &ifxImg, imgfxFlags, mtxTransform); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -107,7 +107,7 @@ API_CALLABLE(N(CreateSticker)) { (u8*) (iconPalEnd + gItemIconPaletteOffsets[itemID]), iconPal); - sticker->folderID = func_8013A704(1); + sticker->imgfxIdx = imgfx_get_free_instances(1); sticker->workerID = create_worker_world(NULL, N(worker_render_sticker)); evt_set_variable(script, MV_StickerData, (s32) sticker); evt_set_variable(script, MV_StickerImage, (s32) iconImg); diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c index bbe60eae9f..fc7c1a139c 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c +++ b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c @@ -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(SetNpcFoldFlags, NPC_SELF, FOLD_STATE_FLAG_2000) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ANIM, FOLD_ANIM_UNFURL, 1, 1, 0) + EVT_CALL(SetNpcImgFXFlags, NPC_SELF, IMGFX_FLAG_2000) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ANIM, IMGFX_ANIM_UNFURL, 1, 1, 0) EVT_WAIT(15) - EVT_CALL(SetNpcFoldFlags, NPC_SELF, FOLD_STATE_FLAG_2000) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_3, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXFlags, NPC_SELF, IMGFX_FLAG_2000) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_RESET, 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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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) diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c index 0a411635d6..76061c49de 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c +++ b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c @@ -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(SetNpcFoldFlags, NPC_SELF, FOLD_STATE_FLAG_2000) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ANIM, FOLD_ANIM_UNFURL, 1, 1, 0) + EVT_CALL(SetNpcImgFXFlags, NPC_SELF, IMGFX_FLAG_2000) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ANIM, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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) diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c index 61acb838e3..7ffc386aad 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -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(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(SetNpcImgFXFlags, NPC_SELF, IMGFX_FLAG_800) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ANIM, IMGFX_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 10) EVT_LOOP(30) diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c index a8aeb0dfaf..fd23e92cff 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c +++ b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c @@ -77,8 +77,8 @@ EvtScript N(EVS_Player_EnterPipe_Intro) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - 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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(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_CALL(SetNpcImgFXFlags, NPC_Scene_Luigi, IMGFX_FLAG_800) + EVT_CALL(SetNpcImgFXParams, NPC_Scene_Luigi, IMGFX_SET_ANIM, IMGFX_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0) EVT_WAIT(25) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c index a40fd8b505..ef946b4f28 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c +++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c @@ -149,8 +149,8 @@ EvtScript N(EVS_Player_EnterPipe_Epilogue) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - 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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(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_CALL(SetNpcImgFXFlags, NPC_Luigi_1, IMGFX_FLAG_800) + EVT_CALL(SetNpcImgFXParams, NPC_Luigi_1, IMGFX_SET_ANIM, IMGFX_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0) EVT_WAIT(25) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_20/kmr_20_8_bed.c b/src/world/area_kmr/kmr_20/kmr_20_8_bed.c index 851a38d44c..e929174493 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_8_bed.c +++ b/src/world/area_kmr/kmr_20/kmr_20_8_bed.c @@ -64,8 +64,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_END_LOOP EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, 0x00010002, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, 0x00010002, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -45, 30, -70) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, -75, 30, -70) diff --git a/src/world/area_kmr/kmr_21/kmr_21_1_main.c b/src/world/area_kmr/kmr_21/kmr_21_1_main.c index 7093cb1470..5bf0874212 100644 --- a/src/world/area_kmr/kmr_21/kmr_21_1_main.c +++ b/src/world/area_kmr/kmr_21/kmr_21_1_main.c @@ -141,7 +141,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) EVT_END_IF EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 208, 208, 208) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_kmr/kmr_22/kmr_22_1_main.c b/src/world/area_kmr/kmr_22/kmr_22_1_main.c index 794fb6fcf4..39ecba6856 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_1_main.c +++ b/src/world/area_kmr/kmr_22/kmr_22_1_main.c @@ -157,7 +157,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) EVT_END_IF EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 208, 208, 208) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c index b6baee22ca..d7c7ba08a8 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c @@ -1,13 +1,13 @@ EvtScript N(EVS_NpcInit_Eldstar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldEldstar_Still) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/npc/chapter_2.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_2.inc.c index 249a287eb0..da8c1051f6 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_2.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_2.inc.c @@ -1,32 +1,32 @@ EvtScript N(EVS_NpcInit_Mamar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMamar_Still) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_ChainChomp) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ChainChomp_Anim03) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_CALL(SetNpcPos, NPC_SELF, 5, -25, -180) EVT_CALL(SetNpcAnimation, NPC_ChainChomp_02, ANIM_ChainChomp_Anim02) - EVT_CALL(SetNpcFoldParams, NPC_ChainChomp_02, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_ChainChomp_02, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_CALL(SetNpcPos, NPC_ChainChomp_02, 35, -14, -180) EVT_CALL(SetNpcAnimation, NPC_ChainChomp_03, ANIM_ChainChomp_Anim02) - EVT_CALL(SetNpcFoldParams, NPC_ChainChomp_03, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_ChainChomp_03, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_CALL(SetNpcPos, NPC_ChainChomp_03, 52, -18, -180) EVT_CALL(SetNpcAnimation, NPC_ChainChomp_04, ANIM_ChainChomp_Anim02) - EVT_CALL(SetNpcFoldParams, NPC_ChainChomp_04, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_ChainChomp_04, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_CALL(SetNpcPos, NPC_ChainChomp_04, 69, -19, -180) EVT_CALL(SetNpcAnimation, NPC_ChainChomp_05, ANIM_ChainChomp_Anim02) - EVT_CALL(SetNpcFoldParams, NPC_ChainChomp_05, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_ChainChomp_05, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_CALL(SetNpcPos, NPC_ChainChomp_05, 86, -19, -180) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_22/npc/chapter_3.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_3.inc.c index b7e8823d18..4850a38599 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_3.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_3.inc.c @@ -1,13 +1,13 @@ EvtScript N(EVS_NpcInit_Skolar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSkolar_Still) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/npc/chapter_4.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_4.inc.c index ecc147e085..0cb58d7266 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_4.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_4.inc.c @@ -1,20 +1,20 @@ EvtScript N(EVS_NpcInit_Muskular) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMuskular_Still) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_ShyGuy) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim02) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/npc/chapter_5.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_5.inc.c index efc13c81d0..9e64eaed0a 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_5.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_5.inc.c @@ -1,6 +1,6 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Still) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_TINT, 0, 0, 0, 128) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/npc/chapter_6.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_6.inc.c index 8d7ff88c66..9b60d4a87b 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_6.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_6.inc.c @@ -1,13 +1,13 @@ EvtScript N(EVS_NpcInit_Klevar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKlevar_Still) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 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(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 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(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 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(SetNpcFoldParams, NPC_TuffPuff_01, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_TuffPuff_01, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_CALL(SetNpcPos, NPC_TuffPuff_01, 120, -1, -51) EVT_CALL(SetNpcAnimation, NPC_TuffPuff_02, ANIM_TuffPuff_Idle) - EVT_CALL(SetNpcFoldParams, NPC_TuffPuff_02, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_TuffPuff_02, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_CALL(SetNpcPos, NPC_TuffPuff_02, -40, 59, 1) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_22/npc/chapter_7.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_7.inc.c index f4f4f66d35..187354119e 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_7.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_7.inc.c @@ -1,34 +1,34 @@ EvtScript N(EVS_NpcInit_Kalmar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKalmar_Still) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 128) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_IceCube) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0A) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_IceSphere) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0B) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_IceSpike) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0C) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/npc/chapter_8.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_8.inc.c index 3bce022feb..dd6fc511d1 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_8.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_8.inc.c @@ -1,6 +1,6 @@ EvtScript N(EVS_NpcInit_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBowser_Talk) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c b/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c index a3221d3292..161ae623ee 100644 --- a/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c +++ b/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c @@ -179,9 +179,9 @@ EvtScript N(EVS_NpcAux_LavaPiranhaHead) = { }; EvtScript N(EVS_NpcInit_LavaPiranhaHead) = { - 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(SetNpcImgFXParams, NPC_LavaPiranhaHead, IMGFX_FILL_COLOR, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_LavaBud_01, IMGFX_FILL_COLOR, 80, 80, 80, 0) + EVT_CALL(SetNpcImgFXParams, NPC_LavaBud_02, IMGFX_FILL_COLOR, 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) diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index 2a2054d5b9..0deccc1ede 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_TINT, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_TINT, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, 94, 0) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN diff --git a/src/world/area_kmr/kmr_24/kmr_24_1_main.c b/src/world/area_kmr/kmr_24/kmr_24_1_main.c index aa5e327150..60ffdd75e5 100644 --- a/src/world/area_kmr/kmr_24/kmr_24_1_main.c +++ b/src/world/area_kmr/kmr_24/kmr_24_1_main.c @@ -73,7 +73,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) EVT_END_IF EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 208, 208, 208) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c index 5f689c103d..b63a8896f0 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c +++ b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c @@ -126,7 +126,7 @@ EvtScript N(EVS_LowerWaterLevel0) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 120, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_THREAD - EVT_CALL(func_802CA988, 0, LVar4, LVar5, LVar6, LVar7) + EVT_CALL(func_802CA988, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) EVT_CALL(MakeLerp, LVar6, 600, 20, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -167,7 +167,7 @@ EvtScript N(EVS_LowerWaterLevel0) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_migi, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(10) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerPhysics, FALSE) @@ -191,7 +191,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(60) - EVT_CALL(func_802CA988, 0, LVar4, LVar5, LVar6, LVar7) + EVT_CALL(func_802CA988, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) EVT_CALL(MakeLerp, LVar6, 600, 20, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -271,7 +271,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_CALL(EnableModel, MODEL_o388, FALSE) EVT_END_THREAD EVT_WAIT(230) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) @@ -375,7 +375,7 @@ EvtScript N(EVS_LowerWaterLevel1) = { EVT_CALL(EnableModel, MODEL_s_sui, FALSE) EVT_CALL(EnableModel, MODEL_o385, TRUE) EVT_THREAD - EVT_CALL(func_802CA988, 0, LVar4, LVar5, LVar6, LVar7) + EVT_CALL(func_802CA988, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) EVT_CALL(MakeLerp, LVar6, 600, 20, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -409,7 +409,7 @@ EvtScript N(EVS_LowerWaterLevel1) = { EVT_CALL(PlaySound, SOUND_22B | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_22B) EVT_WAIT(10) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerPhysics, FALSE) @@ -435,7 +435,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = { EVT_CALL(EnableModel, MODEL_o385, FALSE) EVT_THREAD EVT_WAIT(60) - EVT_CALL(func_802CA988, 0, LVar4, LVar5, LVar6, LVar7) + EVT_CALL(func_802CA988, CAM_DEFAULT, LVar4, LVar5, LVar6, LVar7) EVT_CALL(MakeLerp, LVar6, 600, 20, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -514,7 +514,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = { EVT_CALL(EnableModel, MODEL_o388, FALSE) EVT_END_THREAD EVT_WAIT(230) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerPhysics, FALSE) diff --git a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c index d4fc9a1521..cc15ba8156 100644 --- a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c +++ b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c @@ -32,7 +32,7 @@ EvtScript N(EVS_Scene_Arrival) = { EVT_SET(MV_Starship_PosY, 0) EVT_SET(MV_Starship_PosZ, 0) EVT_EXEC(N(EVS_SetStarshipPosRot)) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 30, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 30, 16, 4096) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -70, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -70, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) @@ -82,7 +82,7 @@ EvtScript N(EVS_Scene_Departure) = { EVT_SET(MV_Starship_PosY, 160) EVT_SET(MV_Starship_PosZ, -970) EVT_EXEC(N(EVS_SetStarshipPosRot)) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 30, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 30, 16, 4096) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -70, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -70, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) diff --git a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c index 5dae66205b..56a0be0da8 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c +++ b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c @@ -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(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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_2000 | IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(SetPlayerPos, -139, 0, -90) EVT_CALL(PlayerMoveTo, -102, -130, 20) diff --git a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c index 349cccdccd..ede2fe5c98 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c +++ b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c @@ -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(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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_2000 | IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(SetPlayerPos, -139, 0, -90) EVT_CALL(PlayerMoveTo, -102, -130, 20) diff --git a/src/world/area_kzn/common/SpinyTromp.inc.c b/src/world/area_kzn/common/SpinyTromp.inc.c index fb7beff474..1b4d02721a 100644 --- a/src/world/area_kzn/common/SpinyTromp.inc.c +++ b/src/world/area_kzn/common/SpinyTromp.inc.c @@ -62,14 +62,14 @@ EvtScript N(D_80240D10_C7EE90) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) EVT_WAIT(1) EVT_CALL(N(SpinyTrompHit)) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Fallen, FOLD_UPD_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Fallen, IMGFX_SET_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(UpdatePlayerFold, ANIM_Mario1_Fallen, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Fallen, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) EVT_CALL(N(UnkFunc48), 0) EVT_LABEL(2) diff --git a/src/world/area_kzn/kzn_17/kzn_17_1_main.c b/src/world/area_kzn/kzn_17/kzn_17_1_main.c index adafe4d000..9768a1cda0 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_1_main.c +++ b/src/world/area_kzn/kzn_17/kzn_17_1_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_MT_LAVALAVA) EVT_CALL(SetSpriteShading, SHADING_KZN_17) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) diff --git a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c index 46ac770a92..93d1bbf1b4 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c @@ -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(SetNpcFoldParams, NPC_Kolorado, FOLD_UPD_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kolorado, IMGFX_SET_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(SetNpcFoldParams, NPC_Kolorado, FOLD_UPD_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kolorado, IMGFX_SET_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_00/mac_00_12_intro.c b/src/world/area_mac/mac_00/mac_00_12_intro.c index 9eac3ae456..a36bc86138 100644 --- a/src/world/area_mac/mac_00/mac_00_12_intro.c +++ b/src/world/area_mac/mac_00/mac_00_12_intro.c @@ -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(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(SetPlayerImgFXFlags, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_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(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(SetNpcImgFXFlags, NPC_Luigi_Intro, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(SetNpcImgFXParams, NPC_Luigi_Intro, IMGFX_SET_ANIM, IMGFX_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(SetNpcFoldParams, NPC_Luigi_Intro, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Luigi_Intro, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_Luigi_Intro, -100, 30, -370) EVT_WAIT(3) EVT_CALL(EnableNpcShadow, NPC_Luigi_Intro, TRUE) diff --git a/src/world/area_mac/mac_00/mac_00_14_epilogue.c b/src/world/area_mac/mac_00/mac_00_14_epilogue.c index e079e90f09..f5ddb90930 100644 --- a/src/world/area_mac/mac_00/mac_00_14_epilogue.c +++ b/src/world/area_mac/mac_00/mac_00_14_epilogue.c @@ -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(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(SetPlayerImgFXFlags, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_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(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(SetNpcImgFXFlags, NPC_Luigi_Epilogue, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(SetNpcImgFXParams, NPC_Luigi_Epilogue, IMGFX_SET_ANIM, IMGFX_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(SetNpcFoldParams, NPC_Luigi_Epilogue, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Luigi_Epilogue, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_Luigi_Epilogue, -100, 30, -370) EVT_WAIT(3) EVT_CALL(EnableNpcShadow, NPC_Luigi_Epilogue, TRUE) diff --git a/src/world/area_mac/mac_01/mac_01_2_main.c b/src/world/area_mac/mac_01/mac_01_2_main.c index 7b02be10e9..c5d1057fca 100644 --- a/src/world/area_mac/mac_01/mac_01_2_main.c +++ b/src/world/area_mac/mac_01/mac_01_2_main.c @@ -113,7 +113,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 90, 4096) // note: unusually large near clip dist: 90 vs 16 + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 90, 4096) // note: unusually large near clip dist: 90 vs 16 EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 0e28bcff1d..83788f0ad1 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -416,20 +416,20 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(PlayerJump1, -222, 20, -158, 8 * DT) EVT_WAIT(5 * DT) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) - EVT_CALL(N(KnockDownPlayerB), 1, 37) - EVT_CALL(N(KnockDownPlayerD), -215, 20, -158) + EVT_CALL(N(KnockdownCreate), SPR_Mario1, 37) //TODO hardcoded player raster ID + EVT_CALL(N(KnockdownSetPos), -215, 20, -158) EVT_WAIT(1) EVT_CALL(SetPlayerPos, -215, 1000, -158) EVT_CALL(MakeLerp, 0, 90, 10 * DT, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(N(KnockDownPlayerE), LVar0, 0, 0) + EVT_CALL(N(KnockdownSetRot), LVar0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(N(KnockDownPlayerD), -215, 21, -158) + EVT_CALL(N(KnockdownSetPos), -215, 21, -158) EVT_CALL(PlaySoundAtPlayer, SOUND_162, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(50 * DT) @@ -440,18 +440,18 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(GetAngleToPlayer, NPC_Merlon, LVar0) EVT_CALL(InterpNpcYaw, NPC_Merlon, LVar0, 5) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0021) - EVT_CALL(N(KnockDownPlayerD), -215, 20, -158) + EVT_CALL(N(KnockdownSetPos), -215, 20, -158) EVT_CALL(MakeLerp, 90, 0, 15 * DT, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(N(KnockDownPlayerE), LVar0, 0, 0) + EVT_CALL(N(KnockdownSetRot), LVar0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_CALL(SetPlayerPos, -222, 20, -158) - EVT_CALL(N(KnockDownPlayerC)) + EVT_CALL(N(KnockdownDestroy)) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) @@ -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(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(SetPlayerPos, 568, 20, -186) EVT_CALL(PlayerMoveTo, 525, -168, 20) diff --git a/src/world/area_mac/mac_02/npc/bootler.inc.c b/src/world/area_mac/mac_02/npc/bootler.inc.c index 3ec51afd21..1fc7db3979 100644 --- a/src/world/area_mac/mac_02/npc/bootler.inc.c +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -8,7 +8,7 @@ EvtScript N(D_8024ACA4_82DF64) = { EVT_END_IF EVT_LOOP(10) EVT_ADDF(LVar0, LVar1) - EVT_CALL(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_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)) diff --git a/src/world/area_mac/machi/machi_6_misstar.c b/src/world/area_mac/machi/machi_6_misstar.c index 17b77a986f..f8aa1d0040 100644 --- a/src/world/area_mac/machi/machi_6_misstar.c +++ b/src/world/area_mac/machi/machi_6_misstar.c @@ -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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(20) EVT_ADDF(LVar0, EVT_FLOAT(-4.0)) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_GOTO(0) diff --git a/src/world/area_mim/mim_01/mim_01_2_main.c b/src/world/area_mim/mim_01/mim_01_2_main.c index 68da5f9e4a..64827c2f70 100644 --- a/src/world/area_mim/mim_01/mim_01_2_main.c +++ b/src/world/area_mim/mim_01/mim_01_2_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_01) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_02/mim_02_2_main.c b/src/world/area_mim/mim_02/mim_02_2_main.c index 5fdcf1cb41..9341354c1f 100644 --- a/src/world/area_mim/mim_02/mim_02_2_main.c +++ b/src/world/area_mim/mim_02/mim_02_2_main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_02) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_03/mim_03_2_main.c b/src/world/area_mim/mim_03/mim_03_2_main.c index d477e5ef45..1c99ebdb57 100644 --- a/src/world/area_mim/mim_03/mim_03_2_main.c +++ b/src/world/area_mim/mim_03/mim_03_2_main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_03) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_04/mim_04_2_main.c b/src/world/area_mim/mim_04/mim_04_2_main.c index 9cce0156e4..68f8556928 100644 --- a/src/world/area_mim/mim_04/mim_04_2_main.c +++ b/src/world/area_mim/mim_04/mim_04_2_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_04) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_05/mim_05_2_main.c b/src/world/area_mim/mim_05/mim_05_2_main.c index 1ecea13722..073a1eccf4 100644 --- a/src/world/area_mim/mim_05/mim_05_2_main.c +++ b/src/world/area_mim/mim_05/mim_05_2_main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_05) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_06/mim_06_2_main.c b/src/world/area_mim/mim_06/mim_06_2_main.c index 048864a66d..dbae685316 100644 --- a/src/world/area_mim/mim_06/mim_06_2_main.c +++ b/src/world/area_mim/mim_06/mim_06_2_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_06) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_07/mim_07_2_main.c b/src/world/area_mim/mim_07/mim_07_2_main.c index b5041d5921..fbf8b83619 100644 --- a/src/world/area_mim/mim_07/mim_07_2_main.c +++ b/src/world/area_mim/mim_07/mim_07_2_main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_07) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_08/mim_08_2_main.c b/src/world/area_mim/mim_08/mim_08_2_main.c index 5afc45d32e..ce22471db8 100644 --- a/src/world/area_mim/mim_08/mim_08_2_main.c +++ b/src/world/area_mim/mim_08/mim_08_2_main.c @@ -44,7 +44,7 @@ EvtScript N(D_802431F0_BB0B30) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_08) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_09/mim_09_2_main.c b/src/world/area_mim/mim_09/mim_09_2_main.c index 4f2fcbbb22..ecd26460ed 100644 --- a/src/world/area_mim/mim_09/mim_09_2_main.c +++ b/src/world/area_mim/mim_09/mim_09_2_main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_09) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index 4de657815d..8607d0aaf0 100644 --- a/src/world/area_mim/mim_10/mim_10_4_npc.c +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -103,7 +103,7 @@ EvtScript N(EVS_Bootler_SpookPlayer) = { EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_CALL(N(AwaitPlayerApproachForest)) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 650) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 650) EVT_CALL(N(InitializeLightingBright)) EVT_THREAD EVT_CALL(N(ReduceFogEndDist)) @@ -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(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_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(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_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(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_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(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_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(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_SET(GB_StoryProgress, STORY_CH3_INVITED_TO_BOOS_MANSION) diff --git a/src/world/area_mim/mim_11/mim_11_3_gate.c b/src/world/area_mim/mim_11/mim_11_3_gate.c index e59827c5de..768ed8ab7a 100644 --- a/src/world/area_mim/mim_11/mim_11_3_gate.c +++ b/src/world/area_mim/mim_11/mim_11_3_gate.c @@ -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(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_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(SetNpcFoldParams, NPC_Bootler, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(RemoveNpc, NPC_Bootler) diff --git a/src/world/area_mim/mim_11/mim_11_5_npc.c b/src/world/area_mim/mim_11/mim_11_5_npc.c index 9a0fa7472d..44d7697f38 100644 --- a/src/world/area_mim/mim_11/mim_11_5_npc.c +++ b/src/world/area_mim/mim_11/mim_11_5_npc.c @@ -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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ALPHA, 0, 0, 0, 0) EVT_CASE_DEFAULT EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH diff --git a/src/world/area_mim/mim_12/mim_12_3_main.c b/src/world/area_mim/mim_12/mim_12_3_main.c index 1663dfe541..c9da5326b4 100644 --- a/src/world/area_mim/mim_12/mim_12_3_main.c +++ b/src/world/area_mim/mim_12/mim_12_3_main.c @@ -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(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_CALL(SetNpcImgFXParams, NPC_GateBoo_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_GateBoo_02, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) @@ -30,7 +30,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) EVT_CALL(SetSpriteShading, SHADING_MIM_12) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 1024) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 1024) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) diff --git a/src/world/area_mim/mim_12/mim_12_5_gate.c b/src/world/area_mim/mim_12/mim_12_5_gate.c index c4b250c353..3d9816b1f5 100644 --- a/src/world/area_mim/mim_12/mim_12_5_gate.c +++ b/src/world/area_mim/mim_12/mim_12_5_gate.c @@ -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(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_CALL(SetNpcImgFXParams, NPC_GateBoo_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_GateBoo_02, IMGFX_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(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_CALL(SetNpcImgFXParams, NPC_GateBoo_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_GateBoo_02, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_GateBoo_01, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_nok/nok_01/nok_01_4_npc.c b/src/world/area_nok/nok_01/nok_01_4_npc.c index 7e79ccf31a..f075d1f77a 100644 --- a/src/world/area_nok/nok_01/nok_01_4_npc.c +++ b/src/world/area_nok/nok_01/nok_01_4_npc.c @@ -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(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_GET_IN_BED, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_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(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -380, 0, 5) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -325, 79, 0) diff --git a/src/world/area_obk/common/TrafficBoos.inc.c b/src/world/area_obk/common/TrafficBoos.inc.c index 6cd2bb29fb..c61b456533 100644 --- a/src/world/area_obk/common/TrafficBoos.inc.c +++ b/src/world/area_obk/common/TrafficBoos.inc.c @@ -101,7 +101,7 @@ EvtScript N(EVS_NpcIdle_TrafficBoo) = { EVT_LOOP(0) EVT_CALL(N(UpdateTrafficBooMotion)) EVT_CALL(N(UpdateTrafficBooAlpha)) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_CALL(SetNpcRenderMode, NPC_SELF, RENDER_MODE_SURFACE_XLU_LAYER1) EVT_WAIT(1) EVT_END_LOOP diff --git a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c b/src/world/area_obk/obk_01/obk_01_5_jump_scare.c index 187cadddf5..0099cd4ef7 100644 --- a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c +++ b/src/world/area_obk/obk_01/obk_01_5_jump_scare.c @@ -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(SetNpcFoldParams, NPC_JumpScareBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_JumpScareBoo, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(RemoveNpc, NPC_JumpScareBoo) diff --git a/src/world/area_obk/obk_01/obk_01_6_npc.c b/src/world/area_obk/obk_01/obk_01_6_npc.c index fa8dd10ffa..a653834bee 100644 --- a/src/world/area_obk/obk_01/obk_01_6_npc.c +++ b/src/world/area_obk/obk_01/obk_01_6_npc.c @@ -109,7 +109,7 @@ EvtScript N(EVS_NpcAux_TrafficBoo) = { EVT_SET(LVar1, 0) EVT_LOOP(0) EVT_CALL(N(UpdateTrafficBooAlpha)) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN diff --git a/src/world/area_obk/obk_04/obk_04_3_npc.c b/src/world/area_obk/obk_04/obk_04_3_npc.c index b93250a840..5c1dbb5bec 100644 --- a/src/world/area_obk/obk_04/obk_04_3_npc.c +++ b/src/world/area_obk/obk_04/obk_04_3_npc.c @@ -34,12 +34,12 @@ 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->foldFlags = 0; - npc_set_fold_params(npc, FOLD_UPD_CLEAR, 0, 0, 0, 0, npc->foldFlags); + npc->imgfxFlags = 0; + npc_set_imgfx_params(npc, IMGFX_CLEAR, 0, 0, 0, 0, npc->imgfxFlags); } else { npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - npc_set_fold_params(npc, FOLD_UPD_SET_ALPHA, gPlayerStatusPtr->alpha1, 255, 0, 0, npc->foldFlags); - npc->foldArg1 = 255; + npc_set_imgfx_params(npc, IMGFX_SET_ALPHA, gPlayerStatusPtr->alpha1, 255, 0, 0, npc->imgfxFlags); + npc->imgfxArg1 = 255; } } @@ -55,14 +55,14 @@ void N(func_80240198_BC7FF8)(void) { } void N(func_8024022C_BC808C)(void) { - 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; + get_npc_unsafe(NPC_KeepAwayBoo1)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo2)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo3)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo4)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo5)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo6)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo7)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo8)->imgfxFlags = 0; } s32 N(SetRingMovement)(s32 arg0) { diff --git a/src/world/area_obk/obk_04/obk_04_6_game.c b/src/world/area_obk/obk_04/obk_04_6_game.c index f4379192a8..7fc3d16881 100644 --- a/src/world/area_obk/obk_04/obk_04_6_game.c +++ b/src/world/area_obk/obk_04/obk_04_6_game.c @@ -203,7 +203,7 @@ EvtScript N(EVS_BooAppear) = { EVT_CALL(MakeLerp, 0, 255, 60, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcFoldParams, LVarA, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, LVarA, IMGFX_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(SetNpcFoldParams, LVarA, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, LVarA, IMGFX_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(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_LeaderBoo, IMGFX_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(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_LeaderBoo, IMGFX_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(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_LeaderBoo, IMGFX_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(SetNpcFoldParams, NPC_TutorialBoo, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_TutorialBoo, IMGFX_SET_ALPHA, 0, 0, 0, 0) EVT_SET(LVarA, NPC_TutorialBoo) EVT_EXEC(N(EVS_BooAppear)) EVT_WAIT(60) diff --git a/src/world/area_obk/obk_07/obk_07_6_phonograph.c b/src/world/area_obk/obk_07/obk_07_6_phonograph.c index 255bbf71d9..5964c07724 100644 --- a/src/world/area_obk/obk_07/obk_07_6_phonograph.c +++ b/src/world/area_obk/obk_07/obk_07_6_phonograph.c @@ -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(SetNpcFoldParams, NPC_GuardBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_GuardBoo, IMGFX_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(SetNpcFoldParams, NPC_GuardBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_GuardBoo, IMGFX_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(SetNpcFoldParams, NPC_GuardBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_GuardBoo, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) diff --git a/src/world/area_obk/obk_08/obk_08_3_cabinets.c b/src/world/area_obk/obk_08/obk_08_3_cabinets.c index 6320346944..0d1b0894c5 100644 --- a/src/world/area_obk/obk_08/obk_08_3_cabinets.c +++ b/src/world/area_obk/obk_08/obk_08_3_cabinets.c @@ -72,20 +72,20 @@ EvtScript N(EVS_CrushPlayer) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(13) EVT_CALL(GetPlayerPos, MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) - EVT_CALL(N(KnockDownPlayerB), 1, 37) - EVT_CALL(N(KnockDownPlayerD), MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) + EVT_CALL(N(KnockdownCreate), SPR_Mario1, 37) //TODO hardcoded player raster ID + EVT_CALL(N(KnockdownSetPos), MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) EVT_WAIT(1) EVT_CALL(SetPlayerPos, 0, 1000, 0) // unusual dispose location EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_IN) EVT_LABEL(0) EVT_CALL(UpdateLerp) - EVT_CALL(N(KnockDownPlayerE), LVar0, 0, 0) + EVT_CALL(N(KnockdownSetRot), LVar0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF EVT_ADD(MV_KnockdownPosY, 3) - EVT_CALL(N(KnockDownPlayerD), MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) + EVT_CALL(N(KnockdownSetPos), MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) EVT_CALL(N(DamagePlayer1HP)) EVT_RETURN EVT_END @@ -96,16 +96,16 @@ EvtScript N(EVS_RestorePlayer) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(15) EVT_SUB(MV_KnockdownPosY, 3) - EVT_CALL(N(KnockDownPlayerD), MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) + EVT_CALL(N(KnockdownSetPos), MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) EVT_CALL(MakeLerp, 90, 0, 15, EASING_QUADRATIC_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) - EVT_CALL(N(KnockDownPlayerE), LVar0, 0, 0) + EVT_CALL(N(KnockdownSetRot), LVar0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(N(KnockDownPlayerC)) + EVT_CALL(N(KnockdownDestroy)) EVT_CALL(SetPlayerPos, MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHeadHard) diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/obk_08_5_npc.c index aa8f3af45c..da97c17116 100644 --- a/src/world/area_obk/obk_08/obk_08_5_npc.c +++ b/src/world/area_obk/obk_08/obk_08_5_npc.c @@ -34,12 +34,12 @@ 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->foldFlags = 0; - npc_set_fold_params(npc, FOLD_UPD_CLEAR, 0, 0, 0, 0, npc->foldFlags); + npc->imgfxFlags = 0; + npc_set_imgfx_params(npc, IMGFX_CLEAR, 0, 0, 0, 0, npc->imgfxFlags); } else { npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - npc_set_fold_params(npc, FOLD_UPD_SET_ALPHA, gPlayerStatusPtr->alpha1, 0, 0, 0, npc->foldFlags); - npc->foldArg1 = 255; + npc_set_imgfx_params(npc, IMGFX_SET_ALPHA, gPlayerStatusPtr->alpha1, 0, 0, 0, npc->imgfxFlags); + npc->imgfxArg1 = 255; } } @@ -55,14 +55,14 @@ void func_802409E8_BD4258(void) { } void func_80240A7C_BD42EC(void) { - 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; + get_npc_unsafe(NPC_KeepAwayBoo1)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo2)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo3)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo4)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo5)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo6)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo7)->imgfxFlags = 0; + get_npc_unsafe(NPC_KeepAwayBoo8)->imgfxFlags = 0; } API_CALLABLE(N(func_80240AF0_BD4360)) { diff --git a/src/world/area_obk/obk_08/obk_08_6_game.c b/src/world/area_obk/obk_08/obk_08_6_game.c index d7775c05f5..33a897ee0f 100644 --- a/src/world/area_obk/obk_08/obk_08_6_game.c +++ b/src/world/area_obk/obk_08/obk_08_6_game.c @@ -153,7 +153,7 @@ EvtScript N(EVS_BooSpookAndVanish) = { EVT_CALL(MakeLerp, 255, 0, 60, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcFoldParams, LVarA, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, LVarA, IMGFX_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(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_LeaderBoo, IMGFX_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(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_LeaderBoo, IMGFX_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(SetNpcFoldParams, NPC_LeaderBoo, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_LeaderBoo, IMGFX_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(SetNpcFoldParams, MV_ItemCarrierNpc, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, MV_ItemCarrierNpc, IMGFX_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(SetNpcFoldParams, MV_ItemCarrierNpc, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, MV_ItemCarrierNpc, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP diff --git a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c index b6c0c6b014..89009095f3 100644 --- a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c +++ b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c @@ -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(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_CALL(SetNpcImgFXParams, NPC_Bow, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Bootler, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(40 * DT) diff --git a/src/world/area_obk/obk_09/obk_09_4_npc.c b/src/world/area_obk/obk_09/obk_09_4_npc.c index 2a40b52874..ec097b7279 100644 --- a/src/world/area_obk/obk_09/obk_09_4_npc.c +++ b/src/world/area_obk/obk_09/obk_09_4_npc.c @@ -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(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, 170, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ALPHA, 170, 0, 0, 0) EVT_IF_GE(GB_StoryProgress, STORY_CH3_BOW_JOINED_PARTY) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF diff --git a/src/world/area_osr/osr_03/osr_03_3_intro.c b/src/world/area_osr/osr_03/osr_03_3_intro.c index ea53e6c8ba..9455209847 100644 --- a/src/world/area_osr/osr_03/osr_03_3_intro.c +++ b/src/world/area_osr/osr_03/osr_03_3_intro.c @@ -210,7 +210,7 @@ EvtScript N(MV_Scene_CastleAscending) = { EVT_CALL(EnableGroup, MODEL_kemuri, FALSE) EVT_CALL(EnableGroup, MODEL_obj, FALSE) EVT_CALL(EnableGroup, MODEL_g277, FALSE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 80, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 80, 16, 4096) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -1, 0) EVT_CALL(SetCamType, CAM_DEFAULT, 1, TRUE) EVT_CALL(SetPanTarget, CAM_DEFAULT, -150, 0, 0) @@ -249,7 +249,7 @@ EvtScript N(MV_Scene_PlayerTossedOut) = { EVT_CALL(EnableGroup, MODEL_jimen, FALSE) EVT_CALL(EnableGroup, MODEL_kemuri, FALSE) EVT_CALL(EnableGroup, MODEL_obj, FALSE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 80, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 80, 16, 4096) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -1, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -1, 0) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-13.0), EVT_FLOAT(18.0)) @@ -298,7 +298,7 @@ EvtScript N(EVS_Scene_UnusedTossOut) = { EVT_CALL(EnableGroup, MODEL_jimen, FALSE) EVT_CALL(EnableGroup, MODEL_kemuri, FALSE) EVT_CALL(EnableGroup, MODEL_obj, FALSE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 6000) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 6000) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, -400, -1500, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(3500.0)) diff --git a/src/world/area_osr/osr_03/osr_03_4_starship.c b/src/world/area_osr/osr_03/osr_03_4_starship.c index ab9caa667f..65196f14f6 100644 --- a/src/world/area_osr/osr_03/osr_03_4_starship.c +++ b/src/world/area_osr/osr_03/osr_03_4_starship.c @@ -45,7 +45,7 @@ EvtScript N(EVS_Scene_Starship) = { EVT_SET(MV_CastleLiftDist, 0) EVT_EXEC(N(EVS_AnimateSwingingChains)) EVT_EXEC(N(EVS_AnimateSpinningRing)) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 80, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 80, 16, 4096) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -1, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -1, 0) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-13.0), EVT_FLOAT(18.0)) diff --git a/src/world/area_osr/osr_03/osr_03_5_interlude.c b/src/world/area_osr/osr_03/osr_03_5_interlude.c index 2c3e8ff40c..4fee9410ec 100644 --- a/src/world/area_osr/osr_03/osr_03_5_interlude.c +++ b/src/world/area_osr/osr_03/osr_03_5_interlude.c @@ -118,7 +118,7 @@ EvtScript N(EVS_Scene_BeginInterlude) = { EVT_CALL(EnableGroup, MODEL_jimen, FALSE) EVT_CALL(EnableGroup, MODEL_kemuri, FALSE) EVT_CALL(EnableGroup, MODEL_obj, FALSE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 80, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 80, 16, 4096) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -1, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -1, 0) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-13.0), EVT_FLOAT(18.0)) diff --git a/src/world/area_osr/osr_03/osr_03_6_ending.c b/src/world/area_osr/osr_03/osr_03_6_ending.c index f7ad81504d..7241ac8c53 100644 --- a/src/world/area_osr/osr_03/osr_03_6_ending.c +++ b/src/world/area_osr/osr_03/osr_03_6_ending.c @@ -123,7 +123,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = { EVT_EXEC(N(EVS_AnimateSpinningRing)) EVT_EXEC(N(EVS_UpdateCamShaking)) EVT_EXEC_GET_TID(N(EVS_PlayExplosionFX), LVar9) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 22, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 22, 16, 4096) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamType, CAM_DEFAULT, 1, TRUE) EVT_CALL(SetPanTarget, CAM_DEFAULT, -60, 0, 0) @@ -150,7 +150,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = { EVT_CALL(UpdateLerp) EVT_SETF(LVar2, LVar0) EVT_DIVF(LVar2, 10) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, LVar2, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, LVar2, 16, 4096) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP @@ -161,7 +161,7 @@ EvtScript N(EVS_Scene_CastleDestruction) = { EVT_CALL(UpdateLerp) EVT_SETF(LVar2, LVar0) EVT_DIVF(LVar2, 10) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, LVar2, 1, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, LVar2, 1, 4096) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP diff --git a/src/world/area_pra/common/Reflection.inc.c b/src/world/area_pra/common/Reflection.inc.c index dfdb504248..35b0852578 100644 --- a/src/world/area_pra/common/Reflection.inc.c +++ b/src/world/area_pra/common/Reflection.inc.c @@ -97,10 +97,10 @@ void N(worker_reflect_player_wall)(void) { if (playerStatus->alpha1 != D_802D9D70) { if (playerStatus->alpha1 < 254) { renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - func_802DDEE4(PLAYER_SPRITE_AUX2, -1, FOLD_UPD_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); + set_player_imgfx_comp(PLAYER_SPRITE_AUX2, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); } else { renderMode = RENDER_MODE_ALPHATEST; - func_802DDEE4(PLAYER_SPRITE_AUX2, -1, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_comp(PLAYER_SPRITE_AUX2, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); } } D_802D9D70 = playerStatus->alpha1; @@ -172,10 +172,10 @@ void N(worker_reflect_player_floor)(void) { if (playerStatus->alpha1 != D_802D9D71) { if (playerStatus->alpha1 < 254) { renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - func_802DDEE4(PLAYER_SPRITE_AUX1, -1, FOLD_UPD_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); + set_player_imgfx_comp(PLAYER_SPRITE_AUX1, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); } else { renderMode = RENDER_MODE_ALPHATEST; - func_802DDEE4(PLAYER_SPRITE_AUX1, -1, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_comp(PLAYER_SPRITE_AUX1, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); } } D_802D9D71 = playerStatus->alpha1; @@ -264,7 +264,7 @@ void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) { tint = 100; } - func_802DDEE4(PLAYER_SPRITE_AUX1, -1, 6, tint, tint, tint, 255, 0); + set_player_imgfx_comp(PLAYER_SPRITE_AUX1, -1, IMGFX_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); @@ -284,7 +284,7 @@ void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) { px = playerStatus->position.x; pz = playerStatus->position.z; - func_802DDEE4(PLAYER_SPRITE_AUX1, -1, 7, 0, 0, 0, 64, 0); + set_player_imgfx_comp(PLAYER_SPRITE_AUX1, -1, IMGFX_SET_ALPHA, 0, 0, 0, 64, 0); guRotateF(mtx, yaw, 0.0f, -1.0f, 0.0f); guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); guRotateF(mtx, blurAngle, 0.0f, 1.0f, 0.0f); diff --git a/src/world/area_pra/pra_02/pra_02_2_main.c b/src/world/area_pra/pra_02/pra_02_2_main.c index 10c16708ee..b57c7edc52 100644 --- a/src/world/area_pra/pra_02/pra_02_2_main.c +++ b/src/world/area_pra/pra_02/pra_02_2_main.c @@ -321,7 +321,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_03/pra_03_2_main.c b/src/world/area_pra/pra_03/pra_03_2_main.c index adb08370f0..b64621f4e1 100644 --- a/src/world/area_pra/pra_03/pra_03_2_main.c +++ b/src/world/area_pra/pra_03/pra_03_2_main.c @@ -56,7 +56,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_04/pra_04_2_main.c b/src/world/area_pra/pra_04/pra_04_2_main.c index a1b49a57fa..298f4e3e62 100644 --- a/src/world/area_pra/pra_04/pra_04_2_main.c +++ b/src/world/area_pra/pra_04/pra_04_2_main.c @@ -52,7 +52,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_05/pra_05_2_main.c b/src/world/area_pra/pra_05/pra_05_2_main.c index fb8a0d9c3f..c18d4c1cbf 100644 --- a/src/world/area_pra/pra_05/pra_05_2_main.c +++ b/src/world/area_pra/pra_05/pra_05_2_main.c @@ -41,7 +41,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_06/pra_06_2_main.c b/src/world/area_pra/pra_06/pra_06_2_main.c index 2b459dff1a..1cda12577c 100644 --- a/src/world/area_pra/pra_06/pra_06_2_main.c +++ b/src/world/area_pra/pra_06/pra_06_2_main.c @@ -48,7 +48,7 @@ EvtScript N(EVS_EnterDoors_0) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_09/pra_09_2_main.c b/src/world/area_pra/pra_09/pra_09_2_main.c index 4c13392fa3..ba7311ca54 100644 --- a/src/world/area_pra/pra_09/pra_09_2_main.c +++ b/src/world/area_pra/pra_09/pra_09_2_main.c @@ -70,7 +70,7 @@ EvtScript N(EVS_BlastWall) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_11/pra_11_2_main.c b/src/world/area_pra/pra_11/pra_11_2_main.c index 4a4e074645..8d6a74c347 100644 --- a/src/world/area_pra/pra_11/pra_11_2_main.c +++ b/src/world/area_pra/pra_11/pra_11_2_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_12/pra_12_2_main.c b/src/world/area_pra/pra_12/pra_12_2_main.c index 17e264e588..a73644942b 100644 --- a/src/world/area_pra/pra_12/pra_12_2_main.c +++ b/src/world/area_pra/pra_12/pra_12_2_main.c @@ -48,7 +48,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_13/pra_13_2_main.c b/src/world/area_pra/pra_13/pra_13_2_main.c index baa0b77fc5..03bc181ba4 100644 --- a/src/world/area_pra/pra_13/pra_13_2_main.c +++ b/src/world/area_pra/pra_13/pra_13_2_main.c @@ -154,7 +154,7 @@ EvtScript N(EVS_BlastWall_Far) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_14/pra_14_2_main.c b/src/world/area_pra/pra_14/pra_14_2_main.c index b43aa4a6bd..cb899e9141 100644 --- a/src/world/area_pra/pra_14/pra_14_2_main.c +++ b/src/world/area_pra/pra_14/pra_14_2_main.c @@ -52,7 +52,7 @@ EvtScript N(EVS_BlastWallB) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_16/pra_16_2_main.c b/src/world/area_pra/pra_16/pra_16_2_main.c index d12c551dd2..65917c628c 100644 --- a/src/world/area_pra/pra_16/pra_16_2_main.c +++ b/src/world/area_pra/pra_16/pra_16_2_main.c @@ -162,7 +162,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_18/pra_18_2_main.c b/src/world/area_pra/pra_18/pra_18_2_main.c index 56f5db22d4..e5b813b3b9 100644 --- a/src/world/area_pra/pra_18/pra_18_2_main.c +++ b/src/world/area_pra/pra_18/pra_18_2_main.c @@ -112,7 +112,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_19/pra_19_2_main.c b/src/world/area_pra/pra_19/pra_19_2_main.c index 75fabed6c8..1e308f9abb 100644 --- a/src/world/area_pra/pra_19/pra_19_2_main.c +++ b/src/world/area_pra/pra_19/pra_19_2_main.c @@ -52,7 +52,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_20/pra_20_2_main.c b/src/world/area_pra/pra_20/pra_20_2_main.c index d0fa731b85..0c7ceda9d4 100644 --- a/src/world/area_pra/pra_20/pra_20_2_main.c +++ b/src/world/area_pra/pra_20/pra_20_2_main.c @@ -164,7 +164,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_21/pra_21_2_main.c b/src/world/area_pra/pra_21/pra_21_2_main.c index e409d14ca4..e79e8493fe 100644 --- a/src/world/area_pra/pra_21/pra_21_2_main.c +++ b/src/world/area_pra/pra_21/pra_21_2_main.c @@ -60,7 +60,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_22/pra_22_2_main.c b/src/world/area_pra/pra_22/pra_22_2_main.c index 6f98a17275..8d76aa80d3 100644 --- a/src/world/area_pra/pra_22/pra_22_2_main.c +++ b/src/world/area_pra/pra_22/pra_22_2_main.c @@ -207,7 +207,7 @@ EvtScript N(EVS_PushStatue) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_27/pra_27_2_main.c b/src/world/area_pra/pra_27/pra_27_2_main.c index 3ce3aae061..ed581d0996 100644 --- a/src/world/area_pra/pra_27/pra_27_2_main.c +++ b/src/world/area_pra/pra_27/pra_27_2_main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_28/pra_28_2_main.c b/src/world/area_pra/pra_28/pra_28_2_main.c index 3ff2dc3994..f9939cf46f 100644 --- a/src/world/area_pra/pra_28/pra_28_2_main.c +++ b/src/world/area_pra/pra_28/pra_28_2_main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_29/pra_29_3_main.c b/src/world/area_pra/pra_29/pra_29_3_main.c index 464d49cbf4..7722f8914f 100644 --- a/src/world/area_pra/pra_29/pra_29_3_main.c +++ b/src/world/area_pra/pra_29/pra_29_3_main.c @@ -153,7 +153,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_EXEC_WAIT(N(EVS_MakeEntities)) diff --git a/src/world/area_pra/pra_31/pra_31_3_main.c b/src/world/area_pra/pra_31/pra_31_3_main.c index ced69cad46..27325d535a 100644 --- a/src/world/area_pra/pra_31/pra_31_3_main.c +++ b/src/world/area_pra/pra_31/pra_31_3_main.c @@ -82,7 +82,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_32/pra_32_3_npc.c b/src/world/area_pra/pra_32/pra_32_3_npc.c index 51dbac0487..3c88236661 100644 --- a/src/world/area_pra/pra_32/pra_32_3_npc.c +++ b/src/world/area_pra/pra_32/pra_32_3_npc.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = { EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_KING_THEME, 0, 8) EVT_CALL(ShowMessageAtScreenPos, MSG_CH7_016A, 160, 40) EVT_CALL(SetNpcPos, NPC_CrystalKing_01, 588, 200, 116) - EVT_CALL(SetNpcFoldParams, NPC_CrystalKing_01, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_CrystalKing_01, IMGFX_SET_ALPHA, 0, 0, 0, 0) EVT_CALL(GetNpcPos, NPC_CrystalKing_01, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, -30) @@ -95,7 +95,7 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = { EVT_CALL(MakeLerp, 0, 255, 120 * DT, EASING_LINEAR) EVT_LABEL(5) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcFoldParams, NPC_CrystalKing_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_CrystalKing_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) EVT_GOTO(5) @@ -171,7 +171,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_CALL(MakeLerp, 255, 122, 30 * DT, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcFoldParams, NPC_CrystalKing_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_CrystalKing_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF @@ -186,13 +186,13 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_CALL(MakeLerp, 120, 0, 30 * DT, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcFoldParams, NPC_CrystalKing_01, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_CrystalKing_01, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcFoldParams, NPC_CrystalKing_01, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_CrystalKing_01, IMGFX_SET_ALPHA, 0, 0, 0, 0) EVT_CALL(GetNpcPos, NPC_CrystalKing_01, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar1, LVar2, 40) diff --git a/src/world/area_pra/pra_33/pra_33_2_main.c b/src/world/area_pra/pra_33/pra_33_2_main.c index 61af857387..dbf419f498 100644 --- a/src/world/area_pra/pra_33/pra_33_2_main.c +++ b/src/world/area_pra/pra_33/pra_33_2_main.c @@ -96,7 +96,7 @@ EvtScript N(EVS_BlastWall) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_34/pra_34_2_main.c b/src/world/area_pra/pra_34/pra_34_2_main.c index f882879200..8eb5ce7346 100644 --- a/src/world/area_pra/pra_34/pra_34_2_main.c +++ b/src/world/area_pra/pra_34/pra_34_2_main.c @@ -198,7 +198,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_35/pra_35_2_main.c b/src/world/area_pra/pra_35/pra_35_2_main.c index afe07463ef..ebe0a052e5 100644 --- a/src/world/area_pra/pra_35/pra_35_2_main.c +++ b/src/world/area_pra/pra_35/pra_35_2_main.c @@ -93,7 +93,7 @@ EvtScript N(D_802432B8_D90508) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_36/pra_36_2_main.c b/src/world/area_pra/pra_36/pra_36_2_main.c index 4afb8584d7..3cae3cdaba 100644 --- a/src/world/area_pra/pra_36/pra_36_2_main.c +++ b/src/world/area_pra/pra_36/pra_36_2_main.c @@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_37/pra_37_2_main.c b/src/world/area_pra/pra_37/pra_37_2_main.c index f407526688..ede256d9d3 100644 --- a/src/world/area_pra/pra_37/pra_37_2_main.c +++ b/src/world/area_pra/pra_37/pra_37_2_main.c @@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_38/pra_38_2_main.c b/src/world/area_pra/pra_38/pra_38_2_main.c index 9a209b845e..29c629d356 100644 --- a/src/world/area_pra/pra_38/pra_38_2_main.c +++ b/src/world/area_pra/pra_38/pra_38_2_main.c @@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_39/pra_39_2_main.c b/src/world/area_pra/pra_39/pra_39_2_main.c index 064ab71c24..55294274d3 100644 --- a/src/world/area_pra/pra_39/pra_39_2_main.c +++ b/src/world/area_pra/pra_39/pra_39_2_main.c @@ -75,7 +75,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_pra/pra_40/pra_40_2_main.c b/src/world/area_pra/pra_40/pra_40_2_main.c index c818dd8e63..5877ed14b8 100644 --- a/src/world/area_pra/pra_40/pra_40_2_main.c +++ b/src/world/area_pra/pra_40/pra_40_2_main.c @@ -39,7 +39,7 @@ EvtScript N(EVS_EnterMap) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) diff --git a/src/world/area_sam/sam_02/sam_02_4_npc.c b/src/world/area_sam/sam_02/sam_02_4_npc.c index cae7b45b90..c8eb9196aa 100644 --- a/src/world/area_sam/sam_02/sam_02_4_npc.c +++ b/src/world/area_sam/sam_02/sam_02_4_npc.c @@ -73,8 +73,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(InterpPlayerYaw, 229, 1) EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - 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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_GET_IN_BED, 1, 1, 0) EVT_THREAD EVT_WAIT(60) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) @@ -110,7 +110,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_END_IF EVT_END_IF EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, 277, 0, -256) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 336, -199, 0) diff --git a/src/world/area_sam/sam_05/sam_05_4_npc.c b/src/world/area_sam/sam_05/sam_05_4_npc.c index 323162b090..d79a1f6b33 100644 --- a/src/world/area_sam/sam_05/sam_05_4_npc.c +++ b/src/world/area_sam/sam_05/sam_05_4_npc.c @@ -48,25 +48,14 @@ EvtScript N(EVS_NpcDefeat_Monstar) = { #include "world/area_sam/sam_05/monstar.pal.inc.c" #include "world/area_sam/sam_05/monstar.png.h" -//TODO borrowed from sprite.c -typedef struct UnkFoldStruct { - /* 0x00 */ IMG_PTR raster; - /* 0x04 */ PAL_PTR palette; - /* 0x08 */ u16 width; - /* 0x0A */ u16 height; - /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ Gfx* unk_14; -} UnkFoldStruct; // size = 0x18 - -UnkFoldStruct N(MonstarDetailTexture) = { +ImgFXOverlayTexture N(MonstarDetailTexture) = { .raster = N(monstar_png), .palette = N(monstar_pal), .width = N(monstar_png_width), .height = N(monstar_png_height), - .unk_0C = -2, - .unk_10 = 0, - .unk_14 = N(monstar_gfx), + .offsetX = -2, + .offsetY = 0, + .displayList = N(monstar_gfx), }; API_CALLABLE(N(UpdateMonstarSpriteEffects)) { @@ -84,11 +73,11 @@ API_CALLABLE(N(UpdateMonstarSpriteEffects)) { } if (enemy->varTable[3] == 0) { - func_802DE780(npc->spriteInstanceID, 1, FOLD_UPD_SET_ALPHA, 255, 255, 255, 0, 0); + set_npc_imgfx_comp(npc->spriteInstanceID, 1, IMGFX_SET_ALPHA, 255, 255, 255, 0, 0); return ApiStatus_BLOCK; } - func_802DE780(npc->spriteInstanceID, 0, FOLD_UPD_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); + set_npc_imgfx_comp(npc->spriteInstanceID, 0, IMGFX_ALLOC_COLOR_BUF, 20, 0, 0, 255, 0); script->functionTemp[0] += 10; if (script->functionTemp[0] >= 360) { script->functionTemp[0] %= 360; @@ -100,15 +89,15 @@ API_CALLABLE(N(UpdateMonstarSpriteEffects)) { sp50[i] = (cosine(script->functionTemp[0] + (i * 25) + 90) + 1.0) * 56.0; sp68[i] = enemy->varTable[3]; - func_802DE780(npc->spriteInstanceID, 0, FOLD_UPD_COLOR_BUF_SET_C, i, (sp20[i] << 24) | (sp38[i] << 16) | (sp50[i] << 8) | sp68[i], 0, 255, 0); + set_npc_imgfx_comp(npc->spriteInstanceID, 0, IMGFX_COLOR_BUF_SET_MODULATE, i, (sp20[i] << 24) | (sp38[i] << 16) | (sp50[i] << 8) | sp68[i], 0, 255, 0); } if (enemy->varTable[3] == 255) { npc->renderMode = RENDER_MODE_ALPHATEST; - func_802DE780(npc->spriteInstanceID, 1, FOLD_TYPE_F, (s32) &N(MonstarDetailTexture), 255, 0, 255, 0); + set_npc_imgfx_comp(npc->spriteInstanceID, 1, IMGFX_OVERLAY, (s32) &N(MonstarDetailTexture), 255, 0, 255, 0); } else { npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - func_802DE780(npc->spriteInstanceID, 1, FOLD_TYPE_F, (s32) &N(MonstarDetailTexture), enemy->varTable[3], 0, enemy->varTable[3], 0); + set_npc_imgfx_comp(npc->spriteInstanceID, 1, IMGFX_OVERLAY, (s32) &N(MonstarDetailTexture), enemy->varTable[3], 0, enemy->varTable[3], 0); } return ApiStatus_BLOCK; } diff --git a/src/world/area_sam/sam_05/sam_05_5_scenes.c b/src/world/area_sam/sam_05/sam_05_5_scenes.c index 5c3976b2ad..bcfa6369c6 100644 --- a/src/world/area_sam/sam_05/sam_05_5_scenes.c +++ b/src/world/area_sam/sam_05/sam_05_5_scenes.c @@ -217,7 +217,7 @@ EvtScript N(EVS_StarKidsFlee) = { EVT_IF_EQ(LVarA, -1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(SetNpcFoldParams, LVarA, FOLD_UPD_SET_ALPHA, LVar2, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, LVarA, IMGFX_SET_ALPHA, LVar2, 0, 0, 0) EVT_END_LOOP EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) diff --git a/src/world/area_sam/sam_06/sam_06_4_npc.c b/src/world/area_sam/sam_06/sam_06_4_npc.c index b69356615d..abf7bb7f4f 100644 --- a/src/world/area_sam/sam_06/sam_06_4_npc.c +++ b/src/world/area_sam/sam_06/sam_06_4_npc.c @@ -762,8 +762,8 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(InterpPlayerYaw, 229, 1) EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) - 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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_GET_IN_BED, 1, 1, 0) EVT_THREAD EVT_WAIT(60) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) @@ -784,7 +784,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(PlayerMoveTo, -347, -114, 0) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -309, -16, 0) diff --git a/src/world/area_sam/sam_11/sam_11_3_rooms.c b/src/world/area_sam/sam_11/sam_11_3_rooms.c index 614cde5ecd..651468d81c 100644 --- a/src/world/area_sam/sam_11/sam_11_3_rooms.c +++ b/src/world/area_sam/sam_11/sam_11_3_rooms.c @@ -48,7 +48,7 @@ EvtScript N(EVS_RoomListener_LeftHouse) = { EVT_CALL(MakeLerp, 0, 255, 20, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcFoldParams, NPC_Herringway, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Herringway, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP diff --git a/src/world/area_sam/sam_11/sam_11_5_npc.c b/src/world/area_sam/sam_11/sam_11_5_npc.c index 9e49e309e1..0034eccc91 100644 --- a/src/world/area_sam/sam_11/sam_11_5_npc.c +++ b/src/world/area_sam/sam_11/sam_11_5_npc.c @@ -206,7 +206,7 @@ EvtScript N(EVS_NpcInteract_Herringway) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Herringway_Idle) EVT_CALL(SetNpcPos, NPC_SELF, -217, 0, -38) EVT_END_THREAD - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ALPHA, 0, 0, 0, 0) EVT_SET(GB_StoryProgress, STORY_CH7_SPOKE_WITH_HERRINGWAY) EVT_CASE_LT(STORY_CH7_MAYOR_MURDER_SOLVED) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00D3) diff --git a/src/world/area_sam/sam_12/sam_12_4_scenes.c b/src/world/area_sam/sam_12/sam_12_4_scenes.c index 074595c4c7..34b156782b 100644 --- a/src/world/area_sam/sam_12/sam_12_4_scenes.c +++ b/src/world/area_sam/sam_12/sam_12_4_scenes.c @@ -70,10 +70,10 @@ EvtScript N(EVS_MerlarFlickering) = { EVT_USE_BUF(EVT_PTR(N(FlickeringStaticAmts))) EVT_LOOP(5) EVT_BUF_READ1(LVar0) - EVT_CALL(SetNpcFoldParams, NPC_Merlar, FOLD_UPD_HOLOGRAM, EVT_FLOAT(0.0), LVar0, EVT_FLOAT(200.0), EVT_FLOAT(100.0)) + EVT_CALL(SetNpcImgFXParams, NPC_Merlar, IMGFX_HOLOGRAM, EVT_FLOAT(0.0), LVar0, EVT_FLOAT(200.0), EVT_FLOAT(100.0)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcFoldParams, NPC_Merlar, FOLD_UPD_HOLOGRAM, EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(100.0)) + EVT_CALL(SetNpcImgFXParams, NPC_Merlar, IMGFX_HOLOGRAM, EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(100.0)) EVT_WAIT(1) EVT_END_LOOP EVT_GOTO(0) @@ -144,7 +144,7 @@ EvtScript N(EVS_Scene_MeetMerlar) = { EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(LOOPCOUNT_2) EVT_ADDF(LVar0, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcFoldParams, NPC_Merlar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Merlar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_EXEC_GET_TID(N(EVS_MerlarFlickering), LVar8) @@ -248,7 +248,7 @@ EvtScript N(EVS_Scene_MeetMerlar) = { EVT_SETF(LVar0, EVT_FLOAT(100.0)) EVT_LOOP(LOOPCOUNT_2) EVT_ADDF(LVar0, EVT_FLOAT(-100.0 / LOOPCOUNT_2)) - EVT_CALL(SetNpcFoldParams, NPC_Merlar, FOLD_UPD_SET_ALPHA, LVar0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Merlar, IMGFX_SET_ALPHA, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_Merlar, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_tik/tik_06/tik_06_4_entity.c b/src/world/area_tik/tik_06/tik_06_4_entity.c index 68c085bfc1..b01c0a98d1 100644 --- a/src/world/area_tik/tik_06/tik_06_4_entity.c +++ b/src/world/area_tik/tik_06/tik_06_4_entity.c @@ -11,7 +11,7 @@ EvtScript N(EVS_MonitorPlayerFallDown) = { EVT_IF_GE(LVar1, -10) EVT_GOTO(0) EVT_END_IF - EVT_CALL(func_802CA988, 0, LVar2, LVar3, LVar4, LVar5) + EVT_CALL(func_802CA988, CAM_DEFAULT, LVar2, LVar3, LVar4, LVar5) EVT_LABEL(1) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 581d879804..6a7ae013d1 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -53,10 +53,10 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -556, 180, 0) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_SET_ANIM, FOLD_ANIM_STARTLE, 2, 1, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ANIM, IMGFX_ANIM_STARTLE, 2, 1, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1E) EVT_WAIT(12 * DT) - EVT_CALL(SetNpcFoldParams, NPC_SELF, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim04) EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Black_Anim14, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00D2) diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index aea8e5e42a..bf5bc42777 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -89,10 +89,10 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(SetPlayerPos, -647, 0, 80) EVT_EXEC_WAIT(N(EVS_EnterMap)) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 270, 5) - EVT_CALL(SetNpcFoldParams, NPC_KoopaBros, FOLD_UPD_SET_ANIM, FOLD_ANIM_STARTLE, 2, 1, 0) + EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros, IMGFX_SET_ANIM, IMGFX_ANIM_STARTLE, 2, 1, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim1E) EVT_WAIT(12 * DT) - EVT_CALL(SetNpcFoldParams, NPC_KoopaBros, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04, 0, MSG_CH1_00D4) diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index 7c0735bd97..3716b143c9 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -2,7 +2,7 @@ #include "sprite.h" typedef struct FallingSprite { - /* 0x00 */ s32 foldStateID; + /* 0x00 */ s32 imgfxIdx; /* 0x04 */ s32 workerID; /* 0x08 */ s32 playerSpriteID; /* 0x0C */ s32 rasterID; @@ -15,7 +15,7 @@ BSS FallingSprite N(Falling); void N(appendGfx_FallingSprite)(void) { FallingSprite* falling = &N(Falling); - FoldImageRecPart recPart; + ImgFXTexture ifxImg; SpriteRasterInfo info; Matrix4f transformMtx; Matrix4f tempMtx; @@ -63,14 +63,14 @@ void N(appendGfx_FallingSprite)(void) { } spr_get_player_raster_info(&info, falling->playerSpriteID, falling->rasterID); - recPart.raster = info.raster; - recPart.palette = info.defaultPal; - recPart.width = info.width; - recPart.height = info.height; - recPart.xOffset = -(info.width / 2); - recPart.yOffset = (info.height / 2); - recPart.opacity = 255; - fold_appendGfx_component(falling->foldStateID, &recPart, 0, transformMtx); + ifxImg.raster = info.raster; + ifxImg.palette = info.defaultPal; + ifxImg.width = info.width; + ifxImg.height = info.height; + ifxImg.xOffset = -(info.width / 2); + ifxImg.yOffset = (info.height / 2); + ifxImg.alpha = 255; + imgfx_appendGfx_component(falling->imgfxIdx, &ifxImg, 0, transformMtx); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -86,13 +86,13 @@ API_CALLABLE(N(InitializeFallingSprite)) { falling->scale.x = SPRITE_WORLD_SCALE_F; falling->scale.y = SPRITE_WORLD_SCALE_F; falling->scale.z = SPRITE_WORLD_SCALE_F; - falling->foldStateID = func_8013A704(1); + falling->imgfxIdx = imgfx_get_free_instances(1); falling->workerID = create_worker_world(0, &N(appendGfx_FallingSprite)); return ApiStatus_DONE2; } API_CALLABLE(N(DeleteFallingSprite)) { - func_8013A854(N(Falling).foldStateID); + imgfx_release_instance(N(Falling).imgfxIdx); free_worker(N(Falling).workerID); return ApiStatus_DONE2; } diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c index 340ece7a1b..2bc4bdcc96 100644 --- a/src/world/area_trd/trd_05/trd_05_4_npc.c +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -31,11 +31,11 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) EVT_THREAD EVT_LOOP(8) - EVT_CALL(SetNpcFoldParams, NPC_KoopaBros_01, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) - EVT_CALL(SetNpcFoldParams, NPC_KoopaBros_02, FOLD_UPD_SET_ALPHA, 255, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_01, IMGFX_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_02, IMGFX_SET_ALPHA, 255, 0, 0, 0) EVT_WAIT(6 * DT) - EVT_CALL(SetNpcFoldParams, NPC_KoopaBros_01, FOLD_UPD_SET_ALPHA, 255, 0, 0, 0) - EVT_CALL(SetNpcFoldParams, NPC_KoopaBros_02, FOLD_UPD_SET_ALPHA, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_01, IMGFX_SET_ALPHA, 255, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_02, IMGFX_SET_ALPHA, 0, 0, 0, 0) EVT_WAIT(6 * DT) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index 75e073666c..73c2ce63b5 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -3,7 +3,7 @@ typedef struct FallingSprite { /* 0x00 */ s32 animationEnabled; - /* 0x04 */ s32 foldStateID; + /* 0x04 */ s32 imgfxIdx; /* 0x08 */ s32 workerID; /* 0x0C */ s32 playerSpriteID; /* 0x10 */ s32 rasterID; @@ -17,7 +17,7 @@ typedef struct FallingSprite { BSS FallingSprite N(Falling); void N(appendGfx_FallingSprite)(void) { - FoldImageRecPart foldImage; + ImgFXTexture ifxImg; SpriteRasterInfo rasterInfo; Matrix4f mtxTransform; Matrix4f mtxTemp; @@ -66,14 +66,14 @@ void N(appendGfx_FallingSprite)(void) { } spr_get_player_raster_info(&rasterInfo, falling->playerSpriteID, falling->rasterID); - foldImage.raster = rasterInfo.raster; - foldImage.palette = rasterInfo.defaultPal; - falling->width = foldImage.width = rasterInfo.width; - falling->height = foldImage.height = rasterInfo.height; - foldImage.xOffset = -(rasterInfo.width / 2); - foldImage.yOffset = rasterInfo.height / 2; - foldImage.opacity = 255; - fold_appendGfx_component(falling->foldStateID, &foldImage, 0, mtxTransform); + ifxImg.raster = rasterInfo.raster; + ifxImg.palette = rasterInfo.defaultPal; + falling->width = ifxImg.width = rasterInfo.width; + falling->height = ifxImg.height = rasterInfo.height; + ifxImg.xOffset = -(rasterInfo.width / 2); + ifxImg.yOffset = rasterInfo.height / 2; + ifxImg.alpha = 255; + imgfx_appendGfx_component(falling->imgfxIdx, &ifxImg, 0, mtxTransform); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } @@ -94,13 +94,13 @@ API_CALLABLE(N(InitializeFallingSprite)) { falling->scale.y = SPRITE_WORLD_SCALE_F; falling->scale.z = SPRITE_WORLD_SCALE_F; - falling->foldStateID = func_8013A704(1); + falling->imgfxIdx = imgfx_get_free_instances(1); falling->workerID = create_worker_world(0, &N(appendGfx_FallingSprite)); return ApiStatus_DONE2; } API_CALLABLE(N(DeleteFallingSprite)) { - func_8013A854(N(Falling).foldStateID); + imgfx_release_instance(N(Falling).imgfxIdx); free_worker(N(Falling).workerID); return ApiStatus_DONE2; } diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c index 4f781ff8dc..cfdaa0915c 100644 --- a/src/world/area_trd/trd_10/trd_10_2_npc.c +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -66,10 +66,10 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -32, 0, 0) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -88, 0, 15 * DT) EVT_WAIT(10 * DT) - EVT_CALL(SetNpcFoldParams, NPC_KoopaBros_01, FOLD_UPD_SET_ANIM, FOLD_ANIM_STARTLE, 2, 1, 0) + EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_01, IMGFX_SET_ANIM, IMGFX_ANIM_STARTLE, 2, 1, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim1E) EVT_WAIT(12 * DT) - EVT_CALL(SetNpcFoldParams, NPC_KoopaBros_01, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_01, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim02, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00F4) diff --git a/src/world/area_tst/tst_11/tst_11_2_extra.c b/src/world/area_tst/tst_11/tst_11_2_extra.c index ea12f07a4a..6fc2f63025 100644 --- a/src/world/area_tst/tst_11/tst_11_2_extra.c +++ b/src/world/area_tst/tst_11/tst_11_2_extra.c @@ -120,9 +120,9 @@ void N(appendGfx_test_reflection_floor)(void* data) { guTranslateF(sp60, playerStatus->position.x, playerStatus->position.y, 0.0f); guMtxCatF(sp20, sp60, sp20); trueAnimation = playerStatus->trueAnimation; - func_802DDFF8(trueAnimation, FOLD_UPD_SET_ALPHA, 255, 255, 255, 20, 0); + set_player_imgfx_all(trueAnimation, IMGFX_SET_ALPHA, 255, 255, 255, 20, 0); spr_draw_player_sprite(PLAYER_SPRITE_AUX1, 0, 0, 0, sp20); - func_802DDFF8(trueAnimation, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_all(trueAnimation, IMGFX_CLEAR, 0, 0, 0, 0, 0); } API_CALLABLE(N(PartnerReflectTest)) { diff --git a/src/world/area_tst/tst_13/tst_13_1_main.c b/src/world/area_tst/tst_13/tst_13_1_main.c index 0d964ecc2b..2e7146cd60 100644 --- a/src/world/area_tst/tst_13/tst_13_1_main.c +++ b/src/world/area_tst/tst_13/tst_13_1_main.c @@ -315,7 +315,7 @@ s32 N(BetaPanelData)[] = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_TESTING) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) diff --git a/src/world/common/complete/KnockDownPlayer.inc.c b/src/world/common/complete/KnockDownPlayer.inc.c index 4808ce286c..e39f8e7251 100644 --- a/src/world/common/complete/KnockDownPlayer.inc.c +++ b/src/world/common/complete/KnockDownPlayer.inc.c @@ -6,8 +6,8 @@ #endif void N(gfx_build_knocked_down_player)(void) { - UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); - FoldImageRecPart part; + KnockdownData* data = (KnockdownData*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); + ImgFXTexture ifxImg; SpriteRasterInfo rasterInfo; Matrix4f sp40, sp80; @@ -27,114 +27,114 @@ void N(gfx_build_knocked_down_player)(void) { gDPSetCombineKey(gMainGfxPos++, G_CK_NONE); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); - guTranslateF(sp40, temp_v0->pos.x, temp_v0->pos.y, temp_v0->pos.z); - guRotateF(sp80, temp_v0->rot.y, 0.0f, 1.0f, 0.0f); + guTranslateF(sp40, data->pos.x, data->pos.y, data->pos.z); + guRotateF(sp80, data->rot.y, 0.0f, 1.0f, 0.0f); guMtxCatF(sp80, sp40, sp40); - guRotateF(sp80, temp_v0->rot.z, 0.0f, 0.0f, 1.0f); + guRotateF(sp80, data->rot.z, 0.0f, 0.0f, 1.0f); guMtxCatF(sp80, sp40, sp40); - guRotateF(sp80, temp_v0->rot.x, 1.0f, 0.0f, 0.0f); + guRotateF(sp80, data->rot.x, 1.0f, 0.0f, 0.0f); guMtxCatF(sp80, sp40, sp40); - guScaleF(sp80, temp_v0->scale.x, temp_v0->scale.y, temp_v0->scale.z); + guScaleF(sp80, data->scale.x, data->scale.y, data->scale.z); guMtxCatF(sp80, sp40, sp40); guMtxF2L(sp40, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, OS_K0_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - spr_get_player_raster_info(&rasterInfo, temp_v0->spriteIndex, temp_v0->rasterIndex); - part.raster = rasterInfo.raster; - part.palette = rasterInfo.defaultPal; - temp_v0->unk_34 = part.width = rasterInfo.width; - temp_v0->unk_38 = part.height = rasterInfo.height; - part.xOffset = -(s32) (rasterInfo.width * 0.5f); - part.yOffset = rasterInfo.height; - part.opacity = 255; + spr_get_player_raster_info(&rasterInfo, data->spriteIndex, data->rasterIndex); + ifxImg.raster = rasterInfo.raster; + ifxImg.palette = rasterInfo.defaultPal; + data->width = ifxImg.width = rasterInfo.width; + data->height = ifxImg.height = rasterInfo.height; + ifxImg.xOffset = -(s32) (rasterInfo.width * 0.5f); + ifxImg.yOffset = rasterInfo.height; + ifxImg.alpha = 255; - fold_appendGfx_component(temp_v0->foldID, &part, 0, sp40); + imgfx_appendGfx_component(data->imgfxIdx, &ifxImg, 0, sp40); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } -ApiStatus N(KnockDownPlayerB)(Evt* script) { +ApiStatus N(KnockdownCreate)(Evt* script) { Bytecode* args = script->ptrReadPos; s32 spriteIndex = evt_get_variable(script, *args++); s32 rasterIndex = evt_get_variable(script, *args++); - UnkEntityStruct* temp_v0 = heap_malloc(sizeof(*temp_v0)); + KnockdownData* data = heap_malloc(sizeof(*data)); - temp_v0->spriteIndex = spriteIndex; - temp_v0->rasterIndex = rasterIndex; - temp_v0->unk_34 = gPlayerStatus.colliderHeight; - temp_v0->unk_38 = gPlayerStatus.colliderDiameter; - temp_v0->pos.x = gPlayerStatus.position.x; - temp_v0->pos.y = gPlayerStatus.position.y; - temp_v0->pos.z = gPlayerStatus.position.z; - temp_v0->rot.x = 0.0f; - temp_v0->rot.y = 0.0f; - temp_v0->rot.z = 0.0f; - temp_v0->scale.x = SPRITE_WORLD_SCALE_F; - temp_v0->scale.y = SPRITE_WORLD_SCALE_F; - temp_v0->scale.z = SPRITE_WORLD_SCALE_F; - temp_v0->foldID = func_8013A704(1); - temp_v0->entityID = create_worker_world(0, N(gfx_build_knocked_down_player)); - evt_set_variable(script, KNOCK_DOWN_MAP_VAR, (s32) temp_v0); + data->spriteIndex = spriteIndex; + data->rasterIndex = rasterIndex; + data->width = gPlayerStatus.colliderHeight; + data->height = gPlayerStatus.colliderDiameter; + data->pos.x = gPlayerStatus.position.x; + data->pos.y = gPlayerStatus.position.y; + data->pos.z = gPlayerStatus.position.z; + data->rot.x = 0.0f; + data->rot.y = 0.0f; + data->rot.z = 0.0f; + data->scale.x = SPRITE_WORLD_SCALE_F; + data->scale.y = SPRITE_WORLD_SCALE_F; + data->scale.z = SPRITE_WORLD_SCALE_F; + data->imgfxIdx = imgfx_get_free_instances(1); + data->workerID = create_worker_world(0, N(gfx_build_knocked_down_player)); + evt_set_variable(script, KNOCK_DOWN_MAP_VAR, (s32) data); return ApiStatus_DONE2; } -API_CALLABLE(N(KnockDownPlayerC)) { - UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL,KNOCK_DOWN_MAP_VAR); +API_CALLABLE(N(KnockdownDestroy)) { + KnockdownData* data = (KnockdownData*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); - func_8013A854(temp_v0->foldID); - free_worker(temp_v0->entityID); - heap_free(temp_v0); + imgfx_release_instance(data->imgfxIdx); + free_worker(data->workerID); + heap_free(data); evt_set_variable(script, KNOCK_DOWN_MAP_VAR, NULL); return ApiStatus_DONE2; } -API_CALLABLE(N(KnockDownPlayerD)) { +API_CALLABLE(N(KnockdownSetPos)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_float_variable(script, *args++); s32 y = evt_get_float_variable(script, *args++); s32 z = evt_get_float_variable(script, *args++); - UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); + KnockdownData* data = (KnockdownData*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); - temp_v0->pos.x = x; - temp_v0->pos.y = y; - temp_v0->pos.z = z; + data->pos.x = x; + data->pos.y = y; + data->pos.z = z; return ApiStatus_DONE2; } -API_CALLABLE(N(KnockDownPlayerE)) { +API_CALLABLE(N(KnockdownSetRot)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_float_variable(script, *args++); s32 y = evt_get_float_variable(script, *args++); s32 z = evt_get_float_variable(script, *args++); - UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); + KnockdownData* data = (KnockdownData*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); - temp_v0->rot.x = x; - temp_v0->rot.y = y; - temp_v0->rot.z = z; + data->rot.x = x; + data->rot.y = y; + data->rot.z = z; return ApiStatus_DONE2; } -API_CALLABLE(N(KnockDownPlayerF)) { +API_CALLABLE(N(KnockdownSetScale)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_float_variable(script, *args++); s32 y = evt_get_float_variable(script, *args++); s32 z = evt_get_float_variable(script, *args++); - UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); + KnockdownData* data = (KnockdownData*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); - temp_v0->scale.x = x; - temp_v0->scale.y = y; - temp_v0->scale.z = z; + data->scale.x = x; + data->scale.y = y; + data->scale.z = z; return ApiStatus_DONE2; } -API_CALLABLE(N(KnockDownPlayerG)) { +API_CALLABLE(N(KnockdownSetRaster)) { Bytecode* args = script->ptrReadPos; s32 spriteIndex = evt_get_variable(script, *args++); s32 rasterIndex = evt_get_variable(script, *args++); - UnkEntityStruct* temp_v0 = (UnkEntityStruct*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); + KnockdownData* data = (KnockdownData*) evt_get_variable(NULL, KNOCK_DOWN_MAP_VAR); - temp_v0->spriteIndex = spriteIndex; - temp_v0->rasterIndex = rasterIndex; + data->spriteIndex = spriteIndex; + data->rasterIndex = rasterIndex; return ApiStatus_DONE2; } diff --git a/src/world/common/enemy/ai/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c index 794f71f0e4..c3cc64747c 100644 --- a/src/world/common/enemy/ai/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -128,7 +128,7 @@ void N(MagikoopaAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol } if (enemy->varTable[0] == 0) { if (npc->duration >= 20) { - func_802DE894(npc->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, 0); npc->alpha = 255; npc->scale.x = 1.0f; npc->scale.y = 1.0f; @@ -311,7 +311,7 @@ API_CALLABLE(N(MagikoopaAI_OnPlayerWon)) { Npc* npc = get_npc_unsafe(enemy->npcID); npc->alpha = 255; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/common/enemy/ai/SentinelAI.inc.c b/src/world/common/enemy/ai/SentinelAI.inc.c index 5676add07e..c3ad225215 100644 --- a/src/world/common/enemy/ai/SentinelAI.inc.c +++ b/src/world/common/enemy/ai/SentinelAI.inc.c @@ -131,7 +131,7 @@ void N(SentinelAI_Descend)(Evt* script, MobileAISettings* aiSettings, EnemyDetec npc->rotation.y -= 360.0; } color = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); - func_802DE894(npc->spriteInstanceID, FOLD_UPD_SET_COLOR, color, color, color, 255, 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_SET_COLOR, color, color, color, 255, 0); posX = gPlayerStatusPtr->position.x; posY = gPlayerStatusPtr->position.y; @@ -160,7 +160,7 @@ void N(SentinelAI_LosePlayerInit)(Evt* script, MobileAISettings* aiSettings, Ene Npc* npc = get_npc_unsafe(enemy->npcID); enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; - func_802DE894(npc->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, 0); if (enemy->varTable[0] & SENTINEL_AI_FLAG_PLAYING_SOUND) { sfx_stop_sound(SOUND_80000011); enemy->varTable[0] &= ~SENTINEL_AI_FLAG_PLAYING_SOUND; @@ -299,7 +299,7 @@ API_CALLABLE(N(SentinelAI_Main)) { switch (script->AI_TEMP_STATE) { case AI_STATE_SENTINEL_WANDER_INIT: N(FlyingAI_WanderInit)(script, aiSettings, territoryPtr); - func_802DE894(npc->spriteInstanceID, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_npc_imgfx_all(npc->spriteInstanceID, IMGFX_CLEAR, 0, 0, 0, 0, 0); // fallthrough case AI_STATE_SENTINEL_WANDER: N(FlyingAI_Wander)(script, aiSettings, territoryPtr); diff --git a/src/world/common/entity/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c index d2667f2a3d..9e2fc5a7e9 100644 --- a/src/world/common/entity/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -128,8 +128,8 @@ EvtScript N(EVS_Pipe_EnterVertical) = { EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) EVT_CALL(InterpPlayerYaw, LVar4, 0) EVT_CALL(PlaySound, SOUND_ENTER_PIPE) - EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_REVERSE_ANIM) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Still, FOLD_UPD_SET_ANIM, FOLD_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_REVERSE_ANIM) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Still, IMGFX_SET_ANIM, IMGFX_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(40) EVT_ADD(LVar1, 1) @@ -150,7 +150,7 @@ EvtScript N(EVS_Pipe_EnterVertical) = { EVT_END_THREAD EVT_END_IF EVT_WAIT(2) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Still, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Still, IMGFX_CLEAR, 0, 0, 0, 0) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerPhysics, FALSE) @@ -202,8 +202,8 @@ EvtScript N(EVS_Pipe_EnterHorizontal) = { EVT_WAIT(25) EVT_CALL(HidePlayerShadow, FALSE) EVT_END_THREAD - EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_REVERSE_ANIM | FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_SET_ANIM, FOLD_ANIM_HORIZONTAL_PIPE_CURL, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_REVERSE_ANIM | IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_HORIZONTAL_PIPE_CURL, 1, 1, 0) EVT_LOOP(40) EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0)) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -220,7 +220,7 @@ EvtScript N(EVS_Pipe_EnterHorizontal) = { EVT_END_THREAD EVT_END_IF EVT_WAIT(5) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(ModifyColliderFlags, 1, LVarB, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(DisablePlayerPhysics, FALSE) @@ -278,8 +278,8 @@ EvtScript N(EVS_Pipe_ExitVertical_Impl) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - 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_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Idle, IMGFX_SET_ANIM, IMGFX_ANIM_VERTICAL_PIPE_CURL, 1, 1, 0) EVT_WAIT(25) EVT_EXEC_WAIT(LVarC) EVT_RETURN @@ -328,8 +328,8 @@ EvtScript N(EVS_Pipe_ExitHorizontal) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, LVar6, LVar7) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) - EVT_CALL(SetPlayerFoldFlags, FOLD_STATE_FLAG_800) - EVT_CALL(UpdatePlayerFold, ANIM_Mario1_Still, FOLD_UPD_SET_ANIM, FOLD_ANIM_HORIZONTAL_PIPE_CURL, 1, 1, 0) + EVT_CALL(SetPlayerImgFXFlags, IMGFX_FLAG_800) + EVT_CALL(UpdatePlayerImgFX, ANIM_Mario1_Still, IMGFX_SET_ANIM, IMGFX_ANIM_HORIZONTAL_PIPE_CURL, 1, 1, 0) EVT_THREAD EVT_WAIT(8) EVT_CALL(HidePlayerShadow, TRUE) diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c b/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c index 2f610d3e85..b7445d8d40 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_MT_LAVALAVA) EVT_CALL(SetSpriteShading, SHADING_KZN_17) - EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_MODE_3, 25, 16, 4096) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, CAM_UPDATE_FROM_ZONE, 25, 16, 4096) EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c index fb8c126be4..8368022cb2 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c @@ -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(SetNpcFoldParams, NPC_Kolorado, FOLD_UPD_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kolorado, IMGFX_SET_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(SetNpcFoldParams, NPC_Kolorado, FOLD_UPD_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) + EVT_CALL(SetNpcImgFXParams, NPC_Kolorado, IMGFX_SET_WAVY, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) EVT_RETURN EVT_END }; diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index 38739d865a..ce9666325a 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -281,7 +281,7 @@ API_CALLABLE(N(UseAbility)) { bow->duration--; if (bow->duration == 0) { bow->yaw = playerStatus->targetYaw; - npc_set_fold_params(bow, FOLD_UPD_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); + npc_set_imgfx_params(bow, IMGFX_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); suggest_player_anim_always_forward(ANIM_Mario1_Crouch); sfx_play_sound_at_npc(SOUND_BOW_VANISH, SOUND_SPACE_MODE_0, NPC_PARTNER); script->USE_STATE = OUTTA_SIGHT_VANISH; @@ -303,7 +303,7 @@ API_CALLABLE(N(UseAbility)) { } get_shadow_by_index(bow->shadowIndex)->alpha = playerStatus->alpha1 >> 1; - npc_set_fold_params(bow, FOLD_UPD_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); + npc_set_imgfx_params(bow, IMGFX_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); bow->pos.x = playerStatus->position.x - N(OuttaSightPosX); bow->pos.y = playerStatus->position.y - N(OuttaSightPosY); bow->pos.z = playerStatus->position.z - N(OuttaSightPosZ); @@ -367,7 +367,7 @@ void N(end_outta_sight_cleanup)(Npc* bow) { s32 actionState; playerStatus->alpha1 = 255; - npc_set_fold_params(bow, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + npc_set_imgfx_params(bow, IMGFX_CLEAR, 0, 0, 0, 0, 0); bow->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; get_shadow_by_index(bow->shadowIndex)->alpha = playerStatus->alpha1 / 2; diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index 0711794e93..ad05d8d8e4 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -281,8 +281,8 @@ void N(update_riding_physics)(Npc* sushie) { if (!N(IsUnderwater) && (playerStatus->position.y + (playerStatus->colliderHeight * 0.5f) < N(WaterSurfaceY))) { N(IsUnderwater) = TRUE; playerStatus->renderMode = RENDER_MODE_ALPHATEST; - func_802DDFF8(playerStatus->trueAnimation, FOLD_UPD_WAVY, 2, 0, 0, 0, 0); - npc_set_fold_params(sushie, FOLD_UPD_WAVY, 2, 0, 0, 0, 0); + set_player_imgfx_all(playerStatus->trueAnimation, IMGFX_SET_WAVY, 2, 0, 0, 0, 0); + npc_set_imgfx_params(sushie, IMGFX_SET_WAVY, 2, 0, 0, 0, 0); } if (N(DiveTime) >= 10) { if (!(partnerStatus->currentButtons & BUTTON_C_DOWN) || N(DiveTime) >= 30) { @@ -316,8 +316,8 @@ void N(update_riding_physics)(Npc* sushie) { if ((N(WaterSurfaceY) - sushie->moveToPos.y) - (sushie->collisionHeight * 0.5f) <= 0.0f) { if (N(IsUnderwater)) { N(IsUnderwater) = FALSE; - func_802DDFF8(ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); - npc_set_fold_params(sushie, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_all(ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0, 0); + npc_set_imgfx_params(sushie, IMGFX_CLEAR, 0, 0, 0, 0, 0); } N(DiveState) = DIVE_STATE_NONE; sushie->currentAnim = ANIM_WorldSushie_Ride; @@ -411,7 +411,7 @@ API_CALLABLE(N(UseAbility)) { suggest_player_anim_always_forward(ANIM_MarioW2_RideSushie); disable_player_shadow(); disable_npc_shadow(sushie); - npc_set_fold_params(sushie, FOLD_UPD_WAVY, 2, 0, 0, 0, 0); + npc_set_imgfx_params(sushie, IMGFX_SET_WAVY, 2, 0, 0, 0, 0); sushie->currentAnim = ANIM_WorldSushie_Ride; sushie->moveSpeed = playerStatus->runSpeed; sushie->jumpScale = 0.0f; @@ -487,7 +487,7 @@ API_CALLABLE(N(UseAbility)) { sushie->flags |= NPC_FLAG_8; sushie->flags &= ~(NPC_FLAG_GRAVITY | NPC_FLAG_IGNORE_WORLD_COLLISION); disable_npc_shadow(sushie); - npc_set_fold_params(sushie, FOLD_UPD_WAVY, 2, 0, 0, 0, 0); + npc_set_imgfx_params(sushie, IMGFX_SET_WAVY, 2, 0, 0, 0, 0); sushie->currentAnim = ANIM_WorldSushie_Ride; playerStatus->flags |= PS_FLAG_MOVEMENT_LOCKED; dist = dist2D(playerStatus->position.x, playerStatus->position.z, sushie->moveToPos.x, sushie->moveToPos.z); @@ -722,8 +722,8 @@ API_CALLABLE(N(UseAbility)) { gGameStatusPtr->keepUsingPartnerOnMapChange = FALSE; partnerStatus->partnerActionState = PARTNER_ACTION_NONE; partnerStatus->actingPartner = 0; - func_802DDFF8(ANIM_Mario1_Idle, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); - npc_set_fold_params(sushie, FOLD_UPD_CLEAR, 0, 0, 0, 0, 0); + set_player_imgfx_all(ANIM_Mario1_Idle, IMGFX_CLEAR, 0, 0, 0, 0, 0); + npc_set_imgfx_params(sushie, IMGFX_CLEAR, 0, 0, 0, 0, 0); return ApiStatus_DONE1; } sushie->duration--; diff --git a/src/world/world.c b/src/world/world.c index 807e50ce2b..de98d79697 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -213,10 +213,10 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { } gCurrentCameraID = CAM_DEFAULT; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; - gCameras[CAM_3].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED; + gCameras[CAM_3].flags |= CAMERA_FLAG_DISABLED; if (gGameStatusPtr->creditsViewportMode == -1) { set_cam_viewport(0, 12, 20, 296, 200); diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index c2ff5a5bb5..a0c5268672 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -155,7 +155,7 @@ dead_CreatePushBlockGrid = 0x80283420; dead_SetPushBlock = 0x8028364C; dead_GetSelfAnimationFromTable = 0x800497E4; dead_SelfEnemyOverrideSyncPos = 0x80049630; -dead_SetNpcFoldParams = 0x802DD290; +dead_SetNpcImgFXParams = 0x802DD290; dead_SetGroupVisibility = 0x802D6788; dead_GetCamDistance = 0x802D9578; dead_GetCamPitch = 0x802D94E8; @@ -209,8 +209,8 @@ dead_SetSelfVar = 0x8004930C; dead_GetSelfVar = 0x80049370; dead_GetPlayerTargetYaw = 0x802DF348; dead_HidePlayerShadow = 0x802DE3C0; -dead_SetPlayerFoldFlags = 0x802DFEB8; -dead_UpdatePlayerFold = 0x802DFB40; +dead_SetPlayerImgFXFlags = 0x802DFEB8; +dead_UpdatePlayerImgFX = 0x802DFB40; dead_SetPlayerFlagBits = 0x802DF380; dead_func_80044238 = 0x800482D8; dead_SetCamType = 0x802D8FA8; diff --git a/ver/ique/asm/bss3.s b/ver/ique/asm/bss3.s index 5bb60f351f..aa5019a8e0 100644 --- a/ver/ique/asm/bss3.s +++ b/ver/ique/asm/bss3.s @@ -555,16 +555,16 @@ dlabel screen_overlay_backZoom dlabel D_80156910 .space 0x00000010 -dlabel D_80156920 +dlabel ImgFXCurrentTexture .space 0x00000028 -dlabel D_80156948 +dlabel ImgFXVtxBuffers .space 8 -dlabel fold_vtxBuf +dlabel imgfx_vtxBuf .space 4 -dlabel D_80156954 +dlabel ImgFXInstances .space 4 dlabel D_80156958 @@ -579,10 +579,10 @@ dlabel D_80156968 dlabel D_80156970 .space 0x00000010 -dlabel FoldAnimHeaders +dlabel ImgFXAnimHeaders .space 0x000005a0 -dlabel fold_gfxDataCache +dlabel ImgFXDataCache .space 0x00000040 dlabel gHudElementsWorld @@ -660,7 +660,7 @@ dlabel wSpriteShadingProfileAux dlabel bSpriteShadingProfileAux .space 0x000000b0 -dlabel D_80159880 +dlabel SpriteShadingPalette .space 0x00000020 dlabel wEnvSounds diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index 6d0755cb00..8cafc1fe86 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -595,7 +595,7 @@ gHudElementCacheSize = 0x8014facc; gHudElementCacheTablePalette = 0x8014fa60; gGameStatusPtr = 0x80072e0c; gEncounterState = 0x800991cc; -fold_appendGfx_component = 0x80139700; +imgfx_appendGfx_component = 0x80139700; get_msg_properties = 0x801242f8; appendGfx_message = 0x80126140; msg_draw_char = 0x8012a75c; @@ -643,10 +643,10 @@ gCurrentCameraID = 0x80076070; clamp_angle = 0x800297f4; add_vec2D_polar = 0x80029c6c; gHudElementSizes = 0x8014d75c; -fold_update = 0x8013922c; +imgfx_update = 0x8013922c; D_8014F0C8 = 0x8014d858; nuGfxCfb_ptr = 0x80099224; -D_80159880 = 0x8015bc00; +SpriteShadingPalette = 0x8015bc00; gCameras = 0x800b07d0; dma_load_msg = 0x80123b70; D_80154520 = 0x80154520; diff --git a/ver/ique/undefined_syms.txt b/ver/ique/undefined_syms.txt index 713fade632..01615b0712 100644 --- a/ver/ique/undefined_syms.txt +++ b/ver/ique/undefined_syms.txt @@ -813,7 +813,7 @@ is_ability_active = 0x800e8128; SetNpcFlagBits = 0x802cf060; SetNpcRotation = 0x802cddb0; -SetNpcFoldParams = 0x802cfd30; +SetNpcImgFXParams = 0x802cfd30; npc_raycast_down_sides = 0x800daf5c; @@ -839,7 +839,7 @@ draw_status_ui = 0x800e7b1c; evt_get_float_variable = 0x802c842c; func_800E97E4 = 0x800e7bc4; func_800EF3D4 = 0x800ed7b4; -func_802DE894 = 0x802de894; +set_npc_imgfx_all = 0x802de894; func_802DDEC4 = 0x802ddec4; gBackgroundFogModePtr = 0x8014fa80; gBackgroundImage = 0x80200000; @@ -1036,7 +1036,7 @@ TranslateGroup = 0x802c97b4; SetMotionBlurParams = 0x802d7cf8; ClearAmbientSounds = 0x802d60e8; SetMusicTrack = 0x802d5d4c; -UpdatePlayerFold = 0x802d2520; +UpdatePlayerImgFX = 0x802d2520; SetPlayerAnimation = 0x802d1084; EnableNpcShadow = 0x802cf268; DisablePlayerPhysics = 0x802d0de4; @@ -1045,7 +1045,7 @@ SetPlayerPos = 0x802d0ef0; InterpPlayerYaw = 0x802d193c; UseSettingsFrom = 0x802cb860; GetCurrentPartnerID = 0x802cfc74; -SetPlayerFoldFlags = 0x802d286c; +SetPlayerImgFXFlags = 0x802d286c; EnablePartnerAI = 0x802cf52c; GetPartnerInUse = 0x802d2b0c; InterruptUsePartner = 0x802d2b6c; @@ -1143,7 +1143,7 @@ entity_sbk_omo_ROM_START = 0x00e78190; entity_jan_iwa_ROM_END = 0x00e78190; entity_default_ROM_START = 0x00e73f70; entity_default_ROM_END = 0x00e76170; -fold_gfx_data_ROM_START = 0x00294870; +imgfx_gfx_data_ROM_START = 0x00294870; sort_items = 0x800e5aac; suggest_player_anim_always_forward = 0x800de358; add_item = 0x800e5954; diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index a5de2b7a82..a0b6ae33d7 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -157,7 +157,7 @@ spr_update_sprite = 0x80111DFC; spr_draw_npc_sprite = 0x80111F28; spr_get_notify_value = 0x80112118; spr_free_sprite = 0x80112138; -func_802DE894 = 0x801123E4; +set_npc_imgfx_all = 0x801123E4; spr_get_npc_palettes = 0x80112590; spr_get_npc_color_variations = 0x801125BC; update_entities = 0x801148E0; @@ -231,7 +231,7 @@ render_screen_overlay_backUI = 0x8013D2D0; set_map_transition_effect = 0x8013D350; update_exit_map_screen_overlay = 0x8013D35C; update_enter_map_screen_overlay = 0x8013D684; -func_8013A6E8 = 0x8013F798; +imgfx_update_cache = 0x8013F798; hud_element_clear_cache = 0x801461B0; init_hud_element_list = 0x801463B0; hud_element_create = 0x80146554; @@ -346,7 +346,7 @@ SetNpcAnimation = 0x802CE0F4; SetNpcYaw = 0x802CEA84; SetNpcFlagBits = 0x802CF060; GetNpcPos = 0x802CF0F4; -SetNpcFoldParams = 0x802CFD30; +SetNpcImgFXParams = 0x802CFD30; GetPlayerPos = 0x802D1DFC; PlaySound = 0x802D6150; D_802D9D70 = 0x802D9D70; diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index 01f5b667ba..fa0099ec04 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -64,7 +64,7 @@ set_npc_yaw = 0x8003B830; npc_set_palswap_mode_A = 0x8003B8C0; npc_set_palswap_1 = 0x8003B93C; npc_set_palswap_2 = 0x8003B954; -npc_set_fold_params = 0x8003DB14; +npc_set_imgfx_params = 0x8003DB14; spawn_surface_effects = 0x8003DB50; init_encounter_status = 0x8003E828; kill_enemy = 0x8003EC9C; @@ -438,10 +438,10 @@ clear_screen_overlays = 0x80136CA8; set_map_transition_effect = 0x80136E40; update_exit_map_screen_overlay = 0x80136E4C; func_80138D88 = 0x80137928; -func_8013A704 = 0x801392A4; -func_8013A854 = 0x801393F4; -fold_update = 0x8013963C; -fold_appendGfx_component = 0x80139B10; +imgfx_get_free_instances = 0x801392A4; +imgfx_release_instance = 0x801393F4; +imgfx_update = 0x8013963C; +imgfx_appendGfx_component = 0x80139B10; hud_element_clear_cache = 0x8013FCA0; hud_element_create = 0x80140054; hud_element_draw_clipped = 0x80143358; @@ -1037,8 +1037,8 @@ PutPartnerAway = 0x802D2988; GetCurrentPartnerID = 0x802D2C74; PartnerCanUseAbility = 0x802D2CA0; PartnerIsFlying = 0x802D2CE8; -SetNpcFoldParams = 0x802D2D30; -SetNpcFoldFlags = 0x802D2E2C; +SetNpcImgFXParams = 0x802D2D30; +SetNpcImgFXFlags = 0x802D2E2C; SetNpcPaletteSwapMode = 0x802D2E80; SetNpcPaletteSwapLower = 0x802D2EEC; SetNpcPaletteSwapping = 0x802D2FC0; @@ -1089,8 +1089,8 @@ func_802D2484 = 0x802D5484; IsPlayerOnValidFloor = 0x802D549C; WaitForPlayerMoveToComplete = 0x802D54F4; WaitForPlayerInputEnabled = 0x802D5508; -UpdatePlayerFold = 0x802D5520; -SetPlayerFoldFlags = 0x802D586C; +UpdatePlayerImgFX = 0x802D5520; +SetPlayerImgFXFlags = 0x802D586C; FacePlayerTowardPoint = 0x802D5884; DisablePulseStone = 0x802D5AA8; GetPartnerInUse = 0x802D5B0C; @@ -1265,12 +1265,12 @@ StarShrineLightBeamAlpha = 0x802E0032; spr_init_sprites = 0x802E3BD8; spr_update_player_sprite = 0x802E3D6C; spr_draw_player_sprite = 0x802E3F20; -func_802DDEE4 = 0x802E41C4; -func_802DDFF8 = 0x802E42D8; +set_player_imgfx_comp = 0x802E41C4; +set_player_imgfx_all = 0x802E42D8; spr_get_player_raster_info = 0x802E4324; -func_802DE780 = 0x802E4A60; -func_802DE894 = 0x802E4B74; -func_802DE8DC = 0x802E4BBC; +set_npc_imgfx_comp = 0x802E4A60; +set_npc_imgfx_all = 0x802E4B74; +spr_get_comp_position = 0x802E4BBC; spr_get_npc_raster_info = 0x802E4CB8; spr_allocateBtlComponentsOnWorldHeap = 0x802E5804; entity_upgrade_block_hide_content = 0x802EB990; diff --git a/ver/us/asm/bss3.s b/ver/us/asm/bss3.s index bc03a6b182..ba26436476 100644 --- a/ver/us/asm/bss3.s +++ b/ver/us/asm/bss3.s @@ -550,16 +550,16 @@ dlabel screen_overlay_backZoom dlabel D_80156910 .space 0x00000010 -dlabel D_80156920 +dlabel ImgFXCurrentTexture .space 0x00000028 -dlabel D_80156948 +dlabel ImgFXVtxBuffers .space 8 -dlabel fold_vtxBuf +dlabel imgfx_vtxBuf .space 4 -dlabel D_80156954 +dlabel ImgFXInstances .space 4 dlabel D_80156958 @@ -574,10 +574,10 @@ dlabel D_80156968 dlabel D_80156970 .space 0x00000010 -dlabel FoldAnimHeaders +dlabel ImgFXAnimHeaders .space 0x000005a0 -dlabel fold_gfxDataCache +dlabel ImgFXDataCache .space 0x00000040 dlabel gHudElementsWorld @@ -655,7 +655,7 @@ dlabel wSpriteShadingProfileAux dlabel bSpriteShadingProfileAux .space 0x000000b0 -dlabel D_80159880 +dlabel SpriteShadingPalette .space 0x00000020 dlabel wEnvSounds diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 938959a1f9..a194fee99b 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -2596,7 +2596,7 @@ segments: - [0x2435F0, ia8, title/tape, 128, 128] - [0x2475F0, ci8, title/bowser_silhouette, 128, 128] - [0x24B5F0, palette, title/bowser_silhouette] - - [0x24B7F0, bin, fold_gfx_data] # TODO extract into better format? + - [0x24B7F0, bin, imgfx_gfx_data] # TODO extract into better format? - [0x315B80, pm_sprite_shading_profiles, sprite_shading_profiles] - type: code start: 0x3169F0 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 31fb190b6d..1a4894d694 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -310,7 +310,7 @@ npc_find_closest_simple = 0x8003D0C4; // type:func rom:0x184C4 npc_find_standing_on_entity = 0x8003D1D4; // type:func rom:0x185D4 npc_get_collider_below = 0x8003D2F8; // type:func rom:0x186F8 func_8003D3BC = 0x8003D3BC; // type:func rom:0x187BC -npc_set_fold_params = 0x8003D624; // type:func rom:0x18A24 +npc_set_imgfx_params = 0x8003D624; // type:func rom:0x18A24 spawn_surface_effects = 0x8003D660; // type:func rom:0x18A60 spawn_default_surface_effects = 0x8003D788; // type:func rom:0x18B88 spawn_flower_surface_effects = 0x8003DA38; // type:func rom:0x18E38 @@ -4312,36 +4312,36 @@ func_80138740 = 0x80138740; // type:func rom:0xCEE40 func_80138D88 = 0x80138D88; // type:func rom:0xCF488 func_80138E54 = 0x80138E54; // type:func rom:0xCF554 func_80139F10 = 0x80139F10; // type:func rom:0xD0610 -fold_set_vtx_buf_capacity = 0x8013A370; // type:func rom:0xD0A70 -fold_init = 0x8013A37C; // type:func rom:0xD0A7C +imgfx_set_vtx_buf_capacity = 0x8013A370; // type:func rom:0xD0A70 +imgfx_init = 0x8013A37C; // type:func rom:0xD0A7C func_8013A4D0 = 0x8013A4D0; // type:func rom:0xD0BD0 -fold_add_to_gfx_cache = 0x8013A610; // type:func rom:0xD0D10 -fold_update_gfx_cache = 0x8013A650; // type:func rom:0xD0D50 -func_8013A6E8 = 0x8013A6E8; // type:func rom:0xD0DE8 -func_8013A704 = 0x8013A704; // type:func rom:0xD0E04 -func_8013A854 = 0x8013A854; // type:func rom:0xD0F54 -func_8013A888 = 0x8013A888; // type:func rom:0xD0F88 -func_8013A8E0 = 0x8013A8E0; // type:func rom:0xD0FE0 -fold_get_state = 0x8013A920; // type:func rom:0xD1020 -fold_clear_state_gfx = 0x8013A93C; // type:func rom:0xD103C -fold_clear_state_data = 0x8013A9C8; // type:func rom:0xD10C8 -fold_init_state = 0x8013A9E8; // type:func rom:0xD10E8 -fold_update = 0x8013AA9C; // type:func rom:0xD119C -fold_set_state_flags = 0x8013AF20; // type:func rom:0xD1620 -fold_appendGfx_component = 0x8013AF70; // type:func rom:0xD1670 -func_8013B0EC = 0x8013B0EC; // type:func rom:0xD17EC -func_8013B1B0 = 0x8013B1B0; // type:func rom:0xD18B0 -fold_mesh_make_strip = 0x8013BC88; // type:func rom:0xD2388 -fold_mesh_make_grid = 0x8013C048; // type:func rom:0xD2748 -fold_load_anim = 0x8013C220; // type:func rom:0xD2920 -fold_mesh_anim_update = 0x8013C3F0; // type:func rom:0xD2AF0 -func_8013CFA8 = 0x8013CFA8; // type:func rom:0xD36A8 -func_8013DAB4 = 0x8013DAB4; // type:func rom:0xD41B4 -func_8013E2F0 = 0x8013E2F0; // type:func rom:0xD49F0 -func_8013E904 = 0x8013E904; // type:func rom:0xD5004 -fold_wavy_init = 0x8013EE48; // type:func rom:0xD5548 -fold_mesh_wavy_update = 0x8013EE68; // type:func rom:0xD5568 -fold_mesh_load_colors = 0x8013F1F8; // type:func rom:0xD58F8 +imgfx_add_to_cache = 0x8013A610; // type:func rom:0xD0D10 +imgfx_update_cache_impl = 0x8013A650; // type:func rom:0xD0D50 +imgfx_update_cache = 0x8013A6E8; // type:func rom:0xD0DE8 +imgfx_get_free_instances = 0x8013A704; // type:func rom:0xD0E04 +imgfx_release_instance = 0x8013A854; // type:func rom:0xD0F54 +imgfx_release_instance_chain = 0x8013A888; // type:func rom:0xD0F88 +imgfx_get_next_instance = 0x8013A8E0; // type:func rom:0xD0FE0 +imgfx_get_instance = 0x8013A920; // type:func rom:0xD1020 +imgfx_cache_instance_data = 0x8013A93C; // type:func rom:0xD103C +imgfx_clear_instance_data = 0x8013A9C8; // type:func rom:0xD10C8 +imgfx_init_instance = 0x8013A9E8; // type:func rom:0xD10E8 +imgfx_update = 0x8013AA9C; // type:func rom:0xD119C +imgfx_set_state_flags = 0x8013AF20; // type:func rom:0xD1620 +imgfx_appendGfx_component = 0x8013AF70; // type:func rom:0xD1670 +imgfx_make_mesh = 0x8013B0EC; // type:func rom:0xD17EC +imgfx_appendGfx_mesh = 0x8013B1B0; // type:func rom:0xD18B0 +imgfx_mesh_make_strip = 0x8013BC88; // type:func rom:0xD2388 +imgfx_mesh_make_grid = 0x8013C048; // type:func rom:0xD2748 +imgfx_load_anim = 0x8013C220; // type:func rom:0xD2920 +imgfx_mesh_anim_update = 0x8013C3F0; // type:func rom:0xD2AF0 +imgfx_appendGfx_mesh_basic = 0x8013CFA8; // type:func rom:0xD36A8 +imgfx_appendGfx_mesh_grid = 0x8013DAB4; // type:func rom:0xD41B4 +imgfx_appendGfx_mesh_anim = 0x8013E2F0; // type:func rom:0xD49F0 +imgfx_appendGfx_mesh_strip = 0x8013E904; // type:func rom:0xD5004 +imgfx_wavy_init = 0x8013EE48; // type:func rom:0xD5548 +imgfx_mesh_make_wavy = 0x8013EE68; // type:func rom:0xD5568 +imgfx_mesh_load_colors = 0x8013F1F8; // type:func rom:0xD58F8 hud_element_load_script = 0x8013F350; // type:func rom:0xD5A50 hud_element_draw_rect = 0x8013F704; // type:func rom:0xD5E04 hud_element_clear_cache = 0x80141100; // type:func rom:0xD7800 @@ -4626,15 +4626,15 @@ vtx_stencil2 = 0x8014E770; // type:data rom:0xE4E70 D_8014E8F0 = 0x8014E8F0; // type:data rom:0xE4FF0 D_8014E9A8 = 0x8014E9A8; // type:data rom:0xE50A8 D_8014EA48 = 0x8014EA48; // type:data rom:0xE5148 -fold_currentImage = 0x8014EE10; // type:data rom:0xE5510 -fold_vtxCount = 0x8014EE14; // type:data rom:0xE5514 -FoldLights = 0x8014EE18; // type:data rom:0xE5518 +ImgFXCurrentTexturePtr = 0x8014EE10; // type:data rom:0xE5510 +imgfx_vtxCount = 0x8014EE14; // type:data rom:0xE5514 +ImgFXLights = 0x8014EE18; // type:data rom:0xE5518 D_8014EE40 = 0x8014EE40; // type:data rom:0xE5540 D_8014EE50 = 0x8014EE50; // type:data rom:0xE5550 -FoldVtxBufferCapacity = 0x8014EE60; // type:data rom:0xE5560 +ImgFXVtxBufferCapacity = 0x8014EE60; // type:data rom:0xE5560 D_8014EE68 = 0x8014EE68; // type:data rom:0xE5568 -D_8014EE98 = 0x8014EE98; // type:data rom:0xE5598 -FoldAnimOffsets = 0x8014EF64; // type:data rom:0xE5664 +ImgFXRenderModes = 0x8014EE98; // type:data rom:0xE5598 +ImgFXAnimOffsets = 0x8014EF64; // type:data rom:0xE5664 gHudElementAuxCache = 0x8014EFC0; // type:data rom:0xE56C0 gHudElementCacheCapacity = 0x8014EFC4; // type:data rom:0xE56C4 HES_Empty = 0x8014EFC8; // type:data rom:0xE56C8 @@ -5130,15 +5130,15 @@ screen_overlay_frontZoom = 0x80156904; // type:data rom:0xED004 screen_overlay_backType = 0x80156908; // type:data rom:0xED008 screen_overlay_backZoom = 0x8015690C; // type:data rom:0xED00C D_80156910 = 0x80156910; // type:data rom:0xED010 -D_80156920 = 0x80156920; // type:data rom:0xED020 -D_80156948 = 0x80156948; // type:data rom:0xED048 -fold_vtxBuf = 0x80156950; // type:data rom:0xED050 -D_80156954 = 0x80156954; // rom:0xED054 +ImgFXCurrentTexture = 0x80156920; // type:data rom:0xED020 +ImgFXVtxBuffers = 0x80156948; // type:data rom:0xED048 +imgfx_vtxBuf = 0x80156950; // type:data rom:0xED050 +ImgFXInstances = 0x80156954; // rom:0xED054 D_80156958 = 0x80156958; // type:data rom:0xED058 D_80156960 = 0x80156960; // type:data rom:0xED060 D_80156968 = 0x80156968; // type:data rom:0xED068 D_80156970 = 0x80156970; // type:data rom:0xED070 -FoldAnimHeaders = 0x80156980; // type:data rom:0xED080 +ImgFXAnimHeaders = 0x80156980; // type:data rom:0xED080 evt_find_label = 0x802C8890; // type:func rom:0xED240 evt_skip_if = 0x802C88FC; // type:func rom:0xED2AC evt_skip_else = 0x802C8978; // type:func rom:0xED328 @@ -5147,7 +5147,7 @@ evt_goto_next_case = 0x802C8A60; // type:func rom:0xED410 evt_goto_end_loop = 0x802C8AE4; // type:func rom:0xED494 TranslateModel = 0x802C8B60; // type:func rom:0xED510 RotateModel = 0x802C8C64; // type:func rom:0xED614 -fold_gfxDataCache = 0x80156F20; // type:data rom:0xED620 +ImgFXDataCache = 0x80156F20; // type:data rom:0xED620 gHudElementsWorld = 0x80156F60; // type:data rom:0xED660 ScaleModel = 0x802C8D88; // type:func rom:0xED738 GetModelIndex = 0x802C8E8C; // type:func rom:0xED83C @@ -5232,7 +5232,7 @@ wSpriteShadingProfileAux = 0x80159720; // type:data rom:0xEFE20 bSpriteShadingProfileAux = 0x801597D0; // type:data rom:0xEFED0 exec_ShakeCam1 = 0x802CB56C; // type:func rom:0xEFF1C exec_ShakeCamX = 0x802CB5C8; // type:func rom:0xEFF78 -D_80159880 = 0x80159880; // type:data rom:0xEFF80 +SpriteShadingPalette = 0x80159880; // type:data rom:0xEFF80 wEnvSounds = 0x801598A0; // type:data rom:0xEFFA0 SetCamLeadPlayer = 0x802CB680; // type:func rom:0xF0030 bEnvSounds = 0x801599B8; // type:data rom:0xF00B8 @@ -5368,8 +5368,8 @@ PutPartnerAway = 0x802CF988; // type:func rom:0xF4338 GetCurrentPartnerID = 0x802CFC74; // type:func rom:0xF4624 PartnerCanUseAbility = 0x802CFCA0; // type:func rom:0xF4650 PartnerIsFlying = 0x802CFCE8; // type:func rom:0xF4698 -SetNpcFoldParams = 0x802CFD30; // type:func rom:0xF46E0 -SetNpcFoldFlags = 0x802CFE2C; // type:func rom:0xF47DC +SetNpcImgFXParams = 0x802CFD30; // type:func rom:0xF46E0 +SetNpcImgFXFlags = 0x802CFE2C; // type:func rom:0xF47DC SetNpcPaletteSwapMode = 0x802CFE80; // type:func rom:0xF4830 SetNpcPaletteSwapLower = 0x802CFEEC; // type:func rom:0xF489C SetNpcPaletteSwapping = 0x802CFFC0; // type:func rom:0xF4970 @@ -5430,8 +5430,8 @@ func_802D2484 = 0x802D2484; // type:func rom:0xF6E34 IsPlayerOnValidFloor = 0x802D249C; // type:func rom:0xF6E4C WaitForPlayerMoveToComplete = 0x802D24F4; // type:func rom:0xF6EA4 WaitForPlayerInputEnabled = 0x802D2508; // type:func rom:0xF6EB8 -UpdatePlayerFold = 0x802D2520; // type:func rom:0xF6ED0 -SetPlayerFoldFlags = 0x802D286C; // type:func rom:0xF721C +UpdatePlayerImgFX = 0x802D2520; // type:func rom:0xF6ED0 +SetPlayerImgFXFlags = 0x802D286C; // type:func rom:0xF721C FacePlayerTowardPoint = 0x802D2884; // type:func rom:0xF7234 DisablePulseStone = 0x802D2AA8; // type:func rom:0xF7458 GetPartnerInUse = 0x802D2B0C; // type:func rom:0xF74BC @@ -5644,8 +5644,8 @@ func_802DDA84 = 0x802DDA84; // type:func rom:0x100B74 spr_update_player_sprite = 0x802DDA8C; // type:func rom:0x100B7C spr_draw_player_sprite = 0x802DDC40; // type:func rom:0x100D30 func_802DDEC4 = 0x802DDEC4; // type:func rom:0x100FB4 -func_802DDEE4 = 0x802DDEE4; // type:func rom:0x100FD4 -func_802DDFF8 = 0x802DDFF8; // type:func rom:0x1010E8 +set_player_imgfx_comp = 0x802DDEE4; // type:func rom:0x100FD4 +set_player_imgfx_all = 0x802DDFF8; // type:func rom:0x1010E8 spr_get_player_raster_info = 0x802DE044; // type:func rom:0x101134 spr_get_player_palettes = 0x802DE0C0; // type:func rom:0x1011B0 spr_load_npc_sprite = 0x802DE0EC; // type:func rom:0x1011DC @@ -5653,10 +5653,10 @@ spr_update_sprite = 0x802DE2AC; // type:func rom:0x10139C spr_draw_npc_sprite = 0x802DE3D8; // type:func rom:0x1014C8 spr_get_notify_value = 0x802DE5C8; // type:func rom:0x1016B8 spr_free_sprite = 0x802DE5E8; // type:func rom:0x1016D8 -func_802DE748 = 0x802DE748; // type:func rom:0x101838 -func_802DE780 = 0x802DE780; // type:func rom:0x101870 -func_802DE894 = 0x802DE894; // type:func rom:0x101984 -func_802DE8DC = 0x802DE8DC; // type:func rom:0x1019CC +get_npc_comp_imgfx_idx = 0x802DE748; // type:func rom:0x101838 +set_npc_imgfx_comp = 0x802DE780; // type:func rom:0x101870 +set_npc_imgfx_all = 0x802DE894; // type:func rom:0x101984 +spr_get_comp_position = 0x802DE8DC; // type:func rom:0x1019CC spr_get_npc_raster_info = 0x802DE9D8; // type:func rom:0x101AC8 spr_get_npc_palettes = 0x802DEA40; // type:func rom:0x101B30 spr_get_npc_color_variations = 0x802DEA6C; // type:func rom:0x101B5C @@ -13138,7 +13138,7 @@ b_area_sam2_monstar_IdleAnimations2 = 0x80219FE4; // type:data rom:0x63F1C4 b_area_sam2_monstar_init = 0x80219FF0; // type:data rom:0x63F1D0 battle_area_sam2_actor_img_png = 0x8021A098; // type:data rom:0x63F278 battle_area_sam2_actor_img_pal = 0x8021A298; // type:data rom:0x63F478 -D_8021A2B8_63F498 = 0x8021A2B8; // type:data rom:0x63F498 +b_area_sam2_monstar_MonstarDetailTexture = 0x8021A2B8; // type:data rom:0x63F498 b_area_sam2_monstar_idle = 0x8021A2D0; // type:data rom:0x63F4B0 b_area_sam2_monstar_handleEvent = 0x8021A4FC; // type:data rom:0x63F6DC b_area_sam2_monstar_unused = 0x8021A9BC; // type:data rom:0x63FB9C @@ -15203,12 +15203,12 @@ mac_01_Quizmo_UpdatePartnerPosition = 0x80242E20; // type:func rom:0x8036A0 mac_01_Quizmo_CreateReactionEffect = 0x80242F08; // type:func rom:0x803788 mac_01_Quizmo_CreateWorker = 0x80242F74; // type:func rom:0x8037F4 mac_01_gfx_build_knocked_down_player = 0x80242FA4; // type:func rom:0x803824 -mac_01_KnockDownPlayerB = 0x80243380; // type:func rom:0x803C00 -mac_01_KnockDownPlayerC = 0x80243494; // type:func rom:0x803D14 -mac_01_KnockDownPlayerD = 0x80243500; // type:func rom:0x803D80 -mac_01_KnockDownPlayerE = 0x802435C0; // type:func rom:0x803E40 -mac_01_KnockDownPlayerF = 0x80243680; // type:func rom:0x803F00 -mac_01_KnockDownPlayerG = 0x80243740; // type:func rom:0x803FC0 +mac_01_KnockdownCreate = 0x80243380; // type:func rom:0x803C00 +mac_01_KnockdownDestroy = 0x80243494; // type:func rom:0x803D14 +mac_01_KnockdownSetPos = 0x80243500; // type:func rom:0x803D80 +mac_01_KnockdownSetRot = 0x802435C0; // type:func rom:0x803E40 +mac_01_KnockdownSetScale = 0x80243680; // type:func rom:0x803F00 +mac_01_KnockdownSetRaster = 0x80243740; // type:func rom:0x803FC0 mac_01_ToadHouse_DisableStatusMenu = 0x802437AC; // type:func rom:0x80402C mac_01_ToadHouse_ShowStatusMenu = 0x802437CC; // type:func rom:0x80404C mac_01_ToadHouse_UpdateScreenOverlay = 0x802437F4; // type:func rom:0x804074 @@ -19153,12 +19153,12 @@ kkj_25_SetEntityPositionF = 0x802400FC; // type:func rom:0xB06AFC kkj_25_GetEntityPosition = 0x802401C4; // type:func rom:0xB06BC4 func_80240264_B06C64 = 0x80240264; // type:func rom:0xB06C64 kkj_25_gfx_build_knocked_down_player = 0x80240310; // type:func rom:0xB06D10 -kkj_25_KnockDownPlayerB = 0x802406EC; // type:func rom:0xB070EC -kkj_25_KnockDownPlayerC = 0x80240800; // type:func rom:0xB07200 -kkj_25_KnockDownPlayerD = 0x8024086C; // type:func rom:0xB0726C -kkj_25_KnockDownPlayerE = 0x8024092C; // type:func rom:0xB0732C -kkj_25_KnockDownPlayerF = 0x802409EC; // type:func rom:0xB073EC -kkj_25_KnockDownPlayerG = 0x80240AAC; // type:func rom:0xB074AC +kkj_25_KnockdownCreate = 0x802406EC; // type:func rom:0xB070EC +kkj_25_KnockdownDestroy = 0x80240800; // type:func rom:0xB07200 +kkj_25_KnockdownSetPos = 0x8024086C; // type:func rom:0xB0726C +kkj_25_KnockdownSetRot = 0x8024092C; // type:func rom:0xB0732C +kkj_25_KnockdownSetScale = 0x802409EC; // type:func rom:0xB073EC +kkj_25_KnockdownSetRaster = 0x80240AAC; // type:func rom:0xB074AC func_80240B18_B07518 = 0x80240B18; // type:func rom:0xB07518 func_80240B8C_B0758C = 0x80240B8C; // type:func rom:0xB0758C func_80240BA0_B075A0 = 0x80240BA0; // type:func rom:0xB075A0 @@ -20014,12 +20014,12 @@ D_802430A0_BD1C90 = 0x802430A0; // type:data rom:0xBD1C90 D_802430B0_BD1CA0 = 0x802430B0; // type:data rom:0xBD1CA0 D_802430C0_BD1CB0 = 0x802430C0; // type:data rom:0xBD1CB0 obk_08_gfx_build_knocked_down_player = 0x80240000; // type:func rom:0xBD3870 -obk_08_KnockDownPlayerB = 0x802403DC; // type:func rom:0xBD3C4C -obk_08_KnockDownPlayerC = 0x802404F0; // type:func rom:0xBD3D60 -obk_08_KnockDownPlayerD = 0x8024055C; // type:func rom:0xBD3DCC -obk_08_KnockDownPlayerE = 0x8024061C; // type:func rom:0xBD3E8C -obk_08_KnockDownPlayerF = 0x802406DC; // type:func rom:0xBD3F4C -obk_08_KnockDownPlayerG = 0x8024079C; // type:func rom:0xBD400C +obk_08_KnockdownCreate = 0x802403DC; // type:func rom:0xBD3C4C +obk_08_KnockdownDestroy = 0x802404F0; // type:func rom:0xBD3D60 +obk_08_KnockdownSetPos = 0x8024055C; // type:func rom:0xBD3DCC +obk_08_KnockdownSetRot = 0x8024061C; // type:func rom:0xBD3E8C +obk_08_KnockdownSetScale = 0x802406DC; // type:func rom:0xBD3F4C +obk_08_KnockdownSetRaster = 0x8024079C; // type:func rom:0xBD400C obk_08_DamagePlayer1HP = 0x80240808; // type:func rom:0xBD4078 func_80240840_BD40B0 = 0x80240840; // type:func rom:0xBD40B0 func_80240870_BD40E0 = 0x80240870; // type:func rom:0xBD40E0 @@ -24997,7 +24997,7 @@ end_00_CharAnim_FadeIn_2 = 0x80240540; // type:func rom:0xDF6F40 end_00_CharAnim_FadeIn_3 = 0x8024081C; // type:func rom:0xDF721C end_00_CharAnim_FadeIn_4 = 0x80240AE8; // type:func rom:0xDF74E8 end_00_CharAnim_FadeIn_5 = 0x80240EB0; // type:func rom:0xDF78B0 -end_00_CharAnim_HoldClearFold = 0x80240FEC; // type:func rom:0xDF79EC +end_00_CharAnim_HoldClearImgFX = 0x80240FEC; // type:func rom:0xDF79EC end_00_CharAnim_Hold = 0x802411CC; // type:func rom:0xDF7BCC end_00_CharAnim_FadeOut_0 = 0x80241294; // type:func rom:0xDF7C94 end_00_CharAnim_FadeOut_1 = 0x802414CC; // type:func rom:0xDF7ECC @@ -25034,7 +25034,7 @@ end_01_CharAnim_FadeIn_2 = 0x80240550; // type:func rom:0xE058B0 end_01_CharAnim_FadeIn_3 = 0x8024082C; // type:func rom:0xE05B8C end_01_CharAnim_FadeIn_4 = 0x80240AF8; // type:func rom:0xE05E58 end_01_CharAnim_FadeIn_5 = 0x80240EC0; // type:func rom:0xE06220 -end_01_CharAnim_HoldClearFold = 0x80240FFC; // type:func rom:0xE0635C +end_01_CharAnim_HoldClearImgFX = 0x80240FFC; // type:func rom:0xE0635C end_01_CharAnim_Hold = 0x802411DC; // type:func rom:0xE0653C end_01_CharAnim_FadeOut_0 = 0x802412A4; // type:func rom:0xE06604 end_01_CharAnim_FadeOut_1 = 0x802414DC; // type:func rom:0xE0683C @@ -27159,7 +27159,7 @@ D_802DAE54 = 0x802DAE54; // type:data gCurrentPrintContext = 0x802DB260; // D_802DB264 = 0x802DB264; // type:data D_802DB268 = 0x802DB268; // type:data -PlayerFoldFlags = 0x802DB5B0; // type:data +PlayerImgFXFlags = 0x802DB5B0; // type:data bBattleVirtualEntityList = 0x802DB5C0; // type:data wWorldVirtualEntityList = 0x802DB6C0; // type:data gCurrentVirtualEntityListPtr = 0x802DB7C0; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 53e382b289..62c0a9bb88 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -364,7 +364,7 @@ dead_func_802CF56C = func_802CF56C + 0xD560; dead_BringPartnerOut = BringPartnerOut + 0xD560; dead_PutPartnerAway = PutPartnerAway + 0xD560; dead_GetCurrentPartnerID = GetCurrentPartnerID + 0xD560; -dead_SetNpcFoldParams = SetNpcFoldParams + 0xD560; +dead_SetNpcImgFXParams = SetNpcImgFXParams + 0xD560; dead_SetNpcPaletteSwapMode = SetNpcPaletteSwapMode + 0xD560; dead_SetNpcPaletteSwapping = SetNpcPaletteSwapping + 0xD560; dead_PlaySoundAtNpc = PlaySoundAtNpc + 0xD560; @@ -398,8 +398,8 @@ dead_GetPlayerAnimation = GetPlayerAnimation + 0xD620; dead_UseExitHeading = UseExitHeading + 0xD620; dead_IsPlayerOnValidFloor = IsPlayerOnValidFloor + 0xD620; dead_WaitForPlayerInputEnabled = WaitForPlayerInputEnabled + 0xD620; -dead_UpdatePlayerFold = UpdatePlayerFold + 0xD620; -dead_SetPlayerFoldFlags = SetPlayerFoldFlags + 0xD64C; +dead_UpdatePlayerImgFX = UpdatePlayerImgFX + 0xD620; +dead_SetPlayerImgFXFlags = SetPlayerImgFXFlags + 0xD64C; dead_FacePlayerTowardPoint = FacePlayerTowardPoint + 0xD64C; dead_GetPartnerInUse = GetPartnerInUse + 0xD64C; dead_InterruptUsePartner = InterruptUsePartner + 0xD64C;