diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-23 10:01:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 10:01:30 -0400 |
| commit | 34bebdc56e6e7001043a95549d6aa19e2610719a (patch) | |
| tree | f6b5f3db3085e77ea856802acb27cce20e02fea9 | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
| parent | a25ec36dfc4eb36949514d5c26f2949bad11fb05 (diff) | |
Merge pull request #73 from Delta456/master
Fix build
| -rw-r--r-- | data/map_events.s | 1 | ||||
| -rw-r--r-- | ld_script.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/data/map_events.s b/data/map_events.s index d5d0e2329..583802155 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -12,6 +12,7 @@ @#include "constants/trainer_hill.h" .include "asm/macros.inc" .include "constants/constants.inc" + .include "constants/item_data_constants.inc" .section .rodata diff --git a/ld_script.txt b/ld_script.txt index 3ba67bffe..50e25d378 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -172,7 +172,6 @@ SECTIONS { asm/ground.o(.text); asm/normal.o(.text); asm/battle_anim_utility_funcs.o(.text); - src/bike.o(.text); asm/bike.o(.text); asm/easy_chat.o(.text); asm/mon_markings.o(.text); |