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

Merge pull request #186 from PikalaxALT/pikalax_work

Browse Source 
Spring cleanup. In summer.
This commit is contained in:
Revo
2020-06-23 22:34:29 -04:00
committed by GitHub
parent 615c6579c8 5ce948ab4a
commit b071ca4b3d
6 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arm9/arm9.lcf
View File

@@ -635,6 +635,7 @@ SECTIONS {
unk_02033F50.o (.rodata)
unk_02034188.o (.rodata)
unk_02034710.o (.rodata)
unk_02034E84.o (.rodata)
unk_02034FE4.o (.rodata)
unk_02035068.o (.rodata)
unk_020377B0.o (.rodata)

22
arm9/asm/unk_0200AA80.s
View File

@@ -5,16 +5,20 @@
.global UNK_020ECE64
UNK_020ECE64: ; 0x020ECE64
.byte 0x7E, 0x01, 0x80, 0x01, 0x7F, 0x01, 0x00, 0x00
.short 0x017E
.short 0x0180
.short 0x017F
.balign 4
.global UNK_020ECE6C
UNK_020ECE6C: ; 0x020ECE6C
.byte 0x40, 0x01
.global UNK_020ECE6E
UNK_020ECE6E: ; 0x020ECE6E
.byte 0x08, 0x00, 0x60, 0x01, 0x10, 0x00, 0xA0, 0x01, 0x10, 0x00, 0xE0, 0x01, 0x10, 0x00, 0x20, 0x02
.byte 0x10, 0x00, 0x60, 0x02, 0x10, 0x00, 0xA0, 0x02, 0x10, 0x00
.short 0x0140, 0x0008
.short 0x0160, 0x0010
.short 0x01A0, 0x0010
.short 0x01E0, 0x0010
.short 0x0220, 0x0010
.short 0x0260, 0x0010
.short 0x02A0, 0x0010
.text
@@ -1990,7 +1994,7 @@ FUN_0200B9A8: ; 0x0200B9A8
push {r3-r5, lr}
sub sp, #0x18
add r4, r0, #0x0
ldr r0, _0200B9E4 ; =UNK_020ECE6E
ldr r0, _0200B9E4 ; =UNK_020ECE6C + 2
lsl r5, r1, #0x2
ldrh r1, [r0, r5]
lsl r3, r3, #0x10
@@ -2017,7 +2021,7 @@ FUN_0200B9A8: ; 0x0200B9A8
add sp, #0x18
pop {r3-r5, pc}
.balign 4
_0200B9E4: .word UNK_020ECE6E
_0200B9E4: .word UNK_020ECE6C + 2
_0200B9E8: .word UNK_020ECE6C
thumb_func_start FUN_0200B9EC

62
arm9/asm/unk_02034710.s
View File

@@ -612,68 +612,6 @@ UNK_020EEDBC: ; 0x020EEDBC
map_header 0x2e, 0xf, 0x42, 0x170, 0x33b, 0x12, 0x428, 0x428, 0xffff, 0x0, MAPSEC_TURNBACK_CAVE, 0xe, 0x0, 0x3, 0x7b
map_header 0x20, 0xf, 0xa6, 0x74, 0x243, 0x79, 0x441, 0x441, 0xffff, 0x1ff, MAPSEC_CONTEST_HALL, 0x0, 0x0, 0x4, 0x7
.global UNK_020F2224
UNK_020F2224: ; 0x020F2224
.short 0x019E, 0x0008, 0x0008, 0x019B, 0x0074, 0x0376
.byte 0x01, 0x01, 0x00, 0x00
.short 0x01A4, 0x0008, 0x0006, 0x01A2, 0x00B1, 0x034B
.byte 0x01, 0x01, 0x01, 0x00
.short 0x01AC, 0x0008, 0x0006, 0x01AA, 0x00B0, 0x029B
.byte 0x01, 0x01, 0x02, 0x00
.short 0x01B3, 0x0008, 0x0006, 0x01B1, 0x0236, 0x0291
.byte 0x01, 0x01, 0x03, 0x00
.short 0x01BB, 0x0008, 0x0006, 0x01BA, 0x01D8, 0x021B
.byte 0x01, 0x01, 0x04, 0x00
.short 0x0006, 0x0008, 0x0006, 0x0003, 0x00B4, 0x0309
.byte 0x01, 0x01, 0x07, 0x00
.short 0x0024, 0x0008, 0x0006, 0x0021, 0x003A, 0x02D3
.byte 0x01, 0x01, 0x08, 0x00
.short 0x0030, 0x0008, 0x0006, 0x002D, 0x012F, 0x02F5
.byte 0x01, 0x01, 0x09, 0x00
.short 0x0045, 0x0008, 0x0006, 0x0041, 0x0131, 0x0213
.byte 0x01, 0x01, 0x0A, 0x00
.short 0x0065, 0x0008, 0x0006, 0x0056, 0x01D1, 0x02BA
.byte 0x01, 0x01, 0x0B, 0x00
.short 0x007B, 0x0008, 0x0006, 0x0078, 0x0258, 0x0330
.byte 0x01, 0x01, 0x0C, 0x00
.short 0x0086, 0x0008, 0x0006, 0x0084, 0x02CD, 0x0264
.byte 0x01, 0x01, 0x0D, 0x00
.short 0x0097, 0x0008, 0x0006, 0x0096, 0x035C, 0x0311
.byte 0x01, 0x01, 0x0E, 0x00
.short 0x00A8, 0x0008, 0x0006, 0x00A5, 0x017B, 0x00EA
.byte 0x01, 0x01, 0x0F, 0x00
.short 0x00AD, 0x0008, 0x0006, 0x00AC, 0x034A, 0x0257
.byte 0x01, 0x00, 0x10, 0x00
.short 0x00BD, 0x0008, 0x0006, 0x00BC, 0x0287, 0x01B0
.byte 0x01, 0x01, 0x11, 0x00
.short 0x01C4, 0x0008, 0x0006, 0x01C2, 0x0291, 0x0153
.byte 0x01, 0x01, 0x05, 0x00
.short 0x01CB, 0x0008, 0x0006, 0x01C9, 0x0327, 0x01CA
.byte 0x01, 0x01, 0x06, 0x00
.short 0x0189, 0x0008, 0x0006, 0x0188, 0x0132, 0x038E
.byte 0x00, 0x00, 0x42, 0x00
.short 0x00AF, 0x0004, 0x0006, 0x00AC, 0x034F, 0x0230
.byte 0x01, 0x00, 0x44, 0x00
.text
thumb_func_start FUN_02034710

64
arm9/asm/unk_02034E84.s
View File

@@ -1,7 +1,69 @@
.include "asm/macros.inc"
.include "global.inc"
.extern UNK_020F2224
.rodata
.global UNK_020F2224
UNK_020F2224: ; 0x020F2224
.short 0x019E, 0x0008, 0x0008, 0x019B, 0x0074, 0x0376
.byte 0x01, 0x01, 0x00, 0x00
.short 0x01A4, 0x0008, 0x0006, 0x01A2, 0x00B1, 0x034B
.byte 0x01, 0x01, 0x01, 0x00
.short 0x01AC, 0x0008, 0x0006, 0x01AA, 0x00B0, 0x029B
.byte 0x01, 0x01, 0x02, 0x00
.short 0x01B3, 0x0008, 0x0006, 0x01B1, 0x0236, 0x0291
.byte 0x01, 0x01, 0x03, 0x00
.short 0x01BB, 0x0008, 0x0006, 0x01BA, 0x01D8, 0x021B
.byte 0x01, 0x01, 0x04, 0x00
.short 0x0006, 0x0008, 0x0006, 0x0003, 0x00B4, 0x0309
.byte 0x01, 0x01, 0x07, 0x00
.short 0x0024, 0x0008, 0x0006, 0x0021, 0x003A, 0x02D3
.byte 0x01, 0x01, 0x08, 0x00
.short 0x0030, 0x0008, 0x0006, 0x002D, 0x012F, 0x02F5
.byte 0x01, 0x01, 0x09, 0x00
.short 0x0045, 0x0008, 0x0006, 0x0041, 0x0131, 0x0213
.byte 0x01, 0x01, 0x0A, 0x00
.short 0x0065, 0x0008, 0x0006, 0x0056, 0x01D1, 0x02BA
.byte 0x01, 0x01, 0x0B, 0x00
.short 0x007B, 0x0008, 0x0006, 0x0078, 0x0258, 0x0330
.byte 0x01, 0x01, 0x0C, 0x00
.short 0x0086, 0x0008, 0x0006, 0x0084, 0x02CD, 0x0264
.byte 0x01, 0x01, 0x0D, 0x00
.short 0x0097, 0x0008, 0x0006, 0x0096, 0x035C, 0x0311
.byte 0x01, 0x01, 0x0E, 0x00
.short 0x00A8, 0x0008, 0x0006, 0x00A5, 0x017B, 0x00EA
.byte 0x01, 0x01, 0x0F, 0x00
.short 0x00AD, 0x0008, 0x0006, 0x00AC, 0x034A, 0x0257
.byte 0x01, 0x00, 0x10, 0x00
.short 0x00BD, 0x0008, 0x0006, 0x00BC, 0x0287, 0x01B0
.byte 0x01, 0x01, 0x11, 0x00
.short 0x01C4, 0x0008, 0x0006, 0x01C2, 0x0291, 0x0153
.byte 0x01, 0x01, 0x05, 0x00
.short 0x01CB, 0x0008, 0x0006, 0x01C9, 0x0327, 0x01CA
.byte 0x01, 0x01, 0x06, 0x00
.short 0x0189, 0x0008, 0x0006, 0x0188, 0x0132, 0x038E
.byte 0x00, 0x00, 0x42, 0x00
.short 0x00AF, 0x0004, 0x0006, 0x00AC, 0x034F, 0x0230
.byte 0x01, 0x00, 0x44, 0x00
.text

5
arm9/lib/Makefile
View File

@@ -7,10 +7,6 @@ ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
include $(TOOLCHAIN)/base_tools
endif
### Default target ###
default: all
# If you are using WSL, it is recommended you build with NOWINE=1.
WSLENV ?= no
ifeq ($(WSLENV),)
@@ -73,6 +69,7 @@ LIBS := libsyscall.a
.PHONY: all clean
all: $(LIBS)
@:
clean:
$(RM) $(LIBS) $(LIBS:%.a=%/*.o)

0
arm9/modules/01/src/module_01.cpp → arm9/modules/01/src/module_01.c
View File