Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-30 20:36:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #80 from PikalaxALT/pikalax_work

Browse Source 
Modules 58-64
This commit is contained in:
red031000
2020-05-12 22:59:06 +01:00
committed by GitHub
parent 2bec462a65 1f1436119c
commit f4ea052ed0
14 changed files with 30993 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
arm9/arm9.lcf
View File

@@ -2347,12 +2347,23 @@ SECTIONS {
SDK_OVERLAY.MODULE_57.BSS_SIZE = SDK_OVERLAY.MODULE_57.BSS_END - SDK_OVERLAY.MODULE_57.BSS_START;
} >> MODULE_57
.MODULE_58: {
.MODULE_58 :
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY_MODULE_58_ID = 58;
SDK_OVERLAY.MODULE_58.ID = 58;
SDK_OVERLAY.MODULE_58.START = .;
FILE_2A8800.o (.text) /* 0x2A4800 */
module_58.o (.text)
module_58.o (.rodata)
module_58.o (.init)
SDK_OVERLAY.MODULE_58.SINIT_START = .;
module_58.o (.ctor)
module_58.o (.sinit)
WRITEW 0;
SDK_OVERLAY.MODULE_58.SINIT_END = .;
. = ALIGN(32);
module_58.o (.sdata)
module_58.o (.data)
. = ALIGN(32);
SDK_OVERLAY.MODULE_58.END = .;
SDK_OVERLAY.MODULE_58.SIZE = SDK_OVERLAY.MODULE_58.END - SDK_OVERLAY.MODULE_58.START;
@@ -2362,18 +2373,30 @@ SECTIONS {
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY.MODULE_58.BSS_START = .;
FILE_2A8800.o (.bss)
module_58.o (.bss)
module_58.o (.sbss)
. = ALIGN(32);
SDK_OVERLAY.MODULE_58.BSS_END = .;
SDK_OVERLAY.MODULE_58.BSS_SIZE = SDK_OVERLAY.MODULE_58.BSS_END - SDK_OVERLAY.MODULE_58.BSS_START;
} >> MODULE_58
.MODULE_59: {
.MODULE_59 :
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY_MODULE_59_ID = 59;
SDK_OVERLAY.MODULE_59.ID = 59;
SDK_OVERLAY.MODULE_59.START = .;
FILE_2A9E00.o (.text) /* 0x2A5E00 */
module_59.o (.text)
module_59.o (.rodata)
module_59.o (.init)
SDK_OVERLAY.MODULE_59.SINIT_START = .;
module_59.o (.ctor)
module_59.o (.sinit)
WRITEW 0;
SDK_OVERLAY.MODULE_59.SINIT_END = .;
. = ALIGN(32);
module_59.o (.sdata)
module_59.o (.data)
. = ALIGN(32);
SDK_OVERLAY.MODULE_59.END = .;
SDK_OVERLAY.MODULE_59.SIZE = SDK_OVERLAY.MODULE_59.END - SDK_OVERLAY.MODULE_59.START;
@@ -2383,18 +2406,30 @@ SECTIONS {
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY.MODULE_59.BSS_START = .;
FILE_2A9E00.o (.bss)
module_59.o (.bss)
module_59.o (.sbss)
. = ALIGN(32);
SDK_OVERLAY.MODULE_59.BSS_END = .;
SDK_OVERLAY.MODULE_59.BSS_SIZE = SDK_OVERLAY.MODULE_59.BSS_END - SDK_OVERLAY.MODULE_59.BSS_START;
} >> MODULE_59
.MODULE_60: {
.MODULE_60 :
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY_MODULE_60_ID = 60;
SDK_OVERLAY.MODULE_60.ID = 60;
SDK_OVERLAY.MODULE_60.START = .;
FILE_2ACC00.o (.text) /* 0x2A8C00 */
module_60.o (.text)
module_60.o (.rodata)
module_60.o (.init)
SDK_OVERLAY.MODULE_60.SINIT_START = .;
module_60.o (.ctor)
module_60.o (.sinit)
WRITEW 0;
SDK_OVERLAY.MODULE_60.SINIT_END = .;
. = ALIGN(32);
module_60.o (.sdata)
module_60.o (.data)
. = ALIGN(32);
SDK_OVERLAY.MODULE_60.END = .;
SDK_OVERLAY.MODULE_60.SIZE = SDK_OVERLAY.MODULE_60.END - SDK_OVERLAY.MODULE_60.START;
@@ -2404,18 +2439,30 @@ SECTIONS {
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY.MODULE_60.BSS_START = .;
FILE_2ACC00.o (.bss)
module_60.o (.bss)
module_60.o (.sbss)
. = ALIGN(32);
SDK_OVERLAY.MODULE_60.BSS_END = .;
SDK_OVERLAY.MODULE_60.BSS_SIZE = SDK_OVERLAY.MODULE_60.BSS_END - SDK_OVERLAY.MODULE_60.BSS_START;
} >> MODULE_60
.MODULE_61: {
.MODULE_61 :
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY_MODULE_61_ID = 61;
SDK_OVERLAY.MODULE_61.ID = 61;
SDK_OVERLAY.MODULE_61.START = .;
FILE_2ADA00.o (.text) /* 0x2A9A00 */
module_61.o (.text)
module_61.o (.rodata)
module_61.o (.init)
SDK_OVERLAY.MODULE_61.SINIT_START = .;
module_61.o (.ctor)
module_61.o (.sinit)
WRITEW 0;
SDK_OVERLAY.MODULE_61.SINIT_END = .;
. = ALIGN(32);
module_61.o (.sdata)
module_61.o (.data)
. = ALIGN(32);
SDK_OVERLAY.MODULE_61.END = .;
SDK_OVERLAY.MODULE_61.SIZE = SDK_OVERLAY.MODULE_61.END - SDK_OVERLAY.MODULE_61.START;
@@ -2425,18 +2472,30 @@ SECTIONS {
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY.MODULE_61.BSS_START = .;
FILE_2ADA00.o (.bss)
module_61.o (.bss)
module_61.o (.sbss)
. = ALIGN(32);
SDK_OVERLAY.MODULE_61.BSS_END = .;
SDK_OVERLAY.MODULE_61.BSS_SIZE = SDK_OVERLAY.MODULE_61.BSS_END - SDK_OVERLAY.MODULE_61.BSS_START;
} >> MODULE_61
.MODULE_62: {
.MODULE_62 :
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY_MODULE_62_ID = 62;
SDK_OVERLAY.MODULE_62.ID = 62;
SDK_OVERLAY.MODULE_62.START = .;
FILE_2AEC00.o (.text) /* 0x2AAC00 */
module_62.o (.text)
module_62.o (.rodata)
module_62.o (.init)
SDK_OVERLAY.MODULE_62.SINIT_START = .;
module_62.o (.ctor)
module_62.o (.sinit)
WRITEW 0;
SDK_OVERLAY.MODULE_62.SINIT_END = .;
. = ALIGN(32);
module_62.o (.sdata)
module_62.o (.data)
. = ALIGN(32);
SDK_OVERLAY.MODULE_62.END = .;
SDK_OVERLAY.MODULE_62.SIZE = SDK_OVERLAY.MODULE_62.END - SDK_OVERLAY.MODULE_62.START;
@@ -2446,18 +2505,30 @@ SECTIONS {
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY.MODULE_62.BSS_START = .;
FILE_2AEC00.o (.bss)
module_62.o (.bss)
module_62.o (.sbss)
. = ALIGN(32);
SDK_OVERLAY.MODULE_62.BSS_END = .;
SDK_OVERLAY.MODULE_62.BSS_SIZE = SDK_OVERLAY.MODULE_62.BSS_END - SDK_OVERLAY.MODULE_62.BSS_START;
} >> MODULE_62
.MODULE_63: {
.MODULE_63 :
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY_MODULE_63_ID = 63;
SDK_OVERLAY.MODULE_63.ID = 63;
SDK_OVERLAY.MODULE_63.START = .;
FILE_2B2A00.o (.text) /* 0x2AEA00 */
module_63.o (.text)
module_63.o (.rodata)
module_63.o (.init)
SDK_OVERLAY.MODULE_63.SINIT_START = .;
module_63.o (.ctor)
module_63.o (.sinit)
WRITEW 0;
SDK_OVERLAY.MODULE_63.SINIT_END = .;
. = ALIGN(32);
module_63.o (.sdata)
module_63.o (.data)
. = ALIGN(32);
SDK_OVERLAY.MODULE_63.END = .;
SDK_OVERLAY.MODULE_63.SIZE = SDK_OVERLAY.MODULE_63.END - SDK_OVERLAY.MODULE_63.START;
@@ -2467,18 +2538,30 @@ SECTIONS {
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY.MODULE_63.BSS_START = .;
FILE_2B2A00.o (.bss)
module_63.o (.bss)
module_63.o (.sbss)
. = ALIGN(32);
SDK_OVERLAY.MODULE_63.BSS_END = .;
SDK_OVERLAY.MODULE_63.BSS_SIZE = SDK_OVERLAY.MODULE_63.BSS_END - SDK_OVERLAY.MODULE_63.BSS_START;
} >> MODULE_63
.MODULE_64: {
.MODULE_64 :
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY_MODULE_64_ID = 64;
SDK_OVERLAY.MODULE_64.ID = 64;
SDK_OVERLAY.MODULE_64.START = .;
FILE_2B7600.o (.text) /* 0x2B3600 */
module_64.o (.text)
module_64.o (.rodata)
module_64.o (.init)
SDK_OVERLAY.MODULE_64.SINIT_START = .;
module_64.o (.ctor)
module_64.o (.sinit)
WRITEW 0;
SDK_OVERLAY.MODULE_64.SINIT_END = .;
. = ALIGN(32);
module_64.o (.sdata)
module_64.o (.data)
. = ALIGN(32);
SDK_OVERLAY.MODULE_64.END = .;
SDK_OVERLAY.MODULE_64.SIZE = SDK_OVERLAY.MODULE_64.END - SDK_OVERLAY.MODULE_64.START;
@@ -2488,7 +2571,8 @@ SECTIONS {
{
ALIGNALL(4); . = ALIGN(32);
SDK_OVERLAY.MODULE_64.BSS_START = .;
FILE_2B7600.o (.bss)
module_64.o (.bss)
module_64.o (.sbss)
. = ALIGN(32);
SDK_OVERLAY.MODULE_64.BSS_END = .;
SDK_OVERLAY.MODULE_64.BSS_SIZE = SDK_OVERLAY.MODULE_64.BSS_END - SDK_OVERLAY.MODULE_64.BSS_START;
@@ -3603,13 +3687,69 @@ SECTIONS {
WRITEW 57;
WRITEW 0;
OVERLAY_TABLE(MODULE_58, 58)
OVERLAY_TABLE(MODULE_59, 59)
OVERLAY_TABLE(MODULE_60, 60)
OVERLAY_TABLE(MODULE_61, 61)
OVERLAY_TABLE(MODULE_62, 62)
OVERLAY_TABLE(MODULE_63, 63)
OVERLAY_TABLE(MODULE_64, 64)
WRITEW 58;
WRITEW ADDR(.MODULE_58);
WRITEW SDK_OVERLAY.MODULE_58.SIZE;
WRITEW SDK_OVERLAY.MODULE_58.BSS_SIZE;
WRITEW SDK_OVERLAY.MODULE_58.SINIT_START;
WRITEW SDK_OVERLAY.MODULE_58.SINIT_END;
WRITEW 58;
WRITEW 0;
WRITEW 59;
WRITEW ADDR(.MODULE_59);
WRITEW SDK_OVERLAY.MODULE_59.SIZE;
WRITEW SDK_OVERLAY.MODULE_59.BSS_SIZE;
WRITEW SDK_OVERLAY.MODULE_59.SINIT_START;
WRITEW SDK_OVERLAY.MODULE_59.SINIT_END;
WRITEW 59;
WRITEW 0;
WRITEW 60;
WRITEW ADDR(.MODULE_60);
WRITEW SDK_OVERLAY.MODULE_60.SIZE;
WRITEW SDK_OVERLAY.MODULE_60.BSS_SIZE;
WRITEW SDK_OVERLAY.MODULE_60.SINIT_START;
WRITEW SDK_OVERLAY.MODULE_60.SINIT_END;
WRITEW 60;
WRITEW 0;
WRITEW 61;
WRITEW ADDR(.MODULE_61);
WRITEW SDK_OVERLAY.MODULE_61.SIZE;
WRITEW SDK_OVERLAY.MODULE_61.BSS_SIZE;
WRITEW SDK_OVERLAY.MODULE_61.SINIT_START;
WRITEW SDK_OVERLAY.MODULE_61.SINIT_END;
WRITEW 61;
WRITEW 0;
WRITEW 62;
WRITEW ADDR(.MODULE_62);
WRITEW SDK_OVERLAY.MODULE_62.SIZE;
WRITEW SDK_OVERLAY.MODULE_62.BSS_SIZE;
WRITEW SDK_OVERLAY.MODULE_62.SINIT_START;
WRITEW SDK_OVERLAY.MODULE_62.SINIT_END;
WRITEW 62;
WRITEW 0;
WRITEW 63;
WRITEW ADDR(.MODULE_63);
WRITEW SDK_OVERLAY.MODULE_63.SIZE;
WRITEW SDK_OVERLAY.MODULE_63.BSS_SIZE;
WRITEW SDK_OVERLAY.MODULE_63.SINIT_START;
WRITEW SDK_OVERLAY.MODULE_63.SINIT_END;
WRITEW 63;
WRITEW 0;
WRITEW 64;
WRITEW ADDR(.MODULE_64);
WRITEW SDK_OVERLAY.MODULE_64.SIZE;
WRITEW SDK_OVERLAY.MODULE_64.BSS_SIZE;
WRITEW SDK_OVERLAY.MODULE_64.SINIT_START;
WRITEW SDK_OVERLAY.MODULE_64.SINIT_END;
WRITEW 64;
WRITEW 0;
OVERLAY_TABLE(MODULE_65, 65)
OVERLAY_TABLE(MODULE_66, 66)
OVERLAY_TABLE(MODULE_67, 67)

34
arm9/asm/unk_02046030.s
View File

@@ -128316,7 +128316,7 @@ FUN_02083E4C: ; 0x02083E4C
add r0, r4, #0x0
mov r1, #0x3
mov r2, #0x0
bl FUN_021D8B64
bl MOD53_021D8B64
ldr r1, _02083E8C ; =0x000043D0
mov r2, #0xe1
mov r0, #0x0
@@ -128381,7 +128381,7 @@ _02083ED0:
ldr r1, [r4, r1]
cmp r1, r0
bne _02083EFE
bl FUN_021D917C
bl MOD53_021D917C
mov r1, #0xc6
lsl r1, r1, #0x2
ldr r1, [r4, r1]
@@ -128437,7 +128437,7 @@ _02083F3C:
add r0, r4, #0x0
mov r1, #0x9
add r2, r6, #0x0
bl FUN_021D8B64
bl MOD53_021D8B64
add sp, #0x4
pop {r3-r6, pc}
_02083F5A:
@@ -128447,14 +128447,14 @@ _02083F5A:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x8
bl FUN_021D8B64
bl MOD53_021D8B64
add sp, #0x4
pop {r3-r6, pc}
_02083F6E:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x15
bl FUN_021D8B64
bl MOD53_021D8B64
_02083F78:
add sp, #0x4
pop {r3-r6, pc}
@@ -128474,7 +128474,7 @@ FUN_02083F88: ; 0x02083F88
add r4, r3, #0x0
add r0, r4, #0x0
mov r1, #0x1
bl FUN_021D8B64
bl MOD53_021D8B64
bl FUN_02031190
cmp r0, #0x0
bne _02083FB6
@@ -128514,7 +128514,7 @@ FUN_02083FC4: ; 0x02083FC4
add r0, r4, #0x0
mov r1, #0xf
mov r2, #0x0
bl FUN_021D8B64
bl MOD53_021D8B64
_02083FDA:
pop {r4, pc}
@@ -128674,12 +128674,12 @@ FUN_020840CC: ; 0x020840CC
add r0, r4, #0x0
bl FUN_02084270
add r0, r4, #0x0
bl FUN_021D844C
bl MOD54_021D844C
lsl r2, r5, #0x18
add r0, r4, #0x0
mov r1, #0x19
lsr r2, r2, #0x18
bl FUN_021D88E4
bl MOD54_021D88E4
mov r0, #0x1
add r1, r0, #0x0
bl FUN_020334E8
@@ -128693,12 +128693,12 @@ _02084110: .word 0x00000658
thumb_func_start FUN_02084114
FUN_02084114: ; 0x02084114
add r0, r3, #0x0
ldr r3, _02084120 ; =FUN_021D88E4
ldr r3, _02084120 ; =MOD54_021D88E4
mov r1, #0x2
mov r2, #0x0
bx r3
nop
_02084120: .word FUN_021D88E4 + 1
_02084120: .word MOD54_021D88E4
thumb_func_start FUN_02084124
FUN_02084124: ; 0x02084124
@@ -128736,7 +128736,7 @@ _0208415E:
ldr r1, [r4, r1]
cmp r1, r0
bne _02084186
bl FUN_021D8C24
bl MOD54_021D8C24
ldr r1, _02084208 ; =0x00004A48
ldr r1, [r4, r1]
cmp r1, r0
@@ -128792,7 +128792,7 @@ _020841C8:
add r0, r4, #0x0
mov r1, #0x8
add r2, r6, #0x0
bl FUN_021D88E4
bl MOD54_021D88E4
add sp, #0x4
pop {r3-r6, pc}
_020841E6:
@@ -128802,14 +128802,14 @@ _020841E6:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x7
bl FUN_021D88E4
bl MOD54_021D88E4
add sp, #0x4
pop {r3-r6, pc}
_020841FA:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x13
bl FUN_021D88E4
bl MOD54_021D88E4
_02084204:
add sp, #0x4
pop {r3-r6, pc}
@@ -128824,7 +128824,7 @@ FUN_02084210: ; 0x02084210
add r4, r3, #0x0
add r0, r4, #0x0
mov r1, #0x1
bl FUN_021D89CC
bl MOD54_021D89CC
bl FUN_02031190
cmp r0, #0x0
bne _0208422E
@@ -128855,7 +128855,7 @@ FUN_02084238: ; 0x02084238
add r0, r4, #0x0
mov r1, #0xd
mov r2, #0x0
bl FUN_021D88E4
bl MOD54_021D88E4
_0208424E:
pop {r4, pc}

55
arm9/global.inc
View File

@@ -2637,6 +2637,11 @@
.extern FUN_020C1F54
.extern FUN_020C1FA4
.extern FUN_020C1FF0
.extern FUN_02013EA8
.extern FUN_02013EC4
.extern FUN_02013ED8
.extern FUN_02013EE0
.extern FUN_0201EC58
.extern FUN_020C20DC
.extern FUN_020C2104
.extern FUN_020C217C
@@ -2727,7 +2732,7 @@
.extern MOD04_021D83A8
.extern MOD04_021D83C0
.extern MOD04_021D83F0
.extern FUN_021D844C
.extern MOD54_021D844C
.extern MOD04_021D8494
.extern MOD04_021D8558
.extern MOD04_021D8590
@@ -2744,23 +2749,23 @@
.extern MOD04_021D8818
.extern MOD05_021D8820
.extern MOD04_021D8860
.extern FUN_021D88E4
.extern MOD54_021D88E4
.extern MOD04_021D8910
.extern MOD04_021D8944
.extern FUN_021D89CC
.extern MOD54_021D89CC
.extern MOD04_021D8A54
.extern MOD04_021D8A7C
.extern FUN_021D8B64
.extern MOD53_021D8B64
.extern MOD04_021D8BF0
.extern MOD04_021D8C08
.extern FUN_021D8C24
.extern MOD54_021D8C24
.extern MOD04_021D8C58
.extern MOD04_021D8C6C
.extern MOD04_021D8CC8
.extern MOD04_021D8CF0
.extern MOD04_021D8D04
.extern MOD04_021D8F08
.extern FUN_021D917C
.extern MOD53_021D917C
.extern MOD05_021D959C
.extern MOD05_021D967C
.extern MOD05_021D96F4
@@ -4329,8 +4334,8 @@
.extern MOD20_022524DC
.extern MOD19_022524F4
.extern MOD19_02252504
.extern FUN_02254A68
.extern FUN_02254AB8
.extern MOD51_02254A68
.extern MOD51_02254AB8
.extern FX_Atan
.extern G3X_SetEdgeColorTable
.extern G3X_SetFogTable
@@ -5588,7 +5593,27 @@
.extern FUN_0201CD38
.extern FUN_020294A8
.extern FUN_0202EEB0
.extern MOD08_02217E80
.extern MOD08_02217ECC
.extern MOD08_02217F08
.extern MOD08_0222A02C
.extern FUN_0200C6D8
.extern FUN_02029CA4
.extern FUN_02029CF4
.extern FUN_02029CF8
.extern FUN_02029D40
.extern FUN_02029D84
.extern FUN_02085D9C
.extern FUN_02085FAC
.extern FUN_02031370
.extern FUN_02016B44
.extern FUN_02017BD0
.extern FUN_0201ED5C
.extern FUN_0201EE2C
.extern FUN_0201EFB4
.extern FUN_0201F05C
.extern FUN_0200A064
.extern FUN_0200C918
.extern FUN_02031388
.extern FUN_02052F8C
.extern FUN_02083D48
@@ -5650,6 +5675,20 @@
.extern FUN_02084098
.extern FUN_020048A0
.extern FUN_020048BC
.extern FUN_02014630
.extern FUN_02024EF4
.extern FUN_02004D60
.extern FUN_020181EC
.extern FUN_02024FD8
.extern FUN_02024FE0
.extern FUN_02025010
.extern FUN_02025018
.extern FUN_02025034
.extern FUN_02025048
.extern FUN_02025050
.extern FUN_02025064
.extern FUN_0202506C
.extern FUN_0202508C
.extern SDK_OVERLAY_MODULE_00_ID
.extern SDK_OVERLAY_MODULE_01_ID
.extern SDK_OVERLAY_MODULE_02_ID

4
arm9/modules/05/asm/module_05.s
View File

@@ -9489,7 +9489,7 @@ MOD05_021DBEA0: ; 0x021DBEA0
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl FUN_02254A68
bl MOD51_02254A68
add r4, #0x80
str r0, [r4]
pop {r4, pc}
@@ -9515,7 +9515,7 @@ MOD05_021DBECC: ; 0x021DBECC
push {r3, lr}
add r0, #0x80
ldr r0, [r0]
bl FUN_02254AB8
bl MOD51_02254AB8
ldr r0, _021DBEE0 ; =SDK_OVERLAY_MODULE_51_ID
bl UnloadOverlayByID
pop {r3, pc}

74
arm9/modules/57/asm/module_57.s
View File

@@ -41,7 +41,7 @@ MOD57_021D74E0: ; 0x021D74E0
ldr r2, _021D76F0 ; =0x00003320
mov r1, #0
add r4, r0, #0
blx Call_FillMemWithValue
bl Call_FillMemWithValue
add r0, r5, #0
bl FUN_0200628C
add r1, r4, #0
@@ -722,19 +722,19 @@ _021D7AC4:
mov r1, #2
ldr r0, [r0, #0xc]
lsl r1, r1, #8
blx DC_FlushRange
bl DC_FlushRange
ldr r0, [sp]
mov r1, #0x20
ldr r5, [r0, #0xc]
mov r2, #0x60
add r0, r5, #0
add r0, #0x20
blx GXS_LoadBGPltt
bl GXS_LoadBGPltt
mov r1, #0x1e
lsl r1, r1, #4
add r0, r5, r1
mov r2, #0x20
blx GXS_LoadBGPltt
bl GXS_LoadBGPltt
add r0, r4, #0
bl FUN_02016A18
pop {r3, r4, r5, pc}
@@ -776,17 +776,17 @@ _021D7B30:
ldr r0, [sp]
mov r1, #0x20
ldr r0, [r0, #0xc]
blx DC_FlushRange
bl DC_FlushRange
ldr r0, [sp]
mov r1, #0
ldr r0, [r0, #0xc]
mov r2, #0x20
blx GX_LoadBGPltt
bl GX_LoadBGPltt
ldr r0, [sp]
mov r1, #0
ldr r0, [r0, #0xc]
mov r2, #0x20
blx GXS_LoadBGPltt
bl GXS_LoadBGPltt
add r0, r4, #0
bl FUN_02016A18
add sp, #4
@@ -809,11 +809,11 @@ MOD57_021D7B5C: ; 0x021D7B5C
ldr r5, [r0, #0xc]
mov r1, #0x20
add r0, r5, r4
blx DC_FlushRange
bl DC_FlushRange
add r0, r5, r4
mov r1, #0x80
mov r2, #0x20
blx GXS_LoadBGPltt
bl GXS_LoadBGPltt
add r0, r6, #0
bl FUN_02016A18
add sp, #4
@@ -958,13 +958,13 @@ MOD57_021D7CA4: ; 0x021D7CA4
mov r1, #2
ldr r0, [r0, #0xc]
lsl r1, r1, #8
blx DC_FlushRange
bl DC_FlushRange
ldr r0, [sp, #0x14]
mov r2, #2
ldr r0, [r0, #0xc]
mov r1, #0
lsl r2, r2, #8
blx GXS_LoadBGPltt
bl GXS_LoadBGPltt
add r0, r5, #0
bl FUN_02016A18
add r0, r4, #0
@@ -985,13 +985,13 @@ MOD57_021D7CA4: ; 0x021D7CA4
mov r1, #2
ldr r0, [r0, #0xc]
lsl r1, r1, #8
blx DC_FlushRange
bl DC_FlushRange
ldr r0, [sp, #0x10]
mov r2, #2
ldr r0, [r0, #0xc]
mov r1, #0
lsl r2, r2, #8
blx GX_LoadBGPltt
bl GX_LoadBGPltt
add r0, r5, #0
bl FUN_02016A18
add r0, r4, #0
@@ -1022,7 +1022,7 @@ _021D7D4C:
ldr r0, [r4, r1]
add r1, r1, #4
add r1, r4, r1
blx FUN_020B0030
bl FUN_020B0030
cmp r0, #0
bne _021D7D60
bl ErrorHandling
@@ -1076,7 +1076,7 @@ _021D7DBC:
ldr r0, [r4, r1]
add r1, r1, #4
add r1, r4, r1
blx FUN_020B0030
bl FUN_020B0030
cmp r0, #0
bne _021D7DD0
bl ErrorHandling
@@ -1420,17 +1420,17 @@ _021D806A:
_021D8092:
ldr r0, _021D80E0 ; =0x000030C8
ldr r0, [r4, r0]
blx FX_Inv
bl FX_Inv
add r6, r0, #0
ldr r0, _021D80EC ; =0x000030CC
ldr r0, [r4, r0]
blx FX_Inv
bl FX_Inv
mov r1, #0
str r6, [sp, #0x10]
str r1, [sp, #0x14]
str r1, [sp, #0x18]
str r0, [sp, #0x1c]
blx OS_WaitVBlankIntr
bl OS_WaitVBlankIntr
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1438,7 +1438,7 @@ _021D8092:
add r1, sp, #0x10
mov r2, #0x80
mov r3, #0x60
blx G2x_SetBGyAffine_
bl G2x_SetBGyAffine_
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1446,7 +1446,7 @@ _021D8092:
add r1, sp, #0x10
mov r2, #0x80
mov r3, #0x60
blx G2x_SetBGyAffine_
bl G2x_SetBGyAffine_
add r0, r5, #0
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
@@ -1562,24 +1562,24 @@ _021D81A8:
_021D81AE:
mov r0, #1
lsl r0, r0, #0xc
blx FX_Inv
bl FX_Inv
add r5, r0, #0
ldr r0, _021D81E8 ; =0x000030D0
ldr r0, [r4, r0]
blx FX_Inv
bl FX_Inv
mov r1, #0
str r5, [sp, #8]
str r1, [sp, #0xc]
str r1, [sp, #0x10]
str r0, [sp, #0x14]
blx OS_WaitVBlankIntr
bl OS_WaitVBlankIntr
mov r3, #0
str r3, [sp]
ldr r0, _021D81F4 ; =0x04000030
add r1, sp, #8
mov r2, #0x80
str r3, [sp, #4]
blx G2x_SetBGyAffine_
bl G2x_SetBGyAffine_
mov r0, #0
add sp, #0x18
pop {r3, r4, r5, pc}
@@ -2068,17 +2068,17 @@ MOD57_021D8588: ; 0x021D8588
sub sp, #0x18
mov r0, #1
lsl r0, r0, #0xc
blx FX_Inv
bl FX_Inv
add r4, r0, #0
mov r0, #1
lsl r0, r0, #0xc
blx FX_Inv
bl FX_Inv
mov r1, #0
str r4, [sp, #8]
str r1, [sp, #0xc]
str r1, [sp, #0x10]
str r0, [sp, #0x14]
blx OS_WaitVBlankIntr
bl OS_WaitVBlankIntr
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -2086,7 +2086,7 @@ MOD57_021D8588: ; 0x021D8588
add r1, sp, #8
mov r2, #0x80
mov r3, #0x60
blx G2x_SetBGyAffine_
bl G2x_SetBGyAffine_
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -2094,15 +2094,15 @@ MOD57_021D8588: ; 0x021D8588
add r1, sp, #8
mov r2, #0x80
mov r3, #0x60
blx G2x_SetBGyAffine_
blx OS_WaitVBlankIntr
bl G2x_SetBGyAffine_
bl OS_WaitVBlankIntr
mov r3, #0
str r3, [sp]
ldr r0, _021D85F0 ; =0x04000030
add r1, sp, #8
mov r2, #0x80
str r3, [sp, #4]
blx G2x_SetBGyAffine_
bl G2x_SetBGyAffine_
add sp, #0x18
pop {r4, pc}
.align 2, 0
@@ -2538,7 +2538,7 @@ _021D88F0:
mov r1, #0x1e
ldrb r0, [r4, r0]
add r0, r0, #1
blx _s32_div_f
bl _s32_div_f
ldr r0, _021D8904 ; =0x0000331E
strb r1, [r4, r0]
_021D8900:
@@ -3573,7 +3573,7 @@ MOD57_021D9184: ; 0x021D9184
sub sp, #0x3c
add r7, r0, #0
bl MOD57_021D9578
blx FUN_020B0FC0
bl FUN_020B0FC0
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -3709,7 +3709,7 @@ _021D9290:
beq _021D92CA
ldr r1, [sp, #0x18]
add r1, r1, r6
blx FUN_020B0138
bl FUN_020B0138
cmp r0, #0
bne _021D92CE
mov r0, #0x1e
@@ -4024,7 +4024,7 @@ _021D9536:
ldr r0, [r1, r0]
bl FUN_02020354
mov r1, #1
blx FUN_020B19C4
bl FUN_020B19C4
str r0, [sp]
lsl r0, r4, #5
str r0, [sp, #4]
@@ -4036,13 +4036,13 @@ _021D9536:
ldr r4, [r0, #0xc]
mov r1, #0x20
add r0, r4, r5
blx DC_FlushRange
bl DC_FlushRange
ldr r2, [sp]
ldr r1, [sp, #4]
add r0, r4, r5
add r1, r2, r1
mov r2, #0x20
blx GX_LoadOBJPltt
bl GX_LoadOBJPltt
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0

2481
arm9/modules/58/asm/module_58.s Normal file
View File

File diff suppressed because it is too large Load Diff

5042
arm9/modules/59/asm/module_59.s Normal file
View File

File diff suppressed because it is too large Load Diff

1491
arm9/modules/60/asm/module_60.s Normal file
View File

File diff suppressed because it is too large Load Diff

1907
arm9/modules/61/asm/module_61.s Normal file
View File

File diff suppressed because it is too large Load Diff

7543
arm9/modules/62/asm/module_62.s Normal file
View File

File diff suppressed because it is too large Load Diff

8588
arm9/modules/63/asm/module_63.s Normal file
View File

File diff suppressed because it is too large Load Diff

3582
arm9/modules/64/asm/module_64.s Normal file
View File

File diff suppressed because it is too large Load Diff

9
arm9/undefined_syms.txt
View File

@@ -1,12 +1,5 @@
// Overlay
FUN_021D844C = 0x021D844C;
FUN_021D88E4 = 0x021D88E4;
FUN_021D89CC = 0x021D89CC;
FUN_021D8B64 = 0x021D8B64;
FUN_021D8C24 = 0x021D8C24;
FUN_021D917C = 0x021D917C;
MOD63_UNK_021DBE18 = 0x021DBE18;
FUN_0222DAEC = 0x0222DAEC;
FUN_0222DD1C = 0x0222DD1C;
FUN_0222DD38 = 0x0222DD38;
@@ -28,8 +21,6 @@ FUN_02213B08 = 0x02213B08;
FUN_02213D80 = 0x02213D80;
FUN_02213DBC = 0x02213DBC;
FUN_02213E24 = 0x02213E24;
FUN_02254A68 = 0x02254A68;
FUN_02254AB8 = 0x02254AB8;
// Overlay

176
pokediamond.lcf
View File

@@ -289,355 +289,355 @@ SECTIONS {
INCLUDE arm9.bin
} > arm9
.arm9_table : AT (0x0010B800) {
.arm9_table : AT (0x10B800) {
INCLUDE arm9_table.bin
} >> arm9
.MODULE_00 : AT (0x0010C400) {
.MODULE_00 : AT (0x10C400) {
INCLUDE MODULE_00.bin
} >> arm9
.MODULE_01 : AT (0x0010C600) {
.MODULE_01 : AT (0x10C600) {
INCLUDE MODULE_01.bin
} >> arm9
.MODULE_02 : AT (0x0010C800) {
.MODULE_02 : AT (0x10C800) {
INCLUDE MODULE_02.bin
} >> arm9
.MODULE_03 : AT (0x0010CA00) {
.MODULE_03 : AT (0x10CA00) {
INCLUDE MODULE_03.bin
} >> arm9
.MODULE_04 : AT (0x0010CC00) {
.MODULE_04 : AT (0x10CC00) {
INCLUDE MODULE_04.bin
} >> arm9
.MODULE_05 : AT (0x00145400) {
.MODULE_05 : AT (0x145400) {
INCLUDE MODULE_05.bin
} >> arm9
.MODULE_06 : AT (0x0016B600) {
.MODULE_06 : AT (0x16B600) {
INCLUDE MODULE_06.bin
} >> arm9
.MODULE_07 : AT (0x00184400) {
.MODULE_07 : AT (0x184400) {
INCLUDE MODULE_07.bin
} >> arm9
.MODULE_08 : AT (0x00187800) {
.MODULE_08 : AT (0x187800) {
INCLUDE MODULE_08.bin
} >> arm9
.MODULE_09 : AT (0x001A3000) {
.MODULE_09 : AT (0x1A3000) {
INCLUDE MODULE_09.bin
} >> arm9
.MODULE_10 : AT (0x001AD200) {
.MODULE_10 : AT (0x1AD200) {
INCLUDE MODULE_10.bin
} >> arm9
.MODULE_11 : AT (0x001AD400) {
.MODULE_11 : AT (0x1AD400) {
INCLUDE MODULE_11.bin
} >> arm9
.MODULE_12 : AT (0x001DFE00) {
.MODULE_12 : AT (0x1DFE00) {
INCLUDE MODULE_12.bin
} >> arm9
.MODULE_13 : AT (0x001F9200) {
.MODULE_13 : AT (0x1F9200) {
INCLUDE MODULE_13.bin
} >> arm9
.MODULE_14 : AT (0x00227E00) {
.MODULE_14 : AT (0x227E00) {
INCLUDE MODULE_14.bin
} >> arm9
.MODULE_15 : AT (0x00237400) {
.MODULE_15 : AT (0x237400) {
INCLUDE MODULE_15.bin
} >> arm9
.MODULE_16 : AT (0x0023BC00) {
.MODULE_16 : AT (0x23BC00) {
INCLUDE MODULE_16.bin
} >> arm9
.MODULE_17 : AT (0x00264200) {
.MODULE_17 : AT (0x264200) {
INCLUDE MODULE_17.bin
} >> arm9
.MODULE_18 : AT (0x0026B200) {
.MODULE_18 : AT (0x26B200) {
INCLUDE MODULE_18.bin
} >> arm9
.MODULE_19 : AT (0x00283000) {
.MODULE_19 : AT (0x283000) {
INCLUDE MODULE_19.bin
} >> arm9
.MODULE_20 : AT (0x00283200) {
.MODULE_20 : AT (0x283200) {
INCLUDE MODULE_20.bin
} >> arm9
.MODULE_21 : AT (0x00285600) {
.MODULE_21 : AT (0x285600) {
INCLUDE MODULE_21.bin
} >> arm9
.MODULE_22 : AT (0x00285C00) {
.MODULE_22 : AT (0x285C00) {
INCLUDE MODULE_22.bin
} >> arm9
.MODULE_23 : AT (0x00286C00) {
.MODULE_23 : AT (0x286C00) {
INCLUDE MODULE_23.bin
} >> arm9
.MODULE_24 : AT (0x00288600) {
.MODULE_24 : AT (0x288600) {
INCLUDE MODULE_24.bin
} >> arm9
.MODULE_25 : AT (0x00289000) {
.MODULE_25 : AT (0x289000) {
INCLUDE MODULE_25.bin
} >> arm9
.MODULE_26 : AT (0x00289600) {
.MODULE_26 : AT (0x289600) {
INCLUDE MODULE_26.bin
} >> arm9
.MODULE_27 : AT (0x00289E00) {
.MODULE_27 : AT (0x289E00) {
INCLUDE MODULE_27.bin
} >> arm9
.MODULE_28 : AT (0x0028AA00) {
.MODULE_28 : AT (0x28AA00) {
INCLUDE MODULE_28.bin
} >> arm9
.MODULE_29 : AT (0x0028C200) {
.MODULE_29 : AT (0x28C200) {
INCLUDE MODULE_29.bin
} >> arm9
.MODULE_30 : AT (0x0028CC00) {
.MODULE_30 : AT (0x28CC00) {
INCLUDE MODULE_30.bin
} >> arm9
.MODULE_31 : AT (0x0028D200) {
.MODULE_31 : AT (0x28D200) {
INCLUDE MODULE_31.bin
} >> arm9
.MODULE_32 : AT (0x0028D800) {
.MODULE_32 : AT (0x28D800) {
INCLUDE MODULE_32.bin
} >> arm9
.MODULE_33 : AT (0x0028DE00) {
.MODULE_33 : AT (0x28DE00) {
INCLUDE MODULE_33.bin
} >> arm9
.MODULE_34 : AT (0x0028E200) {
.MODULE_34 : AT (0x28E200) {
INCLUDE MODULE_34.bin
} >> arm9
.MODULE_35 : AT (0x0028E800) {
.MODULE_35 : AT (0x28E800) {
INCLUDE MODULE_35.bin
} >> arm9
.MODULE_36 : AT (0x0028F200) {
.MODULE_36 : AT (0x28F200) {
INCLUDE MODULE_36.bin
} >> arm9
.MODULE_37 : AT (0x00290000) {
.MODULE_37 : AT (0x290000) {
INCLUDE MODULE_37.bin
} >> arm9
.MODULE_38 : AT (0x00290600) {
.MODULE_38 : AT (0x290600) {
INCLUDE MODULE_38.bin
} >> arm9
.MODULE_39 : AT (0x00291200) {
.MODULE_39 : AT (0x291200) {
INCLUDE MODULE_39.bin
} >> arm9
.MODULE_40 : AT (0x00292000) {
.MODULE_40 : AT (0x292000) {
INCLUDE MODULE_40.bin
} >> arm9
.MODULE_41 : AT (0x00292E00) {
.MODULE_41 : AT (0x292E00) {
INCLUDE MODULE_41.bin
} >> arm9
.MODULE_42 : AT (0x00294000) {
.MODULE_42 : AT (0x294000) {
INCLUDE MODULE_42.bin
} >> arm9
.MODULE_43 : AT (0x00294A00) {
.MODULE_43 : AT (0x294A00) {
INCLUDE MODULE_43.bin
} >> arm9
.MODULE_44 : AT (0x00295400) {
.MODULE_44 : AT (0x295400) {
INCLUDE MODULE_44.bin
} >> arm9
.MODULE_45 : AT (0x00295A00) {
.MODULE_45 : AT (0x295A00) {
INCLUDE MODULE_45.bin
} >> arm9
.MODULE_46 : AT (0x00296400) {
.MODULE_46 : AT (0x296400) {
INCLUDE MODULE_46.bin
} >> arm9
.MODULE_47 : AT (0x00296800) {
.MODULE_47 : AT (0x296800) {
INCLUDE MODULE_47.bin
} >> arm9
.MODULE_48 : AT (0x00297600) {
.MODULE_48 : AT (0x297600) {
INCLUDE MODULE_48.bin
} >> arm9
.MODULE_49 : AT (0x00298000) {
.MODULE_49 : AT (0x298000) {
INCLUDE MODULE_49.bin
} >> arm9
.MODULE_50 : AT (0x00298600) {
.MODULE_50 : AT (0x298600) {
INCLUDE MODULE_50.bin
} >> arm9
.MODULE_51 : AT (0x00298A00) {
.MODULE_51 : AT (0x298A00) {
INCLUDE MODULE_51.bin
} >> arm9
.MODULE_52 : AT (0x00299A00) {
.MODULE_52 : AT (0x299A00) {
INCLUDE MODULE_52.bin
} >> arm9
.MODULE_53 : AT (0x00299E00) {
.MODULE_53 : AT (0x299E00) {
INCLUDE MODULE_53.bin
} >> arm9
.MODULE_54 : AT (0x0029C400) {
.MODULE_54 : AT (0x29C400) {
INCLUDE MODULE_54.bin
} >> arm9
.MODULE_55 : AT (0x0029E800) {
.MODULE_55 : AT (0x29E800) {
INCLUDE MODULE_55.bin
} >> arm9
.MODULE_56 : AT (0x002A1A00) {
.MODULE_56 : AT (0x2A1A00) {
INCLUDE MODULE_56.bin
} >> arm9
.MODULE_57 : AT (0x002A6200) {
.MODULE_57 : AT (0x2A6200) {
INCLUDE MODULE_57.bin
} >> arm9
.MODULE_58 : AT (0x002A8800) {
.MODULE_58 : AT (0x2A8800) {
INCLUDE MODULE_58.bin
} >> arm9
.MODULE_59 : AT (0x002A9E00) {
.MODULE_59 : AT (0x2A9E00) {
INCLUDE MODULE_59.bin
} >> arm9
.MODULE_60 : AT (0x002ACC00) {
.MODULE_60 : AT (0x2ACC00) {
INCLUDE MODULE_60.bin
} >> arm9
.MODULE_61 : AT (0x002ADA00) {
.MODULE_61 : AT (0x2ADA00) {
INCLUDE MODULE_61.bin
} >> arm9
.MODULE_62 : AT (0x002AEC00) {
.MODULE_62 : AT (0x2AEC00) {
INCLUDE MODULE_62.bin
} >> arm9
.MODULE_63 : AT (0x002B2A00) {
.MODULE_63 : AT (0x2B2A00) {
INCLUDE MODULE_63.bin
} >> arm9
.MODULE_64 : AT (0x002B7600) {
.MODULE_64 : AT (0x2B7600) {
INCLUDE MODULE_64.bin
} >> arm9
.MODULE_65 : AT (0x002B9400) {
.MODULE_65 : AT (0x2B9400) {
INCLUDE MODULE_65.bin
} >> arm9
.MODULE_66 : AT (0x002BC400) {
.MODULE_66 : AT (0x2BC400) {
INCLUDE MODULE_66.bin
} >> arm9
.MODULE_67 : AT (0x002BEC00) {
.MODULE_67 : AT (0x2BEC00) {
INCLUDE MODULE_67.bin
} >> arm9
.MODULE_68 : AT (0x002C1200) {
.MODULE_68 : AT (0x2C1200) {
INCLUDE MODULE_68.bin
} >> arm9
.MODULE_69 : AT (0x002C2800) {
.MODULE_69 : AT (0x2C2800) {
INCLUDE MODULE_69.bin
} >> arm9
.MODULE_70 : AT (0x002C4C00) {
.MODULE_70 : AT (0x2C4C00) {
INCLUDE MODULE_70.bin
} >> arm9
.MODULE_71 : AT (0x002C5C00) {
.MODULE_71 : AT (0x2C5C00) {
INCLUDE MODULE_71.bin
} >> arm9
.MODULE_72 : AT (0x002C9C00) {
.MODULE_72 : AT (0x2C9C00) {
INCLUDE MODULE_72.bin
} >> arm9
.MODULE_73 : AT (0x002C9E00) {
.MODULE_73 : AT (0x2C9E00) {
INCLUDE MODULE_73.bin
} >> arm9
.MODULE_74 : AT (0x002CEA00) {
.MODULE_74 : AT (0x2CEA00) {
INCLUDE MODULE_74.bin
} >> arm9
.MODULE_75 : AT (0x002CFE00) {
.MODULE_75 : AT (0x2CFE00) {
INCLUDE MODULE_75.bin
} >> arm9
.MODULE_76 : AT (0x002D5C00) {
.MODULE_76 : AT (0x2D5C00) {
INCLUDE MODULE_76.bin
} >> arm9
.MODULE_77 : AT (0x002D7C00) {
.MODULE_77 : AT (0x2D7C00) {
INCLUDE MODULE_77.bin
} >> arm9
.MODULE_78 : AT (0x002D9800) {
.MODULE_78 : AT (0x2D9800) {
INCLUDE MODULE_78.bin
} >> arm9
.MODULE_79 : AT (0x002D9E00) {
.MODULE_79 : AT (0x2D9E00) {
INCLUDE MODULE_79.bin
} >> arm9
.MODULE_80 : AT (0x002DF200) {
.MODULE_80 : AT (0x2DF200) {
INCLUDE MODULE_80.bin
} >> arm9
.MODULE_81 : AT (0x002E9A00) {
.MODULE_81 : AT (0x2E9A00) {
INCLUDE MODULE_81.bin
} >> arm9
.MODULE_82 : AT (0x002EF000) {
.MODULE_82 : AT (0x2EF000) {
INCLUDE MODULE_82.bin
} >> arm9
.MODULE_83 : AT (0x002F1600) {
.MODULE_83 : AT (0x2F1600) {
INCLUDE MODULE_83.bin
} >> arm9
.MODULE_84 : AT (0x002FFA00) {
.MODULE_84 : AT (0x2FFA00) {
INCLUDE MODULE_84.bin
} >> arm9
.MODULE_85 : AT (0x00303400) {
.MODULE_85 : AT (0x303400) {
INCLUDE MODULE_85.bin
} >> arm9
.MODULE_86 : AT (0x0030C600) {
.MODULE_86 : AT (0x30C600) {
INCLUDE MODULE_86.bin
} >> arm9