Karathan
/
source_of_the_sovereign
mirror of https://github.com/SBird1337/source_of_the_sovereign
Watch 1
Star 0
Fork 0
Code Issues Releases 0 Wiki Activity
Browse Source

Merge branch 'master' into test

SBird1337 7 years ago
parent
bc3c891610 a8c238fbb9
commit
3b228509b4
2 changed files with 1 additions and 3 deletions
Unified View Show Diff Stats
  1. 1
    1
      makefile
  2. 0
    2
      src/overworld/dynamic_overworld.c

+ 1
- 1
makefile View File

18
18
19 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
 19 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
20 
 ASFLAGS   := -mthumb
 20 
 ASFLAGS   := -mthumb
21 
-CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -fdiagnostics-color $(DEFINES)
21 
+CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -Isrc/include -fdiagnostics-color $(DEFINES)
22 
 GRITFLAGS := -ftc -fa
 22 
 GRITFLAGS := -ftc -fa
23 
 LDFLAGS   := -z muldefs
 23 
 LDFLAGS   := -z muldefs
24 
 BLDPATH   := object
 24 
 BLDPATH   := object

+ 0
- 2
src/overworld/dynamic_overworld.c View File

1 
-#include <pokeagb/pokeagb.h>
2 
-
3 
 void npc_spawn()
1 
 void npc_spawn()
4 
 {
2 
 {
5 
     //placeholder for now
3 
     //placeholder for now