From 1d5ec895af202aeb64cc4642586486b6098f5ba5 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 25 Sep 2017 16:13:32 -0400 Subject: Rename data/data3.s to data/daycare.s --- data/data3.s | 24 ------------------------ data/daycare.s | 24 ++++++++++++++++++++++++ ld_script.txt | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 data/data3.s create mode 100644 data/daycare.s diff --git a/data/data3.s b/data/data3.s deleted file mode 100644 index c249a668c..000000000 --- a/data/data3.s +++ /dev/null @@ -1,24 +0,0 @@ -@ the third big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - -@ 832ADD8 - .include "data/egg_moves.inc" - - .align 2 -gUnknown_0832B6C0:: @ 832B6C0 - .incbin "baserom.gba", 0x32b6c0, 0x20 - -gUnknown_0832B6E0:: @ 832B6E0 - .incbin "baserom.gba", 0x32b6e0, 0x18 - -gUnknown_0832B6F8:: @ 832B6F8 - .incbin "baserom.gba", 0x32b6f8, 0x10 - -gEggName:: @ 832B708 - .string "タマゴ$" @ "tamago" ("egg" in Japanese) diff --git a/data/daycare.s b/data/daycare.s new file mode 100644 index 000000000..c249a668c --- /dev/null +++ b/data/daycare.s @@ -0,0 +1,24 @@ +@ the third big chunk of data + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + + +@ 832ADD8 + .include "data/egg_moves.inc" + + .align 2 +gUnknown_0832B6C0:: @ 832B6C0 + .incbin "baserom.gba", 0x32b6c0, 0x20 + +gUnknown_0832B6E0:: @ 832B6E0 + .incbin "baserom.gba", 0x32b6e0, 0x18 + +gUnknown_0832B6F8:: @ 832B6F8 + .incbin "baserom.gba", 0x32b6f8, 0x10 + +gEggName:: @ 832B708 + .string "タマゴ$" @ "tamago" ("egg" in Japanese) diff --git a/ld_script.txt b/ld_script.txt index 069b520c9..64a43d573 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -339,7 +339,7 @@ SECTIONS { data/data2c.o(.rodata); src/trig.o(.rodata); src/util.o(.rodata); - data/data3.o(.rodata); + data/daycare.o(.rodata); src/egg_hatch.o(.rodata); data/battle_7.o(.rodata); data/battle_interface.o(.rodata); -- cgit v1.2.3