changed modulo and updated battle_engine

.vscode/settings.json

@@ -2,6 +2,45 @@
     "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"
     }
 }

battle_engine

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

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/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)
     {

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