Merge branch 'master' of https://github.com/Sagiri/wonder-trade

Author: LOuroboros

main.asm

@@ -1,7 +1,7 @@
 .gba
 .thumb
 
-.open "test.gba", 0x08000000
+.open "rom.gba", "test.gba", 0x08000000
 
 .org allocation
 

scripts/makinoa/__main__.py

@@ -3,6 +3,8 @@
 import os, sys, argparse, configparser, shutil, subprocess, fnmatch, itertools
 import os.path
 import kewensis
+from orderedset import OrderedSet
+from collections import OrderedDict
 
 src = "src"
 build = "build"
@@ -28,9 +30,9 @@
 free_space = iniparser.get("main", "free-space", fallback="0x08800000")
 optimization_level = iniparser.get("main", "optimization-level", fallback="-O2")
 reserve = iniparser.get("main", "reserve", fallback="0")
-static_objects = set() if "static" not in iniparser else set(iniparser["static"])
-defines = {} if "defines" not in iniparser else dict(iniparser["defines"])
-libgcc = set() if "libgcc" not in iniparser else set(iniparser["libgcc"])
+static_objects = OrderedSet() if "static" not in iniparser else OrderedSet(iniparser["static"])
+defines = OrderedDict() if "defines" not in iniparser else OrderedDict(iniparser["defines"])
+libgcc = OrderedSet() if "libgcc" not in iniparser else OrderedSet(iniparser["libgcc"])
 
 try:
     free_space = int(free_space, 16)
@@ -64,6 +66,7 @@
 
 CC = os.path.join(DEVKITARM, "bin", "arm-none-eabi-gcc")
 LD = os.path.join(DEVKITARM, "bin", "arm-none-eabi-ld")
+SIZE = os.path.join(DEVKITARM, "bin", "arm-none-eabi-size")
 
 CFLAGS = [
     optimization_level,
@@ -85,7 +88,12 @@
     "--relocatable"
 ]
 
-relocatable_objects = set()
+SIZEFLAGS = [
+    "-d",
+    "-B"
+]
+
+relocatable_objects = OrderedSet()
 
 if os.path.exists(src):
     for srcfile in (path for path in os.listdir(src) if fnmatch.fnmatch(path, "*.c")):
@@ -126,6 +134,14 @@
         if not libgcc:
             break
 
+needed_words = 0
+
+def round_up_to_4(x):
+    if x & 0x3 == 0:
+        return x
+    else:
+        return round_up_to_4(x + 1)
+
 if relocatable_objects:
     exit_code = subprocess.run([
         LD,
@@ -138,17 +154,24 @@
     if exit_code != 0:
         print("Error :: Linking failed.")
         sys.exit(exit_code)
-        
-def round_up_to_4(x):
-    if x & 0x3 == 0:
-        return x
-    else:
-        return round_up_to_4(x + 1)
+
+    rslt = subprocess.run([
+        SIZE,
+        *SIZEFLAGS,
+        relocatable
+    ], stdout=subprocess.PIPE)
+
+    if rslt.returncode != 0:
+        print("Error :: Size calculation failed.")
+        sys.exit(rslt.returncode)
+
+    sz = int(rslt.stdout.decode("UTF-8").split("\n")[1].split()[3])
+
+    needed_words = round_up_to_4(sz + reserve) >> 2
 
 offset_mask = 0x08000000
 free_space |= offset_mask
 
-needed_words = round_up_to_4(os.stat(relocatable).st_size + reserve) >> 2
 free_space = round_up_to_4(free_space)
 
 def find_needed_words(needed_words, free_space):
@@ -176,7 +199,7 @@ def find_needed_words(needed_words, free_space):
 
     return start ^ offset_mask
 
-shutil.copy("rom.gba", "test.gba")
+# shutil.copy("rom.gba", "test.gba")
 
 if "ARMIPS" in os.environ:
     ARMIPS = os.environ["ARMIPS"]

scripts/makinoa/orderedset.py

@@ -0,0 +1,19 @@
+import collections
+
+class OrderedSet():
+    def __init__(self, things=()):
+        self._dict = collections.OrderedDict()
+        for thing in things:
+            self._dict[thing] = None
+
+    def __iter__(self):
+        return iter(self._dict)
+
+    def add(self, thing):
+        self._dict[thing] = None
+
+    def remove(self, thing):
+        self._dict.pop(thing)
+
+    def __bool__(self):
+        return bool(self._dict)

src/functions.h

@@ -2,8 +2,8 @@
 #include "types.h"
 
 u8 b_trainer_build_party(struct pokemon* party, u16 tid);
-u32 strnlen(u8*, u32);
+u32 strnlen(const char*, u32);
 u16 rand();
 u32 umod(u32, u32);
-void memcpy(void *dst, void *src, u32 size);
-void pokemon_setattr(struct pokemon*, u8, void*);
+void memcpy(void* dst, const void* src, u32 size);
+void pokemon_setattr(struct pokemon*, u8, const void*);

src/gen_random_pokemon.c

@@ -1,4 +1,4 @@
-#include "defines.h"
+#include "global.h"
 
 void gen_random_pokemon() {
     u16 tid;
@@ -23,7 +23,7 @@ void gen_random_pokemon() {
     pokemon_setattr(&party_trader[0], REQ_METLOC, &location);
 }
 
-u32 strnlen(u8* str, u32 max) {
+u32 strnlen(const char* str, u32 max) {
     u32 len = 0;
     while(*str != 0xFF && len < max) {
         ++len;

src/defines.h src/global.h

@@ -1,6 +1,9 @@
 #pragma once
 #include "types.h"
 
+#define PARTY_SIZE 6
+#define NUM_TRAINERS 743
+
 #include "structs.h"
 #include "functions.h"
 #include "locations.h"

src/locations.h

@@ -1,4 +1,7 @@
 #pragma once
 #include "types.h"
 
-extern u32 battle_type_flags;
+extern u32 battle_type_flags;
+
+extern struct pokemon party_opponent[PARTY_SIZE];
+extern const struct trainer trainers[NUM_TRAINERS];

src/structs.h

@@ -1,18 +1,10 @@
 #pragma once
 #include "types.h"
 
-#define PARTY_SIZE 6
-
 struct pokemon {
     u8 _[100];
 };
 
-extern struct pokemon party_opponent[PARTY_SIZE];
-
-// -----------------------------------------------------------------------------
-
-#define NUM_TRAINERS 743
-
 struct trainer {
     u8 custom_moveset_flag : 1;
     u8 held_item_flag : 1;
@@ -21,12 +13,10 @@ struct trainer {
     u8 music : 7;
     u8 gender : 1;
     u8 sprite;
-    u8 name[12];
+    char name[12];
     u8 data[8];
     u8 double_flag;
     u8 data2[7];
     u32 party_size;
     void* party_data;
-};
-
-extern struct trainer trainers[NUM_TRAINERS];
+};