Merge branch 'master' into dump_pointers

This commit is contained in:
DizzyEggg
2017-12-24 11:15:00 +01:00
22 changed files with 1338 additions and 2401 deletions

View File

@@ -163,7 +163,7 @@ SECTIONS {
asm/contest_link_80FC4F4.o(.text);
asm/item_use.o(.text);
asm/battle_anim_80FE840.o(.text);
asm/bike.o(.text);
src/bike.o(.text);
asm/easy_chat.o(.text);
asm/mon_markings.o(.text);
asm/mauville_old_man.o(.text);
@@ -416,7 +416,7 @@ SECTIONS {
data/rotating_gate.o(.rodata);
data/item_use.o(.rodata);
data/battle_anim_80FE840.o(.rodata);
data/bike.o(.rodata);
src/bike.o(.rodata);
data/easy_chat.o(.rodata);
data/mon_markings.o(.rodata);
data/mauville_old_man.o(.rodata);