diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-16 23:22:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-16 23:22:52 +0800 |
| commit | c7d3ad06b062abf6acb2eaa2b19da86a7acdab19 (patch) | |
| tree | dda0c0701f1f73921fc2d7ca3fd1b6133473aad4 /ld_script.txt | |
| parent | b7bdad5b2594b847a7d9c70970505c45dabca462 (diff) | |
| parent | e13e7eccafdc48b648bf20f8e02f72130c51d1ab (diff) | |
Merge branch 'master' into pokemon
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index d891908ca..c6b35f651 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -187,7 +187,7 @@ SECTIONS { src/prof_pc.o(.text); src/hof_pc.o(.text); asm/field_specials.o(.text); - asm/battle_records.o(.text); + src/battle_records.o(.text); asm/evolution_scene.o(.text); src/coins.o(.text); src/fldeff_strength.o(.text); @@ -416,6 +416,8 @@ SECTIONS { data/data_835B488.o(.rodata.83EEC98); src/battle_ai_script_commands.o(.rodata); data/data_83F5738.o(.rodata); + src/battle_records.o(.rodata); + data/data_83F5738.o(.rodata.83F6C90); src/save.o(.rodata); data/data_83FECCC.o(.rodata); src/intro.o(.rodata); |