Merge branch 'master' into pokedex_2

This commit is contained in:
ultima-soul
2019-08-04 15:23:09 -07:00
114 changed files with 8784 additions and 14915 deletions
+7 -5
View File
@@ -115,7 +115,7 @@ SECTIONS {
src/task.o(.text);
asm/reshow_battle_screen.o(.text);
asm/battle_anim_status_effects.o(.text);
asm/title_screen.o(.text);
src/title_screen.o(.text);
src/reset_save_heap.o(.text);
asm/field_weather.o(.text);
asm/field_weather_effects.o(.text);
@@ -191,7 +191,7 @@ SECTIONS {
asm/evolution_scene.o(.text);
src/coins.o(.text);
src/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
src/battle_transition.o(.text);
asm/battle_controller_link_partner.o(.text);
asm/battle_message.o(.text);
src/math_util.o(.text);
@@ -254,7 +254,7 @@ SECTIONS {
asm/berry_pouch.o(.text);
asm/itemfinder.o(.text);
src/buy_menu_helpers.o(.text);
asm/slot_machine.o(.text);
src/slot_machine.o(.text);
src/roamer.o(.text);
src/mystery_gift_menu.o(.text);
src/mevent.o(.text);
@@ -405,7 +405,7 @@ SECTIONS {
data/battle_anim.o(.rodata);
data/map_events.o(.rodata);
data/battle_anim_status_effects.o(.rodata);
data/title_screen.o(.rodata);
src/title_screen.o(.rodata);
data/field_weather.o(.rodata);
data/data_835B488.o(.rodata);
src/item_menu_icons.o(.rodata);
@@ -418,6 +418,8 @@ SECTIONS {
data/data_83F5738.o(.rodata);
src/battle_records.o(.rodata);
data/data_83F5738.o(.rodata.83F6C90);
src/battle_transition.o(.rodata);
data/data_83F5738.o(.rodata.83FB134);
src/save.o(.rodata);
data/data_83FECCC.o(.rodata);
src/intro.o(.rodata);
@@ -454,7 +456,7 @@ SECTIONS {
data/berry_pouch.o(.rodata);
data/itemfinder.o(.rodata);
src/buy_menu_helpers.o(.rodata);
data/slot_machine.o(.rodata);
src/slot_machine.o(.rodata);
src/roamer.o(.rodata);
src/mystery_gift_menu.o(.rodata);
src/mevent.o(.rodata);