Get rid of common syms (#2040)

pret · Oct 15, 2024 · a55c75d · a55c75d
1 parent 253d3dd
commit a55c75d
Show file tree

Hide file tree

Showing 96 changed files with 244 additions and 501 deletions.
diff --git a/Makefile b/Makefile
@@ -178,12 +178,20 @@ ifneq (,$(MAKECMDGOALS))
   endif
 endif
 
+.SHELLSTATUS ?= 0
+
 ifeq ($(SETUP_PREREQS),1)
   # If set on: Default target or a rule requiring a scan
   # Forcibly execute `make tools` since we need them for what we are doing.
-  $(call infoshell, $(MAKE) -f make_tools.mk)
+  $(foreach line, $(shell $(MAKE) -f make_tools.mk | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
+  ifneq ($(.SHELLSTATUS),0)
+    $(error Errors occurred while building tools. See error messages above for more details)
+  endif
   # Oh and also generate mapjson sources before we use `SCANINC`.
-  $(call infoshell, $(MAKE) generated)
+  $(foreach line, $(shell $(MAKE) generated | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
+  ifneq ($(.SHELLSTATUS),0)
+    $(error Errors occurred while generating map-related sources. See error messages above for more details)
+  endif
 endif
 
 # Collect sources
@@ -255,6 +263,8 @@ include spritesheet_rules.mk
 include json_data_rules.mk
 include audio_rules.mk
 
+# NOTE: Tools must have been built prior (FIXME)
+# so you can't really call this rule directly
 generated: $(AUTO_GEN_TARGETS)
 
 %.s:   ;
@@ -270,8 +280,6 @@ generated: $(AUTO_GEN_TARGETS)
 %.lz:     %      ; $(GFX) $< $@
 %.rl:     %      ; $(GFX) $< $@
 
-# NOTE: Tools must have been built prior (FIXME)
-generated: tools $(AUTO_GEN_TARGETS)
 clean-generated:
 	-rm -f $(AUTO_GEN_TARGETS)
 
@@ -371,6 +379,7 @@ libagbsyscall:
 # Elf from object files
 $(ELF): $(LD_SCRIPT) $(LD_SCRIPT_DEPS) $(OBJS) libagbsyscall
 	@cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat
+	@echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< --print-memory-usage -o ../../$@ <objs> <libs> | cat"
 	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
 
 # Builds the rom from the elf file

diff --git a/common_syms/AgbRfu_LinkManager.txt b/common_syms/AgbRfu_LinkManager.txt
diff --git a/common_syms/agb_flash.txt b/common_syms/agb_flash.txt
diff --git a/common_syms/apprentice.txt b/common_syms/apprentice.txt
diff --git a/common_syms/battle_anim_throw.txt b/common_syms/battle_anim_throw.txt
diff --git a/common_syms/battle_factory_screen.txt b/common_syms/battle_factory_screen.txt
diff --git a/common_syms/battle_main.txt b/common_syms/battle_main.txt
diff --git a/common_syms/battle_tower.txt b/common_syms/battle_tower.txt
diff --git a/common_syms/berry_blender.txt b/common_syms/berry_blender.txt
diff --git a/common_syms/bg.txt b/common_syms/bg.txt
diff --git a/common_syms/contest.txt b/common_syms/contest.txt
diff --git a/common_syms/contest_painting.txt b/common_syms/contest_painting.txt
diff --git a/common_syms/ereader_screen.txt b/common_syms/ereader_screen.txt
diff --git a/common_syms/evolution_scene.txt b/common_syms/evolution_scene.txt
diff --git a/common_syms/faraway_island.txt b/common_syms/faraway_island.txt
diff --git a/common_syms/field_camera.txt b/common_syms/field_camera.txt
diff --git a/common_syms/field_control_avatar.txt b/common_syms/field_control_avatar.txt
diff --git a/common_syms/field_specials.txt b/common_syms/field_specials.txt
diff --git a/common_syms/fieldmap.txt b/common_syms/fieldmap.txt
diff --git a/common_syms/image_processing_effects.txt b/common_syms/image_processing_effects.txt
diff --git a/common_syms/intro.txt b/common_syms/intro.txt
diff --git a/common_syms/librfu_rfu.txt b/common_syms/librfu_rfu.txt
diff --git a/common_syms/librfu_sio32id.txt b/common_syms/librfu_sio32id.txt
diff --git a/common_syms/librfu_stwi.txt b/common_syms/librfu_stwi.txt
diff --git a/common_syms/link.txt b/common_syms/link.txt
diff --git a/common_syms/link_rfu_2.txt b/common_syms/link_rfu_2.txt
diff --git a/common_syms/list_menu.txt b/common_syms/list_menu.txt
diff --git a/common_syms/load_save.txt b/common_syms/load_save.txt
diff --git a/common_syms/m4a.txt b/common_syms/m4a.txt
diff --git a/common_syms/main.txt b/common_syms/main.txt
diff --git a/common_syms/mauville_old_man.txt b/common_syms/mauville_old_man.txt
diff --git a/common_syms/overworld.txt b/common_syms/overworld.txt
diff --git a/common_syms/party_menu.txt b/common_syms/party_menu.txt
diff --git a/common_syms/pokedex.txt b/common_syms/pokedex.txt
diff --git a/common_syms/pokedex_cry_screen.txt b/common_syms/pokedex_cry_screen.txt
diff --git a/common_syms/random.txt b/common_syms/random.txt
diff --git a/common_syms/rtc.txt b/common_syms/rtc.txt
diff --git a/common_syms/save.txt b/common_syms/save.txt
diff --git a/common_syms/sound.txt b/common_syms/sound.txt
diff --git a/common_syms/sprite.txt b/common_syms/sprite.txt
diff --git a/common_syms/start_menu.txt b/common_syms/start_menu.txt
diff --git a/common_syms/task.txt b/common_syms/task.txt
diff --git a/common_syms/text.txt b/common_syms/text.txt
diff --git a/common_syms/trainer_see.txt b/common_syms/trainer_see.txt
diff --git a/common_syms/tv.txt b/common_syms/tv.txt
diff --git a/common_syms/window.txt b/common_syms/window.txt
diff --git a/include/gba/defines.h b/include/gba/defines.h
@@ -8,6 +8,7 @@
 
 #define IWRAM_DATA __attribute__((section("iwram_data")))
 #define EWRAM_DATA __attribute__((section("ewram_data")))
+#define COMMON_DATA __attribute__((section("common_data")))
 #define UNUSED __attribute__((unused))
 
 #if MODERN

diff --git a/ld_script.ld b/ld_script.ld
@@ -42,6 +42,7 @@ SECTIONS {
 
         /* COMMON starts at 0x30022A8 */
         INCLUDE "sym_common.ld"
+        src/*.o(COMMON);
         *libc.a:sbrkr.o(COMMON);
     } > IWRAM
 

diff --git a/ld_script_modern.ld b/ld_script_modern.ld
@@ -28,6 +28,7 @@ SECTIONS {
 
         src/m4a.o(.bss.code);
 
+        src/*.o(common_data);
         src/*.o(COMMON);
         *libc.a:*.o(COMMON);
         *libnosys.a:*.o(COMMON);

diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c
@@ -14,7 +14,7 @@
 #define FSP_ON    0x01
 #define FSP_START 0x02
 
-LINK_MANAGER lman;
+COMMON_DATA LINK_MANAGER lman = {0};
 
 static void rfu_LMAN_clearVariables(void);
 static void rfu_LMAN_settingPCSWITCH(u32 rand);

diff --git a/src/agb_flash.c b/src/agb_flash.c
@@ -6,16 +6,16 @@ static u16 sTimerCount;
 static vu16 *sTimerReg;
 static u16 sSavedIme;
 
-u8 gFlashTimeoutFlag;
-u8 (*PollFlashStatus)(u8 *);
-u16 (*WaitForFlashWrite)(u8 phase, u8 *addr, u8 lastData);
-u16 (*ProgramFlashSector)(u16 sectorNum, u8 *src);
-const struct FlashType *gFlash;
-u16 (*ProgramFlashByte)(u16 sectorNum, u32 offset, u8 data);
-u16 gFlashNumRemainingBytes;
-u16 (*EraseFlashChip)();
-u16 (*EraseFlashSector)(u16 sectorNum);
-const u16 *gFlashMaxTime;
+COMMON_DATA u8 gFlashTimeoutFlag = 0;
+COMMON_DATA u8 (*PollFlashStatus)(u8 *) = NULL;
+COMMON_DATA u16 (*WaitForFlashWrite)(u8 phase, u8 *addr, u8 lastData) = NULL;
+COMMON_DATA u16 (*ProgramFlashSector)(u16 sectorNum, u8 *src) = NULL;
+COMMON_DATA const struct FlashType *gFlash = NULL;
+COMMON_DATA u16 (*ProgramFlashByte)(u16 sectorNum, u32 offset, u8 data) = NULL;
+COMMON_DATA u16 gFlashNumRemainingBytes = 0;
+COMMON_DATA u16 (*EraseFlashChip)() = NULL;
+COMMON_DATA u16 (*EraseFlashSector)(u16 sectorNum) = 0;
+COMMON_DATA const u16 *gFlashMaxTime = NULL;
 
 void SetReadFlash1(u16 *dest);
 

diff --git a/src/apprentice.c b/src/apprentice.c
@@ -75,9 +75,9 @@ struct ApprenticeQuestionData
 };
 
 // IWRAM common
-struct ApprenticePartyMovesData *gApprenticePartyMovesData;
-struct ApprenticeQuestionData *gApprenticeQuestionData;
-void (*gApprenticeFunc)(void);
+COMMON_DATA struct ApprenticePartyMovesData *gApprenticePartyMovesData = NULL;
+COMMON_DATA struct ApprenticeQuestionData *gApprenticeQuestionData = NULL;
+COMMON_DATA void (*gApprenticeFunc)(void) = NULL;
 
 // This file's functions.
 static u16 GetRandomAlternateMove(u8 monId);

diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c
@@ -23,9 +23,9 @@
 #include "constants/rgb.h"
 
 // iwram
-u32 gMonShrinkDuration;
-u16 gMonShrinkDelta;
-u16 gMonShrinkDistance;
+COMMON_DATA u32 gMonShrinkDuration = 0;
+COMMON_DATA u16 gMonShrinkDelta = 0;
+COMMON_DATA u16 gMonShrinkDistance = 0;
 
 enum {
     BALL_ROLL_1,

diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
@@ -256,7 +256,7 @@ static struct FactorySelectScreen *sFactorySelectScreen;
 static void (*sSwap_CurrentOptionFunc)(u8 taskId);
 static struct FactorySwapScreen *sFactorySwapScreen;
 
-u8 (*gFactorySelect_CurrentOptionFunc)(void);
+COMMON_DATA u8 (*gFactorySelect_CurrentOptionFunc)(void) = NULL;
 
 static const u16 sPokeballGray_Pal[]         = INCBIN_U16("graphics/battle_frontier/factory_screen/pokeball_gray.gbapal");
 static const u16 sPokeballSelected_Pal[]     = INCBIN_U16("graphics/battle_frontier/factory_screen/pokeball_selected.gbapal");

diff --git a/src/battle_main.c b/src/battle_main.c
@@ -237,15 +237,15 @@ EWRAM_DATA u16 gBattleMovePower = 0;
 EWRAM_DATA u16 gMoveToLearn = 0;
 EWRAM_DATA u8 gBattleMonForms[MAX_BATTLERS_COUNT] = {0};
 
-void (*gPreBattleCallback1)(void);
-void (*gBattleMainFunc)(void);
-struct BattleResults gBattleResults;
-u8 gLeveledUpInBattle;
-void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-u8 gMultiUsePlayerCursor;
-u8 gNumberOfMovesToChoose;
-u8 gBattleControllerData[MAX_BATTLERS_COUNT]; // Used by the battle controllers to store misc sprite/task IDs for each battler
+COMMON_DATA void (*gPreBattleCallback1)(void) = NULL;
+COMMON_DATA void (*gBattleMainFunc)(void) = NULL;
+COMMON_DATA struct BattleResults gBattleResults = {0};
+COMMON_DATA u8 gLeveledUpInBattle = 0;
+COMMON_DATA void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void) = {0};
+COMMON_DATA u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT] = {0};
+COMMON_DATA u8 gMultiUsePlayerCursor = 0;
+COMMON_DATA u8 gNumberOfMovesToChoose = 0;
+COMMON_DATA u8 gBattleControllerData[MAX_BATTLERS_COUNT] = {0}; // Used by the battle controllers to store misc sprite/task IDs for each battler
 
 static const struct ScanlineEffectParams sIntroScanlineParams16Bit =
 {