From 2766bd78df51c90175b66dd344fe4211121b9749 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Sep 2017 09:22:59 +0200 Subject: split the second file --- data/battle_tower.s | 103 ++++++++++++++++++++++++++++++++++ data/rom_85CECB0.s | 154 --------------------------------------------------- data/use_pokeblock.s | 55 ++++++++++++++++++ ld_script.txt | 3 +- 4 files changed, 160 insertions(+), 155 deletions(-) create mode 100644 data/battle_tower.s delete mode 100644 data/rom_85CECB0.s create mode 100644 data/use_pokeblock.s diff --git a/data/battle_tower.s b/data/battle_tower.s new file mode 100644 index 000000000..a952e0773 --- /dev/null +++ b/data/battle_tower.s @@ -0,0 +1,103 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +@ 85CECB0 + .include "data/battle_frontier/battle_frontier_held_items.inc" + +@ 85CED2E + .include "data/battle_frontier/battle_frontier_trainer_mons.inc" + +@ 85D5ACC + .include "data/battle_frontier/battle_frontier_trainers.inc" + +@ 85D97BC + .include "data/battle_frontier/battle_frontier_mons.inc" + +gUnknown_085DCEDC:: @ 85DCEDC + .incbin "baserom.gba", 0x5dcedc, 0x1e + +gUnknown_085DCEFA:: @ 85DCEFA + .incbin "baserom.gba", 0x5dcefa, 0x14 + +gUnknown_085DCF0E:: @ 85DCF0E + .incbin "baserom.gba", 0x5dcf0e, 0x1e + +gUnknown_085DCF2C:: @ 85DCF2C + .incbin "baserom.gba", 0x5dcf2c, 0x14 + +gUnknown_085DCF40:: @ 85DCF40 + .incbin "baserom.gba", 0x5dcf40, 0x5c0 + +gUnknown_085DD500:: @ 85DD500 + .incbin "baserom.gba", 0x5dd500, 0x190 + +gUnknown_085DD690:: @ 85DD690 + .incbin "baserom.gba", 0x5dd690, 0x40 + +gUnknown_085DD6D0:: @ 85DD6D0 + .incbin "baserom.gba", 0x5dd6d0, 0x5 + +gUnknown_085DD6D5:: @ 85DD6D5 + .incbin "baserom.gba", 0x5dd6d5, 0x7 + +gUnknown_085DD6DC:: @ 85DD6DC + .incbin "baserom.gba", 0x5dd6dc, 0x30 + +@ 85DD70C + .include "data/battle_frontier/slateport_battle_tent_trainer_mons.inc" + +@ 85DDA14 + .include "data/battle_frontier/slateport_battle_tent_trainers.inc" + +@ 85DE02C + .include "data/battle_frontier/slateport_battle_tent_mons.inc" + +@ 85DE48C + .include "data/battle_frontier/verdanturf_battle_tent_trainer_mons.inc" + +@ 85DE610 + .include "data/battle_frontier/verdanturf_battle_tent_trainers.inc" + +@ 85DEC28 + .include "data/battle_frontier/verdanturf_battle_tent_mons.inc" + +@ 85DEEF8 + .include "data/battle_frontier/fallarbor_battle_tent_trainer_mons.inc" + +@ 85DF084 + .include "data/battle_frontier/fallarbor_battle_tent_trainers.inc" + +@ 85DF69C + .include "data/battle_frontier/fallarbor_battle_tent_mons.inc" + +gUnknown_085DF96C:: @ 85DF96C + .incbin "baserom.gba", 0x5df96c, 0x40 + +gUnknown_085DF9AC:: @ 85DF9AC + .incbin "baserom.gba", 0x5df9ac, 0x20 + +gUnknown_085DF9CC:: @ 85DF9CC + .incbin "baserom.gba", 0x5df9cc, 0x20 + +gUnknown_085DF9EC:: @ 85DF9EC + .incbin "baserom.gba", 0x5df9ec, 0xa + +gUnknown_085DF9F6:: @ 85DF9F6 + .incbin "baserom.gba", 0x5df9f6, 0x4 + +gUnknown_085DF9FA:: @ 85DF9FA + .incbin "baserom.gba", 0x5df9fa, 0x20 + +gUnknown_085DFA1A:: @ 85DFA1A + .incbin "baserom.gba", 0x5dfa1a, 0x28 + +gUnknown_085DFA42:: @ 85DFA42 + .incbin "baserom.gba", 0x5dfa42, 0x4 + +gUnknown_085DFA46:: @ 85DFA46 + .incbin "baserom.gba", 0x5dfa46, 0xc + +gUnknown_085DFA52:: @ 85DFA52 + .incbin "baserom.gba", 0x5dfa52, 0xe diff --git a/data/rom_85CECB0.s b/data/rom_85CECB0.s deleted file mode 100644 index c0233bb8c..000000000 --- a/data/rom_85CECB0.s +++ /dev/null @@ -1,154 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 85CECB0 - .include "data/battle_frontier/battle_frontier_held_items.inc" - -@ 85CED2E - .include "data/battle_frontier/battle_frontier_trainer_mons.inc" - -@ 85D5ACC - .include "data/battle_frontier/battle_frontier_trainers.inc" - -@ 85D97BC - .include "data/battle_frontier/battle_frontier_mons.inc" - -gUnknown_085DCEDC:: @ 85DCEDC - .incbin "baserom.gba", 0x5dcedc, 0x1e - -gUnknown_085DCEFA:: @ 85DCEFA - .incbin "baserom.gba", 0x5dcefa, 0x14 - -gUnknown_085DCF0E:: @ 85DCF0E - .incbin "baserom.gba", 0x5dcf0e, 0x1e - -gUnknown_085DCF2C:: @ 85DCF2C - .incbin "baserom.gba", 0x5dcf2c, 0x14 - -gUnknown_085DCF40:: @ 85DCF40 - .incbin "baserom.gba", 0x5dcf40, 0x5c0 - -gUnknown_085DD500:: @ 85DD500 - .incbin "baserom.gba", 0x5dd500, 0x190 - -gUnknown_085DD690:: @ 85DD690 - .incbin "baserom.gba", 0x5dd690, 0x40 - -gUnknown_085DD6D0:: @ 85DD6D0 - .incbin "baserom.gba", 0x5dd6d0, 0x5 - -gUnknown_085DD6D5:: @ 85DD6D5 - .incbin "baserom.gba", 0x5dd6d5, 0x7 - -gUnknown_085DD6DC:: @ 85DD6DC - .incbin "baserom.gba", 0x5dd6dc, 0x30 - -@ 85DD70C - .include "data/battle_frontier/slateport_battle_tent_trainer_mons.inc" - -@ 85DDA14 - .include "data/battle_frontier/slateport_battle_tent_trainers.inc" - -@ 85DE02C - .include "data/battle_frontier/slateport_battle_tent_mons.inc" - -@ 85DE48C - .include "data/battle_frontier/verdanturf_battle_tent_trainer_mons.inc" - -@ 85DE610 - .include "data/battle_frontier/verdanturf_battle_tent_trainers.inc" - -@ 85DEC28 - .include "data/battle_frontier/verdanturf_battle_tent_mons.inc" - -@ 85DEEF8 - .include "data/battle_frontier/fallarbor_battle_tent_trainer_mons.inc" - -@ 85DF084 - .include "data/battle_frontier/fallarbor_battle_tent_trainers.inc" - -@ 85DF69C - .include "data/battle_frontier/fallarbor_battle_tent_mons.inc" - -gUnknown_085DF96C:: @ 85DF96C - .incbin "baserom.gba", 0x5df96c, 0x40 - -gUnknown_085DF9AC:: @ 85DF9AC - .incbin "baserom.gba", 0x5df9ac, 0x20 - -gUnknown_085DF9CC:: @ 85DF9CC - .incbin "baserom.gba", 0x5df9cc, 0x20 - -gUnknown_085DF9EC:: @ 85DF9EC - .incbin "baserom.gba", 0x5df9ec, 0xa - -gUnknown_085DF9F6:: @ 85DF9F6 - .incbin "baserom.gba", 0x5df9f6, 0x4 - -gUnknown_085DF9FA:: @ 85DF9FA - .incbin "baserom.gba", 0x5df9fa, 0x20 - -gUnknown_085DFA1A:: @ 85DFA1A - .incbin "baserom.gba", 0x5dfa1a, 0x28 - -gUnknown_085DFA42:: @ 85DFA42 - .incbin "baserom.gba", 0x5dfa42, 0x4 - -gUnknown_085DFA46:: @ 85DFA46 - .incbin "baserom.gba", 0x5dfa46, 0xc - -gUnknown_085DFA52:: @ 85DFA52 - .incbin "baserom.gba", 0x5dfa52, 0xe - -gUnknown_085DFA60:: @ 85DFA60 - .incbin "baserom.gba", 0x5dfa60, 0x20 - -gUnknown_085DFA80:: @ 85DFA80 - .incbin "baserom.gba", 0x5dfa80, 0xe0 - -gUnknown_085DFB60:: @ 85DFB60 - .incbin "baserom.gba", 0x5dfb60, 0xac - -gUnknown_085DFC0C:: @ 85DFC0C - .incbin "baserom.gba", 0x5dfc0c, 0xa4 - -gUnknown_085DFCB0:: @ 85DFCB0 - .incbin "baserom.gba", 0x5dfcb0, 0x14 - -gUnknown_085DFCC4:: @ 85DFCC4 - .incbin "baserom.gba", 0x5dfcc4, 0x5 - -gUnknown_085DFCC9:: @ 85DFCC9 - .incbin "baserom.gba", 0x5dfcc9, 0x3 - -gUnknown_085DFCCC:: @ 85DFCCC - .incbin "baserom.gba", 0x5dfccc, 0x10 - -gUnknown_085DFCDC:: @ 85DFCDC - .incbin "baserom.gba", 0x5dfcdc, 0x20 - -gUnknown_085DFCFC:: @ 85DFCFC - .incbin "baserom.gba", 0x5dfcfc, 0x8 - -gUnknown_085DFD04:: @ 85DFD04 - .incbin "baserom.gba", 0x5dfd04, 0x14 - -gUnknown_085DFD18:: @ 85DFD18 - .incbin "baserom.gba", 0x5dfd18, 0x8 - -gUnknown_085DFD20:: @ 85DFD20 - .incbin "baserom.gba", 0x5dfd20, 0x8 - -gUnknown_085DFD28:: @ 85DFD28 - .incbin "baserom.gba", 0x5dfd28, 0x34 - -gUnknown_085DFD5C:: @ 85DFD5C - .incbin "baserom.gba", 0x5dfd5c, 0x44 - -gUnknown_085DFDA0:: @ 85DFDA0 - .incbin "baserom.gba", 0x5dfda0, 0x18 - -gUnknown_085DFDB8:: @ 85DFDB8 - .incbin "baserom.gba", 0x5dfdb8, 0x8 diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s new file mode 100644 index 000000000..9b557a0dd --- /dev/null +++ b/data/use_pokeblock.s @@ -0,0 +1,55 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_085DFA60:: @ 85DFA60 + .incbin "baserom.gba", 0x5dfa60, 0x20 + +gUnknown_085DFA80:: @ 85DFA80 + .incbin "baserom.gba", 0x5dfa80, 0xe0 + +gUnknown_085DFB60:: @ 85DFB60 + .incbin "baserom.gba", 0x5dfb60, 0xac + +gUnknown_085DFC0C:: @ 85DFC0C + .incbin "baserom.gba", 0x5dfc0c, 0xa4 + +gUnknown_085DFCB0:: @ 85DFCB0 + .incbin "baserom.gba", 0x5dfcb0, 0x14 + +gUnknown_085DFCC4:: @ 85DFCC4 + .incbin "baserom.gba", 0x5dfcc4, 0x5 + +gUnknown_085DFCC9:: @ 85DFCC9 + .incbin "baserom.gba", 0x5dfcc9, 0x3 + +gUnknown_085DFCCC:: @ 85DFCCC + .incbin "baserom.gba", 0x5dfccc, 0x10 + +gUnknown_085DFCDC:: @ 85DFCDC + .incbin "baserom.gba", 0x5dfcdc, 0x20 + +gUnknown_085DFCFC:: @ 85DFCFC + .incbin "baserom.gba", 0x5dfcfc, 0x8 + +gUnknown_085DFD04:: @ 85DFD04 + .incbin "baserom.gba", 0x5dfd04, 0x14 + +gUnknown_085DFD18:: @ 85DFD18 + .incbin "baserom.gba", 0x5dfd18, 0x8 + +gUnknown_085DFD20:: @ 85DFD20 + .incbin "baserom.gba", 0x5dfd20, 0x8 + +gUnknown_085DFD28:: @ 85DFD28 + .incbin "baserom.gba", 0x5dfd28, 0x34 + +gUnknown_085DFD5C:: @ 85DFD5C + .incbin "baserom.gba", 0x5dfd5c, 0x44 + +gUnknown_085DFDA0:: @ 85DFDA0 + .incbin "baserom.gba", 0x5dfda0, 0x18 + +gUnknown_085DFDB8:: @ 85DFDB8 + .incbin "baserom.gba", 0x5dfdb8, 0x8 diff --git a/ld_script.txt b/ld_script.txt index b1aef1319..0a5a77415 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -423,7 +423,8 @@ SECTIONS { data/battle_anim_815A0D4.o(.rodata); data/learn_move.o(.rodata); src/roamer.o(.rodata); - data/rom_85CECB0.o(.rodata); + data/battle_tower.o(.rodata); + data/use_pokeblock.o(.rodata); data/battle_controller_wally.o(.rodata); data/player_pc.o(.rodata); data/intro.o(.rodata); -- cgit v1.2.3