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

ld_script.txt

@@ -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);