github-mirror/sa2
1
0 Fork 0
mirror of https://github.com/SAT-R/sa2.git synced 2026-10-28 09:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

sa1: reference final east shared code from sa2

Browse Source
This commit is contained in:
Oliver Bell committed 2026-04-12 00:49:58 +01:00
1 parent 9bbcf20ec5
commit 872bafd19d
34 files changed
+188 -1486
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/constants/sa1/move_states.h
+2 -2
View File
@@ -16,7 +16,7 @@
#define MOVESTATE_DEAD 0x00000080
#define MOVESTATE_100 0x00000100
#define MOVESTATE_200 0x00000200
#define MOVESTATE_400 0x00000400
#define MOVESTATE_SPINDASH 0x00000400
#define MOVESTATE_SPINDASH 0x00000400
#define MOVESTATE_ICE_SLIDE 0x00000800
#define MOVESTATE_1000 0x00001000
@@ -56,7 +56,7 @@
#define MOVESTATE_DEAD 0x00000080
#define MOVESTATE_100 0x00000100
#define MOVESTATE_200 0x00000200
#define MOVESTATE_400 0x00000400
#define MOVESTATE_SPINDASH 0x00000400
#define MOVESTATE_ICE_SLIDE 0x00000800
#define MOVESTATE_1000 0x00001000
#define MOVESTATE_2000 0x00002000
include/constants/sa2/move_states.h
+1 -2
View File
@@ -16,7 +16,6 @@
#define MOVESTATE_DEAD 0x00000080
#define MOVESTATE_100 0x00000100
#define MOVESTATE_200 0x00000200
#define MOVESTATE_400 0x00000400
#define MOVESTATE_SPINDASH 0x00000400
#define MOVESTATE_ICE_SLIDE 0x00000800 // SA2: MOVESTATE_ICE_SLIDE
#define MOVESTATE_1000 0x00001000
@@ -56,7 +55,7 @@
#define MOVESTATE_DEAD 0x00000080
#define MOVESTATE_100 0x00000100
#define MOVESTATE_200 0x00000200
#define MOVESTATE_400 0x00000400
#define MOVESTATE_SPINDASH 0x00000400
#define MOVESTATE_ICE_SLIDE 0x00000800
#define MOVESTATE_1000 0x00001000
#define MOVESTATE_2000 0x00002000
include/constants/sa2/vram_hardcoded.h
+10 -4
View File
@@ -49,10 +49,16 @@
#define VRAM_RESERVED_BOSS_XTRA_ROCK2 (void *)(OBJ_VRAM0 + 0x3100)
#elif (GAME == GAME_SA2)
#define VRAM_RESERVED_DUST_EFFECT_BRAKING ((void *)OBJ_VRAM0 + 0x2300)
#define RESERVED_INDICATOR_TILES_VRAM (void *)(OBJ_VRAM0 + 0x2700)
#define VRAM_RESERVED_WATER_SURFACE (void *)(OBJ_VRAM0 + 0x2980)
#define VRAM_RESERVED_BUBBLES_SMALL (void *)(OBJ_VRAM0 + 0x2A40)
#define VRAM_RESERVED_BUBBLES_GROUP (void *)(OBJ_VRAM0 + 0x2AC0)
#ifndef COLLECT_RINGS_ROM
#define RESERVED_INDICATOR_TILES_VRAM (void *)(OBJ_VRAM0 + 0x2700)
#else
#define RESERVED_INDICATOR_TILES_VRAM (void *)(OBJ_VRAM0 + 0x3640)
#endif
#define VRAM_RESERVED_WATER_SURFACE (void *)(OBJ_VRAM0 + 0x2980)
#define VRAM_RESERVED_BUBBLES_SMALL (void *)(OBJ_VRAM0 + 0x2A40)
#define VRAM_RESERVED_BUBBLES_GROUP (void *)(OBJ_VRAM0 + 0x2AC0)
#endif
#endif // GUARD_VRAM_HARDCODED_H
include/game/shared/stage/mp_event_mgr.h
+1 -1
View File
@@ -101,7 +101,7 @@ void ReceiveRoomEvent_ItemBoxBreak(union MultiSioData *, u8);
void ReceiveRoomEvent_EnemyDestroyed(union MultiSioData *, u8);
void ReceiveRoomEvent_PlayerRingLoss(union MultiSioData *, u8);
void ReceiveRoomEvent_MysteryItemBoxBreak(union MultiSioData *, u8);
void ReceiveRoomEvent_Unknown(union MultiSioData *, u8);
void ReceiveRoomEvent_8(union MultiSioData *, u8);
// Creates and sends a room event for multiplayer
void *CreateRoomEvent(void);