refractor special file and add rival name copy special

.vscode/c_cpp_properties.json

@@ -1,78 +0,0 @@
-{
-    "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",
-                    "$(workspaceRoot)/src/include",
-                    "$(workspaceRoot}/g3headers/include",
-                    "$(workspaceRoot}/generated_image"
-                ],
-                "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

@@ -1,18 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "gdb",
-            "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

@@ -1,165 +0,0 @@
-{
-    "files.associations": {
-        "filesystem": "cpp",
-        "regex": "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",
-        "met_background.h": "c",
-        "met_clouds.h": "c",
-        "met_sky.h": "c",
-        "met_meteor.h": "c",
-        "met_foreground.h": "c"
-    }
-}

.vscode/tasks.json

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

sots-private

@@ -1 +1 @@
-Subproject commit 7c0c2b2e5f9fde3cf3796734b3c4b85d3cf12f36
+Subproject commit 78e9ed7d9d986b5ecfbbd607f2ca935b67ab5338

src/include/config.h

@@ -1,5 +1,3 @@
-#include "pkmn_types.h"
-
 #ifndef CONFIG_S_
 #define CONFIG_S_
 

src/specials/custom_specials.c

@@ -32,11 +32,11 @@
 
 #include "camera_move.h"
 #include "cutscene_meteor.h"
-#include <callback.h>
 #include <config.h>
-#include <debug.h>
-#include <game_engine.h>
-#include <math.h>
+#include <pokeagb/pokeagb.h>
+
+/* === TYPES === */
+typedef void (*special_func)();
 
 /* === PROTOTYPES === */
 
@@ -71,17 +71,30 @@ void get_text_pointer_from_lookup();
 
 void sp_check_tileset();
 
+void sp_set_rival(void);
+
 extern void sp_crystal_fade(void);
 
+extern pchar name_rival_male[5];
+extern pchar name_rival_female[5];
+
 /* === STATICS === */
 
-static callback special_routines[9] = {
-    met_play,         cam_sp_move_camera, sp_init_script,  debug_some_test, sp_dns_switch,
-    sp_random_number, sp_check_tileset,   sp_batchmaptile, sp_crystal_fade,
+static special_func special_routines[10] = {
+    met_play,         cam_sp_move_camera, sp_init_script,  NULL, sp_dns_switch,
+    sp_random_number, sp_check_tileset,   sp_batchmaptile, sp_crystal_fade, sp_set_rival,
 };
 
 /* === IMPLEMENTATIONS === */
 
+void sp_set_rival(void) {
+    if (saveblock2->gender == GENDER_MALE) {
+        pstrcpy(&(saveblock1->rival_name[0]), &name_rival_female[0]);
+    } else {
+        pstrcpy(&(saveblock1->rival_name[0]), &name_rival_male[0]);
+    }
+}
+
 void sp_dns_switch() {
     volatile u8 *test_pointer = (u8 *)(0x0203FAB0);
     *(test_pointer + 1) = (*(test_pointer + 1) == 3 ? 0 : (*(test_pointer + 1)) + 1);
@@ -112,4 +125,4 @@ void sp_clear_variables() {
     return;
 }
 
-void sp_random_number() { var_set(0x800D, (random() % var_get(0x8000))); }
+void sp_random_number() { var_set(0x800D, (rand() % var_load(0x8000))); }