Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made Bowser 2 ride the platform again

This commit is contained in:
MysterD 2022-03-11 23:21:21 -08:00
parent 2e65946bf5
commit 5edb366aed
3 changed files with 13 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/behaviors/bowser.inc.c
View File

@ -1172,7 +1172,7 @@ void bowser_free_update(void) {
struct Object *platform;
UNUSED f32 floorHeight;
if ((platform = o->platform) != NULL)
apply_platform_displacement(FALSE, platform);
apply_platform_displacement((u32)-1, platform);
o->oBowserUnk10E = 0;
cur_obj_update_floor_and_walls();

2
src/game/mario.c
View File

@ -1500,7 +1500,7 @@ void update_mario_inputs(struct MarioState *m) {
/* Developer stuff */
#ifdef DEVELOPMENT
if (m->playerIndex == 0) {
if (m->action != ACT_DEBUG_FREE_MOVE && m->controller->buttonPressed & L_TRIG && m->controller->buttonPressed & Z_TRIG) {
if (m->action != ACT_DEBUG_FREE_MOVE && m->controller->buttonPressed & L_TRIG && m->controller->buttonDown & Z_TRIG) {
set_mario_action(m, ACT_DEBUG_FREE_MOVE, 0);
m->marioObj->oTimer = 0;
}

98
src/pc/controller/controller_keyboard_debug.c
View File

@ -16,11 +16,6 @@
static bool sHoldingAlt = false;
static u8 warpToLevel = LEVEL_BOB;
static u8 warpToArea = 27;
// warpToArea: 26 = basement
// warpToArea: 27 = upstairs
// warpToArea: 29 = courtyard
#define SCANCODE_0 0x0B
#define SCANCODE_1 0x02
@ -39,89 +34,18 @@ static void debug_breakpoint_here(void) {
// create easy breakpoint position for debugging
}
static void debug_warp_level(u8 level) {
extern bool dynos_warp_to_level(s32 aLevel, s32 aArea, s32 aAct);
static void debug_warp_level1() {
// warp to credits
//set_mario_action(&gMarioStates[0], ACT_JUMBO_STAR_CUTSCENE, 0);
//return;
if (sCurrPlayMode == PLAY_MODE_CHANGE_LEVEL) { return; }
gCurrCourseNum = 0;
gCurrLevelNum = 0;
gCurrAreaIndex = 0;
gCurrActStarNum = 0;
gChangeLevel = level;
return;
// find level from painting
/*for (int i = 0; i < 45; i++) {
struct WarpNode* node = &gCurrentArea->paintingWarpNodes[i];
if (node == NULL) { break; }
if (node->destLevel == level) {
sWarpDest.type = WARP_TYPE_CHANGE_LEVEL;
sWarpDest.levelNum = node->destLevel;
sWarpDest.areaIdx = node->destArea;
sWarpDest.nodeId = node->destNode;
sWarpDest.arg = 0;
sCurrPlayMode = PLAY_MODE_CHANGE_LEVEL;
return;
}
}
struct ObjectWarpNode* objectNode = gCurrentArea->warpNodes;
while (objectNode != NULL) {
struct WarpNode* node = &objectNode->node;
if (node->destLevel == level) {
sWarpDest.type = WARP_TYPE_CHANGE_LEVEL;
sWarpDest.levelNum = node->destLevel;
sWarpDest.areaIdx = node->destArea;
sWarpDest.nodeId = node->destNode;
sWarpDest.arg = 0;
sCurrPlayMode = PLAY_MODE_CHANGE_LEVEL;
return;
}
objectNode = objectNode->next;
}
// failed, go to main castle area
sWarpDest.type = WARP_TYPE_CHANGE_LEVEL;
sWarpDest.levelNum = LEVEL_CASTLE;
sWarpDest.areaIdx = 1;
sWarpDest.nodeId = 0x1F;
sWarpDest.arg = 0;
sCurrPlayMode = PLAY_MODE_CHANGE_LEVEL;
D_80339ECA = 0;
D_80339EE0 = 0;
extern s16 gSavedCourseNum;
gSavedCourseNum = 0;*/
dynos_warp_to_level(LEVEL_BOB, 1, 1);
}
static void debug_warp_area() {
extern bool dynos_warp_to_level(s32 aLevel, s32 aArea, s32 aAct);
dynos_warp_to_level(LEVEL_CCM, 1, 5);
return;
if (sCurrPlayMode == PLAY_MODE_CHANGE_LEVEL) { return; }
struct ObjectWarpNode* objectNode = gCurrentArea->warpNodes;
u8 onArea = 0;
while (objectNode != NULL) {
struct WarpNode* node = &objectNode->node;
if (gCurrCourseNum == 0 || (node->destLevel == gCurrLevelNum && node->destArea != gCurrAreaIndex)) {
if (gCurrCourseNum != 0 || ++onArea == warpToArea) {
sWarpDest.type = WARP_TYPE_CHANGE_AREA;
sWarpDest.levelNum = node->destLevel;
sWarpDest.areaIdx = node->destArea;
sWarpDest.nodeId = node->destNode;
sWarpDest.arg = 0;
sCurrPlayMode = PLAY_MODE_CHANGE_LEVEL;
return;
}
}
objectNode = objectNode->next;
}
static void debug_warp_level2() {
dynos_warp_to_level(LEVEL_BOWSER_2, 1, 1);
}
static void debug_grand_star(void) {
@ -162,11 +86,11 @@ void debug_keyboard_on_key_down(int scancode) {
case SCANCODE_ALT: sHoldingAlt = true; break;
case SCANCODE_3: debug_breakpoint_here(); break;
#ifdef DEVELOPMENT
case SCANCODE_6: if (sHoldingAlt) { debug_warp_level(warpToLevel); } break;
case SCANCODE_7: if (sHoldingAlt) { debug_warp_area(); } break;
case SCANCODE_8: if (sHoldingAlt) { debug_spawn_object(); } break;
case SCANCODE_9: if (sHoldingAlt) { debug_warp_to(); } break;
case SCANCODE_0: if (sHoldingAlt) { debug_suicide(); } break;
case SCANCODE_1: if (sHoldingAlt) { debug_warp_level1(); } break;
case SCANCODE_2: if (sHoldingAlt) { debug_warp_level2(); } break;
case SCANCODE_8: if (sHoldingAlt) { debug_spawn_object(); } break;
case SCANCODE_9: if (sHoldingAlt) { debug_warp_to(); } break;
case SCANCODE_0: if (sHoldingAlt) { debug_suicide(); } break;
case SCANCODE_F5: debug_reload_lua(); break;
#endif
}