start rewriting trainer routine

data/moves/move_data.s

@@ -6,6 +6,8 @@
 
 .global move_table
 move_table:
+.global pokemon_moves
+pokemon_moves:
 
 @Move			DATA		.BYTE		EFFECT		DMG		TYPE		ACCUR		PP		EF_ACC		TARGET		PRIO		FLAGS		AGR_1		SPLIT		AGR_2
 /*Nichts*/		move_data_0:	.byte		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0

g3headers

@@ -1 +1 @@
-Subproject commit 67148f99854803cb7e03b0efa64b38a1285dc8db
+Subproject commit 4f2398d73aba67dfbc4dd396c2b8f3a376c64ea9

src/overworld/trainerbattle_init.c

@@ -13,4 +13,93 @@ void battle_intro_launch(u8 environment) {
     for (u8 i = 0; i <= 6; ++i)
         livingTask->priv[i] = 0;
     livingTask->priv[1] = environment;
+}
+
+u8 battle_trainer_build_party(struct Pokemon *party, u16 tid) {
+    if(tid == 0x400)
+        return 0;
+    //ignore some type of battles like old man or trainer tower where the party is determined otherwise
+    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)
+                personalityValue = 0x78;
+            else
+                personalityValue = 0x88;
+            u32 nameHash = 0;
+            for(u8 j = 0; trainer_data[tid].name[j] != 0xFF; ++j){
+                nameHash += trainer_data[tid].name[j];
+            }
+
+            //has custom items etc
+            switch(trainer_data[tid].flags)
+            {
+                case TRAINER_PARTY_NONE:
+                {
+                    //nothing
+                    const struct TrainerPokemonBase *pokeData = (const struct TrainerPokemonBase*)(trainer_data[tid].party);
+                    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;
+
+                    //no idea about the last 2 parameters, just do what the game does I guess
+                    pokemon_make_full(&party[i], pokeData[i].species, pokeData[i].level, iv, true, personalityValue, 2, 0);
+                    break;
+                }
+                case TRAINER_PARTY_MOVESET:
+                {
+                    const struct TrainerPokemonMoves *pokeData = (const struct TrainerPokemonMoves*)(trainer_data[tid].party);
+                    //custom moveset
+                    for(u8 j = 0; pokemon_names[pokeData[i].base.species][j] != 0xFF; ++j)
+                        nameHash += pokemon_names[pokeData[i].base.species][j];
+                    personalityValue += nameHash << 8;
+                    u8 iv = pokeData[i].base.iv * 31 / 255;
+                    pokemon_make_full(&party[i], pokeData[i].base.species, pokeData[i].base.level, iv, true, personalityValue, 2, 0);
+                    for(u8 j = 0; j < 4; ++j) {
+                        pokemon_setattr(&party[i], REQUEST_MOVE1 + j, (void*)&pokeData[i].moves[j]);
+                        pokemon_setattr(&party[i], REQUEST_PP1 + j, (void*)&pokemon_moves[pokeData[i].moves[j]].pp);
+                    }
+                    break;
+                }
+                case TRAINER_PARTY_HELD_ITEM:
+                {
+                    //custom item
+                    const struct TrainerPokemonBase *pokeData = (const struct TrainerPokemonBase*)(trainer_data[tid].party);
+                    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;
+                    pokemon_make_full(&party[i], pokeData[i].species, pokeData[i].level, iv, true, personalityValue, 2, 0);
+                    
+                    pokemon_setattr(&party[i], REQUEST_HELD_ITEM, (void*)&pokeData[i].Item);
+                    break;
+                }
+                case TRAINER_PARTY_HELD_ITEM | TRAINER_PARTY_MOVESET:
+                {
+                    //custom all the things
+                    const struct TrainerPokemonMoves *pokeData = (const struct TrainerPokemonMoves*)(trainer_data[tid].party);  
+                    for(u8 j = 0; pokemon_names[pokeData[i].base.species][j] != 0xFF; ++j)
+                        nameHash += pokemon_names[pokeData[i].base.species][j];
+                    personalityValue += nameHash << 8;
+                    u8 iv = pokeData[i].base.iv * 31 / 255;
+                    pokemon_make_full(&party[i], pokeData[i].base.species, pokeData[i].base.level, iv, true, personalityValue, 2, 0);
+                    
+                    pokemon_setattr(&party[i], REQUEST_HELD_ITEM, (void*)&pokeData[i].base.Item);
+                    for(u8 j = 0; j < 4; ++j) {
+                        pokemon_setattr(&party[i], REQUEST_MOVE1 + j, (void*)&pokeData[i].moves[j]);
+                        pokemon_setattr(&party[i], REQUEST_PP1 + j, (void*)&pokemon_moves[pokeData[i].moves[j]].pp);
+                    }
+                    break;
+                }
+                
+            }
+        }
+        battle_type_flags |= trainer_data[tid].is_double;
+    }
+    (void) party;
+    return trainer_data[tid].party_size;
 }