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

2020-01-02 09:27:59 -05:00
parent 10d550d5a2 4d7a5b165f
commit 7310adb5f7
5 changed files with 95 additions and 123 deletions
@@ -121,6 +121,7 @@ SECTIONS {
        asm/field_weather.o(.text);
        asm/field_weather_effects.o(.text);
        src/field_fadetransition.o(.text);
+        src/field_screen_effect.o(.text);
        asm/field_screen_effect.o(.text);
        src/battle_setup.o(.text);
        asm/cable_club.o(.text);