Merge branch 'master' into quest_log

2018-11-02 14:16:03 -04:00
parent 46e006b94c c0a9d62091
commit 5391289fc1
61 changed files with 629 additions and 1257 deletions
@@ -145,7 +145,7 @@ SECTIONS {
        asm/berry.o(.text);
        asm/script_menu.o(.text);
        asm/naming_screen.o(.text);
-        asm/money.o(.text);
+        src/money.o(.text);
        asm/script_pokemon_util_80A0058.o(.text);
        asm/field_poison.o(.text);
        asm/pokemon_size_record.o(.text);
@@ -173,12 +173,12 @@ SECTIONS {
        asm/field_specials.o(.text);
        asm/battle_records.o(.text);
        asm/evolution_scene.o(.text);
-        asm/coins.o(.text);
+        src/coins.o(.text);
        asm/fldeff_strength.o(.text);
        asm/battle_transition.o(.text);
        asm/battle_controller_link_partner.o(.text);
        asm/battle_message.o(.text);
-        asm/math_util.o(.text);
+        src/math_util.o(.text);
        asm/roulette_util.o(.text);
        asm/cable_car_util.o(.text);
        src/save.o(.text);