You've already forked Microtransactions64
mirror of
https://github.com/Print-and-Panic/Microtransactions64.git
synced 2026-01-21 10:17:19 -08:00
f3e61a31aa
* buffers: refresh 15 and revert to base decomp * behavior script * color helper functions * extended bounds * egeo_layout * fixed model ids * camera conf improved * message panel ucode small * graph node * level script * mathutil updates * mathutil updates (allow unused funcs) * behaviors a - beta_fish * Add librtc and fix some data declarations * Move GRUCODE define to proper location in makefile * Refresh 15 * extra * Make ROM name smaller and change messages printed on build a bit * Fix console (lol) * Update UNF to latest master * Make ucode load from .o's (and also fix Super3D) * Fix crash with rumble + custom mario model * graph node and mathutil * removed behaviors * Ldtob documentation * _Putfld labeling * area * behavior actions * camera * debug updates * bubbles * envfx snow * farcall helpers * game init * geo misc * hud * only check if VC on render init * ingame menu * revert goddard to base decomp * insn disasm * interaction documentation * level geo * level update defines * macro special objects formatting changes * main.h documentation * map parser documentation & formatting * airborne documentation * mario actions automatic documentation * mario actions cutscene documentation * mario actions moving documentation and options * mario actions object documentation and options * mario stationary documentation * mario submerged documentation * mario misc documentation * mario step: ledge grab fixes and documentation * mario documentation * memory.h documentation * moving textures * object behaviors * object collision * fix flamethrower bug * object helpers * object list processor documentation * paintings * platform displacement * print / printf * puppycam absf * puppyprint updates and formatting changes * rendering graph node performance optimizations * rumble opt and doc * hqvm back to ultrasm64 * save file documentation and unlock defines * s2d engine * reset various files to ultrasm64 * file select * intro geo documentation * screen transition documentation * segment2.h * shadow overhaul * skybox refactor * sound init: clean up define usage + documentation * spawn object optimizations and documentation * spawn sound cleanup * sram to ultrasm64 * star select cleanup * title screen cleanup * dialogs / text * rename stomp smoke * stomp smoke -> small water splash * updated README * compilation flags * optimized file positions + support function/data sections * surface collision performance improvements * surface load optimizations * camera conf documentation * Allow easier command for opening puppyprint debug * Rearranged framebuffers & fixed puppyprint console printing * Fix shadow scaling and shifting * Fix SILHOUETTE, OBJECTS_REJ, and ucode loading, also clean up render phase system a bit. * Fixed build with BETTER_HANGING off * Clean up OBJECTS_REJ ifdefs * Fix duplicate comment & graph render layers/flags bitmask * Fixed build with BETTER_HANGING off * Fix Fast64 importing by reverting sSegmentTable change * Readded missing functions that caused build errors with Mario head enabled * Fixed clang compilation issues * Add INTER mode for geo_update_layer_transparency * Fix build warnings * bugfix: miscalculation in obj_turn_toward_object * Some puppytech fixes * Further Puppycamera fixes * Fix BUGFIX_DIALOG_TIME_STOP Fixes #136 * Fix sliding platform bparams * Add LEGACY_SHADOW_IDS define for Fast64 compatibility * Apply suggested changes * Better find_in_bounds_yaw_wdw_bob_thi ifdef * Fix build warnings for unused functions * Fixed stale reference bug from obj_mark_for_deletion change * Fixed incorrect digit for 100s #145 * Change groundpound-fix define and functionality to just disable bonking * Fixed puppyroll #134 * Adjust height value for terrain angle to kick in * fixed hi score flashing * Remove menudata backup (#131) Not considered important enough to keep * Fix fread() build warning * Add COURSE_NUM_TO_INDEX to save_file_get_star_flags check in bhv_unagi_init * Fix approach_s16 return value * Use boolean defines for oCapDoScaleVertically * Make the door lock a part of the key door model to eliminate z-fighting, also reduce z fighting on numbered doors with AUTO_LOD enabled. * Move flames to LAYER_TRANSPARENT_INTER * Resolved some compiler warnings and added FALL_THROUGH define (#168) * Address some more compiler warnings with different define toggles * Remove unnecessary fallthrough attribute * fixed geo_process_billboard floating point exception * Allow water to face any direction * Initialize focOffset so that BBH doesn't crash * Removed superfluous RDP commands when switching microcodes which would override scissor * Set OBJ_FLAG_DONT_CALC_COLL_DIST on bhvUkikiCage * Fix rumble build * Fixed UNLOCK_FPS strobing * Update src/game/object_helpers.c Co-authored-by: thecozies <79979276+thecozies@users.noreply.github.com> * Update src/game/object_helpers.c Co-authored-by: thecozies <79979276+thecozies@users.noreply.github.com> * Fix LEGACY_SHADOW_IDS id conflict * Use the vanilla default value for rotating fire bars if bparam2 is 0 * START_LEVEL safeguard * Fix some drawing distance issues caused by AUTO_COLLISION_DISTANCE * Fix rumble build * Fixed spline poll code using the wrong values for keyframes * Update readme with better credits Better credits for individual contributors * add arthur * added falco and moose * add fazana * le funny typo * added S2DEX engine to credits * silhouette + axo + ratio * remove specific callouts + add auto col distance * Update data/behavior_data.c Co-authored-by: thecozies <79979276+thecozies@users.noreply.github.com> * Update data/behavior_data.c Co-authored-by: thecozies <79979276+thecozies@users.noreply.github.com> * Update data/behavior_data.c Co-authored-by: thecozies <79979276+thecozies@users.noreply.github.com> * Revert formatting changes to match vanilla decomp * Re-implement Y buffer for find_ceil * Re-implement POWER_STARS_HEAL for normal Power Stars * Start level comment & exit course comment/collapse * utilize reonucam technique for FAST_VERTICAL_CAMERA_MOVEMENT * Fix "MAX_REFERENCED_WALLS" typo * Allow stop_and_set_height_to_floor to work at any height if Mario is teleporting (#213) * Revert stop_and_set_height_to_floor to vanilla Fixes #208 * Fixed sAudioEnabled so that it disables audio CPU processing as well * Fixed puppyprint debug RDP us calculations * Renamed sAudioEnabled to gAudioEnabled * Replaced mtxf_to_mtx_asm with an equivalent implementation that supports WORLD_SCALE * Moved extended bounds and world scale configuration to a new config_world.h file * Default all objects to non-rej (#227) Fixes #221 (Default all objects to non-rej) * Fix #221 * Fix VISUAL_DEBUG breaking/crashing when OBJECTS_REJ is disabled (#211) * Fix VISUAL_DEBUG breaking/crashing when OBJECTS_REJ is disabled * Change vtl decrement in visual_surface_display from 6 to 3 Fixes #207 * Make area in SL igloo wider to prevent a softlock (#233) Fixes #210 * Fix coin formation coins being deleted if they spawn in the middle of a floor, also fix TTM slide coin position (#232) Fixes #201 * Make UNLOCK_ALL apply to more things * Fix wrong ifdef/ifndef in bhv_invisible_objects_under_bridge_init * Change chain chomp load/unload distances depending on number of segments (#237) Fixes #192 * added WATER_PLUNGE_UPWARP define * Add reonucam patch (#239) * added reonucam patch Fixes #218 * Fix how shadows handle water/transparency/height (#228) * Fix how shadows handle water/transparency/height * Change shadow check for flying carpets from a level specific check to a oPlatformOnTrackType check Fixes #179 * added reonucam credit * delete unnecesary patches * Apply suggested changes * murdered more patches * UNLOCK_ALL unlocks the cap boxes * UNLOCK_ALL unlocks cap boxes (slightly more epic edition) * revert ceil buffer * Renamed HD_INTRO_TEXTURES define, separated intro floombas * prevent double definition of floombas * actually prevent floomba redefinition * Develop/refactor default defines (#242) * Changed default config options * Added build dir to includePaths for pngs * disable NO_SLEEP by default * Disable puppyprint by default Sorry fazana 😔 * fix typos * add comment about BETTER_REVERB console perf * disable blue coin switch retry by default * Update config_audio.h Co-authored-by: Reonu <danileon95@gmail.com> Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com> * revert air step line to vanilla to fix bitfs scaling platform issue (#247) Fixes #200 * Fix stuttering on thin slopes (#248) * Fix stuttering on thin slopes * Revert vec3f_find_ceil calls to vanilla * Rename vec3f_find_ceil to find_mario_ceil * Update src/engine/surface_collision.h Fixes #249 * Swap static and dynamic surface checks back to vanilla order (#253) * Swap static and dynamic surface checks back to vanilla order * re-enable DISABLE_ALL config Fixes #251 #252 * Fixed save and quitting while in widescreen (#257) * Fixed save and quitting while in widescreen * use define for the level * all my homies hate ifdefs * skip wall offsets < 0 (#255) Fixes #255 * #264: Document non-stop stars' issues (#267) * #264: Document non-stop stars' issues * Update include/config/config_game.h * nonstop vanilla comment * derive margin_radius from radius after capping at 200 (#266) Fixes #259 * Config cleanup/refactor (#269) * Moved puppyprint define to graphics / rearranged some debug defines for ease of access * Moved compatibility safeguards to config_safeguards.h * spacing and comment formatting * #272 Move GFX_POOL_SIZE to config_graphics.h * disable EASIER_DIALOG_TRIGGER by default * prevent redefining warnings * small ifdef typo * changed ifndef to undefs Fixes #262 Fixes #272 * Improved movement config documentation related to turning around (#271) Fixes #270 * rename CUSTOM_DEBUG, add comments (#275) * Update README.md (#277) * v2.0.0 Co-authored-by: CrashOveride95 <crashoveride953@gmail.com> Co-authored-by: Arceveti <73617174+Arceveti@users.noreply.github.com> Co-authored-by: n64 <n64> Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com> Co-authored-by: Mr-Wiseguy <mrwiseguyromhacking@gmail.com> Co-authored-by: aglab2 <aglab3@gmail.com> Co-authored-by: gheskett <gheskett@gmail.com> Co-authored-by: Reonu <danileon95@gmail.com> Co-authored-by: Axollyon <20480418+Axollyon@users.noreply.github.com> Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
383 lines
8.7 KiB
C
383 lines
8.7 KiB
C
#ifndef MACRO_PRESET_NAMES_H
|
|
#define MACRO_PRESET_NAMES_H
|
|
|
|
enum MacroPresets {
|
|
macro_yellow_coin,
|
|
macro_yellow_coin_2,
|
|
macro_moving_blue_coin,
|
|
macro_sliding_blue_coin,
|
|
macro_red_coin,
|
|
macro_empty_5,
|
|
macro_coin_line_horizontal,
|
|
macro_coin_ring_horizontal,
|
|
macro_coin_arrow,
|
|
macro_coin_line_horizontal_flying,
|
|
macro_coin_line_vertical,
|
|
macro_coin_ring_horizontal_flying,
|
|
macro_coin_ring_vertical,
|
|
macro_coin_arrow_flying,
|
|
macro_hidden_star_trigger,
|
|
macro_empty_15,
|
|
macro_empty_16,
|
|
macro_empty_17,
|
|
macro_empty_18,
|
|
macro_empty_19,
|
|
macro_fake_star,
|
|
macro_wooden_signpost,
|
|
macro_cannon_closed,
|
|
macro_bobomb_buddy_opens_cannon,
|
|
macro_butterfly,
|
|
macro_bouncing_fireball_copy,
|
|
macro_fish_group_3,
|
|
macro_fish_group,
|
|
macro_unknown_28,
|
|
macro_hidden_1up_in_pole,
|
|
macro_huge_goomba,
|
|
macro_tiny_goomba,
|
|
macro_goomba_triplet_spawner,
|
|
macro_goomba_quintuplet_spawner,
|
|
macro_sign_on_wall,
|
|
macro_chuckya,
|
|
macro_cannon_open,
|
|
macro_goomba,
|
|
macro_homing_amp,
|
|
macro_circling_amp,
|
|
macro_unknown_40,
|
|
macro_unknown_41,
|
|
macro_free_bowling_ball,
|
|
macro_snufit,
|
|
macro_recovery_heart,
|
|
macro_1up_sliding,
|
|
macro_1up,
|
|
macro_1up_jump_on_approach,
|
|
macro_hidden_1up,
|
|
macro_hidden_1up_trigger,
|
|
macro_1up_2,
|
|
macro_1up_3,
|
|
macro_empty_52,
|
|
macro_blue_coin_switch,
|
|
macro_hidden_blue_coin,
|
|
macro_wing_cap_switch,
|
|
macro_metal_cap_switch,
|
|
macro_vanish_cap_switch,
|
|
macro_yellow_cap_switch,
|
|
macro_unknown_59,
|
|
macro_box_wing_cap,
|
|
macro_box_metal_cap,
|
|
macro_box_vanish_cap,
|
|
macro_box_koopa_shell,
|
|
macro_box_one_coin,
|
|
macro_box_three_coins,
|
|
macro_box_ten_coins,
|
|
macro_box_1up,
|
|
macro_box_star_1,
|
|
macro_breakable_box_no_coins,
|
|
macro_breakable_box_three_coins,
|
|
macro_pushable_metal_box,
|
|
macro_breakable_box_small,
|
|
macro_floor_switch_hidden_objects,
|
|
macro_hidden_box,
|
|
macro_hidden_object_2,
|
|
macro_hidden_object_3,
|
|
macro_breakable_box_giant,
|
|
macro_koopa_shell_underwater,
|
|
macro_box_1up_running_away,
|
|
macro_empty_80,
|
|
macro_bullet_bill_cannon,
|
|
macro_heave_ho,
|
|
macro_empty_83,
|
|
macro_thwomp,
|
|
macro_fire_spitter,
|
|
macro_fire_fly_guy,
|
|
macro_jumping_box,
|
|
macro_butterfly_triplet,
|
|
macro_butterfly_triplet_2,
|
|
macro_empty_90,
|
|
macro_empty_91,
|
|
macro_empty_92,
|
|
macro_bully,
|
|
macro_bully_2,
|
|
macro_empty_95,
|
|
macro_unknown_96,
|
|
macro_bouncing_fireball,
|
|
macro_flamethrower,
|
|
macro_empty_99,
|
|
macro_empty_100,
|
|
macro_empty_101,
|
|
macro_empty_102,
|
|
macro_empty_103,
|
|
macro_empty_104,
|
|
macro_empty_105,
|
|
macro_wooden_post,
|
|
macro_water_bomb_spawner,
|
|
macro_enemy_lakitu,
|
|
macro_bob_koopa_the_quick,
|
|
macro_koopa_race_endpoint,
|
|
macro_bobomb,
|
|
macro_water_bomb_cannon_copy,
|
|
macro_bobomb_buddy_opens_cannon_copy,
|
|
macro_water_bomb_cannon,
|
|
macro_bobomb_still,
|
|
macro_empty_116,
|
|
macro_empty_117,
|
|
macro_empty_118,
|
|
macro_empty_119,
|
|
macro_empty_120,
|
|
macro_empty_121,
|
|
macro_empty_122,
|
|
macro_unknown_123,
|
|
macro_empty_124,
|
|
macro_unagi,
|
|
macro_sushi,
|
|
macro_empty_127,
|
|
macro_empty_128,
|
|
macro_empty_129,
|
|
macro_empty_130,
|
|
macro_empty_131,
|
|
macro_empty_132,
|
|
macro_empty_133,
|
|
macro_empty_134,
|
|
macro_empty_135,
|
|
macro_empty_136,
|
|
macro_unknown_137,
|
|
macro_tornado,
|
|
macro_pokey,
|
|
macro_pokey_copy,
|
|
macro_tox_box,
|
|
macro_empty_142,
|
|
macro_empty_143,
|
|
macro_empty_144,
|
|
macro_empty_145,
|
|
macro_empty_146,
|
|
macro_empty_147,
|
|
macro_empty_148,
|
|
macro_empty_149,
|
|
macro_empty_150,
|
|
macro_monty_mole_2,
|
|
macro_monty_mole,
|
|
macro_monty_mole_hole,
|
|
macro_fly_guy,
|
|
macro_empty_155,
|
|
macro_wiggler,
|
|
macro_empty_157,
|
|
macro_empty_158,
|
|
macro_empty_159,
|
|
macro_empty_160,
|
|
macro_empty_161,
|
|
macro_empty_162,
|
|
macro_empty_163,
|
|
macro_empty_164,
|
|
macro_spindrift,
|
|
macro_mr_blizzard,
|
|
macro_mr_blizzard_copy,
|
|
macro_empty_168,
|
|
macro_small_penguin,
|
|
macro_tuxies_mother,
|
|
macro_tuxies_mother_copy,
|
|
macro_mr_blizzard_2,
|
|
macro_empty_173,
|
|
macro_empty_174,
|
|
macro_empty_175,
|
|
macro_empty_176,
|
|
macro_empty_177,
|
|
macro_empty_178,
|
|
macro_empty_179,
|
|
macro_empty_180,
|
|
macro_empty_181,
|
|
macro_empty_182,
|
|
macro_empty_183,
|
|
macro_empty_184,
|
|
macro_empty_185,
|
|
macro_empty_186,
|
|
macro_empty_187,
|
|
macro_empty_188,
|
|
macro_haunted_chair_copy,
|
|
macro_haunted_chair,
|
|
macro_haunted_chair_copy2,
|
|
macro_boo,
|
|
macro_boo_copy,
|
|
macro_boo_group,
|
|
macro_boo_with_cage,
|
|
macro_beta_key,
|
|
macro_empty_197,
|
|
macro_empty_198,
|
|
macro_empty_199,
|
|
macro_empty_200,
|
|
macro_empty_201,
|
|
macro_empty_202,
|
|
macro_empty_203,
|
|
macro_empty_204,
|
|
macro_empty_205,
|
|
macro_empty_206,
|
|
macro_empty_207,
|
|
macro_empty_208,
|
|
macro_empty_209,
|
|
macro_empty_210,
|
|
macro_empty_211,
|
|
macro_empty_212,
|
|
macro_empty_213,
|
|
macro_empty_214,
|
|
macro_empty_215,
|
|
macro_empty_216,
|
|
macro_empty_217,
|
|
macro_empty_218,
|
|
macro_empty_219,
|
|
macro_empty_220,
|
|
macro_empty_221,
|
|
macro_empty_222,
|
|
macro_empty_223,
|
|
macro_empty_224,
|
|
macro_empty_225,
|
|
macro_empty_226,
|
|
macro_empty_227,
|
|
macro_empty_228,
|
|
macro_empty_229,
|
|
macro_empty_230,
|
|
macro_empty_231,
|
|
macro_empty_232,
|
|
macro_empty_233,
|
|
macro_bub_spawner,
|
|
macro_seaweed_bundle,
|
|
macro_beta_chest,
|
|
macro_water_mine,
|
|
macro_fish_group_4,
|
|
macro_fish_group_2,
|
|
macro_jet_stream_ring_spawner,
|
|
macro_jet_stream_ring_spawner_copy,
|
|
macro_skeeter,
|
|
macro_clam_shell,
|
|
macro_empty_244,
|
|
macro_empty_245,
|
|
macro_empty_246,
|
|
macro_empty_247,
|
|
macro_empty_248,
|
|
macro_empty_249,
|
|
macro_empty_250,
|
|
macro_ukiki,
|
|
macro_ukiki_2,
|
|
macro_piranha_plant,
|
|
macro_empty_254,
|
|
macro_whomp,
|
|
macro_chain_chomp,
|
|
macro_empty_257,
|
|
macro_koopa,
|
|
macro_koopa_shellless,
|
|
macro_wooden_post_copy,
|
|
macro_fire_piranha_plant,
|
|
macro_fire_piranha_plant_2,
|
|
macro_thi_koopa_the_quick,
|
|
macro_empty_264,
|
|
macro_empty_265,
|
|
macro_empty_266,
|
|
macro_empty_267,
|
|
macro_empty_268,
|
|
macro_empty_269,
|
|
macro_empty_270,
|
|
macro_empty_271,
|
|
macro_empty_272,
|
|
macro_empty_273,
|
|
macro_empty_274,
|
|
macro_empty_275,
|
|
macro_empty_276,
|
|
macro_empty_277,
|
|
macro_empty_278,
|
|
macro_empty_279,
|
|
macro_empty_280,
|
|
macro_moneybag,
|
|
macro_empty_282,
|
|
macro_empty_283,
|
|
macro_empty_284,
|
|
macro_empty_285,
|
|
macro_empty_286,
|
|
macro_empty_287,
|
|
macro_empty_288,
|
|
macro_swoop,
|
|
macro_swoop_2,
|
|
macro_mr_i,
|
|
macro_scuttlebug_spawner,
|
|
macro_scuttlebug,
|
|
macro_empty_294,
|
|
macro_empty_295,
|
|
macro_empty_296,
|
|
macro_empty_297,
|
|
macro_empty_298,
|
|
macro_empty_299,
|
|
macro_empty_300,
|
|
macro_empty_301,
|
|
macro_empty_302,
|
|
macro_unknown_303,
|
|
macro_empty_304,
|
|
macro_empty_305,
|
|
macro_empty_306,
|
|
macro_empty_307,
|
|
macro_empty_308,
|
|
macro_empty_309,
|
|
macro_empty_310,
|
|
macro_empty_311,
|
|
macro_empty_312,
|
|
macro_ttc_rotating_cube,
|
|
macro_ttc_rotating_prism,
|
|
macro_ttc_pendulum,
|
|
macro_ttc_large_treadmill,
|
|
macro_ttc_small_treadmill,
|
|
macro_ttc_push_block,
|
|
macro_ttc_rotating_hexagon,
|
|
macro_ttc_rotating_triangle,
|
|
macro_ttc_pit_block,
|
|
macro_ttc_pit_block_2,
|
|
macro_ttc_elevator_platform,
|
|
macro_ttc_clock_hand,
|
|
macro_ttc_spinner,
|
|
macro_ttc_small_gear,
|
|
macro_ttc_large_gear,
|
|
macro_ttc_large_treadmill_2,
|
|
macro_ttc_small_treadmill_2,
|
|
macro_empty_330,
|
|
macro_empty_331,
|
|
macro_empty_332,
|
|
macro_empty_333,
|
|
macro_empty_334,
|
|
macro_empty_335,
|
|
macro_empty_336,
|
|
macro_empty_337,
|
|
macro_empty_338,
|
|
macro_box_star_2,
|
|
macro_box_star_3,
|
|
macro_box_star_4,
|
|
macro_box_star_5,
|
|
macro_box_star_6,
|
|
macro_empty_344,
|
|
macro_empty_345,
|
|
macro_empty_346,
|
|
macro_empty_347,
|
|
macro_empty_348,
|
|
macro_empty_349,
|
|
macro_bits_sliding_platform,
|
|
macro_bits_twin_sliding_platforms,
|
|
macro_bits_unknown_352,
|
|
macro_bits_octagonal_platform,
|
|
macro_bits_staircase,
|
|
macro_empty_355,
|
|
macro_empty_356,
|
|
macro_bits_ferris_wheel_axle,
|
|
macro_bits_arrow_platform,
|
|
macro_bits_seesaw_platform,
|
|
macro_bits_tilting_w_platform,
|
|
macro_empty_361,
|
|
macro_empty_362,
|
|
macro_empty_363,
|
|
macro_empty_364,
|
|
#ifdef FLOOMBAS
|
|
macro_empty_365,
|
|
macro_floomba,
|
|
macro_huge_floomba,
|
|
macro_tiny_floomba,
|
|
macro_floomba_triplet_spawner,
|
|
macro_floomba_quintuplet_spawner
|
|
#else
|
|
macro_empty_365
|
|
#endif
|
|
};
|
|
|
|
#endif // MACRO_PRESET_NAMES_H
|