mirror of
https://github.com/n64decomp/sm64
synced 2026-04-27 09:33:42 +00:00
28 lines
1.7 KiB
Plaintext
28 lines
1.7 KiB
Plaintext
diff a/levels/scripts.c b/levels/scripts.c (rejected hunks)
|
|
@@ -65,6 +65,17 @@ const LevelScript level_main_scripts_entry[] = {
|
|
LOAD_RAW( /*seg*/ 0x16, _common1_geoSegmentRomStart, _common1_geoSegmentRomEnd),
|
|
LOAD_RAW( /*seg*/ 0x13, _behaviorSegmentRomStart, _behaviorSegmentRomEnd),
|
|
ALLOC_LEVEL_POOL(),
|
|
+
|
|
+ LOAD_MODEL_FROM_GEO(MODEL_SONIC_BALL, sonic_ball_geo),
|
|
+ LOAD_MODEL_FROM_GEO(MODEL_SUPER_BALL, super_ball_geo),
|
|
+ LOAD_MODEL_FROM_GEO(MODEL_SUPER_SONIC, super_sonic_geo),
|
|
+ // LOAD_MODEL_FROM_GEO(MODEL_SONIC_BALL_SHADOW, sonic_ball_shadow_geo),
|
|
+ LOAD_MODEL_FROM_GEO(MODEL_SONIC_TRAIL, sonic_trail_geo),
|
|
+ LOAD_MODEL_FROM_GEO(MODEL_SUPER_TRAIL, super_trail_geo),
|
|
+ LOAD_MODEL_FROM_GEO(MODEL_EMERALD, emerald_geo),
|
|
+ LOAD_MODEL_FROM_GEO(MODEL_EMERALD_CIRCLE, emerald_circle_geo),
|
|
+ LOAD_MODEL_FROM_GEO(MODEL_RETICLE, reticle_geo),
|
|
+
|
|
LOAD_MODEL_FROM_GEO(MODEL_MARIO, mario_geo),
|
|
LOAD_MODEL_FROM_GEO(MODEL_SMOKE, smoke_geo),
|
|
LOAD_MODEL_FROM_GEO(MODEL_SPARKLES, sparkles_geo),
|
|
@@ -88,7 +99,6 @@ const LevelScript level_main_scripts_entry[] = {
|
|
LOAD_MODEL_FROM_GEO(MODEL_SPARKLES_ANIMATION, sparkles_animation_geo),
|
|
LOAD_MODEL_FROM_DL( MODEL_SAND_DUST, sand_seg3_dl_0302BCD0, LAYER_ALPHA),
|
|
LOAD_MODEL_FROM_GEO(MODEL_BUTTERFLY, butterfly_geo),
|
|
- LOAD_MODEL_FROM_GEO(MODEL_BURN_SMOKE_UNUSED, burn_smoke_geo),
|
|
LOAD_MODEL_FROM_DL( MODEL_PEBBLE, pebble_seg3_dl_0301CB00, LAYER_ALPHA),
|
|
LOAD_MODEL_FROM_GEO(MODEL_MIST, mist_geo),
|
|
LOAD_MODEL_FROM_GEO(MODEL_WHITE_PUFF, white_puff_geo),
|