Merge pull request #231 from KDSKardabox/master

Player PC
This commit is contained in:
Marcus Huderle
2018-03-28 21:45:24 -07:00
committed by GitHub
25 changed files with 1522 additions and 3565 deletions

View File

@@ -216,7 +216,7 @@ SECTIONS {
src/use_pokeblock.o(.text);
asm/use_pokeblock.o(.text);
src/battle_controller_wally.o(.text);
asm/player_pc.o(.text);
src/player_pc.o(.text);
src/intro.o(.text);
src/reset_save_heap.o(.text);
src/field_region_map.o(.text);
@@ -495,7 +495,7 @@ SECTIONS {
src/use_pokeblock.o(.rodata);
data/use_pokeblock.o(.rodata);
src/battle_controller_wally.o(.rodata);
data/player_pc.o(.rodata);
src/player_pc.o(.rodata);
src/intro.o(.rodata);
src/field_region_map.o(.rodata);
data/battle_anim_8170478.o(.rodata);