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

This commit is contained in:
PikalaxALT
2020-03-16 07:51:21 -04:00
41 changed files with 10009 additions and 25762 deletions
+2 -3
View File
@@ -93,8 +93,7 @@ SECTIONS {
src/field_camera.o(.text);
src/field_door.o(.text);
asm/field_player_avatar.o(.text);
asm/event_object_movement.o(.text);
src/event_object_80688E4.o(.text); /* event_object_movement */
src/event_object_movement.o(.text);
src/field_message_box.o(.text);
src/event_object_lock.o(.text);
src/text_window_graphics.o(.text);
@@ -434,7 +433,7 @@ SECTIONS {
src/field_door.o(.rodata);
data/field_player_avatar.o(.rodata);
data/event_object_movement.o(.rodata);
src/event_object_80688E4.o(.rodata); /* event_object_movement */
src/event_object_movement.o(.rodata);
src/scrcmd.o(.rodata);
src/coord_event_weather.o(.rodata);
src/field_tasks.o(.rodata);