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

Merge branch 'master' into decompile_battle_frontier_1

Browse Source
This commit is contained in:
DizzyEggg
2018-08-25 20:02:09 +02:00
parent edcf04b665 60dff848aa
commit 447e65860c
118 changed files with 21234 additions and 25833 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+10 -6
View File
@@ -143,7 +143,7 @@ SECTIONS {
asm/script_menu.o(.text);
src/naming_screen.o(.text);
src/money.o(.text);
asm/contest_effect.o(.text);
src/contest_effect.o(.text);
src/record_mixing.o(.text);
src/secret_base.o(.text);
src/tv.o(.text);
@@ -203,7 +203,7 @@ SECTIONS {
src/save.o(.text);
src/mystery_event_script.o(.text);
asm/field_effect_helpers.o(.text);
asm/contest_ai.o(.text);
src/contest_ai.o(.text);
src/battle_anim_sound_tasks.o(.text);
src/battle_controller_safari.o(.text);
src/fldeff_sweetscent.o(.text);
@@ -263,7 +263,9 @@ SECTIONS {
asm/fossil_specials.o(.text);
src/berry_fix_program.o(.text);
src/pokemon_summary_screen.o(.text);
asm/pokemon_summary_screen.o(.text);
src/unk_pokedex_area_screen_helper.o(.text);
src/battle_pyramid.o(.text);
asm/battle_pyramid.o(.text);
asm/pokenav.o(.text);
src/match_call.o(.text);
asm/pokenav.o(.text.after.match.call);
@@ -378,6 +380,7 @@ SECTIONS {
src/main_menu.o(.rodata);
src/rom_8034C54.o(.rodata);
data/data2b.o(.rodata);
src/data2b.o(.rodata);
src/battle_data.o(.rodata);
data/data2c.o(.rodata);
src/battle_main.o(.rodata);
@@ -444,7 +447,7 @@ SECTIONS {
data/script_menu.o(.rodata);
src/naming_screen.o(.rodata);
src/money.o(.rodata);
data/contest_effect.o(.rodata);
src/contest_effect.o(.rodata);
src/record_mixing.o(.rodata);
src/secret_base.o(.rodata);
src/tv.o(.rodata);
@@ -489,7 +492,7 @@ SECTIONS {
data/cable_car.o(.rodata);
src/save.o(.rodata);
data/field_effect_helpers.o(.rodata);
data/contest_ai.o(.rodata);
src/contest_ai.o(.rodata);
src/battle_controller_safari.o(.rodata);
data/battle_anim_815A0D4.o(.rodata);
src/learn_move.o(.rodata);
@@ -539,7 +542,8 @@ SECTIONS {
src/fldeff_groundshake.o(.rodata);
src/berry_fix_program.o(.rodata);
src/pokemon_summary_screen.o(.rodata);
data/pokemon_summary_screen.o(.rodata);
src/unk_pokedex_area_screen_helper.o(.rodata);
data/battle_pyramid.o(.rodata);
data/pokenav.o(.rodata);
src/match_call.o(.rodata);
data/pokenav.o(.rodata.after.match.call);