diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-01 13:55:39 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-01 13:56:32 -0400 |
| commit | 486a3abf6b9904bbef7219ea66023ba6ac2bb886 (patch) | |
| tree | 72a6c03e9725d2900d87a2ad15867920ec23d5fc | |
| parent | 6a90a57318aa20fb83797bbf99eafcda062b34f8 (diff) | |
Finish splitting data_835B488
| -rw-r--r-- | data/mon_markings.s | 31 | ||||
| -rw-r--r-- | data/region_map.s (renamed from data/data_835B488.s) | 26 | ||||
| -rw-r--r-- | ld_script.txt | 4 |
3 files changed, 33 insertions, 28 deletions
diff --git a/data/mon_markings.s b/data/mon_markings.s new file mode 100644 index 000000000..ff9529e50 --- /dev/null +++ b/data/mon_markings.s @@ -0,0 +1,31 @@ +#include "constants/maps.h" +#include "constants/species.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnknown_83EE008:: @ 83EE008 + .incbin "baserom.gba", 0x3EE008, 0x20 + +gUnknown_83EE028:: @ 83EE028 + .incbin "baserom.gba", 0x3EE028, 0x808 + +gUnknown_83EE830:: @ 83EE830 + .incbin "baserom.gba", 0x3EE830, 0x8 + +gUnknown_83EE838:: @ 83EE838 + .incbin "baserom.gba", 0x3EE838, 0x58 + +gUnknown_83EE890:: @ 83EE890 + .incbin "baserom.gba", 0x3EE890, 0x38 + +gUnknown_83EE8C8:: @ 83EE8C8 + .incbin "baserom.gba", 0x3EE8C8, 0x8 + +gUnknown_83EE8D0:: @ 83EE8D0 + .incbin "baserom.gba", 0x3EE8D0, 0x88 + +gUnknown_83EE958:: @ 83EE958 + .incbin "baserom.gba", 0x3EE958, 0x40 diff --git a/data/data_835B488.s b/data/region_map.s index 1aa8ac3bb..610b09357 100644 --- a/data/data_835B488.s +++ b/data/region_map.s @@ -6,32 +6,6 @@ .section .rodata .align 2 -gUnknown_83EE008:: @ 83EE008 - .incbin "baserom.gba", 0x3EE008, 0x20 - -gUnknown_83EE028:: @ 83EE028 - .incbin "baserom.gba", 0x3EE028, 0x808 - -gUnknown_83EE830:: @ 83EE830 - .incbin "baserom.gba", 0x3EE830, 0x8 - -gUnknown_83EE838:: @ 83EE838 - .incbin "baserom.gba", 0x3EE838, 0x58 - -gUnknown_83EE890:: @ 83EE890 - .incbin "baserom.gba", 0x3EE890, 0x38 - -gUnknown_83EE8C8:: @ 83EE8C8 - .incbin "baserom.gba", 0x3EE8C8, 0x8 - -gUnknown_83EE8D0:: @ 83EE8D0 - .incbin "baserom.gba", 0x3EE8D0, 0x88 - -gUnknown_83EE958:: @ 83EE958 - .incbin "baserom.gba", 0x3EE958, 0x40 - - .section .rodata.83EEC98 - .include "data/text/map_section_names.inc" gUnknown_83EF23C:: @ 83EF23C diff --git a/ld_script.txt b/ld_script.txt index fe033340e..02bf0d371 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -461,10 +461,10 @@ SECTIONS { src/battle_intro.o(.rodata); data/bike.o(.rodata); src/easy_chat.o(.rodata); - data/data_835B488.o(.rodata); + data/mon_markings.o(.rodata); src/mail.o(.rodata); src/heal_location.o(.rodata); - data/data_835B488.o(.rodata.83EEC98); + data/region_map.o(.rodata); src/battle_ai_script_commands.o(.rodata); data/data_83F5738.o(.rodata); src/field_specials.o(.rodata); |