Skip to content

Commit 02faa34

Browse files
authored
name a bunch of globals, functions, general fixes (#227)
- Name some BG Sprite globals - Create some macros for setting up the BG Sprite globals - Name `gMultiplayerRanks` - Name `gOamMallocBuffer` - Name `gBgOffsetsHBlank` globals - Name `gSpriteOffset` - Name `ProcessOamBuffers` function - Move `gRefCollision` to `collision.c` - Name `Player_HandleMultiplayerFinish` and refactor - Name `gWorldSpeed` - Name `gSpikesUnknownTimer`
1 parent 44eaa7f commit 02faa34

File tree

89 files changed

+698
-890
lines changed

Some content is hidden

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

89 files changed

+698
-890
lines changed

asm/non_matching/engine/sub_8004010.inc

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@
1515
sub_8004010_loop:
1616
mov r2, r8 @ r8 = bg
1717
lsls r0, r2, #2 @ r0 = bg*4
18-
ldr r1, _080040DC @ =gUnknown_03002280
18+
ldr r1, _080040DC @ =gBgSprites_Unknown2
1919
adds r1, #1
20-
adds r4, r0, r1 @ r4 = gUnknown_03002280[bg][1]
21-
ldr r6, _080040E0 @ =gUnknown_03002280 + 3
22-
adds r6, r0, r6 @ r6 = &gUnknown_03002280[bg][3]
23-
str r6, [sp, #0xc] @ sp0C = r6 = &gUnknown_03002280[bg][3]
24-
ldrb r1, [r4] @ r1 = *r4 = gUnknown_03002280[bg][1]
25-
ldrb r2, [r6] @ r2 = *r6 = gUnknown_03002280[bg][3]
26-
mov ip, r2 @ ip = r2 = gUnknown_03002280[bg][3]
20+
adds r4, r0, r1 @ r4 = gBgSprites_Unknown2[bg][1]
21+
ldr r6, _080040E0 @ =gBgSprites_Unknown2 + 3
22+
adds r6, r0, r6 @ r6 = &gBgSprites_Unknown2[bg][3]
23+
str r6, [sp, #0xc] @ sp0C = r6 = &gBgSprites_Unknown2[bg][3]
24+
ldrb r1, [r4] @ r1 = *r4 = gBgSprites_Unknown2[bg][1]
25+
ldrb r2, [r6] @ r2 = *r6 = gBgSprites_Unknown2[bg][3]
26+
mov ip, r2 @ ip = r2 = gBgSprites_Unknown2[bg][3]
2727
mov sl, r0 @ sl = bg*4
2828
__0800403C:
2929
cmp r1, ip
3030
bne _08004056
31-
ldr r0, _080040DC @ =gUnknown_03002280 + 0
31+
ldr r0, _080040DC @ =gBgSprites_Unknown2 + 0
3232
add r0, sl
33-
ldr r1, _080040E4 @ =gUnknown_03002280 + 2
34-
add r1, sl @ r1 = gUnknown_03002280[bg][2]
35-
ldrb r0, [r0] @ r0 = gUnknown_03002280[bg][0]
33+
ldr r1, _080040E4 @ =gBgSprites_Unknown2 + 2
34+
add r1, sl @ r1 = gBgSprites_Unknown2[bg][2]
35+
ldrb r0, [r0] @ r0 = gBgSprites_Unknown2[bg][0]
3636
mov r7, r8
3737
adds r7, #1 @ r7 = bg+1
3838
ldrb r1, [r1]
@@ -53,10 +53,10 @@ _08004056:
5353
ands r0, r6 @ bgCtrl & 0x1F00
5454
lsls r0, r0, #3
5555
adds r5, r0, r1 @ r5 = vramBase
56-
ldrb r4, [r4] @ r4 = gUnknown_03002280[bg][1]
57-
ldr r0, _080040DC @ =gUnknown_03002280
58-
add r0, sl @ r0 = &gUnknown_03002280[bg][0]
59-
ldrb r0, [r0] @ r0 = gUnknown_03002280[bg][0]
56+
ldrb r4, [r4] @ r4 = gBgSprites_Unknown2[bg][1]
57+
ldr r0, _080040DC @ =gBgSprites_Unknown2
58+
add r0, sl @ r0 = &gBgSprites_Unknown2[bg][0]
59+
ldrb r0, [r0] @ r0 = gBgSprites_Unknown2[bg][0]
6060
str r0, [sp, #8]
6161
adds r7, r2, #0 @ r7 = gBgCntRegs
6262
adds r2, r3, #0 @ r2 = r3 = bg * 2
@@ -79,26 +79,26 @@ __0800408E:
7979
lsls r0, r0, #0xd
8080
lsls r0, r2
8181
lsrs r3, r0, #0x10 @ r3 = affineSize = (16 << (gBgCntRegs[bg] >> 14))
82-
mov r2, ip @ r2 = ip = gUnknown_03002280[bg][3]
82+
mov r2, ip @ r2 = ip = gBgSprites_Unknown2[bg][3]
8383
__0800409E:
8484
cmp r2, #0xff
8585
bne _080040F8
8686
__080040A2:
87-
ldr r0, _080040F0 @ =gUnknown_03004D80
88-
add r0, r8 @ r0 = &gUnknown_03004D80[bg]
89-
ldrb r1, [r0] @ r1 = gUnknown_03004D80[bg]
87+
ldr r0, _080040F0 @ =gBgSprites_Unknown1
88+
add r0, r8 @ r0 = &gBgSprites_Unknown1[bg]
89+
ldrb r1, [r0] @ r1 = gBgSprites_Unknown1[bg]
9090
lsls r0, r1, #8 @ combine(v) : ((v) << 8 | (v))
91-
orrs r1, r0 @ r1 = cb = combine(gUnknown_03004D80[bg])
92-
adds r0, r4, #0 @ r0 = r4 = gUnknown_03002280[bg][1]
93-
muls r0, r3, r0 @ r0 = affineSize * gUnknown_03002280[bg][1]
94-
adds r0, r5, r0 @ r0 = vramBase + (affineSize * gUnknown_03002280[bg][1])
91+
orrs r1, r0 @ r1 = cb = combine(gBgSprites_Unknown1[bg])
92+
adds r0, r4, #0 @ r0 = r4 = gBgSprites_Unknown2[bg][1]
93+
muls r0, r3, r0 @ r0 = affineSize * gBgSprites_Unknown2[bg][1]
94+
adds r0, r5, r0 @ r0 = vramBase + (affineSize * gBgSprites_Unknown2[bg][1])
9595
ldr r6, [sp, #0x10] @ --- DMA Start ---
9696
strh r1, [r6] @ *sp10 = cb
9797
mov r1, sp
9898
ldr r2, _080040F4 @ =0x040000D4
9999
str r1, [r2] @ DMASrc = sp00 (fill: cb)
100100
str r0, [r2, #4] @ vramBase
101-
ldr r6, [sp, #0xc] @ sp0C = &gUnknown_03002280[bg][3]
101+
ldr r6, [sp, #0xc] @ sp0C = &gBgSprites_Unknown2[bg][3]
102102
ldrb r0, [r6]
103103
subs r0, r0, r4
104104
muls r0, r3, r0
@@ -114,12 +114,12 @@ __080040A2:
114114
mov sb, r2 @ sb = 2nd dmaTarget
115115
b _080041C0
116116
.align 2, 0
117-
_080040DC: .4byte gUnknown_03002280
118-
_080040E0: .4byte gUnknown_03002280 + 3
119-
_080040E4: .4byte gUnknown_03002280 + 2
117+
_080040DC: .4byte gBgSprites_Unknown2
118+
_080040E0: .4byte gBgSprites_Unknown2 + 3
119+
_080040E4: .4byte gBgSprites_Unknown2 + 2
120120
_080040E8: .4byte gBgCntRegs
121121
_080040EC: .4byte gDispCnt
122-
_080040F0: .4byte gUnknown_03004D80
122+
_080040F0: .4byte gBgSprites_Unknown1
123123
_080040F4: .4byte 0x040000D4
124124
_080040F8:
125125
add r6, sp, #4
@@ -131,20 +131,20 @@ __08004100:
131131
bls _08004106
132132
b _0800422C
133133
_08004106:
134-
ldr r0, _0800415C @ =gUnknown_03004D80
134+
ldr r0, _0800415C @ =gBgSprites_Unknown1
135135
add r0, r8
136-
mov ip, r0 @ ip = &gUnknown_03004D80[bg]
136+
mov ip, r0 @ ip = &gBgSprites_Unknown1[bg]
137137
ldr r2, _08004160 @ =0x040000D4
138-
ldr r1, _08004164 @ =gUnknown_03002280 + 2
138+
ldr r1, _08004164 @ =gBgSprites_Unknown2 + 2
139139
add r1, sl
140-
mov r8, r1 @ r8 = &gUnknown_03002280[bg][2]
140+
mov r8, r1 @ r8 = &gBgSprites_Unknown2[bg][2]
141141
ldr r6, [sp, #0xc]
142142
str r6, [sp, #0x14]
143143
_08004118_loop:
144-
mov r0, ip @ r0 = ip = &gUnknown_03004D80[bg]
144+
mov r0, ip @ r0 = ip = &gBgSprites_Unknown1[bg]
145145
ldrb r1, [r0]
146146
lsls r0, r1, #8
147-
orrs r1, r0 @ r1 = cb = combine(gUnknown_03004D80[bg])
147+
orrs r1, r0 @ r1 = cb = combine(gBgSprites_Unknown1[bg])
148148
adds r0, r4, #0
149149
muls r0, r3, r0 @ r0 *= affineSize
150150
adds r0, r5, r0
@@ -153,10 +153,10 @@ _08004118_loop:
153153
mov r1, sp
154154
str r1, [r2]
155155
str r0, [r2, #4]
156-
mov r6, r8 @ r6 = r8 = &gUnknown_03002280[bg][2]
156+
mov r6, r8 @ r6 = r8 = &gBgSprites_Unknown2[bg][2]
157157
ldrb r0, [r6]
158158
ldr r1, [sp, #8]
159-
subs r0, r0, r1 @ r0 = gUnknown_03002280[bg][2] - gUnknown_03002280[bg][0]
159+
subs r0, r0, r1 @ r0 = gBgSprites_Unknown2[bg][2] - gBgSprites_Unknown2[bg][0]
160160
adds r0, #1
161161
asrs r1, r0, #1
162162
lsrs r0, r0, #0x1f
@@ -176,11 +176,11 @@ _08004118_loop:
176176
bls _08004118_loop
177177
b _0800422C
178178
.align 2, 0
179-
_0800415C: .4byte gUnknown_03004D80
179+
_0800415C: .4byte gBgSprites_Unknown1
180180
_08004160: .4byte 0x040000D4
181-
_08004164: .4byte gUnknown_03002280 + 2
181+
_08004164: .4byte gBgSprites_Unknown2 + 2
182182
_08004168:
183-
ldr r1, [sp, #8] @ r1 = sp08 = gUnknown_03002280[bg][0]
183+
ldr r1, [sp, #8] @ r1 = sp08 = gBgSprites_Unknown2[bg][0]
184184
lsls r0, r1, #1
185185
adds r5, r5, r0 @ r5 = vramBase + (sp08 * 2)
186186
movs r3, #0x20 @ r3 = tileSize = 32
@@ -197,29 +197,29 @@ __0800417C:
197197
bhi _08004182
198198
movs r3, #0x40 @ r3 = tileSize = 64
199199
_08004182:
200-
ldr r1, _080041C8 @ =&gUnknown_03002280[0][2]
201-
add r1, sl @ r1 = &gUnknown_03002280[bg][2]
200+
ldr r1, _080041C8 @ =&gBgSprites_Unknown2[0][2]
201+
add r1, sl @ r1 = &gBgSprites_Unknown2[bg][2]
202202
ldrb r0, [r1]
203203
__08004188:
204204
cmp r0, #0xff
205205
bne _080041D8
206206
__0800418C:
207-
ldr r0, _080041CC @ =gUnknown_03004D80
207+
ldr r0, _080041CC @ =gBgSprites_Unknown1
208208
add r0, r8
209-
ldrb r1, [r0] @ r1 = gUnknown_03004D80[bg]
209+
ldrb r1, [r0] @ r1 = gBgSprites_Unknown1[bg]
210210
lsls r0, r3, #1 @ r3 = tileSize
211-
muls r0, r4, r0 @ r0 = tileSize * gUnknown_03002280[bg][1]
211+
muls r0, r4, r0 @ r0 = tileSize * gBgSprites_Unknown2[bg][1]
212212
adds r0, r5, r0
213213
ldr r2, [sp, #0x10] @ r2 = &sp00[0]
214-
strh r1, [r2] @ sp00[0] = gUnknown_03004D80[bg];
214+
strh r1, [r2] @ sp00[0] = gBgSprites_Unknown1[bg];
215215
mov r6, sp @ r6 = sp
216216
ldr r1, _080041D0 @ =0x040000D4
217217
str r6, [r1]
218218
str r0, [r1, #4]
219-
ldr r0, _080041D4 @ r0 = &gUnknown_03002280[0][3]
220-
add r0, sl @ r0 = &gUnknown_03002280[bg][3]
221-
ldrb r0, [r0] @ r0 = gUnknown_03002280[bg][3]
222-
subs r0, r0, r4 @ r0 = r0 - gUnknown_03002280[bg][1]
219+
ldr r0, _080041D4 @ r0 = &gBgSprites_Unknown2[0][3]
220+
add r0, sl @ r0 = &gBgSprites_Unknown2[bg][3]
221+
ldrb r0, [r0] @ r0 = gBgSprites_Unknown2[bg][3]
222+
subs r0, r0, r4 @ r0 = r0 - gBgSprites_Unknown2[bg][1]
223223
muls r0, r3, r0
224224
lsls r0, r0, #1
225225
asrs r0, r0, #1
@@ -235,42 +235,42 @@ _080041C0:
235235
adds r7, #1
236236
b _0800422C
237237
.align 2, 0
238-
_080041C8: .4byte gUnknown_03002280 + 2
239-
_080041CC: .4byte gUnknown_03004D80
238+
_080041C8: .4byte gBgSprites_Unknown2 + 2
239+
_080041CC: .4byte gBgSprites_Unknown1
240240
_080041D0: .4byte 0x040000D4
241-
_080041D4: .4byte gUnknown_03002280 + 3
241+
_080041D4: .4byte gBgSprites_Unknown2 + 3
242242
_080041D8:
243-
ldr r0, _08004260 @ =gUnknown_03002280 + 3
244-
add r0, sl @ r0 = &gUnknown_03002280[bg][3]
243+
ldr r0, _08004260 @ =gBgSprites_Unknown2 + 3
244+
add r0, sl @ r0 = &gBgSprites_Unknown2[bg][3]
245245
add r2, sp, #4
246246
mov sb, r2 @ sb = dmaTarget
247247
mov r7, r8 @ r7 = bg+1 (done by loop)
248248
adds r7, #1
249-
ldrb r6, [r0] @ r6 = gUnknown_03002280[bg][3]
249+
ldrb r6, [r0] @ r6 = gBgSprites_Unknown2[bg][3]
250250
__080041E6:
251251
cmp r4, r6
252252
bhi _0800422C
253-
ldr r2, _08004264 @ r2 = gUnknown_03004D80
254-
add r8, r2 @ r8 = gUnknown_03004D80[bg]
253+
ldr r2, _08004264 @ r2 = gBgSprites_Unknown1
254+
add r8, r2 @ r8 = gBgSprites_Unknown1[bg]
255255
ldr r2, _08004268 @ =0x040000D4
256-
mov ip, r1 @ ip = r1 = &gUnknown_03002280[bg][2]
256+
mov ip, r1 @ ip = r1 = &gBgSprites_Unknown2[bg][2]
257257
str r0, [sp, #0x14]
258258
lsls r3, r3, #1
259259
_080041F6:
260-
mov r6, r8 @ r6 = &gUnknown_03004D80[bg]
261-
ldrb r1, [r6] @ r1 = gUnknown_03004D80[bg]
262-
adds r0, r4, #0 @ r0 = r4 = gUnknown_03002280[bg][1]
263-
muls r0, r3, r0 @ r0 = tileSize * gUnknown_03002280[bg][1]
260+
mov r6, r8 @ r6 = &gBgSprites_Unknown1[bg]
261+
ldrb r1, [r6] @ r1 = gBgSprites_Unknown1[bg]
262+
adds r0, r4, #0 @ r0 = r4 = gBgSprites_Unknown2[bg][1]
263+
muls r0, r3, r0 @ r0 = tileSize * gBgSprites_Unknown2[bg][1]
264264
adds r0, r5, r0
265265
ldr r6, [sp, #0x10]
266-
strh r1, [r6] @ sp00[0] = gUnknown_03004D80[bg]
266+
strh r1, [r6] @ sp00[0] = gBgSprites_Unknown1[bg]
267267
mov r1, sp
268268
str r1, [r2]
269269
str r0, [r2, #4]
270-
mov r6, ip @ r6 = ip = &gUnknown_03002280[bg][2]
270+
mov r6, ip @ r6 = ip = &gBgSprites_Unknown2[bg][2]
271271
ldrb r0, [r6]
272272
ldr r1, [sp, #8]
273-
subs r0, r0, r1 @ r0 = (gUnknown_03002280[bg][2] - gUnknown_03002280[bg][0])
273+
subs r0, r0, r1 @ r0 = (gBgSprites_Unknown2[bg][2] - gBgSprites_Unknown2[bg][0])
274274
adds r0, #1
275275
movs r6, #0x81
276276
lsls r6, r6, #0x18
@@ -290,8 +290,8 @@ _0800422C:
290290
mov r1, sb @ r1 = sb = &sp04 = dmaTarget
291291
ldr r2, _08004268 @ r2 = 0x040000D4
292292
str r1, [r2]
293-
ldr r0, _0800426C @ =gUnknown_03002280
294-
add r0, sl @ r0 = &gUnknown_03002280[bg][0]
293+
ldr r0, _0800426C @ =gBgSprites_Unknown2
294+
add r0, sl @ r0 = &gBgSprites_Unknown2[bg][0]
295295
str r0, [r2, #4]
296296
ldr r0, _08004270 @ =0x85000001
297297
str r0, [r2, #8]
@@ -314,10 +314,10 @@ sub_8004010_return:
314314
pop {r1}
315315
bx r1
316316
.align 2, 0
317-
_08004260: .4byte gUnknown_03002280 + 3
318-
_08004264: .4byte gUnknown_03004D80
317+
_08004260: .4byte gBgSprites_Unknown2 + 3
318+
_08004264: .4byte gBgSprites_Unknown1
319319
_08004268: .4byte 0x040000D4
320-
_0800426C: .4byte gUnknown_03002280
320+
_0800426C: .4byte gBgSprites_Unknown2
321321
_08004270: .4byte 0x85000001
322322

323323
.syntax divided

asm/non_matching/engine/unused_sub_8005C54.inc

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

asm/non_matching/engine/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 _08006004
35-
ldr r0, _08006000 @ =gBgOffsetsHBlank
35+
ldr r0, _08006000 @ =gBgOffsetsHBlankPrimary
3636
ldr r0, [r0]
3737
adds r3, r0, #2
3838
b _08006038
3939
.align 2, 0
4040
_08005FF8: .4byte gFlags
4141
_08005FFC: .4byte gHBlankCopySize
42-
_08006000: .4byte gBgOffsetsHBlank
42+
_08006000: .4byte gBgOffsetsHBlankPrimary
4343
_08006004:
44-
ldr r0, _0800600C @ =gBgOffsetsHBlank
44+
ldr r0, _0800600C @ =gBgOffsetsHBlankPrimary
4545
ldr r3, [r0]
4646
b _08006038
4747
.align 2, 0
48-
_0800600C: .4byte gBgOffsetsHBlank
48+
_0800600C: .4byte gBgOffsetsHBlankPrimary
4949
_08006010:
5050
ldr r1, _08006028 @ =gHBlankCopySize
5151
movs r0, #2
5252
strb r0, [r1]
53-
ldr r0, _0800602C @ =gBgOffsetsHBlank
53+
ldr r0, _0800602C @ =gBgOffsetsHBlankPrimary
5454
ldr r3, [r0]
5555
movs r0, #1
5656
ands r0, r6
@@ -61,7 +61,7 @@ _08006010:
6161
b _0800603C
6262
.align 2, 0
6363
_08006028: .4byte gHBlankCopySize
64-
_0800602C: .4byte gBgOffsetsHBlank
64+
_0800602C: .4byte gBgOffsetsHBlankPrimary
6565
_08006030: .4byte gHBlankCopyTarget
6666
_08006034: .4byte 0x04000042
6767
_08006038:

asm/non_matching/engine/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 _0800676C
25-
ldr r0, _08006768 @ =gBgOffsetsHBlank
25+
ldr r0, _08006768 @ =gBgOffsetsHBlankPrimary
2626
ldr r0, [r0]
2727
adds r7, r0, #2
2828
b _080067A0
2929
.align 2, 0
3030
_08006760: .4byte gFlags
3131
_08006764: .4byte gHBlankCopySize
32-
_08006768: .4byte gBgOffsetsHBlank
32+
_08006768: .4byte gBgOffsetsHBlankPrimary
3333
_0800676C:
34-
ldr r0, _08006774 @ =gBgOffsetsHBlank
34+
ldr r0, _08006774 @ =gBgOffsetsHBlankPrimary
3535
ldr r7, [r0]
3636
b _080067A0
3737
.align 2, 0
38-
_08006774: .4byte gBgOffsetsHBlank
38+
_08006774: .4byte gBgOffsetsHBlankPrimary
3939
_08006778:
4040
ldr r1, _08006790 @ =gHBlankCopySize
4141
movs r0, #2
4242
strb r0, [r1]
43-
ldr r0, _08006794 @ =gBgOffsetsHBlank
43+
ldr r0, _08006794 @ =gBgOffsetsHBlankPrimary
4444
ldr r7, [r0]
4545
movs r0, #1
4646
ands r0, r2
@@ -51,7 +51,7 @@ _08006778:
5151
b _080067A4
5252
.align 2, 0
5353
_08006790: .4byte gHBlankCopySize
54-
_08006794: .4byte gBgOffsetsHBlank
54+
_08006794: .4byte gBgOffsetsHBlankPrimary
5555
_08006798: .4byte gHBlankCopyTarget
5656
_0800679C: .4byte 0x04000042
5757
_080067A0:

0 commit comments

Comments
 (0)