Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-01 21:07:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split bss.s, 1

Browse Source
This commit is contained in:
PikalaxALT
2020-05-22 14:19:44 -04:00
parent 3f3f956859
commit 933fb65691
18 changed files with 227 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arm9/arm9.lcf
View File

@@ -607,6 +607,22 @@ SECTIONS {
unk_02003B98.o (.bss)
unk_020040F4.o (.bss)
poke_overlay.o (.bss)
unk_02009EAC.o (.bss)
unk_0200E1D0.o (.bss)
unk_02011744.o (.bss)
unk_02012CC8.o (.bss)
unk_02015E30.o (.bss)
unk_02015EA0.o (.bss)
unk_020166C8.o (.bss)
unk_0201B1A8.o (.bss)
math_util.o (.bss)
unk_0201BCBC.o (.bss)
unk_0201C24C.o (.bss)
unk_0201CC08.o (.bss)
unk_0201D040.o (.bss)
unk_0201E00C.o (.bss)
unk_0201E66C.o (.bss)
unk_0201E7D8.o (.bss)
bss.o (.bss)
custom_allocator.o (.bss)
bss_2.o (.bss)

59
arm9/asm/math_util.s
View File

@@ -1,16 +1,21 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_02105BAC
.extern UNK_021C56C8
.extern UNK_021C5348
.section .bss
.global gLCRNG_State
gLCRNG_State: ; 0x021C4D48
.space 4
.global gMTRNG_State
gMTRNG_State: ; 0x021C4D4C
.space 624 * 4
.extern UNK_020EDC7E
.extern UNK_020EDF50
.extern UNK_021C4D4C
.extern UNK_021C4D50
.extern UNK_020FFA38
.extern UNK_02105BA8
.extern UNK_020EDC7E
.extern UNK_021C4D48
.extern UNK_02105BAC
.text
@@ -108,23 +113,23 @@ _0201B9D0: .word UNK_020EDF50
thumb_func_start getseed_LC
getseed_LC: ; 0x0201B9D4
ldr r0, _0201B9DC ; =UNK_021C4D48
ldr r0, _0201B9DC ; =gLCRNG_State
ldr r0, [r0, #0x0]
bx lr
nop
_0201B9DC: .word UNK_021C4D48
_0201B9DC: .word gLCRNG_State
thumb_func_start seedr_LC
seedr_LC: ; 0x0201B9E0
ldr r1, _0201B9E8 ; =UNK_021C4D48
ldr r1, _0201B9E8 ; =gLCRNG_State
str r0, [r1, #0x0]
bx lr
nop
_0201B9E8: .word UNK_021C4D48
_0201B9E8: .word gLCRNG_State
thumb_func_start rand_LC
rand_LC: ; 0x0201B9EC
ldr r1, _0201BA04 ; =UNK_021C4D48
ldr r1, _0201BA04 ; =gLCRNG_State
ldr r0, _0201BA08 ; =0x41C64E6D
ldr r2, [r1, #0x0]
add r3, r2, #0x0
@@ -137,7 +142,7 @@ rand_LC: ; 0x0201B9EC
lsr r0, r0, #0x10
bx lr
.balign 4
_0201BA04: .word UNK_021C4D48
_0201BA04: .word gLCRNG_State
_0201BA08: .word 0x41C64E6D
_0201BA0C: .word 0x00006073
@@ -153,13 +158,13 @@ _0201BA18: .word 0x6C078965
thumb_func_start seedr_MT
seedr_MT: ; 0x0201BA1C
push {r4-r5}
ldr r1, _0201BA50 ; =UNK_021C4D48
ldr r1, _0201BA50 ; =gLCRNG_State
mov r4, #0x27
str r0, [r1, #0x4]
ldr r1, _0201BA54 ; =UNK_02105BA8
mov r0, #0x1
str r0, [r1, #0x0]
ldr r1, _0201BA58 ; =UNK_021C4D50
ldr r1, _0201BA58 ; =gMTRNG_State + 4
ldr r3, _0201BA5C ; =0x6C078965
lsl r4, r4, #0x4
_0201BA30:
@@ -179,9 +184,9 @@ _0201BA30:
pop {r4-r5}
bx lr
nop
_0201BA50: .word UNK_021C4D48
_0201BA50: .word gLCRNG_State
_0201BA54: .word UNK_02105BA8
_0201BA58: .word UNK_021C4D50
_0201BA58: .word gMTRNG_State + 4
_0201BA5C: .word 0x6C078965
thumb_func_start rand_MT
@@ -199,7 +204,7 @@ rand_MT: ; 0x0201BA60
ldr r0, _0201BB48 ; =0x00001571
bl seedr_MT
_0201BA7A:
ldr r4, _0201BB4C ; =UNK_021C4D4C
ldr r4, _0201BB4C ; =gMTRNG_State
ldr r1, _0201BB50 ; =UNK_02105BAC
ldr r5, _0201BB54 ; =0x7FFFFFFF
ldr r6, _0201BB58 ; =0x00000634
@@ -226,7 +231,7 @@ _0201BA84:
ldr r1, _0201BB5C ; =0x0000026F
cmp r0, r1
bge _0201BAE4
ldr r2, _0201BB4C ; =UNK_021C4D4C
ldr r2, _0201BB4C ; =gMTRNG_State
lsl r1, r0, #0x2
add r1, r2, r1
mov r2, #0xe3
@@ -255,19 +260,19 @@ _0201BABC:
cmp r0, r3
blt _0201BABC
_0201BAE4:
ldr r2, _0201BB60 ; =UNK_021C56C8
ldr r2, _0201BB60 ; =gMTRNG_State + 607 * 4
mov r0, #0x2
ldr r1, [r2, #0x40]
lsl r0, r0, #0x1e
add r3, r1, #0x0
ldr r1, _0201BB64 ; =UNK_021C4D48
ldr r1, _0201BB64 ; =gLCRNG_State
and r3, r0
ldr r1, [r1, #0x4]
sub r0, r0, #0x1
and r0, r1
add r4, r3, #0x0
orr r4, r0
ldr r0, _0201BB68 ; =UNK_021C5348
ldr r0, _0201BB68 ; =gMTRNG_State + 383 * 4
ldr r1, [r0, #0x34]
lsr r0, r4, #0x1
add r3, r1, #0x0
@@ -286,7 +291,7 @@ _0201BB18:
ldr r2, [r0, #0x0]
add r1, r2, #0x1
str r1, [r0, #0x0]
ldr r0, _0201BB4C ; =UNK_021C4D4C
ldr r0, _0201BB4C ; =gMTRNG_State
lsl r1, r2, #0x2
ldr r1, [r0, r1]
lsr r0, r1, #0xb
@@ -307,14 +312,14 @@ _0201BB18:
.balign 4
_0201BB44: .word UNK_02105BA8
_0201BB48: .word 0x00001571
_0201BB4C: .word UNK_021C4D4C
_0201BB4C: .word gMTRNG_State
_0201BB50: .word UNK_02105BAC
_0201BB54: .word 0x7FFFFFFF
_0201BB58: .word 0x00000634
_0201BB5C: .word 0x0000026F
_0201BB60: .word UNK_021C56C8
_0201BB64: .word UNK_021C4D48
_0201BB68: .word UNK_021C5348
_0201BB60: .word gMTRNG_State + 607 * 4
_0201BB64: .word gLCRNG_State
_0201BB68: .word gMTRNG_State + 383 * 4
_0201BB6C: .word 0x9D2C5680
_0201BB70: .word 0xEFC60000

16
arm9/asm/unk_02009EAC.s
View File

@@ -1,9 +1,19 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C4694
.extern UNK_021C4674
.extern UNK_021C4670
.section .bss
.global UNK_021C4670
UNK_021C4670: ; 0x021C4670
.space 0x4
.global UNK_021C4674
UNK_021C4674: ; 0x021C4674
.space 0x20
.global UNK_021C4694
UNK_021C4694: ; 0x021C4694
.space 0x20
.text

42
arm9/asm/unk_0200E1D0.s
View File

@@ -1,15 +1,41 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C46B8
.extern UNK_020ECEF4
.extern UNK_021C4740
.extern UNK_021C46F8
.extern UNK_021C4728
.extern UNK_021C47F4
.extern UNK_021C46C8
.extern UNK_021C46B4
.extern UNK_021C46BC
.section .bss
.global UNK_021C46B4
UNK_021C46B4: ; 0x021C46B4
.space 0x4
.global UNK_021C46B8
UNK_021C46B8: ; 0x021C46B8
.space 0x4
.global UNK_021C46BC
UNK_021C46BC: ; 0x021C46BC
.space 0xc
.global UNK_021C46C8
UNK_021C46C8: ; 0x021C46C8
.space 0x30
.global UNK_021C46F8
UNK_021C46F8: ; 0x021C46F8
.space 0x30
.global UNK_021C4728
UNK_021C4728: ; 0x021C4728
.space 0x18
.global UNK_021C4740
UNK_021C4740: ; 0x021C4740
.space 0xb4
.global UNK_021C47F4
UNK_021C47F4: ; 0x021C47F4
.space 0x14
.text

33
arm9/asm/unk_02011744.s
View File

@@ -1,21 +1,32 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_020ED438
.extern UNK_020ED4B2
.extern UNK_020ED398
.extern UNK_020ED498
.extern UNK_020ED4CC
.extern UNK_020ED399
.extern UNK_020ED4A4
.extern UNK_020ED3C8
.extern UNK_020FFA38
.extern UNK_021C4828
.extern UNK_020ED3B8
.extern UNK_021C4818
.extern UNK_021C4808
.extern UNK_020ED3B0
.extern UNK_020ED3B8
.extern UNK_020ED3C8
.extern UNK_020ED3D8
.extern UNK_020ED438
.extern UNK_020ED498
.extern UNK_020ED4A4
.extern UNK_020ED4B2
.extern UNK_020ED4CC
.extern UNK_020FFA38
.section .bss
.global UNK_021C4808
UNK_021C4808: ; 0x021C4808
.space 0x10
.global UNK_021C4818
UNK_021C4818: ; 0x021C4818
.space 0x10
.global UNK_021C4828
UNK_021C4828: ; 0x021C4828
.space 0x28
.text

18
arm9/asm/unk_02012CC8.s
View File

@@ -1,15 +1,23 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C4850
.extern UNK_020ED508
.extern UNK_020ED4F0
.extern UNK_020ED548
.extern UNK_020ED4E4
.extern UNK_020ED4F0
.extern UNK_020ED4FC
.extern UNK_021C4858
.extern UNK_020ED508
.extern UNK_020ED548
.extern UNK_021CED64
.section .bss
.global UNK_021C4850
UNK_021C4850: ; 0x021C4850
.space 0x8
.global UNK_021C4858
UNK_021C4858: ; 0x021C4858
.space 0x40
.text
thumb_func_start FUN_02012CC8

6
arm9/asm/unk_02015E30.s
View File

@@ -1,7 +1,11 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C4898
.section .bss
.global UNK_021C4898
UNK_021C4898: ; 0x021C4898
.space 0x20
.text

32
arm9/asm/unk_02015EA0.s
View File

@@ -1,14 +1,34 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C48F8
.extern gUnk021C4918
.extern UNK_021C4928
.extern UNK_021C492C
.extern UNK_021C4D20
.extern gUnknown21C48B8
.extern UNK_020EDB10
.section .bss
.global gUnknown21C48B8
gUnknown21C48B8: ; 0x021C48B8
.space 0x40
.global UNK_021C48F8
UNK_021C48F8: ; 0x021C48F8
.space 0x20
.global gUnk021C4918
gUnk021C4918: ; 0x021C4918
.space 0x10
.global UNK_021C4928
UNK_021C4928: ; 0x021C4928
.space 0x4
.global UNK_021C492C
UNK_021C492C: ; 0x021C492C
.space 0x3f4
.global UNK_021C4D20
UNK_021C4D20: ; 0x021C4D20
.space 0x8
.text
thumb_func_start FUN_02015EA0

6
arm9/asm/unk_020166C8.s
View File

@@ -1,7 +1,11 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C4D28
.section .bss
.global UNK_021C4D28
UNK_021C4D28: ; 0x021C4D28
.space 0x1c
.text

7
arm9/asm/unk_0201B1A8.s
View File

@@ -1,7 +1,6 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C4D44
.extern UNK_021CED98
.extern UNK_021CEDD4
.extern UNK_021064C0
@@ -9,6 +8,12 @@
.extern UNK_021064C4
.extern UNK_021064BC
.section .bss
.global UNK_021C4D44
UNK_021C4D44: ; 0x021C4D44
.space 0x4
.text
thumb_func_start FUN_0201B1A8

17
arm9/asm/unk_0201BCBC.s
View File

@@ -1,11 +1,22 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C5714
.extern UNK_021C5734
.extern UNK_021C570C
.extern UNK_02105BB4
.section .bss
.global UNK_021C570C
UNK_021C570C: ; 0x021C570C
.space 0x8
.global UNK_021C5714
UNK_021C5714: ; 0x021C5714
.space 0x20
.global UNK_021C5734
UNK_021C5734: ; 0x021C5734
.space 0x200
.text
thumb_func_start FUN_0201BCBC

6
arm9/asm/unk_0201C24C.s
View File

@@ -1,7 +1,11 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C5934
.section .bss
.global UNK_021C5934
UNK_021C5934: ; 0x021C5934
.space 0x4
.text

17
arm9/asm/unk_0201CC08.s
View File

@@ -1,10 +1,21 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C5938
.extern UNK_021C5944
.extern gUnk021C4918
.extern UNK_021C5978
.section .bss
.global UNK_021C5938
UNK_021C5938: ; 0x021C5938
.space 0xc
.global UNK_021C5944
UNK_021C5944: ; 0x021C5944
.space 0x34
.global UNK_021C5978
UNK_021C5978: ; 0x021C5978
.space 0x1c
.text

6
arm9/asm/unk_0201D040.s
View File

@@ -1,7 +1,11 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C5994
.section .bss
.global UNK_021C5994
UNK_021C5994: ; 0x021C5994
.space 0x4
.text

6
arm9/asm/unk_0201E00C.s
View File

@@ -1,7 +1,11 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C5998
.section .bss
.global UNK_021C5998
UNK_021C5998: ; 0x021C5998
.space 0x4
.text

7
arm9/asm/unk_0201E66C.s
View File

@@ -2,7 +2,12 @@
.include "global.inc"
.extern gUnk021C4918
.extern UNK_021C599C
.section .bss
.global UNK_021C599C
UNK_021C599C: ; 0x021C599C
.space 0x8
.text

7
arm9/asm/unk_0201E7D8.s
View File

@@ -1,7 +1,6 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_021C59A4
.extern UNK_021CED98
.extern UNK_021CEF64
.extern UNK_021CED20
@@ -11,6 +10,12 @@
.extern UNK_021CEF70
.extern UNK_021CED64
.section .bss
.global UNK_021C59A4
UNK_021C59A4: ; 0x021C59A4
.space 0x4
.text
thumb_func_start FUN_0201E7D8

164
arm9/data/bss.s
View File

@@ -1,169 +1,5 @@
.section .bss
.global UNK_021C4670
UNK_021C4670: ; 0x021C4670
.space 0x4
.global UNK_021C4674
UNK_021C4674: ; 0x021C4674
.space 0x20
.global UNK_021C4694
UNK_021C4694: ; 0x021C4694
.space 0x20
.global UNK_021C46B4
UNK_021C46B4: ; 0x021C46B4
.space 0x4
.global UNK_021C46B8
UNK_021C46B8: ; 0x021C46B8
.space 0x4
.global UNK_021C46BC
UNK_021C46BC: ; 0x021C46BC
.space 0xc
.global UNK_021C46C8
UNK_021C46C8: ; 0x021C46C8
.space 0x30
.global UNK_021C46F8
UNK_021C46F8: ; 0x021C46F8
.space 0x30
.global UNK_021C4728
UNK_021C4728: ; 0x021C4728
.space 0x18
.global UNK_021C4740
UNK_021C4740: ; 0x021C4740
.space 0xb4
.global UNK_021C47F4
UNK_021C47F4: ; 0x021C47F4
.space 0x14
.global UNK_021C4808
UNK_021C4808: ; 0x021C4808
.space 0x10
.global UNK_021C4818
UNK_021C4818: ; 0x021C4818
.space 0x10
.global UNK_021C4828
UNK_021C4828: ; 0x021C4828
.space 0x28
.global UNK_021C4850
UNK_021C4850: ; 0x021C4850
.space 0x8
.global UNK_021C4858
UNK_021C4858: ; 0x021C4858
.space 0x40
.global UNK_021C4898
UNK_021C4898: ; 0x021C4898
.space 0x20
.global gUnknown21C48B8
gUnknown21C48B8: ; 0x021C48B8
.space 0x40
.global UNK_021C48F8
UNK_021C48F8: ; 0x021C48F8
.space 0x20
.global gUnk021C4918
gUnk021C4918: ; 0x021C4918
.space 0x10
.global UNK_021C4928
UNK_021C4928: ; 0x021C4928
.space 0x4
.global UNK_021C492C
UNK_021C492C: ; 0x021C492C
.space 0x3f4
.global UNK_021C4D20
UNK_021C4D20: ; 0x021C4D20
.space 0x8
.global UNK_021C4D28
UNK_021C4D28: ; 0x021C4D28
.space 0x1c
.global UNK_021C4D44
UNK_021C4D44: ; 0x021C4D44
.space 0x4
.global UNK_021C4D48
UNK_021C4D48: ; 0x021C4D48
.space 0x4
.global UNK_021C4D4C
UNK_021C4D4C: ; 0x021C4D4C
.space 0x4
.global UNK_021C4D50
UNK_021C4D50: ; 0x021C4D50
.space 0x5f8
.global UNK_021C5348
UNK_021C5348: ; 0x021C5348
.space 0x380
.global UNK_021C56C8
UNK_021C56C8: ; 0x021C56C8
.space 0x44
.global UNK_021C570C
UNK_021C570C: ; 0x021C570C
.space 0x8
.global UNK_021C5714
UNK_021C5714: ; 0x021C5714
.space 0x20
.global UNK_021C5734
UNK_021C5734: ; 0x021C5734
.space 0x200
.global UNK_021C5934
UNK_021C5934: ; 0x021C5934
.space 0x4
.global UNK_021C5938
UNK_021C5938: ; 0x021C5938
.space 0xc
.global UNK_021C5944
UNK_021C5944: ; 0x021C5944
.space 0x34
.global UNK_021C5978
UNK_021C5978: ; 0x021C5978
.space 0x1c
.global UNK_021C5994
UNK_021C5994: ; 0x021C5994
.space 0x4
.global UNK_021C5998
UNK_021C5998: ; 0x021C5998
.space 0x4
.global UNK_021C599C
UNK_021C599C: ; 0x021C599C
.space 0x8
.global UNK_021C59A4
UNK_021C59A4: ; 0x021C59A4
.space 0x4
.global UNK_021C59A8
UNK_021C59A8: ; 0x021C59A8
.space 0x8