more build fixes

.gitignore

@@ -1,7 +1,6 @@
 *.gba
 base/*.gba
-build
-gfx_build/*.o
+*.o
 object
 temp
 assets/pkmn_sprites/*.png
@@ -10,5 +9,4 @@ assets/pkmn_icons/*.png
 *.ogg
 *.wav
 *.mid
-object/*.o
 *.a

base/.gitignore

@@ -0,0 +1 @@
+*.gba

build/.gitignore

@@ -0,0 +1,2 @@
+*.gba
+*.sym

gfx_build/.gitignore

@@ -1 +1,2 @@
 *.o
+*.s

gfx_build/icons/.gitignore

@@ -1 +1,2 @@
 *.o
+*.s

gfx_build/sprites/.gitignore

@@ -1 +1,2 @@
 *.o
+*.s

gfx_build/sprites/back_sprites/.gitignore

@@ -1 +1,2 @@
 *.o
+*.s

gfx_build/sprites/castform/.gitignore

@@ -1 +1,2 @@
 *.o
+*.s

gfx_build/sprites/front_sprites/.gitignore

@@ -1 +1,2 @@
 *.o
+*.s

gfx_build/sprites/normal_pal/.gitignore

@@ -1 +1,2 @@
 *.o
+*.s

gfx_build/sprites/shiny_pal/.gitignore

@@ -1 +1,2 @@
 *.o
+*.s

makefile

@@ -67,7 +67,7 @@ rom: main.asm $(MAIN_OBJ)
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
 
-$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(DYN_OVER) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) "built/dynamic_overworld.o"
+$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(DYN_OVER) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR)
 	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
 
 .PHONY: clean