Merge branch 'main' into pal-main

pmret · Nov 5, 2024 · a9f1771 · a9f1771
2 parents 45fc282 + f8c89d2
commit a9f1771
Show file tree

Hide file tree

Showing 129 changed files with 9,572 additions and 858 deletions.
diff --git a/include/common_structs.h b/include/common_structs.h
@@ -2521,10 +2521,16 @@ typedef struct CreditsChar {
     /* 0x18 */ s32 fadeInTime;
 } CreditsChar; // size = unk
 
+#if VERSION_JP
+#define MAX_CREDITS_LINES 30
+#else
+#define MAX_CREDITS_LINES 32
+#endif
+
 typedef struct CreditsData {
     /* 0x00 */ u32 workerID;
-    /* 0x04 */ CreditsLine lines[32];
-} CreditsData; // size = 0x74
+    /* 0x04 */ CreditsLine lines[MAX_CREDITS_LINES];
+} CreditsData; // size = 0xE84, JP size = 0xD9C
 
 typedef struct CreditsPairOffset {
     /* 0x00 */ u8 firstChar;

diff --git a/include/dead.h b/include/dead.h
@@ -337,5 +337,14 @@
 #define GetAnimatedRotationByTreeIndex dead_GetAnimatedRotationByTreeIndex
 #define SetEncounterStatusFlags dead_SetEncounterStatusFlags
 #define Entity_YellowBlock dead_Entity_YellowBlock
+#if VERSION_JP
+#define osSyncPrintf dead_osSyncPrintf
+#define SetModelFlags dead_SetModelFlags
+#define SetNpcScale dead_SetNpcScale
+#define StartBattle dead_StartBattle
+#define Entity_BrickBlock dead_Entity_BrickBlock
+#define Entity_SimpleSpring dead_Entity_SimpleSpring
+#define MakeTransformGroup dead_MakeTransformGroup
+#endif
 
 #endif
diff --git a/src/77480.c b/src/77480.c
@@ -17,17 +17,6 @@
 #define i_spy_VRAM (void*)0x802B7000
 #endif
 
-#if VERSION_JP // TODO remove once segments are split
-extern Addr i_spy_ROM_START;
-extern Addr i_spy_ROM_END;
-extern Addr pulse_stone_ROM_START;
-extern Addr pulse_stone_ROM_END;
-extern Addr speech_bubble_ROM_START;
-extern Addr speech_bubble_ROM_END;
-extern Addr inspect_icon_ROM_START;
-extern Addr inspect_icon_ROM_END;
-#endif
-
 UNK_FUN_PTR(ISpyNotificationCallback);
 UNK_FUN_PTR(PulseStoneNotificationCallback);
 UNK_FUN_PTR(TalkNotificationCallback);

diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c
@@ -7,12 +7,6 @@
 #include "model.h"
 #include "game_modes.h"
 
-#if VERSION_JP
-extern Addr btl_states_menus_ROM_START;
-extern Addr btl_states_menus_ROM_END;
-extern Addr btl_states_menus_VRAM;
-#endif
-
 extern StageListRow* gCurrentStagePtr;
 
 extern s16 D_802809F6;