dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into lilycove_lady

Browse Source
This commit is contained in:
PikalaxALT
2017-09-20 23:02:17 -04:00
parent 6f481cceb1 e7f91c65d9
commit 8d5250fdaa
98 changed files with 11101 additions and 3739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ld_script.txt
View File

@@ -239,9 +239,8 @@ SECTIONS {
asm/recorded_battle.o(.text);
asm/battle_controller_recorded_opponent.o(.text);
asm/battle_controller_recorded_player.o(.text);
asm/battle_dome_cards.o(.text);
src/battle_dome_cards.o(.text);
src/lilycove_lady.o(.text);
asm/lilycove_lady.o(.text);
asm/battle_frontier_1.o(.text);
asm/new_menu_helpers.o(.text);
asm/menu.o(.text);
@@ -379,7 +378,7 @@ SECTIONS {
data/data_860A4AC.o(.rodata);
data/battle_controller_recorded_opponent.o(.rodata);
data/battle_controller_recorded_player.o(.rodata);
data/data_emerald.o(.rodata.deleteme);
src/battle_dome_cards.o(.rodata);
src/lilycove_lady.o(.rodata);
data/data_emerald.o(.rodata);
data/battle_controller_player_partner.o(.rodata);