zoness boss fix, increase memory allocation, fix prototypes, level_select fix

This commit is contained in:
Sonic Dreamcaster
2024-04-03 00:38:00 -03:00
committed by KiritoDv
parent d409d1dc07
commit 4cd75e1aac
4 changed files with 8 additions and 6 deletions
+1 -1
View File
@@ -3116,7 +3116,7 @@ void Zoness_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 y
}
}
}
if (sp50 >= 60 && newActor != NULL) {
if (sp50 == 60) {
newActor->obj.status = OBJ_FREE;
}
}
+4 -3
View File
@@ -4098,14 +4098,14 @@ bool Map_801A62FC(PlanetId planet) {
break;
}
#if MODS_LEVEL_SELECT == 1
#ifdef MOD_LEVEL_SELECT
if (gCurrentPlanet == 6) {
return false;
}
#endif
if (gSaveFile.save.data.planet[planetSaveSlot].played & 1) {
ret = false;
ret = false;
}
return ret;
@@ -5407,7 +5407,7 @@ void Map_801A9A8C(void) {
TextureRect_8bIA(&gMasterDisp, &D_5000500, 112, 19, D_menu_801B6AC0[0], D_menu_801B6AC8[0], 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, sp54, 16, 15, D_menu_801B6AC0[1], D_menu_801B6AC8[1], 1.0f, 1.0f);
/*
for (i = 0; i < D_menu_801AF834[sp58].height; i++) {
TextureRect_8bIA(&gMasterDisp, D_menu_801AF834[sp58].texture + (D_menu_801AF834[sp58].width * i),
D_menu_801AF834[sp58].width, 1, D_menu_801AF834[sp58].xPos, 94.0f + (1.0f * i), 1.0f, 1.0f);
@@ -5417,6 +5417,7 @@ void Map_801A9A8C(void) {
TextureRect_8bIA(&gMasterDisp, D_menu_801AF914[sp58].texture + (D_menu_801AF914[sp58].width * i),
D_menu_801AF914[sp58].width, 1, D_menu_801AF914[sp58].xPos, 140.0f + (1.0f * i), 1.0f, 1.0f);
}
*/
}
void Map_801A9DE8(void) {
+2 -1
View File
@@ -266,6 +266,7 @@ void Graphics_ThreadUpdate(){
osRecvMesg(&gControllerMsgQueue, NULL, OS_MESG_BLOCK);
osSendMesg(&gSerialThreadMsgQueue, OS_MESG_32(SI_RUMBLE), OS_MESG_PRI_NORMAL);
Controller_UpdateInput();
Controller_ReadData();
osSendMesg(&gSerialThreadMsgQueue, OS_MESG_32(SI_READ_CONTROLLER), OS_MESG_PRI_NORMAL);
if (gControllerPress[3].button & U_JPAD) {
Main_SetVIMode();
@@ -296,7 +297,7 @@ void Graphics_ThreadUpdate(){
osViSwapBuffer(&gFrameBuffers[(gSysFrameCount - 1) % 3]);
}
Controller_ReadData();
// LTODO: FAULT_CRASH
// func_80007FE4(&gFrameBuffers[(gSysFrameCount - 1) % 3], SCREEN_WIDTH, 16);
+1 -1
View File
@@ -1,6 +1,6 @@
#include "sys.h"
s32 sMemoryBuffer[0x2200];
s32 sMemoryBuffer[0x8800];
s32* sMemoryPtr;
void Memory_FreeAll(void) {