Skip to content

Commit 0ee720a

Browse files
Manu098vmManu098vm
committed
Update offset for BDSP 1.3.0
1 parent bd6a853 commit 0ee720a

3 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎SysBot.Pokemon/BDSP/Data/PokeDataOffsetsBS_BD.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ namespace SysBot.Pokemon
44
{
55
public class PokeDataOffsetsBS_BD : BasePokeDataOffsetsBS
66
{
7-
public override IReadOnlyList<long> MainRNGState { get; } = new long[] { 0x4F8E750, 0x0 };
8-
public override IReadOnlyList<long> R1_SpeciesPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x2A0, 0x2C };
9-
public override IReadOnlyList<long> R2_SpeciesPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x2A0, 0x4C };
10-
public override IReadOnlyList<long> R1_SeedPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x2A0, 0x24 };
11-
public override IReadOnlyList<long> R2_SeedPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x2A0, 0x44 };
12-
public override IReadOnlyList<long> EggSeedPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x450 };
13-
public override IReadOnlyList<long> EggStepPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x458 };
14-
public override IReadOnlyList<long> LocationPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x40 };
15-
public override IReadOnlyList<long> PartyStartPokemonPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x7F8, 0x10, 0x20, 0x20, 0x18, 0x20 };
16-
public override IReadOnlyList<long> PartySlot2PokemonPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x7F8, 0x10, 0x28, 0x20, 0x18, 0x20 };
17-
public override IReadOnlyList<long> BoxStartPokemonPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xA0, 0x20, 0x20, 0x20 };
18-
public override IReadOnlyList<long> OpponentPokemonPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x7F0, 0x58, 0x28, 0x10, 0x20, 0x20, 0x18, 0x20 };
7+
public override IReadOnlyList<long> MainRNGState { get; } = new long[] { 0x4FD43D0, 0x0 };
8+
public override IReadOnlyList<long> R1_SpeciesPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x2A0, 0x2C };
9+
public override IReadOnlyList<long> R2_SpeciesPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x2A0, 0x4C };
10+
public override IReadOnlyList<long> R1_SeedPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x2A0, 0x24 };
11+
public override IReadOnlyList<long> R2_SeedPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x2A0, 0x44 };
12+
public override IReadOnlyList<long> EggSeedPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x450 };
13+
public override IReadOnlyList<long> EggStepPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x458 };
14+
public override IReadOnlyList<long> LocationPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x40 };
15+
public override IReadOnlyList<long> PartyStartPokemonPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x808, 0x10, 0x20, 0x20, 0x18, 0x20 };
16+
public override IReadOnlyList<long> PartySlot2PokemonPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x808, 0x10, 0x28, 0x20, 0x18, 0x20 };
17+
public override IReadOnlyList<long> BoxStartPokemonPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0xA0, 0x20, 0x20, 0x20 };
18+
public override IReadOnlyList<long> OpponentPokemonPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0x800, 0x58, 0x28, 0x10, 0x20, 0x20, 0x18, 0x20 };
1919

20-
public override IReadOnlyList<long> SceneIDPointer { get; } = new long[] { 0x4E2BC08, 0xB8, 0x18 };
21-
public override IReadOnlyList<long> DayTimePointer { get; } = new long[] { 0x4E2BC08, 0xB8, 0x0, 0x60, 0x100 };
20+
public override IReadOnlyList<long> SceneIDPointer { get; } = new long[] { 0x4C59B50, 0xB8, 0x18 };
21+
public override IReadOnlyList<long> DayTimePointer { get; } = new long[] { 0x4C59B50, 0xB8, 0x0, 0x60, 0x100 };
2222

23-
public override IReadOnlyList<long> MyStatusTrainerPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xE0, 0x0 };
24-
public override IReadOnlyList<long> MyStatusTIDPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xE8 };
25-
public override IReadOnlyList<long> ConfigTextSpeedPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xA8 };
26-
public override IReadOnlyList<long> ConfigLanguagePointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xAC };
23+
public override IReadOnlyList<long> MyStatusTrainerPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0xE0, 0x0 };
24+
public override IReadOnlyList<long> MyStatusTIDPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0xE8 };
25+
public override IReadOnlyList<long> ConfigTextSpeedPointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0xA8 };
26+
public override IReadOnlyList<long> ConfigLanguagePointer { get; } = new long[] { 0x4C64DC0, 0xB8, 0x10, 0xAC };
2727
}
2828
}

‎SysBot.Pokemon/BDSP/Data/PokeDataOffsetsBS_SP.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ namespace SysBot.Pokemon
44
{
55
public class PokeDataOffsetsBS_SP : BasePokeDataOffsetsBS
66
{
7-
public override IReadOnlyList<long> MainRNGState { get; } = new long[] { 0x4F8E750, 0x0 };
8-
public override IReadOnlyList<long> R1_SpeciesPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x2A0, 0x2C };
9-
public override IReadOnlyList<long> R2_SpeciesPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x2A0, 0x4C };
10-
public override IReadOnlyList<long> R1_SeedPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x2A0, 0x24 };
11-
public override IReadOnlyList<long> R2_SeedPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x2A0, 0x44 };
12-
public override IReadOnlyList<long> EggSeedPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x450 };
13-
public override IReadOnlyList<long> EggStepPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x458 };
14-
public override IReadOnlyList<long> LocationPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x40 };
15-
public override IReadOnlyList<long> PartyStartPokemonPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x7F8, 0x10, 0x20, 0x20, 0x18, 0x20 };
16-
public override IReadOnlyList<long> PartySlot2PokemonPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x7F8, 0x10, 0x28, 0x20, 0x18, 0x20 };
17-
public override IReadOnlyList<long> BoxStartPokemonPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xA0, 0x20, 0x20, 0x20 };
18-
public override IReadOnlyList<long> OpponentPokemonPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0x7F0, 0x58, 0x28, 0x10, 0x20, 0x20, 0x18, 0x20 };
7+
public override IReadOnlyList<long> MainRNGState { get; } = new long[] { 0x4FD43D0, 0x0 };
8+
public override IReadOnlyList<long> R1_SpeciesPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x2A0, 0x2C };
9+
public override IReadOnlyList<long> R2_SpeciesPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x2A0, 0x4C };
10+
public override IReadOnlyList<long> R1_SeedPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x2A0, 0x24 };
11+
public override IReadOnlyList<long> R2_SeedPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x2A0, 0x44 };
12+
public override IReadOnlyList<long> EggSeedPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x450 };
13+
public override IReadOnlyList<long> EggStepPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x458 };
14+
public override IReadOnlyList<long> LocationPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x40 };
15+
public override IReadOnlyList<long> PartyStartPokemonPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x808, 0x10, 0x20, 0x20, 0x18, 0x20 };
16+
public override IReadOnlyList<long> PartySlot2PokemonPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x808, 0x10, 0x28, 0x20, 0x18, 0x20 };
17+
public override IReadOnlyList<long> BoxStartPokemonPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0xA0, 0x20, 0x20, 0x20 };
18+
public override IReadOnlyList<long> OpponentPokemonPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0x800, 0x58, 0x28, 0x10, 0x20, 0x20, 0x18, 0x20 };
1919

20-
public override IReadOnlyList<long> SceneIDPointer { get; } = new long[] { 0x4E2BC08, 0xB8, 0x18 };
21-
public override IReadOnlyList<long> DayTimePointer { get; } = new long[] { 0x4E2BC08, 0xB8, 0x0, 0x60, 0x100 };
20+
public override IReadOnlyList<long> SceneIDPointer { get; } = new long[] { 0x4E70C28, 0xB8, 0x18 };
21+
public override IReadOnlyList<long> DayTimePointer { get; } = new long[] { 0x4E70C28, 0xB8, 0x0, 0x60, 0x100 };
2222

23-
public override IReadOnlyList<long> MyStatusTrainerPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xE0, 0x0 };
24-
public override IReadOnlyList<long> MyStatusTIDPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xE8 };
25-
public override IReadOnlyList<long> ConfigTextSpeedPointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xA8 };
26-
public override IReadOnlyList<long> ConfigLanguagePointer { get; } = new long[] { 0x4E36C58, 0xB8, 0x10, 0xAC };
23+
public override IReadOnlyList<long> MyStatusTrainerPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0xE0, 0x0 };
24+
public override IReadOnlyList<long> MyStatusTIDPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0xE8 };
25+
public override IReadOnlyList<long> ConfigTextSpeedPointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0xA8 };
26+
public override IReadOnlyList<long> ConfigLanguagePointer { get; } = new long[] { 0x4E7BE98, 0xB8, 0x10, 0xAC };
2727
}
2828
}

‎SysBot.Pokemon/BDSP/PokeRoutineExecutor8BS.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public string GetString(PB8 pk)
444444
{
445445

446446
return $"\nEC: {pk.EncryptionConstant:X}\nPID: {pk.PID:X} {GetShinyType(pk)}\n" +
447-
$"{(Nature)pk.Nature} nature\nAbility slot: {pk.AbilityNumber}\n" +
447+
$"{(Nature)pk.Nature} nature\n" +
448448
$"IVs: [{pk.IV_HP}, {pk.IV_ATK}, {pk.IV_DEF}, {pk.IV_SPA}, {pk.IV_SPD}, {pk.IV_SPE}]\n";
449449
}
450450

0 commit comments

Comments
 (0)