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

module 6 fully shiftable

Browse Source
This commit is contained in:
red031000
2020-06-26 21:47:45 +01:00
parent 981bf953cb
commit 2c7afe3a37
11 changed files with 477 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arm9/global.inc
View File

@@ -4684,6 +4684,8 @@
.extern FUN_0206475C
.extern FUN_0206476C
.extern FUN_0206477C
.extern FUN_02064794
.extern FUN_02064798
.extern FUN_020647A4
.extern FUN_0206486C
.extern FUN_020649B0
@@ -7717,6 +7719,7 @@
.extern UNK_021064BC
.extern UNK_021064C4
.extern gUnknown21C48B8
.extern gUnk021C4918
.extern UNK_021CED20
.extern UNK_021CED98
.extern UNK_021CEDD4

613
arm9/modules/06/asm/module_06.s
View File

File diff suppressed because it is too large Load Diff

8
arm9/modules/11/asm/module_11.s
View File

@@ -26862,7 +26862,7 @@ _0223A994:
mov r1, #0xc
mov r2, #0
bl GetMonData
ldr r1, _0223ABAC ; =0x020ECAC4
ldr r1, _0223ABAC ; =gGameLanguage
ldrb r1, [r1]
cmp r1, r0
beq _0223A9C2
@@ -27111,7 +27111,7 @@ _0223AB9C: .word 0x00002E4C
_0223ABA0: .word 0x00002FCC
_0223ABA4: .word 0x00003144
_0223ABA8: .word 0x00000467
_0223ABAC: .word 0x020ECAC4
_0223ABAC: .word gGameLanguage
_0223ABB0: .word 0x0000219C
_0223ABB4: .word 0x00002DA4
_0223ABB8: .word 0x0225DCC0
@@ -78236,13 +78236,13 @@ MOD11_02253A74: ; 0x02253A74
thumb_func_start MOD11_02253A78
MOD11_02253A78: ; 0x02253A78
ldr r3, _02253A84 ; =0x020CE34C
ldr r3, _02253A84 ; =MI_CpuFill8
add r0, #0x80
mov r1, #0
mov r2, #8
bx r3
nop
_02253A84: .word 0x020CE34C
_02253A84: .word MI_CpuFill8
thumb_func_start MOD11_02253A88
MOD11_02253A88: ; 0x02253A88

12
arm9/modules/13/asm/module_13_arm1.s
View File

@@ -5490,12 +5490,12 @@ _02216B6C:
arm_func_start MOD13_02216B80
MOD13_02216B80: ; 0x02216B80
ldr ip, _02216B90 ; =0x020CE34C
ldr ip, _02216B90 ; =MI_CpuFill8
mov r1, #0
mov r2, #0x70
bx ip
.align 2, 0
_02216B90: .word 0x020CE34C
_02216B90: .word MI_CpuFill8
arm_func_start MOD13_02216B94
MOD13_02216B94: ; 0x02216B94
@@ -5651,12 +5651,12 @@ MOD13_02216D78: ; 0x02216D78
arm_func_start MOD13_02216D90
MOD13_02216D90: ; 0x02216D90
ldr ip, _02216DA0 ; =0x020CE34C
ldr ip, _02216DA0 ; =MI_CpuFill8
mov r1, #0
mov r2, #0x20
bx ip
.align 2, 0
_02216DA0: .word 0x020CE34C
_02216DA0: .word MI_CpuFill8
arm_func_start MOD13_02216DA4
MOD13_02216DA4: ; 0x02216DA4
@@ -6022,14 +6022,14 @@ _0221727C: .word MOD13_02240B24
arm_func_start MOD13_02217280
MOD13_02217280: ; 0x02217280
ldr r3, _02217298 ; =0x02240B24
ldr ip, _0221729C ; =0x020CE34C
ldr ip, _0221729C ; =MI_CpuFill8
mov r1, #0
mov r2, #0x21c
str r0, [r3]
bx ip
.align 2, 0
_02217298: .word MOD13_02240B24
_0221729C: .word 0x020CE34C
_0221729C: .word MI_CpuFill8
arm_func_start MOD13_022172A0
MOD13_022172A0: ; 0x022172A0

4
arm9/modules/13/asm/module_13_thumb.s
View File

@@ -278,10 +278,10 @@ MOD13_022174A4: ; 0x022174A4
MOD13_022174C0: ; 0x022174C0
lsl r1, r1, #0x18
lsr r1, r1, #0x18
ldr r3, _022174C8 ; =0x020CE34C
ldr r3, _022174C8 ; =MI_CpuFill8
bx r3
.align 2, 0
_022174C8: .word 0x020CE34C
_022174C8: .word MI_CpuFill8
thumb_func_start MOD13_022174CC
MOD13_022174CC: ; 0x022174CC

16
arm9/modules/17/asm/module_17.s
View File

@@ -411,19 +411,19 @@ MOD17_021D7794: ; 0x021D7794
bl MOD17_021D7D08
bl MOD17_021D7D28
bl MOD17_021D7DB0
ldr r0, _021D77B0 ; =0x021C4918
ldr r0, _021D77B0 ; =gUnk021C4918
mov r1, #1
strb r1, [r0, #5]
bl FUN_0201E7A0
pop {r3, pc}
nop
_021D77B0: .word 0x021C4918
_021D77B0: .word gUnk021C4918
thumb_func_end MOD17_021D7794
thumb_func_start MOD17_021D77B4
MOD17_021D77B4: ; 0x021D77B4
push {r3, lr}
ldr r0, _021D77D0 ; =0x021C4918
ldr r0, _021D77D0 ; =gUnk021C4918
mov r1, #0
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -432,7 +432,7 @@ MOD17_021D77B4: ; 0x021D77B4
bl GX_ResetBankForTex
pop {r3, pc}
nop
_021D77D0: .word 0x021C4918
_021D77D0: .word gUnk021C4918
thumb_func_end MOD17_021D77B4
thumb_func_start MOD17_021D77D4
@@ -5151,12 +5151,12 @@ _021D9CD0: .word 0x000006A4
thumb_func_start MOD17_021D9CD4
MOD17_021D9CD4: ; 0x021D9CD4
ldr r3, _021D9CDC ; =0x020DF4A4
ldr r3, _021D9CDC ; =memset
mov r1, #0
mov r2, #0xac
bx r3
.align 2, 0
_021D9CDC: .word 0x020DF4A4
_021D9CDC: .word memset
thumb_func_end MOD17_021D9CD4
thumb_func_start MOD17_021D9CE0
@@ -13821,7 +13821,7 @@ _021DDBBC:
ldr r0, [r5, #8]
str r0, [r4, #0xc]
bl MOD17_021D7794
ldr r0, _021DDC2C ; =0x021C4918
ldr r0, _021DDC2C ; =gUnk021C4918
mov r1, #0
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -13864,7 +13864,7 @@ _021DDC02:
pop {r3, r4, r5, pc}
.align 2, 0
_021DDC28: .word MOD17_021DDD40
_021DDC2C: .word 0x021C4918
_021DDC2C: .word gUnk021C4918
thumb_func_end MOD17_021DDB58
thumb_func_start MOD17_021DDC30

8
arm9/modules/54/asm/module_54.s
View File

@@ -1968,7 +1968,7 @@ MOD54_021D84D4: ; 0x021D84D4
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
ldr r0, _021D8514 ; =0x021C4918
ldr r0, _021D8514 ; =gUnk021C4918
mov r1, #1
strb r1, [r0, #8]
mov r0, #0x33
@@ -1993,7 +1993,7 @@ MOD54_021D84D4: ; 0x021D84D4
add r0, r4, #0
pop {r3, r4, r5, pc}
nop
_021D8514: .word 0x021C4918
_021D8514: .word gUnk021C4918
thumb_func_end MOD54_021D84D4
thumb_func_start MOD54_021D8518
@@ -2035,7 +2035,7 @@ _021D852A:
str r1, [r5, #0xc]
lsl r0, r0, #4
str r1, [r5, r0]
ldr r0, _021D8580 ; =0x021C4918
ldr r0, _021D8580 ; =gUnk021C4918
strb r1, [r0, #8]
ldr r0, _021D8584 ; =0x00004A40
strb r1, [r5, r0]
@@ -2044,7 +2044,7 @@ _021D8576:
pop {r3, r4, r5, pc}
nop
_021D857C: .word 0x00000658
_021D8580: .word 0x021C4918
_021D8580: .word gUnk021C4918
_021D8584: .word 0x00004A40
thumb_func_end MOD54_021D8518

16
arm9/modules/63/asm/module_63.s
View File

@@ -1028,7 +1028,7 @@ _021D7C52:
mov r0, #0x10
orr r0, r1
strh r0, [r2]
ldr r0, _021D7D70 ; =0x021C4918
ldr r0, _021D7D70 ; =gUnk021C4918
mov r1, #1
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -1043,7 +1043,7 @@ _021D7D60: .word 0x04000060
_021D7D64: .word 0xFFFFCFFF
_021D7D68: .word 0x00007FFF
_021D7D6C: .word 0x0000010E
_021D7D70: .word 0x021C4918
_021D7D70: .word gUnk021C4918
thumb_func_end MOD63_021D7C18
thumb_func_start MOD63_021D7D74
@@ -1853,7 +1853,7 @@ MOD63_021D8360: ; 0x021D8360
ldr r0, _021D83A0 ; =0x0000CFDF
and r0, r1
strh r0, [r2]
ldr r0, _021D83A4 ; =0x021C4918
ldr r0, _021D83A4 ; =gUnk021C4918
strb r3, [r0, #5]
bl FUN_0201E7A0
mov r0, #1
@@ -1861,7 +1861,7 @@ MOD63_021D8360: ; 0x021D8360
.align 2, 0
_021D839C: .word 0x04000050
_021D83A0: .word 0x0000CFDF
_021D83A4: .word 0x021C4918
_021D83A4: .word gUnk021C4918
thumb_func_end MOD63_021D8360
thumb_func_start MOD63_021D83A8
@@ -3074,7 +3074,7 @@ MOD63_021D8D10: ; 0x021D8D10
str r1, [r4, #8]
lsl r0, r0, #2
strb r1, [r4, r0]
ldr r0, _021D8D94 ; =0x021C4918
ldr r0, _021D8D94 ; =gUnk021C4918
strb r1, [r0, #5]
bl FUN_0201E7A0
bl GetLCRNGSeed
@@ -3085,7 +3085,7 @@ MOD63_021D8D10: ; 0x021D8D10
pop {r4, pc}
.align 2, 0
_021D8D90: .word 0x00007FFF
_021D8D94: .word 0x021C4918
_021D8D94: .word gUnk021C4918
thumb_func_end MOD63_021D8D10
thumb_func_start MOD63_021D8D98
@@ -4014,7 +4014,7 @@ MOD63_021D9498: ; 0x021D9498
ldr r0, [r5, #0xc]
mov r1, #1
str r0, [r5, #0x40]
ldr r0, _021D9588 ; =0x021C4918
ldr r0, _021D9588 ; =gUnk021C4918
strb r1, [r0, #5]
bl FUN_0201E7A0
ldr r6, _021D958C ; =0x021DBDE8
@@ -4076,7 +4076,7 @@ _021D950C:
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
_021D9588: .word 0x021C4918
_021D9588: .word gUnk021C4918
_021D958C: .word 0x021DBDE8
_021D9590: .word 0x021DBAD0
_021D9594: .word 0x00004210

8
arm9/modules/73/asm/module_73.s
View File

@@ -2230,7 +2230,7 @@ MOD73_021D8630: ; 0x021D8630
bl MOD73_021DAFA8
add r0, r4, #0
bl MOD73_021D8BDC
ldr r0, _021D8758 ; =0x021C4918
ldr r0, _021D8758 ; =gUnk021C4918
mov r1, #1
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -2245,7 +2245,7 @@ _021D8748: .word 0x0000058C
_021D874C: .word 0x0000061C
_021D8750: .word 0x00000A84
_021D8754: .word 0x00000B04
_021D8758: .word 0x021C4918
_021D8758: .word gUnk021C4918
thumb_func_end MOD73_021D8630
thumb_func_start MOD73_021D875C
@@ -2299,7 +2299,7 @@ MOD73_021D875C: ; 0x021D875C
bl MOD73_021D8BD0
add r0, r4, #0
bl MOD73_021D8D18
ldr r0, _021D880C ; =0x021C4918
ldr r0, _021D880C ; =gUnk021C4918
mov r1, #0
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -2313,7 +2313,7 @@ _021D87FC: .word 0x00000598
_021D8800: .word 0x0000061C
_021D8804: .word 0x00000A84
_021D8808: .word 0x00000B04
_021D880C: .word 0x021C4918
_021D880C: .word gUnk021C4918
thumb_func_end MOD73_021D875C
thumb_func_start MOD73_021D8810

12
arm9/modules/77/asm/module_77.s
View File

@@ -39,7 +39,7 @@ MOD77_021D74E0: ; 0x021D74E0
bl memset
mov r0, #0x32
str r0, [r5]
ldr r0, _021D75E0 ; =0x020ECAC4
ldr r0, _021D75E0 ; =gGameLanguage
ldrb r0, [r0]
cmp r0, #1
bne _021D753E
@@ -94,7 +94,7 @@ _021D7540:
mov r0, #0
add r1, #0x1c
str r0, [r5, r1]
ldr r0, _021D7600 ; =0x021C4918
ldr r0, _021D7600 ; =gUnk021C4918
mov r1, #1
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -109,7 +109,7 @@ _021D7540:
_021D75D4: .word 0xFFFFE0FF
_021D75D8: .word 0x04001000
_021D75DC: .word 0x0000C32C
_021D75E0: .word 0x020ECAC4
_021D75E0: .word gGameLanguage
_021D75E4: .word 0x0000C2F0
_021D75E8: .word 0x0000C314
_021D75EC: .word 0x0000C318
@@ -117,7 +117,7 @@ _021D75F0: .word 0x0000C324
_021D75F4: .word 0x0000C010
_021D75F8: .word 0x0000C070
_021D75FC: .word 0x0000C2CC
_021D7600: .word 0x021C4918
_021D7600: .word gUnk021C4918
thumb_func_end MOD77_021D74E0
thumb_func_start MOD77_021D7604
@@ -832,7 +832,7 @@ MOD77_021D7BAC: ; 0x021D7BAC
bl FUN_0200627C
add r0, r5, #0
bl FUN_020168D0
ldr r0, _021D7C20 ; =0x021C4918
ldr r0, _021D7C20 ; =gUnk021C4918
mov r1, #0
strb r1, [r0, #5]
mov r0, #1
@@ -841,7 +841,7 @@ MOD77_021D7BAC: ; 0x021D7BAC
_021D7C14: .word 0x0000C2CC
_021D7C18: .word 0x0000C070
_021D7C1C: .word 0x0000C010
_021D7C20: .word 0x021C4918
_021D7C20: .word gUnk021C4918
thumb_func_end MOD77_021D7BAC
thumb_func_start MOD77_021D7C24

28
arm9/modules/83/asm/module_83.s
View File

@@ -147,7 +147,7 @@ _0222D6BE:
cmp r0, #0
beq _0222D6E6
bl MOD83_02236EA8
ldr r1, _0222D6E8 ; =0x020ECAC4
ldr r1, _0222D6E8 ; =gGameLanguage
ldrb r1, [r1]
cmp r1, r0
bne _0222D6E6
@@ -158,7 +158,7 @@ _0222D6BE:
_0222D6E6:
pop {r3, r4, r5, pc}
.align 2, 0
_0222D6E8: .word 0x020ECAC4
_0222D6E8: .word gGameLanguage
thumb_func_end MOD83_0222D67C
thumb_func_start MOD83_0222D6EC
@@ -16263,7 +16263,7 @@ _02235512:
str r0, [sp, #0x20]
ldr r0, [sp, #0x1c]
bl MOD83_02237EBC
ldr r2, _0223563C ; =0x021C4918
ldr r2, _0223563C ; =gUnk021C4918
ldr r1, [sp, #0x20]
ldrb r2, [r2, #6]
bl MOD83_02235350
@@ -16360,7 +16360,7 @@ _02235602:
nop
_02235634: .word 0x0000E880
_02235638: .word 0x0000E884
_0223563C: .word 0x021C4918
_0223563C: .word gUnk021C4918
_02235640: .word MOD83_022354AC
_02235644: .word 0x00012604
thumb_func_end MOD83_022354F0
@@ -17522,7 +17522,7 @@ _02235F48:
bl FUN_0201E66C
ldr r0, [r4, #0x20]
bl MOD83_02235E68
ldr r0, _02235FB8 ; =0x021C4918
ldr r0, _02235FB8 ; =gUnk021C4918
mov r1, #1
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -17562,7 +17562,7 @@ _02235F48:
pop {r3, r4, r5, pc}
.align 2, 0
_02235FB4: .word MOD83_0223A59C
_02235FB8: .word 0x021C4918
_02235FB8: .word gUnk021C4918
thumb_func_end MOD83_02235F3C
thumb_func_start MOD83_02235FBC
@@ -17814,7 +17814,7 @@ _02236148:
ldr r0, _02236288 ; =0x00000414
str r7, [sp]
ldr r0, [r4, r0]
ldr r3, _0223628C ; =0x021C4918
ldr r3, _0223628C ; =gUnk021C4918
str r0, [sp, #4]
ldrb r3, [r3, #6]
ldr r0, [sp, #0x14]
@@ -17901,7 +17901,7 @@ _02236148:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_02236288: .word 0x00000414
_0223628C: .word 0x021C4918
_0223628C: .word gUnk021C4918
_02236290: .word MOD83_0223B280
_02236294: .word 0x000003D2
thumb_func_end MOD83_022360C8
@@ -18086,7 +18086,7 @@ _022363E2:
ldr r0, _02236448 ; =0x0000E88C
ldr r0, [r6, r0]
bl FUN_020145A8
ldr r0, _0223644C ; =0x021C4918
ldr r0, _0223644C ; =gUnk021C4918
mov r1, #0
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -18108,7 +18108,7 @@ _0223643C: .word 0x00000478
_02236440: .word 0x00000488
_02236444: .word 0x00000498
_02236448: .word 0x0000E88C
_0223644C: .word 0x021C4918
_0223644C: .word gUnk021C4918
thumb_func_end MOD83_02236330
thumb_func_start MOD83_02236450
@@ -22445,7 +22445,7 @@ _022384AE:
ldr r1, _022385F0 ; =0x00000182
cmp r0, r1
bne _022384FE
ldr r0, _022385F4 ; =0x021C4918
ldr r0, _022385F4 ; =gUnk021C4918
ldrb r0, [r0, #6]
cmp r0, #5
bhi _022384DE
@@ -22500,7 +22500,7 @@ _022384FE:
mov r1, #3
mov r2, #0
bl MOD83_02237A10
ldr r1, _022385F8 ; =0x020ECAC4
ldr r1, _022385F8 ; =gGameLanguage
ldrb r1, [r1]
cmp r1, r0
beq _0223853E
@@ -22585,8 +22585,8 @@ _0223853E:
pop {r3, r4, r5, r6, r7, pc}
nop
_022385F0: .word 0x00000182
_022385F4: .word 0x021C4918
_022385F8: .word 0x020ECAC4
_022385F4: .word gUnk021C4918
_022385F8: .word gGameLanguage
thumb_func_end MOD83_02237F6C
thumb_func_start MOD83_022385FC