Merge branch 'test'

.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
+...
+

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "sots-private"]
 	path = sots-private
 	url = ssh://sotshost:/home/sots/sots-private.git
+[submodule "battle_engine"]
+	path = battle_engine
+	url = https://github.com/EternalCode/battle_engine

.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

@@ -2,6 +2,159 @@
     "files.associations": {
         "filesystem": "cpp",
         "regex": "cpp",
-        "xlocmon": "cpp"
+        "xlocmon": "cpp",
+        "functional": "cpp",
+        "chrono": "cpp",
+        "future": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "scoped_allocator": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "xmemory0": "cpp",
+        "xstddef": "cpp",
+        "xtr1common": "cpp",
+        "xutility": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "sstream": "cpp",
+        "strstream": "cpp",
+        "system_error": "cpp",
+        "typeindex": "cpp",
+        "xlocale": "cpp",
+        "array": "cpp",
+        "bitset": "cpp",
+        "deque": "cpp",
+        "forward_list": "cpp",
+        "initializer_list": "cpp",
+        "iterator": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "queue": "cpp",
+        "set": "cpp",
+        "stack": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "xhash": "cpp",
+        "xstring": "cpp",
+        "xtree": "cpp",
+        "xiosbase": "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": []
         }
     ]
 }

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;
@@ -199,7 +200,12 @@ current_map_block_role_get = 0x08058F78|1;
 
 current_oe_state = 0x020386E0;
 
-__aeabi_idiv = 0x081E4018|1;
+/*__aeabi_idiv = 0x081E4018|1;
 __aeabi_idivmod = 0x081E40F4|1;
 __aeabi_uidiv = 0x081E460C|1;
-__aeabi_uidivmod = 0x081E4684|1;
+__aeabi_uidivmod = 0x081E4684|1;*/
+
+__aeabi_idiv = 0x081E3B68|1;
+__aeabi_idivmod = 0x081E3B68|1;
+__aeabi_uidiv = 0x081E3B68|1;
+__aeabi_uidivmod = 0x081E3B68|1;

data/overworld/overworld_frames.S

@@ -15143,31 +15143,31 @@ ow_frames_539:
 
 .align 2
 ow_frames_540:
-.word ow_0539Tiles+(0*0x800)
+.word ow_00000Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_0539Tiles+(1*0x800)
+.word ow_00000Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_0539Tiles+(2*0x800)
+.word ow_00000Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_0539Tiles+(0*0x800)
+.word ow_00000Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_0539Tiles+(0*0x800)
+.word ow_00000Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_0539Tiles+(0*0x800)
+.word ow_00000Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_0539Tiles+(0*0x800)
+.word ow_00000Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_0539Tiles+(0*0x800)
+.word ow_00000Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_0539Tiles+(0*0x800)
+.word ow_00000Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
 

data/pkmn_tables/pokemon_back_sprites.S

@@ -1,7 +1,7 @@
 .text
 .align 2
-.global pokemon_back_sprites
-pokemon_back_sprites:
+.global pokemon_graphics_back
+pokemon_graphics_back:
 
 .word back_0000Tiles, 0
 .word back_0001Tiles, 1

data/pkmn_tables/pokemon_front_sprites.S

@@ -1,7 +1,7 @@
 .text
 .align 2
-.global pokemon_front_sprites
-pokemon_front_sprites:
+.global pokemon_graphics_front
+pokemon_graphics_front:
 
 .word front_0000Tiles, 0
 .word front_0001Tiles, 1

data/pkmn_tables/pokemon_normal_pal.S

@@ -1,7 +1,7 @@
 .text
 .align 2
-.global pokemon_normal_pal
-pokemon_normal_pal:
+.global pokemon_palette_normal
+pokemon_palette_normal:
 
 .word n_p_0000Pal, 0x0
 .word n_p_0001Pal, 0x0

data/pkmn_tables/pokemon_player_y_table.s

@@ -2,6 +2,6 @@
 .thumb
 .text
 
-.global pokemon_player_y_table
-pokemon_player_y_table:
+.global pokemon_player_xy_table
+pokemon_player_xy_table:
 .incbin "data/pkmn_tables/pkmn_player_y_table_dump.bin"

data/pkmn_tables/pokemon_shiny_pal.S

@@ -1,7 +1,7 @@
 .text
 .align 2
-.global pokemon_shiny_pal
-pokemon_shiny_pal:
+.global pokemon_palette_shiny
+pokemon_palette_shiny:
 
 .word s_p_0000Pal, 0x0
 .word s_p_0001Pal, 0x0

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

data/raw_defines.s

@@ -2,9 +2,9 @@
 .thumb
 .text
 
-.global objects
+/*.global objects
 objects:
-    .word 0x0202063C
+    .word 0x0202063C*/
 
 .global evolutions
 evolutions:

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

@@ -5,7 +5,12 @@
 //exclude for now
 //.include "patches/split_physical_special.asm"
 .include "patches/hooks.asm"
-.include "patches/dynamic_overworld_hooks.asm"
+
+
+//no dynamic overworlds, sorry :T
+//.include "patches/dynamic_overworld_hooks.asm"
+
+
 .include "patches/special.asm"
 .include "patches/moves.asm"
 .include "patches/music.asm"
@@ -37,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"
@@ -54,15 +59,11 @@
 
 .include "patches/game_engine/quick_hacks.asm"
 
+//.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
@@ -23,6 +27,7 @@ SOURCEDIR := src
 STRINGDIR := string
 
 MAIN_OBJ  := $(BLDPATH)/linked.o
+B_ENGINE  := battle_engine/build/linked.o
 SPRITES   := $(BLDPATH)/pkmn_sprites.o
 ICONS_AR  := $(BLDPATH)/pkmn_icons.a
 DYN_OVER  := built/dynamic_overworld.o
@@ -78,10 +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) $(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 battle_engine build/linked.o
 
 .PHONY: clean
 clean:

patches/pokemon_data/player_y_table.asm

@@ -1,24 +1,24 @@
 .org 0x08074634
-.word pokemon_player_y_table
+.word pokemon_player_xy_table
 
 .org 0x08074664
-.word pokemon_player_y_table
+.word pokemon_player_xy_table
 
 .org 0x08074670
-.word pokemon_player_y_table
+.word pokemon_player_xy_table
 
 .org 0x08076564
-.word pokemon_player_y_table
+.word pokemon_player_xy_table
 
 .org 0x08076B1C
-.word pokemon_player_y_table
+.word pokemon_player_xy_table
 
 .org 0x08076BE8
-.word pokemon_player_y_table
+.word pokemon_player_xy_table
 
 .org 0x08076BF8
-.word pokemon_player_y_table
+.word pokemon_player_xy_table
 
 .org 0x08076C04
-.word pokemon_player_y_table
+.word pokemon_player_xy_table
 

patches/pokemon_data/pokemon_back_sprites.asm

@@ -1,30 +1,30 @@
 .org 0x0800012C
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x0800ED58
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x0800F19C
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x08034540
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x08034584
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x08034F04
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x08076A58
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x08076AC8
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x0810BC0C
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 
 .org 0x0810BC24
-.word pokemon_back_sprites
+.word pokemon_graphics_back
 

patches/pokemon_data/pokemon_front_sprites.asm

@@ -1,84 +1,84 @@
 .org 0x08000128
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0800ECA8
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0800ECEC
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0800ED68
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0800ED80
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0800F0F8
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0800F130
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0800F1AC
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0800F1C4
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080343C4
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x08034D60
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0803507C
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x08046F64
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x08050074
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080500BC
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x08052068
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080534C4
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080769C0
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080769E4
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0808F470
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080CE0B8
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080CE2B8
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080CE454
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x080CE6C4
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0810BBE4
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0810BBF0
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0811D900
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 
 .org 0x0814AED8
-.word pokemon_front_sprites
+.word pokemon_graphics_front
 

patches/pokemon_data/pokemon_normal_pal.asm

@@ -1,15 +1,15 @@
 .org 0x08000130
-.word pokemon_normal_pal
+.word pokemon_palette_normal
 
 .org 0x0804410C
-.word pokemon_normal_pal
+.word pokemon_palette_normal
 
 .org 0x08044130
-.word pokemon_normal_pal
+.word pokemon_palette_normal
 
 .org 0x080441A4
-.word pokemon_normal_pal
+.word pokemon_palette_normal
 
 .org 0x080839C0
-.word pokemon_normal_pal
+.word pokemon_palette_normal
 

patches/pokemon_data/pokemon_shiny_pal.asm

@@ -1,9 +1,9 @@
 .org 0x08000134
-.word pokemon_shiny_pal
+.word pokemon_palette_shiny
 
 .org 0x08044144
-.word pokemon_shiny_pal
+.word pokemon_palette_shiny
 
 .org 0x080441B4
-.word pokemon_shiny_pal
+.word pokemon_palette_shiny
 

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

src/agb_debug/agb_debug.c

@@ -70,7 +70,8 @@ u32 mini_itoa(int value, u32 radix, u32 uppercase, u32 unsig, char * buffer, u32
     }
     /* This builds the string back to front ... */
     do {
-        u32 digit = __aeabi_uidivmod(value, radix); * (pbuffer++) = (digit < 10 ? '0' + digit : (uppercase ? 'A' : 'a') + digit - 10);
+        u32 digit = value % radix;
+        * (pbuffer++) = (digit < 10 ? '0' + digit : (uppercase ? 'A' : 'a') + digit - 10);
         value /= radix;
     } while (value > 0);
     for (i = (pbuffer - buffer); i < zero_pad; i++)

src/battle_engine/battle_initiative.c

@@ -102,7 +102,7 @@ u16 get_speed(u8 bank) {
 u8 speed_alt_from_item(u8 bank, u8 item_effect) {
     switch (item_effect) {
         case ITEM_EFFECT_QUICKCLAW:
-            if (__aeabi_uidivmod(battle_turn_random, 100) > item_get_quality(battle_participants[bank].held_item)) {
+            if ((battle_turn_random % 100) > item_get_quality(battle_participants[bank].held_item)) {
                 return 1;
             }
             break;

src/battle_engine/battle_m_flee_hook.S

@@ -15,7 +15,7 @@ and r0, r1
 cmp r0, #8
 bne no_trainer
 ldr r0, =battle_buffer_b
-ldr r4, =battle_active_side
+ldr r4, =battle_active_bank
 ldrb r1, [r4]
 lsl r1, #9
 add r0, #1
@@ -31,7 +31,7 @@ no_trainer:
 
 @only intercept the flee command though...
 ldr r0, =battle_buffer_b
-ldr r4, =battle_active_side
+ldr r4, =battle_active_bank
 ldrb r1, [r4]
 lsl r1, #9
 add r0, #1

src/debug/debug.c

@@ -367,7 +367,7 @@ void debug_int_to_char(u32 i, char* ref) {
     u32 len = debug_dec_len(i);
     while (i > 0) {
 
-        ref[len - 1] = '0' + (__aeabi_uidivmod(i, 10));
+        ref[len - 1] = '0' + (i % 10);
         i /= 10;
         len--;
     }
@@ -377,7 +377,7 @@ void debug_int_to_char(u32 i, char* ref) {
 
 u32 debug_power(u32 n, u32 power) {
     u32 out = 1;
-    for (int i = 0; i < power; ++i) {
+    for (u32 i = 0; i < power; ++i) {
         out = out * n;
     }
     return out;

src/evolution/evolution_methods.c

@@ -181,7 +181,7 @@ struct evo_result evolve_random(struct evo_call_arguments arguments)
     }
     u32 pid = pokemon_get_attribute(arguments.poke, ATTR_PID, NULL);
     pid = pid & 0xFFFF;
-    u8 mod = __aeabi_uidivmod(pid, 10);
+    u8 mod = (pid % 10);
     dprintf("A pokemon tries to evolve at random: pid: %d, low: %d, mod: %d\n", pid, pid, mod);
     if (mod >= 5)
     {
@@ -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/assets/interface/arrows.img.h

@@ -7,10 +7,7 @@
 //	+ 24 tiles not compressed
 //	Total size: 768 = 768
 //
-<<<<<<< HEAD
-//	Time-stamp: 2017-05-24, 23:53:39
-=======
->>>>>>> 287c7ea0c11e046fe6fb8f2f68178aeca2fa326b
+//	Time-stamp: 2017-05-29, 22:25:28
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

src/include/math.h

@@ -39,14 +39,6 @@
 
 /* === EXTERN METHODS === */
 
-/**
- * @brief gets the a mod b
- * @param a dividend
- * @param b divisor
- * @return a % b
- */
-u32 __aeabi_uidivmod(u32 a, u32 b);
-
 u16 random();
 
 #endif /* MATH_H */

src/include/objects.h

@@ -84,7 +84,7 @@ struct obj_entity {
   u8 field43;
 };
 
-extern struct obj_entity* objects;
+extern struct obj_entity objects[64];
 
 typedef void (*object_callback)(struct obj_entity*);
 

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;
 }
 

src/specials/custom_specials.c

@@ -120,5 +120,5 @@ void sp_clear_variables()
 
 void sp_random_number()
 {
-    var_set(0x800D, (__aeabi_uidivmod(random(), var_get(0x8000))));
+    var_set(0x800D, (random() % var_get(0x8000)));
 }

src/test/alabastia.S

@@ -1,11 +1,11 @@
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-@                                                                                 @
-@           file: C:\Users\Philipp\Desktop\sots tilesets\alabastia.tmx            @
-@                            converted using tiled2agb                            @
-@                             converted on 29.05.2017                             @
-@                          program created by Sturmvogel                          @
-@                                                                                 @
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@                                                                    @
+@           file: E:\OneDrive\sots tilesets\alabastia.tmx            @
+@                     converted using tiled2agb                      @
+@                      converted on 31.05.2017                       @
+@                   program created by Sturmvogel                    @
+@                                                                    @
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
 @@@  SECTION: MAPHEADER  @@@
 
@@ -20,7 +20,7 @@ mapheader_alabastia:
 	.hword 0x004E @index
 	.byte 0x58 @name
 	.byte 0x00 @cave
-	.byte 0x07 @weather
+	.byte 0x02 @weather
 	.byte 0x01 @light
 	.byte 0x01 @unknown
 	.hword 0x0006 @showName
@@ -45,8 +45,8 @@ mapfooter_alabastia:
 
 .global mapblocks_alabastia
 mapblocks_alabastia:
-	.hword 0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041F,0x32A6,0x32A7,0x041E,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041E,0x041F
-	.hword 0x0414,0x0415,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0427,0x32AE,0x32AF,0x0426,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0416,0x0417
+	.hword 0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x32A6,0x32A7,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041E,0x041F
+	.hword 0x0414,0x0415,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x32AE,0x32AF,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0416,0x0417
 	.hword 0x041C,0x041D,0x32A6,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x3285,0x3286,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328F,0x041E,0x041F
 	.hword 0x0414,0x0415,0x32AE,0x3296,0x3296,0x3281,0x3282,0x3282,0x3282,0x3283,0x3296,0x3296,0x3296,0x3296,0x3281,0x3282,0x3282,0x3282,0x3283,0x3296,0x3296,0x3297,0x0416,0x0417
 	.hword 0x041C,0x041D,0x32AE,0x32C7,0x329E,0x0689,0x068A,0x068A,0x068A,0x068B,0x329E,0x329E,0x329E,0x329E,0x0689,0x068A,0x068A,0x068A,0x068B,0x32C6,0x3296,0x3297,0x041E,0x041F
@@ -72,51 +72,100 @@ mapblocks_alabastia:
 mapborderblocks_alabastia:
 	.hword 0x001C,0x001D
 	.hword 0x0014,0x0015
-@@@  SECTION: MAPFOOTER  @@@
+@@@  SECTION: MAPEVENTS  @@@
 
 .align 2
 .global mapevents_alabastia
 mapevents_alabastia:
-.byte	0x02, 0x00, 0x00, 0x00
+.byte	0x02, 0x03, 0x02, 0x00
 .word 	mapevents_persons_alabastia
-.word 	00000000
-.word 	00000000
+.word 	mapevents_warps_alabastia
+.word 	mapevents_triggers_alabastia
 .word 	00000000
 
 @@@ SECTION: PERSON EVENTS @@@
 .align 2
 mapevents_persons_alabastia:
-@//new structure
-	.byte 0x01
-	.byte 0x1E
-	.byte 0x00
+@PERSON ID: 0
+
+	.byte 0x09
+	.byte 0x14
 	.byte 0x00
-	.hword 0x0014
-	.hword 0x0003
 	.byte 0x00
+	.hword 0x000A
+	.hword 0x0004
 	.byte 0x00
+	.byte 0x01
 	.byte 0x40
 	.byte 0x00
-	.byte 0x01
 	.byte 0x00
-	.hword 0x0004
-	.word scr_trainer_test
+	.byte 0x00
+	.hword 0x0000
+	.word scr_map_test
 	.hword 0x0500
 	.hword 0x0000
-@//new structure
-	.byte 0x00
-	.byte 0x20
-	.byte 0x00
+@PERSON ID: 1
+
+	.byte 0x07
+	.byte 0x0A
 	.byte 0x00
-	.hword 0x000A
-	.hword 0x0005
 	.byte 0x00
+	.hword 0x000E
+	.hword 0x0002
 	.byte 0x00
+	.byte 0x03
 	.byte 0x40
 	.byte 0x00
+	.byte 0x01
 	.byte 0x00
-	.byte 0x00
-	.hword 0x0000
-	.word scr_map_test
+	.hword 0x0004
+	.word 0x00000000
 	.hword 0x0501
 	.hword 0x0000
+@@@ SECTION: WARP EVENTS @@@
+.align 2
+mapevents_warps_alabastia:
+@WARP ID: 0
+	.hword 6
+	.hword 7
+	.byte 0
+	.byte 1
+	.byte 0
+	.byte 4
+@WARP ID: 1
+	.hword 15
+	.hword 7
+	.byte 0
+	.byte 0
+	.byte 2
+	.byte 4
+@WARP ID: 2
+	.hword 16
+	.hword 13
+	.byte 0
+	.byte 0
+	.byte 3
+	.byte 4
+@@@ SECTION: TRIGGER EVENTS @@@
+.align 2
+mapevents_triggers_alabastia:
+@WARP ID: 0
+	.hword 12
+	.hword 1
+	.byte 0
+	.byte 0
+	.hword 20497
+	.hword 0
+	.byte 0
+	.byte 0
+	.word scr_trigger_test_two
+@WARP ID: 1
+	.hword 13
+	.hword 1
+	.byte 0
+	.byte 0
+	.hword 20498
+	.hword 0
+	.byte 0
+	.byte 0
+	.word scr_trigger_test

src/test/test_scripts.S

@@ -13,4 +13,26 @@ end
 
 .global scr_trainer_test
 scr_trainer_test:
-trainerbattle 0 5 0 str_test_text str_test_text
+trainerbattle 0 5 0 str_test_text str_test_text
+
+.global scr_trigger_test
+scr_trigger_test:
+lockall
+msgbox str_test_text 6
+applymovement 0xFF move_data
+waitmovement 0x0
+releaseall
+end
+
+.global scr_trigger_test_two
+scr_trigger_test_two:
+lockall
+msgbox str_test_text_two 6
+applymovement 0xFF move_data
+waitmovement 0x0
+setvar 0x5011
+releaseall
+end
+
+move_data:
+.byte APPLYMOVE_JUMP_ONE_DOWN, APPLYMOVE_END

string/de/debugging.txt

@@ -1 +1,2 @@
-str_test_text=Tremble, before the majesty\nof the emperor!
+str_test_text=Tremble, before the majesty\nof the emperor!
+str_test_text_two=Maybe next time...