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 branch 'master' into master

Browse Source
This commit is contained in:
Cleverking2003
2020-04-29 23:06:12 +03:00
committed by GitHub
parent c197dfc985 84f0713c69
commit facbc48530
8 changed files with 31535 additions and 1836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arm7/arm7.lcf
View File

@@ -21,7 +21,7 @@ SECTIONS {
SDK_AUTOLOAD_START = .;
.itcm : AT (0x1b0) {
arm7_rom.o (.itcm)
itcm.o (.text)
} > .itcm
.dtcm : AT (0x28C) {
@@ -32,7 +32,7 @@ SECTIONS {
} > .dtcm
.ewram : AT (0xF998) {
arm7_rom.o (.ewram)
ext.o (.text)
} > .ewram
.autoload : AT (0x292F8) {

3614
arm7/asm/dtcm.s
View File

File diff suppressed because it is too large Load Diff

3
arm7/asm/dtcm2.s
View File

@@ -6660,6 +6660,9 @@ _03806B24: .word _0380A3F0
_03806B28: .word _0380A400
_03806B2C: .word FUN_03806854
_03806B30: .word FUN_03806920
arm_func_start FUN_03806B34
FUN_03806B34: ; 0x03806B34
ldr r1, _03806B6C ;@ =0x55555555
and r1, r1, r0, lsr #1
sub r2, r0, r1

29611
arm7/asm/ext.s Normal file
View File

File diff suppressed because it is too large Load Diff

5
arm7/asm/arm7_rom.s → arm7/asm/itcm.s
View File

@@ -2,7 +2,7 @@
.include "asm/macros.inc"
.include "global.inc"
.section .itcm
.section .text
arm_func_start FUN_027E0000
FUN_027E0000: ; 0x027E0000 load at 0x023801B0
stmdb sp!, {r4, r5, r6, lr}
@@ -69,6 +69,3 @@ _027E00CC: .word 0x027E00DC
_027E00D0: .word 0x0380A3F4
_027E00D4: .word 0x0380A3FC
_027E00D8: .word 0x027FAFCC
.section .ewram
.incbin "baserom.nds", 0x31C998, 0x19960

63
arm7/global.inc
View File

@@ -89,9 +89,72 @@
.extern FUN_03806AD0
.extern FUN_038073EC
.extern FUN_03807408
.extern FUN_037F8858
.extern FUN_037F8894
.extern FUN_037F894C
.extern FUN_037F8A24
.extern FUN_037F8D50
.extern FUN_037F8D88
.extern FUN_037F8E14
.extern FUN_037F8EB8
.extern FUN_037F8FB4
.extern FUN_037F90B8
.extern FUN_037F90CC
.extern FUN_037F9218
.extern FUN_037F9244
.extern FUN_037F9884
.extern FUN_037F9924
.extern FUN_037F99B8
.extern FUN_037F9A6C
.extern FUN_037F9ADC
.extern FUN_037F9B68
.extern FUN_037FA0C4
.extern FUN_037FA138
.extern FUN_037FA364
.extern FUN_037FA650
.extern FUN_037FA6E0
.extern FUN_037FA75C
.extern FUN_037FA900
.extern FUN_037FA910
.extern FUN_037FACAC
.extern FUN_037FAE20
.extern FUN_037FAEB8
.extern FUN_037FAFD0
.extern FUN_037FAFE0
.extern FUN_037FB05C
.extern FUN_037FB070
.extern FUN_037FB1F0
.extern FUN_037FB290
.extern FUN_037FB300
.extern FUN_037FB318
.extern FUN_037FB334
.extern FUN_037FB348
.extern FUN_037FB360
.extern FUN_037FB3E4
.extern FUN_037FB478
.extern FUN_037FB5B0
.extern FUN_037FB7A8
.extern FUN_037FBAA8
.extern FUN_03801474
.extern FUN_038014E0
.extern FUN_03802BC8
.extern FUN_03804798
.extern FUN_03804E50
.extern FUN_03804F70
.extern FUN_03806F8C
.extern FUN_03807408
.extern FUN_03807534
.extern FUN_03807590
.extern FUN_03806B34
.extern _0380B764
.extern _0380B808
.extern _0380B8AC
.extern _0380B8D8
.extern _0380B904
.extern _ll_sdiv
.extern _ll_udiv
.extern _s32_div_f
.extern _u32_div_f
.extern _03807170
.extern _03807194
.extern _03807294

69
arm7/undefined_syms.txt
View File

@@ -1,39 +1,27 @@
// ???
// DTCM
// EWRAM
SDK_AUTOLOAD_ITCM_BSS_SIZE = 0x00000000;
SDK_SYS_STACKSIZE = 0x00000000;
CONST_34 = 0x00000034;
CONST_3F = 0x0000003F;
SDK_IRQ_STACKSIZE = 0x00000400;
SDK_AUTOLOAD_LIST = 0x023A92F8;
SDK_AUTOLOAD_ITCM_START = 0x027E0000;
SDK_AUTOLOAD_ITCM_SIZE = 0x000000DC;
SDK_AUTOLOAD_ITCM_BSS_SIZE = 0x00000000;
SDK_AUTOLOAD_DTCM_START = 0x037F8000;
SDK_AUTOLOAD_DTCM_SIZE = 0x0000F70C;
SDK_AUTOLOAD_DTCM_BSS_SIZE = 0x00004220;
SDK_AUTOLOAD_EXT_START = 0x06000000;
SDK_AUTOLOAD_EXT_SIZE = 0x00019960;
SDK_IRQ_STACKSIZE = 0x00000400;
SDK_AUTOLOAD_EXT_BSS_SIZE = 0x00001590;
SDK_AUTOLOAD_LIST_END = SDK_AUTOLOAD_LIST + 0x24;
// ???
SDK_AUTOLOAD_DTCM_BSS_SIZE = 0x00004220;
SDK_AUTOLOAD_DTCM_SIZE = 0x0000F70C;
SDK_AUTOLOAD_EXT_SIZE = 0x00019960;
SDK_MAIN_ARENA_LO = 0x0225FFA0;
// EWRAM
SDK_AUTOLOAD_LIST = 0x023A92F8;
SDK_SECTION_ARENA_EX_START = 0x023E0000;
_060001F8 = 0x060001F8;
_06000204 = 0x06000204;
_06000798 = 0x06000798;
_060009A4 = 0x060009A4;
_06006978 = 0x06006978;
_06008CC4 = 0x06008CC4;
_06019960 = 0x06019960;
_0601A960 = 0x0601A960;
_0601AE88 = 0x0601AE88;
// DTCM
SDK_AUTOLOAD_ITCM_START = 0x027E0000;
gUnk027FFC20 = 0x027FFC20;
SDK_AUTOLOAD_DTCM_START = 0x037F8000;
FUN_037F90B8 = 0x037F90B8;
FUN_037F9B68 = 0x037F9B68;
FUN_037FB300 = 0x037FB300;
FUN_037FB318 = 0x037FB318;
SVC_SoftReset = 0x038010D4;
SVC_WaitByLoop = 0x038010D8;
SVC_WaitIntr = 0x038010DC;
@@ -171,3 +159,28 @@ _0380A400 = 0x0380A400;
_0380A4A4 = 0x0380A4A4;
_0380AA64 = 0x0380AA64;
_0380B064 = 0x0380B064;
_0380B764 = 0x0380B764;
_0380B808 = 0x0380B808;
_0380B8AC = 0x0380B8AC;
_0380B8D8 = 0x0380B8D8;
_0380B904 = 0x0380B904;
SDK_AUTOLOAD_EXT_START = 0x06000000;
_060001F8 = 0x060001F8;
_06000204 = 0x06000204;
_06000798 = 0x06000798;
_060009A4 = 0x060009A4;
_06006978 = 0x06006978;
_06008CC4 = 0x06008CC4;
_06019960 = 0x06019960;
_06019980 = 0x06019980;
_06019988 = 0x06019988;
_060199A8 = 0x060199A8;
_060199B8 = 0x060199B8;
_060199D8 = 0x060199D8;
_060199E8 = 0x060199E8;
_06019A08 = 0x06019A08;
_0601A960 = 0x0601A960;
_0601AA88 = 0x0601AA88;
_0601AE88 = 0x0601AE88;
_0601AEB4 = 0x0601AEB4;
SDK_AUTOLOAD_LIST_END = SDK_AUTOLOAD_LIST + 0x24;

2
arm9/Makefile
View File

@@ -145,7 +145,7 @@ $(BUILD_DIR)/%.o: %.c
$(BUILD_DIR)/%.o: %.s
$(AS) $(ASFLAGS) $< -o $@
$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) undefined_syms.txt
$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) undefined_syms.txt macros.lcf.inc
$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BIN_FILES)