Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.

Commit baebaf3

Browse files
JaceCearJaceCear
committed
More SA2 alignment
1 parent 5604688 commit baebaf3

48 files changed

Lines changed: 383 additions & 396 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎asm/non_matching/engine/sa2__sub_8004010.inc‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
_08002F98:
1414
mov r2, r8
1515
lsls r0, r2, #2
16-
ldr r1, _08003050 @ =sa2__gUnknown_03002280
16+
ldr r1, _08003050 @ =gBgSprites_Unknown2
1717
adds r1, #1
1818
adds r4, r0, r1
19-
ldr r6, _08003054 @ =sa2__gUnknown_03002280+3
19+
ldr r6, _08003054 @ =gBgSprites_Unknown2+3
2020
adds r6, r0, r6
2121
str r6, [sp, #0xc]
2222
ldrb r1, [r4]
@@ -25,9 +25,9 @@ _08002F98:
2525
mov sl, r0
2626
cmp r1, ip
2727
bne _08002FCA
28-
ldr r0, _08003050 @ =sa2__gUnknown_03002280
28+
ldr r0, _08003050 @ =gBgSprites_Unknown2
2929
add r0, sl
30-
ldr r1, _08003058 @ =sa2__gUnknown_03002280+
30+
ldr r1, _08003058 @ =gBgSprites_Unknown2+
3131
add r1, sl
3232
ldrb r0, [r0]
3333
mov r7, r8
@@ -50,7 +50,7 @@ _08002FCA:
5050
lsls r0, r0, #3
5151
adds r5, r0, r1
5252
ldrb r4, [r4]
53-
ldr r0, _08003050 @ =sa2__gUnknown_03002280
53+
ldr r0, _08003050 @ =gBgSprites_Unknown2
5454
add r0, sl
5555
ldrb r0, [r0]
5656
str r0, [sp, #8]
@@ -105,9 +105,9 @@ _08002FCA:
105105
mov sb, r2
106106
b _08003134
107107
.align 2, 0
108-
_08003050: .4byte sa2__gUnknown_03002280
109-
_08003054: .4byte sa2__gUnknown_03002280+3
110-
_08003058: .4byte sa2__gUnknown_03002280+2
108+
_08003050: .4byte gBgSprites_Unknown2
109+
_08003054: .4byte gBgSprites_Unknown2+3
110+
_08003058: .4byte gBgSprites_Unknown2+2
111111
_0800305C: .4byte gBgCntRegs
112112
_08003060: .4byte gDispCnt
113113
_08003064: .4byte sa2__gUnknown_03004D80
@@ -125,7 +125,7 @@ _0800307A:
125125
add r0, r8
126126
mov ip, r0
127127
ldr r2, _080030D4 @ =0x040000D4
128-
ldr r1, _080030D8 @ =sa2__gUnknown_03002280
128+
ldr r1, _080030D8 @ =gBgSprites_Unknown2
129129
add r1, sl
130130
mov r8, r1
131131
ldr r6, [sp, #0xc]
@@ -168,7 +168,7 @@ _0800308C:
168168
.align 2, 0
169169
_080030D0: .4byte sa2__gUnknown_03004D80
170170
_080030D4: .4byte 0x040000D4
171-
_080030D8: .4byte sa2__gUnknown_03002280+2
171+
_080030D8: .4byte gBgSprites_Unknown2+2
172172
_080030DC:
173173
ldr r1, [sp, #8]
174174
lsls r0, r1, #1
@@ -184,7 +184,7 @@ _080030DC:
184184
bhi _080030F6
185185
movs r3, #0x40
186186
_080030F6:
187-
ldr r1, _0800313C @ =sa2__gUnknown_03002280+2
187+
ldr r1, _0800313C @ =gBgSprites_Unknown2+2
188188
add r1, sl
189189
ldrb r0, [r1]
190190
cmp r0, #0xff
@@ -201,7 +201,7 @@ _080030F6:
201201
ldr r1, _08003144 @ =0x040000D4
202202
str r6, [r1]
203203
str r0, [r1, #4]
204-
ldr r0, _08003148 @ =sa2__gUnknown_03002280+3
204+
ldr r0, _08003148 @ =gBgSprites_Unknown2+3
205205
add r0, sl
206206
ldrb r0, [r0]
207207
subs r0, r0, r4
@@ -220,12 +220,12 @@ _08003134:
220220
adds r7, #1
221221
b _080031A0
222222
.align 2, 0
223-
_0800313C: .4byte sa2__gUnknown_03002280+2
223+
_0800313C: .4byte gBgSprites_Unknown2+2
224224
_08003140: .4byte sa2__gUnknown_03004D80
225225
_08003144: .4byte 0x040000D4
226-
_08003148: .4byte sa2__gUnknown_03002280+3
226+
_08003148: .4byte gBgSprites_Unknown2+3
227227
_0800314C:
228-
ldr r0, _080031D4 @ =sa2__gUnknown_03002280+3
228+
ldr r0, _080031D4 @ =gBgSprites_Unknown2+3
229229
add r0, sl
230230
add r2, sp, #4
231231
mov sb, r2
@@ -274,7 +274,7 @@ _080031A0:
274274
mov r1, sb
275275
ldr r2, _080031DC @ =0x040000D4
276276
str r1, [r2]
277-
ldr r0, _080031E0 @ =sa2__gUnknown_03002280
277+
ldr r0, _080031E0 @ =gBgSprites_Unknown2
278278
add r0, sl
279279
str r0, [r2, #4]
280280
ldr r0, _080031E4 @ =0x85000001
@@ -298,10 +298,10 @@ _080031C2:
298298
pop {r1}
299299
bx r1
300300
.align 2, 0
301-
_080031D4: .4byte sa2__gUnknown_03002280+3
301+
_080031D4: .4byte gBgSprites_Unknown2+3
302302
_080031D8: .4byte sa2__gUnknown_03004D80
303303
_080031DC: .4byte 0x040000D4
304-
_080031E0: .4byte sa2__gUnknown_03002280
304+
_080031E0: .4byte gBgSprites_Unknown2
305305
_080031E4: .4byte 0x85000001
306306

307307
.syntax divided

‎asm/non_matching/engine/sa2__unused_sub_8005C54.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ _08004C50:
129129
lsrs r0, r0, #0x18
130130
mov sl, r0
131131
lsls r1, r3, #2
132-
ldr r7, _08004D70 @ =gBgOffsetsHBlank
132+
ldr r7, _08004D70 @ =gBgOffsetsHBlankPrimary
133133
ldr r0, [r7]
134134
adds r4, r0, r1
135135
mov r0, ip
@@ -183,7 +183,7 @@ _08004CC4:
183183
str r0, [sp, #8]
184184
adds r3, r0, #0
185185
lsls r1, r0, #2
186-
ldr r4, _08004D70 @ =gBgOffsetsHBlank
186+
ldr r4, _08004D70 @ =gBgOffsetsHBlankPrimary
187187
ldr r0, [r4]
188188
adds r4, r0, r1
189189
ldr r0, [sp, #4]
@@ -222,7 +222,7 @@ _08004D2C:
222222
str r0, [r7]
223223
ldr r0, _08004D84 @ =gHBlankCopySize
224224
strb r1, [r0]
225-
ldr r1, _08004D70 @ =gBgOffsetsHBlank
225+
ldr r1, _08004D70 @ =gBgOffsetsHBlankPrimary
226226
ldr r0, [r1]
227227
mov r2, sb
228228
adds r4, r0, r2
@@ -243,7 +243,7 @@ _08004D2C:
243243
subs r0, r1, r2
244244
b _08004D8C
245245
.align 2, 0
246-
_08004D70: .4byte gBgOffsetsHBlank
246+
_08004D70: .4byte gBgOffsetsHBlankPrimary
247247
_08004D74: .4byte 0x000001FF
248248
_08004D78: .4byte gFlags
249249
_08004D7C: .4byte 0x04000010

‎asm/non_matching/engine/sa2__unused_sub_8005FB4.inc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@
3232
ands r0, r6
3333
cmp r0, #0
3434
beq _08004F4C
35-
ldr r0, _08004F48 @ =gBgOffsetsHBlank
35+
ldr r0, _08004F48 @ =gBgOffsetsHBlankPrimary
3636
ldr r0, [r0]
3737
adds r3, r0, #2
3838
b _08004F80
3939
.align 2, 0
4040
_08004F40: .4byte gFlags
4141
_08004F44: .4byte gHBlankCopySize
42-
_08004F48: .4byte gBgOffsetsHBlank
42+
_08004F48: .4byte gBgOffsetsHBlankPrimary
4343
_08004F4C:
44-
ldr r0, _08004F54 @ =gBgOffsetsHBlank
44+
ldr r0, _08004F54 @ =gBgOffsetsHBlankPrimary
4545
ldr r3, [r0]
4646
b _08004F80
4747
.align 2, 0
48-
_08004F54: .4byte gBgOffsetsHBlank
48+
_08004F54: .4byte gBgOffsetsHBlankPrimary
4949
_08004F58:
5050
ldr r1, _08004F70 @ =gHBlankCopySize
5151
movs r0, #2
5252
strb r0, [r1]
53-
ldr r0, _08004F74 @ =gBgOffsetsHBlank
53+
ldr r0, _08004F74 @ =gBgOffsetsHBlankPrimary
5454
ldr r3, [r0]
5555
movs r0, #1
5656
ands r0, r6
@@ -61,7 +61,7 @@ _08004F58:
6161
b _08004F84
6262
.align 2, 0
6363
_08004F70: .4byte gHBlankCopySize
64-
_08004F74: .4byte gBgOffsetsHBlank
64+
_08004F74: .4byte gBgOffsetsHBlankPrimary
6565
_08004F78: .4byte gHBlankCopyTarget
6666
_08004F7C: .4byte 0x04000042
6767
_08004F80:

‎asm/non_matching/engine/sa2__unused_sub_800672C.inc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@
2222
ands r0, r2
2323
cmp r0, #0
2424
beq _080056B4
25-
ldr r0, _080056B0 @ =gBgOffsetsHBlank
25+
ldr r0, _080056B0 @ =gBgOffsetsHBlankPrimary
2626
ldr r0, [r0]
2727
adds r7, r0, #2
2828
b _080056E8
2929
.align 2, 0
3030
_080056A8: .4byte gFlags
3131
_080056AC: .4byte gHBlankCopySize
32-
_080056B0: .4byte gBgOffsetsHBlank
32+
_080056B0: .4byte gBgOffsetsHBlankPrimary
3333
_080056B4:
34-
ldr r0, _080056BC @ =gBgOffsetsHBlank
34+
ldr r0, _080056BC @ =gBgOffsetsHBlankPrimary
3535
ldr r7, [r0]
3636
b _080056E8
3737
.align 2, 0
38-
_080056BC: .4byte gBgOffsetsHBlank
38+
_080056BC: .4byte gBgOffsetsHBlankPrimary
3939
_080056C0:
4040
ldr r1, _080056D8 @ =gHBlankCopySize
4141
movs r0, #2
4242
strb r0, [r1]
43-
ldr r0, _080056DC @ =gBgOffsetsHBlank
43+
ldr r0, _080056DC @ =gBgOffsetsHBlankPrimary
4444
ldr r7, [r0]
4545
movs r0, #1
4646
ands r0, r2
@@ -51,7 +51,7 @@ _080056C0:
5151
b _080056EC
5252
.align 2, 0
5353
_080056D8: .4byte gHBlankCopySize
54-
_080056DC: .4byte gBgOffsetsHBlank
54+
_080056DC: .4byte gBgOffsetsHBlankPrimary
5555
_080056E0: .4byte gHBlankCopyTarget
5656
_080056E4: .4byte 0x04000042
5757
_080056E8:

‎asm/non_matching/game/char_select__CreateCharacterSelectionScreen.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ _08059C5C:
852852
bl UpdateSpriteAnimation
853853
ldr r0, _08059F94 @ =sa2__gUnknown_03004D80
854854
strb r4, [r0, #1]
855-
ldr r0, _08059F98 @ =sa2__gUnknown_03002280
855+
ldr r0, _08059F98 @ =gBgSprites_Unknown2
856856
strb r4, [r0, #4]
857857
strb r4, [r0, #5]
858858
movs r1, #1
@@ -907,6 +907,6 @@ _08059F88: .4byte 0x030000B2
907907
_08059F8C: .4byte 0x000002DA
908908
_08059F90: .4byte 0x030000B0
909909
_08059F94: .4byte sa2__gUnknown_03004D80
910-
_08059F98: .4byte sa2__gUnknown_03002280
910+
_08059F98: .4byte gBgSprites_Unknown2
911911

912912
.syntax divided

‎asm/non_matching/game/course_select__Task_CourseSelectInit.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ _08061F64:
185185
str r0, [r1]
186186
ldr r0, _0806211C @ =gHBlankCopySize
187187
strb r2, [r0]
188-
ldr r0, _08062120 @ =gBgOffsetsHBlank
188+
ldr r0, _08062120 @ =gBgOffsetsHBlankPrimary
189189
ldr r1, [r0]
190190
movs r2, #0
191191
movs r4, #0
@@ -336,7 +336,7 @@ _08062110: .4byte gFlags
336336
_08062114: .4byte gHBlankCopyTarget
337337
_08062118: .4byte 0x04000010
338338
_0806211C: .4byte gHBlankCopySize
339-
_08062120: .4byte gBgOffsetsHBlank
339+
_08062120: .4byte gBgOffsetsHBlankPrimary
340340
_08062124: .4byte 0x000001FF
341341
_08062128: .4byte gPressedKeys
342342
_0806212C: .4byte gBgScrollRegs

‎asm/non_matching/game/game2_1__sub_805D048.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ _0805D186:
509509
str r6, [r0, #0x20]
510510
ldr r3, _0805D4E8 @ =sa2__gUnknown_03004D80
511511
strb r4, [r3]
512-
ldr r0, _0805D4EC @ =sa2__gUnknown_03002280
512+
ldr r0, _0805D4EC @ =gBgSprites_Unknown2
513513
strb r4, [r0]
514514
strb r4, [r0, #1]
515515
movs r1, #0xff
@@ -558,6 +558,6 @@ _0805D4DC: .4byte sub_805E018
558558
_0805D4E0: .4byte sub_805D4F0
559559
_0805D4E4: .4byte TaskDestructor_805E1E4
560560
_0805D4E8: .4byte sa2__gUnknown_03004D80
561-
_0805D4EC: .4byte sa2__gUnknown_03002280
561+
_0805D4EC: .4byte gBgSprites_Unknown2
562562

563563
.syntax divided

‎asm/non_matching/game/multiplayer/mode_select__Task_800F058.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ _0800F12C:
122122
bl m4aSongNumStart
123123
ldr r0, _0800F180 @ =sa2__gUnknown_03004D80
124124
strb r4, [r0]
125-
ldr r1, _0800F184 @ =sa2__gUnknown_03002280
125+
ldr r1, _0800F184 @ =gBgSprites_Unknown2
126126
strb r4, [r1]
127127
strb r4, [r1, #1]
128128
movs r0, #0xff
@@ -140,7 +140,7 @@ _0800F174: .4byte gPressedKeys
140140
_0800F178: .4byte gMultiSioEnabled
141141
_0800F17C: .4byte gMultiSioSend
142142
_0800F180: .4byte sa2__gUnknown_03004D80
143-
_0800F184: .4byte sa2__gUnknown_03002280
143+
_0800F184: .4byte gBgSprites_Unknown2
144144
_0800F188: .4byte gCurTask
145145
_0800F18C:
146146
ldr r0, _0800F1C0 @ =0x00000219

‎asm/non_matching/game/multiplayer/results_2__CreateMultiplayerSinglePakResultsScreen.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
ldr r2, _0801AA4C @ =sa2__gUnknown_03004D80
7070
movs r0, #0x7f
7171
strb r0, [r2, #2]
72-
ldr r0, _0801AA50 @ =sa2__gUnknown_03002280
72+
ldr r0, _0801AA50 @ =gBgSprites_Unknown2
7373
strb r6, [r0, #8]
7474
strb r6, [r0, #9]
7575
movs r1, #0xff
@@ -332,7 +332,7 @@ _0801AA40: .4byte gBgCntRegs
332332
_0801AA44: .4byte 0x00005E0B
333333
_0801AA48: .4byte 0x00001C0C
334334
_0801AA4C: .4byte sa2__gUnknown_03004D80
335-
_0801AA50: .4byte sa2__gUnknown_03002280
335+
_0801AA50: .4byte gBgSprites_Unknown2
336336
_0801AA54: .4byte 0x040000D4
337337
_0801AA58: .4byte 0x06009FE0
338338
_0801AA5C: .4byte 0x85000010

‎asm/non_matching/game/multiplayer/results_b__Task_80196FC.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ _08019952:
313313
movs r3, #0x74
314314
bl sa2__sub_80064A8
315315
ldr r2, _08019AC0 @ =0x040000D4
316-
ldr r0, _08019AC4 @ =gBgOffsetsHBlank
316+
ldr r0, _08019AC4 @ =gBgOffsetsHBlankPrimary
317317
ldr r4, [r0]
318318
ldr r0, _08019AC8 @ =gHBlankCopySize
319319
ldrb r3, [r0]
@@ -481,7 +481,7 @@ _08019AAA:
481481
b _08019B42
482482
.align 2, 0
483483
_08019AC0: .4byte 0x040000D4
484-
_08019AC4: .4byte gBgOffsetsHBlank
484+
_08019AC4: .4byte gBgOffsetsHBlankPrimary
485485
_08019AC8: .4byte gHBlankCopySize
486486
_08019ACC: .4byte 0x000003FF
487487
_08019AD0: .4byte 0x00000236

0 commit comments

Comments
 (0)