prepare for merge

.clang-format

@@ -0,0 +1,90 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: false
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories: 
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
+

.vscode/c_cpp_properties.json

@@ -1,70 +1,77 @@
-{
-    "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "${workspaceRoot}",
-                "/usr/include",
-                "/usr/local/include",
-                "src/include"
-            ],
-            "defines": [],
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "src/include"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "Linux",
-            "includePath": [
-                "${workspaceRoot}",
-                "/usr/include",
-                "/usr/local/include",
-                "src/include"
-            ],
-            "defines": [],
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "src/include"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "Win32",
-            "includePath": [
-                "${workspaceRoot}",
-                "E:/Visual Studio 2015/VC/include/*",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/um",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/ucrt",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/shared",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/winrt",
-                "src/include"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "browse": {
-                "path": [
-                    "E:/Visual Studio 2015/VC/include/*",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/um",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/ucrt",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/shared",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/winrt",
-                    "src/include"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        }
-    ]
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceRoot}",
+                "/usr/include",
+                "/usr/local/include",
+                "src/include"
+            ],
+            "defines": [],
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "src/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "intelliSenseMode": "clang-x64"
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceRoot}",
+                "/usr/include",
+                "/usr/local/include",
+                "src/include"
+            ],
+            "defines": [],
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "src/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "intelliSenseMode": "clang-x64"
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceRoot}",
+                "E:/Visual Studio 2015/VC/include/*",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/um",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/ucrt",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/shared",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/winrt",
+                "src/include"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "browse": {
+                "path": [
+                    "E:/Visual Studio 2015/VC/include/*",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/um",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/ucrt",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/shared",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10586.0/winrt",
+                    "src/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "intelliSenseMode": "msvc-x64"
+        }
+    ],
+    "version": 2
 }

.vscode/launch.json

@@ -2,11 +2,17 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Debug",
             "type": "gdb",
-            "request": "launch",
-            "target": "./bin/executable",
-            "cwd": "${workspaceRoot}"
+            "request": "attach",
+            "name": "Debug",
+            "preLaunchTask": "start",
+            "executable": "object/linked.o",
+            "gdbpath": "arm-none-eabi-gdb",
+            "target": "localhost:2345",
+            "remote": true,
+            "cwd": "${workspaceRoot}",
+            "autorun": [
+            ]
         }
     ]
 }

.vscode/settings.json

@@ -41,6 +41,120 @@
         "xstring": "cpp",
         "xtree": "cpp",
         "xiosbase": "cpp",
-        "xfunctional": "cpp"
+        "xfunctional": "cpp",
+        "streambuf": "cpp",
+        "xlocmes": "cpp",
+        "memory": "cpp",
+        "xlocbuf": "cpp",
+        "atomic": "cpp",
+        "valarray": "cpp",
+        "locale": "cpp",
+        "thread": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "corecrt_io.h": "c",
+        "corecrt_wio.h": "c",
+        "ocidl.h": "c",
+        "wingdi.h": "c",
+        "m4a.h": "c",
+        "background.h": "c",
+        "sprites.h": "c",
+        "berry.h": "c",
+        "fieldmap.h": "c",
+        "flash_internal.h": "c",
+        "m4a_internal.h": "c",
+        "types.h": "c",
+        "sprite.h": "c",
+        "lcd.h": "c",
+        "objects.h": "c",
+        "map.h": "c",
+        "dns_core.h": "c",
+        "task.h": "c",
+        "xkeycheck.h": "c",
+        "pkmn_bank.h": "c",
+        "bios.h": "c",
+        "gba_video.h": "c",
+        "compression.h": "c",
+        "switch_bg.h": "c",
+        "flags.h": "c",
+        "battle_structs.h": "c",
+        "palette.h": "c",
+        "string.h": "c",
+        "callback.h": "c",
+        "gba_types.h": "c",
+        "text.h": "c",
+        "base.h": "c",
+        "oam_types.h": "c",
+        "debug.h": "c",
+        "common.h": "c",
+        "ole.h": "c",
+        "oleidl.h": "c",
+        "battle_state.h": "c",
+        "crtdbg.h": "c",
+        "useful-bped.h": "c",
+        "pokeagb.h": "c",
+        "graphics.h": "c",
+        "version.h": "c",
+        "core.h": "c",
+        "pokemon.h": "c",
+        "save.h": "c",
+        "battle.h": "c",
+        "overworld.h": "c",
+        "audio.h": "c",
+        "memory.h": "c",
+        "io.h": "c",
+        "battle_pick_message.h": "c",
+        "battle_abilities.h": "c",
+        "moves.h": "c",
+        "pkmn_bank_stats.h": "c",
+        "constants.h": "c",
+        "math.h": "c",
+        "objidl.h": "c",
+        "objidlbase.h": "c",
+        "winuser.h": "c",
+        "winnt.h": "c",
+        "internal.h": "c",
+        "item.h": "c",
+        "evolution.h": "c",
+        "move.h": "c",
+        "game_engine.h": "c",
+        "agile.h": "c",
+        "xtgmath.h": "c",
+        "stdbool.h": "c",
+        "stdint.h": "c",
+        "grass_bg.h": "c",
+        "fade.h": "c",
+        "block.h": "c",
+        "gba_keys.h": "c",
+        "data.h": "c",
+        "ability.h": "c",
+        "battle_common.h": "c",
+        "nb30.h": "c",
+        "trainer.h": "c",
+        "decoration.h": "c",
+        "link.h": "c",
+        "vcruntime_typeinfo.h": "c",
+        "msxml.h": "c",
+        "wmp.h": "c",
+        "minwindef.h": "c",
+        "corecrt.h": "c",
+        "vcruntime.h": "c",
+        "virtual_map.h": "c",
+        "wincrypt.h": "c",
+        "gba_compress.h": "c",
+        "windef.h": "c",
+        "wtypes.h": "c",
+        "effects.h": "c",
+        "npc.h": "c",
+        "global.h": "c",
+        "save_one.h": "c",
+        "type.h": "c",
+        "pkmn_types.h": "c",
+        "type_icons.h": "c",
+        "ppltasks.h": "c",
+        "stat.h": "c",
+        "pokedex.h": "c",
+        "config.h": "c",
+        "agb_debug.h": "c"
     }
 }

.vscode/tasks.json

@@ -1,20 +1,27 @@
 {
-    "version": "0.1.0",
-    "command": "make",
-    "isShellCommand": true,
-    "args": [],
-    "showOutput": "always",
-    "echoCommand": true,
+    "version": "2.0.0",
+    "command": "C:/cygwin64/bin/bash",
+    "args": ["-lc", "make"],
     "suppressTaskName": true,
     "tasks": [
         {
-            "isBuildCommand": true,
+            "type": "shell",
+            "group": "build",
             "taskName": "build",
-            "args": ["-j4", "all"]
+            "args": [],
+            "problemMatcher": [],
+            "presentation": {
+                "reveal": "always",
+                "echo": true
+            }
         },
         {
-            "taskName": "clean",
-            "args": ["clean"]
+            "type": "shell",
+            "group": "none",
+            "taskName": "start",
+            "command": "~/sots/source_of_the_sovereign/debug.sh",
+            "args":[],
+            "problemMatcher": []
         }
     ]
 }

battle_engine

@@ -1 +1 @@
-Subproject commit 781351a52a4f4b118ddf09c9b27f4f8ffdf4f520
+Subproject commit a0eee6f4ba5baee875f4f283c1f2b093d08b0564

bpre.sym

@@ -81,6 +81,7 @@ execute_battle_script = 0x0801BC24;
 dp_01_prepare_buffer = 0x0800D8B1;
 wram_decompress = 0x081E3B70|1;
 battle_script_push = 0x08017544|1;
+objects = 0x0202063C;
 
 fade_screen = 0x08070589;
 fade_update = 0x080704D1;

data/pkmn_tables/pokemon_stats.S

@@ -1,7 +1,7 @@
 .text
 .align 2
-.global pokemon_stats
-pokemon_stats:
+.global pokemon_base_stats
+pokemon_base_stats:
 
 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 .hword 0, 0

debug.sh

@@ -0,0 +1,7 @@
+EMULATOR=E:/OneDrive/Hacking/Romhacking/Emulator/mGBA-0.5.2-2016-12-31-win32/mgba.exe
+
+# Start mGBA in the background
+pwd
+cygstart $EMULATOR -g sots/source_of_the_sovereign/build/pkmn_sots.gba
+sleep 4
+exit

main.asm

@@ -42,7 +42,7 @@
 .include "patches/pokemon_data/pokemon_habitats.asm"
 .include "patches/pokemon_data/pokemon_evolution.asm"
 
-//.include "patches/overworlds/pkm_wild.asm"
+.include "patches/overworlds/pkm_wild.asm"
 //.include "patches/dns/core.asm"
 
 .include "patches/overworlds/overworld.asm"
@@ -59,17 +59,11 @@
 
 .include "patches/game_engine/quick_hacks.asm"
 
-.include "battle_engine/patches/menutest.s"
+//.include "battle_engine/patches/battle_hooks.s"
 
 .org 0x0815F9B8
     .word 0x08069ED5 // fix nop1 for now...
 
-.org 0x083522F4
-    //.word mapheader_alabastia
-
-.org 0x0834ECC0
-    //.word mapfooter_alabastia
-
 .org 0x09000000
 .importobj "object/linked.o"
 .close

makefile

@@ -12,9 +12,13 @@ STRAGB	:= string2agb
 
 export PATH := $(realpath ../tools):$(PATH)
 
+PAGB_MAIN := battle_engine/deps/pokeagb
+PAGB_INCLUDE := $(PAGB_MAIN)/build/include/
+PAGB_LINK := $(PAGB_MAIN)/build/linker/BPRE.ld
+
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
 ASFLAGS   := -mthumb
-CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O0 -std=c99 -Wall -Wextra -Wunreachable-code -Isrc/include $(DEFINES)
+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)
 GRITFLAGS := -ftc -fa
 LDFLAGS   := -z muldefs
 BLDPATH   := object
@@ -79,14 +83,13 @@ 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) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $(STRING_OBJ) $(B_ENGINE)#$(DYN_OVER) 
+$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $(STRING_OBJ)#$(B_ENGINE)
 	$(MAKE) -f assets.makefile
 	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
-	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym -o object/debug.o object/linked.o
 
 .PHONY: $(B_ENGINE)
 $(B_ENGINE):
-	$(MAKE) -C $(dir $@)/.. build/linked.o
+	$(MAKE) -C battle_engine build/linked.o
 
 .PHONY: clean
 clean:

patches/pokemon_data/pokemon_stats.asm

@@ -1,174 +1,174 @@
 .org 0x080001BC
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08012754
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08012FA8
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08013230
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08016A60
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0801F008
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08021C28
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080240B4
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0802BABC
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0802CE90
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0802D53C
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0802FFBC
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080300E8
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080301F8
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08039558
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080399BC
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08039A68
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08039FE8
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0803DCC4
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0803DD94
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0803E734
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0803E82C
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0803E898
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0803F780
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0803F7C8
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08040D58
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08040D78
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080413B8
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080419A0
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08043914
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08043928
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0804393C
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08043950
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08043964
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080439A4
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08043B8C
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08043C10
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08044208
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08044458
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08046600
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08049F4C
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0804FC88
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080C84E0
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080CA850
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080E7F14
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080E8040
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x080E8150
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08103AC4
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x081066B4
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0811AE48
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x081361F8
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08136794
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x0813AAE0
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x081569EC
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08156B18
-.word pokemon_stats
+.word pokemon_base_stats
 
 .org 0x08156C28
-.word pokemon_stats
+.word pokemon_base_stats
 
 //EGG HATCHING TIME
 .org 0x08046204
-.word pokemon_stats + 0x11
+.word pokemon_base_stats + 0x11
 
 .org 0x080462A8
-.word pokemon_stats + 0x11
+.word pokemon_base_stats + 0x11

sots-private

@@ -1 +1 @@
-Subproject commit 6b628d4d5ffc83d20296c181681feb35c93857c3
+Subproject commit 81f4381ae57d57a70520296de8a09a469b5b1f5c

src/evolution/evolution_methods.c

@@ -291,8 +291,8 @@ struct evo_result evolve_by_type(struct evo_call_arguments arguments)
         u16 current_species = pokemon_get_attribute(&(pokemon_party_player[i]), ATTR_SPECIES, NULL);
         if (current_species == 0)
             continue;
-        u8 type_one = pokemon_stats[current_species].type_one;
-        u8 type_two = pokemon_stats[current_species].type_two;
+        u8 type_one = pokemon_base_stats[current_species].type_one;
+        u8 type_two = pokemon_base_stats[current_species].type_two;
         dprintf("Found type: %d/%d\n", type_one, type_two);
         if (type_one == type_required || type_two == type_required)
         {

src/include/pokemon.h

@@ -51,6 +51,6 @@ struct pokemon_data
     u16 padding;
 };
 
-extern struct pokemon_data pokemon_stats[1300];
+extern struct pokemon_data pokemon_base_stats[1300];
 
 #endif /* POKE_INDICES_H */

src/overworld/dynamic_overworld.c

@@ -0,0 +1,6 @@
+#include <pokeagb/pokeagb.h>
+
+void npc_spawn()
+{
+    //placeholder for now
+}

src/savefile/flag_manipulation.c

@@ -34,6 +34,7 @@
 #include <stdbool.h>
 #include <game_engine.h>
 #include <battle_structs.h>
+#include <config.h>
 
 u16 trainerflag_fix_difficulty(u16 flag_id);
 
@@ -48,7 +49,7 @@ u16 load_hword(void* ptr)
 u16 trainerflag_fix_difficulty(u16 flag_id)
 {
     u16 new_flag = ((flag_id - TRAINER_FLAG_SPACE_START + 1) / 3) + TRAINER_FLAG_SPACE_START;
-    dprintf("trainerflag_fix_difficulty;; flag_id: 0x%x, reduced: 0x%x\n", flag_id, new_flag);
+    dprintf("trainerflag_fix_difficulty;; flag_id: 0x%x, reduced: 0x%x, status: %s\n", flag_id, new_flag, flag_check(new_flag) ? "true" : "false");
     return new_flag;
 }