10 files changed, 679 insertions, 933 deletions

@@ -9,7 +9,7 @@ endif
 
 %_pkjb.elf:
         @echo linking pkjb
-        @$(LD) -specs=../gba_pkjb.specs $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+        $(LD) -specs=../gba_pkjb.specs $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
 
 include $(DEVKITARM)/gba_rules
 
@@ -155,7 +155,7 @@ $(OUTPUT).elf	:	$(OFILES)
 #---------------------------------------------------------------------------------
         @echo $(notdir $<)
         @$(bin2o)
-        
+
 #---------------------------------------------------------------------------------
 # This rule creates assembly source files using grit
 # grit takes an image file and a .grit describing how the file is to be processed
@@ -1,13 +0,0 @@
-        .text
-        .code 16
-
-        .global call_into_middle_of_titlescreen_func
-        .thumb_func
-call_into_middle_of_titlescreen_func:
-        push {lr}
-        push {r4-r5}
-        @ use r4 (which already got saved to the stack) as scratch space to reserve a variable amount of stack space
-        mov r4,sp
-        sub r4,r4,r1
-        mov sp,r4
-        bx r0
\ No newline at end of file
@@ -0,0 +1,512 @@
+/*
+ * Copyright (C) 2017 hatkirby
+ * Copyright (C) 2017 slipstream/RoL
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+#include "gamedata.h"
+
+void decryptSaveStructures(
+    pSaveBlock1 SaveBlock1,
+    pSaveBlock2 SaveBlock2,
+    pSaveBlock3 SaveBlock3)
+{
+  if (GAME_RS)
+  {
+    // R/S doesn't have save crypto.
+    return;
+  }
+
+  u8* sb1raw = (u8*)SaveBlock1;
+  u8* sb2raw = (u8*)SaveBlock2;
+  //u8* sb3raw = (u8*)SaveBlock3; // unused
+
+  u32* xor_key_ptr = (u32*)(&sb2raw[( GAME_EM ? 0xA8 : 0xF20 )]);
+
+  u32 xor_key = *xor_key_ptr;
+  u16 xor_key16 = (u16)xor_key;
+  if (!xor_key)
+  {
+    // xor key is zero, nothing needs to be done.
+    return;
+  }
+
+  u32* ptr_to_xor;
+  u32 save_offset;
+  int i;
+  u32* bag_pocket_offsets;
+  u32* bag_pocket_counts;
+  if (GAME_FRLG)
+  {
+    // loop over and decrypt various things
+    save_offset = 0x3D38 + 4;
+    for (i = 3; i >= 0; i--)
+    {
+      ptr_to_xor = (u32*)(&sb1raw[save_offset]);
+      *ptr_to_xor ^= xor_key;
+      save_offset += 12;
+    }
+
+    for (i = 0; i <= 0x3f; i++)
+    {
+      save_offset = 0x1200 + (i*sizeof(u32));
+      ptr_to_xor = (u32*)(&sb1raw[save_offset]);
+      *ptr_to_xor ^= xor_key;
+    }
+
+    // loop over each of the bag pockets and decrypt decrypt decrypt
+    bag_pocket_offsets = (u32[5]) { 0x310, 0x388, 0x430, 0x464, 0x54C };
+    bag_pocket_counts = (u32[5]) { 42, 30, 13, 58, 43 };
+
+    for (i = 0; i < 5; i++)
+    {
+      for (int bag_i = 0; bag_i < bag_pocket_counts[i]; bag_i++)
+      {
+        save_offset = bag_pocket_offsets[i] + (sizeof(u32) * bag_i) + 2;
+        *(u16*)(&sb1raw[save_offset]) ^= xor_key16;
+      }
+    }
+
+    // decrypt some more stuff
+    save_offset = 0xaf8;
+    ptr_to_xor = (u32*)(&sb1raw[save_offset]);
+    *ptr_to_xor ^= xor_key;
+
+    save_offset = 0x290;
+    ptr_to_xor = (u32*)(&sb1raw[save_offset]);
+    *ptr_to_xor ^= xor_key;
+
+    save_offset = 0x294;
+    *(u16*)(&sb1raw[save_offset]) ^= xor_key16;
+  } else {
+    // Emerald
+
+    // loop over and decrypt various things
+    for (i = 0; i <= 0x3f; i++)
+    {
+      save_offset = 0x159c + (i*sizeof(u32));
+      ptr_to_xor = (u32*)(&sb1raw[save_offset]);
+      *ptr_to_xor ^= xor_key;
+    }
+
+    // loop over each of the bag pockets and decrypt decrypt decrypt
+    bag_pocket_offsets = (u32[5]) { 0x560, 0x5D8, 0x650, 0x690, 0x790 };
+    bag_pocket_counts = (u32[5]) { 30, 30, 16, 64, 46 };
+
+    for (i = 0; i < 5; i++)
+    {
+      for (int bag_i = 0; bag_i < bag_pocket_counts[i]; bag_i++)
+      {
+        save_offset = bag_pocket_offsets[i] + (sizeof(u32) * bag_i) + 2;
+        *(u16*)(&sb1raw[save_offset]) ^= xor_key16;
+      }
+    }
+
+    // decrypt some more stuff
+    save_offset = 0x1F4;
+    ptr_to_xor = (u32*)(&sb1raw[save_offset]);
+    *ptr_to_xor ^= xor_key;
+
+    save_offset = 0x490;
+    ptr_to_xor = (u32*)(&sb1raw[save_offset]);
+    *ptr_to_xor ^= xor_key;
+
+    save_offset = 0x494;
+    *(u16*)(&sb1raw[save_offset]) ^= xor_key16;
+  }
+
+  *xor_key_ptr = 0;
+}
+
+bool initSaveData(
+    pSaveBlock1* SaveBlock1,
+    pSaveBlock2* SaveBlock2,
+    pSaveBlock3* SaveBlock3)
+{
+  // check the ROM code, make sure this game is supported.
+  u8* ROM = (u8*) 0x8000000;
+
+  u32 gamecode = (*(u32*)(&ROM[0xAC]));
+
+  void(*loadsave)(char a1);
+  //void(*mainloop)();
+  //void(*load_pokemon)();
+  pSaveBlock1 gSaveBlock1;
+  pSaveBlock2 gSaveBlock2;
+  pSaveBlock3 gSaveBlock3;
+  //u32 titlemid = 0;
+
+  // get the address of the save loading function.
+  switch (gamecode)
+  {
+    // --- R/S ---
+    case 'DVXA': // Ruby German
+    case 'DPXA': // Sapphire German
+    {
+      // TODO: detect debug ROM?
+      gSaveBlock1 = (pSaveBlock1) 0x2025734;
+      gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
+      gSaveBlock3 = (pSaveBlock3) 0x20300A0;
+      loadsave = (void(*)(char)) 0x8126249; // same for v1.0 + v1.1
+      //mainloop = (void(*)()) 0x80003D9;
+      //load_pokemon = (void(*)()) 0x8047da9;
+
+      break;
+    }
+
+    case 'FVXA': // Ruby French
+    case 'FPXA': // Sapphire French
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025734;
+      gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
+      gSaveBlock3 = (pSaveBlock3) 0x20300A0;
+      loadsave = (void(*)(char)) 0x8126351; // same for v1.0 + v1.1
+      //mainloop = (void(*)()) 0x80003D9;
+      //load_pokemon = (void(*)()) 0x8047e95;
+
+      break;
+    }
+
+    case 'IVXA': // Ruby Italian
+    case 'IPXA': // Sapphire Italian
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025734;
+      gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
+      gSaveBlock3 = (pSaveBlock3) 0x20300A0;
+      loadsave = (void(*)(char)) 0x8126249; // same for v1.0 + v1.1
+      //mainloop = (void(*)()) 0x80003D9;
+      //load_pokemon = (void(*)()) 0x8047dbd;
+
+      break;
+    }
+
+    case 'SVXA': // Ruby Spanish
+    case 'SPXA': // Sapphire Spanish
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025734;
+      gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
+      gSaveBlock3 = (pSaveBlock3) 0x20300A0;
+      loadsave = (void(*)(char)) 0x8126349; // same for v1.0 + v1.1
+      //mainloop = (void(*)()) 0x80003D9;
+      //load_pokemon = (void(*)()) 0x8047ea5;
+
+      break;
+    }
+
+    case 'EVXA': // Ruby English
+    case 'EPXA': // Sapphire English
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025734;
+      gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
+      gSaveBlock3 = (pSaveBlock3) 0x20300A0;
+      //mainloop = (void(*)()) 0x80002A5;
+
+      // version number
+      switch (ROM[0xBC])
+      {
+        case 0:
+        {
+          loadsave = (void(*)(char)) 0x8125EC9;
+          //load_pokemon = (void(*)()) 0x8047a85;
+
+          break;
+        }
+
+        case 1:
+        case 2:
+        {
+          loadsave = (void(*)(char)) 0x8125EE9;
+          //load_pokemon = (void(*)()) 0x8047aa5;
+
+          break;
+        }
+
+        default:
+        {
+          return false; // unsupported version
+        }
+      }
+
+      break;
+    }
+
+    case 'JVXA': // Ruby Japanese
+    case 'JPXA': // Sapphire Japanese
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025494;
+      gSaveBlock2 = (pSaveBlock2) 0x2024C04;
+      gSaveBlock3 = (pSaveBlock3) 0x202FDBC;
+      loadsave = (void(*)(char)) 0x8120d05; // same for v1.0 + v1.1
+      //mainloop = (void(*)()) 0x80002A9;
+      //load_pokemon = (void(*)()) 0x8044d55;
+
+      break;
+    }
+
+    /// --- FR/LG ---
+    // In FR/LG, the function that initialises the save-block pointers to
+    // default does not set up saveblock3. Which will need to be set up before
+    // loading the save if we want boxed Pokémon to not disappear. Oh, and
+    // loadsave() offset is different between FR and LG...
+
+    case 'DRPB': // FireRed German
+    case 'DGPB': // LeafGreen German
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x202552C;
+      gSaveBlock2 = (pSaveBlock2) 0x2024588;
+      gSaveBlock3 = (pSaveBlock3) 0x2029314;
+      *(pSaveBlock3*)(0x3004f60) = gSaveBlock3;
+      loadsave = (void(*)(char)) ( GAME_FR ? 0x80da721 : 0x80da6f5 );
+      //mainloop = (void(*)()) 0x8000425;
+      //titlemid = 0x80791df;
+      //load_pokemon = (void(*)()) 0x804c251;
+
+      break;
+    }
+
+    case 'FRPB': // FireRed French
+    case 'FGPB': // LeafGreen French
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x202552C;
+      gSaveBlock2 = (pSaveBlock2) 0x2024588;
+      gSaveBlock3 = (pSaveBlock3) 0x2029314;
+      *(pSaveBlock3*)(0x3004f60) = gSaveBlock3;
+      loadsave = (void(*)(char)) ( GAME_FR ? 0x80da7e1 : 0x80da7b5 );
+      //mainloop = (void(*)()) 0x8000417;
+      //titlemid = 0x807929f;
+      //load_pokemon = (void(*)()) 0x804c311;
+
+      break;
+    }
+
+    case 'IRPB': // FireRed Italian
+    case 'IGPB': // LeafGreen Italian
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x202552C;
+      gSaveBlock2 = (pSaveBlock2) 0x2024588;
+      gSaveBlock3 = (pSaveBlock3) 0x2029314;
+      *(pSaveBlock3*)(0x3004f60) = gSaveBlock3;
+      loadsave = (void(*)(char)) ( GAME_FR ? 0x80da721 : 0x80da6f5 );
+      //mainloop = (void(*)()) 0x8000425;
+      //titlemid = 0x80791cb;
+      //load_pokemon = (void(*)()) 0x804c23d;
+
+      break;
+    }
+
+    case 'SRPB': // FireRed Spanish
+    case 'SGPB': // LeafGreen Spanish
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x202552C;
+      gSaveBlock2 = (pSaveBlock2) 0x2024588;
+      gSaveBlock3 = (pSaveBlock3) 0x2029314;
+      *(pSaveBlock3*)(0x3004f60) = gSaveBlock3;
+      loadsave = (void(*)(char)) ( GAME_FR ? 0x80da809 : 0x80da7dd );
+      //mainloop = (void(*)()) 0x8000417;
+      //titlemid = 0x80792b3;
+      //load_pokemon = (void(*)()) 0x804c325;
+
+      break;
+    }
+
+    case 'ERPB': // FireRed English
+    case 'EGPB': // LeafGreen English
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x202552C;
+      gSaveBlock2 = (pSaveBlock2) 0x2024588;
+      gSaveBlock3 = (pSaveBlock3) 0x2029314;
+      *(pSaveBlock3*)(0x3005010) = gSaveBlock3;
+
+      // version number
+      switch (ROM[0xBC])
+      {
+        case 0:
+        {
+          loadsave = (void(*)(char)) ( GAME_FR ? 0x80da4fd : 0x80da4d1 );
+          //mainloop = (void(*)()) 0x800041b;
+          //titlemid = 0x807927b;
+          //load_pokemon = (void(*)()) 0x804c231;
+
+          break;
+        }
+
+        case 1:
+        {
+          loadsave = (void(*)(char)) ( GAME_FR ? 0x80da511 : 0x80da4e5 );
+          //mainloop = (void(*)()) 0x8000429;
+          //titlemid = 0x807928f;
+          //load_pokemon = (void(*)()) 0x804c245;
+
+          break;
+        }
+
+        default:
+        {
+          return false; // unsupported version
+        }
+      }
+
+      break;
+    }
+
+    case 'JRPB': // FireRed Japanese
+    case 'JGPB': // LeafGreen Japanese
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x202548C;
+      gSaveBlock2 = (pSaveBlock2) 0x20244E8;
+      gSaveBlock3 = (pSaveBlock3) 0x202924C;
+      *(pSaveBlock3*)(0x3005050) = gSaveBlock3;
+
+      // version number
+      switch (ROM[0xBC])
+      {
+        case 0:
+        {
+          loadsave = (void(*)(char)) ( GAME_FR ? 0x80db4e5 : 0x80db4b9 );
+          //mainloop = (void(*)()) 0x800041b;
+          //titlemid = 0x8078a0f;
+          //load_pokemon = (void(*)()) 0x804b9e9;
+
+          break;
+        }
+
+        case 1:
+        {
+          if ((gamecode << 8) == 'GPB\x00')
+          {
+            // LeafGreen v1.1 Japanese is undumped.
+            // Therefore, it is unsupported.
+            // I will make guesses at the offsets in the comments, but I will
+            // not actually implement them until LeafGreen v1.1 is dumped.
+
+            return false;
+          }
+
+          loadsave = (void(*)(char)) 0x80db529;
+          // potential LG1.1 address: 0x80db4fd
+          //mainloop = (void(*)()) 0x8000417;
+          //titlemid = 0x8078987;
+          //load_pokemon = (void(*)()) 0x804b9c5;
+
+          break;
+        }
+
+        default:
+        {
+          return false; // unsupported version
+        }
+      }
+
+      break;
+    }
+
+    /// --- Emerald ---
+    // In Emerald, the saveblock pointer that isn't set up is saveblock1 (in
+    // FR/LG it was saveblock3). The initial save loading code after the
+    // copyright screen is also updated, now it sets up ASLR/crypto here before
+    // loading the save.
+
+    case 'DEPB': // Emerald German
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025A00;
+      gSaveBlock2 = (pSaveBlock2) 0x2024A54;
+      gSaveBlock3 = (pSaveBlock3) 0x2029808;
+      *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
+      loadsave = (void(*)(char)) 0x8153075;
+      //mainloop = (void(*)()) 0x800042b;
+      //titlemid = 0x816fdb5;
+      //load_pokemon = (void(*)()) 0x8076dd5;
+
+      break;
+    }
+
+    case 'FEPB': // Emerald French
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025A00;
+      gSaveBlock2 = (pSaveBlock2) 0x2024A54;
+      gSaveBlock3 = (pSaveBlock3) 0x2029808;
+      *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
+      loadsave = (void(*)(char)) 0x815319d;
+      //mainloop = (void(*)()) 0x800042b;
+      //titlemid = 0x816fedd;
+      //load_pokemon = (void(*)()) 0x8076dd1;
+
+      break;
+    }
+
+    case 'IEPB': // Emerald Italian
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025A00;
+      gSaveBlock2 = (pSaveBlock2) 0x2024A54;
+      gSaveBlock3 = (pSaveBlock3) 0x2029808;
+      *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
+      loadsave = (void(*)(char)) 0x8153065;
+      //mainloop = (void(*)()) 0x800042b;
+      //titlemid = 0x816fda5;
+      //load_pokemon = (void(*)()) 0x8076dd5;
+
+      break;
+    }
+
+    case 'SEPB': // Emerald Spanish
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025A00;
+      gSaveBlock2 = (pSaveBlock2) 0x2024A54;
+      gSaveBlock3 = (pSaveBlock3) 0x2029808;
+      *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
+      loadsave = (void(*)(char)) 0x8153175;
+      //mainloop = (void(*)()) 0x800042b;
+      //titlemid = 0x816feb5;
+      //load_pokemon = (void(*)()) 0x8076dd1;
+
+      break;
+    }
+
+    case 'EEPB': // Emerald English
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x2025A00;
+      gSaveBlock2 = (pSaveBlock2) 0x2024A54;
+      gSaveBlock3 = (pSaveBlock3) 0x2029808;
+      *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
+      loadsave = (void(*)(char)) 0x81534d1;
+      //mainloop = (void(*)()) 0x800042b;
+      //titlemid = 0x817014d;
+      //load_pokemon = (void(*)()) 0x8076dd5;
+
+      break;
+    }
+
+    case 'JEPB': // Emerald Japanese
+    {
+      gSaveBlock1 = (pSaveBlock1) 0x20256A4;
+      gSaveBlock2 = (pSaveBlock2) 0x20246F8;
+      gSaveBlock3 = (pSaveBlock3) 0x20294AC;
+      *(pSaveBlock1*)(0x3005aec) = gSaveBlock1;
+      loadsave = (void(*)(char)) 0x815340d;
+      //mainloop = (void(*)()) 0x800042b;
+      //titlemid = 0x816ff45;
+      //load_pokemon = (void(*)()) 0x80767dd;
+
+      break;
+    }
+
+    default:
+    {
+      return false; // this game isn't supported
+    }
+  }
+
+  loadsave(0);
+
+  // now the save is loaded, we can do what we want with the loaded blocks.
+  // first, we're going to want to decrypt the parts that are crypted, if
+  // applicable.
+  decryptSaveStructures(gSaveBlock1,gSaveBlock2,gSaveBlock3);
+
+  *SaveBlock1 = gSaveBlock1;
+  *SaveBlock2 = gSaveBlock2;
+  *SaveBlock3 = gSaveBlock3;
+
+  return true;
+}
@@ -1,14 +1,15 @@
 /*
- * Example Gen3-multiboot payload by slipstream/RoL 2017.
+ * Copyright (C) 2017 hatkirby
+ * Copyright (C) 2017 slipstream/RoL
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
- *
- * payload.h: header file describing payload function
  */
+#ifndef _GAMEDATA_H_
+#define _GAMEDATA_H_
 
+#include <gba.h>
 #include "saveblocks.h"
-#include "libpayload.h"
 
 #define GAME_RUBY (((*(u32*)(0x80000AC)) << 8) == 'VXA\x00')
 #define GAME_SAPP (((*(u32*)(0x80000AC)) << 8) == 'PXA\x00')
@@ -20,4 +21,9 @@
 
 #define LANG_JAPAN ((*(u8*)(0x80000AF)) == 'J')
 
-void payload(pSaveBlock1 SaveBlock1,pSaveBlock2 SaveBlock2,pSaveBlock3 SaveBlock3);
\ No newline at end of file
+bool initSaveData(
+    pSaveBlock1* SaveBlock1,
+    pSaveBlock2* SaveBlock2,
+    pSaveBlock3* SaveBlock3);
+
+#endif
@@ -1,312 +0,0 @@
-/*
- * Example Gen3-multiboot payload by slipstream/RoL 2017.
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- *
- * libpayload.c: contains helper functions for the payload
- */
- 
-#include <gba.h>
-#include "payload.h"
-
-// private functions
-static void CryptBoxPokemon(struct BoxPokemon* pkm);
-static u16 crc16(const u8* data, u16 len);
-static u32 CalculateRamScriptDataChecksum(struct RamScriptData* ramScript);
-
-/**
- * Decrypts the substructures of a Pokémon structure, so they can be viewed or modified easily.
- * Remember to call EncryptPokemon() afterwards.
- * @param struct Pokemon* pkm The Pokémon to decrypt the substructures of.
-*/
-void DecryptPokemon(struct Pokemon* pkm) {
-        struct BoxPokemon* boxMon = &(pkm->box);
-        CryptBoxPokemon(boxMon);
-}
-
-/**
- * Private function that does the actual work of crypting the substructures of a BoxPokemon.
- * @param struct BoxPokemon* pkm The BoxPokemon whose substructures will be crypted.
-*/
-static void CryptBoxPokemon(struct BoxPokemon* pkm) {
-        for (u32 i = 0; i < 12; i++) {
-                pkm->secure.raw[i] ^= (pkm->otId ^ pkm->personality);
-        }
-}
-
-/**
- * Decrypts the substructures of a core Pokémon structure, so they can be viewed or modified easily.
- * Used by DecryptPokemon().
- * Remember to call EncryptPokemon() afterwards.
- * @param struct BoxPokemon* pkm The BoxPokemon to decrypt the substructures of.
-*/
-void DecryptBoxPokemon(struct BoxPokemon* pkm) {
-        CryptBoxPokemon(pkm);
-}
-
-/**
- * Encrypts the substructures of a Pokémon structure, and fixes the checksum.
- * Must be used after DecryptPokemon() has been called, otherwise the Pokémon you decrypted and forgot to re-encrypt will become a Bad Egg.
- * @param struct Pokemon* pkm The Pokémon to encrypt the substructures and fix the checksum of.
-*/
-void EncryptPokemon(struct Pokemon* pkm) {
-        struct BoxPokemon* boxMon = &(pkm->box);
-        EncryptBoxPokemon(boxMon);
-}
-
-/**
- * Encrypts the substructures of a core Pokémon structure, and fixes the checksum.
- * Must be used after DecryptBoxPokemon() has been called, otherwise the Pokémon you decrypted and forgot to re-encrypt will become a Bad Egg.
- * @param struct BoxPokemon* pkm The BoxPokemon to encrypt the substructures and fix the checksum of.
-*/
-void EncryptBoxPokemon(struct BoxPokemon* pkm) {
-        FixBoxPokemonChecksum(pkm);
-        CryptBoxPokemon(pkm);
-}
-
-/**
- * Gets a substructure of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokemon to get a substructure of.
- * @param u8 substructId The substructure to get.
- * @return union PokemonSubstruct* The substructure.
-*/
-union PokemonSubstruct* GetPokemonSubstruct(struct Pokemon* pkm,u8 substructId) {
-        struct BoxPokemon* boxMon = &(pkm->box);
-        return GetBoxPokemonSubstruct(boxMon,substructId);
-}
-
-/**
- * Gets a substructure of a core Pokémon structure.
- * Call DecryptBoxPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokemon to get a substructure of.
- * @param u8 substructId The substructure to get.
- * @return union PokemonSubstruct* The substructure.
-*/
-union PokemonSubstruct* GetBoxPokemonSubstruct(struct BoxPokemon* pkm,u8 substructId) {
-        if (substructId > 3) return NULL;
-        u32 personality = pkm->personality;
-        // Staring at the substruct indexes, I noticed the last two columns are the reverse of the first two!
-        // that is, substructId==2 column is the reverse of substructId==1, substructId==3 is the reverse of substructId==0
-        // At least that means there's no need to hardcode all four.
-        u8 substruct_idxes[2][24] = {
-                { 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 2, 3, 1, 1, 2, 3, 2, 3, 1, 1, 2, 3, 2, 3 },
-                { 1, 1, 2, 3, 2, 3, 0, 0, 0, 0, 0, 0, 2, 3, 1, 1, 3, 2, 2, 3, 1, 1, 3, 2 }
-        };
-        u32 modulo = (personality % 24);
-        if (substructId < 2) {
-                return &( pkm->secure.substructs[ substruct_idxes[substructId][modulo] ] );
-        }
-        return &( pkm->secure.substructs[ substruct_idxes[3 - substructId][23 - modulo] ] );
-}
-
-/**
- * Gets the checksum of a core Pokémon structure.
- * @param struct BoxPokemon* pkm The BoxPokemon to calculate the checksum of.
- * @return u16 The checksum.
-*/
-u16 CalculateBoxPokemonChecksum(struct BoxPokemon* pkm) {
-        u16 checksum = 0;
-        union PokemonSubstruct* substructs[4] = {
-                GetBoxPokemonSubstruct(pkm,0),
-                GetBoxPokemonSubstruct(pkm,1),
-                GetBoxPokemonSubstruct(pkm,2),
-                GetBoxPokemonSubstruct(pkm,3)
-        };
-        
-        for (int substruct = 0; substruct < 4; substruct++) {
-                for (int i = 0; i < 6; i++) {
-                        checksum += substructs[substruct]->raw[i];
-                }
-        }
-        return checksum;
-}
-
-/**
- * Fixes the checksum of a core Pokémon structure.
- * @param struct BoxPokemon* pkm The BoxPokemon to fix the checksum of.
-*/
-void FixBoxPokemonChecksum(struct BoxPokemon* pkm) {
-        pkm->checksum = CalculateBoxPokemonChecksum(pkm);
-}
-
-/**
- * Gets the zeroth substructure ("Growth") of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokémon to get a substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct0* GetPokemonSubstruct0(struct Pokemon* pkm) {
-        struct BoxPokemon* boxMon = &(pkm->box);
-        return GetBoxPokemonSubstruct0(boxMon);
-}
-
-/**
- * Gets the zeroth substructure ("Growth") of a core Pokémon structure.
- * Call DecryptBoxPokemon() first or the substructure data will be encrypted.
- * @param struct BoxPokemon* pkm The BoxPokemon to get the substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct0* GetBoxPokemonSubstruct0(struct BoxPokemon* pkm) {
-        return &( GetBoxPokemonSubstruct(pkm,0)->type0 );
-}
-
-/**
- * Gets the first substructure ("Attacks") of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokémon to get a substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct1* GetPokemonSubstruct1(struct Pokemon* pkm) {
-        struct BoxPokemon* boxMon = &(pkm->box);
-        return GetBoxPokemonSubstruct1(boxMon);
-}
-
-/**
- * Gets the first substructure ("Attacks") of a core Pokémon structure.
- * Call DecryptBoxPokemon()  first or the substructure data will be encrypted.
- * @param struct BoxPokemon* pkm The BoxPokemon to get the substructure of.
- * @return struct PokemonSubstruct1* The substructure.
-*/
-struct PokemonSubstruct1* GetBoxPokemonSubstruct1(struct BoxPokemon* pkm) {
-        return &( GetBoxPokemonSubstruct(pkm,1)->type1 );
-}
-
-/**
- * Gets the second substructure ("EVs & Condition") of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokémon to get a substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct2* GetPokemonSubstruct2(struct Pokemon* pkm) {
-        struct BoxPokemon* boxMon = &(pkm->box);
-        return GetBoxPokemonSubstruct2(boxMon);
-}
-
-/**
- * Gets the second substructure ("EVs & Condition") of a core Pokémon structure.
- * Call DecryptBoxPokemon()  first or the substructure data will be encrypted.
- * @param struct BoxPokemon* pkm The BoxPokemon to get the substructure of.
- * @return struct PokemonSubstruct2* The substructure.
-*/
-struct PokemonSubstruct2* GetBoxPokemonSubstruct2(struct BoxPokemon* pkm) {
-        return &( GetBoxPokemonSubstruct(pkm,2)->type2 );
-}
-
-/**
- * Gets the third substructure ("Miscellaneous")  of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokémon to get a substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct3* GetPokemonSubstruct3(struct Pokemon* pkm) {
-        struct BoxPokemon* boxMon = &(pkm->box);
-        return GetBoxPokemonSubstruct3(boxMon);
-}
-
-/**
- * Gets the third substructure ("Miscellaneous") of a core Pokémon structure.
- * Call DecryptBoxPokemon()  first or the substructure data will be encrypted.
- * @param struct BoxPokemon* pkm The BoxPokemon to get the substructure of.
- * @return struct PokemonSubstruct3* The substructure.
-*/
-struct PokemonSubstruct3* GetBoxPokemonSubstruct3(struct BoxPokemon* pkm) {
-        return &( GetBoxPokemonSubstruct(pkm,3)->type3 );
-}
-
-/**
- * Calculates the checksum for an R/S-specific Enigma Berry structure in SaveBlock1.
- * @param struct EnigmaBerry* enigmaBerry The R/S-specific Enigma Berry to calculate the checksum for.
- * @return u32 The checksum.
-*/
-u32 CalculateEnigmaBerryChecksumRS(struct EnigmaBerry* enigmaBerry) {
-        if (!GAME_RS) return 0; // Enigma Berry structure changed in FR/LG, use CalculateEnigmaBerryChecksumFRLGE() instead.
-        u32 checksum = 0;
-        // Save off and zero out the original Enigma Berry description pointers.
-        const u8* description[2] = { enigmaBerry->berry.description1, enigmaBerry->berry.description2 };
-        enigmaBerry->berry.description1 = enigmaBerry->berry.description2 = NULL;
-        u8* enigmaBerryBytes = (u8*)enigmaBerry;
-        // Calculate the checksum.
-        for (u32 i = 0; i < 1324; i++) {
-                checksum += enigmaBerryBytes[i];
-        }
-        // Restore the saved description.
-        enigmaBerry->berry.description1 = description[0];
-        enigmaBerry->berry.description2 = description[1];
-        return checksum;
-}
-
-/**
- * Calculates the checksum for an FR/LG/Emerald-specific Enigma Berry structure in SaveBlock1.
- * @param struct EnigmaBerryFRLGE* enigmaBerry The FR/LG/Emerald-specific Enigma Berry to calculate the checksum for.
- * @return u32 The checksum.
-*/
-u32 CalculateEnigmaBerryChecksumFRLGE(struct EnigmaBerryFRLGE* enigmaBerry) {
-        if (GAME_RS) return 0; // Enigma Berry structure is different in R/S, use CalculateEnigmaBerryChecksumRS() instead.
-        u32 checksum = 0;
-        u8* enigmaBerryBytes = (u8*)enigmaBerry;
-        for (int i = 0; i < 0x30; i++) {
-                checksum += enigmaBerryBytes[i];
-        }
-        return checksum;
-}
-
-/**
- * Calculates the checksum for an unspecified Enigma Berry structure in SaveBlock1. (detected by current game)
- * @param void* enigmaBerry The Enigma Berry structure to calculate the checksum for.
- * @return u32 The checksum.
- */
-u32 CalculateEnigmaBerryChecksum(void* enigmaBerry) {
-        if (GAME_RS) return CalculateEnigmaBerryChecksumRS( (struct EnigmaBerry*) enigmaBerry );
-        return CalculateEnigmaBerryChecksumFRLGE( (struct EnigmaBerryFRLGE*) enigmaBerry );
-}
-
-/**
- * Calculates the checksum for a RAM script structure in SaveBlock1.
- * @param struct RamScript* ramScript The RAM script structure to calculate the checksum for.
- * @return u32 The checksum.
- */
-u32 CalculateRamScriptChecksum(struct RamScript* ramScript) {
-        asm(""); // make sure the call to CalculateRamScriptDataChecksum() is *not* inlined.
-        // For some reason, if it gets inlined, something happens, and the wrong length is used when checksumming...
-        return CalculateRamScriptDataChecksum(&ramScript->data);
-}
-
-/**
- * Calculates the checksum for a RAM script structure in SaveBlock1.
- * @param struct RamScript* ramScript The RAM script structure to calculate the checksum for.
- * @return u32 The checksum.
- */
-static __attribute__ ((noinline)) u32 CalculateRamScriptDataChecksum(struct RamScriptData* ramScript) {
-        u32 checksum = 0;
-        u32 i = 0;
-        u8* ramScriptBytes = (u8*)(ramScript);
-        if (GAME_RS) {
-                for (i = 0; i < sizeof(struct RamScriptData); i++) checksum += ramScriptBytes[i];
-                return checksum;
-        }
-        
-        return (u32)crc16(ramScriptBytes,sizeof(struct RamScriptData) + 1);
-}
-
-/**
- * Private function to CRC-16, (used by FR/LG/Emerald ramscript checksum). Adapted from http://forums.glitchcity.info/index.php?topic=7114.0
- * @param u8* Data to checksum
- * @param u16 Length of data
- * @return u16 The checksum
-*/
-static u16 crc16(const u8* data, u16 len) {
-        u16 crc = 0x1121;
-        for (u16 i = 0; i < len; ++i) {
-                crc ^= data[i];
-                for (u16 j = 0; j < 8; ++j) {
-                        if(crc & 1) {
-                                crc = (crc >> 1) ^ 0x8408;
-                        } else {
-                                crc >>= 1;
-                        }
-                }
-        }
-        return ~crc;
-}
\ No newline at end of file
@@ -1,160 +0,0 @@
-/*
- * Example Gen3-multiboot payload by slipstream/RoL 2017.
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- *
- * libpayload.h: header for payload helper functions
- */
-
-/**
- * Decrypts the substructures of a Pokémon structure, so they can be viewed or modified easily.
- * Remember to call EncryptPokemon() afterwards.
- * @param struct Pokemon* pkm The Pokémon to decrypt the substructures of.
-*/
-void DecryptPokemon(struct Pokemon* pkm);
-
-/**
- * Decrypts the substructures of a core Pokémon structure, so they can be viewed or modified easily.
- * Used by DecryptPokemon().
- * Remember to call EncryptPokemon() afterwards.
- * @param struct BoxPokemon* pkm The BoxPokemon to decrypt the substructures of.
-*/
-void DecryptBoxPokemon(struct BoxPokemon* pkm);
-
-/**
- * Encrypts the substructures of a Pokémon structure, and fixes the checksum.
- * Must be used after DecryptPokemon() has been called, otherwise the Pokémon you decrypted and forgot to re-encrypt will become a Bad Egg.
- * @param struct Pokemon* pkm The Pokémon to encrypt the substructures and fix the checksum of.
-*/
-void EncryptPokemon(struct Pokemon* pkm);
-
-/**
- * Encrypts the substructures of a core Pokémon structure, and fixes the checksum.
- * Must be used after DecryptBoxPokemon() has been called, otherwise the Pokémon you decrypted and forgot to re-encrypt will become a Bad Egg.
- * @param struct BoxPokemon* pkm The BoxPokemon to encrypt the substructures and fix the checksum of.
-*/
-void EncryptBoxPokemon(struct BoxPokemon* pkm);
-
-/**
- * Gets a substructure of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokemon to get a substructure of.
- * @param u8 substructId The substructure to get.
- * @return union PokemonSubstruct* The substructure.
-*/
-union PokemonSubstruct* GetPokemonSubstruct(struct Pokemon* pkm,u8 substructId);
-
-/**
- * Gets a substructure of a core Pokémon structure.
- * Call DecryptBoxPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokemon to get a substructure of.
- * @param u8 substructId The substructure to get.
- * @return union PokemonSubstruct* The substructure.
-*/
-union PokemonSubstruct* GetBoxPokemonSubstruct(struct BoxPokemon* pkm,u8 substructId);
-
-/**
- * Gets the checksum of a core Pokémon structure.
- * @param struct BoxPokemon* pkm The BoxPokemon to calculate the checksum of.
- * @return u16 The checksum.
-*/
-u16 CalculateBoxPokemonChecksum(struct BoxPokemon* pkm);
-
-/**
- * Fixes the checksum of a core Pokémon structure.
- * @param struct BoxPokemon* pkm The BoxPokemon to fix the checksum of.
-*/
-void FixBoxPokemonChecksum(struct BoxPokemon* pkm);
-
-/**
- * Gets the zeroth substructure ("Growth") of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokémon to get a substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct0* GetPokemonSubstruct0(struct Pokemon* pkm);
-
-/**
- * Gets the zeroth substructure ("Growth") of a core Pokémon structure.
- * Call DecryptBoxPokemon() first or the substructure data will be encrypted.
- * @param struct BoxPokemon* pkm The BoxPokemon to get the substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct0* GetBoxPokemonSubstruct0(struct BoxPokemon* pkm);
-
-/**
- * Gets the first substructure ("Attacks") of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokémon to get a substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct1* GetPokemonSubstruct1(struct Pokemon* pkm);
-
-/**
- * Gets the first substructure ("Attacks") of a core Pokémon structure.
- * Call DecryptBoxPokemon()  first or the substructure data will be encrypted.
- * @param struct BoxPokemon* pkm The BoxPokemon to get the substructure of.
- * @return struct PokemonSubstruct1* The substructure.
-*/
-struct PokemonSubstruct1* GetBoxPokemonSubstruct1(struct BoxPokemon* pkm);
-
-/**
- * Gets the second substructure ("EVs & Condition") of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokémon to get a substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct2* GetPokemonSubstruct2(struct Pokemon* pkm);
-
-/**
- * Gets the second substructure ("EVs & Condition") of a core Pokémon structure.
- * Call DecryptBoxPokemon()  first or the substructure data will be encrypted.
- * @param struct BoxPokemon* pkm The BoxPokemon to get the substructure of.
- * @return struct PokemonSubstruct2* The substructure.
-*/
-struct PokemonSubstruct2* GetBoxPokemonSubstruct2(struct BoxPokemon* pkm);
-
-/**
- * Gets the third substructure ("Miscellaneous")  of a Pokémon structure.
- * Call DecryptPokemon() first or the substructure data will be encrypted.
- * @param struct Pokemon* pkm The Pokémon to get a substructure of.
- * @return struct PokemonSubstruct0* The substructure.
-*/
-struct PokemonSubstruct3* GetPokemonSubstruct3(struct Pokemon* pkm);
-
-/**
- * Gets the third substructure ("Miscellaneous") of a core Pokémon structure.
- * Call DecryptBoxPokemon()  first or the substructure data will be encrypted.
- * @param struct BoxPokemon* pkm The BoxPokemon to get the substructure of.
- * @return struct PokemonSubstruct3* The substructure.
-*/
-struct PokemonSubstruct3* GetBoxPokemonSubstruct3(struct BoxPokemon* pkm);
-
-/**
- * Calculates the checksum for an R/S-specific Enigma Berry structure in SaveBlock1.
- * @param struct EnigmaBerry* enigmaBerry The R/S-specific Enigma Berry to calculate the checksum for.
- * @return u32 The checksum.
-*/
-u32 CalculateEnigmaBerryChecksumRS(struct EnigmaBerry* enigmaBerry);
-
-/**
- * Calculates the checksum for an FR/LG/Emerald-specific Enigma Berry structure in SaveBlock1.
- * @param struct EnigmaBerryFRLGE* enigmaBerry The FR/LG/Emerald-specific Enigma Berry to calculate the checksum for.
- * @return u32 The checksum.
-*/
-u32 CalculateEnigmaBerryChecksumFRLGE(struct EnigmaBerryFRLGE* enigmaBerry);
-
-/**
- * Calculates the checksum for an unspecified Enigma Berry structure in SaveBlock1. (detected by current game)
- * @param void* enigmaBerry The Enigma Berry structure to calculate the checksum for.
- * @return u32 The checksum.
- */
-u32 CalculateEnigmaBerryChecksum(void* enigmaBerry);
-
-/**
- * Calculates the checksum for a RAM script structure in SaveBlock1.
- * @param struct RamScript* ramScript The RAM script structure to calculate the checksum for.
- * @return u32 The checksum.
- */
-u32 CalculateRamScriptChecksum(struct RamScript* ramScript);
\ No newline at end of file
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2017 hatkirby
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+#include "link.h"
+
+#define JOY_WRITE 2
+#define JOY_READ 4
+#define JOY_RW 6
+
+void initializeLink()
+{
+        REG_HS_CTRL |= JOY_RW;
+        REG_JOYTR = 0;
+  while ((REG_HS_CTRL & JOY_WRITE) == 0);
+  REG_HS_CTRL |= JOY_RW;
+}
+
+void waitForAck()
+{
+  while ((REG_HS_CTRL & JOY_WRITE) == 0);
+  REG_HS_CTRL |= JOY_RW;
+        REG_JOYTR = 0;
+  while ((REG_HS_CTRL & JOY_WRITE) == 0);
+  REG_HS_CTRL |= JOY_RW;
+}
+
+void sendS32(s32 val)
+{
+  REG_JOYTR = val;
+}
+
+void sendU32(u32 val)
+{
+  REG_JOYTR = val;
+}
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2017 hatkirby
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+#ifndef _LINK_H_
+#define _LINK_H_
+
+#include <gba.h>
+
+void initializeLink();
+void waitForAck();
+void sendS32(s32 val);
+void sendU32(u32 val);
+
+#endif
@@ -1,380 +1,110 @@
 /*
- * Example Gen3-multiboot payload by slipstream/RoL 2017.
+ * Copyright (C) 2017 hatkirby
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
- *
- * main.c: setup, call payload, return gracefully back to game
  */
 #include <gba.h>
-#include "payload.h"
+#include "gamedata.h"
+#include "link.h"
 
-void call_into_middle_of_titlescreen_func(u32 addr,u32 stackspace);
+int main(void)
+{
+        initializeLink();
 
-void decrypt_save_structures(pSaveBlock1 SaveBlock1,pSaveBlock2 SaveBlock2,pSaveBlock3 SaveBlock3) {
-        if (GAME_RS) {
-                // R/S doesn't have save crypto.
-                return;
-        }
-        u8* sb1raw = (u8*)SaveBlock1;
-        u8* sb2raw = (u8*)SaveBlock2;
-        //u8* sb3raw = (u8*)SaveBlock3; // unused
-        
-        u32* xor_key_ptr = (u32*)(&sb2raw[( GAME_EM ? 0xA8 : 0xF20 )]);
-        
-        u32 xor_key = *xor_key_ptr;
-        u16 xor_key16 = (u16)xor_key;
-        if (!xor_key) {
-                // xor key is zero, nothing needs to be done.
-                return;
-        }
-        
-        u32* ptr_to_xor;
-        u32 save_offset;
-        int i;
-        u32* bag_pocket_offsets;
-        u32* bag_pocket_counts;
-        if (GAME_FRLG) {
-                // loop over and decrypt various things
-                save_offset = 0x3D38 + 4;
-                for (i = 3; i >= 0; i--) {
-                        ptr_to_xor = (u32*)(&sb1raw[save_offset]);
-                        *ptr_to_xor ^= xor_key;
-                        save_offset += 12;
-                }
-                for (i = 0; i <= 0x3f; i++) {
-                        save_offset = 0x1200 + (i*sizeof(u32));
-                        ptr_to_xor = (u32*)(&sb1raw[save_offset]);
-                        *ptr_to_xor ^= xor_key;
-                }
-                // loop over each of the bag pockets and decrypt decrypt decrypt
-                bag_pocket_offsets = (u32[5]) { 0x310, 0x388, 0x430, 0x464, 0x54C };
-                bag_pocket_counts = (u32[5]) { 42, 30, 13, 58, 43 };
-                for (i = 0; i < 5; i++) {
-                        for (int bag_i = 0; bag_i < bag_pocket_counts[i]; bag_i++) {
-                                save_offset = bag_pocket_offsets[i] + (sizeof(u32) * bag_i) + 2;
-                                *(u16*)(&sb1raw[save_offset]) ^= xor_key16;
-                        }
-                }
-                // decrypt some more stuff
-                save_offset = 0xaf8;
-                ptr_to_xor = (u32*)(&sb1raw[save_offset]);
-                *ptr_to_xor ^= xor_key;
-                save_offset = 0x290;
-                ptr_to_xor = (u32*)(&sb1raw[save_offset]);
-                *ptr_to_xor ^= xor_key;
-                save_offset = 0x294;
-                *(u16*)(&sb1raw[save_offset]) ^= xor_key16;
-        } else { // Emerald
-                // loop over and decrypt various things
-                for (i = 0; i <= 0x3f; i++) {
-                        save_offset = 0x159c + (i*sizeof(u32));
-                        ptr_to_xor = (u32*)(&sb1raw[save_offset]);
-                        *ptr_to_xor ^= xor_key;
-                }
-                // loop over each of the bag pockets and decrypt decrypt decrypt
-                bag_pocket_offsets = (u32[5]) { 0x560, 0x5D8, 0x650, 0x690, 0x790 };
-                bag_pocket_counts = (u32[5]) { 30, 30, 16, 64, 46 };
-                for (i = 0; i < 5; i++) {
-                        for (int bag_i = 0; bag_i < bag_pocket_counts[i]; bag_i++) {
-                                save_offset = bag_pocket_offsets[i] + (sizeof(u32) * bag_i) + 2;
-                                *(u16*)(&sb1raw[save_offset]) ^= xor_key16;
-                        }
-                }
-                // decrypt some more stuff
-                save_offset = 0x1F4;
-                ptr_to_xor = (u32*)(&sb1raw[save_offset]);
-                *ptr_to_xor ^= xor_key;
-                save_offset = 0x490;
-                ptr_to_xor = (u32*)(&sb1raw[save_offset]);
-                *ptr_to_xor ^= xor_key;
-                save_offset = 0x494;
-                *(u16*)(&sb1raw[save_offset]) ^= xor_key16;
-        }
-        
-        *xor_key_ptr = 0;
-        return;
-        
-}
+  // Identify the host game.
+  if (GAME_RUBY)
+  {
+    sendS32(1);
+  } else if (GAME_SAPP)
+  {
+    sendS32(2);
+  } else if (GAME_FR)
+  {
+    sendS32(3);
+  } else if (GAME_LG)
+  {
+    sendS32(4);
+  } else if (GAME_EM)
+  {
+    sendS32(5);
+  } else {
+    sendS32(-1);
+                waitForAck();
 
-int main(void) {
-        // check the ROM code, make sure this game is supported.
-        u8* ROM = (u8*) 0x8000000;
-        
-        u32 gamecode = (*(u32*)(&ROM[0xAC]));
-        
-        void(*loadsave)(char a1);
-        void(*mainloop)();
-        void(*load_pokemon)();
-        pSaveBlock1 gSaveBlock1;
-        pSaveBlock2 gSaveBlock2;
-        pSaveBlock3 gSaveBlock3;
-        u32 titlemid = 0;
-        // get the address of the save loading function.
-        switch (gamecode) {
-                // --- R/S ---
-                case 'DVXA': // Ruby German
-                case 'DPXA': // Sapphire German
-                        // TODO: detect debug ROM?
-                        gSaveBlock1 = (pSaveBlock1) 0x2025734;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
-                        gSaveBlock3 = (pSaveBlock3) 0x20300A0;
-                        loadsave = (void(*)(char)) 0x8126249; // same for v1.0 + v1.1
-                        mainloop = (void(*)()) 0x80003D9;
-                        load_pokemon = (void(*)()) 0x8047da9;
-                        break;
-                case 'FVXA': // Ruby French
-                case 'FPXA': // Sapphire French
-                        gSaveBlock1 = (pSaveBlock1) 0x2025734;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
-                        gSaveBlock3 = (pSaveBlock3) 0x20300A0;
-                        loadsave = (void(*)(char)) 0x8126351; // same for v1.0 + v1.1
-                        mainloop = (void(*)()) 0x80003D9;
-                        load_pokemon = (void(*)()) 0x8047e95;
-                        break;
-                case 'IVXA': // Ruby Italian
-                case 'IPXA': // Sapphire Italian
-                        gSaveBlock1 = (pSaveBlock1) 0x2025734;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
-                        gSaveBlock3 = (pSaveBlock3) 0x20300A0;
-                        loadsave = (void(*)(char)) 0x8126249; // same for v1.0 + v1.1
-                        mainloop = (void(*)()) 0x80003D9;
-                        load_pokemon = (void(*)()) 0x8047dbd;
-                        break;
-                case 'SVXA': // Ruby Spanish
-                case 'SPXA': // Sapphire Spanish
-                        gSaveBlock1 = (pSaveBlock1) 0x2025734;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
-                        gSaveBlock3 = (pSaveBlock3) 0x20300A0;
-                        loadsave = (void(*)(char)) 0x8126349; // same for v1.0 + v1.1
-                        mainloop = (void(*)()) 0x80003D9;
-                        load_pokemon = (void(*)()) 0x8047ea5;
-                        break;
-                case 'EVXA': // Ruby English
-                case 'EPXA': // Sapphire English
-                        gSaveBlock1 = (pSaveBlock1) 0x2025734;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024EA4;
-                        gSaveBlock3 = (pSaveBlock3) 0x20300A0;
-                        mainloop = (void(*)()) 0x80002A5;
-                        switch (ROM[0xBC]) { // version number
-                                case 0:
-                                        loadsave = (void(*)(char)) 0x8125EC9;
-                                        load_pokemon = (void(*)()) 0x8047a85;
-                                        break;
-                                case 1:
-                                case 2:
-                                        loadsave = (void(*)(char)) 0x8125EE9;
-                                        load_pokemon = (void(*)()) 0x8047aa5;
-                                        break;
-                                default:
-                                        return 0; // unsupported version
-                        }
-                        break;
-                case 'JVXA': // Ruby Japanese
-                case 'JPXA': // Sapphire Japanese
-                        gSaveBlock1 = (pSaveBlock1) 0x2025494;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024C04;
-                        gSaveBlock3 = (pSaveBlock3) 0x202FDBC;
-                        loadsave = (void(*)(char)) 0x8120d05; // same for v1.0 + v1.1
-                        mainloop = (void(*)()) 0x80002A9;
-                        load_pokemon = (void(*)()) 0x8044d55;
-                        break;
-                /// --- FR/LG ---
-                // In FR/LG, the function that initialises the save-block pointers to default does not set up saveblock3.
-                // Which will need to be set up before loading the save if we want boxed Pokémon to not disappear.
-                // Oh, and loadsave() offset is different between FR and LG...
-                case 'DRPB': // FireRed German
-                case 'DGPB': // LeafGreen German
-                        gSaveBlock1 = (pSaveBlock1) 0x202552C;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024588;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029314;
-                        *(pSaveBlock3*)(0x3004f60) = gSaveBlock3;
-                        loadsave = (void(*)(char)) ( GAME_FR ? 0x80da721 : 0x80da6f5 );
-                        mainloop = (void(*)()) 0x8000425;
-                        titlemid = 0x80791df;
-                        load_pokemon = (void(*)()) 0x804c251;
-                        break;
-                case 'FRPB': // FireRed French
-                case 'FGPB': // LeafGreen French
-                        gSaveBlock1 = (pSaveBlock1) 0x202552C;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024588;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029314;
-                        *(pSaveBlock3*)(0x3004f60) = gSaveBlock3;
-                        loadsave = (void(*)(char)) ( GAME_FR ? 0x80da7e1 : 0x80da7b5 );
-                        mainloop = (void(*)()) 0x8000417;
-                        titlemid = 0x807929f;
-                        load_pokemon = (void(*)()) 0x804c311;
-                        break;
-                case 'IRPB': // FireRed Italian
-                case 'IGPB': // LeafGreen Italian
-                        gSaveBlock1 = (pSaveBlock1) 0x202552C;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024588;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029314;
-                        *(pSaveBlock3*)(0x3004f60) = gSaveBlock3;
-                        loadsave = (void(*)(char)) ( GAME_FR ? 0x80da721 : 0x80da6f5 );
-                        mainloop = (void(*)()) 0x8000425;
-                        titlemid = 0x80791cb;
-                        load_pokemon = (void(*)()) 0x804c23d;
-                        break;
-                case 'SRPB': // FireRed Spanish
-                case 'SGPB': // LeafGreen Spanish
-                        gSaveBlock1 = (pSaveBlock1) 0x202552C;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024588;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029314;
-                        *(pSaveBlock3*)(0x3004f60) = gSaveBlock3;
-                        loadsave = (void(*)(char)) ( GAME_FR ? 0x80da809 : 0x80da7dd );
-                        mainloop = (void(*)()) 0x8000417;
-                        titlemid = 0x80792b3;
-                        load_pokemon = (void(*)()) 0x804c325;
-                        break;
-                case 'ERPB': // FireRed English
-                case 'EGPB': // LeafGreen English
-                        gSaveBlock1 = (pSaveBlock1) 0x202552C;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024588;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029314;
-                        *(pSaveBlock3*)(0x3005010) = gSaveBlock3;
-                        switch (ROM[0xBC]) { // version number
-                                case 0:
-                                        loadsave = (void(*)(char)) ( GAME_FR ? 0x80da4fd : 0x80da4d1 );
-                                        mainloop = (void(*)()) 0x800041b;
-                                        titlemid = 0x807927b;
-                                        load_pokemon = (void(*)()) 0x804c231;
-                                        break;
-                                case 1:
-                                        loadsave = (void(*)(char)) ( GAME_FR ? 0x80da511 : 0x80da4e5 );
-                                        mainloop = (void(*)()) 0x8000429;
-                                        titlemid = 0x807928f;
-                                        load_pokemon = (void(*)()) 0x804c245;
-                                        break;
-                                default:
-                                        return 0; // unsupported version
-                        }
-                        break;
-                case 'JRPB': // FireRed Japanese
-                case 'JGPB': // LeafGreen Japanese
-                        gSaveBlock1 = (pSaveBlock1) 0x202548C;
-                        gSaveBlock2 = (pSaveBlock2) 0x20244E8;
-                        gSaveBlock3 = (pSaveBlock3) 0x202924C;
-                        *(pSaveBlock3*)(0x3005050) = gSaveBlock3;
-                        switch (ROM[0xBC]) { // version number
-                                case 0:
-                                        loadsave = (void(*)(char)) ( GAME_FR ? 0x80db4e5 : 0x80db4b9 );
-                                        mainloop = (void(*)()) 0x800041b;
-                                        titlemid = 0x8078a0f;
-                                        load_pokemon = (void(*)()) 0x804b9e9;
-                                        break;
-                                case 1:
-                                        if ((gamecode << 8) == 'GPB\x00') {
-                                                // LeafGreen v1.1 Japanese is undumped.
-                                                // Therefore, it is unsupported.
-                                                // I will make guesses at the offsets in the comments, but I will not actually implement them until LeafGreen v1.1 is dumped.
-                                                return 0;
-                                        }
-                                        loadsave = (void(*)(char)) 0x80db529; // potential LG1.1 address: 0x80db4fd
-                                        mainloop = (void(*)()) 0x8000417;
-                                        titlemid = 0x8078987;
-                                        load_pokemon = (void(*)()) 0x804b9c5;
-                                        break;
-                                default:
-                                        return 0; // unsupported version
-                        }
-                        break;
-                /// --- Emerald ---
-                // In Emerald, the saveblock pointer that isn't set up is saveblock1 (in FR/LG it was saveblock3).
-                // The initial save loading code after the copyright screen is also updated, now it sets up ASLR/crypto here before loading the save.
-                case 'DEPB': // Emerald German
-                        gSaveBlock1 = (pSaveBlock1) 0x2025A00;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024A54;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029808;
-                        *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
-                        loadsave = (void(*)(char)) 0x8153075;
-                        mainloop = (void(*)()) 0x800042b;
-                        titlemid = 0x816fdb5;
-                        load_pokemon = (void(*)()) 0x8076dd5;
-                        break;
-                case 'FEPB': // Emerald French
-                        gSaveBlock1 = (pSaveBlock1) 0x2025A00;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024A54;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029808;
-                        *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
-                        loadsave = (void(*)(char)) 0x815319d;
-                        mainloop = (void(*)()) 0x800042b;
-                        titlemid = 0x816fedd;
-                        load_pokemon = (void(*)()) 0x8076dd1;
-                        break;
-                case 'IEPB': // Emerald Italian
-                        gSaveBlock1 = (pSaveBlock1) 0x2025A00;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024A54;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029808;
-                        *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
-                        loadsave = (void(*)(char)) 0x8153065;
-                        mainloop = (void(*)()) 0x800042b;
-                        titlemid = 0x816fda5;
-                        load_pokemon = (void(*)()) 0x8076dd5;
-                        break;
-                case 'SEPB': // Emerald Spanish
-                        gSaveBlock1 = (pSaveBlock1) 0x2025A00;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024A54;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029808;
-                        *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
-                        loadsave = (void(*)(char)) 0x8153175;
-                        mainloop = (void(*)()) 0x800042b;
-                        titlemid = 0x816feb5;
-                        load_pokemon = (void(*)()) 0x8076dd1;
-                        break;
-                case 'EEPB': // Emerald English
-                        gSaveBlock1 = (pSaveBlock1) 0x2025A00;
-                        gSaveBlock2 = (pSaveBlock2) 0x2024A54;
-                        gSaveBlock3 = (pSaveBlock3) 0x2029808;
-                        *(pSaveBlock1*)(0x3005d8c) = gSaveBlock1;
-                        loadsave = (void(*)(char)) 0x81534d1;
-                        mainloop = (void(*)()) 0x800042b;
-                        titlemid = 0x817014d;
-                        load_pokemon = (void(*)()) 0x8076dd5;
-                        break;
-                case 'JEPB': // Emerald Japanese
-                        gSaveBlock1 = (pSaveBlock1) 0x20256A4;
-                        gSaveBlock2 = (pSaveBlock2) 0x20246F8;
-                        gSaveBlock3 = (pSaveBlock3) 0x20294AC;
-                        *(pSaveBlock1*)(0x3005aec) = gSaveBlock1;
-                        loadsave = (void(*)(char)) 0x815340d;
-                        mainloop = (void(*)()) 0x800042b;
-                        titlemid = 0x816ff45;
-                        load_pokemon = (void(*)()) 0x80767dd;
-                        break;
-                default:
-                        return 0; // this game isn't supported
-        }
-        loadsave(0);
-        // now the save is loaded, we can do what we want with the loaded blocks.
-        // first, we're going to want to decrypt the parts that are crypted, if applicable.
-        decrypt_save_structures(gSaveBlock1,gSaveBlock2,gSaveBlock3);
-        // time to call the payload.
-        payload(gSaveBlock1,gSaveBlock2,gSaveBlock3);
-        // Now, we better call the function that sets the pokemon-related stuff from the structure elements of the loaded save again.
-        // Just in case the payload did something with that.
-        load_pokemon();
-        // In FR/LG/Emerald, just returning to the game is unwise.
-        // The game reloads the savefile.
-        // In FR/LG, this is done at the title screen after setting ASLR/saveblock-crypto up. (probably because at initial save-load, SaveBlock3 ptr isn't set up lol)
-        // So, better bypass the title screen and get the game to return directly to the Continue/New Game screen.
-        // In Emerald, the save reload happens after the Continue option was chosen, so we have no choice but to bypass everything and get the game to go straight to the overworld.
-        // Easiest way to do this is to call into the middle of the function we want, using an ASM wrapper to set up the stack.
-        // Here goes...
-        if (titlemid) {
-                // Function reserves an extra 4 bytes of stack space in FireRed/LeafGreen, and none in Emerald.
-                call_into_middle_of_titlescreen_func(titlemid,(GAME_EM ? 0 : 4));
-        }
-        // Now we've done what we want, time to return to the game.
-        // Can't just return, the game will reload the save.
-        // So let's just call the main-loop directly ;)
-        // turn the sound back on before we head back to the game
-        *(vu16 *)(REG_BASE + 0x84) = 0x8f;
-        // re-enable interrupts
-        REG_IME = 1;
-        mainloop();
-        // Anything past here will not be executed.
-        return 0;
-}
+                return 0;
+  }
+
+  waitForAck();
+
+  // Get access to save data.
+  pSaveBlock1 SaveBlock1;
+  pSaveBlock2 SaveBlock2;
+  pSaveBlock3 SaveBlock3;
+
+  if (!initSaveData(&SaveBlock1, &SaveBlock2, &SaveBlock3))
+  {
+    // Unsupported game version.
+    sendS32(-1);
+                waitForAck();
+
+                return 0;
+  }
+
+  sendS32(1);
+  waitForAck();
+
+  // Send trainer name.
+  u8* trainerName = 0;
 
+  if (GAME_RS)
+  {
+    trainerName = SaveBlock2->rs.playerName;
+  } else if (GAME_FRLG)
+  {
+    trainerName = SaveBlock2->frlg.playerName;
+  } else if (GAME_EM)
+  {
+    trainerName = SaveBlock2->e.playerName;
+  }
 
+  u32 tn1 =
+      (trainerName[0] << 24)
+    | (trainerName[1] << 16)
+    | (trainerName[2] << 8)
+    | (trainerName[3]);
+
+  u32 tn2 =
+      (trainerName[4] << 24)
+    | (trainerName[5] << 16)
+    | (trainerName[6] << 8)
+    | (trainerName[7]);
+
+  sendU32(tn1);
+  waitForAck();
+
+  sendU32(tn2);
+  waitForAck();
+
+  // Send trainer ID.
+  u8* trainerId = 0;
+  if (GAME_RS)
+  {
+    trainerId = SaveBlock2->rs.playerTrainerId;
+  } else if (GAME_FRLG)
+  {
+    trainerId = SaveBlock2->frlg.playerTrainerId;
+  } else if (GAME_EM)
+  {
+    trainerId = SaveBlock2->e.playerTrainerId;
+  }
+
+  u32 tti =
+      (trainerId[1] << 8)
+    | (trainerId[0]);
+
+  sendU32(tti);
+  waitForAck();
+
+        // Halt();
+}
@@ -1,72 +0,0 @@
-/*
- * Example Gen3-multiboot payload by slipstream/RoL 2017.
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- *
- * payload.c: place where user payload should go :)
- */
-
-#include <gba.h>
-#include "payload.h"
-
-// Your payload code should obviously go into the body of this, the payload function.
-void payload(pSaveBlock1 SaveBlock1,pSaveBlock2 SaveBlock2,pSaveBlock3 SaveBlock3) {
-        // HoF-warp example payload!
-        
-        // Structure offsets are different between R/S, FR/LG, and Emerald.
-        // The beginning of the structures are the same but do NOT take shortcuts here, it's not good practise.
-        // If you want to support multiple games, make specific checks for games, use the right structure for each game.
-        SaveBlock1_RS* sb1rs = &SaveBlock1->rs;
-        SaveBlock1_FRLG* sb1frlg = &SaveBlock1->frlg;
-        SaveBlock1_E* sb1e = &SaveBlock1->e;
-        if (GAME_FRLG) {
-                sb1frlg->location.mapGroup = 1; // generic indoors?
-                sb1frlg->location.mapNum = 80; // Hall of Fame
-                // set coords to the same place that the champions' room script sets them to
-                sb1frlg->location.x = sb1frlg->pos.x = 5;
-                sb1frlg->location.y = sb1frlg->pos.y = 12;
-                sb1frlg->mapDataId = 0xDA; // from HoF map-header
-                sb1frlg->location.warpId = 0xff;
-                // make sure the HoF script doesn't crash, which it will do if 0 pokémon
-                if (sb1frlg->playerPartyCount == 0) {
-                        sb1frlg->playerPartyCount = 1;
-                        // this isn't enough, the heal animation recalculates the party count ignoring empty spots
-                        // so let's hack together one. i don't care about it becoming a bad egg at all.
-                        sb1frlg->playerParty[0].box.personality++;
-                }
-                return;
-        } else if (GAME_RS) {
-                sb1rs->location.mapGroup = 16; // Ever Grande City
-                sb1rs->location.mapNum = 11; // Hall of Fame
-                // set coords to the same place that the champions' room script sets them to
-                sb1rs->location.x = sb1rs->pos.x = 7;
-                sb1rs->location.y = sb1rs->pos.y = 16;
-                sb1rs->mapDataId = 299; // from HoF map-header
-                sb1rs->location.warpId = 0xff;
-                // make sure the HoF script doesn't crash, which it will do if 0 pokémon
-                if (sb1rs->playerPartyCount == 0) {
-                        sb1rs->playerPartyCount = 1;
-                        // this isn't enough, the heal animation recalculates the party count ignoring empty spots
-                        // so let's hack together one. i don't care about it becoming a bad egg at all.
-                        sb1rs->playerParty[0].box.personality++;
-                }
-                return;
-        } else if (GAME_EM) {
-                sb1e->location.mapGroup = 16; // Ever Grande City
-                sb1e->location.mapNum = 11; // Hall of Fame
-                // set coords to the same place that the champions' room script sets them to
-                sb1e->location.x = sb1e->pos.x = 7;
-                sb1e->location.y = sb1e->pos.y = 16;
-                sb1e->mapDataId = 298; // from HoF map-header
-                sb1e->location.warpId = 0xff;
-                // make sure the HoF script doesn't crash, which it will do if 0 pokémon
-                if (sb1e->playerPartyCount == 0) {
-                        sb1e->playerPartyCount = 1;
-                        // this isn't enough, the heal animation recalculates the party count ignoring empty spots
-                        // so let's hack together one. i don't care about it becoming a bad egg at all.
-                        sb1e->playerParty[0].box.personality++;
-                }
-                return;
-        }
-}
\ No newline at end of file