pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shiftable build

Browse Source
This commit is contained in:
Ethan Roseman 2023-08-20 17:54:36 +09:00
parent b171712e0e
commit a3cdc47fb7
No known key found for this signature in database
GPG Key ID: 27F9FCEB8E4969BD
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/macros.h
View File

@ -28,12 +28,12 @@
#ifndef BBPLAYER #ifndef BBPLAYER
# define ALIGNED(x) __attribute__((aligned(x))) # define ALIGNED(x) __attribute__((aligned(x)))
# define BBALIGNED(x) ALIGNED(x)
#else #else
# define ALIGNED(x) # define ALIGNED(x)
# define BBALIGNED(x) __attribute__((aligned(x)))
#endif #endif
#define BBALIGNED(x) __attribute__((aligned(x)))
#define ALIGN16(val) (((val) + 0xF) & ~0xF) #define ALIGN16(val) (((val) + 0xF) & ~0xF)
#define ALIGN8(val) (((val) + 0x7) & ~0x7) #define ALIGN8(val) (((val) + 0x7) & ~0x7)

6
src/entity.c
View File

@ -18,9 +18,9 @@ extern Addr WorldEntityHeapBottom;
extern Addr WorldEntityHeapBase; extern Addr WorldEntityHeapBase;
#define WORLD_ENTITY_HEAP_BOTTOM (s32) WorldEntityHeapBottom #define WORLD_ENTITY_HEAP_BOTTOM (s32) WorldEntityHeapBottom
#define WORLD_ENTITY_HEAP_BASE (s32) WorldEntityHeapBase #define WORLD_ENTITY_HEAP_BASE (s32) WorldEntityHeapBase
#define entity_jan_iwa_VRAM (s32) entity_jan_iwa_VRAM #define entity_jan_iwa_VRAM (void*) entity_jan_iwa_VRAM
#define entity_sbk_omo_VRAM (s32) entity_sbk_omo_VRAM #define entity_sbk_omo_VRAM (void*) entity_sbk_omo_VRAM
#define entity_default_VRAM (s32) entity_default_VRAM #define entity_default_VRAM (void*) entity_default_VRAM
#else #else
#define WORLD_ENTITY_HEAP_BOTTOM 0x80250000 #define WORLD_ENTITY_HEAP_BOTTOM 0x80250000
#define WORLD_ENTITY_HEAP_BASE 0x80267FF0 #define WORLD_ENTITY_HEAP_BASE 0x80267FF0

3
src/main.c
View File

@ -8,10 +8,7 @@
#include "PR/controller.h" #include "PR/controller.h"
#include "PR/osint.h" #include "PR/osint.h"
SHIFT_BSS OSPifRam __osEepPifRam; SHIFT_BSS OSPifRam __osEepPifRam;
SHIFT_BSS OSPifRam __osPfsPifRam;
SHIFT_BSS __OSEventState __osEventStateTab[OS_NUM_EVENTS]; SHIFT_BSS __OSEventState __osEventStateTab[OS_NUM_EVENTS];
SHIFT_BSS u32 __osFinalrom;
SHIFT_BSS __OSInode __osPfsInodeCache;
SHIFT_BSS OSPifRam __MotorDataBuf[MAXCONTROLLERS]; SHIFT_BSS OSPifRam __MotorDataBuf[MAXCONTROLLERS];
SHIFT_BSS u16 retrace; SHIFT_BSS u16 retrace;
SHIFT_BSS OSThread viThread; SHIFT_BSS OSThread viThread;

1
ver/us/splat.yaml
View File

@ -373,6 +373,7 @@ segments:
- [auto, .data, os/initialize] - [auto, .data, os/initialize]
- [auto, .data, os/xlitob] - [auto, .data, os/xlitob]
- [auto, .data, os/vi] - [auto, .data, os/vi]
- [auto, .data, os/pfsisplug]
- [auto, .data, os/vimodepallan1] - [auto, .data, os/vimodepallan1]
- [auto, .data, battle/battle] - [auto, .data, battle/battle]
- [0x71430, bin, gspF3DEX2kawase_fifo_text] - [0x71430, bin, gspF3DEX2kawase_fifo_text]