dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for merge

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-04 01:54:51 +08:00
parent 94091f1589 5bcafd74ec
commit 67542ec22d
2535 changed files with 59634 additions and 59721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+24 -7
View File
@@ -112,10 +112,10 @@ SECTIONS {
asm/palette.o(.text);
src/sound.o(.text);
asm/battle_anim.o(.text);
asm/battle_anim_8074480.o(.text);
asm/battle_anim_mons.o(.text);
src/task.o(.text);
asm/reshow_battle_screen.o(.text);
asm/battle_anim_8078178.o(.text);
asm/battle_anim_status_effects.o(.text);
asm/title_screen.o(.text);
asm/reset_save_heap.o(.text);
asm/field_weather.o(.text);
@@ -138,7 +138,7 @@ SECTIONS {
asm/mail_data.o(.text);
asm/map_name_popup.o(.text);
asm/item_menu_icons.o(.text);
asm/battle_anim_80989F8.o(.text);
asm/battle_anim_mon_movement.o(.text);
asm/item.o(.text);
asm/shop.o(.text);
src/berry.o(.text);
@@ -154,7 +154,24 @@ SECTIONS {
asm/field_special_scene.o(.text);
asm/safari_zone.o(.text);
asm/item_use.o(.text);
asm/battle_anim_80A22E8.o(.text);
asm/battle_anim_effects_1.o(.text);
asm/battle_anim_effects_2.o(.text);
asm/water.o(.text);
asm/fire.o(.text);
asm/electric.o(.text);
asm/ice.o(.text);
asm/fighting.o(.text);
asm/poison.o(.text);
asm/flying.o(.text);
asm/psychic.o(.text);
asm/bug.o(.text);
asm/rock.o(.text);
asm/ghost.o(.text);
asm/dragon.o(.text);
asm/dark.o(.text);
asm/ground.o(.text);
asm/normal.o(.text);
asm/battle_anim_utility_funcs.o(.text);
asm/bike.o(.text);
asm/easy_chat.o(.text);
asm/mon_markings.o(.text);
@@ -186,14 +203,14 @@ SECTIONS {
asm/battle_anim_sound_tasks.o(.text);
asm/battle_controller_safari.o(.text);
asm/fldeff_sweetscent.o(.text);
asm/battle_anim_80DE2C0.o(.text);
asm/battle_anim_effects_3.o(.text);
asm/learn_move.o(.text);
asm/fldeff_softboiled.o(.text);
src/fldeff_softboiled.o(.text);
asm/battle_tower.o(.text);
asm/battle_controller_oak.o(.text);
asm/player_pc.o(.text);
asm/intro.o(.text);
asm/battle_anim_80EEC0C.o(.text);
asm/battle_anim_special.o(.text);
asm/hall_of_fame.o(.text);
asm/credits.o(.text);
asm/diploma.o(.text);