Merge branch 'master' into decompile_battle_controllers

This commit is contained in:
DizzyEggg
2017-10-23 13:33:32 +02:00
137 changed files with 11131 additions and 15649 deletions

View File

@@ -172,7 +172,7 @@ SECTIONS {
asm/heal_location.o(.text);
asm/region_map.o(.text);
asm/cute_sketch.o(.text);
asm/decoration.o(.text);
src/decoration.o(.text);
asm/slot_machine.o(.text);
asm/contest_painting.o(.text);
src/battle_ai_script_commands.o(.text);
@@ -206,7 +206,7 @@ SECTIONS {
asm/battle_anim_815A0D4.o(.text);
asm/learn_move.o(.text);
asm/fldeff_softboiled.o(.text);
asm/decoration_inventory.o(.text);
src/decoration_inventory.o(.text);
src/roamer.o(.text);
asm/battle_tower.o(.text);
asm/use_pokeblock.o(.text);
@@ -257,6 +257,7 @@ SECTIONS {
asm/fldeff_groundshake.o(.text);
asm/fossil_specials.o(.text);
src/berry_fix_program.o(.text);
src/pokemon_summary_screen.o(.text);
asm/pokemon_summary_screen.o(.text);
asm/pokenav.o(.text);
asm/rayquaza_scene.o(.text);
@@ -415,7 +416,7 @@ SECTIONS {
data/heal_location.o(.rodata);
data/region_map.o(.rodata);
data/cute_sketch.o(.rodata);
data/decoration.o(.rodata);
src/decoration.o(.rodata);
data/slot_machine.o(.rodata);
data/contest_painting.o(.rodata);
src/battle_ai_script_commands.o(.rodata);