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

2020-03-26 17:07:52 -04:00
parent d69a051df5 7a6d4525c4
commit 402f2643bd
207 changed files with 10677 additions and 9902 deletions
@@ -434,7 +434,6 @@ SECTIONS {
        src/metatile_behavior.o(.rodata);
        src/field_door.o(.rodata);
        src/field_player_avatar.o(.rodata);
-        data/event_object_movement.o(.rodata);
        src/event_object_movement.o(.rodata);
        src/scrcmd.o(.rodata);
        src/coord_event_weather.o(.rodata);