diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-01-07 19:00:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 19:00:16 -0600 |
| commit | 5c00be143da47ae0a3c0fb3349f6751f8759acb6 (patch) | |
| tree | 6559a371dc505c684a7931accf5dd0812e9d8bbf /ld_script.txt | |
| parent | 75c359e3001badee4eaaf496255d3a51bdcb124e (diff) | |
| parent | 0eadf71b1a0676f70024ac93a7b4bfa325fa09a3 (diff) | |
Merge pull request #156 from Diegoisawesome/master
Extract baseroms and port field_door
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt index b3551e328..9f922126e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -92,7 +92,7 @@ SECTIONS { asm/fieldmap.o(.text); src/metatile_behavior.o(.text); asm/field_camera.o(.text); - asm/field_door.o(.text); + src/field_door.o(.text); asm/field_player_avatar.o(.text); src/field_map_obj.o(.text); asm/field_ground_effect.o(.text); @@ -366,8 +366,7 @@ SECTIONS { data/maps.o(.rodata); data/fieldmap.o(.rodata); src/metatile_behavior.o(.rodata); - data/rom_8486FEC.o(.rodata); - data/field_door.o(.rodata); + src/field_door.o(.rodata); data/field_player_avatar.o(.rodata); data/field_map_obj.o(.rodata); data/field_ground_effect.o(.rodata); @@ -480,7 +479,8 @@ SECTIONS { data/intro_credits_graphics.o(.rodata); src/evolution_graphics.o(.rodata); src/bard_music.o(.rodata); - data/data_860A4AC.o(.rodata); + data/battle_link_817C95C.o(.rodata); + data/pokemon_animation.o(.rodata); src/battle_controller_recorded_opponent.o(.rodata); src/battle_controller_recorded_player.o(.rodata); src/battle_dome_cards.o(.rodata); |