diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-26 16:19:44 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-26 16:19:44 -0500 |
| commit | cf84c5406bf9b08950722d90ba4eba3bd8606080 (patch) | |
| tree | 0140b0b3cb4b1b0b523cd39a71fd775d911c65d0 /ld_script.txt | |
| parent | 2d70a16fa09eb545b0e236313be6daaa6d17964a (diff) | |
| parent | 4e7e4cf467e6243994d19971d7cbee33c2f7bd25 (diff) | |
merge
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index eb3e414f9..4ff52a41e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -65,7 +65,7 @@ SECTIONS { src/pokemon/pokemon_3.o(.text); src/de_rom_8040FE0.o(.text); src/engine/trig.o(.text); - src/engine/rng.o(.text); + src/engine/random.o(.text); src/engine/util.o(.text); src/engine/blend_palette.o(.text); src/field/daycare.o(.text); @@ -111,7 +111,7 @@ SECTIONS { src/battle/battle_anim_807B69C.o(.text); src/scene/title_screen.o(.text); src/field/field_weather.o(.text); - asm/field_weather.o(.text); + src/field/field_weather_effects.o(.text); src/field/field_fadetransition.o(.text); src/field/field_screen_effect.o(.text); src/battle/battle_setup.o(.text); @@ -158,6 +158,7 @@ SECTIONS { src/script_pokemon_util_80C4BF0.o(.text); src/field/field_poison.o(.text); src/pokemon/pokemon_size_record.o(.text); + src/field/pc_screen_effect.o(.text); asm/pc_screen_effect.o(.text); src/field/fldeff_secretpower.o(.text); src/field/fldeff_secret_base_pc.o(.text); @@ -497,7 +498,7 @@ SECTIONS { src/battle/battle_anim_807B69C.o(.rodata); src/scene/title_screen.o(.rodata); src/field/field_weather.o(.rodata); - data/field_weather.o(.rodata); + src/field/field_weather_effects.o(.rodata); src/field/field_screen_effect.o(.rodata); src/battle/battle_setup.o(.rodata); src/engine/cable_club.o(.rodata); @@ -535,6 +536,7 @@ SECTIONS { src/field/tv.o(.rodata); data/contest_link_80C2020.o(.rodata); src/pokemon/pokemon_size_record.o(.rodata); + src/field/pc_screen_effect.o(.rodata); data/pc_screen_effect.o(.rodata); data/fldeff_secretpower.o(.rodata); data/fldeff_decoration.o(.rodata); |