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

sfx and render modes cleanup (#1124)

Browse Source 
* misc

* map_init returns

* remaining render mode names

* fix render mode case order

* minor additions

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-11-10 00:19:40 -05:00 committed by GitHub
parent ecb65c720a
commit 5f5722c850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
142 changed files with 1360 additions and 1264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/common_structs.h
View File

@ -1048,19 +1048,6 @@ typedef struct CollisionData {
/* 0x0E */ char unk_0E[2];
} CollisionData; // size = 0x10
typedef struct ModelGroupData {
/* 0x00 */ Mtx* transformMatrix;
/* 0x04 */ Lightsn* lightingGroup;
/* 0x08 */ s32 numLights;
/* 0x0C */ s32 numChildren;
/* 0x10 */ struct ModelNode** childList;
} ModelGroupData; // size = 0x14
typedef struct ModelDisplayData {
/* 0x0 */ Gfx* displayList;
/* 0x4 */ char unk_04[0x4];
} ModelDisplayData; // size = 0x8
typedef struct AnimatorNode {
/* 0x00 */ Gfx* displayList;
/* 0x04 */ struct AnimatorNode* children[32];

630
include/enums.h
View File

@ -522,6 +522,27 @@ enum EasingType {
EASING_COS_IN = 12,
};
enum SoundIDBits {
SOUND_ID_STOP = 0x00008000,
SOUND_ID_LOWER = 0x000023FF,
SOUND_ID_UNK = 0x00002000, // sounds belonging to special large section
SOUND_ID_ADJUST = 0x00001000,
SOUND_ID_TRIGGER_MASK = 0x00000C00,
SOUND_ID_TRIGGER_CHANGE_VOLUME = 0x00000800,
SOUND_ID_TRIGGER_CHANGE_SOUND = 0x00000400,
SOUND_ID_SECTION_MASK = 0x00000300, // corresponds to sections 0-3 for indices < 0xC0 and 4-7 for those above
SOUND_ID_INDEX_MASK = 0x000000FF,
SOUND_ID_UNK_INDEX_MASK = 0x000001FF, // indices for the special large section
};
enum SoundType {
SOUND_TYPE_SPECIAL = 0x80000000,
SOUND_TYPE_LOOPING = 0, // 0x80000000 (with SOUND_TYPE_SPECIAL)
SOUND_TYPE_EXIT_DOOR = 1, // 0x90000000 (with SOUND_TYPE_SPECIAL)
SOUND_TYPE_ROOM_DOOR = 2, // 0xA0000000 (with SOUND_TYPE_SPECIAL)
SOUND_TYPE_ALTERNATING = 3, // 0xB0000000 (with SOUND_TYPE_SPECIAL)
};
enum SoundIDs {
SOUND_NONE = 0x00000000,
SOUND_OPEN_POPUP_1 = 0x00000001,
@ -1290,272 +1311,272 @@ enum SoundIDs {
SOUND_THROW = 0x000003FA,
SOUND_PLAYER_COLLAPSE = 0x000003FB,
SOUND_LUCKY = 0x000003FC,
SOUND_GOOMBARIO_GATHERING = 0x00002003,
SOUND_PARAKARRY_PREDIVE = 0x00002004,
SOUND_PARAKARRY_DIVE = 0x00002005,
SOUND_PARAKARRY_SHELL_SHOT = 0x00002006,
SOUND_PARAKARRY_FLAP = 0x00002009,
SOUND_PARAKARRY_AIR_RAID_1 = 0x0000200A, // #whoosh
SOUND_PARAKARRY_AIR_RAID_2 = 0x0000200B, // #whoosh #echoing
SOUND_KOOPER_SHELL_SPINUP = 0x0000200C,
SOUND_GOOMBARIO_JUMP = 0x0000200D,
SOUND_BOW_VANISH = 0x0000200E,
SOUND_BOW_APPEAR = 0x0000200F,
SOUND_EGG_MISSILE_BLAST = 0x00002010,
SOUND_WATT_REPEL_DARKNESS = 0x00002011,
SOUND_WATT_RESUME_DARKNESS = 0x00002012,
SOUND_SUSHIE_EMBARK = 0x00002013,
SOUND_SUSHIE_RIDE_IDLE = 0x00002014,
SOUND_SUSHIE_RIDE_MOVING = 0x00002015,
SOUND_BOMBETTE_BLAST_LV1 = 0x00002016,
SOUND_BOMBETTE_BLAST_LV2 = 0x00002017,
SOUND_BOMBETTE_BLAST_LV3 = 0x00002018,
SOUND_BOW_SMACK = 0x00002019,
SOUND_BOW_FAN_SMACK = 0x0000201A,
SOUND_LAKILESTER_THROW_SPINY_A = 0x0000201B,
SOUND_LAKILESTER_THROW_SPINY_B = 0x0000201C,
SOUND_LAKILESTER_MAKE_CLOUD_NINE = 0x0000201D,
SOUND_LAKILESTER_HURRICANE_INHALE = 0x0000201E,
SOUND_LAKILESTER_HURRICANE_EXHALE = 0x0000201F,
SOUND_BOMBETTE_BODY_SLAM = 0x00002020,
SOUND_SHELL_SPIN = 0x00002021,
SOUND_FAN_SMACK_HIT = 0x00002022, // #windy
SOUND_FAN_SMACK_END = 0x00002023, // #windy
SOUND_WATT_MEGA_CHARGE_WAVE = 0x00002024,
SOUND_DIZZY_SHELL = 0x00002026,
SOUND_SHUFFLE_CARD_A = 0x0000202A,
SOUND_SHUFFLE_CARD_B = 0x0000202B,
SOUND_FIRE_FLOWER_A = 0x0000202C,
SOUND_FIRE_FLOWER_B = 0x0000202D,
SOUND_SNOWMAN_DOLL_JUMP = 0x0000202E,
SOUND_NOISE_RUSH = 0x0000202F, // unused
SOUND_POW_BLOCK = 0x00002030,
SOUND_INFLICT_SLEEP = 0x00002031,
SOUND_INFLICT_STATUS = 0x00002032,
SOUND_DIZZY_DIAL = 0x00002033,
SOUND_SUSHIE_BELLY_FLOP = 0x00002034,
SOUND_CREATE_WATER_BLOCK = 0x00002035,
SOUND_WHALE_OPEN_MOUTH = 0x00002036,
SOUND_WHALE_CLOSE_MOUTH = 0x00002037,
SOUND_TUBBA_SNORE_INHALE = 0x00002038,
SOUND_TUBBA_SNORE_EXHALE = 0x00002039,
SOUND_KPA_BRIDGE_COLLAPSE_A = 0x0000203A,
SOUND_KPA_BRIDGE_COLLAPSE_B = 0x0000203B,
SOUND_KPA_ARENA_EXPLODING = 0x0000203C,
SOUND_OBK_STAIRS_DROP = 0x0000203D,
SOUND_SHY_GUY_OUCH = 0x0000203E,
SOUND_SHY_GUY_RUN_AWAY = 0x0000203F,
SOUND_KPA_FLIP_BRIDGE_PANEL = 0x00002040,
SOUND_STAR_SPIRIT_APPEAR_A = 0x00002041,
SOUND_STAR_SPIRIT_APPEAR_B = 0x00002042,
SOUND_STAR_SPIRIT_CAST_A = 0x00002043,
SOUND_STAR_SPIRIT_CAST_B = 0x00002044,
SOUND_STAR_SPIRIT_DEPART_1 = 0x00002045,
SOUND_STAR_SPIRIT_DEPART_2 = 0x00002046,
SOUND_STAR_SPIRIT_DEPART_3 = 0x00002047,
SOUND_DARK_TOAD_DISPEL = 0x00002049,
SOUND_OPEN_MAGIC_CHEST = 0x0000204A,
SOUND_CLOSE_MAGIC_CHEST = 0x0000204B,
SOUND_QUICK_HINGE = 0x0000204C, // unused
SOUND_FLO_MOVE_PILLAR = 0x0000204D,
SOUND_WISH_ASCENDING = 0x00002051,
SOUND_UP_AND_AWAY_SEND_AWAY = 0x00002052,
SOUND_STAR_POWER_RECOVERY = 0x00002053,
SOUND_START_RECOVERY = 0x00002055,
SOUND_RECOVER = 0x00002056,
SOUND_FLOWERS_LIGHT_GIGGLE = 0x00002059,
SOUND_FLOWERS_SAD_GIGGLE = 0x0000205A,
SOUND_FLOWERS_LAUGH = 0x0000205B,
SOUND_FLOWERS_WITHER = 0x0000205C,
SOUND_FLOWERS_GROW = 0x0000205D,
SOUND_ROCK_LAUGHTER = 0x0000205E,
SOUND_TREE_LAUGHTER = 0x0000205F,
SOUND_IMPISH_LAUGH = 0x00002060,
SOUND_CHAIN_CHOMP_BITE = 0x00002061,
SOUND_CHAIN_CHOMP_THUD = 0x00002062,
SOUND_CHAIN_RATTLE = 0x00002063,
SOUND_SHY_STACK_SQUISH = 0x00002064,
SOUND_STILT_GUY_UNFOLD = 0x00002065,
SOUND_STILT_GUY_STEP = 0x00002066,
SOUND_STILTS_FALL = 0x00002067, // #woody
SOUND_TANK_BULB_FIRE = 0x00002069, // #electric
SOUND_TOY_TANK_OPEN_HATCH = 0x0000206A,
SOUND_TOY_TANK_CLOSE_HATCH = 0x0000206B,
SOUND_WOODEN_BLOCK = 0x0000206C, // #unused
SOUND_RECOVER_HEART = 0x0000206D, // #magic
SOUND_FUZZY_RUMBLE = 0x0000206E,
SOUND_FUZZY_SHAKE = 0x0000206F,
SOUND_FUZZY_DIVIDE = 0x00002070,
SOUND_UP_AND_AWAY_CAPTURE = 0x00002071,
SOUND_YOSHI = 0x00002072,
SOUND_HIT_WHACKA = 0x00002073,
SOUND_MAGIC_ASCENDING = 0x00002074, // #magic #ascending
SOUND_MAGIC_DESCENDING = 0x00002075, // #magic #descending
SOUND_BOMB_BLAST = 0x00002076,
SOUND_BULLET_BILL_EXPLODE_A = 0x00002078,
SOUND_BULLET_BILL_EXPLODE_B = 0x00002079,
SOUND_KAMMY_SUMMON_MAGIC = 0x0000207A,
SOUND_KAMMY_SUMMON_BLOCK = 0x0000207B,
SOUND_KAMMY_RAISE_OBJECT = 0x0000207C,
SOUND_KAMMY_LOWER_OBJECT = 0x0000207D,
SOUND_TWINK_ATTACK = 0x0000207E,
SOUND_TWINK_FLY_A = 0x0000207F,
SOUND_QUICK_PLAYER_JUMP = 0x00002081,
SOUND_JUMP_8BIT_MARIO = 0x00002082,
SOUND_STAR_BOX_LAUNCHER = 0x00002085,
SOUND_SPRING = 0x00002086,
SOUND_ZIPLINE_FINISH = 0x00002087,
SOUND_PUSH_BLOCK = 0x00002088,
SOUND_PULL_VINE = 0x00002089,
SOUND_FLOOR_SWITCH_DEPRESS = 0x0000208A,
SOUND_FLOOR_SWITCH_ACTIVATE = 0x0000208B,
SOUND_NO_DAMGE = 0x0000208C,
SOUND_USE_ITEM = 0x0000208D,
SOUND_GROW = 0x0000208E,
SOUND_CHARGE_UP = 0x0000208F,
SOUND_OPEN_TRAPDOOR = 0x00002091,
SOUND_BREAK_FLOOR = 0x00002092,
SOUND_SPIKES_EXTEND = 0x00002093,
SOUND_JUMP_SCARE = 0x00002094,
SOUND_EAT_OR_DRINK = 0x00002095,
SOUND_SPIT_OUT = 0x00002096,
SOUND_GLASS_SHATTER = 0x00002097,
SOUND_VANISH_IN_SMOKE = 0x00002098,
SOUND_HEART_PLANT = 0x00002099,
SOUND_HURT_PLANT_SHRIEK = 0x0000209A,
SOUND_MUNCHLESIA_SUCTION = 0x0000209B,
SOUND_JAN_LOG_LAND = 0x0000209D,
SOUND_JAN_LOG_SPLIT = 0x0000209E,
SOUND_SEPARATE_BUSHES = 0x0000209F,
SOUND_LARGE_NPC_IMPACT = 0x000020A0,
SOUND_STARSHIP_BOOST = 0x000020A1,
SOUND_IWA_SLIDE_GATE = 0x000020A2,
SOUND_CREAKY_WINDOW_OPEN = 0x000020A3,
SOUND_CREAKY_WINDOW_CLOSE = 0x000020A4,
SOUND_TRAIN_DOOR_OPEN = 0x000020A5,
SOUND_TRAIN_DOOR_CLOSE = 0x000020A6,
SOUND_TURN_MECHANISM = 0x000020A7,
SOUND_CAPSULE_OPEN = 0x000020A8,
SOUND_FLIP_PANEL = 0x000020AB,
SOUND_CLOSE_PANEL = 0x000020AC,
SOUND_WATER_SPLASH = 0x000020AD,
SOUND_BREAK_CRATE = 0x000020AE, // #boing
SOUND_HOLLOW_RISING = 0x000020AF, // #unused
SOUND_HOLLOW_FALLING = 0x000020B0, // #unused
SOUND_PIRANHA_SPIN_1 = 0x000020B1,
SOUND_PIRANHA_SPIN_2 = 0x000020B2,
SOUND_PIRANHA_TENSE = 0x000020B3,
SOUND_HEAVY_NPC_STEP_B = 0x000020B4,
SOUND_HUFF_N_PUFF_JIGGLE = 0x000020B6,
SOUND_HUFF_N_PUFF_WOBBLE = 0x000020B7,
SOUND_GHOST_TRANSFORM = 0x000020B8,
SOUND_JR_TROOPA_TRANSFORM = 0x000020B9,
SOUND_ACTOR_STEP_A = 0x000020BA,
SOUND_MASTER_FLUTTER = 0x000020BB,
SOUND_MASTER_KICK = 0x000020BC,
SOUND_MASTER_STANCE_CHANGE = 0x000020BD,
SOUND_MASTER_FLIP = 0x000020BE,
SOUND_LAVA_BUD_RECOVER = 0x000020BF,
SOUND_SMALL_NPC_STEP = 0x000020C1,
SOUND_BANDIT_STEAL = 0x000020C2,
SOUND_DISAPPOINTED = 0x000020C3,
SOUND_CLUBBA_STEP = 0x000020C4,
SOUND_CLUBBA_SWING = 0x000020C5,
SOUND_MBUSH_STEP = 0x000020C6,
SOUND_TUBBA_HEART_JUMP = 0x000020C8,
SOUND_MBUSH_LEAP = 0x000020C9,
SOUND_BZZAP_STING = 0x000020CA,
SOUND_MINI_BZZAP_STING = 0x000020CB,
SOUND_BZZAP_CALL_SWARM = 0x000020CC,
SOUND_BONY_BEETLE_STEP = 0x000020CD,
SOUND_BONY_BEETLE_EXTEND_SPIKES = 0x000020CE,
SOUND_BONY_BEETLE_RETRACT_SPIKES = 0x000020CF,
SOUND_CLEFT_STEP = 0x000020D0,
SOUND_CLEFT_TACKLE = 0x000020D1,
SOUND_LAKITU_THROW_SPINY = 0x000020D2,
SOUND_SHELL_TOSS = 0x000020D3,
SOUND_SPELL_CAST1 = 0x000020D4,
SOUND_SPELL_CAST2 = 0x000020D5,
SOUND_SPELL_CAST3 = 0x000020D6,
SOUND_SPELL_CAST4 = 0x000020D7,
SOUND_SPELL_CAST5 = 0x000020D8, // unused
SOUND_FUZZIPEDE_MOTION = 0x000020D9,
SOUND_FUZZIPEDE_LEAP = 0x000020DA, // #boing #spring #bounce
SOUND_FUZZIPEDE_STRIKE = 0x000020DB, // #boing #spring
SOUND_COMMAND_LOSS = 0x000020DC,
SOUND_GOOMBA_STEP = 0x000020DD,
SOUND_PIRANHA_BITE = 0x000020DE,
SOUND_PARAGOOMBA_FLY = 0x000020DF,
SOUND_PARAGOOMBA_PREDIVE = 0x000020E0,
SOUND_TUTANKOOPA_MAGIC = 0x000020E1,
SOUND_JR_TOOPA_JUMP = 0x000020E2,
SOUND_ACTOR_WITHER = 0x000020E3,
SOUND_ACTOR_COLLAPSE = 0x000020E4,
SOUND_KNOCKOUT_CHIRPING = 0x000020E5, // #bird #chirping
SOUND_TUTANKOOPA_LEVITATE = 0x000020E6,
SOUND_SPOOKY_LEVITATE = 0x000020E7,
SOUND_ILLUSION_DISSOLVE = 0x000020E8,
SOUND_HEAVY_NPC_FALLING = 0x000020E9, // #falling
SOUND_HEAVY_NPC_LANDING = 0x000020EA, // #echoing #thud #impact
SOUND_TUTANKOOPA_DEBRIS_FALL = 0x000020EB, // #falling
SOUND_HEAVY_NPC_STEP_A = 0x000020EC,
SOUND_GOOMBA_KING_SPIN = 0x000020ED,
SOUND_GULPIT_LICK = 0x000020EE,
SOUND_BUZZAR_FLAP = 0x000020EF,
SOUND_BUZZAR_WHIRLWIND = 0x000020F0, // #windy
SOUND_BUZZAR_WINDUP = 0x000020F1,
SOUND_BUZZAR_DIVE = 0x000020F2,
SOUND_SMALL_LENS_FLARE = 0x000020F3,
SOUND_BUZZAR_THROW = 0x000020F4,
SOUND_BUZZAR_GRAB = 0x000020F5,
SOUND_HEAVY_NPC_STEP_C = 0x000020F6,
SOUND_TUBBAS_HEART_CHARGE = 0x000020F7,
SOUND_TUBBAS_HEART_SWARM_ATTACK = 0x000020F9,
SOUND_TUBBAS_HEART_SWARM_DISPERSE = 0x000020FB,
SOUND_TUBBAS_HEART_SWARM_VANISH = 0x000020FC,
SOUND_FAKE_BOWSER_SWING = 0x000020FD,
SOUND_FAKE_BOWSER_STRIKE = 0x000020FE,
SOUND_FILE_MENU_MOVE_CURSOR = 0x00002101,
SOUND_CREATE_FILE_MOVE_CURSOR = 0x00002102,
SOUND_CREATE_FILE_SET_CHARACTER = 0x00002103,
SOUND_CREATE_FILE_BACKSPACE = 0x00002104,
SOUND_CREATE_FILE_CHANGE_CHARSET = 0x00002105,
SOUND_INFLICT_CHILL_OUT = 0x00002106,
SOUND_INFLICT_KO = 0x00002107,
SOUND_SPAWN_BLOCK = 0x00002108,
SOUND_D_DOWN_HIT_1 = 0x0000210A,
SOUND_D_DOWN_HIT_2 = 0x0000210B,
SOUND_D_DOWN_HIT_3 = 0x0000210C,
SOUND_SPIN = 0x00002111,
SOUND_SPEEDY_SPIN = 0x00002112,
SOUND_SPIN_ATTACK = 0x00002113,
SOUND_SPEEDY_SPIN_ATTACK = 0x00002114,
SOUND_HAMMER_SWING_1 = 0x00002115,
SOUND_HAMMER_SWING_2 = 0x00002116,
SOUND_HAMMER_SWING_3 = 0x00002117,
SOUND_HAMMER_STRIKE_1 = 0x00002118,
SOUND_HAMMER_STRIKE_2 = 0x00002119,
SOUND_HAMMER_STRIKE_3 = 0x0000211A,
SOUND_HAMMER_QUAKE_1 = 0x0000211B,
SOUND_HAMMER_QUAKE_2 = 0x0000211C,
SOUND_HAMMER_QUAKE_3 = 0x0000211D,
SOUND_SPIN_SMASH_1 = 0x0000211E,
SOUND_SPIN_SMASH_2 = 0x0000211F,
SOUND_SPIN_SMASH_3 = 0x00002120,
SOUND_BOWSER_STAR_ROD_USE = 0x00002121,
SOUND_BOWSER_STAR_ROD_DRAIN_WAVE = 0x00002122,
SOUND_BOWSER_STAR_ROD_GATHER = 0x00002123,
SOUND_BOWSER_STAR_ROD_SHOCKWAVE = 0x00002124,
SOUND_BOWSER_STAR_ROD_ENCHANT = 0x00002125,
SOUND_BOWSER_CAST_RECOVER = 0x00002126,
SOUND_BOWSER_LIGHTNING = 0x00002127,
SOUND_BOWSER_POWER_DOWN = 0x00002128,
SOUND_BOWSER_COLLAPSE = 0x00002129,
SOUND_OBK_CHANDELIER_RELEASE = 0x0000212A,
SOUND_OBK_CHANDELIER_STOP = 0x0000212B,
SOUND_OBK_CHANDELIER_RETRACT = 0x0000212C,
SOUND_RELEASE_ENERGY = 0x0000212D,
SOUND_GATHER_ENERGY = 0x0000212E,
SOUND_GOOMBARIO_GATHERING = SOUND_ID_UNK | 0x00000003,
SOUND_PARAKARRY_PREDIVE = SOUND_ID_UNK | 0x00000004,
SOUND_PARAKARRY_DIVE = SOUND_ID_UNK | 0x00000005,
SOUND_PARAKARRY_SHELL_SHOT = SOUND_ID_UNK | 0x00000006,
SOUND_PARAKARRY_FLAP = SOUND_ID_UNK | 0x00000009,
SOUND_PARAKARRY_AIR_RAID_1 = SOUND_ID_UNK | 0x0000000A, // #whoosh
SOUND_PARAKARRY_AIR_RAID_2 = SOUND_ID_UNK | 0x0000000B, // #whoosh #echoing
SOUND_KOOPER_SHELL_SPINUP = SOUND_ID_UNK | 0x0000000C,
SOUND_GOOMBARIO_JUMP = SOUND_ID_UNK | 0x0000000D,
SOUND_BOW_VANISH = SOUND_ID_UNK | 0x0000000E,
SOUND_BOW_APPEAR = SOUND_ID_UNK | 0x0000000F,
SOUND_EGG_MISSILE_BLAST = SOUND_ID_UNK | 0x00000010,
SOUND_WATT_REPEL_DARKNESS = SOUND_ID_UNK | 0x00000011,
SOUND_WATT_RESUME_DARKNESS = SOUND_ID_UNK | 0x00000012,
SOUND_SUSHIE_EMBARK = SOUND_ID_UNK | 0x00000013,
SOUND_SUSHIE_RIDE_IDLE = SOUND_ID_UNK | 0x00000014,
SOUND_SUSHIE_RIDE_MOVING = SOUND_ID_UNK | 0x00000015,
SOUND_BOMBETTE_BLAST_LV1 = SOUND_ID_UNK | 0x00000016,
SOUND_BOMBETTE_BLAST_LV2 = SOUND_ID_UNK | 0x00000017,
SOUND_BOMBETTE_BLAST_LV3 = SOUND_ID_UNK | 0x00000018,
SOUND_BOW_SMACK = SOUND_ID_UNK | 0x00000019,
SOUND_BOW_FAN_SMACK = SOUND_ID_UNK | 0x0000001A,
SOUND_LAKILESTER_THROW_SPINY_A = SOUND_ID_UNK | 0x0000001B,
SOUND_LAKILESTER_THROW_SPINY_B = SOUND_ID_UNK | 0x0000001C,
SOUND_LAKILESTER_MAKE_CLOUD_NINE = SOUND_ID_UNK | 0x0000001D,
SOUND_LAKILESTER_HURRICANE_INHALE = SOUND_ID_UNK | 0x0000001E,
SOUND_LAKILESTER_HURRICANE_EXHALE = SOUND_ID_UNK | 0x0000001F,
SOUND_BOMBETTE_BODY_SLAM = SOUND_ID_UNK | 0x00000020,
SOUND_SHELL_SPIN = SOUND_ID_UNK | 0x00000021,
SOUND_FAN_SMACK_HIT = SOUND_ID_UNK | 0x00000022, // #windy
SOUND_FAN_SMACK_END = SOUND_ID_UNK | 0x00000023, // #windy
SOUND_WATT_MEGA_CHARGE_WAVE = SOUND_ID_UNK | 0x00000024,
SOUND_DIZZY_SHELL = SOUND_ID_UNK | 0x00000026,
SOUND_SHUFFLE_CARD_A = SOUND_ID_UNK | 0x0000002A,
SOUND_SHUFFLE_CARD_B = SOUND_ID_UNK | 0x0000002B,
SOUND_FIRE_FLOWER_A = SOUND_ID_UNK | 0x0000002C,
SOUND_FIRE_FLOWER_B = SOUND_ID_UNK | 0x0000002D,
SOUND_SNOWMAN_DOLL_JUMP = SOUND_ID_UNK | 0x0000002E,
SOUND_NOISE_RUSH = SOUND_ID_UNK | 0x0000002F, // unused
SOUND_POW_BLOCK = SOUND_ID_UNK | 0x00000030,
SOUND_INFLICT_SLEEP = SOUND_ID_UNK | 0x00000031,
SOUND_INFLICT_STATUS = SOUND_ID_UNK | 0x00000032,
SOUND_DIZZY_DIAL = SOUND_ID_UNK | 0x00000033,
SOUND_SUSHIE_BELLY_FLOP = SOUND_ID_UNK | 0x00000034,
SOUND_CREATE_WATER_BLOCK = SOUND_ID_UNK | 0x00000035,
SOUND_WHALE_OPEN_MOUTH = SOUND_ID_UNK | 0x00000036,
SOUND_WHALE_CLOSE_MOUTH = SOUND_ID_UNK | 0x00000037,
SOUND_TUBBA_SNORE_INHALE = SOUND_ID_UNK | 0x00000038,
SOUND_TUBBA_SNORE_EXHALE = SOUND_ID_UNK | 0x00000039,
SOUND_KPA_BRIDGE_COLLAPSE_A = SOUND_ID_UNK | 0x0000003A,
SOUND_KPA_BRIDGE_COLLAPSE_B = SOUND_ID_UNK | 0x0000003B,
SOUND_KPA_ARENA_EXPLODING = SOUND_ID_UNK | 0x0000003C,
SOUND_OBK_STAIRS_DROP = SOUND_ID_UNK | 0x0000003D,
SOUND_SHY_GUY_OUCH = SOUND_ID_UNK | 0x0000003E,
SOUND_SHY_GUY_RUN_AWAY = SOUND_ID_UNK | 0x0000003F,
SOUND_KPA_FLIP_BRIDGE_PANEL = SOUND_ID_UNK | 0x00000040,
SOUND_STAR_SPIRIT_APPEAR_A = SOUND_ID_UNK | 0x00000041,
SOUND_STAR_SPIRIT_APPEAR_B = SOUND_ID_UNK | 0x00000042,
SOUND_STAR_SPIRIT_CAST_A = SOUND_ID_UNK | 0x00000043,
SOUND_STAR_SPIRIT_CAST_B = SOUND_ID_UNK | 0x00000044,
SOUND_STAR_SPIRIT_DEPART_1 = SOUND_ID_UNK | 0x00000045,
SOUND_STAR_SPIRIT_DEPART_2 = SOUND_ID_UNK | 0x00000046,
SOUND_STAR_SPIRIT_DEPART_3 = SOUND_ID_UNK | 0x00000047,
SOUND_DARK_TOAD_DISPEL = SOUND_ID_UNK | 0x00000049,
SOUND_OPEN_MAGIC_CHEST = SOUND_ID_UNK | 0x0000004A,
SOUND_CLOSE_MAGIC_CHEST = SOUND_ID_UNK | 0x0000004B,
SOUND_QUICK_HINGE = SOUND_ID_UNK | 0x0000004C, // unused
SOUND_FLO_MOVE_PILLAR = SOUND_ID_UNK | 0x0000004D,
SOUND_WISH_ASCENDING = SOUND_ID_UNK | 0x00000051,
SOUND_UP_AND_AWAY_SEND_AWAY = SOUND_ID_UNK | 0x00000052,
SOUND_STAR_POWER_RECOVERY = SOUND_ID_UNK | 0x00000053,
SOUND_START_RECOVERY = SOUND_ID_UNK | 0x00000055,
SOUND_RECOVER = SOUND_ID_UNK | 0x00000056,
SOUND_FLOWERS_LIGHT_GIGGLE = SOUND_ID_UNK | 0x00000059,
SOUND_FLOWERS_SAD_GIGGLE = SOUND_ID_UNK | 0x0000005A,
SOUND_FLOWERS_LAUGH = SOUND_ID_UNK | 0x0000005B,
SOUND_FLOWERS_WITHER = SOUND_ID_UNK | 0x0000005C,
SOUND_FLOWERS_GROW = SOUND_ID_UNK | 0x0000005D,
SOUND_ROCK_LAUGHTER = SOUND_ID_UNK | 0x0000005E,
SOUND_TREE_LAUGHTER = SOUND_ID_UNK | 0x0000005F,
SOUND_IMPISH_LAUGH = SOUND_ID_UNK | 0x00000060,
SOUND_CHAIN_CHOMP_BITE = SOUND_ID_UNK | 0x00000061,
SOUND_CHAIN_CHOMP_THUD = SOUND_ID_UNK | 0x00000062,
SOUND_CHAIN_RATTLE = SOUND_ID_UNK | 0x00000063,
SOUND_SHY_STACK_SQUISH = SOUND_ID_UNK | 0x00000064,
SOUND_STILT_GUY_UNFOLD = SOUND_ID_UNK | 0x00000065,
SOUND_STILT_GUY_STEP = SOUND_ID_UNK | 0x00000066,
SOUND_STILTS_FALL = SOUND_ID_UNK | 0x00000067, // #woody
SOUND_TANK_BULB_FIRE = SOUND_ID_UNK | 0x00000069, // #electric
SOUND_TOY_TANK_OPEN_HATCH = SOUND_ID_UNK | 0x0000006A,
SOUND_TOY_TANK_CLOSE_HATCH = SOUND_ID_UNK | 0x0000006B,
SOUND_WOODEN_BLOCK = SOUND_ID_UNK | 0x0000006C, // #unused
SOUND_RECOVER_HEART = SOUND_ID_UNK | 0x0000006D, // #magic
SOUND_FUZZY_RUMBLE = SOUND_ID_UNK | 0x0000006E,
SOUND_FUZZY_SHAKE = SOUND_ID_UNK | 0x0000006F,
SOUND_FUZZY_DIVIDE = SOUND_ID_UNK | 0x00000070,
SOUND_UP_AND_AWAY_CAPTURE = SOUND_ID_UNK | 0x00000071,
SOUND_YOSHI = SOUND_ID_UNK | 0x00000072,
SOUND_HIT_WHACKA = SOUND_ID_UNK | 0x00000073,
SOUND_MAGIC_ASCENDING = SOUND_ID_UNK | 0x00000074, // #magic #ascending
SOUND_MAGIC_DESCENDING = SOUND_ID_UNK | 0x00000075, // #magic #descending
SOUND_BOMB_BLAST = SOUND_ID_UNK | 0x00000076,
SOUND_BULLET_BILL_EXPLODE_A = SOUND_ID_UNK | 0x00000078,
SOUND_BULLET_BILL_EXPLODE_B = SOUND_ID_UNK | 0x00000079,
SOUND_KAMMY_SUMMON_MAGIC = SOUND_ID_UNK | 0x0000007A,
SOUND_KAMMY_SUMMON_BLOCK = SOUND_ID_UNK | 0x0000007B,
SOUND_KAMMY_RAISE_OBJECT = SOUND_ID_UNK | 0x0000007C,
SOUND_KAMMY_LOWER_OBJECT = SOUND_ID_UNK | 0x0000007D,
SOUND_TWINK_ATTACK = SOUND_ID_UNK | 0x0000007E,
SOUND_TWINK_FLY_A = SOUND_ID_UNK | 0x0000007F,
SOUND_QUICK_PLAYER_JUMP = SOUND_ID_UNK | 0x00000081,
SOUND_JUMP_8BIT_MARIO = SOUND_ID_UNK | 0x00000082,
SOUND_STAR_BOX_LAUNCHER = SOUND_ID_UNK | 0x00000085,
SOUND_SPRING = SOUND_ID_UNK | 0x00000086,
SOUND_ZIPLINE_FINISH = SOUND_ID_UNK | 0x00000087,
SOUND_PUSH_BLOCK = SOUND_ID_UNK | 0x00000088,
SOUND_PULL_VINE = SOUND_ID_UNK | 0x00000089,
SOUND_FLOOR_SWITCH_DEPRESS = SOUND_ID_UNK | 0x0000008A,
SOUND_FLOOR_SWITCH_ACTIVATE = SOUND_ID_UNK | 0x0000008B,
SOUND_NO_DAMGE = SOUND_ID_UNK | 0x0000008C,
SOUND_USE_ITEM = SOUND_ID_UNK | 0x0000008D,
SOUND_GROW = SOUND_ID_UNK | 0x0000008E,
SOUND_CHARGE_UP = SOUND_ID_UNK | 0x0000008F,
SOUND_OPEN_TRAPDOOR = SOUND_ID_UNK | 0x00000091,
SOUND_BREAK_FLOOR = SOUND_ID_UNK | 0x00000092,
SOUND_SPIKES_EXTEND = SOUND_ID_UNK | 0x00000093,
SOUND_JUMP_SCARE = SOUND_ID_UNK | 0x00000094,
SOUND_EAT_OR_DRINK = SOUND_ID_UNK | 0x00000095,
SOUND_SPIT_OUT = SOUND_ID_UNK | 0x00000096,
SOUND_GLASS_SHATTER = SOUND_ID_UNK | 0x00000097,
SOUND_VANISH_IN_SMOKE = SOUND_ID_UNK | 0x00000098,
SOUND_HEART_PLANT = SOUND_ID_UNK | 0x00000099,
SOUND_HURT_PLANT_SHRIEK = SOUND_ID_UNK | 0x0000009A,
SOUND_MUNCHLESIA_SUCTION = SOUND_ID_UNK | 0x0000009B,
SOUND_JAN_LOG_LAND = SOUND_ID_UNK | 0x0000009D,
SOUND_JAN_LOG_SPLIT = SOUND_ID_UNK | 0x0000009E,
SOUND_SEPARATE_BUSHES = SOUND_ID_UNK | 0x0000009F,
SOUND_LARGE_NPC_IMPACT = SOUND_ID_UNK | 0x000000A0,
SOUND_STARSHIP_BOOST = SOUND_ID_UNK | 0x000000A1,
SOUND_IWA_SLIDE_GATE = SOUND_ID_UNK | 0x000000A2,
SOUND_CREAKY_WINDOW_OPEN = SOUND_ID_UNK | 0x000000A3,
SOUND_CREAKY_WINDOW_CLOSE = SOUND_ID_UNK | 0x000000A4,
SOUND_TRAIN_DOOR_OPEN = SOUND_ID_UNK | 0x000000A5,
SOUND_TRAIN_DOOR_CLOSE = SOUND_ID_UNK | 0x000000A6,
SOUND_TURN_MECHANISM = SOUND_ID_UNK | 0x000000A7,
SOUND_CAPSULE_OPEN = SOUND_ID_UNK | 0x000000A8,
SOUND_FLIP_PANEL = SOUND_ID_UNK | 0x000000AB,
SOUND_CLOSE_PANEL = SOUND_ID_UNK | 0x000000AC,
SOUND_WATER_SPLASH = SOUND_ID_UNK | 0x000000AD,
SOUND_BREAK_CRATE = SOUND_ID_UNK | 0x000000AE, // #boing
SOUND_HOLLOW_RISING = SOUND_ID_UNK | 0x000000AF, // #unused
SOUND_HOLLOW_FALLING = SOUND_ID_UNK | 0x000000B0, // #unused
SOUND_PIRANHA_SPIN_1 = SOUND_ID_UNK | 0x000000B1,
SOUND_PIRANHA_SPIN_2 = SOUND_ID_UNK | 0x000000B2,
SOUND_PIRANHA_TENSE = SOUND_ID_UNK | 0x000000B3,
SOUND_HEAVY_NPC_STEP_B = SOUND_ID_UNK | 0x000000B4,
SOUND_HUFF_N_PUFF_JIGGLE = SOUND_ID_UNK | 0x000000B6,
SOUND_HUFF_N_PUFF_WOBBLE = SOUND_ID_UNK | 0x000000B7,
SOUND_GHOST_TRANSFORM = SOUND_ID_UNK | 0x000000B8,
SOUND_JR_TROOPA_TRANSFORM = SOUND_ID_UNK | 0x000000B9,
SOUND_ACTOR_STEP_A = SOUND_ID_UNK | 0x000000BA,
SOUND_MASTER_FLUTTER = SOUND_ID_UNK | 0x000000BB,
SOUND_MASTER_KICK = SOUND_ID_UNK | 0x000000BC,
SOUND_MASTER_STANCE_CHANGE = SOUND_ID_UNK | 0x000000BD,
SOUND_MASTER_FLIP = SOUND_ID_UNK | 0x000000BE,
SOUND_LAVA_BUD_RECOVER = SOUND_ID_UNK | 0x000000BF,
SOUND_SMALL_NPC_STEP = SOUND_ID_UNK | 0x000000C1,
SOUND_BANDIT_STEAL = SOUND_ID_UNK | 0x000000C2,
SOUND_DISAPPOINTED = SOUND_ID_UNK | 0x000000C3,
SOUND_CLUBBA_STEP = SOUND_ID_UNK | 0x000000C4,
SOUND_CLUBBA_SWING = SOUND_ID_UNK | 0x000000C5,
SOUND_MBUSH_STEP = SOUND_ID_UNK | 0x000000C6,
SOUND_TUBBA_HEART_JUMP = SOUND_ID_UNK | 0x000000C8,
SOUND_MBUSH_LEAP = SOUND_ID_UNK | 0x000000C9,
SOUND_BZZAP_STING = SOUND_ID_UNK | 0x000000CA,
SOUND_MINI_BZZAP_STING = SOUND_ID_UNK | 0x000000CB,
SOUND_BZZAP_CALL_SWARM = SOUND_ID_UNK | 0x000000CC,
SOUND_BONY_BEETLE_STEP = SOUND_ID_UNK | 0x000000CD,
SOUND_BONY_BEETLE_EXTEND_SPIKES = SOUND_ID_UNK | 0x000000CE,
SOUND_BONY_BEETLE_RETRACT_SPIKES = SOUND_ID_UNK | 0x000000CF,
SOUND_CLEFT_STEP = SOUND_ID_UNK | 0x000000D0,
SOUND_CLEFT_TACKLE = SOUND_ID_UNK | 0x000000D1,
SOUND_LAKITU_THROW_SPINY = SOUND_ID_UNK | 0x000000D2,
SOUND_SHELL_TOSS = SOUND_ID_UNK | 0x000000D3,
SOUND_SPELL_CAST1 = SOUND_ID_UNK | 0x000000D4,
SOUND_SPELL_CAST2 = SOUND_ID_UNK | 0x000000D5,
SOUND_SPELL_CAST3 = SOUND_ID_UNK | 0x000000D6,
SOUND_SPELL_CAST4 = SOUND_ID_UNK | 0x000000D7,
SOUND_SPELL_CAST5 = SOUND_ID_UNK | 0x000000D8, // unused
SOUND_FUZZIPEDE_MOTION = SOUND_ID_UNK | 0x000000D9,
SOUND_FUZZIPEDE_LEAP = SOUND_ID_UNK | 0x000000DA, // #boing #spring #bounce
SOUND_FUZZIPEDE_STRIKE = SOUND_ID_UNK | 0x000000DB, // #boing #spring
SOUND_COMMAND_LOSS = SOUND_ID_UNK | 0x000000DC,
SOUND_GOOMBA_STEP = SOUND_ID_UNK | 0x000000DD,
SOUND_PIRANHA_BITE = SOUND_ID_UNK | 0x000000DE,
SOUND_PARAGOOMBA_FLY = SOUND_ID_UNK | 0x000000DF,
SOUND_PARAGOOMBA_PREDIVE = SOUND_ID_UNK | 0x000000E0,
SOUND_TUTANKOOPA_MAGIC = SOUND_ID_UNK | 0x000000E1,
SOUND_JR_TOOPA_JUMP = SOUND_ID_UNK | 0x000000E2,
SOUND_ACTOR_WITHER = SOUND_ID_UNK | 0x000000E3,
SOUND_ACTOR_COLLAPSE = SOUND_ID_UNK | 0x000000E4,
SOUND_KNOCKOUT_CHIRPING = SOUND_ID_UNK | 0x000000E5, // #bird #chirping
SOUND_TUTANKOOPA_LEVITATE = SOUND_ID_UNK | 0x000000E6,
SOUND_SPOOKY_LEVITATE = SOUND_ID_UNK | 0x000000E7,
SOUND_ILLUSION_DISSOLVE = SOUND_ID_UNK | 0x000000E8,
SOUND_HEAVY_NPC_FALLING = SOUND_ID_UNK | 0x000000E9, // #falling
SOUND_HEAVY_NPC_LANDING = SOUND_ID_UNK | 0x000000EA, // #echoing #thud #impact
SOUND_TUTANKOOPA_DEBRIS_FALL = SOUND_ID_UNK | 0x000000EB, // #falling
SOUND_HEAVY_NPC_STEP_A = SOUND_ID_UNK | 0x000000EC,
SOUND_GOOMBA_KING_SPIN = SOUND_ID_UNK | 0x000000ED,
SOUND_GULPIT_LICK = SOUND_ID_UNK | 0x000000EE,
SOUND_BUZZAR_FLAP = SOUND_ID_UNK | 0x000000EF,
SOUND_BUZZAR_WHIRLWIND = SOUND_ID_UNK | 0x000000F0, // #windy
SOUND_BUZZAR_WINDUP = SOUND_ID_UNK | 0x000000F1,
SOUND_BUZZAR_DIVE = SOUND_ID_UNK | 0x000000F2,
SOUND_SMALL_LENS_FLARE = SOUND_ID_UNK | 0x000000F3,
SOUND_BUZZAR_THROW = SOUND_ID_UNK | 0x000000F4,
SOUND_BUZZAR_GRAB = SOUND_ID_UNK | 0x000000F5,
SOUND_HEAVY_NPC_STEP_C = SOUND_ID_UNK | 0x000000F6,
SOUND_TUBBAS_HEART_CHARGE = SOUND_ID_UNK | 0x000000F7,
SOUND_TUBBAS_HEART_SWARM_ATTACK = SOUND_ID_UNK | 0x000000F9,
SOUND_TUBBAS_HEART_SWARM_DISPERSE = SOUND_ID_UNK | 0x000000FB,
SOUND_TUBBAS_HEART_SWARM_VANISH = SOUND_ID_UNK | 0x000000FC,
SOUND_FAKE_BOWSER_SWING = SOUND_ID_UNK | 0x000000FD,
SOUND_FAKE_BOWSER_STRIKE = SOUND_ID_UNK | 0x000000FE,
SOUND_FILE_MENU_MOVE_CURSOR = SOUND_ID_UNK | 0x00000101,
SOUND_CREATE_FILE_MOVE_CURSOR = SOUND_ID_UNK | 0x00000102,
SOUND_CREATE_FILE_SET_CHARACTER = SOUND_ID_UNK | 0x00000103,
SOUND_CREATE_FILE_BACKSPACE = SOUND_ID_UNK | 0x00000104,
SOUND_CREATE_FILE_CHANGE_CHARSET = SOUND_ID_UNK | 0x00000105,
SOUND_INFLICT_CHILL_OUT = SOUND_ID_UNK | 0x00000106,
SOUND_INFLICT_KO = SOUND_ID_UNK | 0x00000107,
SOUND_SPAWN_BLOCK = SOUND_ID_UNK | 0x00000108,
SOUND_D_DOWN_HIT_1 = SOUND_ID_UNK | 0x0000010A,
SOUND_D_DOWN_HIT_2 = SOUND_ID_UNK | 0x0000010B,
SOUND_D_DOWN_HIT_3 = SOUND_ID_UNK | 0x0000010C,
SOUND_SPIN = SOUND_ID_UNK | 0x00000111,
SOUND_SPEEDY_SPIN = SOUND_ID_UNK | 0x00000112,
SOUND_SPIN_ATTACK = SOUND_ID_UNK | 0x00000113,
SOUND_SPEEDY_SPIN_ATTACK = SOUND_ID_UNK | 0x00000114,
SOUND_HAMMER_SWING_1 = SOUND_ID_UNK | 0x00000115,
SOUND_HAMMER_SWING_2 = SOUND_ID_UNK | 0x00000116,
SOUND_HAMMER_SWING_3 = SOUND_ID_UNK | 0x00000117,
SOUND_HAMMER_STRIKE_1 = SOUND_ID_UNK | 0x00000118,
SOUND_HAMMER_STRIKE_2 = SOUND_ID_UNK | 0x00000119,
SOUND_HAMMER_STRIKE_3 = SOUND_ID_UNK | 0x0000011A,
SOUND_HAMMER_QUAKE_1 = SOUND_ID_UNK | 0x0000011B,
SOUND_HAMMER_QUAKE_2 = SOUND_ID_UNK | 0x0000011C,
SOUND_HAMMER_QUAKE_3 = SOUND_ID_UNK | 0x0000011D,
SOUND_SPIN_SMASH_1 = SOUND_ID_UNK | 0x0000011E,
SOUND_SPIN_SMASH_2 = SOUND_ID_UNK | 0x0000011F,
SOUND_SPIN_SMASH_3 = SOUND_ID_UNK | 0x00000120,
SOUND_BOWSER_STAR_ROD_USE = SOUND_ID_UNK | 0x00000121,
SOUND_BOWSER_STAR_ROD_DRAIN_WAVE = SOUND_ID_UNK | 0x00000122,
SOUND_BOWSER_STAR_ROD_GATHER = SOUND_ID_UNK | 0x00000123,
SOUND_BOWSER_STAR_ROD_SHOCKWAVE = SOUND_ID_UNK | 0x00000124,
SOUND_BOWSER_STAR_ROD_ENCHANT = SOUND_ID_UNK | 0x00000125,
SOUND_BOWSER_CAST_RECOVER = SOUND_ID_UNK | 0x00000126,
SOUND_BOWSER_LIGHTNING = SOUND_ID_UNK | 0x00000127,
SOUND_BOWSER_POWER_DOWN = SOUND_ID_UNK | 0x00000128,
SOUND_BOWSER_COLLAPSE = SOUND_ID_UNK | 0x00000129,
SOUND_OBK_CHANDELIER_RELEASE = SOUND_ID_UNK | 0x0000012A,
SOUND_OBK_CHANDELIER_STOP = SOUND_ID_UNK | 0x0000012B,
SOUND_OBK_CHANDELIER_RETRACT = SOUND_ID_UNK | 0x0000012C,
SOUND_RELEASE_ENERGY = SOUND_ID_UNK | 0x0000012D,
SOUND_GATHER_ENERGY = SOUND_ID_UNK | 0x0000012E,
// looping sounds
SOUND_LOOP_BOMBETTE_FUSE = 0x80000000,
SOUND_LOOP_BOBOMB_FUSE = 0x80000001,
@ -1726,23 +1747,6 @@ enum SoundSpatializationFlags {
SOUND_PARAM_QUIET = 0x00400000,
};
enum SoundType {
SOUND_TYPE_SPECIAL = 0x80000000,
SOUND_TYPE_LOOPING = 0, // 0x80000000 (with SOUND_TYPE_SPECIAL)
SOUND_TYPE_EXIT_DOOR = 1, // 0x90000000 (with SOUND_TYPE_SPECIAL)
SOUND_TYPE_ROOM_DOOR = 2, // 0xA0000000 (with SOUND_TYPE_SPECIAL)
SOUND_TYPE_ALTERNATING = 3, // 0xB0000000 (with SOUND_TYPE_SPECIAL)
};
enum SoundIDBits {
SOUND_ID_STOP = 0x00008000,
SOUND_ID_LOWER = 0x000023FF,
SOUND_ID_ADJUST = 0x00001000,
SOUND_ID_TRIGGER_MASK = 0x00000C00,
SOUND_ID_TRIGGER_CHANGE_SOUND = 0x00000400,
SOUND_ID_TRIGGER_CHANGE_VOLUME = 0x00000800,
};
enum SoundTriggers {
SOUND_TRIGGER_CHANGE_SOUND = 1,
SOUND_TRIGGER_CHANGE_VOLUME = 2,
@ -2582,7 +2586,7 @@ enum EntityTypes {
ENTITY_TYPE_SIMPLE_SPRING = 0x2E,
ENTITY_TYPE_SCRIPT_SPRING = 0x2F,
ENTITY_TYPE_HIDDEN_PANEL = 0x30,
ENTITY_TYPE_STAR_BOX_LAUCHER = 0x31,
ENTITY_TYPE_STAR_BOX_LAUNCHER = 0x31,
ENTITY_TYPE_CHEST = 0x32,
ENTITY_TYPE_SIGNPOST = 0x33,
ENTITY_TYPE_RED_ARROW_SIGNS = 0x34,
@ -3249,60 +3253,58 @@ enum RenderModeIndex {
RENDER_MODE_IDX_3A = 0x3A,
RENDER_MODE_IDX_3B = 0x3B,
RENDER_MODE_IDX_3C = 0x3C,
RENDER_MODE_IDX_3D = 0x3D,
};
/// not really
enum RenderMode {
RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0 = 0x00000000,
RENDER_MODE_SURFACE_OPA = 0x00000001,
RENDER_MODE_2 = 0x00000002,
RENDER_MODE_02_UNUSED = 0x00000002,
RENDER_MODE_SURFACE_OPA_NO_AA = 0x00000003,
RENDER_MODE_SURFACE_OPA_NO_ZB = 0x00000004,
RENDER_MODE_DECAL_OPA = 0x00000005,
RENDER_MODE_6 = 0x00000006,
RENDER_MODE_06_UNUSED = 0x00000006,
RENDER_MODE_DECAL_OPA_NO_AA = 0x00000007,
RENDER_MODE_8 = 0x00000008,
RENDER_MODE_08_UNUSED = 0x00000008,
RENDER_MODE_INTERSECTING_OPA = 0x00000009,
RENDER_MODE_A = 0x0000000A,
RENDER_MODE_B = 0x0000000B,
RENDER_MODE_C = 0x0000000C,
RENDER_MODE_0A_UNUSED = 0x0000000A,
RENDER_MODE_0B_UNUSED = 0x0000000B,
RENDER_MODE_0C_UNUSED = 0x0000000C,
RENDER_MODE_ALPHATEST = 0x0000000D,
RENDER_MODE_E = 0x0000000E,
RENDER_MODE_0E_UNUSED = 0x0000000E,
RENDER_MODE_ALPHATEST_ONESIDED = 0x0000000F,
RENDER_MODE_ALPHATEST_NO_ZB = 0x00000010,
RENDER_MODE_SURFACE_XLU_LAYER1 = 0x00000011,
RENDER_MODE_12 = 0x00000012,
RENDER_MODE_12_UNUSED = 0x00000012,
RENDER_MODE_SURFACE_XLU_NO_AA = 0x00000013,
RENDER_MODE_SURFACE_XLU_NO_ZB = 0x00000014,
RENDER_MODE_SURFXLU_ZB_ZUPD = 0x00000015,
RENDER_MODE_SURFACE_XLU_ZB_ZUPD = 0x00000015,
RENDER_MODE_SURFACE_XLU_LAYER2 = 0x00000016,
RENDER_MODE_17 = 0x00000017,
RENDER_MODE_18 = 0x00000018,
RENDER_MODE_19 = 0x00000019,
RENDER_MODE_17_UNUSED = 0x00000017,
RENDER_MODE_18_UNUSED = 0x00000018,
RENDER_MODE_19_UNUSED = 0x00000019,
RENDER_MODE_DECAL_XLU = 0x0000001A,
RENDER_MODE_1B = 0x0000001B,
RENDER_MODE_DECAL_XLU_NOAA = 0x0000001C,
RENDER_MODE_1D = 0x0000001D,
RENDER_MODE_1E = 0x0000001E,
RENDER_MODE_1F = 0x0000001F,
RENDER_MODE_1B_UNUSED = 0x0000001B,
RENDER_MODE_DECAL_XLU_NO_AA = 0x0000001C,
RENDER_MODE_1D_UNUSED = 0x0000001D,
RENDER_MODE_DECAL_XLU_AHEAD = 0x0000001E, // special case RENDER_MODE_DECAL_XLU for rendering in front of others
RENDER_MODE_1F_UNUSED = 0x0000001F,
RENDER_MODE_SHADOW = 0x00000020,
RENDER_MODE_21 = 0x00000021,
RENDER_MODE_21_UNUSED = 0x00000021,
RENDER_MODE_SURFACE_XLU_LAYER3 = 0x00000022,
RENDER_MODE_23 = 0x00000023,
RENDER_MODE_24 = 0x00000024,
RENDER_MODE_25 = 0x00000025,
RENDER_MODE_23_UNUSED = 0x00000023,
RENDER_MODE_24_UNUSED = 0x00000024,
RENDER_MODE_25_UNUSED = 0x00000025,
RENDER_MODE_INTERSECTING_XLU = 0x00000026,
RENDER_MODE_27 = 0x00000027,
RENDER_MODE_28 = 0x00000028,
RENDER_MODE_SURFXLU_AA_ZB_ZUPD = 0x00000029,
RENDER_MODE_2A = 0x0000002A,
RENDER_MODE_2B = 0x0000002B,
RENDER_MODE_2C = 0x0000002C,
RENDER_MODE_2D = 0x0000002D,
RENDER_MODE_27_UNUSED = 0x00000027,
RENDER_MODE_PASS_THROUGH = 0x00000028, // no render mode is set, only geometry modes are initialized
RENDER_MODE_SURFACE_XLU_AA_ZB_ZUPD = 0x00000029,
RENDER_MODE_SURFACE_OPA_NO_ZB_BEHIND = 0x0000002A,
RENDER_MODE_ALPHATEST_NO_ZB_BEHIND = 0x0000002B,
RENDER_MODE_SURFACE_XLU_NO_ZB_BEHIND = 0x0000002C,
RENDER_MODE_CLOUD_NO_ZCMP = 0x0000002D,
RENDER_MODE_CLOUD = 0x0000002E,
RENDER_MODE_CLOUD_NO_ZB = 0x0000002F,
RENDER_MODE_COUNT = 0x00000030,
};
enum RenderTaskFlags {

8
include/macros.h
View File

@ -276,6 +276,8 @@
#define PACK_PAL_RGBA(r, g, b, a) (((r) << 11) | ((g) << 6) | ((b) << 1) | (a));
#define PM_RM_TILEMODE_B GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA)
#define PM_CC_01 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0
#define PM_CC_02 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0
#define PM_CC_03 TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0
@ -302,6 +304,12 @@
#define PM_CC_16 COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED
#define PM_CC_17 COMBINED, 0, PRIMITIVE, ENVIRONMENT, 0, 0, 0, COMBINED
#define PM_CC_18 COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED
#define PM_CC_19 COMBINED, 0, SHADE, PRIMITIVE, 0, 0, 0, COMBINED
#define PM_CC_1A COMBINED, 0, PRIMITIVE, ENVIRONMENT, 0, 0, 0, COMBINED
#define PM_CC_ALT_TRILERP TEXEL1, TEXEL0, LOD_FRACTION, TEXEL0, TEXEL1, TEXEL0, LOD_FRACTION, TEXEL0
// custom cycle1 modes for window styles
#define PM_CC_WINDOW_2 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, TEXEL1
#define PM_CC_WINDOW_3 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL1, 0

15
include/model.h
View File

@ -35,6 +35,19 @@ typedef struct ModelNodeProperty {
/* 0x8 */ ModelNodePropertyData data;
} ModelNodeProperty; // size = 0xC;
typedef struct ModelGroupData {
/* 0x00 */ Mtx* transformMatrix;
/* 0x04 */ Lightsn* lightingGroup;
/* 0x08 */ s32 numLights;
/* 0x0C */ s32 numChildren;
/* 0x10 */ struct ModelNode** childList;
} ModelGroupData; // size = 0x14
typedef struct ModelDisplayData {
/* 0x0 */ Gfx* displayList;
/* 0x4 */ char unk_04[0x4];
} ModelDisplayData; // size = 0x8
typedef struct ModelNode {
/* 0x00 */ s32 type; /* 2 = model */
/* 0x04 */ ModelDisplayData* displayData;
@ -172,7 +185,7 @@ typedef struct ShapeFile {
} ShapeFile; // size = variable
typedef ModelTreeInfo ModelTreeInfoList[0x200];
extern ModelTreeInfoList* mdl_currentModelTreeNodeInfo;
extern ModelTreeInfoList* gCurrentModelTreeNodeInfo;
extern ModelList* gCurrentModels;
void set_model_fog_color_parameters(u8 primR, u8 primG, u8 primB, u8 primA, u8 fogR, u8 fogG, u8 fogB, s32 fogStart, s32 fogEnd);

56
src/animator.c
View File

@ -29,20 +29,20 @@ SHIFT_BSS Matrix4f gAnimTranslateMtx;
SHIFT_BSS Matrix4f gAnimRotScaleMtx;
SHIFT_BSS StaticAnimatorNode** gAnimTreeRoot;
extern Gfx D_8014B7F8[];
extern Gfx D_8014B820[];
extern Gfx D_8014B848[];
extern Gfx D_8014B870[];
extern Gfx D_8014B898[];
extern Gfx D_8014B8C0[];
extern Gfx D_8014B8E8[];
extern Gfx D_8014BE78[];
extern Gfx D_8014BEA0[];
extern Gfx D_8014BEC8[];
extern Gfx D_8014BEF0[];
extern Gfx D_8014BF18[];
extern Gfx D_8014BF40[];
extern Gfx D_8014BF68[];
extern Gfx Gfx_RM1_SURFACE_OPA[];
extern Gfx Gfx_RM1_DECAL_OPA[];
extern Gfx Gfx_RM1_INTERSECTING_OPA[];
extern Gfx Gfx_RM1_ALPHATEST[];
extern Gfx Gfx_RM1_SURFACE_XLU[];
extern Gfx Gfx_RM1_DECAL_XLU[];
extern Gfx Gfx_RM1_INTERSECTING_XLU[];
extern Gfx Gfx_RM3_SURFACE_OPA[];
extern Gfx Gfx_RM3_DECAL_OPA[];
extern Gfx Gfx_RM3_INTERSECTING_OPA[];
extern Gfx Gfx_RM3_ALPHATEST[];
extern Gfx Gfx_RM3_SURFACE_XLU[];
extern Gfx Gfx_RM3_DECAL_XLU[];
extern Gfx Gfx_RM3_INTERSECTING_XLU[];
AnimScript gAnimScriptDefault = {
as_Wait(60)
@ -786,50 +786,50 @@ void appendGfx_animator(ModelAnimator* animator) {
case FALSE:
switch (animator->renderMode) {
case RENDER_MODE_SURFACE_OPA:
gSPDisplayList(gMainGfxPos++, D_8014B7F8);
gSPDisplayList(gMainGfxPos++, Gfx_RM1_SURFACE_OPA);
break;
case RENDER_MODE_DECAL_OPA:
gSPDisplayList(gMainGfxPos++, D_8014B820);
gSPDisplayList(gMainGfxPos++, Gfx_RM1_DECAL_OPA);
break;
case RENDER_MODE_INTERSECTING_OPA:
gSPDisplayList(gMainGfxPos++, D_8014B848);
gSPDisplayList(gMainGfxPos++, Gfx_RM1_INTERSECTING_OPA);
break;
case RENDER_MODE_ALPHATEST:
gSPDisplayList(gMainGfxPos++, D_8014B870);
gSPDisplayList(gMainGfxPos++, Gfx_RM1_ALPHATEST);
break;
case RENDER_MODE_SURFACE_XLU_LAYER1:
gSPDisplayList(gMainGfxPos++, D_8014B898);
gSPDisplayList(gMainGfxPos++, Gfx_RM1_SURFACE_XLU);
break;
case RENDER_MODE_DECAL_XLU:
gSPDisplayList(gMainGfxPos++, D_8014B8C0);
gSPDisplayList(gMainGfxPos++, Gfx_RM1_DECAL_XLU);
break;
case RENDER_MODE_INTERSECTING_XLU:
gSPDisplayList(gMainGfxPos++, D_8014B8E8);
gSPDisplayList(gMainGfxPos++, Gfx_RM1_INTERSECTING_XLU);
break;
}
break;
case TRUE:
switch (animator->renderMode) {
case RENDER_MODE_SURFACE_OPA:
gSPDisplayList(gMainGfxPos++, D_8014BE78);
gSPDisplayList(gMainGfxPos++, Gfx_RM3_SURFACE_OPA);
break;
case RENDER_MODE_DECAL_OPA:
gSPDisplayList(gMainGfxPos++, D_8014BEA0);
gSPDisplayList(gMainGfxPos++, Gfx_RM3_DECAL_OPA);
break;
case RENDER_MODE_INTERSECTING_OPA:
gSPDisplayList(gMainGfxPos++, D_8014BEC8);
gSPDisplayList(gMainGfxPos++, Gfx_RM3_INTERSECTING_OPA);
break;
case RENDER_MODE_ALPHATEST:
gSPDisplayList(gMainGfxPos++, D_8014BEF0);
gSPDisplayList(gMainGfxPos++, Gfx_RM3_ALPHATEST);
break;
case RENDER_MODE_SURFACE_XLU_LAYER1:
gSPDisplayList(gMainGfxPos++, D_8014BF18);
gSPDisplayList(gMainGfxPos++, Gfx_RM3_SURFACE_XLU);
break;
case RENDER_MODE_DECAL_XLU:
gSPDisplayList(gMainGfxPos++, D_8014BF40);
gSPDisplayList(gMainGfxPos++, Gfx_RM3_DECAL_XLU);
break;
case RENDER_MODE_INTERSECTING_XLU:
gSPDisplayList(gMainGfxPos++, D_8014BF68);
gSPDisplayList(gMainGfxPos++, Gfx_RM3_INTERSECTING_XLU);
break;
}

39
src/audio.h
View File

@ -612,7 +612,7 @@ typedef struct SoundPlayer {
/* 0x85 */ u8 triggers;
/* 0x86 */ char unk_86[0x2];
/* 0x88 */ s8* loopStartPos;
/* 0x8C */ u8 loopIterCount;
/* 0x8C */ u8 loopIterCount; // loopIterCount = 0 for infinite loop
/* 0x8D */ char unk_8D;
/* 0x8E */ u16 delay;
/* 0x90 */ u16 playLength;
@ -783,28 +783,25 @@ typedef struct BGMInstrumentInfo {
/* 0x07 */ char pad_7[1];
} BGMInstrumentInfo; // size = 0x8
typedef struct AUFileMetadata {
/* 0x00 */ s32 signature; // file type identifer: 'SBN ', 'SEF ', etc
/* 0x04 */ s32 size; // full file size, including header and data
} AUFileMetadata;
typedef struct SBNHeader {
/* 0x00 */ s32 signature; // 'SBN '
/* 0x04 */ s32 size;
/* 0x08 */ s32 unk_08;
/* 0x0C */ s32 unk_0C;
/* 0x10 */ s32 tableOffset; // = 0x40
/* 0x14 */ s32 numEntries;
/* 0x18 */ s32 unk_18;
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
/* 0x00 */ AUFileMetadata mdata; // uses identifer 'SBN '
/* 0x08 */ char unused_08[8];
/* 0x10 */ s32 tableOffset; // offset in the SBN file of the file table (== sizeof(SBNHeader))
/* 0x14 */ s32 numEntries; // number of entries in the SBN file table
/* 0x18 */ s32 fileSize; // full size of the SBN file (unread)
/* 0x1C */ s32 versionOffset;
/* 0x20 */ char unused_04[4];
/* 0x24 */ s32 INIToffset;
/* 0x28 */ s32 unk_28;
/* 0x2C */ s32 unk_2C;
/* 0x30 */ s32 unk_30;
/* 0x34 */ s32 unk_34;
/* 0x38 */ s32 unk_38;
/* 0x3C */ s32 unk_3C;
/* 0x28 */ char reserved[24];
} SBNHeader; // size = 0x40
typedef struct SEFHeader {
/* 0x00 */ s32 signature; // 'SEF '
/* 0x04 */ s32 size;
/* 0x00 */ AUFileMetadata mdata; // uses identifer 'SEF '
/* 0x08 */ s32 unk8;
/* 0x0C */ s8 unkC; // 0
/* 0x0D */ s8 unkD; // 0
@ -815,8 +812,7 @@ typedef struct SEFHeader {
} SEFHeader; // size = 0x22
typedef struct INITHeader {
/* 0x00 */ s32 signature; // 'INIT'
/* 0x04 */ s32 size;
/* 0x00 */ AUFileMetadata mdata; // uses identifer 'INIT'
/* 0x08 */ u16 entriesOffset;
/* 0x0A */ u16 entriesSize;
/* 0x0C */ u16 tblOffset;
@ -827,8 +823,7 @@ typedef struct INITHeader {
} INITHeader; // size = 0x20
typedef struct PERHeader {
/* 0x00 */ s32 signature; // 'PER ' or 'PRG '
/* 0x04 */ s32 size; // including this header
/* 0x00 */ AUFileMetadata mdata; // uses identifer 'PER ' or 'PRG '
/* 0x08 */ char unk_08[8];
} PERHeader; // size = 0x10

4
src/audio/2e230_len_2190.c
View File

@ -798,7 +798,7 @@ void au_load_PER(AuGlobals* globals, s32 romAddr) {
void* end;
au_read_rom(romAddr, &header, sizeof(header));
size = header.size - sizeof(header);
size = header.mdata.size - sizeof(header);
au_read_rom(romAddr + sizeof(header), globals->dataPER, size);
numItems = size / sizeof(PEREntry);
numItemsLeft = 6 - numItems;
@ -819,7 +819,7 @@ void au_load_PRG(AuGlobals* arg0, s32 romAddr) {
au_read_rom(romAddr, &header, sizeof(header));
dataRomAddr = romAddr + sizeof(header);
size = header.size - sizeof(header);
size = header.mdata.size - sizeof(header);
if (size > 0x200) {
size = 0x200;
}

124
src/audio/sfx_player.c
View File

@ -650,7 +650,7 @@ void au_sfx_update_main(SoundManager* manager) {
}
}
}
sfxEntry->soundID = 0;
sfxEntry->soundID = SOUND_NONE;
j++;
if (j >= ARRAY_COUNT(manager->soundQueue)) {
@ -695,7 +695,7 @@ void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManager
s32 playerIndex;
u16* cmdList;
s32 trackCount;
s32 cond = FALSE;
s32 foundPlayer = FALSE;
u32 exclusiveID;
s32 sectionIndex;
u16 soundInfo;
@ -709,9 +709,9 @@ void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManager
u16 soundIDLower = entry->soundID & SOUND_ID_LOWER;
u16 soundID = entry->soundID;
if (soundID & 0x2000) {
if (soundID & SOUND_ID_UNK) {
// sound from extra section
soundIndex = (entry->soundID - 1) & 0x1FF;
soundIndex = (entry->soundID - 1) & SOUND_ID_UNK_INDEX_MASK;
if (soundIndex < 0x140) {
cmdList = (u16*)&manager->extraSounds[soundIndex];
if (*cmdList != 0) {
@ -719,23 +719,23 @@ void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManager
for (playerIndex = 7; playerIndex >= 0; playerIndex--) {
player = &manager->players[playerIndex];
if (player->curSoundID == soundIDLower) {
cond = TRUE;
foundPlayer = TRUE;
break;
}
}
if (!cond) {
if (!foundPlayer) {
//find free player
for (playerIndex = 7; playerIndex >= 0; playerIndex--) {
player = &manager->players[playerIndex];
if (player->sefDataReadPos == NULL) {
cond = TRUE;
foundPlayer = TRUE;
break;
}
}
}
if (cond) {
if (foundPlayer) {
au_sfx_play_sound(manager, player, (s8*)cmdList, entry, 0, 0);
}
}
@ -756,23 +756,23 @@ void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManager
for (playerIndex = 7; playerIndex >= 0; playerIndex--) {
player = &manager->players[playerIndex];
if (player->curSoundID == soundIDLower) {
cond = TRUE;
foundPlayer = TRUE;
break;
}
}
if (!cond) {
if (!foundPlayer) {
//find free player
for (playerIndex = 7; playerIndex >= 0; playerIndex--) {
player = &manager->players[playerIndex];
if (player->sefDataReadPos == NULL) {
cond = TRUE;
foundPlayer = TRUE;
break;
}
}
}
if (cond) {
if (foundPlayer) {
au_sfx_play_sound(manager, player, (u8*)cmdList, entry, 0, 0);
}
}
@ -785,6 +785,7 @@ void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManager
}
if (*cmdList != 0) {
// read sound info chunk
soundInfo = cmdList[1];
priority = (soundInfo & 0x300) >> 8; // bits 8, 9
@ -797,14 +798,14 @@ void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManager
for (playerIndex = 0; playerIndex < 8; playerIndex++) {
player = &manager->players[playerIndex];
if (player->curSoundID == entry->upperSoundID) {
cond = TRUE;
foundPlayer = TRUE;
break;
}
}
}
if (useSpecificPlayerMode == 0) {
if (!cond) {
if (!foundPlayer) {
playerIndex = soundInfo & 0x7;
player = &manager->players[playerIndex];
if (player->sefDataReadPos == NULL || priority >= player->priority) {
@ -814,49 +815,49 @@ void au_sfx_load_sound(SoundManager* manager, SoundSFXEntry* entry, SoundManager
}
}
if (!cond) {
if (!foundPlayer) {
// lower 4 bits of soundInfo: max playerIndex
// check if any player is playing this sound
for (playerIndex = soundInfo & 0x7; playerIndex >= 0; playerIndex--) {
player = &manager->players[playerIndex];
if (player->curSoundID == soundIDLower) {
cond = TRUE;
foundPlayer = TRUE;
break;
}
}
}
if (!cond) {
if (!foundPlayer) {
// find free player
for (playerIndex = soundInfo & 0x7; playerIndex >= 0; playerIndex--) {
player = &manager->players[playerIndex];
if (player->sefDataReadPos == NULL) {
cond = TRUE;
foundPlayer = TRUE;
break;
}
}
}
if (!cond) {
if (!foundPlayer) {
// if there is no free player try stealing one with lower priority
for (playerIndex = soundInfo & 0x7; playerIndex >= 0; playerIndex--) {
player = &manager->players[playerIndex];
if (player->priority < priority) {
cond = TRUE;
foundPlayer = TRUE;
break;
}
}
}
if (!cond) {
if (!foundPlayer) {
playerIndex = soundInfo & 0x7;
player = &manager->players[playerIndex];
if (player->priority <= priority) {
cond = TRUE;
foundPlayer = TRUE;
}
}
if (cond) {
if (foundPlayer) {
au_sfx_play_sound(manager, player, AU_FILE_RELATIVE(manager->sefData, *cmdList), entry, priority, 0);
}
} else {
@ -1436,9 +1437,7 @@ static void au_SEFCmd_00_SetVolume(SoundManager* manager, SoundPlayer* player) {
}
static void au_SEFCmd_01_SetPan(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 sfxPan = buf[0];
player->sefDataReadPos = &buf[1];
s32 sfxPan = *player->sefDataReadPos++;
player->changed.pan = TRUE;
player->sfxPan = sfxPan;
@ -1448,16 +1447,14 @@ static void au_SEFCmd_02_SetInstrument(SoundManager* manager, SoundPlayer* playe
AuFilePos buf = player->sefDataReadPos;
s32 bank = buf[0];
s32 patch = buf[1];
player->sefDataReadPos = &buf[2];
player->sefDataReadPos += 2;
player->instrumentIndex = patch;
player->sfxInstrumentRef = au_get_instrument(manager->globals, bank, patch, &player->envelope);
}
static void au_SEFCmd_03_SetReverb(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
u8 reverb = buf[0];
player->sefDataReadPos = &buf[1];
u8 reverb = *player->sefDataReadPos++;
if (player->sfxParamsFlags & SFX_PARAM_FLAG_FIXED_REVERB) {
reverb = manager->defaultReverbAmt;
@ -1470,11 +1467,9 @@ static void au_SEFCmd_04_SetEnvelope(SoundManager* manager, SoundPlayer* player)
Instrument* other;
EnvelopePreset* envPreset;
AuFilePos buf = player->sefDataReadPos;
u8 temp_v1 = buf[0];
player->sefDataReadPos = &buf[1];
u8 envelope = *player->sefDataReadPos++;
player->envelopePreset = temp_v1 & 0x7F;
player->envelopePreset = envelope & 0x7F;
other = player->sfxInstrumentRef;
player->sfxInstrument.base = other->base;
@ -1505,11 +1500,7 @@ static void au_SEFCmd_05_CoarseTune(SoundManager* manager, SoundPlayer* player)
}
static void au_SEFCmd_06_FineTune(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 unkTemp = buf[0];
player->sefDataReadPos = &buf[1];
player->fineTune = unkTemp;
player->fineTune = *player->sefDataReadPos++;
}
static void au_SEFCmd_07_WaitForEnd(SoundManager* manager, SoundPlayer* player) {
@ -1520,12 +1511,11 @@ static void au_SEFCmd_07_WaitForEnd(SoundManager* manager, SoundPlayer* player)
}
static void au_SEFCmd_08_PitchSweep(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 hi = buf[0];
s32 lo = buf[1];
s16 newValue = (buf[2] & 0x7F) * 100;
s32 hi = player->sefDataReadPos[0];
s32 lo = player->sefDataReadPos[1];
s16 newValue = (player->sefDataReadPos[2] & 0x7F) * 100;
s16 time = lo + (hi << 8);
player->sefDataReadPos = &buf[3];
player->sefDataReadPos += 3;
if (time <= 0) {
time = 1;
@ -1537,9 +1527,7 @@ static void au_SEFCmd_08_PitchSweep(SoundManager* manager, SoundPlayer* player)
}
static void au_SEFCmd_09_StartLoop(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 loopIterCount = buf[0]; // loopIterCount = 0 for infinite loop
player->sefDataReadPos = &buf[1];
s32 loopIterCount = *player->sefDataReadPos++;
player->loopStartPos = player->sefDataReadPos;
player->loopIterCount = loopIterCount;
@ -1559,9 +1547,7 @@ static void au_SEFCmd_0B_WaitForRelease(SoundManager* manager, SoundPlayer* play
}
static void au_SEFCmd_0C_SetCurrentVolume(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 vol = buf[0];
player->sefDataReadPos = &buf[1];
s32 vol = *player->sefDataReadPos++;
if (vol != 0) {
vol = (vol << 0x18) | 0xFFFFFF;
@ -1571,12 +1557,11 @@ static void au_SEFCmd_0C_SetCurrentVolume(SoundManager* manager, SoundPlayer* pl
}
static void au_SEFCmd_0D_VolumeRamp(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 hi = buf[0];
s32 lo = buf[1];
s32 newValue = buf[2];
s32 hi = player->sefDataReadPos[0];
s32 lo = player->sefDataReadPos[1];
s32 newValue = player->sefDataReadPos[2];
s16 time = lo + (hi << 8);
player->sefDataReadPos = &buf[3];
player->sefDataReadPos += 3;
if (newValue != 0) {
newValue = (newValue << 8) | 0xFF;
@ -1591,10 +1576,11 @@ static void au_SEFCmd_0D_VolumeRamp(SoundManager* manager, SoundPlayer* player)
}
static void au_SEFCmd_0E_SetAlternativeSound(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
AuFilePos pos = AU_FILE_RELATIVE(manager->sefData, (buf[1] << 8) + buf[2]);
u8 type = buf[0];
player->sefDataReadPos = &buf[3];
s32 hi = player->sefDataReadPos[1];
s32 lo = player->sefDataReadPos[2];
AuFilePos pos = AU_FILE_RELATIVE(manager->sefData, (hi << 8) + lo);
u8 type = player->sefDataReadPos[0];
player->sefDataReadPos += 3;
player->alternativeType = type;
switch (type) {
@ -1634,27 +1620,15 @@ static void au_SEFCmd_12_NOP(SoundManager* manager, SoundPlayer* player) {
}
static void au_SEFCmd_13_SetRandomPitch(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 randomPitch = buf[0];
player->sefDataReadPos = &buf[1];
player->randomPitch = randomPitch;
player->randomPitch = *player->sefDataReadPos++;
}
static void au_SEFCmd_14_SetRandomVelocity(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 unkTemp = buf[0];
player->sefDataReadPos = &buf[1];
player->randomVelocity = unkTemp;
player->randomVelocity = *player->sefDataReadPos++;
}
static void au_SEFCmd_15_SetUnkA3(SoundManager* manager, SoundPlayer* player) {
AuFilePos buf = player->sefDataReadPos;
s32 unkTemp = buf[0];
player->sefDataReadPos = &buf[1];
player->unk_A3 = unkTemp;
player->unk_A3 = *player->sefDataReadPos++;;
}
static void au_SEFCmd_16_SetEnvelopePress(SoundManager* manager, SoundPlayer* player) {
@ -1685,7 +1659,7 @@ static void au_SEFCmd_17_PlaySound(SoundManager* manager, SoundPlayer* player) {
}
static void au_SEFCmd_18_SetAlternativeVolume(SoundManager* manager, SoundPlayer* player) {
player->alternativeVolume = *(u8*)player->sefDataReadPos++;
player->alternativeVolume = *player->sefDataReadPos++;
if (player->alternativeVolume != 0) {
player->alternativeVolume = player->alternativeVolume << 8 | 0xFF;
}

2
src/battle/entity_model_icons.c
View File

@ -68,7 +68,7 @@ Gfx BtlBonkModelGfx[] = {
gsSPEndDisplayList(),
};
EntityModelScript EMS_BonkIcon = STANDARD_ENTITY_MODEL_SCRIPT(BtlBonkModelGfx, RENDER_MODE_2D);
EntityModelScript EMS_BonkIcon = STANDARD_ENTITY_MODEL_SCRIPT(BtlBonkModelGfx, RENDER_MODE_CLOUD_NO_ZCMP);
Vtx BtlStarModelVtx[] = {
{{{ -16, -16, 0 }, 0, { 0, 1024 }, { 0, 0, 0, 255 }}},

2
src/effects.c
View File

@ -326,7 +326,7 @@ s32 load_effect(s32 effectIndex) {
// Copy the effect into the newly mapped space
dma_copy(effectEntry->dmaStart, effectEntry->dmaEnd, effectEntry->dmaDest);
// If there's extra data the effect normally loads, allocate space and copy into the new space
// If there's graphics data for the effect, allocate space and copy into the new space
if (effectEntry->graphicsDmaStart != NULL) {
void* effectDataBuf = general_heap_malloc(effectEntry->graphicsDmaEnd - effectEntry->graphicsDmaStart);
effectGraphics->data = effectDataBuf;

2
src/effects/aura.c
View File

@ -280,7 +280,7 @@ void aura_render(EffectInstance* effect) {
renderTask.appendGfx = aura_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/big_smoke_puff.c
View File

@ -113,7 +113,7 @@ void big_smoke_puff_render(EffectInstance* effect) {
renderTask.appendGfx = big_smoke_puff_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/big_snowflakes.c
View File

@ -101,7 +101,7 @@ void big_snowflakes_render(EffectInstance* effect) {
renderTask.appendGfx = big_snowflakes_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/blast.c
View File

@ -86,7 +86,7 @@ void blast_render(EffectInstance* effect) {
renderTask.appendGfx = blast_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/bombette_breaking.c
View File

@ -196,7 +196,7 @@ void bombette_breaking_render(EffectInstance* effect) {
renderTask.appendGfx = bombette_breaking_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/breaking_junk.c
View File

@ -125,7 +125,7 @@ void breaking_junk_render(EffectInstance* effect) {
renderTask.appendGfx = breaking_junk_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/bulb_glow.c
View File

@ -141,7 +141,7 @@ void bulb_glow_render(EffectInstance* effect) {
renderTaskPtr->renderMode = RENDER_MODE_SURFACE_OPA;
} else {
renderTask.dist = -100;
renderTaskPtr->renderMode = RENDER_MODE_2D;
renderTaskPtr->renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
}
retTask = queue_render_task(renderTaskPtr);

2
src/effects/butterflies.c
View File

@ -154,7 +154,7 @@ void butterflies_render(EffectInstance* effect) {
renderTask.appendGfx = butterflies_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/chapter_change.c
View File

@ -220,7 +220,7 @@ void chapter_change_render(EffectInstance* effect) {
renderTask.appendGfx = chapter_change_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/cloud_puff.c
View File

@ -106,7 +106,7 @@ void cloud_puff_render(EffectInstance* effect) {
renderTask.appendGfx = cloud_puff_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/cloud_trail.c
View File

@ -107,7 +107,7 @@ void cloud_trail_render(EffectInstance* effect) {
renderTask.appendGfx = cloud_trail_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/cold_breath.c
View File

@ -170,7 +170,7 @@ void cold_breath_render(EffectInstance* effect) {
renderTask.appendGfx = cold_breath_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 6;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/confetti.c
View File

@ -239,7 +239,7 @@ void confetti_render(EffectInstance* effect) {
renderTask.appendGfx = confetti_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
}

2
src/effects/damage_stars.c
View File

@ -227,7 +227,7 @@ void damage_stars_render(EffectInstance* effect) {
renderTask.appendGfx = damage_stars_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/debuff.c
View File

@ -124,7 +124,7 @@ void debuff_render(EffectInstance* effect) {
renderTask.appendGfx = debuff_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/drop_leaves.c
View File

@ -120,7 +120,7 @@ void drop_leaves_render(EffectInstance* effect) {
renderTask.appendGfx = drop_leaves_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/effect_3D.c
View File

@ -205,7 +205,7 @@ void effect_3D_render(EffectInstance* effect) {
renderTask.appendGfx = effect_3D_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/effect_46.c
View File

@ -193,7 +193,7 @@ void effect_46_render(EffectInstance* effect) {
renderTask.appendGfx = effect_46_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/effect_63.c
View File

@ -201,7 +201,7 @@ void effect_63_render(EffectInstance* effect) {
renderTask.appendGfx = effect_63_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/effect_65.c
View File

@ -200,7 +200,7 @@ void effect_65_render(EffectInstance* effect) {
renderTask.appendGfx = effect_65_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/effect_86.c
View File

@ -101,7 +101,7 @@ void effect_86_render(EffectInstance* effect) {
renderTask.appendGfx = effect_86_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/embers.c
View File

@ -176,7 +176,7 @@ void embers_render(EffectInstance* effect) {
renderTask.appendGfx = embers_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/emote.c
View File

@ -195,7 +195,7 @@ void emote_render(EffectInstance* effect) {
renderTask.appendGfx = emote_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/ending_decals.c
View File

@ -122,7 +122,7 @@ void ending_decals_render(EffectInstance* effect) {
if (data->type == 0) {
renderTaskPtr->renderMode = RENDER_MODE_SURFACE_OPA;
} else {
renderTaskPtr->renderMode = RENDER_MODE_2D;
renderTaskPtr->renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
}
retTask = queue_render_task(renderTaskPtr);

2
src/effects/energy_in_out.c
View File

@ -231,7 +231,7 @@ void energy_in_out_render(EffectInstance* effect) {
renderTask.appendGfx = energy_in_out_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
}

2
src/effects/energy_orb_wave.c
View File

@ -211,7 +211,7 @@ void energy_orb_wave_render(EffectInstance* effect) {
renderTask.appendGfx = energy_orb_wave_appendGfx;
renderTask.dist = 10;
renderTask.appendGfxArg = effect;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
if (effect82->unk_00 >= 3) {
queue_render_task(renderTaskPointer);
return;

2
src/effects/explosion.c
View File

@ -158,7 +158,7 @@ void explosion_render(EffectInstance* effect) {
renderTask.appendGfx = explosion_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
}

2
src/effects/falling_leaves.c
View File

@ -115,7 +115,7 @@ void falling_leaves_render(EffectInstance* effect) {
renderTask.appendGfx = falling_leaves_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/fire_breath.c
View File

@ -173,7 +173,7 @@ void fire_breath_render(EffectInstance* effect) {
renderTask.dist = 0;
}
renderTaskPointer->renderMode = RENDER_MODE_2D;
renderTaskPointer->renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(renderTaskPointer);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
}

2
src/effects/fire_flower.c
View File

@ -194,7 +194,7 @@ void fire_flower_render(EffectInstance* effect) {
renderTask.appendGfx = fire_flower_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/floating_cloud_puff.c
View File

@ -104,7 +104,7 @@ void floating_cloud_puff_render(EffectInstance* effect) {
renderTask.appendGfx = floating_cloud_puff_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/floating_flower.c
View File

@ -134,7 +134,7 @@ void floating_flower_render(EffectInstance* effect) {
renderTask.appendGfx = floating_flower_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/floating_rock.c
View File

@ -103,7 +103,7 @@ void floating_rock_render(EffectInstance *effect) {
renderTask.appendGfx = floating_rock_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = effect76->pos.z;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/flower_splash.c
View File

@ -132,7 +132,7 @@ void flower_splash_render(EffectInstance* effect) {
renderTask.appendGfx = flower_splash_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/flower_trail.c
View File

@ -148,7 +148,7 @@ void flower_trail_render(EffectInstance* effect) {
renderTask.appendGfx = flower_trail_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
queuedTaskPtr = queue_render_task(&renderTask);
queuedTaskPtr->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/footprint.c
View File

@ -104,7 +104,7 @@ void footprint_render(EffectInstance* effect) {
renderTask.appendGfx = footprint_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/fright_jar.c
View File

@ -103,7 +103,7 @@ void fright_jar_render(EffectInstance* effect) {
renderTask.appendGfx = fright_jar_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/gather_energy_pink.c
View File

@ -151,7 +151,7 @@ void gather_energy_pink_render(EffectInstance* effect) {
renderTask.appendGfx = gather_energy_pink_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/got_item_outline.c
View File

@ -98,7 +98,7 @@ void got_item_outline_render(EffectInstance* effect) {
renderTask.appendGfx = got_item_outline_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/green_impact.c
View File

@ -124,7 +124,7 @@ void green_impact_render(EffectInstance* effect) {
renderTask.appendGfx = green_impact_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
}

2
src/effects/hieroglyphs.c
View File

@ -103,7 +103,7 @@ void hieroglyphs_render(EffectInstance* effect) {
renderTask.appendGfx = hieroglyphs_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/huff_puff_breath.c
View File

@ -116,7 +116,7 @@ void huff_puff_breath_render(EffectInstance* effect) {
renderTask.appendGfx = huff_puff_breath_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
}

2
src/effects/ice_pillar.c
View File

@ -145,7 +145,7 @@ void ice_pillar_render(EffectInstance* effect) {
renderTask.appendGfx = ice_pillar_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 5;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/ice_shard.c
View File

@ -124,7 +124,7 @@ void ice_shard_render(EffectInstance* effect) {
renderTask.appendGfx = ice_shard_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/landing_dust.c
View File

@ -251,7 +251,7 @@ void landing_dust_render(EffectInstance* effect) {
renderTask.appendGfx = landing_dust_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/lens_flare.c
View File

@ -100,7 +100,7 @@ void lens_flare_render(EffectInstance* effect) {
renderTask.appendGfx = lens_flare_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 20;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/light_rays.c
View File

@ -261,7 +261,7 @@ void light_rays_render(EffectInstance* effect) {
renderTask.appendGfx = light_rays_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/lightning_bolt.c
View File

@ -161,7 +161,7 @@ void lightning_bolt_render(EffectInstance *effect) {
renderTask.dist = 10;
}
renderTaskPointer->renderMode = RENDER_MODE_2D;
renderTaskPointer->renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(renderTaskPointer);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;
}

2
src/effects/lil_oink.c
View File

@ -162,7 +162,7 @@ void lil_oink_render(EffectInstance* effect) {
renderTask.appendGfx = lil_oink_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/merlin_house_stars.c
View File

@ -117,7 +117,7 @@ void merlin_house_stars_render(EffectInstance* effect) {
renderTask.appendGfx = merlin_house_stars_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/misc_particles.c
View File

@ -289,7 +289,7 @@ void misc_particles_render(EffectInstance* effect) {
renderTask.appendGfx = misc_particles_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 7;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/motion_blur_flame.c
View File

@ -114,7 +114,7 @@ void motion_blur_flame_render(EffectInstance* effect) {
renderTask.appendGfx = motion_blur_flame_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 100;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/moving_cloud.c
View File

@ -170,7 +170,7 @@ void moving_cloud_render(EffectInstance* effect) {
renderTask.appendGfx = moving_cloud_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/music_note.c
View File

@ -122,7 +122,7 @@ void music_note_render(EffectInstance* effect) {
renderTask.appendGfx = music_note_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/peach_star_beam.c
View File

@ -156,7 +156,7 @@ void peach_star_beam_render(EffectInstance* effect) {
renderTask.appendGfx = peach_star_beam_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/pink_sparkles.c
View File

@ -221,7 +221,7 @@ void pink_sparkles_render(EffectInstance* effect) {
renderTask.appendGfx = pink_sparkles_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
}

2
src/effects/purple_ring.c
View File

@ -182,7 +182,7 @@ void purple_ring_render(EffectInstance* effect) {
renderTask.appendGfx = purple_ring_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/quizmo_assistant.c
View File

@ -91,7 +91,7 @@ void quizmo_assistant_render(EffectInstance* effect) {
renderTask.appendGfx = quizmo_assistant_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/quizmo_audience.c
View File

@ -171,7 +171,7 @@ void quizmo_audience_render(EffectInstance* effect) {
renderTask.appendGfx = quizmo_audience_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/radial_shimmer.c
View File

@ -278,7 +278,7 @@ void radial_shimmer_render(EffectInstance* effect) {
renderTask.appendGfx = radial_shimmer_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/red_impact.c
View File

@ -134,7 +134,7 @@ void red_impact_render(EffectInstance* effect) {
renderTask.appendGfx = red_impact_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/ring_blast.c
View File

@ -77,7 +77,7 @@ void ring_blast_render(EffectInstance* effect) {
renderTask.appendGfx = ring_blast_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/rising_bubble.c
View File

@ -99,7 +99,7 @@ void rising_bubble_render(EffectInstance* effect) {
renderTask.appendGfx = rising_bubble_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/shape_spell.c
View File

@ -127,7 +127,7 @@ void shape_spell_render(EffectInstance* effect) {
renderTask.appendGfx = shape_spell_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/shattering_stones.c
View File

@ -132,7 +132,7 @@ void shattering_stones_render(EffectInstance* effect) {
renderTask.appendGfx = shattering_stones_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/shimmer_burst.c
View File

@ -190,7 +190,7 @@ void shimmer_burst_render(EffectInstance* effect) {
renderTask.appendGfx = shimmer_burst_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/shimmer_wave.c
View File

@ -178,7 +178,7 @@ void shimmer_wave_render(EffectInstance* effect) {
renderTask.appendGfx = shimmer_wave_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/shiny_flare.c
View File

@ -88,7 +88,7 @@ void shiny_flare_render(EffectInstance* effect) {
renderTask.appendGfx = shiny_flare_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/shockwave.c
View File

@ -259,7 +259,7 @@ void shockwave_render(EffectInstance* effect) {
renderTask.appendGfx = shockwave_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/sleep_bubble.c
View File

@ -118,7 +118,7 @@ void sleep_bubble_render(EffectInstance* effect) {
renderTask.appendGfx = sleep_bubble_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/small_gold_sparkle.c
View File

@ -103,7 +103,7 @@ void small_gold_sparkle_render(EffectInstance* effect) {
renderTask.appendGfx = small_gold_sparkle_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/smoke_burst.c
View File

@ -92,7 +92,7 @@ void smoke_burst_render(EffectInstance* effect) {
renderTask.appendGfx = smoke_burst_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/smoke_impact.c
View File

@ -110,7 +110,7 @@ void smoke_impact_render(EffectInstance* effect) {
renderTask.appendGfx = smoke_impact_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/smoke_ring.c
View File

@ -113,7 +113,7 @@ void smoke_ring_render(EffectInstance* effect) {
renderTask.appendGfx = smoke_ring_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
}

2
src/effects/snaking_static.c
View File

@ -149,7 +149,7 @@ void snaking_static_render(EffectInstance* effect) {
renderTask.appendGfx = snaking_static_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/snowfall.c
View File

@ -154,7 +154,7 @@ void snowfall_render(EffectInstance* effect) {
renderTask.appendGfx = snowfall_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/snowflake.c
View File

@ -111,7 +111,7 @@ void snowflake_render(EffectInstance* effect) {
renderTaskPtr->appendGfx = &snowflake_appendGfx;
renderTaskPtr->appendGfxArg = effect;
renderTaskPtr->dist = 0;
renderTaskPtr->renderMode = RENDER_MODE_2D;
renderTaskPtr->renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(renderTaskPtr);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/snowman_doll.c
View File

@ -280,7 +280,7 @@ void snowman_doll_render(EffectInstance* effect) {
renderTask.appendGfx = snowman_doll_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = -10;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/sparkles.c
View File

@ -237,7 +237,7 @@ void sparkles_render(EffectInstance* effect) {
renderTask.appendGfx = sparkles_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
}

2
src/effects/spiky_white_aura.c
View File

@ -169,7 +169,7 @@ void spiky_white_aura_render(EffectInstance* effect) {
renderTask.appendGfx = spiky_white_aura_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/squirt.c
View File

@ -147,7 +147,7 @@ void squirt_render(EffectInstance* effect) {
renderTask.appendGfx = squirt_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/star.c
View File

@ -192,7 +192,7 @@ void star_render(EffectInstance* effect) {
renderTask.appendGfx = star_appendGfx;
renderTask.dist = 0;
if (data->type != FX_STAR_BACKGROUND) {
renderModeTemp = RENDER_MODE_2D;
renderModeTemp = RENDER_MODE_CLOUD_NO_ZCMP;
} else {
renderModeTemp = RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0;
}

2
src/effects/star_outline.c
View File

@ -138,7 +138,7 @@ void star_outline_render(EffectInstance* effect) {
renderTask.appendGfx = star_outline_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/star_spirits_energy.c
View File

@ -329,7 +329,7 @@ void star_spirits_energy_render(EffectInstance* effect) {
renderTask.appendGfx = star_spirits_energy_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/stars_burst.c
View File

@ -122,7 +122,7 @@ void stars_burst_render(EffectInstance* effect) {
renderTask.appendGfx = stars_burst_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

8
src/effects/stars_shimmer.c
View File

@ -274,7 +274,7 @@ void stars_shimmer_render(EffectInstance* effect) {
renderTask.appendGfx = stars_shimmer_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
}
@ -282,14 +282,14 @@ void stars_shimmer_render(EffectInstance* effect) {
void stars_shimmer_appendGfx(void* effect) {
Matrix4f sp18, sp58, sp98;
StarsShimmerFXData* data = ((EffectInstance*)effect)->data.starsShimmer;
s32 type;
s32 state;
s32 temp_s4;
s32 unk_28;
f32 rf, gf, bf;
s32 r, g, b;
s32 i;
type = data->state;
state = data->state;
gDPPipeSync(gMainGfxPos++);
gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
@ -300,7 +300,7 @@ void stars_shimmer_appendGfx(void* effect) {
guRotateF(sp58, -gCameras[gCurrentCameraID].curYaw, 0.0f, 1.0f, 0.0f);
guMtxCatF(sp58, sp18, sp98);
switch (type) {
switch (state) {
case 0:
case 1:
case 2:

2
src/effects/stars_spread.c
View File

@ -113,7 +113,7 @@ void stars_spread_render(EffectInstance* effect) {
renderTask.appendGfx = stars_spread_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/steam_burst.c
View File

@ -101,7 +101,7 @@ void steam_burst_render(EffectInstance* effect) {
renderTask.appendGfx = steam_burst_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 0;
renderTask.renderMode = RENDER_MODE_28;
renderTask.renderMode = RENDER_MODE_PASS_THROUGH;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

2
src/effects/stop_watch.c
View File

@ -169,7 +169,7 @@ void stop_watch_render(EffectInstance* effect) {
renderTask.appendGfx = stop_watch_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
}

2
src/effects/sun.c
View File

@ -139,7 +139,7 @@ void sun_render(EffectInstance* effect) {
renderTask.appendGfx = sun_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.dist = 10;
renderTask.renderMode = RENDER_MODE_2D;
renderTask.renderMode = RENDER_MODE_CLOUD_NO_ZCMP;
retTask = queue_render_task(&renderTask);
retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR;

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