Merge branch 'master' of https://github.com/pret/pokefirered into text

2018-10-06 16:45:53 -04:00
parent 9236084ad8 281507d72e
commit eb03b1ab0f
5 changed files with 23 additions and 40 deletions
@@ -81,7 +81,7 @@ SECTIONS {
        asm/pokemon_item_effect.o(.text);
        asm/pokemon_3.o(.text);
        asm/trig.o(.text);
-        asm/random.o(.text);
+        src/random.o(.text);
        asm/util.o(.text);
        asm/blend_palette.o(.text);
        asm/daycare.o(.text);