From 5d9d9c14235c93ac35f8833cdaca8f0d0b9b9c36 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Sep 2017 09:11:48 +0200 Subject: [PATCH] split, rename for real this time --- data/{rom_85CE2A0.s => battle_anim_815A0D4.s} | 17 -------------- data/learn_move.s | 22 +++++++++++++++++++ ld_script.txt | 3 ++- 3 files changed, 24 insertions(+), 18 deletions(-) rename data/{rom_85CE2A0.s => battle_anim_815A0D4.s} (78%) create mode 100644 data/learn_move.s diff --git a/data/rom_85CE2A0.s b/data/battle_anim_815A0D4.s similarity index 78% rename from data/rom_85CE2A0.s rename to data/battle_anim_815A0D4.s index 72cff0b337..be8439db71 100644 --- a/data/rom_85CE2A0.s +++ b/data/battle_anim_815A0D4.s @@ -64,20 +64,3 @@ gUnknown_085CE87C:: @ 85CE87C gUnknown_085CE9C8:: @ 85CE9C8 .incbin "baserom.gba", 0x5ce9c8, 0x1e8 -gUnknown_085CEBB0:: @ 85CEBB0 - .incbin "baserom.gba", 0x5cebb0, 0x8 - -gUnknown_085CEBB8:: @ 85CEBB8 - .incbin "baserom.gba", 0x5cebb8, 0x8 - -gUnknown_085CEBC0:: @ 85CEBC0 - .incbin "baserom.gba", 0x5cebc0, 0x10 - -gUnknown_085CEBD0:: @ 85CEBD0 - .incbin "baserom.gba", 0x5cebd0, 0x40 - -gUnknown_085CEC10:: @ 85CEC10 - .incbin "baserom.gba", 0x5cec10, 0x18 - -gUnknown_085CEC28:: @ 85CEC28 - .incbin "baserom.gba", 0x5cec28, 0x8 diff --git a/data/learn_move.s b/data/learn_move.s new file mode 100644 index 0000000000..bcb8aeba1a --- /dev/null +++ b/data/learn_move.s @@ -0,0 +1,22 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_085CEBB0:: @ 85CEBB0 + .incbin "baserom.gba", 0x5cebb0, 0x8 + +gUnknown_085CEBB8:: @ 85CEBB8 + .incbin "baserom.gba", 0x5cebb8, 0x8 + +gUnknown_085CEBC0:: @ 85CEBC0 + .incbin "baserom.gba", 0x5cebc0, 0x10 + +gUnknown_085CEBD0:: @ 85CEBD0 + .incbin "baserom.gba", 0x5cebd0, 0x40 + +gUnknown_085CEC10:: @ 85CEC10 + .incbin "baserom.gba", 0x5cec10, 0x18 + +gUnknown_085CEC28:: @ 85CEC28 + .incbin "baserom.gba", 0x5cec28, 0x8 diff --git a/ld_script.txt b/ld_script.txt index 1e2ebcaf93..b1aef1319d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -420,7 +420,8 @@ SECTIONS { data/field_effect_helpers.o(.rodata); data/contest_ai.o(.rodata); data/battle_controller_safari.o(.rodata); - data/rom_85CE2A0.o(.rodata); + data/battle_anim_815A0D4.o(.rodata); + data/learn_move.o(.rodata); src/roamer.o(.rodata); data/rom_85CECB0.o(.rodata); data/battle_controller_wally.o(.rodata);