Help with adding TMs 50-100 to Item Expansion

[paccy]

The problem is probably the tmhm_learnsets.h file as without modification it can't handle any TM/HM thats higher than TM63 I think it was.

I have managed to get 100TMs implemented, it is far from a nice looking solution, but I can go through it if you want. :)

 

[RadicalRadish]

I'd be glad if I could get this working yeah ^^'

I don't know...since I added the Item Expansion I get errors when I do stuff like adding maps too... (and I do it the same way I used to)
I think I'll roll back to a version without it for now.

 

[paccy]

Hmm, not sure what could be going on with the maps without seeing the error. But anyways here's how I got the learnsets for 100 TMs working.

Here is my tmhm_learnset file if you want to have a look.
The main change that has to be made is gTMHMLearnsets[][2] to gTMHMLearnsets[][4] so that there is enough room for the extra TMs.
This will cause problems with the defines at the top as integers greater than 64 bits will be created so I created an awful workaround. I created a script that converts the learnsets to integers in the correct array position.
As you can see it makes learnsets completely unreadable so I don't actually recommend this at all, it's just how I managed to get it working...

A better way would be to do do something like an extra define at the top

 #define TMHM2(tmhm) ((u64)1 << (ITEM_##tmhm - ITEM_64))

and then creating learnsets like this

Spoiler:

 [SPECIES_BULBASAUR]   = TMHM_LEARNSET(TMHM(TM45_ATTRACT)
											| TMHM(TM09_BULLET_SEED)
											| TMHM(TM32_DOUBLE_TEAM)
											| TMHM(TM42_FACADE)
											| TMHM(TM21_FRUSTRATION)
											| TMHM(TM19_GIGA_DRAIN)
											| TMHM(TM10_HIDDEN_POWER)
											| TMHM(TM16_LIGHT_SCREEN)
											| TMHM(TM17_PROTECT)
											| TMHM(TM33_REFLECT)
											| TMHM(TM44_REST)
											| TMHM(TM27_RETURN)
											| TMHM(TM20_SAFEGUARD)
											| TMHM(TM43_SECRET_POWER)
											| TMHM(TM36_SLUDGE_BOMB)
											| TMHM(TM22_SOLARBEAM)
											| TMHM(TM11_SUNNY_DAY)
											| TMHM(TM06_TOXIC)),
											TMHM_LEARNSET(TMHM2(TM68_GIGA_IMPACT)
											| TMHM2(TM86_GRASS_KNOT)
											| TMHM2(HM01_CUT)
											| TMHM2(HM05_FLASH)
											| TMHM2(HM04_STRENGTH)),

Where TMs 64 and above would need to be in the second TMHM_LEARNSET and use TMHM2.
Though I haven't actually tried doing it this so as it is it probably won't work haha.

Either way you'll need to change how the game checks if a TM is teachable in src/pokemon.c

Spoiler:

u32 CanMonLearnTMHM(struct Pokemon *mon, u8 tm)
{
    u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0);
    if (species == SPECIES_EGG)
    {
        return 0;
    }
    else if (tm < 31)
    {
        u32 mask = 1 << tm;
        return gTMHMLearnsets[species][0] & mask;
    }
    else if (tm < 62)
    {
        u32 mask = 1 << (tm - 31);
        return gTMHMLearnsets[species][1] & mask;
    }
    else if (tm < 93)
    {
        u32 mask = 1 << (tm - 62);
        return gTMHMLearnsets[species][2] & mask;
    }
    else
    {
        u32 mask = 1 << (tm - 93);
        return gTMHMLearnsets[species][3] & mask;
    }
}

u32 CanSpeciesLearnTMHM(u16 species, u8 tm)
{
    if (species == SPECIES_EGG)
    {
        return 0;
    }
    else if (tm < 31)
    {
        u32 mask = 1 << tm;
        return gTMHMLearnsets[species][0] & mask;
    }
    else if (tm < 62)
    {
        u32 mask = 1 << (tm - 31);
        return gTMHMLearnsets[species][1] & mask;
    }
    else if (tm < 93)
    {
        u32 mask = 1 << (tm - 62);
        return gTMHMLearnsets[species][2] & mask;
    }
    else
    {
        u32 mask = 1 << (tm - 93);
        return gTMHMLearnsets[species][3] & mask;
    }
}

And as simple(?) as that you have 100 working TMs.

 

[RadicalRadish]

Thx so much for sharing!
I don't know if I'm gonna get to trying this out soon, for now I'm working on other stuff than TMs (and left the Item-Expansion out). I gotta admit I was getting a bit frustrated...

But...after all I'd still love to add this in my rom so...I'll post my progress when I get around to it again!
It's so nice to see that it's actually possible x)

 

[BLourenco]

Thanks for this, I got my 100TMs working with this. This also works if you want to expand Move Tutors as well.

 

[KevinXDE]

Thanks to your previous posts I've managed to get it working without having to convert the learnsets into integers, which was a bit chaotic to be honest xD.What I've done is the following:

1. Changes in src\data\pokemon\tmhm_learnsets.h

Spoiler:

Changing the #define lines:

#define TMHM_LEARNSET(moves, moves2) {(u32)(moves), ((u64)(moves) >> 32), (u32)(moves2), (u64)(moves2) >> 32}
#define TMHM(tmhm) ((u64)1 << (ITEM_##tmhm - ITEM_TM00_CONFIDE)) // item id 482
#define TMHM2(tmhm) ((u64)1 << (ITEM_##tmhm - ITEM_TM64_EXPLOSION)) // item id 546

Having in mind that confide is TM number 100 but i changed it to be the first one in the tm's list because i just didn't want to mess with the number orderings in the tm bag pocket, as it bugged at number 100. If you changed nothing it should be ITEM_TM01_FOCUS_PUNCH

Secondly, change

const u32 gTMHMLearnsets[][2] =

to

const u32 gTMHMLearnsets[][4] =

and then the important part, the learnsets go like this:

{
    [SPECIES_NONE]        = TMHM_LEARNSET(0, 0),

    [SPECIES_BULBASAUR]   = TMHM_LEARNSET(TMHM(TM00_CONFIDE)
					| TMHM(TM01_WORK_UP)
					| TMHM(TM06_TOXIC)
					| TMHM(TM09_VENOSHOCK)
					| TMHM(TM10_HIDDEN_POWER)
					| TMHM(TM11_SUNNY_DAY)							
					| TMHM(TM16_LIGHT_SCREEN)
					| TMHM(TM17_PROTECT)
					| TMHM(TM20_SAFEGUARD)
					| TMHM(TM21_FRUSTRATION)
					| TMHM(TM27_RETURN)
					| TMHM(TM32_DOUBLE_TEAM)
					| TMHM(TM36_SLUDGE_BOMB)
					| TMHM(TM42_FACADE)
					| TMHM(TM44_REST)
					| TMHM(TM45_ATTRACT)
					| TMHM(TM48_ROUND)
					| TMHM(TM49_ECHOED_VOICE)
					| TMHM(TM53_ENERGY_BALL),
						TMHM2(TM75_SWORDS_DANCE)
						| TMHM2(TM86_GRASS_KNOT)
						| TMHM2(TM87_SWAGGER)
						| TMHM2(TM88_SLEEP_TALK)
						| TMHM2(TM90_SUBSTITUTE)
						| TMHM2(TM96_NATURE_POWER)
						| TMHM2(HM01_CUT)
						| TMHM2(HM04_STRENGTH)
						| TMHM2(HM05_FLASH)
						| TMHM2(HM06_ROCK_SMASH)),

where the first 64 tm's (in my case TM00 to TM63) go with TMHM where the first 0 in TMHM_LEARNSET(0, 0) would be (confide to energy ball in the code above), and the rest of tm's and hm's go with TMHM2, where the second 0 should be (swords dance to rock smash in the code above).

2. Changes in src\pokemon.c

Spoiler:

Similar to the changes stated on previous posts, though these numbers are working better for me

u32 CanMonLearnTMHM(struct Pokemon *mon, u8 tm)
{
    u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0);
    if (species == SPECIES_EGG)
    {
        return 0;
    }
    else if (tm < 32)
    {
        u32 mask = 1 << tm;
        return gTMHMLearnsets[species][0] & mask;
    }
    else if (tm < 64)
    {
        u32 mask = 1 << (tm - 32);
        return gTMHMLearnsets[species][1] & mask;
    }
	else if (tm < 96)
	{
		u32 mask = 1 << (tm - 64);
        return gTMHMLearnsets[species][2] & mask;
	}
	else
	{
		u32 mask = 1 << (tm - 96);
        return gTMHMLearnsets[species][3] & mask;
	}	
}

u32 CanSpeciesLearnTMHM(u16 species, u8 tm)
{
    if (species == SPECIES_EGG)
    {
        return 0;
    }
    else if (tm < 32)
    {
        u32 mask = 1 << tm;
        return gTMHMLearnsets[species][0] & mask;
    }
    else if (tm < 64)
    {
        u32 mask = 1 << (tm - 32);
        return gTMHMLearnsets[species][1] & mask;
    }
    else if (tm < 96)
    {
        u32 mask = 1 << (tm - 64);
        return gTMHMLearnsets[species][2] & mask;
    }
    else
    {
        u32 mask = 1 << (tm - 96);
        return gTMHMLearnsets[species][3] & mask;
    }
}

And that would be. I've tested all TM's and HM's on a few pokemon ingame and the learnsets are working as intended. The only thing i'm missing is expanding the TM's and HM's pocket, because that way only 64 tm's are able to fit on that pocket and if you put more items it obviously crashes. That's another topic though and has nothing to do with this problem.

 

[Jessler]

Hey, I tried doing things this way and it didn't work. All I got was a gigantic repeating error. I'm still fairly new to this stuff, so this doesn't really mean much to me. Any ideas?

 

[KevinXDE]

Hey, I tried doing things this way and it didn't work. All I got was a gigantic repeating error. I'm still fairly new to this stuff, so this doesn't really mean much to me. Any ideas?

What do you have in line 21676? I see the previous lines didn't have an error, so maybe you can search for some differences there. Maybe you've got a TM that doesn't belong to the correct group or something. You can also check my repository, you can see in this commit all the changes I made, and it works great for me. Note that the tmhm_learnsets file is too big so you'll have to check the raw version

https://github.com/kevinmc37/pokemon-slumber/commit/0ef243b4ff7c1d0103a5e4b26bfa227020032251

 

[Jessler]

I hate myself sometimes, haha! The Pokemon on that line still had TMHM(HM01_CUT). Thanks for pointing that out!

 

[Diego Mertens]

Thanks to your previous posts I've managed to get it working without having to convert the learnsets into integers, which was a bit chaotic to be honest xD.What I've done is the following:

hi i've tried using this but it keeps telling me that the left shift count is negative, and idk what im doing wrong, do you have any idea of what i could do?

i understand this post is really old but there doesn't seem to be any important changes in the tmhm learnsets in the last versions of item_expansion
EDIT: NEVERMIND i also forgot to delete a TMHM(HM01_CUT) it works now