diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-12-02 13:18:19 -0800 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-12-02 13:18:19 -0800 |
| commit | 385740fc144fb051a139dc764b7b2598599678e8 (patch) | |
| tree | 22a8b49c0f9516dec1e96d62a05d0ff893004d76 | |
| parent | 6f127dca8f6f4462d6f50807a8456316340d674f (diff) | |
Split out data/berry_powder.s
| -rw-r--r-- | data/berry_powder.s | 36 | ||||
| -rw-r--r-- | data/data_8471F50.s (renamed from data/data_8471F00.s) | 3 | ||||
| -rw-r--r-- | ld_script.txt | 7 |
3 files changed, 40 insertions, 6 deletions
diff --git a/data/berry_powder.s b/data/berry_powder.s new file mode 100644 index 000000000..0f812d79d --- /dev/null +++ b/data/berry_powder.s @@ -0,0 +1,36 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + + .align 2 +gUnknown_847565C_UnrefDupe:: @ 8471F00 struct BgTemplate(???) + .4byte 0x000001e0 + .4byte 0x000012c9 + .4byte 0x000012ea + .4byte 0x000021ff + .4byte 0x000000ff + .4byte 0x00000000 + + .align 2 +gUnknown_8475674_UnrefDupe:: @ 8471F18 + window_template 0x00, 0x01, 0x01, 0x1c, 0x03, 0x0d, 0x0013 + window_template 0x00, 0x01, 0x06, 0x1c, 0x0d, 0x0d, 0x0067 + + .align 2 +gUnknown_8475684_UnrefDupe:: @ 8471F28 + window_template 0x00, 0x01, 0x06, 0x1c, 0x07, 0x0d, 0x0067 + + .align 2 +gUnknown_847568C_UnrefDupe:: @ 8471F30 + window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013 + window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c + + .align 2 +gUnknown_847569C_UnrefDupe:: @ 8471F40 + window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013 + + .align 2 +gUnknown_84756A4_UnrefDupe:: @ 8471F48 + window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013 diff --git a/data/data_8471F00.s b/data/data_8471F50.s index c3b4b7c01..8a3a7ae77 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F50.s @@ -14,9 +14,6 @@ .section .rodata .align 2 -gUnknown_8471F00:: - .incbin "baserom.gba", 0x471F00, 0x50 - gUnknown_8471F50:: @ 8471F50 .incbin "baserom.gba", 0x471F50, 0x113 diff --git a/ld_script.txt b/ld_script.txt index cf7005555..6b8c45d96 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -551,18 +551,19 @@ SECTIONS { src/braille_text.o(.rodata); src/text_window_graphics.o(.rodata); src/quest_log_8150454.o(.rodata); - data/data_8471F00.o(.rodata); + data/berry_powder.o(.rodata); + data/data_8471F50.o(.rodata); src/battle_controller_pokedude.o(.rodata); src/teachy_tv.o(.rodata); src/unk_815C980.o(.rodata); - data/data_8471F00.o(.rodata.8479668); + data/data_8471F50.o(.rodata.8479668); src/ss_anne.o(.rodata); src/cereader_tool.o(.rodata); src/renewable_hidden_items.o(.rodata); src/trainer_tower.o(.rodata); src/unk_815F138.o(.rodata); src/berry_fix_program.o(.rodata); - data/data_8471F00.o(.rodata.after_trainer_tower); + data/data_8471F50.o(.rodata.after_trainer_tower); /* These should not be moved to C files */ src/mystery_event_msg.o(.rodata); |