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

This commit is contained in:
PikalaxALT
2020-02-03 10:08:43 -05:00
20 changed files with 805 additions and 1755 deletions
+2 -2
View File
@@ -95,7 +95,7 @@ SECTIONS {
asm/field_player_avatar.o(.text);
asm/event_object_movement.o(.text);
asm/field_ground_effect.o(.text);
asm/event_object_80688E4.o(.text);
src/event_object_80688E4.o(.text);
asm/field_message_box.o(.text);
src/event_object_lock.o(.text);
src/text_window_graphics.o(.text);
@@ -422,7 +422,7 @@ SECTIONS {
data/field_player_avatar.o(.rodata);
data/event_object_movement.o(.rodata);
data/field_ground_effect.o(.rodata);
data/event_object_80688E4.o(.rodata);
src/event_object_80688E4.o(.rodata);
src/scrcmd.o(.rodata);
src/coord_event_weather.o(.rodata);
src/field_tasks.o(.rodata);