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

Merge branch 'master' into dodrio_berry_picking

Browse Source
This commit is contained in:
scnorton
2019-03-24 20:08:49 -04:00
parent 2136187c11 d7a9fcb975
commit 708f128568
137 changed files with 1196 additions and 6791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+58 -57
View File
@@ -56,7 +56,7 @@ SECTIONS {
src/link_rfu.o(.text);
src/union_room.o(.text);
asm/union_room.o(.text);
asm/mevent2.o(.text);
src/mevent2.o(.text);
asm/mevent_801BAAC.o(.text);
asm/mevent_server.o(.text);
asm/mevent_server_ish.o(.text);
@@ -64,7 +64,7 @@ SECTIONS {
asm/mevent_news.o(.text);
asm/union_room_chat.o(.text);
asm/berry_crush.o(.text);
asm/berry_powder_vendor.o(.text);
src/berry_powder.o(.text);
src/dodrio_berry_picking.o(.text);
asm/dodrio_berry_picking.o(.text);
asm/pokemon_jump.o(.text);
@@ -410,11 +410,12 @@ SECTIONS {
src/link_rfu.o(.rodata);
src/union_room.o(.rodata);
data/union_room.o(.rodata);
data/mevent2.o(.rodata);
src/mevent2.o(.rodata);
data/mevent_801BAAC.o(.rodata);
data/mevent_server.o(.rodata);
data/union_room_chat.o(.rodata);
data/berry_crush.o(.rodata);
data/berry_powder_vendor.o(.rodata);
data/berry_powder.o(.rodata);
src/dodrio_berry_picking.o(.rodata);
data/dodrio_berry_picking.o(.rodata);
data/pokemon_jump.o(.rodata);
@@ -663,7 +664,7 @@ SECTIONS {
sound/songs/midi/se_jyuni.o(.rodata);
sound/songs/midi/se_a.o(.rodata);
sound/songs/midi/se_i.o(.rodata);
sound/songs/se_u.o(.rodata);
sound/songs/midi/se_u.o(.rodata);
sound/songs/midi/se_e.o(.rodata);
sound/songs/midi/se_o.o(.rodata);
sound/songs/midi/se_n.o(.rodata);
@@ -672,7 +673,7 @@ SECTIONS {
sound/songs/midi/se_exp.o(.rodata);
sound/songs/midi/se_jite_pyoko.o(.rodata);
sound/songs/midi/se_mu_pachi.o(.rodata);
sound/songs/se_tk_kasya.o(.rodata);
sound/songs/midi/se_tk_kasya.o(.rodata);
sound/songs/midi/se_fu_zaku.o(.rodata);
sound/songs/midi/se_fu_zaku2.o(.rodata);
sound/songs/midi/se_fu_zuzuzu.o(.rodata);
@@ -681,14 +682,14 @@ SECTIONS {
sound/songs/midi/se_ru_bari.o(.rodata);
sound/songs/midi/se_ru_hyuu.o(.rodata);
sound/songs/midi/se_ki_gasyan.o(.rodata);
sound/songs/se_tk_warpin.o(.rodata);
sound/songs/se_tk_warpout.o(.rodata);
sound/songs/se_tu_saa.o(.rodata);
sound/songs/midi/se_tk_warpin.o(.rodata);
sound/songs/midi/se_tk_warpout.o(.rodata);
sound/songs/midi/se_tu_saa.o(.rodata);
sound/songs/midi/se_hi_turun.o(.rodata);
sound/songs/se_track_move.o(.rodata);
sound/songs/se_track_stop.o(.rodata);
sound/songs/se_track_haiki.o(.rodata);
sound/songs/se_track_door.o(.rodata);
sound/songs/midi/se_track_move.o(.rodata);
sound/songs/midi/se_track_stop.o(.rodata);
sound/songs/midi/se_track_haiki.o(.rodata);
sound/songs/midi/se_track_door.o(.rodata);
sound/songs/midi/se_moter.o(.rodata);
sound/songs/midi/se_card.o(.rodata);
sound/songs/midi/se_save.o(.rodata);
@@ -698,14 +699,14 @@ SECTIONS {
sound/songs/midi/se_kon4.o(.rodata);
sound/songs/midi/se_suikomu.o(.rodata);
sound/songs/midi/se_nageru.o(.rodata);
sound/songs/se_toy_c.o(.rodata);
sound/songs/se_toy_d.o(.rodata);
sound/songs/se_toy_e.o(.rodata);
sound/songs/se_toy_f.o(.rodata);
sound/songs/se_toy_g.o(.rodata);
sound/songs/se_toy_a.o(.rodata);
sound/songs/se_toy_b.o(.rodata);
sound/songs/se_toy_c1.o(.rodata);
sound/songs/midi/se_toy_c.o(.rodata);
sound/songs/midi/se_toy_d.o(.rodata);
sound/songs/midi/se_toy_e.o(.rodata);
sound/songs/midi/se_toy_f.o(.rodata);
sound/songs/midi/se_toy_g.o(.rodata);
sound/songs/midi/se_toy_a.o(.rodata);
sound/songs/midi/se_toy_b.o(.rodata);
sound/songs/midi/se_toy_c1.o(.rodata);
sound/songs/midi/se_mizu.o(.rodata);
sound/songs/midi/se_hashi.o(.rodata);
sound/songs/midi/se_daugi.o(.rodata);
@@ -713,8 +714,8 @@ SECTIONS {
sound/songs/midi/se_fuusen1.o(.rodata);
sound/songs/midi/se_fuusen2.o(.rodata);
sound/songs/midi/se_fuusen3.o(.rodata);
sound/songs/se_toy_kabe.o(.rodata);
sound/songs/se_toy_dango.o(.rodata);
sound/songs/midi/se_toy_kabe.o(.rodata);
sound/songs/midi/se_toy_dango.o(.rodata);
sound/songs/midi/se_doku.o(.rodata);
sound/songs/midi/se_esuka.o(.rodata);
sound/songs/midi/se_t_ame.o(.rodata);
@@ -728,8 +729,8 @@ SECTIONS {
sound/songs/midi/se_elebeta.o(.rodata);
sound/songs/midi/se_hinsi.o(.rodata);
sound/songs/midi/se_expmax.o(.rodata);
sound/songs/se_tamakoro.o(.rodata);
sound/songs/se_tamakoro_e.o(.rodata);
sound/songs/midi/se_tamakoro.o(.rodata);
sound/songs/midi/se_tamakoro_e.o(.rodata);
sound/songs/midi/se_basabasa.o(.rodata);
sound/songs/midi/se_regi.o(.rodata);
sound/songs/midi/se_c_gaji.o(.rodata);
@@ -743,16 +744,16 @@ SECTIONS {
sound/songs/midi/se_bt_start.o(.rodata);
sound/songs/midi/se_dendou.o(.rodata);
sound/songs/midi/se_jihanki.o(.rodata);
sound/songs/se_tama.o(.rodata);
sound/songs/midi/se_tama.o(.rodata);
sound/songs/se_z_scroll.o(.rodata);
sound/songs/se_z_page.o(.rodata);
sound/songs/midi/se_pn_on.o(.rodata);
sound/songs/midi/se_pn_off.o(.rodata);
sound/songs/midi/se_z_search.o(.rodata);
sound/songs/se_tamago.o(.rodata);
sound/songs/se_tb_start.o(.rodata);
sound/songs/se_tb_kon.o(.rodata);
sound/songs/se_tb_kara.o(.rodata);
sound/songs/midi/se_tamago.o(.rodata);
sound/songs/midi/se_tb_start.o(.rodata);
sound/songs/midi/se_tb_kon.o(.rodata);
sound/songs/midi/se_tb_kara.o(.rodata);
sound/songs/midi/se_bidoro.o(.rodata);
sound/songs/se_w085.o(.rodata);
sound/songs/se_w085b.o(.rodata);
@@ -764,53 +765,53 @@ SECTIONS {
sound/songs/se_w145b.o(.rodata);
sound/songs/se_w145c.o(.rodata);
sound/songs/se_w240.o(.rodata);
sound/songs/se_w015.o(.rodata);
sound/songs/midi/se_w015.o(.rodata);
sound/songs/se_w081.o(.rodata);
sound/songs/se_w081b.o(.rodata);
sound/songs/se_w088.o(.rodata);
sound/songs/se_w016.o(.rodata);
sound/songs/se_w016b.o(.rodata);
sound/songs/se_w003.o(.rodata);
sound/songs/midi/se_w016.o(.rodata);
sound/songs/midi/se_w016b.o(.rodata);
sound/songs/midi/se_w003.o(.rodata);
sound/songs/se_w104.o(.rodata);
sound/songs/se_w013.o(.rodata);
sound/songs/midi/se_w013.o(.rodata);
sound/songs/se_w196.o(.rodata);
sound/songs/se_w086.o(.rodata);
sound/songs/se_w004.o(.rodata);
sound/songs/se_w025.o(.rodata);
sound/songs/se_w025b.o(.rodata);
sound/songs/midi/se_w004.o(.rodata);
sound/songs/midi/se_w025.o(.rodata);
sound/songs/midi/se_w025b.o(.rodata);
sound/songs/se_w152.o(.rodata);
sound/songs/se_w026.o(.rodata);
sound/songs/midi/se_w026.o(.rodata);
sound/songs/se_w172.o(.rodata);
sound/songs/se_w172b.o(.rodata);
sound/songs/se_w053.o(.rodata);
sound/songs/se_w007.o(.rodata);
sound/songs/midi/se_w007.o(.rodata);
sound/songs/se_w092.o(.rodata);
sound/songs/se_w221.o(.rodata);
sound/songs/se_w221b.o(.rodata);
sound/songs/se_w052.o(.rodata);
sound/songs/se_w036.o(.rodata);
sound/songs/midi/se_w036.o(.rodata);
sound/songs/se_w059.o(.rodata);
sound/songs/se_w059b.o(.rodata);
sound/songs/se_w010.o(.rodata);
sound/songs/se_w011.o(.rodata);
sound/songs/se_w017.o(.rodata);
sound/songs/se_w019.o(.rodata);
sound/songs/se_w028.o(.rodata);
sound/songs/se_w013b.o(.rodata);
sound/songs/midi/se_w010.o(.rodata);
sound/songs/midi/se_w011.o(.rodata);
sound/songs/midi/se_w017.o(.rodata);
sound/songs/midi/se_w019.o(.rodata);
sound/songs/midi/se_w028.o(.rodata);
sound/songs/midi/se_w013b.o(.rodata);
sound/songs/se_w044.o(.rodata);
sound/songs/se_w029.o(.rodata);
sound/songs/midi/se_w029.o(.rodata);
sound/songs/se_w057.o(.rodata);
sound/songs/se_w056.o(.rodata);
sound/songs/se_w250.o(.rodata);
sound/songs/se_w030.o(.rodata);
sound/songs/se_w039.o(.rodata);
sound/songs/midi/se_w030.o(.rodata);
sound/songs/midi/se_w039.o(.rodata);
sound/songs/se_w054.o(.rodata);
sound/songs/se_w077.o(.rodata);
sound/songs/se_w020.o(.rodata);
sound/songs/midi/se_w020.o(.rodata);
sound/songs/se_w082.o(.rodata);
sound/songs/se_w047.o(.rodata);
sound/songs/se_w195.o(.rodata);
sound/songs/se_w006.o(.rodata);
sound/songs/midi/se_w006.o(.rodata);
sound/songs/se_w091.o(.rodata);
sound/songs/se_w146.o(.rodata);
sound/songs/se_w120.o(.rodata);
@@ -827,8 +828,8 @@ SECTIONS {
sound/songs/se_w122.o(.rodata);
sound/songs/se_w060.o(.rodata);
sound/songs/se_w185.o(.rodata);
sound/songs/se_w014.o(.rodata);
sound/songs/se_w043.o(.rodata);
sound/songs/midi/se_w014.o(.rodata);
sound/songs/midi/se_w043.o(.rodata);
sound/songs/se_w207.o(.rodata);
sound/songs/se_w207b.o(.rodata);
sound/songs/se_w215.o(.rodata);
@@ -899,13 +900,13 @@ SECTIONS {
sound/songs/midi/se_rg_deomov.o(.rodata);
sound/songs/midi/se_rg_excellent.o(.rodata);
sound/songs/midi/se_rg_nawamiss.o(.rodata);
sound/songs/se_toreeye.o(.rodata);
sound/songs/se_toreoff.o(.rodata);
sound/songs/midi/se_toreeye.o(.rodata);
sound/songs/midi/se_toreoff.o(.rodata);
sound/songs/midi/se_hantei1.o(.rodata);
sound/songs/midi/se_hantei2.o(.rodata);
sound/songs/midi/se_curtain.o(.rodata);
sound/songs/midi/se_curtain1.o(.rodata);
sound/songs/se_ussoki.o(.rodata);
sound/songs/midi/se_ussoki.o(.rodata);
sound/songs/midi/mus_tetsuji.o(.rodata);
sound/songs/midi/mus_field13.o(.rodata);
sound/songs/midi/mus_kachi22.o(.rodata);