Merge branch 'master' into decompile_battle1
This commit is contained in:
@@ -106,7 +106,7 @@ SECTIONS {
|
||||
src/event_data.o(.text);
|
||||
asm/coord_event_weather.o(.text);
|
||||
asm/field_tasks.o(.text);
|
||||
asm/clock.o(.text);
|
||||
src/clock.o(.text);
|
||||
asm/reset_rtc_screen.o(.text);
|
||||
src/start_menu.o(.text);
|
||||
asm/start_menu.o(.text);
|
||||
@@ -120,8 +120,9 @@ SECTIONS {
|
||||
asm/battle_anim_80A9C70.o(.text);
|
||||
asm/title_screen.o(.text);
|
||||
asm/field_screen.o(.text);
|
||||
asm/battle_setup.o(.text);
|
||||
src/battle_setup.o(.text);
|
||||
asm/cable_club.o(.text);
|
||||
src/trainer_see.o(.text);
|
||||
asm/trainer_see.o(.text);
|
||||
src/wild_encounter.o(.text);
|
||||
asm/field_effect.o(.text);
|
||||
@@ -134,7 +135,7 @@ SECTIONS {
|
||||
asm/pokemon_icon.o(.text);
|
||||
asm/script_movement.o(.text);
|
||||
asm/fldeff_cut.o(.text);
|
||||
asm/mail_data.o(.text);
|
||||
src/mail_data.o(.text);
|
||||
asm/map_name_popup.o(.text);
|
||||
asm/item_menu_icons.o(.text);
|
||||
asm/battle_anim_80D51AC.o(.text);
|
||||
@@ -177,7 +178,7 @@ SECTIONS {
|
||||
src/battle_ai_script_commands.o(.text);
|
||||
asm/trader.o(.text);
|
||||
src/starter_choose.o(.text);
|
||||
asm/wallclock.o(.text);
|
||||
src/wallclock.o(.text);
|
||||
asm/rom6.o(.text);
|
||||
asm/battle_records.o(.text);
|
||||
asm/pokedex_area_screen.o(.text);
|
||||
@@ -377,7 +378,7 @@ SECTIONS {
|
||||
data/battle_anim_80A9C70.o(.rodata);
|
||||
data/title_screen.o(.rodata);
|
||||
data/field_screen.o(.rodata);
|
||||
data/battle_setup.o(.rodata);
|
||||
src/battle_setup.o(.rodata);
|
||||
data/cable_club.o(.rodata);
|
||||
data/trainer_see.o(.rodata);
|
||||
data/wild_encounter.o(.rodata);
|
||||
@@ -423,6 +424,7 @@ SECTIONS {
|
||||
src/battle_ai_script_commands.o(.rodata);
|
||||
data/data4.o(.rodata);
|
||||
data/starter_choose.o(.rodata);
|
||||
src/wallclock.o(.rodata);
|
||||
data/data4c.o(.rodata);
|
||||
src/battle_controller_link_partner.o(.rodata);
|
||||
src/battle_message.o(.rodata);
|
||||
|
||||
Reference in New Issue
Block a user