3 files changed, 13 insertions, 10 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 6b5d79ecd..d8a4a8072 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -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;
     }
 
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 945aacb65..5068553b1 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -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
diff --git a/src/code/z_play_hireso.c b/src/code/z_play_hireso.c
index 581430623..18f9908c5 100644
--- a/src/code/z_play_hireso.c
+++ b/src/code/z_play_hireso.c
@@ -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