summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-04-07 16:01:35 -0700
committerYamaArashi <shadow962@live.com>2017-04-07 16:01:35 -0700
commit4dca3bbb988f4d574faf7410bf6616f802f8cc8c (patch)
tree1a94c948b16471401c3d0cdd9341bcca4a516301
parentc49ffe17388b300ccff96ea39fd816fd2380ce37 (diff)
add build/* to .gitignore
-rw-r--r--.gitignore1
-rw-r--r--ld_script.txt4
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 550f7677c..78af8c737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ types_*.taghl
*.dump
*.sa*
Thumbs.db
+build/*
diff --git a/ld_script.txt b/ld_script.txt
index b65b3b5f4..b045abe92 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -448,8 +448,8 @@ SECTIONS {
data/decoration_inventory.o(.rodata);
data/roamer.o(.rodata);
data/battle_tower.o(.rodata);
- data/use_pokeblock.o(.rodata);
- data/battle_anim_8137220.o(.rodata);
+ data/use_pokeblock.o(.rodata);
+ data/battle_anim_8137220.o(.rodata);
data/player_pc.o(.rodata);
src/intro.o(.rodata);
data/battle_anim_813F0F4.o(.rodata);