From a3cdc47fb7a2cad8b2c97c999ee565d5771c1c46 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 20 Aug 2023 17:54:36 +0900 Subject: [PATCH] Fix shiftable build --- include/macros.h | 4 ++-- src/entity.c | 6 +++--- src/main.c | 3 --- ver/us/splat.yaml | 1 + 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/macros.h b/include/macros.h index 3a6c96b6e5..22c7c2e120 100644 --- a/include/macros.h +++ b/include/macros.h @@ -28,12 +28,12 @@ #ifndef BBPLAYER # define ALIGNED(x) __attribute__((aligned(x))) -# define BBALIGNED(x) ALIGNED(x) #else # define ALIGNED(x) -# define BBALIGNED(x) __attribute__((aligned(x))) #endif +#define BBALIGNED(x) __attribute__((aligned(x))) + #define ALIGN16(val) (((val) + 0xF) & ~0xF) #define ALIGN8(val) (((val) + 0x7) & ~0x7) diff --git a/src/entity.c b/src/entity.c index 5fc64dbd24..2f7a605ebc 100644 --- a/src/entity.c +++ b/src/entity.c @@ -18,9 +18,9 @@ extern Addr WorldEntityHeapBottom; extern Addr WorldEntityHeapBase; #define WORLD_ENTITY_HEAP_BOTTOM (s32) WorldEntityHeapBottom #define WORLD_ENTITY_HEAP_BASE (s32) WorldEntityHeapBase -#define entity_jan_iwa_VRAM (s32) entity_jan_iwa_VRAM -#define entity_sbk_omo_VRAM (s32) entity_sbk_omo_VRAM -#define entity_default_VRAM (s32) entity_default_VRAM +#define entity_jan_iwa_VRAM (void*) entity_jan_iwa_VRAM +#define entity_sbk_omo_VRAM (void*) entity_sbk_omo_VRAM +#define entity_default_VRAM (void*) entity_default_VRAM #else #define WORLD_ENTITY_HEAP_BOTTOM 0x80250000 #define WORLD_ENTITY_HEAP_BASE 0x80267FF0 diff --git a/src/main.c b/src/main.c index 57ae0eb519..f23cb74b21 100644 --- a/src/main.c +++ b/src/main.c @@ -8,10 +8,7 @@ #include "PR/controller.h" #include "PR/osint.h" SHIFT_BSS OSPifRam __osEepPifRam; -SHIFT_BSS OSPifRam __osPfsPifRam; SHIFT_BSS __OSEventState __osEventStateTab[OS_NUM_EVENTS]; -SHIFT_BSS u32 __osFinalrom; -SHIFT_BSS __OSInode __osPfsInodeCache; SHIFT_BSS OSPifRam __MotorDataBuf[MAXCONTROLLERS]; SHIFT_BSS u16 retrace; SHIFT_BSS OSThread viThread; diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index e933b33ff4..11cb6b0c52 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -373,6 +373,7 @@ segments: - [auto, .data, os/initialize] - [auto, .data, os/xlitob] - [auto, .data, os/vi] + - [auto, .data, os/pfsisplug] - [auto, .data, os/vimodepallan1] - [auto, .data, battle/battle] - [0x71430, bin, gspF3DEX2kawase_fifo_text]