From cd87f47c8acd890c86cdea35b2cf03244c966161 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Sep 2017 09:01:21 +0200 Subject: fix a bad file name --- data/rom_8158B30.s | 83 ------------------------------------------------------ data/rom_85CE2A0.s | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ ld_script.txt | 2 +- 3 files changed, 84 insertions(+), 84 deletions(-) delete mode 100644 data/rom_8158B30.s create mode 100644 data/rom_85CE2A0.s diff --git a/data/rom_8158B30.s b/data/rom_8158B30.s deleted file mode 100644 index 72cff0b33..000000000 --- a/data/rom_8158B30.s +++ /dev/null @@ -1,83 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - -gUnknown_085CE2A0:: @ 85CE2A0 - .incbin "baserom.gba", 0x5ce2a0, 0xb0 - -gUnknown_085CE350:: @ 85CE350 - .incbin "baserom.gba", 0x5ce350, 0x38 - -gUnknown_085CE388:: @ 85CE388 - .incbin "baserom.gba", 0x5ce388, 0x18 - -gUnknown_085CE3A0:: @ 85CE3A0 - .incbin "baserom.gba", 0x5ce3a0, 0x18 - -gUnknown_085CE3B8:: @ 85CE3B8 - .incbin "baserom.gba", 0x5ce3b8, 0x28 - -gUnknown_085CE3E0:: @ 85CE3E0 - .incbin "baserom.gba", 0x5ce3e0, 0x50 - -gUnknown_085CE430:: @ 85CE430 - .incbin "baserom.gba", 0x5ce430, 0x30 - -gUnknown_085CE460:: @ 85CE460 - .incbin "baserom.gba", 0x5ce460, 0x2c - -gUnknown_085CE48C:: @ 85CE48C - .incbin "baserom.gba", 0x5ce48c, 0x18 - -gUnknown_085CE4A4:: @ 85CE4A4 - .incbin "baserom.gba", 0x5ce4a4, 0x4 - -gUnknown_085CE4A8:: @ 85CE4A8 - .incbin "baserom.gba", 0x5ce4a8, 0x8 - -gUnknown_085CE4B0:: @ 85CE4B0 - .incbin "baserom.gba", 0x5ce4b0, 0x140 - -gUnknown_085CE5F0:: @ 85CE5F0 - .incbin "baserom.gba", 0x5ce5f0, 0x15c - -gUnknown_085CE74C:: @ 85CE74C - .incbin "baserom.gba", 0x5ce74c, 0x20 - -gUnknown_085CE76C:: @ 85CE76C - .incbin "baserom.gba", 0x5ce76c, 0x18 - -gUnknown_085CE784:: @ 85CE784 - .incbin "baserom.gba", 0x5ce784, 0x68 - -gUnknown_085CE7EC:: @ 85CE7EC - .incbin "baserom.gba", 0x5ce7ec, 0x60 - -gUnknown_085CE84C:: @ 85CE84C - .incbin "baserom.gba", 0x5ce84c, 0x30 - -gUnknown_085CE87C:: @ 85CE87C - .incbin "baserom.gba", 0x5ce87c, 0x14c - -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/rom_85CE2A0.s b/data/rom_85CE2A0.s new file mode 100644 index 000000000..72cff0b33 --- /dev/null +++ b/data/rom_85CE2A0.s @@ -0,0 +1,83 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + +gUnknown_085CE2A0:: @ 85CE2A0 + .incbin "baserom.gba", 0x5ce2a0, 0xb0 + +gUnknown_085CE350:: @ 85CE350 + .incbin "baserom.gba", 0x5ce350, 0x38 + +gUnknown_085CE388:: @ 85CE388 + .incbin "baserom.gba", 0x5ce388, 0x18 + +gUnknown_085CE3A0:: @ 85CE3A0 + .incbin "baserom.gba", 0x5ce3a0, 0x18 + +gUnknown_085CE3B8:: @ 85CE3B8 + .incbin "baserom.gba", 0x5ce3b8, 0x28 + +gUnknown_085CE3E0:: @ 85CE3E0 + .incbin "baserom.gba", 0x5ce3e0, 0x50 + +gUnknown_085CE430:: @ 85CE430 + .incbin "baserom.gba", 0x5ce430, 0x30 + +gUnknown_085CE460:: @ 85CE460 + .incbin "baserom.gba", 0x5ce460, 0x2c + +gUnknown_085CE48C:: @ 85CE48C + .incbin "baserom.gba", 0x5ce48c, 0x18 + +gUnknown_085CE4A4:: @ 85CE4A4 + .incbin "baserom.gba", 0x5ce4a4, 0x4 + +gUnknown_085CE4A8:: @ 85CE4A8 + .incbin "baserom.gba", 0x5ce4a8, 0x8 + +gUnknown_085CE4B0:: @ 85CE4B0 + .incbin "baserom.gba", 0x5ce4b0, 0x140 + +gUnknown_085CE5F0:: @ 85CE5F0 + .incbin "baserom.gba", 0x5ce5f0, 0x15c + +gUnknown_085CE74C:: @ 85CE74C + .incbin "baserom.gba", 0x5ce74c, 0x20 + +gUnknown_085CE76C:: @ 85CE76C + .incbin "baserom.gba", 0x5ce76c, 0x18 + +gUnknown_085CE784:: @ 85CE784 + .incbin "baserom.gba", 0x5ce784, 0x68 + +gUnknown_085CE7EC:: @ 85CE7EC + .incbin "baserom.gba", 0x5ce7ec, 0x60 + +gUnknown_085CE84C:: @ 85CE84C + .incbin "baserom.gba", 0x5ce84c, 0x30 + +gUnknown_085CE87C:: @ 85CE87C + .incbin "baserom.gba", 0x5ce87c, 0x14c + +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/ld_script.txt b/ld_script.txt index 77e8ac4f4..1e2ebcaf9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -420,7 +420,7 @@ SECTIONS { data/field_effect_helpers.o(.rodata); data/contest_ai.o(.rodata); data/battle_controller_safari.o(.rodata); - data/rom_8158B30.o(.rodata); + data/rom_85CE2A0.o(.rodata); src/roamer.o(.rodata); data/rom_85CECB0.o(.rodata); data/battle_controller_wally.o(.rodata); -- cgit v1.2.3