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

Merge branch 'master' into data_dump

Browse Source
This commit is contained in:
ultima-soul
2019-12-04 11:44:52 -08:00
parent b116608e12 67f48e5f28
commit 58cf331340
135 changed files with 3960 additions and 6923 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+6 -4
View File
@@ -83,7 +83,7 @@ SECTIONS {
src/daycare.o(.text);
asm/battle_interface.o(.text);
asm/smokescreen.o(.text);
asm/pokeball.o(.text);
src/pokeball.o(.text);
src/load_save.o(.text);
src/trade.o(.text);
src/trade_scene.o(.text);
@@ -140,7 +140,8 @@ SECTIONS {
src/item_menu_icons.o(.text);
src/battle_anim_mon_movement.o(.text);
src/item.o(.text);
asm/shop.o(.text);
src/shop.o(.text);
src/sea_cottage_special_anim.o(.text);
src/berry.o(.text);
src/script_menu.o(.text);
asm/naming_screen.o(.text);
@@ -400,7 +401,7 @@ SECTIONS {
src/daycare.o(.rodata);
src/battle_gfx_sfx_util.o(.rodata);
data/battle_interface.o(.rodata);
data/pokeball.o(.rodata);
src/pokeball.o(.rodata);
src/trade.o(.rodata);
src/trade_scene.o(.rodata);
data/overworld.o(.rodata);
@@ -441,7 +442,8 @@ SECTIONS {
src/item_menu_icons.o(.rodata);
src/battle_anim_mon_movement.o(.rodata);
src/item.o(.rodata);
data/shop.o(.rodata);
src/shop.o(.rodata);
src/sea_cottage_special_anim.o(.rodata);
src/berry.o(.rodata);
src/script_menu.o(.rodata);
data/naming_screen.o(.rodata);