finish egg hatch, clean up headers

2017-09-19 14:27:46 +02:00
parent f255cbd7dc
commit 148b995189
17 changed files with 3370 additions and 3212 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -81,7 +81,6 @@ SECTIONS {
        src/blend_palette.o(.text);
        asm/daycare.o(.text);
        src/egg_hatch.o(.text);
-        asm/egg_hatch.o(.text);
        asm/battle_interface.o(.text);
        asm/smokescreen.o(.text);
        asm/pokeball.o(.text);
@@ -341,6 +340,8 @@ SECTIONS {
        src/trig.o(.rodata);
        src/util.o(.rodata);
        data/data3.o(.rodata);
+        src/egg_hatch.o(.rodata);
+        data/data3_a0.o(.rodata);
        src/berry.o(.rodata);
        data/data3_a1.o(.rodata);
        src/pokemon_size_record.o(.rodata)