We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent b1d39ff commit 841cba8Copy full SHA for 841cba8
levels/bob/area_1/geo.inc.c
@@ -262,9 +262,9 @@ const GeoLayout bob_area_1[] = {
262
GEO_CLOSE_NODE(),
263
264
265
- GEO_DISPLAY_LIST(5, bob_dl_material_revert_render_settings),
266
- GEO_DISPLAY_LIST(4, bob_dl_material_revert_render_settings),
267
GEO_DISPLAY_LIST(1, bob_dl_material_revert_render_settings),
+ GEO_DISPLAY_LIST(4, bob_dl_material_revert_render_settings),
+ GEO_DISPLAY_LIST(5, bob_dl_material_revert_render_settings),
268
269
GEO_END(),
270
};
levels/bob/script.c
@@ -174,7 +174,7 @@ const LevelScript level_bob_entry[] = {
174
OBJECT(MODEL_STAR, -7790, -2278, 1290, 0, 0, 0, 0x23000000, bhvStar),
175
OBJECT(MODEL_STAR, -5554, 833, -9483, 0, 0, 0, 0x24000000, bhvStar),
176
OBJECT(MODEL_STAR, 4347, -1300, -3755, 0, 0, 0, 0x25000000, bhvStar),
177
- OBJECT(MODEL_STAR, 2637, -270, 11033, 0, 0, 0, 0x02600000, bhvStar),
+ OBJECT(MODEL_STAR, 2637, -270, 11033, 0, 0, 0, 0x26000000, bhvStar),
178
OBJECT(MODEL_STAR, -3598, 3981, 566, 0, 0, 0, 0x27000000, bhvStar),
179
OBJECT(MODEL_NONE, 0, 200, 0, 0, 0, 0, 0x000A0000, bhvSpinAirborneWarp),
180
MARIO_POS(0x01, 0, 4951, -2340, -5344),
src/game/interaction.c
@@ -745,10 +745,10 @@ u32 interact_coin(struct MarioState *m, UNUSED u32 interactType, struct Object *
745
m->healCounter += 4 * o->oDamageOrCoinValue;
746
747
o->oInteractStatus = INT_STATUS_INTERACTED;
748
- if (COURSE_IS_MAIN_COURSE(gCurrCourseNum) && m->numCoins - o->oDamageOrCoinValue < 50
+ /*if (COURSE_IS_MAIN_COURSE(gCurrCourseNum) && m->numCoins - o->oDamageOrCoinValue < 50
749
&& m->numCoins >= 50 && m->numCoins < 100) {
750
spawn_custom_star(5640, -2000, -4133, 0x17000000);
751
- }
+ }*/
752
if (COURSE_IS_MAIN_COURSE(gCurrCourseNum) && m->numCoins - o->oDamageOrCoinValue < 100
753
&& m->numCoins >= 100) {
754
spawn_custom_star(5900, -2000, -4133, 0x18000000);
0 commit comments