Merge pull request #173 from ghoulslash/pokeball

Pokeball
2019-12-04 13:06:48 -05:00
parent bc0fe11d16 11a52655f3
commit 3362b7f671
10 changed files with 1341 additions and 3077 deletions
@@ -83,7 +83,7 @@ SECTIONS {
        src/daycare.o(.text);
        asm/battle_interface.o(.text);
        asm/smokescreen.o(.text);
-        asm/pokeball.o(.text);
+        src/pokeball.o(.text);
        src/load_save.o(.text);
        src/trade.o(.text);
        src/trade_scene.o(.text);
@@ -401,7 +401,7 @@ SECTIONS {
        src/daycare.o(.rodata);
        src/battle_gfx_sfx_util.o(.rodata);
        data/battle_interface.o(.rodata);
-        data/pokeball.o(.rodata);
+        src/pokeball.o(.rodata);
        src/trade.o(.rodata);
        src/trade_scene.o(.rodata);
        data/overworld.o(.rodata);