Merge branch 'master' into pokemon

This commit is contained in:
jiangzhengwenjz
2019-07-16 23:22:52 +08:00
26 changed files with 750 additions and 1524 deletions
+3 -1
View File
@@ -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);