Skip to content

pre-v2 1 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stalechilibeans merged 17 commits into from
Sep 3, 2025
Merged

pre-v2 1 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
19a6a96
Merge pull request #7 from 96flashbacks/main
stalechilibeans Jul 4, 2025
540d103
snow slider test
stalechilibeans Jul 5, 2025
92557b6
piece of shit
stalechilibeans Jul 5, 2025
9ebe8f6
collision test
stalechilibeans Jul 5, 2025
18c95e9
forgot to include some minor stuff
stalechilibeans Jul 5, 2025
f4dc837
fixed collision shit
stalechilibeans Jul 5, 2025
1cbf609
Merge pull request #9 from 96flashbacks/main
stalechilibeans Jul 7, 2025
2c96af4
Merge pull request #17 from 96flashbacks/main
stalechilibeans Jul 24, 2025
1152606
Merge pull request #22 from 96flashbacks/main
stalechilibeans Aug 11, 2025
fa34952
Merge pull request #23 from 96flashbacks/main
stalechilibeans Aug 15, 2025
504a71a
Merge pull request #26 from 96flashbacks/main
stalechilibeans Aug 31, 2025
5d9b7e5
fuck this model
stalechilibeans Aug 31, 2025
bf1af5a
snow slider pt. 1
stalechilibeans Sep 1, 2025
5084f9a
test collision + fixed fence alpha
stalechilibeans Sep 1, 2025
4b4240f
fixed fence alphaaa AGAIN
stalechilibeans Sep 2, 2025
03daa36
snow slider normals update + collision
Sep 2, 2025
b49b0d7
finished snow slider
stalechilibeans Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified levels/ccm/1.rgba16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified levels/ccm/4.rgba16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified levels/ccm/5.rgba16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified levels/ccm/6.rgba16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified levels/ccm/7.rgba16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3,153 changes: 1,677 additions & 1,476 deletions levels/ccm/areas/1/1/model.inc.c
View file
Open in desktop

Large diffs are not rendered by default.

363 changes: 168 additions & 195 deletions levels/ccm/areas/1/2/model.inc.c
View file
Open in desktop

Large diffs are not rendered by default.

608 changes: 421 additions & 187 deletions levels/ccm/areas/1/3/model.inc.c
View file
Open in desktop

Large diffs are not rendered by default.

2,328 changes: 1,304 additions & 1,024 deletions levels/ccm/areas/1/collision.inc.c
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions levels/ccm/script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
#include "levels/ccm/header.h"

static const LevelScript script_func_local_1[] = {
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 7118, -2752, 6209, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00020000, /*bhv*/ bhvSmallPenguin),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 6868, -2752, 6209, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00020000, /*bhv*/ bhvSmallPenguin),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 1698, -2752, -7496, /*angle*/ 0, 90, 0, /*bhvParam*/ 0x00020000, /*bhv*/ bhvSmallPenguin),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 1972, 5183, -1376, /*angle*/ 0, 180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvSmallPenguin),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 7293, -3521, 6321, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00020000, /*bhv*/ bhvSmallPenguin),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 7043, -3521, 6321, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00020000, /*bhv*/ bhvSmallPenguin),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 7863, -3162, -7915, /*angle*/ 0, 90, 0, /*bhvParam*/ 0x00020000, /*bhv*/ bhvSmallPenguin),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 2147, 4569, -1261, /*angle*/ 0, 180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvSmallPenguin),
RETURN(),
};

static const LevelScript script_func_local_2[] = {
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 6993, -2752, 6029, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x01000000, /*bhv*/ bhvTuxiesMother),
OBJECT(/*model*/ MODEL_STAR, /*pos*/ 5464, -2240, 5264, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvStar),
OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 7168, -3521, 6141, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x01000000, /*bhv*/ bhvTuxiesMother),
OBJECT(/*model*/ MODEL_STAR, /*pos*/ 5625, -2981, 5379, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvStar),
RETURN(),
};

Expand Down Expand Up @@ -76,9 +76,9 @@ const LevelScript level_ccm_entry[] = {
LOAD_MODEL_FROM_GEO(MODEL_TTM_MOON_SMILEY, ccm_geo_000DBC),

AREA(/*index*/ 1, snow_slider_geo),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1671, 6300, -1756, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x000A0000, /*bhv*/ bhvSpinAirborneWarp),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 7815, -2649, 4523, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00140000, /*bhv*/ bhvWarp),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2696, 5190, -316, /*angle*/ 0, -90, 0, /*bhvParam*/ 0x0F1E0000, /*bhv*/ bhvWarp),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1846, 5685, -1641, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x000A0000, /*bhv*/ bhvSpinAirborneWarp),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 7987, -3418, 4638, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00140000, /*bhv*/ bhvWarp),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2868, 4575, -204, /*angle*/ 0, -90, 0, /*bhvParam*/ 0x0F1E0000, /*bhv*/ bhvWarp),
WARP_NODE(/*id*/ WARP_NODE_0A, /*destLevel*/ LEVEL_CCM, /*destArea*/ 1, /*destNode*/ WARP_NODE_0A, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ WARP_NODE_14, /*destLevel*/ LEVEL_CCM, /*destArea*/ 1, /*destNode*/ WARP_NODE_1E, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ WARP_NODE_1E, /*destLevel*/ LEVEL_CCM, /*destArea*/ 2, /*destNode*/ WARP_NODE_0A, /*flags*/ WARP_NO_CHECKPOINT),
Expand Down
2 changes: 1 addition & 1 deletion src/game/mario.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ s8 sTerrainSounds[7][6] = {
{ SOUND_TERRAIN_DEFAULT, SOUND_TERRAIN_STONE, SOUND_TERRAIN_DEFAULT,
SOUND_TERRAIN_DEFAULT, SOUND_TERRAIN_DEFAULT,SOUND_TERRAIN_DEFAULT }, // TERRAIN_STONE
{ SOUND_TERRAIN_SNOW, SOUND_TERRAIN_DEFAULT,SOUND_TERRAIN_SNOW,
SOUND_TERRAIN_ICE, SOUND_TERRAIN_ICE, SOUND_TERRAIN_DEFAULT }, // TERRAIN_SNOW
SOUND_TERRAIN_SNOW, SOUND_TERRAIN_ICE, SOUND_TERRAIN_DEFAULT }, // TERRAIN_SNOW
{ SOUND_TERRAIN_SAND, SOUND_TERRAIN_STONE, SOUND_TERRAIN_SAND,
SOUND_TERRAIN_SAND, SOUND_TERRAIN_STONE, SOUND_TERRAIN_STONE }, // TERRAIN_SAND
{ SOUND_TERRAIN_SPOOKY, SOUND_TERRAIN_SPOOKY, SOUND_TERRAIN_SPOOKY,
Expand Down
Loading