Consolidate gDecompressionBuffer
This commit is contained in:
+2
-2
@@ -2093,13 +2093,13 @@ _08010EE4:
|
|||||||
bl bitmask_all_link_players_but_self
|
bl bitmask_all_link_players_but_self
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r0, 24
|
lsrs r0, 24
|
||||||
ldr r1, _08010EF8 @ =gUnknown_201C0C8
|
ldr r1, _08010EF8 @ =gDecompressionBuffer + 0x0C8
|
||||||
movs r2, 0x64
|
movs r2, 0x64
|
||||||
bl SendBlock
|
bl SendBlock
|
||||||
ldr r1, _08010EFC @ =gUnknown_2023E82
|
ldr r1, _08010EFC @ =gUnknown_2023E82
|
||||||
b _080110EA
|
b _080110EA
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_08010EF8: .4byte gUnknown_201C0C8
|
_08010EF8: .4byte gDecompressionBuffer + 0x0C8
|
||||||
_08010EFC: .4byte gUnknown_2023E82
|
_08010EFC: .4byte gUnknown_2023E82
|
||||||
_08010F00:
|
_08010F00:
|
||||||
bl GetBlockReceivedStatus
|
bl GetBlockReceivedStatus
|
||||||
|
|||||||
+14
-14
@@ -145,7 +145,7 @@ _0813B994:
|
|||||||
movs r3, 0
|
movs r3, 0
|
||||||
bl RequestDma3Copy
|
bl RequestDma3Copy
|
||||||
ldr r0, _0813B9CC @ =gUnknown_8464008
|
ldr r0, _0813B9CC @ =gUnknown_8464008
|
||||||
ldr r1, _0813B9D0 @ =gUnknown_201FEE0
|
ldr r1, _0813B9D0 @ =gDecompressionBuffer + 0x3EE0
|
||||||
movs r2, 0x90
|
movs r2, 0x90
|
||||||
lsls r2, 1
|
lsls r2, 1
|
||||||
movs r3, 0
|
movs r3, 0
|
||||||
@@ -157,7 +157,7 @@ _0813B994:
|
|||||||
_0813B9C4: .4byte 0x0600c000
|
_0813B9C4: .4byte 0x0600c000
|
||||||
_0813B9C8: .4byte gUnknown_8464128
|
_0813B9C8: .4byte gUnknown_8464128
|
||||||
_0813B9CC: .4byte gUnknown_8464008
|
_0813B9CC: .4byte gUnknown_8464008
|
||||||
_0813B9D0: .4byte gUnknown_201FEE0
|
_0813B9D0: .4byte gDecompressionBuffer + 0x3EE0
|
||||||
_0813B9D4: .4byte gUnknown_203F178
|
_0813B9D4: .4byte gUnknown_203F178
|
||||||
_0813B9D8:
|
_0813B9D8:
|
||||||
bl sub_813BCF4
|
bl sub_813BCF4
|
||||||
@@ -503,7 +503,7 @@ sub_813BC78: @ 813BC78
|
|||||||
cmp r0, r2
|
cmp r0, r2
|
||||||
bge _0813BCDE
|
bge _0813BCDE
|
||||||
mov r12, r2
|
mov r12, r2
|
||||||
ldr r1, _0813BCF0 @ =gUnknown_201F800
|
ldr r1, _0813BCF0 @ =gDecompressionBuffer + 0x3800
|
||||||
mov r10, r1
|
mov r10, r1
|
||||||
_0813BCAE:
|
_0813BCAE:
|
||||||
mov r4, r9
|
mov r4, r9
|
||||||
@@ -542,7 +542,7 @@ _0813BCDE:
|
|||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_0813BCF0: .4byte gUnknown_201F800
|
_0813BCF0: .4byte gDecompressionBuffer + 0x3800
|
||||||
thumb_func_end sub_813BC78
|
thumb_func_end sub_813BC78
|
||||||
|
|
||||||
thumb_func_start sub_813BCF4
|
thumb_func_start sub_813BCF4
|
||||||
@@ -1518,7 +1518,7 @@ sub_813C454: @ 813C454
|
|||||||
movs r1, 0xF
|
movs r1, 0xF
|
||||||
movs r2, 0x2
|
movs r2, 0x2
|
||||||
bl GenerateFontHalfRowLookupTable
|
bl GenerateFontHalfRowLookupTable
|
||||||
ldr r1, _0813C484 @ =gUnknown_201FD00
|
ldr r1, _0813C484 @ =gDecompressionBuffer + 0x3D00
|
||||||
movs r2, 0x2
|
movs r2, 0x2
|
||||||
str r2, [sp]
|
str r2, [sp]
|
||||||
movs r0, 0x7
|
movs r0, 0x7
|
||||||
@@ -1533,7 +1533,7 @@ sub_813C454: @ 813C454
|
|||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_0813C484: .4byte gUnknown_201FD00
|
_0813C484: .4byte gDecompressionBuffer + 0x3D00
|
||||||
thumb_func_end sub_813C454
|
thumb_func_end sub_813C454
|
||||||
|
|
||||||
thumb_func_start sub_813C488
|
thumb_func_start sub_813C488
|
||||||
@@ -1551,7 +1551,7 @@ sub_813C488: @ 813C488
|
|||||||
movs r1, 0xF
|
movs r1, 0xF
|
||||||
movs r2, 0x2
|
movs r2, 0x2
|
||||||
bl GenerateFontHalfRowLookupTable
|
bl GenerateFontHalfRowLookupTable
|
||||||
ldr r1, _0813C4C8 @ =gUnknown_201F400
|
ldr r1, _0813C4C8 @ =gDecompressionBuffer + 0x3400
|
||||||
lsls r4, 24
|
lsls r4, 24
|
||||||
lsrs r4, 24
|
lsrs r4, 24
|
||||||
movs r2, 0x2
|
movs r2, 0x2
|
||||||
@@ -1568,7 +1568,7 @@ sub_813C488: @ 813C488
|
|||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_0813C4C8: .4byte gUnknown_201F400
|
_0813C4C8: .4byte gDecompressionBuffer + 0x3400
|
||||||
thumb_func_end sub_813C488
|
thumb_func_end sub_813C488
|
||||||
|
|
||||||
thumb_func_start sub_813C4CC
|
thumb_func_start sub_813C4CC
|
||||||
@@ -1671,7 +1671,7 @@ sub_813C584: @ 813C584
|
|||||||
ldr r2, _0813C5C8 @ =0x00001111
|
ldr r2, _0813C5C8 @ =0x00001111
|
||||||
adds r0, r2, 0
|
adds r0, r2, 0
|
||||||
strh r0, [r1]
|
strh r0, [r1]
|
||||||
ldr r4, _0813C5CC @ =gUnknown_201E3C0
|
ldr r4, _0813C5CC @ =gDecompressionBuffer + 0x23C0
|
||||||
ldr r2, _0813C5D0 @ =0x01000820
|
ldr r2, _0813C5D0 @ =0x01000820
|
||||||
adds r0, r1, 0
|
adds r0, r1, 0
|
||||||
adds r1, r4, 0
|
adds r1, r4, 0
|
||||||
@@ -1697,7 +1697,7 @@ sub_813C584: @ 813C584
|
|||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_0813C5C8: .4byte 0x00001111
|
_0813C5C8: .4byte 0x00001111
|
||||||
_0813C5CC: .4byte gUnknown_201E3C0
|
_0813C5CC: .4byte gDecompressionBuffer + 0x23C0
|
||||||
_0813C5D0: .4byte 0x01000820
|
_0813C5D0: .4byte 0x01000820
|
||||||
thumb_func_end sub_813C584
|
thumb_func_end sub_813C584
|
||||||
|
|
||||||
@@ -1709,7 +1709,7 @@ sub_813C5D4: @ 813C5D4
|
|||||||
ldr r2, _0813C5F0 @ =0x0000ffff
|
ldr r2, _0813C5F0 @ =0x0000ffff
|
||||||
adds r0, r2, 0
|
adds r0, r2, 0
|
||||||
strh r0, [r1]
|
strh r0, [r1]
|
||||||
ldr r1, _0813C5F4 @ =gUnknown_201FD00
|
ldr r1, _0813C5F4 @ =gDecompressionBuffer + 0x3D00
|
||||||
ldr r2, _0813C5F8 @ =0x010000e0
|
ldr r2, _0813C5F8 @ =0x010000e0
|
||||||
mov r0, sp
|
mov r0, sp
|
||||||
bl CpuSet
|
bl CpuSet
|
||||||
@@ -1718,7 +1718,7 @@ sub_813C5D4: @ 813C5D4
|
|||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_0813C5F0: .4byte 0x0000ffff
|
_0813C5F0: .4byte 0x0000ffff
|
||||||
_0813C5F4: .4byte gUnknown_201FD00
|
_0813C5F4: .4byte gDecompressionBuffer + 0x3D00
|
||||||
_0813C5F8: .4byte 0x010000e0
|
_0813C5F8: .4byte 0x010000e0
|
||||||
thumb_func_end sub_813C5D4
|
thumb_func_end sub_813C5D4
|
||||||
|
|
||||||
@@ -1730,7 +1730,7 @@ sub_813C5FC: @ 813C5FC
|
|||||||
ldr r2, _0813C618 @ =0x0000ffff
|
ldr r2, _0813C618 @ =0x0000ffff
|
||||||
adds r0, r2, 0
|
adds r0, r2, 0
|
||||||
strh r0, [r1]
|
strh r0, [r1]
|
||||||
ldr r1, _0813C61C @ =gUnknown_201F400
|
ldr r1, _0813C61C @ =gDecompressionBuffer + 0x3400
|
||||||
ldr r2, _0813C620 @ =0x01000200
|
ldr r2, _0813C620 @ =0x01000200
|
||||||
mov r0, sp
|
mov r0, sp
|
||||||
bl CpuSet
|
bl CpuSet
|
||||||
@@ -1739,7 +1739,7 @@ sub_813C5FC: @ 813C5FC
|
|||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_0813C618: .4byte 0x0000ffff
|
_0813C618: .4byte 0x0000ffff
|
||||||
_0813C61C: .4byte gUnknown_201F400
|
_0813C61C: .4byte gDecompressionBuffer + 0x3400
|
||||||
_0813C620: .4byte 0x01000200
|
_0813C620: .4byte 0x01000200
|
||||||
thumb_func_end sub_813C5FC
|
thumb_func_end sub_813C5FC
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -5404,7 +5404,7 @@ _081186AC: .4byte gStringVar4
|
|||||||
thumb_func_start sub_81186B0
|
thumb_func_start sub_81186B0
|
||||||
sub_81186B0: @ 81186B0
|
sub_81186B0: @ 81186B0
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r3, _081186C4 @ =gUnknown_201FF00
|
ldr r3, _081186C4 @ =gDecompressionBuffer + 0x3F00
|
||||||
ldr r1, [r0]
|
ldr r1, [r0]
|
||||||
movs r2, 0x80
|
movs r2, 0x80
|
||||||
lsls r2, 1
|
lsls r2, 1
|
||||||
@@ -5413,21 +5413,21 @@ sub_81186B0: @ 81186B0
|
|||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_081186C4: .4byte gUnknown_201FF00
|
_081186C4: .4byte gDecompressionBuffer + 0x3F00
|
||||||
thumb_func_end sub_81186B0
|
thumb_func_end sub_81186B0
|
||||||
|
|
||||||
thumb_func_start sub_81186C8
|
thumb_func_start sub_81186C8
|
||||||
sub_81186C8: @ 81186C8
|
sub_81186C8: @ 81186C8
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, [r0]
|
ldr r0, [r0]
|
||||||
ldr r1, _081186DC @ =gUnknown_201FF00
|
ldr r1, _081186DC @ =gDecompressionBuffer + 0x3F00
|
||||||
movs r2, 0x80
|
movs r2, 0x80
|
||||||
lsls r2, 1
|
lsls r2, 1
|
||||||
bl memcpy
|
bl memcpy
|
||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_081186DC: .4byte gUnknown_201FF00
|
_081186DC: .4byte gDecompressionBuffer + 0x3F00
|
||||||
thumb_func_end sub_81186C8
|
thumb_func_end sub_81186C8
|
||||||
|
|
||||||
thumb_func_start sub_81186E0
|
thumb_func_start sub_81186E0
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ _080F5314: .4byte 0x05000200
|
|||||||
thumb_func_start sub_80F5318
|
thumb_func_start sub_80F5318
|
||||||
sub_80F5318: @ 80F5318
|
sub_80F5318: @ 80F5318
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, _080F532C @ =gUnknown_201F800
|
ldr r0, _080F532C @ =gDecompressionBuffer + 0x3800
|
||||||
ldr r1, _080F5330 @ =0x0600f800
|
ldr r1, _080F5330 @ =0x0600f800
|
||||||
movs r2, 0xA0
|
movs r2, 0xA0
|
||||||
lsls r2, 3
|
lsls r2, 3
|
||||||
@@ -268,14 +268,14 @@ sub_80F5318: @ 80F5318
|
|||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_080F532C: .4byte gUnknown_201F800
|
_080F532C: .4byte gDecompressionBuffer + 0x3800
|
||||||
_080F5330: .4byte 0x0600f800
|
_080F5330: .4byte 0x0600f800
|
||||||
thumb_func_end sub_80F5318
|
thumb_func_end sub_80F5318
|
||||||
|
|
||||||
thumb_func_start sub_80F5334
|
thumb_func_start sub_80F5334
|
||||||
sub_80F5334: @ 80F5334
|
sub_80F5334: @ 80F5334
|
||||||
push {lr}
|
push {lr}
|
||||||
ldr r0, _080F5348 @ =gUnknown_201C020
|
ldr r0, _080F5348 @ =gDecompressionBuffer + 0x020
|
||||||
ldr r1, _080F534C @ =0x0600c020
|
ldr r1, _080F534C @ =0x0600c020
|
||||||
movs r2, 0x8C
|
movs r2, 0x8C
|
||||||
lsls r2, 6
|
lsls r2, 6
|
||||||
@@ -284,7 +284,7 @@ sub_80F5334: @ 80F5334
|
|||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_080F5348: .4byte gUnknown_201C020
|
_080F5348: .4byte gDecompressionBuffer + 0x020
|
||||||
_080F534C: .4byte 0x0600c020
|
_080F534C: .4byte 0x0600c020
|
||||||
thumb_func_end sub_80F5334
|
thumb_func_end sub_80F5334
|
||||||
|
|
||||||
@@ -315,7 +315,7 @@ sub_80F5350: @ 80F5350
|
|||||||
cmp r0, r2
|
cmp r0, r2
|
||||||
bge _080F53B6
|
bge _080F53B6
|
||||||
mov r12, r2
|
mov r12, r2
|
||||||
ldr r1, _080F53C8 @ =gUnknown_201F800
|
ldr r1, _080F53C8 @ =gDecompressionBuffer + 0x3800
|
||||||
mov r10, r1
|
mov r10, r1
|
||||||
_080F5386:
|
_080F5386:
|
||||||
mov r4, r9
|
mov r4, r9
|
||||||
@@ -354,7 +354,7 @@ _080F53B6:
|
|||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_080F53C8: .4byte gUnknown_201F800
|
_080F53C8: .4byte gDecompressionBuffer + 0x3800
|
||||||
thumb_func_end sub_80F5350
|
thumb_func_end sub_80F5350
|
||||||
|
|
||||||
thumb_func_start sub_80F53CC
|
thumb_func_start sub_80F53CC
|
||||||
@@ -404,7 +404,7 @@ sub_80F5404: @ 80F5404
|
|||||||
ldr r2, _080F544C @ =0x00001111
|
ldr r2, _080F544C @ =0x00001111
|
||||||
adds r0, r2, 0
|
adds r0, r2, 0
|
||||||
strh r0, [r1]
|
strh r0, [r1]
|
||||||
ldr r4, _080F5450 @ =gUnknown_201C020
|
ldr r4, _080F5450 @ =gDecompressionBuffer + 0x020
|
||||||
ldr r2, _080F5454 @ =0x01001180
|
ldr r2, _080F5454 @ =0x01001180
|
||||||
adds r0, r1, 0
|
adds r0, r1, 0
|
||||||
adds r1, r4, 0
|
adds r1, r4, 0
|
||||||
@@ -427,7 +427,7 @@ sub_80F5404: @ 80F5404
|
|||||||
bx r0
|
bx r0
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
_080F544C: .4byte 0x00001111
|
_080F544C: .4byte 0x00001111
|
||||||
_080F5450: .4byte gUnknown_201C020
|
_080F5450: .4byte gDecompressionBuffer + 0x020
|
||||||
_080F5454: .4byte 0x01001180
|
_080F5454: .4byte 0x01001180
|
||||||
thumb_func_end sub_80F5404
|
thumb_func_end sub_80F5404
|
||||||
|
|
||||||
|
|||||||
+1
-25
@@ -1,29 +1,5 @@
|
|||||||
gDecompressionBuffer: @ 201C000
|
gDecompressionBuffer: @ 201C000
|
||||||
.space 0x20
|
.space 0x4000
|
||||||
|
|
||||||
gUnknown_201C020: @ 201C020
|
|
||||||
.space 0xA8
|
|
||||||
|
|
||||||
gUnknown_201C0C8: @ 201C0C8
|
|
||||||
.space 0x22F8
|
|
||||||
|
|
||||||
gUnknown_201E3C0: @ 201E3C0
|
|
||||||
.space 0x1040
|
|
||||||
|
|
||||||
gUnknown_201F400: @ 201F400
|
|
||||||
.space 0x400
|
|
||||||
|
|
||||||
gUnknown_201F800: @ 201F800
|
|
||||||
.space 0x500
|
|
||||||
|
|
||||||
gUnknown_201FD00: @ 201FD00
|
|
||||||
.space 0x1E0
|
|
||||||
|
|
||||||
gUnknown_201FEE0: @ 201FEE0
|
|
||||||
.space 0x20
|
|
||||||
|
|
||||||
gUnknown_201FF00: @ 201FF00
|
|
||||||
.space 0x100
|
|
||||||
|
|
||||||
gTrainerId: @ 2020000
|
gTrainerId: @ 2020000
|
||||||
.space 0x4
|
.space 0x4
|
||||||
|
|||||||
Reference in New Issue
Block a user