Skip to content

Commit ae928fb

Browse files
committed
sa1: some collect rings results alignment
1 parent edd054b commit ae928fb

5 files changed

Lines changed: 460 additions & 224 deletions

File tree

include/data/sa1/collect_rings.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#ifndef GUARD_DATA_COLLECT_RINGS_H
2+
#define GUARD_DATA_COLLECT_RINGS_H
3+
4+
#include "global.h"
5+
6+
extern const u8 gCollectRingsTilemaps[0xC000];
7+
8+
extern const u8 gCollectRingsTextTiles[];
9+
10+
extern const u8 gCollectRingsBgStageTileset[];
11+
12+
extern const u8 gCollectRingsAnimations_Cream_Compressed[0x6A7C];
13+
extern const u8 gCollectRingsAnimations_Tails_Compressed[0x6fe4];
14+
extern const u8 gCollectRingsAnimations_Knuckles_Compressed[0x6a44];
15+
16+
extern const u8 gCollectRingsRom_Compressed[];
17+
18+
#endif

sa1/data/sa1/data1_1.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ C_DECL(gUnknown_087CA2F8):
1919
C_DECL(gUnknown_087D22F8):
2020
.incbin "baserom_sa1.gba", 0x007D22F8, 0x5B88
2121

22-
.global C_DECL(gUnknown_087D7E80)
23-
C_DECL(gUnknown_087D7E80):
22+
.global C_DECL(gCollectRingsBgStageTileset)
23+
C_DECL(gCollectRingsBgStageTileset):
2424
.incbin "baserom_sa1.gba", 0x007D7E80, 0x8000
2525

2626
.global C_DECL(gUnknown_087DFE80)
2727
C_DECL(gUnknown_087DFE80):
2828
.incbin "baserom_sa1.gba", 0x007DFE80, 0x3790
2929

30-
.global C_DECL(gUnknown_087E3610)
31-
C_DECL(gUnknown_087E3610):
30+
.global C_DECL(gCollectRingsTilemaps)
31+
C_DECL(gCollectRingsTilemaps):
3232
.incbin "baserom_sa1.gba", 0x007E3610, 0x8000
3333

3434
.global C_DECL(gUnknown_087EB610)

sa1/data/sa1/data_0_1_2.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ C_DECL(gUnknown_080BB3F8):
99
mPtr C_DECL(gMultiboot_087C22F8)
1010
mPtr C_DECL(gUnknown_087CA2F8)
1111
mPtr C_DECL(gUnknown_087D22F8)
12-
mPtr C_DECL(gUnknown_087E3610)
12+
mPtr C_DECL(gCollectRingsTilemaps)
1313
mPtr C_DECL(gUnknown_087EB610)
1414
mPtr C_DECL(gUnknown_087F2128)
1515
mPtr C_DECL(gUnknown_087F88F0)
1616
mPtr C_DECL(gUnknown_087DFE80)
17-
mPtr C_DECL(gUnknown_087D7E80)
17+
mPtr C_DECL(gCollectRingsBgStageTileset)
1818

1919
.global C_DECL(gUnknown_080BB41C)
2020
C_DECL(gUnknown_080BB41C):

0 commit comments

Comments
 (0)