rewrite trainer_build_party

data/trainer/trainer_pkmn_data.s

 .align 2
 .text
 .thumb
-.global trainer_pkmn_data
-trainer_pkmn_data:
+.global trainer_data
+trainer_data:
 
 .byte 0x0
 .byte 0x0
 .hword 0x0, 0x0
 .byte 0x0
 .byte 0x0, 0x0, 0x0
+.word 0x00000000 @@this is actually important, because otherwise the structure offset will be off
 
 .byte MOVE_NEIN_ITEM_NEIN
 .byte TRAINERCLASS_PKMN_TRAINER

g3headers

-Subproject commit 4f2398d73aba67dfbc4dd396c2b8f3a376c64ea9
+Subproject commit e16cda91fc0c216e41c8a770b5af23a83aba698a

patches/overworlds/trainer.asm

 .org 0x080BC3A0
 ldr r1, =battle_intro_launch+1
 bx r1
+.pool
+
+.org 0x080112E0
+ldr r2, =battle_trainer_build_party+1
+bx r2
 .pool

patches/trainer_sprites/trainer_data.asm

 //Point to trainer data, which is 4 bytes prior to the first name
 
 .org 0x0800FC00
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x0800FC80
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x0801133C
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x080113BC
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x080116C4
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08015728
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08025920
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x080259DC
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08037E6C
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08038040
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08043694
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08043884
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08044028
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x0807FE88
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x0807FFB8
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x080C6F40
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x080D809C
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x080D8158
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08113810
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x08115230
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x0812C048
-.word trainer_pkmn_data -4
+.word trainer_data
 
 .org 0x080D80A0
 .word trainerclasses
 
 //Point to new trainer item data
 .org 0x080C6D9C
-.word trainer_pkmn_data +12
+.word trainer_data +12

sots-private

-Subproject commit 38779228bdfb681bd4b274a1dd367be12099dd73
+Subproject commit 5b270e614e3c0d2eda30f62bfe4818c579b3d55d

src/overworld/trainerbattle_init.c

 #include <pokeagb/pokeagb.h>
+#include <agb_debug.h>
 
 void battle_intro_launch(u8 environment) {
     TaskCallback introTask;
     if(tid == 0x400)
         return 0;
     //ignore some type of battles like old man or trainer tower where the party is determined otherwise
+    dprintf("battle_type_flags: %x, tid: %d\n", battle_type_flags, tid);
     if ((battle_type_flags & 0x80908) == 8) {
         party_opponent_purge();
         for(u8 i = 0; i < trainer_data[tid].party_size; ++i) {
             u32 personalityValue;
             if(trainer_data[tid].is_double)
                 personalityValue = 0x80;
-            else if (trainer_data[tid].gender)
+            else if (trainer_data[tid].gender & 0x80)
                 personalityValue = 0x78;
             else
                 personalityValue = 0x88;
                 {
                     //nothing
                     const struct TrainerPokemonBase *pokeData = (const struct TrainerPokemonBase*)(trainer_data[tid].party);
-                    for(u8 j = 0; pokemon_names[pokeData[i].species][j] != 0xFF; ++j)
+                    dprintf("making pokemon with species: %d, struct: 0x%x\n", pokeData[i].species, pokeData);
+                    for(u8 j = 0; pokemon_names[pokeData[i].species][j] != 0xFF; ++j) {
                         nameHash += pokemon_names[pokeData[i].species][j];
+                    }
+                    
                     personalityValue += nameHash << 8;
                     u8 iv = pokeData[i].iv * 31 / 255;
 
                 case TRAINER_PARTY_MOVESET:
                 {
                     const struct TrainerPokemonMoves *pokeData = (const struct TrainerPokemonMoves*)(trainer_data[tid].party);
+                    dprintf("making pokemon with species: %d\n", pokeData[i].base.species);
                     //custom moveset
                     for(u8 j = 0; pokemon_names[pokeData[i].base.species][j] != 0xFF; ++j)
                         nameHash += pokemon_names[pokeData[i].base.species][j];
                 case TRAINER_PARTY_HELD_ITEM:
                 {
                     //custom item
+                    
                     const struct TrainerPokemonBase *pokeData = (const struct TrainerPokemonBase*)(trainer_data[tid].party);
+                    dprintf("making pokemon with species: %d\n", pokeData[i].species);
                     for(u8 j = 0; pokemon_names[pokeData[i].species][j] != 0xFF; ++j)
                         nameHash += pokemon_names[pokeData[i].species][j];
                     personalityValue += nameHash << 8;
                 case TRAINER_PARTY_HELD_ITEM | TRAINER_PARTY_MOVESET:
                 {
                     //custom all the things
-                    const struct TrainerPokemonMoves *pokeData = (const struct TrainerPokemonMoves*)(trainer_data[tid].party);  
+                    const struct TrainerPokemonMoves *pokeData = (const struct TrainerPokemonMoves*)(trainer_data[tid].party);
+                    dprintf("making pokemon with species: %d\n", pokeData[i].base.species);  
                     for(u8 j = 0; pokemon_names[pokeData[i].base.species][j] != 0xFF; ++j)
                         nameHash += pokemon_names[pokeData[i].base.species][j];
                     personalityValue += nameHash << 8;

src/specials/trainer_battle.c

 
         battle_80801F0_something();
 
-        return (void *)(0x081A4EC1); /* some script to execute */
+        return (void *)(0x081A4F21); /* some script to execute */
 
     case 0xFF:
         /* this is a registered on-spot script */