diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-15 00:04:06 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-15 00:04:06 +0800 |
| commit | 96fa1a23edaf12082034b4ef79244e6ce3dd3128 (patch) | |
| tree | 969c8a73b9f5b3ecdb0f7fc13d551f73d4d70e63 /ld_script.txt | |
| parent | 277726fd5e8c6da021206deeecb163f40073ff3c (diff) | |
| parent | 53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff) | |
Merge branch 'master' into pokemon
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ld_script.txt b/ld_script.txt index 2159a7390..d891908ca 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -196,7 +196,7 @@ SECTIONS { asm/battle_message.o(.text); src/math_util.o(.text); src/roulette_util.o(.text); - asm/cable_car_util.o(.text); + src/cable_car_util.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); asm/field_effect_helpers.o(.text); @@ -213,7 +213,7 @@ SECTIONS { asm/battle_anim_special.o(.text); asm/hall_of_fame.o(.text); asm/credits.o(.text); - asm/diploma.o(.text); + src/diploma.o(.text); asm/save_failed_screen.o(.text); asm/clear_save_data_screen.o(.text); asm/evolution_graphics.o(.text); @@ -233,7 +233,7 @@ SECTIONS { src/vs_seeker.o(.text); src/item_pc.o(.text); asm/mailbox_pc.o(.text); - asm/menu.o(.text); + src/menu.o(.text); src/quest_log.o(.text); asm/link_rfu_3.o(.text); asm/pokemon_special_anim.o(.text); @@ -420,6 +420,7 @@ SECTIONS { data/data_83FECCC.o(.rodata); src/intro.o(.rodata); data/data_83FECCC.o(.rodata.battle_anim_special); + src/diploma.o(.rodata); data/strings.o(.rodata); data/data_83FECCC.o(.rodata.841EE44); src/new_menu_helpers.o(.rodata); @@ -432,6 +433,7 @@ SECTIONS { src/vs_seeker.o(.rodata); src/item_pc.o(.rodata); data/data_83FECCC.o(.rodata.8453F6C); + src/menu.o(.rodata); src/quest_log.o(.rodata); data/data_83FECCC.o(.rodata.8456C74); src/help_system_812B1E0.o(.rodata); @@ -541,13 +543,7 @@ SECTIONS { data/multiboot_pokemon_colosseum.o(.rodata); } =0 - gap1 : - { - gap1_start = ABSOLUTE(.); - BYTE(0xFF) - . = 0x8D00000 - gap1_start; - } =0xFF - + . = 0x08D00000; gfx_data : ALIGN(4) { |