Merge branch 'master' into mauville_old_man

This commit is contained in:
PikalaxALT
2018-05-09 15:30:21 -04:00
20 changed files with 1091 additions and 2334 deletions

View File

@@ -87,7 +87,7 @@ SECTIONS {
src/play_time.o(.text);
src/new_game.o(.text);
src/overworld.o(.text);
asm/fieldmap.o(.text);
src/fieldmap.o(.text);
src/metatile_behavior.o(.text);
src/field_camera.o(.text);
src/field_door.o(.text);
@@ -395,7 +395,7 @@ SECTIONS {
src/overworld.o(.rodata);
data/tilesets.o(.rodata);
data/maps.o(.rodata);
data/fieldmap.o(.rodata);
src/fieldmap.o(.rodata);
src/metatile_behavior.o(.rodata);
src/field_door.o(.rodata);
data/field_player_avatar.o(.rodata);