mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-31 09:21:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

General cleanup (#1636)

Browse Source 
* totalLoadedActors comparision

* OBJMINE_PARAMS

* Sort z64.h header includes

* MapSelect_LoadConsoleLogo

* Combine notebook tables into 1

* TGSw clean up
This commit is contained in:
Derek Hensley
2024-05-19 11:02:20 -07:00
committed by GitHub
parent a3a7b551ed
commit b7e5468ca1
13 changed files with 85 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+1 -1
View File
@@ -3322,7 +3322,7 @@ Actor* Actor_SpawnAsChildAndCutscene(ActorContext* actorCtx, PlayState* play, s1
s32 objectSlot;
ActorOverlay* overlayEntry;
if (actorCtx->totalLoadedActors >= 0xFF) {
if (actorCtx->totalLoadedActors >= 255) {
return NULL;
}
src/code/z_message.c
+2 -4
View File
@@ -36,8 +36,7 @@ u8 gPageSwitchNextButtonStatus[][5] = {
#define DEFINE_EVENT(_enum, _icon, _colorFlag, _description, completedMessage, _completedFlag) completedMessage,
u16 sBombersNotebookEventMessages[BOMBERS_NOTEBOOK_EVENT_MAX] = {
#include "tables/bombers_notebook/person_table.h"
#include "tables/bombers_notebook/event_table.h"
#include "tables/notebook_table.h"
};
#undef DEFINE_PERSON
@@ -47,8 +46,7 @@ u16 sBombersNotebookEventMessages[BOMBERS_NOTEBOOK_EVENT_MAX] = {
#define DEFINE_EVENT(_enum, _icon, _colorFlag, _description, _completedMessage, completedFlag) completedFlag,
u16 gBombersNotebookWeekEventFlags[BOMBERS_NOTEBOOK_EVENT_MAX] = {
#include "tables/bombers_notebook/person_table.h"
#include "tables/bombers_notebook/event_table.h"
#include "tables/notebook_table.h"
};
#undef DEFINE_PERSON
src/code/z_play_hireso.c
+10 -5
View File
@@ -262,23 +262,27 @@ TexturePtr sBombersNotebookDayTextures[] = {
gBombersNotebookDayFinalENGTex,
};
#define DEFINE_PERSON(_enum, _photo, _description, metEnum, _metMessage, _metFlag)
#define DEFINE_EVENT(_enum, icon, _colorFlag, _description, _completedMessage, _completedFlag) icon,
s32 sBombersNotebookEventIcons[] = {
#include "tables/bombers_notebook/event_table.h"
#include "tables/notebook_table.h"
};
#undef DEFINE_PERSON
#undef DEFINE_EVENT
s32 sBombersNotebookEventIconWidths[] = { 16, 24, 32 };
s32 sBombersNotebookEventIconHeights[] = { 16, 28, 28 };
#define DEFINE_PERSON(_enum, _photo, _description, metEnum, _metMessage, _metFlag)
#define DEFINE_EVENT(_enum, _icon, colorFlag, _description, _completedMessage, _completedFlag) colorFlag,
u16 sBombersNotebookEventColorWeekEventFlags[] = {
#include "tables/bombers_notebook/event_table.h"
#include "tables/notebook_table.h"
};
#undef DEFINE_PERSON
#undef DEFINE_EVENT
void BombersNotebook_DrawScisTexRect(Gfx** gfxP, s32 rxl, s32 ryl, s32 rxh, s32 ryh, s32 tile, s32 s, s32 t, s32 dsdx,
@@ -556,12 +560,14 @@ void BombersNotebook_DrawEntries(Gfx** gfxP, s32 row, u32 rectTop) {
}
#define DEFINE_PERSON(_enum, photo, _description, _metEnum, _metMessage, _metFlag) photo,
#define DEFINE_EVENT(enum, _icon, _colorFlag, _description, _completedMessage, _completedFlag)
TexturePtr sBombersNotebookPhotoTextures[] = {
#include "tables/bombers_notebook/person_table.h"
#include "tables/notebook_table.h"
};
#undef DEFINE_PERSON
#undef DEFINE_EVENT
void BombersNotebook_DrawRows(BombersNotebook* this, Gfx** gfxP) {
static s16 sBarColorR = 0;
@@ -1127,8 +1133,7 @@ void BombersNotebook_LoadFiles(BombersNotebook* this, s32 flag) {
#define DEFINE_EVENT(_enum, _icon, _colorFlag, description, _completedMessage, _completedFlag) description,
u16 sBombersNotebookTextIds[] = {
#include "tables/bombers_notebook/person_table.h"
#include "tables/bombers_notebook/event_table.h"
#include "tables/notebook_table.h"
};
#undef DEFINE_PERSON