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

collect_rings: clean up iwram symbols

Browse Source
This commit is contained in:
Oliver Bell committed 2025-06-13 01:44:14 +01:00
1 parent 4f32c50e6b
commit d14053e5a5
9 files changed
+217 -256
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

multi_boot/roms/collect_rings/Makefile
+1
View File
@@ -102,6 +102,7 @@ SA2_C_FILES := \
sa2/sprite.c \
sa2/malloc_vram.c \
sa2/bg_triangles.c \
sa2/game/sa1_sa2_shared/globals.c \
sa2/game/multiplayer/multiplayer_event_mgr.c \
sa2/game/multiplayer/multiplayer_event_recv_mgr.c \
sa2/game/multiboot/collect_rings/results.c \
multi_boot/roms/collect_rings/asm/rings_manager.s
+10 -10
View File
@@ -42,7 +42,7 @@ _02007E2A:
ldr r0, _02008108 @ =gCurTask
ldr r0, [r0]
ldrh r1, [r0, #6]
ldr r2, _0200810C @ =gUnknown_03000030
ldr r2, _0200810C @ =IWRAM_START + 0x30
adds r0, r1, r2
ldr r0, [r0]
str r0, [sp, #0x10]
@@ -355,7 +355,7 @@ _02008074:
movs r6, #0xc0
lsls r6, r6, #0x12
adds r4, r2, r6
ldr r1, _02008128 @ =gUnknown_03000052
ldr r1, _02008128 @ =IWRAM_START + 0x52
adds r0, r2, r1
movs r3, #0
ldrsh r1, [r0, r3]
@@ -368,7 +368,7 @@ _02008074:
lsls r0, r0, #8
lsrs r0, r0, #0x10
mov sl, r0
ldr r3, _0200812C @ =gUnknown_0300002F
ldr r3, _0200812C @ =IWRAM_START + 0x2F
adds r0, r2, r3
ldrb r0, [r0]
lsls r0, r0, #0x18
@@ -385,10 +385,10 @@ _020080AC:
blo _020080B4
b _02008270
_020080B4:
ldr r0, _02008130 @ =gUnknown_03000050
ldr r0, _02008130 @ =IWRAM_START + 0x50
adds r0, r2, r0
str r0, [sp, #0x28]
ldr r1, _02008134 @ =gUnknown_0300002C
ldr r1, _02008134 @ =IWRAM_START + 0x2C
adds r1, r2, r1
str r1, [sp, #0x2c]
subs r3, #1
@@ -429,17 +429,17 @@ _020080FE:
_02008100: .4byte gPlayer
_02008104: .4byte gStageFlags
_02008108: .4byte gCurTask
_0200810C: .4byte gUnknown_03000030
_0200810C: .4byte IWRAM_START + 0x30
_02008110: .4byte gCurrentLevel
_02008114: .4byte gRingCount
_02008118: .4byte gGameMode
_0200811C: .4byte gNumLives
_02008120: .4byte 0x04000128
_02008124: .4byte gMultiplayerPlayerTasks
_02008128: .4byte gUnknown_03000052
_0200812C: .4byte gUnknown_0300002F
_02008130: .4byte gUnknown_03000050
_02008134: .4byte gUnknown_0300002C
_02008128: .4byte IWRAM_START + 0x52
_0200812C: .4byte IWRAM_START + 0x2F
_02008130: .4byte IWRAM_START + 0x50
_02008134: .4byte IWRAM_START + 0x2C
_02008138:
ldr r6, [sp, #8]
mov r0, sl
multi_boot/roms/collect_rings/sym_iwram.txt
+10 -50
View File
@@ -1,48 +1,5 @@
. = 0x00000000; SoundMainRAM_Buffer = .;
. = 0x00000001; gUnknown_03000001 = .;
. = 0x00000004; gUnknown_03000004 = .;
. = 0x00000006; gUnknown_03000006 = .;
. = 0x00000008; gUnknown_03000008 = .;
. = 0x00000009; gUnknown_03000009 = .;
. = 0x0000000C; gUnknown_0300000C = .;
. = 0x00000010; gUnknown_03000010 = .;
. = 0x00000020; gUnknown_03000020 = .;
. = 0x00000021; gUnknown_03000021 = .;
. = 0x00000022; gUnknown_03000022 = .;
. = 0x00000025; gUnknown_03000025 = .;
. = 0x0000002C; gUnknown_0300002C = .;
. = 0x0000002D; gUnknown_0300002D = .;
. = 0x0000002E; gUnknown_0300002E = .;
. = 0x0000002F; gUnknown_0300002F = .;
. = 0x00000030; gUnknown_03000030 = .;
. = 0x00000031; gUnknown_03000031 = .;
. = 0x00000032; gUnknown_03000032 = .;
. = 0x00000034; gUnknown_03000034 = .;
. = 0x00000035; gUnknown_03000035 = .;
. = 0x0000003C; gUnknown_0300003C = .;
. = 0x0000003D; gUnknown_0300003D = .;
. = 0x00000040; gUnknown_03000040 = .;
. = 0x00000050; gUnknown_03000050 = .;
. = 0x00000052; gUnknown_03000052 = .;
. = 0x00000054; gUnknown_03000054 = .;
. = 0x00000056; gUnknown_03000056 = .;
. = 0x00000058; gUnknown_03000058 = .;
. = 0x0000005C; gUnknown_0300005C = .;
. = 0x0000005D; gUnknown_0300005D = .;
. = 0x0000005E; gUnknown_0300005E = .;
. = 0x00000060; gUnknown_03000060 = .;
. = 0x00000061; gUnknown_03000061 = .;
. = 0x00000064; gUnknown_03000064 = .;
. = 0x00000066; gUnknown_03000066 = .;
. = 0x00000068; gUnknown_03000068 = .;
. = 0x0000006A; gUnknown_0300006A = .;
. = 0x0000006C; gUnknown_0300006C = .;
. = 0x00000080; gUnknown_03000080 = .;
. = 0x00000082; gUnknown_03000082 = .;
. = 0x000002B0; gUnknown_030002B0 = .;
. = 0x000002B4; gUnknown_030002B4 = .;
. = 0x000002B6; gUnknown_030002B6 = .;
. = 0x00000378; gUnknown_03000378 = .;
/* terrain_collision.c */
. = 0x00000400; gUnknown_3000410 = .;
. = 0x00000410; gUnknown_3000420 = .;
. = 0x00000420;
@@ -50,6 +7,7 @@ build/collect_rings/src/sa2/multi_sio.o(.data);
build/collect_rings/src/sa2/sio32_multi_load.o(COMMON);
build/collect_rings/src/sa2/core.o(.data);
/* globals.c */
. = 0x000053A0; gUnknown_030053E0 = .;
. = 0x000053A4; gCheckpointTime = .;
. = 0x000053A8; gMultiplayerCharRings = .;
@@ -93,22 +51,24 @@ build/collect_rings/src/sa2/core.o(.data);
. = 0x00005524; gCurrentLevel = .;
. = 0x00005528; gMultiplayerConnections = .;
. = 0x00005530; gUnknown_030055BC = .;
/* time_display.c */
. = 0x0000553C; gUnknown_03005B6C = .;
/* mp_player.c */
. = 0x00005544; gShouldSpawnMPAttack2Effect = .;
. = 0x00005548; gMPAttackEffect2Regs = .;
/* camera.c */
. = 0x00005550; gStageBackgroundsRam = .;
. = 0x00005590; gUnknown_03005590 = .;
. = 0x00005650; gCamera = .;
. = 0x000056B8; gRefCollision = .;
/* player.c */
. = 0x000056C0; gPlayer = .;
. = 0x00005780; gPlayerBodyPSI = .;
/* rings_scatter.c */
. = 0x000057C4; gRingsScatterTask = .;
. = 0x000057C8; gPlayerControls = .;
/* stage.c */
. = 0x000057D0; gGameStageTask = .;
/* dummy_task.c */
. = 0x000057D4; gDummyTask = .;
. = 0x000057D8; iwram_end = .;
. = 0x00007F00; gUnknown_03007F00 = .;
. = 0x00007FA0; gUnknown_03007FA0 = .;
. = 0x00007FF0; gUnknown_03007FF0 = .;
. = 0x00007FF8; gUnknown_03007FF8 = .;
. = 0x00007FFC; gUnknown_03007FFC = .;