Merge remote-tracking branch 'pret/master' into baserom_extraction

This commit is contained in:
Diegoisawesome
2017-10-09 13:32:26 -05:00
408 changed files with 11246 additions and 23108 deletions

View File

@@ -57,8 +57,8 @@ SECTIONS {
asm/rom3.o(.text);
src/decompress.o(.text);
asm/battle_1.o(.text);
asm/battle_2.o(.text);
src/battle_3.o(.text);
src/battle_2.o(.text);
src/battle_util.o(.text);
src/battle_script_commands.o(.text);
asm/battle_5.o(.text);
asm/battle_controller_player.o(.text);
@@ -110,7 +110,7 @@ SECTIONS {
asm/reset_rtc_screen.o(.text);
src/start_menu.o(.text);
asm/start_menu.o(.text);
asm/tileset.o(.text);
src/tileset_anims.o(.text);
src/palette.o(.text);
src/sound.o(.text);
asm/battle_anim.o(.text);
@@ -217,11 +217,11 @@ SECTIONS {
asm/hall_of_fame.o(.text);
asm/credits.o(.text);
src/lottery_corner.o(.text);
asm/diploma.o(.text);
src/diploma.o(.text);
asm/berry_tag_screen.o(.text);
asm/mystery_event_menu.o(.text);
asm/save_failed_screen.o(.text);
asm/braille_puzzles.o(.text);
src/save_failed_screen.o(.text);
src/braille_puzzles.o(.text);
asm/pokeblock_feed.o(.text);
asm/clear_save_data_screen.o(.text);
asm/intro_credits_graphics.o(.text);
@@ -243,11 +243,11 @@ SECTIONS {
asm/list_menu.o(.text);
asm/menu_indicators.o(.text);
asm/unk_text_util.o(.text);
asm/save_location.o(.text);
src/save_location.o(.text);
asm/item_icon.o(.text);
asm/party_menu.o(.text);
asm/battle_tent.o(.text);
asm/unk_text_util_2.o(.text);
src/unk_text_util_2.o(.text);
src/multiboot.o(.text);
asm/unk_81BAD84.o(.text);
asm/battle_controller_player_partner.o(.text);
@@ -326,6 +326,8 @@ SECTIONS {
data/main_menu.o(.rodata);
data/battle_1.o(.rodata);
data/data2b.o(.rodata);
src/battle_2.o(.rodata);
src/battle_util.o(.rodata);
src/battle_script_commands.o(.rodata);
data/battle_controller_player.o(.rodata);
data/smokescreen.o(.rodata);
@@ -357,8 +359,8 @@ SECTIONS {
data/field_tasks.o(.rodata);
data/reset_rtc_screen.o(.rodata);
data/start_menu.o(.rodata);
data/tileset.o(.rodata);
data/palette.o(.rodata);
src/tileset_anims.o(.rodata);
src/palette.o(.rodata);
data/fanfares.o(.rodata);
data/battle_anims.o(.rodata);
data/title_screen.o(.rodata);
@@ -428,11 +430,11 @@ SECTIONS {
data/hall_of_fame.o(.rodata);
data/credits.o(.rodata);
src/lottery_corner.o(.rodata);
data/diploma.o(.rodata);
src/diploma.o(.rodata);
data/strings.o(.rodata);
data/berry_tag_screen.o(.rodata);
data/mystery_event_menu.o(.rodata);
data/save_failed_screen.o(.rodata);
src/save_failed_screen.o(.rodata);
data/braille_puzzles.o(.rodata);
data/pokeblock_feed.o(.rodata);
data/clear_save_data_screen.o(.rodata);
@@ -449,11 +451,11 @@ SECTIONS {
data/battle_frontier_2.o(.rodata);
data/item_menu.o(.rodata);
data/menu_indicators.o(.rodata);
data/save_location.o(.rodata);
src/save_location.o(.rodata);
data/item_icon.o(.rodata);
data/party_menu.o(.rodata);
data/battle_tent.o(.rodata);
data/unk_text_util_2.o(.rodata);
src/unk_text_util_2.o(.rodata);
data/unk_81BAD84.o(.rodata);
data/battle_controller_player_partner.o(.rodata);
data/fossil_special_fldeff_groundshake.o(.rodata);