move trainer stuff to trainer folder, finish first rival battle draft

g3headers

@@ -1 +1 @@
-Subproject commit e16cda91fc0c216e41c8a770b5af23a83aba698a
+Subproject commit 3e36531d290bd97e7b1208526e54c8acdfe376d3

src/trainer/trainer_rival_encounters.c

@@ -0,0 +1,170 @@
+#include <pokeagb/pokeagb.h>
+#include <constants/pkmns.h>
+#include "trainer_rival_encounters.h"
+
+
+const struct TrainerPokemonBase rival_first_encounter[21][1] = {
+    //Bisasam
+    {
+        {
+            .species = PKMN_GLUMANDA,
+            .level = 5
+        },
+    },
+
+    //Glumanda
+    {
+        {
+            .species = PKMN_SCHIGGY,
+            .level = 5
+        },
+    },
+    //Schiggy
+    {
+        {
+            .species = PKMN_BISASAM,
+            .level = 5
+        },
+    },
+    //Endivie
+    {
+        {
+            .species = PKMN_FEURIGEL,
+            .level = 5
+        },
+    },
+
+    //Feurigel
+    {
+        {
+            .species = PKMN_KARNIMANI,
+            .level = 5
+        },
+    },
+    //Karnimani
+    {
+        {
+            .species = PKMN_ENDIVIE,
+            .level = 5
+        },
+    },
+    //Geckarbor
+    {
+        {
+            .species = PKMN_FLEMMLI,
+            .level = 5
+        },
+    },
+
+    //Flemmli
+    {
+        {
+            .species = PKMN_HYDROPI,
+            .level = 5
+        },
+    },
+    //Hydropi
+    {
+        {
+            .species = PKMN_GECKARBOR,
+            .level = 5
+        },
+    },
+    //Chelast
+    {
+        {
+            .species = PKMN_PANFLAM,
+            .level = 5
+        },
+    },
+
+    //Panflam
+    {
+        {
+            .species = PKMN_PLINFA,
+            .level = 5
+        },
+    },
+    //Plinfa
+    {
+        {
+            .species = PKMN_CHELAST,
+            .level = 5
+        },
+    },
+    //Serpifeu
+    {
+        {
+            .species = PKMN_FLOINK,
+            .level = 5
+        },
+    },
+
+    //Floink
+    {
+        {
+            .species = PKMN_OTTARO,
+            .level = 5
+        },
+    },
+    //Ottaro
+    {
+        {
+            .species = PKMN_SERPIFEU,
+            .level = 5
+        },
+    },
+    //Igamaro
+    {
+        {
+            .species = PKMN_FYNX,
+            .level = 5
+        },
+    },
+
+    //Fynx
+    {
+        {
+            .species = PKMN_FROXY,
+            .level = 5
+        },
+    },
+    //Froxy
+    {
+        {
+            .species = PKMN_IGAMARO,
+            .level = 5
+        },
+    },
+    //Bauz
+    {
+        {
+            .species = PKMN_FLAMIAU,
+            .level = 5
+        },
+    },
+
+    //Flamiau
+    {
+        {
+            .species = PKMN_ROBBALL,
+            .level = 5
+        },
+    },
+    //Robball
+    {
+        {
+            .species = PKMN_BAUZ,
+            .level = 5
+        },
+    },
+};
+
+const struct RivalEncounter rival_encounters[RIVAL_ENCOUNTER_COUNT] = {
+    {.partyCount = 1, .partyArray = {&rival_first_encounter[0][0]}, .trainerId = 1}, //male easy
+    {.partyCount = 1, .partyArray = {&rival_first_encounter[0][0]}, .trainerId = 2}, //male medium
+    {.partyCount = 1, .partyArray = {&rival_first_encounter[0][0]}, .trainerId = 3}, //male hard
+    {.partyCount = 1, .partyArray = {&rival_first_encounter[0][0]}, .trainerId = 4}, //female easy
+    {.partyCount = 1, .partyArray = {&rival_first_encounter[0][0]}, .trainerId = 5}, //female medium
+    {.partyCount = 1, .partyArray = {&rival_first_encounter[0][0]}, .trainerId = 6}, //female hard
+};

src/trainer/trainer_rival_encounters.h

@@ -0,0 +1,16 @@
+#ifndef TRAINER_RIVAL_ENC_H_
+#define TRAINER_RIVAL_ENC_H_
+
+#include <pokeagb/pokeagb.h>
+
+#define RIVAL_ENCOUNTER_COUNT 6
+
+struct RivalEncounter {
+    u8 partyCount;
+    const union TrainerPokemonPtr partyArray;
+    u8 trainerId;
+};
+
+const struct RivalEncounter rival_encounters[RIVAL_ENCOUNTER_COUNT];
+
+#endif

src/overworld/trainerbattle_init.c → src/trainer/trainerbattle_init.c

@@ -1,5 +1,6 @@
 #include <pokeagb/pokeagb.h>
 #include <agb_debug.h>
+#include "trainer_rival_encounters.h"
 
 void battle_intro_launch(u8 environment) {
     TaskCallback introTask;
@@ -16,6 +17,43 @@ void battle_intro_launch(u8 environment) {
     livingTask->priv[1] = environment;
 }
 
+union TrainerPokemonPtr battle_trainer_get_rival(u8 chosenStarterValue, u8 encounterNumber, enum TrainerPartyFlag flag) {
+    u8 partyCount = rival_encounters[encounterNumber].partyCount;
+    u8 structureSize = 0;
+    switch(flag)
+    {
+        case TRAINER_PARTY_NONE:
+            structureSize = sizeof(struct TrainerPokemonBase);
+            break;
+        case TRAINER_PARTY_HELD_ITEM:
+            structureSize = sizeof(struct TrainerPokemonItem);
+            break;
+        case TRAINER_PARTY_MOVESET:
+            structureSize = sizeof(struct TrainerPokemonMoves);
+            break;
+        case TRAINER_PARTY_HELD_ITEM_MOVESET:
+            structureSize = sizeof(struct TrainerPokemonItemMoves);
+            break;
+        default:
+            structureSize = sizeof(struct TrainerPokemonBase);
+            break;
+    }
+
+    return (union TrainerPokemonPtr)(rival_encounters[encounterNumber].partyArray.undefinedStructure + (chosenStarterValue * partyCount * structureSize));
+}
+
+#define VAR_STARTER 0x5052
+
+union TrainerPokemonPtr battle_trainer_get_rival_or_null(u8 tid) {
+    for(u16 i = 0; i < RIVAL_ENCOUNTER_COUNT; ++i) {
+        if(rival_encounters[i].trainerId == tid) {
+            return battle_trainer_get_rival(var_load(VAR_STARTER), i, trainer_data[tid].flags);
+        }
+    }
+    union TrainerPokemonPtr nullPokemon = {.undefinedStructure = NULL};
+    return nullPokemon;
+}
+
 u8 battle_trainer_build_party(struct Pokemon *party, u16 tid) {
     if(tid == 0x400)
         return 0;
@@ -35,14 +73,15 @@ u8 battle_trainer_build_party(struct Pokemon *party, u16 tid) {
             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);
+                    const struct TrainerPokemonBase *pokeData = battle_trainer_get_rival_or_null(tid).noItemDefaultMoves;
+                    if(pokeData == NULL)
+                        pokeData = trainer_data[tid].party.noItemDefaultMoves;
                     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];
@@ -57,14 +96,17 @@ u8 battle_trainer_build_party(struct Pokemon *party, u16 tid) {
                 }
                 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);
+                    const struct TrainerPokemonMoves *pokeData = battle_trainer_get_rival_or_null(tid).noItemCustomMoves;
+                    if(pokeData == NULL)
+                        pokeData = trainer_data[tid].party.noItemCustomMoves;
+                        
+                    dprintf("making pokemon with species: %d\n", pokeData[i].species);
                     //custom moveset
-                    for(u8 j = 0; pokemon_names[pokeData[i].base.species][j] != 0xFF; ++j)
-                        nameHash += pokemon_names[pokeData[i].base.species][j];
+                    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].base.iv * 31 / 255;
-                    pokemon_make_full(&party[i], pokeData[i].base.species, pokeData[i].base.level, iv, true, personalityValue, 2, 0);
+                    u8 iv = pokeData[i].iv * 31 / 255;
+                    pokemon_make_full(&party[i], pokeData[i].species, pokeData[i].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);
@@ -75,7 +117,10 @@ u8 battle_trainer_build_party(struct Pokemon *party, u16 tid) {
                 {
                     //custom item
                     
-                    const struct TrainerPokemonBase *pokeData = (const struct TrainerPokemonBase*)(trainer_data[tid].party);
+                    const struct TrainerPokemonItem *pokeData = battle_trainer_get_rival_or_null(tid).itemDefaultMoves;
+                    if(pokeData == NULL)
+                        pokeData = trainer_data[tid].party.itemDefaultMoves;
+
                     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];
@@ -89,15 +134,18 @@ u8 battle_trainer_build_party(struct Pokemon *party, u16 tid) {
                 case TRAINER_PARTY_HELD_ITEM | TRAINER_PARTY_MOVESET:
                 {
                     //custom all the things
-                    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];
+                    const struct TrainerPokemonItemMoves *pokeData = battle_trainer_get_rival_or_null(tid).customItemCustomMoves;
+                    if(pokeData == NULL)
+                        pokeData = trainer_data[tid].party.customItemCustomMoves;
+
+                    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;
-                    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);
+                    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].base.Item);
+                    pokemon_setattr(&party[i], REQUEST_HELD_ITEM, (void*)&pokeData[i].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);