Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

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

data/trainer/trainer_pkmn_data.s

@@ -3,8 +3,8 @@
 .align 2
 .text
 .thumb
-.global trainer_pkmn_data
-trainer_pkmn_data:
+.global trainer_data
+trainer_data:
 
 .byte 0x0
 .byte 0x0
@@ -21,6 +21,7 @@ trainer_pkmn_data:
 .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

@@ -1 +1 @@
-Subproject commit 4f2398d73aba67dfbc4dd396c2b8f3a376c64ea9
+Subproject commit 3e36531d290bd97e7b1208526e54c8acdfe376d3

patches/overworlds/trainer.asm

@@ -11,4 +11,9 @@ bx r2
 .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

@@ -1,67 +1,67 @@
 //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
@@ -74,4 +74,4 @@
 
 //Point to new trainer item data
 .org 0x080C6D9C
-.word trainer_pkmn_data +12
+.word trainer_data +12

src/overworld/trainerbattle_init.c

@@ -1,16 +0,0 @@
-#include <pokeagb/pokeagb.h>
-
-void battle_intro_launch(u8 environment) {
-    TaskCallback introTask;
-    if (battle_type_flags & BATTLE_FLAG_LINK) {
-        introTask = (TaskCallback)(0x080BCC4C | 1);
-    } else if (battle_type_flags & 0x1000 && build_edition_identifier != 2) {
-        introTask = (TaskCallback)(0x080BC6C8 | 1);
-    } else {
-        introTask = task00_battle_intro_by_env[environment];
-    }
-    struct Task *livingTask = &tasks[task_add(introTask, 0)];
-    for (u8 i = 0; i <= 6; ++i)
-        livingTask->priv[i] = 0;
-    livingTask->priv[1] = environment;
-}

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/trainer/trainerbattle_init.c

@@ -0,0 +1,162 @@
+#include <pokeagb/pokeagb.h>
+#include <agb_debug.h>
+#include "trainer_rival_encounters.h"
+
+void battle_intro_launch(u8 environment) {
+    TaskCallback introTask;
+    if (battle_type_flags & BATTLE_FLAG_LINK) {
+        introTask = (TaskCallback)(0x080BCC4C | 1);
+    } else if (battle_type_flags & 0x1000 && build_edition_identifier != 2) {
+        introTask = (TaskCallback)(0x080BC6C8 | 1);
+    } else {
+        introTask = task00_battle_intro_by_env[environment];
+    }
+    struct Task *livingTask = &tasks[task_add(introTask, 0)];
+    for (u8 i = 0; i <= 6; ++i)
+        livingTask->priv[i] = 0;
+    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;
+    //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 & 0x80)
+                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 = 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];
+                    }
+                    
+                    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 = 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].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);
+                    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 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];
+                    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 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].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);
+                    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;
+}