Simple Modifications Directory

[AlmightyK]

Make sure you did declare those MON_DATA variables at include/pokemon.h.

That one's unrelated.
Your project's struct RecordedBattleSave is bigger than its maximum allocated size, so the Assert put in place to notify the user of this prevents the compiler from building a ROM.

I got it working, the problem was a / and } adjacent to each other in pokemon.h

The second has been fixed by reducing Filler.11 to a lower number. I hope that doesnt break other things.

 

[MapleFall]

Hi Sir!!! i have a question on shopdata is it shopdata c or h?...and if its shop.c where is this "maxquantity" located...sorry im just a newbie... im having a hard time to find this because of quick or just shortcut guide... thanks!!!!

I'm sorry for not replying to you in a timely manner.
"shopdata" is a struct in shop.h

 

[PacFire]

[Pokeemerald] Stair Warps

This feature ports the stair warping effect from FRLG to Emerald:
(sorry for the bad tiles)

Options:

• Pull from my repo
• Follow the wiki post

Hello! your Sideways stairs port from FRLG is outdated, please update it and make a new guide! Thank you!

 

[Pierangeli]

Mid-battle Evolutions (Emerald)​

Hi everyone, this is my first contribution to this thread, I've had a lot of fun doing this and I hope to add some more!

Features:

• allows your Pokémon to evolve (if it can) in the middle of a battle when it has levelled up in battle and is currently out. If they learn any moves, they will be ready to be used in battle as well.
• works with single battles, both left and right Pokémon in double battles and in multi battles (i.e. your partner's Pokémon). Your partner's Pokémon should not evolve in normal gameplay since the player can't normally get Steven's (the only trainer with whom you can gain experience) Pokémon (Metang is the only one who could theoretically evolve) to evolve anyway in the Multi Battle against Team Magma.
• If you don't want either of your left or right Pokémon to evolve, the game will stop trying to evolve them in-battle if they gain any more levels.

Preview:

Spoiler:

Source
To pull the branch:

git remote add cfp https://github.com/CtrlFootPrint/pokeemerald
git pull cfp MidBattleEvo

Alternatively, here are the changes made: https://github.com/pret/pokeemerald/compare/master...CtrlFootPrint:MidBattleEvo

I have tested these changes in a variety of different scenarios and with different teams and it seems to be working fine. If you do spot any flaws or bugs or have any questions or queries, please let me know! Any other feedback or comment is much appreciated!

-----------
Hi, how are you? This feature is incredible, it makes perfect sense for pokemon to evolve in the middle of the battle and continue fighting, but I couldn't implement it. I'm using the rhh pokemon expansion.

Could you tell me if it's compatible? and what changes would be needed to implement this? Thank you very much.

 

[Pierangeli]

[Pokeemerald] Use Fly/Flash from party menu if Pokémon is compatible

The following changes allow Fly and/or Flash to be used in the field if the Pokémon is able to learn the relevant HMs, without them needing to be taught. Of course, the necessary gym badges are still required.

All of the changes are made in src\party_menu.c (SetPartyMonFieldSelectionActions) and can be found in this commit:
https://github.com/Scyrous/pokeemerald/commit/2b263a419784b63252ecdd3f576472ee0b3ce136

Demonstration:

Both Xatu and Latios are compatible with Fly/Flash. Because Latios already knows 3 HM moves, only Fly is added to the action list.

Notes:
If the Pokémon already knows fly or flash, the moves will show up as usual.
If the Pokémon already knows 4 field moves, no new moves will be added to the action list.
If the Pokémon knows less than 4 field moves, Fly will be prioritized over Flash.

==========

Hello, I tried to implement this change in rhh pokemon expansion, but without success.
it looks like "CanMonLearnTMHM" is no longer used. The same is happening for the hm usage tutorial without learning them. I don't know what to replace it with. Could you give me a light. Thanks

 

[Pierangeli]

Show Type Effectiveness In-Battle [EM]​

Now with Doubles, Flying Press/two-typed moves, and Inverse Battles support!
​

First thing you're going to want to do is to go into graphics\battle_interface, move text.pal to somewhere safe (I don't think the edits I made to this file harm anything, but better to be safe than sorry) and delete text.gbapal and text.gbapal.lz. Now, download the attached text.zip file, and move its contents (which is just a new text.pal) into the graphics\battle_interface folder.

Now, we get to the fun coding part!
Open up src\battle_message.c, search for sTextOnWindowsInfo_Normal, and add this to the bottom of this array:

Spoiler:

{ // 24 "type" super-effective
	.fillValue = PIXEL_FILL(0xE),
	.fontId = 7,
	.x = 0,
	.y = 1,
	.letterSpacing = 0,
	.lineSpacing = 0,
	.speed = 0,
	.fgColor = 6,
	.bgColor = 14,
	.shadowColor = 5,
},
{ // 25 "type" not very effective
	.fillValue = PIXEL_FILL(0xE),
	.fontId = 7,
	.x = 0,
	.y = 1,
	.letterSpacing = 0,
	.lineSpacing = 0,
	.speed = 0,
	.fgColor = 1,
	.bgColor = 14,
	.shadowColor = 3,
},
{ // 26 "type" no effect
	.fillValue = PIXEL_FILL(0xE),
	.fontId = 7,
	.x = 0,
	.y = 1,
	.letterSpacing = 0,
	.lineSpacing = 0,
	.speed = 0,
	.fgColor = 11,
	.bgColor = 14,
	.shadowColor = 11,
},

Now, open src\battle_bg.c, and add this to the bottom of gStandardBattleWindowTemplates (make sure you paste this before DUMMY_WIN_TEMPLATE, though):

Spoiler:

{ // super effective
	.bg = 0,
	.tilemapLeft = 21,
	.tilemapTop = 57,
	.width = 8,
	.height = 2,
	.paletteNum = 5,
	.baseBlock = 0x02a0,
},
{ // not very effective
	.bg = 0,
	.tilemapLeft = 21,
	.tilemapTop = 57,
	.width = 8,
	.height = 2,
	.paletteNum = 5,
	.baseBlock = 0x02a0,
},
{ // no effect
	.bg = 0,
	.tilemapLeft = 21,
	.tilemapTop = 57,
	.width = 8,
	.height = 2,
	.paletteNum = 5,
	.baseBlock = 0x02a0,
},

The final bit for this code belongs in src\battle_controller_player.c.
We're going to start by adding these defines at the end of the list of defines toward the top of the file:

#include "constants/battle_move_effects.h"
#include "event_data.h"

This is necessary for getting the Inverse Battle flag later on, and for getting the move effects for two-typed moves.

Next, define a new method at the top of the file. You can place it anywhere, but I searched for:

static void MoveSelectionDisplayMoveType(void);

And placed it above it. The method we are defining is:

static void MoveSelectionDisplayMoveTypeDoubles(u8 targetId);

The reason we're defining a whole new method for this here is because it's a bit easier than adding a 1 to every MoveSelectionDisplayMoveType call that happens in this file. If you wanted to, you could replace every MoveSelectionDisplayMoveType(); in the file to MoveSelectionDisplayMoveType(1); and replace the MoveSelectionDisplayMoveType method with the MoveSelectionDisplayMoveTypeDoubles method from later in this post and everything should work the same.

Now, we're going to be copying over the effectiveness table from src\battle_util.c of DizzyEgg's Battle Engine.
I placed this toward the top of the file, under "unknown unused data".

Spoiler:

#define X UQ_4_12

static const u16 sTypeEffectivenessTable[NUMBER_OF_MON_TYPES][NUMBER_OF_MON_TYPES] =
{
	//   normal  fight   flying  poison  ground  rock    bug     ghost   steel   mystery fire    water   grass  electric psychic ice     dragon  dark    fairy
		{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // normal
		{X(2.0), X(1.0), X(0.5), X(0.5), X(1.0), X(2.0), X(0.5), X(0.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(2.0), X(0.5)}, // fight
		{X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // flying
		{X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(0.5), X(1.0), X(0.5), X(0.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0)}, // poison
		{X(1.0), X(1.0), X(0.0), X(2.0), X(1.0), X(2.0), X(0.5), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // ground
		{X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0)}, // rock
		{X(1.0), X(0.5), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0), X(0.5)}, // bug
		{X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0)}, // ghost
		{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0)}, // steel
		{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // mystery
		{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(0.5), X(2.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0)}, // fire
		{X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // water
		{X(1.0), X(1.0), X(0.5), X(0.5), X(2.0), X(2.0), X(0.5), X(1.0), X(0.5), X(1.0), X(0.5), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // grass
		{X(1.0), X(1.0), X(2.0), X(1.0), X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(0.5), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // electric
		{X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(0.0), X(1.0)}, // psychic
		{X(1.0), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(0.5), X(2.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0)}, // ice
		{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(0.0)}, // dragon
		{X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(0.5)}, // dark
		{X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0)}, // fairy
};

#undef X

(If you're not using DizzyEgg's Battle Engine for whatever reason, just eliminate the last line and the last column of this table to get rid of Fairy and it should work fine.)

Now, search for MoveSelectionDisplayMoveType(void), and add these three methods above it:

Spoiler:

static void MulModifier(u16 *modifier, u16 val)
{
	*modifier = UQ_4_12_TO_INT((*modifier * val) + UQ_4_12_ROUND);
}

u8 TypeEffectiveness(struct ChooseMoveStruct *moveInfo, u8 targetId)
{
	bool8 isInverse = (B_FLAG_INVERSE_BATTLE != 0 && FlagGet(B_FLAG_INVERSE_BATTLE)) ? TRUE : FALSE;
	
	if (gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].power == 0)
		return 10;
	else
	{
		u16 mod = sTypeEffectivenessTable[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type][gBattleMons[targetId].type1];

		if (gBattleMons[targetId].type2 != gBattleMons[targetId].type1)
		{
			u16 mod2 = sTypeEffectivenessTable[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type][gBattleMons[targetId].type2];
			MulModifier(&mod, mod2);
		}

		if (gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].effect == EFFECT_TWO_TYPED_MOVE)
		{
			u16 mod3 = sTypeEffectivenessTable[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].argument][gBattleMons[targetId].type1];
			MulModifier(&mod, mod3);

			if (gBattleMons[targetId].type2 != gBattleMons[targetId].type1)
			{
				u16 mod4 = sTypeEffectivenessTable[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].argument][gBattleMons[targetId].type2];
				MulModifier(&mod, mod4);
			}
		}

		// 10 - normal effectiveness
		// 24 - super effective
		// 25 - not very effective
		// 26 - no effect

		if (mod == UQ_4_12(0.0)) {
			if(isInverse)
				return 24;
			else
				return 26;
		}
		else if (mod <= UQ_4_12(0.5)) {
			if(isInverse)
				return 24;
			else
				return 25;
		}
		else if (mod >= UQ_4_12(2.0)) {
			if(isInverse)
				return 25;
			else
				return 24;
		}
		else
			return 10;
	}
}

static void MoveSelectionDisplayMoveTypeDoubles(u8 targetId)
{
	u8 *txtPtr;
	struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);

	txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType);
	txtPtr[0] = EXT_CTRL_CODE_BEGIN;
	txtPtr++;
	txtPtr[0] = 6;
	txtPtr++;
	txtPtr[0] = 1;
	txtPtr++;

	StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]);
	BattlePutTextOnWindow(gDisplayedStringBattle, TypeEffectiveness(moveInfo, targetId));
}

Obviously, you can remove the whole two-type move check if you're not using DizzyEgg's Battle Engine.

And in MoveSelectionDisplayMoveType, change this line:

BattlePutTextOnWindow(gDisplayedStringBattle, 10);

To this:

BattlePutTextOnWindow(gDisplayedStringBattle, TypeEffectiveness(moveInfo, 1));

Now, we just need to add calls for MoveSelectionDisplayMoveTypeDoubles. Search for HandleInputChooseTarget(void) and find the two places that use this switch statement:

switch (GetBattlerPosition(gMultiUsePlayerCursor))

Immediately after these switch statements, add this line:

MoveSelectionDisplayMoveTypeDoubles(GetBattlerPosition(gMultiUsePlayerCursor));

And you should be good to go!
Thanks to DizzyEgg for his hard work on the Battle Engine upgrade. The type effectiveness table and the MulModifier method made things very easy once I figured out how the palettes worked. I for sure would not have been able to do this without those.

============
Hi, how are you?
I think I found an error. I'm using the RHH expansion and in individual battles the code works perfectly. When I arrive in double battles, the effectiveness is appearing before selecting the attack and the opponent's first pokemon is commanding the effectiveness. For example: In a double battle against a lotad (left) and a geodude (right) all attacks that have no effect are already being accused, ignoring the lotad. When selecting "Peck" it remains red in the geodude but in the lotad it is green (correct operation). The problem is that before selecting the attack in the double balance, the pokemon on the right controls the effectiveness and the colors already appear.

I'm starting now on Decomp, I also couldn't implement a part of the code:
static void MulModifier(u16 *modifier, u16 val)
{
*modifier = UQ_4_12_TO_INT((*modifier * val) + UQ_4_12_ROUND);
}

He complains that it should be non-static. I completely removed that part and the rest worked perfectly, but I don't know if this is affecting the double battle. Thanks in advance for the help.

 

[Lunos]

-----------
Hi, how are you? This feature is incredible, it makes perfect sense for pokemon to evolve in the middle of the battle and continue fighting, but I couldn't implement it. I'm using the rhh pokemon expansion.

Could you tell me if it's compatible? and what changes would be needed to implement this? Thank you very much.

Yes, it is compatible. I implemented it myself for someone else a while back.
https://github.com/rh-hideout/pokee...ster...LOuroboros:pokeemerald:expMidBattleEvo

Hello, I tried to implement this change in rhh pokemon expansion, but without success.
it looks like "CanMonLearnTMHM" is no longer used. The same is happening for the hm usage tutorial without learning them. I don't know what to replace it with. Could you give me a light. Thanks

CanMonLearnTMHM has been replaced by CanLearnTeachableMove when teachable learnsets were implemented.

 

[Pierangeli]

Yes, it is compatible. I implemented it myself for someone else a while back.
https://github.com/rh-hideout/pokee...ster...LOuroboros:pokeemerald:expMidBattleEvo

==========


It worked perfectly, thank you so much Lunos.

===============

CanMonLearnTMHM has been replaced by CanLearnTeachableMove when teachable learnsets were implemented.

================

I have the following error when I substitute for "CanLearnTeachableMove".

"Warning: passing arg 1 of 'CanLearnTeachableMove' makes integer from pointer without a cast"

I'm new to decomp and I'm venturing into my first rom hack. This is the code that gave the error:


if (sPartyMenuInternal->numActions < 5 && CanLearnTeachableMove(&mons[slotId], ITEM_HM02 - ITEM_TM01)) // If Mon can learn HM02 and action list consists of < 4 moves, add FLY to action list
AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, 5 + MENU_FIELD_MOVES);
if (sPartyMenuInternal->numActions < 5 && CanLearnTeachableMove(&mons[slotId], ITEM_HM05 - ITEM_TM01)) // If Mon can learn HM05 and action list consists of < 4 moves, add FLASH to action list
AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, 1 + MENU_FIELD_MOVES);

The same goes for using hm if the pokemon can learn it and the badge is obtained. In this case, replace it with 'GiveMoveToMon' in order to compile. But when doing this in this other role, everyone gains the fly and flash ability, which leads me to believe that everyone also received the other hm (only tested with cut for now).

Is there a correct way to replace it with 'CanLearnTeachableMove'? Thanks in advance for the help!

 

[Lunos]

================

I have the following error when I substitute for "CanLearnTeachableMove".

"Warning: passing arg 1 of 'CanLearnTeachableMove' makes integer from pointer without a cast"

I'm new to decomp and I'm venturing into my first rom hack. This is the code that gave the error:


if (sPartyMenuInternal->numActions < 5 && CanLearnTeachableMove(&mons[slotId], ITEM_HM02 - ITEM_TM01)) // If Mon can learn HM02 and action list consists of < 4 moves, add FLY to action list
AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, 5 + MENU_FIELD_MOVES);
if (sPartyMenuInternal->numActions < 5 && CanLearnTeachableMove(&mons[slotId], ITEM_HM05 - ITEM_TM01)) // If Mon can learn HM05 and action list consists of < 4 moves, add FLASH to action list
AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, 1 + MENU_FIELD_MOVES);

If you check either the definition or the declaration for CanLearnTeachableMove, you'll see that it reads a species ID for its first parameter.
&mons[slotId] corresponds to the ID of a party slot, so it's certainly not a compatible parameter to pass through the function call.
What you can do is to get the species ID of the Pokémon in that slot by calling GetMonData and passing the MON_DATA_SPECIES parameter through it.
Like for example, CanLearnTeachableMove(GetMonData(&mons[slotId], MON_DATA_SPECIES), MOVE_DRAGON_CLAW).

However, your second parameter is also wrong.
The function reads a move ID for the second parameter. Passing ITEM_HM05 - ITEM_TM01 is no different than writing "686 - 582", which in up-to-date copies of the expansion is the ID number of Double Team.

What I suggest you to do is to think carefully about what you want to do, then read some more code in the same file where the function that you're editing is located, and then figure out how to make an effective use of the CanLearnTeachableMove function to suit your needs.

The same goes for using hm if the pokemon can learn it and the badge is obtained. In this case, replace it with 'GiveMoveToMon' in order to compile. But when doing this in this other role, everyone gains the fly and flash ability, which leads me to believe that everyone also received the other hm (only tested with cut for now).

Yeah, I mean, I'm not sure what else were you expecting.
As its label indicates, GiveMoveToMon is a function that gives a move to a Pokémon in the party.

 

[Pierangeli]

If you check either the definition or the declaration for CanLearnTeachableMove, you'll see that it reads a species ID for its first parameter.
&mons[slotId] corresponds to the ID of a party slot, so it's certainly not a compatible parameter to pass through the function call.
What you can do is to get the species ID of the Pokémon in that slot by calling GetMonData and passing the MON_DATA_SPECIES parameter through it.
Like for example, CanLearnTeachableMove(GetMonData(&mons[slotId], MON_DATA_SPECIES), MOVE_DRAGON_CLAW).

However, your second parameter is also wrong.
The function reads a move ID for the second parameter. Passing ITEM_HM05 - ITEM_TM01 is no different than writing "686 - 582", which in up-to-date copies of the expansion is the ID number of Double Team.

What I suggest you to do is to think carefully about what you want to do, then read some more code in the same file where the function that you're editing is located, and then figure out how to make an effective use of the CanLearnTeachableMove function to suit your needs.

Yeah, I mean, I'm not sure what else were you expecting.
As its label indicates, GiveMoveToMon is a function that gives a move to a Pokémon in the party.

=======

Thanks Lunos, it's work perfect.

my question now is the use of hm without the pokemon needing to learn, but still needing the gym badge.

In this tutorial available on the wiki: https://github.com/pret/pokeemerald/wiki/Use-HMs-Without-Any-Pokemon-in-your-Party-Knowing-Them#fly-still-needs-to-be- added-in
I opted to use this version 'Only Pokemon that can Learn HM can Use Field Move so Long as HM is in Bag'. In src/scrcmd.c and src/overworld.c the tutorial uses 'CanMonLearnTMHM' in the functions.
I changed it to 'GiveMoveToMon' just to be able to compile, but all the pokemons are using all the hm. Even following your tips I couldn't change it to 'CanLearnTeachableMove'.
Could you teach me the correct way to make only pokemons compatible with hm can use them without having to learn them?
Thanks for your patience and help. And sorry for my lack of ability xD I'm still in the beginning of decomp and c language.

 

[Pierangeli]

Make Poké Balls usable outside of battles [Em]
So, earlier, someone asked in RHH's Discord if it was possible to modify the caught ball of a certain Pokémon in the party at will.
Naturally, that's perfectly possible because the entire source code of the game is laid right before our very eyes and the code itself already does it.
Then Jaizu brought up a very neat suggestion; to make Poké Balls usable outside of battle to set the caught ball directly like that.
Honestly, that sounded very cool to me so I just went and did it.
And now that it's done, I came here to post it because why not.

I don't think there's a need for explanations. You go to the bag, try to use a Poké Ball and the magic happens. It's all pretty straightforward.


To implement this, you can track my GitHub repository via git remote and pull the branch oobBalls which is where I'm hosting the code:

git remote add lunos https://github.com/LOuroboros/pokeemerald
git pull lunos oobBalls

Or you can implement things manually, which is preferable for people who use the item_expansion:
https://github.com/pret/pokeemerald/compare/master...LOuroboros:oobBalls

And that's pretty much it.​

=====

Hello Lunos, it's me again xD

I tried to manually implement this functionality, but in the "src/data/items.h" file
when setting the '.tipe' to 'ITEM_USE_PARTY_MENU' the pokeballs no longer work to catch wild pokemons.

 

[Lunos]

=====

Hello Lunos, it's me again xD

I tried to manually implement this functionality, but in the "src/data/items.h" file
when setting the '.tipe' to 'ITEM_USE_PARTY_MENU' the pokeballs no longer work to catch wild pokemons.

It still works just fine in clean copies of Pokeemerald.
I tested it on the expansion, and I was able to capture Pokémon just fine, but effectively, there's something I'll have to address and it's that the Poké Balls shouldn't open the party screen inside of battles.
I'll take a look and see what I can do about it. Thanks for mentioning this.
EDIT: Done. I pushed a fix.

Also, I forgot to mention this in my previous post, but this thread is not for help requests.
It's a thread for people to share their feature branches or small modifications so others can apply them to their own projects.
Any questions or help requests go here.

 

[セケツ]

[PokeEmerald] A Personal Fix for the 16x16 doors anim tutorial

Just a personal & unproven discovery which posted here for anyone that needs it. Although I don't know whether it is WRONG or NOT until NOW. So please forgive my ignorance.
So, Several days ago, I accidentally found there was something wrong with the "16x16 door animation tutorial" (which enables PokeEmerald itself to display the 16x16 doors animations from PokeFirered) for the updated PokeEmerald, which was distributed here long time ago.
The Original Tutorial is here for anyone not knowing what I'm talking about:
https://github.com/scizz/darkfire/commit/b666ad85d3e22ac134fd24ce0bfe84f0e1e4a773
Well, I did nothing but just copied the original lines provided by that tutorial. And here is a picture of what had happened: When a single door was open or closed, only 1/4 of its original animation graphic was shown properly. And, moreover, the other part became glitchly pixels, for sure

Spoiler:

I had checked the code over and over again, and made sure there was no mistake in my copy & paste process. And the animation of my newly added door was nothing but a graphic file grabbed directly & straightly from the original PokeFirered.
Luckily, I was happened to be lucky enough to find one possible solution. For anyone interested in it, here it is:
First, after implementing the codes from the tutorial, jump to the function named "CopyDoorTilesToVram", and change the lines below:

From:

Spoiler:

CpuFastSet(gfx->tiles + frame->offset, (void *)(VRAM + 0x7F80), 0x20);

to:

Spoiler:

CpuFastSet(gfx->tiles + frame->offset, (void *)(VRAM + TILE_OFFSET_4BPP(DOOR_TILE_START_SIZE_3), 4 * TILE_SIZE_4BPP);

Then, add one completely new definition before that function itself:

Spoiler:

#define DOOR_TILE_START_SIZE_3 (NUM_TITLES_TOTAL - 4)

Here is a picture of what it looked like after being fixed:

Spoiler:

And that's pretty much of it, I wonder whether anyone here trying port the door animation of FRLG has met the same problem. Also, if there is anything wrong, please forgive my ignorance & leave a message to me.
Thanks.

 

[Anon822]

Run Scripts on Door Entry (Emerald)

This modification allows you to use trigger events with animated doors in addition to warp events.

Modification:

Spoiler:

1. Open src/field_screen_effect.h and add the following functions:

static void Task_DoDoorScript(u8 taskId)
{
    struct Task *task = &gTasks[taskId];
    u8 objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
    s16 *x = &task->data[2];
    s16 *y = &task->data[3];

    switch (task->tState)
    {
    case 0: //open door
        FreezeObjectEvents();
        PlayerGetDestCoords(x, y);
        PlaySE(GetDoorSoundEffect(*x, *y - 1));
        task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
        task->tState++;
        break;
    case 1: //wait for door to open, then walk into door
        if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
        {
            ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]);
            ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP);
            task->tState++;
        }
        break;
    case 2: //wait for movement, then close door
        if (IsPlayerStandingStill())
        {
            task->data[1] = FieldAnimateDoorClose(*x, *y - 1);
            ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]);
            SetPlayerVisibility(FALSE);
            task->tState++;
        }
        break;
    case 3: //wait for door to close, then start script
        if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
        {
            ScriptContext_Enable();
            task->tState++;
        }
	break;
    case 4: //wait for script to complete, then open door
        if(ScriptContext_IsEnabled() == FALSE)
        {
            LockPlayerFieldControls();
            task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
            task->tState++;
        }
	    break;
    case 5: //wait for door to reopen, then exit
        if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
	    {
            task->tState = 0;
	        task->func = Task_ExitDoor;
	    }
        break;
    }
}

void DoDoorScript(void)
{
    LockPlayerFieldControls();
    CreateTask(Task_DoDoorScript, 10);
}

2. Add the following declaration in include/field_screen_effect.h

void DoDoorScript(void);

3. Add this code block here here in src/field_control_avatar.c:

         if (MetatileBehavior_IsWarpDoor(metatileBehavior) == TRUE)
         {
[COLOR="Lime"]            if (TryStartCoordEventScript(position) == TRUE)
            {
                DoDoorScript();
                return TRUE;
            }
[/COLOR]
             warpEventId = GetWarpEventAtMapPosition(&gMapHeader, position);

And that's it.
Here are all the changes in diff format:

Spoiler:

diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 6dc9b077d..fb71af838 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -24,6 +24,7 @@ void DoWarp(void);
 void DoDiveWarp(void);
 void DoWhiteFadeWarp(void);
 void DoDoorWarp(void);
+void DoDoorScript(void);
 void DoFallWarp(void);
 void DoEscalatorWarp(u8 metatileBehavior);
 void DoLavaridgeGymB1FWarp(void);
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 3a0c97e8c..ad95a2d9b 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -845,6 +845,12 @@ static bool8 TryDoorWarp(struct MapPosition *position, u16 metatileBehavior, u8
 
         if (MetatileBehavior_IsWarpDoor(metatileBehavior) == TRUE)
         {
+            if (TryStartCoordEventScript(position) == TRUE)
+            {
+                DoDoorScript();
+                return TRUE;
+            }
+
             warpEventId = GetWarpEventAtMapPosition(&gMapHeader, position);
             if (warpEventId != WARP_ID_NONE && IsWarpMetatileBehavior(metatileBehavior) == TRUE)
             {
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 616444116..50c8e4669 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -44,6 +44,7 @@ static bool32 WaitForWeatherFadeIn(void);
 static void Task_SpinEnterWarp(u8 taskId);
 static void Task_WarpAndLoadMap(u8 taskId);
 static void Task_DoDoorWarp(u8 taskId);
+static void Task_DoDoorScript(u8 taskId);
 static void Task_EnableScriptAfterMusicFade(u8 taskId);
 
 // data[0] is used universally by tasks in this file as a state for switches
@@ -519,6 +520,12 @@ void DoDoorWarp(void)
     CreateTask(Task_DoDoorWarp, 10);
 }
 
+void DoDoorScript(void)
+{
+    LockPlayerFieldControls();
+    CreateTask(Task_DoDoorScript, 10);
+}
+
 void DoFallWarp(void)
 {
     DoDiveWarp();
@@ -727,6 +734,64 @@ static void Task_DoDoorWarp(u8 taskId)
     }
 }
 
+static void Task_DoDoorScript(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    u8 objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
+    s16 *x = &task->data[2];
+    s16 *y = &task->data[3];
+
+    switch (task->tState)
+    {
+    case 0: //open door
+        FreezeObjectEvents();
+        PlayerGetDestCoords(x, y);
+        PlaySE(GetDoorSoundEffect(*x, *y - 1));
+        task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
+        task->tState++;
+        break;
+    case 1: //wait for door to open, then walk into door
+        if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
+        {
+            ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]);
+            ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP);
+            task->tState++;
+        }
+        break;
+    case 2: //wait for movement, then close door
+        if (IsPlayerStandingStill())
+        {
+            task->data[1] = FieldAnimateDoorClose(*x, *y - 1);
+            ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]);
+            SetPlayerVisibility(FALSE);
+            task->tState++;
+        }
+        break;
+    case 3: //wait for door to close, then start script
+        if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
+        {
+            ScriptContext_Enable();
+            task->tState++;
+        }
+        break;
+    case 4: //wait for script to complete, then open door
+        if(ScriptContext_IsEnabled() == FALSE)
+        {
+            LockPlayerFieldControls();
+            task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
+            task->tState++;
+        }
+        break;
+    case 5: //wait for door to reopen, then exit
+        if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
+        {
+            task->tState = 0;
+            task->func = Task_ExitDoor;
+        }
+        break;
+    }
+}
+
 static void Task_DoContestHallWarp(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];

Usage:

Spoiler:

Simply place a trigger event on top of a metatile with the MB_ANIMATED_DOOR metatile behavior.
If the trigger's variable's value matches the trigger's var value field, the player will be able the enter the door. Otherwise the door won't open.

The script execution starts as soon as the door animation starts. You probably want to start your script with a waitstate command to make it start running only after the door has closed.

After the script has ended, the player will exit the door.

Here's the script used in the example gif above:

Example_Script::
waitstate      @ Wait for player to enter the door
msgbox Text_Example MSGBOX_AUTOCLOSE
end

 

[Lunos]

Enable the usage of the SPECIES_UNOWN_(LETTER) constants for party creation [Em]
Earlier today, someone in Pret's Discord server talked about how they wanted to assign specific Unown letter forms to a trainer, and I took a shot at it because I was bored.
I didn't put this on a branch because I did it very quickly and it's simple to do too. It's not worth the hassle.
Like a handful of things in the game, the Unown letters are tied to the Pokémon's Personality ID.
With that in mind and focusing on the chunk of CreateBoxMon that assigns the PID to a Pokémon it's generating, we can easily mod that PID to match whatever Unown form we want based on conditions.
Here's a code diff.

diff --git a/src/pokemon.c b/src/pokemon.c
index 7bc9f3bee3..d6dc7d8565 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2195,6 +2195,24 @@ void CreateMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFix
     CalculateMonStats(mon);
}

+static u32 UpdatePIDForUnownForms(u16 species, u32 ogPersonalityValue)
+{
+    u32 newPersonalityValue;
+    u32 actualLetter;
+    u16 nature, gender;
+
+    do
+    {
+        newPersonalityValue = Random32();
+        actualLetter = GET_UNOWN_LETTER(newPersonalityValue);
+    }
+    while (actualLetter != (species - NUM_SPECIES)
+        && nature != GetNatureFromPersonality(ogPersonalityValue)
+        && gender != GetGenderFromSpeciesAndPersonality(SPECIES_UNOWN, ogPersonalityValue));
+
+    return newPersonalityValue;
+}
+
void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
{
     u8 speciesName[POKEMON_NAME_LENGTH + 1];
@@ -2205,9 +2223,21 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
     ZeroBoxMonData(boxMon);

     if (hasFixedPersonality)
-        personality = fixedPersonality;
+    {
+        if (species >= SPECIES_UNOWN_B && species <= SPECIES_UNOWN_QMARK)
+        {
+            personality = UpdatePIDForUnownForms(species, fixedPersonality);
+            species = SPECIES_UNOWN;
+        }
+        else
+        {
+            personality = fixedPersonality;
+        }
+    }
     else
+    {
         personality = Random32();
+    }

     SetBoxMonData(boxMon, MON_DATA_PERSONALITY, &personality);

With these changes, you can easily drop in a SPECIES_UNOWN_F in Youngster Calvin's party data, or a SPECIES_UNOWN_X in the wild encounters list of Route 101, and they'll work as expected.

Note: This is specifically aimed towards people who don't use the Pokeemerald-expansion, which already separated each Unown letter into their own individual species.
Note2: Functionally speaking, this makes CreateMonWithGenderNatureLetter obsolete.

And that's pretty much it.​

 

[Gengalorian]

[PokeEmerald] (RESOURCE) Expansion of following pokemon

If you are like me and want to implement Merrp's day and night system (or just his follower branch) and also have the rhh pokeemerald-expansion. You will see that Merrp's doesn't include gen 4 and up. Well here you go, in the zip file included are all pokemon (gen 1 - gen 8) in an 8 frame format in the correct palette, the files you have to change and a credit files for all the sprite creators.
In Merrp's original code, the pokemon are only 6 frames. When walking east, frame 5 & 6 get mirrored. While this works for most Pokemon, there are some Pokemon that are not symmetric (for example Absol or Torterra). Therefor, I chose to go with 8 frames. If you don't mind the couple of non-symmetric pokemon being displayed inverted, you don't have to change object_event_anims.h but i'll get to that later. I also added some code for female Pokemon that differ (majorly) from the male version such as Frillish and Unfezant.

The 'code' files included in the zip file are not the full files, so don't overwrite the file in your directory with the ones in the zip. They are additions, so copy paste them below the stuff that is already in your file since you might have already made some additions to those files. the only exception to this is object_event_graphics_info_followers.h. you can overwrite this file with what is in the zip.

change to 8 frame

Spoiler:

If you want to change to an 8 frame format, you'll have to make changes in src\data\object_events\object_event_anims.h. Change sAnim_GoEast2F to

static const union AnimCmd sAnim_GoEast2F[] =
{
    ANIMCMD_FRAME(6, 6),
    ANIMCMD_FRAME(7, 6),
    ANIMCMD_FRAME(7, 6),
    ANIMCMD_FRAME(6, 6),
    ANIMCMD_JUMP(0),
};

and sAnim_GoFastEast2F to

static const union AnimCmd sAnim_GoFastEast2F[] =
{
    ANIMCMD_FRAME(6, 4),
    ANIMCMD_FRAME(7, 4),
    ANIMCMD_FRAME(7, 4),
    ANIMCMD_FRAME(6, 4),
    ANIMCMD_JUMP(0),
};

And that is already it.

Cherrim sunshine and female forms

Spoiler:

So Cherrim blooms in the sun and we have several Pokemon with female forms. In src\event_object_movement.c change static const struct ObjectEventGraphicsInfo * SpeciesToGraphicsInfo(u16 species, u8 form)

static const struct ObjectEventGraphicsInfo * SpeciesToGraphicsInfo(u16 species, u8 form) {
  const struct ObjectEventGraphicsInfo *graphicsInfo;
  switch (species) {
    case SPECIES_UNOWN: // Letters >A are defined as species >= NUM_SPECIES, so are not contiguous with A
      form %= NUM_UNOWN_FORMS;
      graphicsInfo = &gPokemonObjectGraphics[form ? SPECIES_UNOWN_B + form - 1 : species];
      break;
    case SPECIES_CASTFORM: // Sunny, rainy, snowy forms stored separately
      graphicsInfo = &gCastformObjectGraphics[form % NUM_CASTFORM_FORMS];
      break;
	case SPECIES_CHERRIM:
      graphicsInfo = &gCherrimObjectGraphics[form];
      break;
	case SPECIES_UNFEZANT:
      graphicsInfo = &gUnfezantObjectGraphics[form];
      break;
	case SPECIES_PYROAR:
      graphicsInfo = &gPyroarObjectGraphics[form];
      break;
	case SPECIES_JELLICENT:
      graphicsInfo = &gJellicentObjectGraphics[form];
      break;
	case SPECIES_FRILLISH:
      graphicsInfo = &gFrillishObjectGraphics[form];
      break;
	case SPECIES_COMBEE:
      graphicsInfo = &gCombeeObjectGraphics[form];
      break;
    default:
      graphicsInfo = &gPokemonObjectGraphics[species];
      break;
  }
  return graphicsInfo->tileTag == TAG_NONE ? graphicsInfo : &gPokemonObjectGraphics[SPECIES_PORYGON]; // avoid OOB access
}

I added 2 small functions to determine Gender and whether it is sunny, I added them below static u8 GetOverworldCastformForm(void)

static u8 GetOverworldCherrimForm(void) {
    if(GetCurrentWeather() == WEATHER_SUNNY || GetCurrentWeather() == WEATHER_DROUGHT){
		return 1;
    }
    return 0;
}

static u8 GetOverworldGenderForm(struct Pokemon * mon){
	if(GetMonGender(mon) == MON_FEMALE){
		return 1;
	}
	return 0;
}

Lastly, you'll need to change static bool8 GetMonInfo(struct Pokemon * mon, u16 *species, u8 *form, u8 *shiny)

static bool8 GetMonInfo(struct Pokemon * mon, u16 *species, u8 *form, u8 *shiny) {
    if (!mon) {
        *species = SPECIES_NONE;
        *form = 0;
        *shiny = 0;
        return FALSE;
    }
    *species = GetMonData(mon, MON_DATA_SPECIES);
    *shiny = IsMonShiny(mon);
    *form = 0; // default
    switch (*species)
    {
    case SPECIES_UNOWN:
        *form = GET_UNOWN_LETTER(mon->box.personality);
        break;
    case SPECIES_CASTFORM: // form is based on overworld weather
        *form = GetOverworldCastformForm();
        break;
	case SPECIES_CHERRIM:
        *form = GetOverworldCherrimForm();
        break;
	case SPECIES_UNFEZANT:
		*form = GetOverworldGenderForm(mon);
        break;
	case SPECIES_PYROAR:
		*form = GetOverworldGenderForm(mon);
        break;
	case SPECIES_JELLICENT:
		*form = GetOverworldGenderForm(mon);
        break;
	case SPECIES_FRILLISH:
		*form = GetOverworldGenderForm(mon);
        break;
	case SPECIES_COMBEE:
		*form = GetOverworldGenderForm(mon);
        break;
    }
    return TRUE;
}

And there you have it.

Two last things. One, there are 6 sprites (Origin Dialga & Palkia, normal & Therian Enamorus, Alolan Exeggutor and Eternatus) that are 64x64, simply because I couldn't find any 32x32 images of those Pokemon. And second, I don't know if all sprites are positioned correctly, so you might want to move them up/down/right/left a couple pixels.

Hope this helps and you wont have to go through all individual pokemon

Link to Merrp's DNS: https://github.com/aarant/pokeemerald/tree/lighting

 

[Anon822]

Unreal-time Clock (Emerald)

This modification separates the game's time system from the real-time clock.
This gives you full control of time and the speed at which it advances. It also lets your hack function on cartridges/emulators that don't support RTC.

Modification:

Spoiler:

1. Open include/rtc.h and add these function declarations:

void RtcAdvanceTime(u32 hours, u32 minutes, u32 seconds);
void RtcAdvanceTimeTo(u32 hour, u32 minute, u32 second);

2. Replace the contents of src/rtc.c with the following:

#include "global.h"
#include "rtc.h"
#include "string_util.h"
#include "text.h"

// iwram bss
static struct SiiRtcInfo sRtc;

// iwram common
struct Time gLocalTime;

struct Time* GetFakeRtc(void)
{
    return &gSaveBlock2Ptr->fakeRTC;
}

u16 RtcGetDayCount(struct SiiRtcInfo *rtc)
{
    return rtc->day;
}

void RtcInit(void)
{

}

u16 RtcGetErrorStatus(void)
{
    return 0;
}

void RtcGetInfo(struct SiiRtcInfo *rtc)
{
    struct Time* time = GetFakeRtc();
    rtc->second = time->seconds;
    rtc->minute = time->minutes;
    rtc->hour = time->hours;
    rtc->day = time->days;
}

u16 RtcCheckInfo(struct SiiRtcInfo *rtc)
{
    return 0;
}

void RtcReset(void)
{
    memset(GetFakeRtc(), 0, sizeof(struct Time));
}

void RtcCalcTimeDifference(struct SiiRtcInfo *rtc, struct Time *result, struct Time *t)
{
    u16 days = RtcGetDayCount(rtc);
    result->seconds = rtc->second - t->seconds;
    result->minutes = rtc->minute - t->minutes;
    result->hours = rtc->hour - t->hours;
    result->days = days - t->days;

    if (result->seconds < 0)
    {
        result->seconds += SECONDS_PER_MINUTE;
        --result->minutes;
    }

    if (result->minutes < 0)
    {
        result->minutes += MINUTES_PER_HOUR;
        --result->hours;
    }

    if (result->hours < 0)
    {
        result->hours += HOURS_PER_DAY;
        --result->days;
    }
}

void RtcCalcLocalTime(void)
{
    RtcGetInfo(&sRtc);
    RtcCalcTimeDifference(&sRtc, &gLocalTime, &gSaveBlock2Ptr->localTimeOffset);
}

void RtcInitLocalTimeOffset(s32 hour, s32 minute)
{
    RtcCalcLocalTimeOffset(0, hour, minute, 0);
}

void RtcCalcLocalTimeOffset(s32 days, s32 hours, s32 minutes, s32 seconds)
{
    gLocalTime.days = days;
    gLocalTime.hours = hours;
    gLocalTime.minutes = minutes;
    gLocalTime.seconds = seconds;
    RtcGetInfo(&sRtc);
    RtcCalcTimeDifference(&sRtc, &gSaveBlock2Ptr->localTimeOffset, &gLocalTime);
}

void CalcTimeDifference(struct Time *result, struct Time *t1, struct Time *t2)
{
    result->seconds = t2->seconds - t1->seconds;
    result->minutes = t2->minutes - t1->minutes;
    result->hours = t2->hours - t1->hours;
    result->days = t2->days - t1->days;

    if (result->seconds < 0)
    {
        result->seconds += SECONDS_PER_MINUTE;
        --result->minutes;
    }

    if (result->minutes < 0)
    {
        result->minutes += MINUTES_PER_HOUR;
        --result->hours;
    }

    if (result->hours < 0)
    {
        result->hours += HOURS_PER_DAY;
        --result->days;
    }
}

u32 RtcGetMinuteCount(void)
{
    RtcGetInfo(&sRtc);
    return (HOURS_PER_DAY * MINUTES_PER_HOUR) * RtcGetDayCount(&sRtc) + MINUTES_PER_HOUR * sRtc.hour + sRtc.minute;
}

u32 RtcGetLocalDayCount(void)
{
    return RtcGetDayCount(&sRtc);
}

void RtcAdvanceTime(u32 hours, u32 minutes, u32 seconds)
{
    struct Time* time = GetFakeRtc();
    seconds += time->seconds;
    minutes += time->minutes;
    hours += time->hours;

    while(seconds >= SECONDS_PER_MINUTE)
    {
        minutes++;
        seconds -= SECONDS_PER_MINUTE;   
    }

    while(minutes >= MINUTES_PER_HOUR)
    {
        hours++;
        minutes -= MINUTES_PER_HOUR;
    }

    while(hours >= HOURS_PER_DAY)
    {
        time->days++;
        hours -= HOURS_PER_DAY;
    }

    time->seconds = seconds;
    time->minutes = minutes;
    time->hours = hours;
}

void RtcAdvanceTimeTo(u32 hour, u32 minute, u32 second)
{
    struct Time diff, target;
    RtcCalcLocalTime();
   
    target.hours = hour;
    target.minutes = minute;
    target.seconds = second;
    target.days = gLocalTime.days;
   
    CalcTimeDifference(&diff, &gLocalTime, &target);
    RtcAdvanceTime(diff.hours, diff.minutes, diff.seconds);
}

NOTE: I removed a bunch of unused functions from src/rtc.c for brevity. If you have custom code that relies on those, you'll have to add them back in.

3. Add "struct Time fakeRTC" to saveblock2:

diff --git a/include/global.h b/include/global.h
index e6d58f36e..010a37ff0 100644
--- a/include/global.h
+++ b/include/global.h;
@@ -531,6 +531,7 @@ struct SaveBlock2
     /*0x57C*/ struct RankingHall2P hallRecords2P[FRONTIER_LVL_MODE_COUNT][HALL_RECORDS_COUNT]; // From record mixing.
     /*0x624*/ u16 contestLinkResults[CONTEST_CATEGORIES_COUNT][CONTESTANT_COUNT];
     /*0x64C*/ struct BattleFrontier frontier;
+    struct Time fakeRTC;
 }; // sizeof=0xF2C

Now the game will use the fakeRTC variable to tell time instead of using the RTC.

All that's left to do is make the clock tick.
You could for example add a call to RtcAdvanceTime here in src/play_time.c to advance the clock at a normal rate:

diff --git a/src/play_time.c b/src/play_time.c
index 97f4ac22f..b640c0d34 100644
--- a/src/play_time.c
+++ b/src/play_time.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "play_time.h"
+#include "rtc.h"
 
 enum
 {
@@ -45,6 +46,7 @@ void PlayTimeCounter_Update(void)
 
     gSaveBlock2Ptr->playTimeVBlanks = 0;
     gSaveBlock2Ptr->playTimeSeconds++;

+    // Runs once per second
+    RtcAdvanceTime(0, 0, 1); //Advance "rtc" by 0 hours, 0 minutes, 1 seconds
 
     if (gSaveBlock2Ptr->playTimeSeconds < 60)

You could also change the rate at which time advances or call RtcAdvanceTime elsewhere to tie the clock to something else.


In addition to RtcAdvanceTime, there's also RtcAdvanceTimeTo, which sets the time to a specific moment.

RtcAdvanceTimeTo(17, 40, 0); //Set time to 17:40

You could for example use it in a script to make an event always occur at a specific time of day.

Finally, here are all the changes in diff format:

Spoiler:

diff --git a/include/global.h b/include/global.h
index e6d58f36e..010a37ff0 100644
--- a/include/global.h
+++ b/include/global.h
@@ -531,6 +531,7 @@ struct SaveBlock2
     /*0x57C*/ struct RankingHall2P hallRecords2P[FRONTIER_LVL_MODE_COUNT][HALL_RECORDS_COUNT]; // From record mixing.
     /*0x624*/ u16 contestLinkResults[CONTEST_CATEGORIES_COUNT][CONTESTANT_COUNT];
     /*0x64C*/ struct BattleFrontier frontier;
+    struct Time fakeRTC;
 }; // sizeof=0xF2C
 
 extern struct SaveBlock2 *gSaveBlock2Ptr;
diff --git a/include/rtc.h b/include/rtc.h
index 7a3d3d524..0d4310f98 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -46,4 +46,6 @@ void CalcTimeDifference(struct Time *result, struct Time *t1, struct Time *t2);
 u32 RtcGetMinuteCount(void);
 u32 RtcGetLocalDayCount(void);
 
+void RtcAdvanceTime(u32 hours, u32 minutes, u32 seconds);
+void RtcAdvanceTimeTo(u32 hour, u32 minute, u32 second);
 #endif // GUARD_RTC_UTIL_H
diff --git a/src/play_time.c b/src/play_time.c
index 97f4ac22f..1a11dd094 100644
--- a/src/play_time.c
+++ b/src/play_time.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "rtc.h"
 #include "play_time.h"
 
 enum
@@ -46,6 +47,8 @@ void PlayTimeCounter_Update(void)
     gSaveBlock2Ptr->playTimeVBlanks = 0;
     gSaveBlock2Ptr->playTimeSeconds++;
 
+    RtcAdvanceTime(0, 0, 1); //Advance "rtc" by 0 hours, 0 minutes, 1 seconds
+   
     if (gSaveBlock2Ptr->playTimeSeconds < 60)
         return;
 
diff --git a/src/rtc.c b/src/rtc.c
index b79f62a3c..95a1eeeb2 100644
--- a/src/rtc.c
+++ b/src/rtc.c
@@ -4,268 +4,56 @@
 #include "text.h"
 
 // iwram bss
-static u16 sErrorStatus;
 static struct SiiRtcInfo sRtc;
-static u8 sProbeResult;
-static u16 sSavedIme;
 
 // iwram common
 struct Time gLocalTime;
 
-// const rom
-
-static const struct SiiRtcInfo sRtcDummy = {0, MONTH_JAN, 1}; // 2000 Jan 1
-
-static const s32 sNumDaysInMonths[MONTH_COUNT] =
-{
-    [MONTH_JAN - 1] = 31,
-    [MONTH_FEB - 1] = 28,
-    [MONTH_MAR - 1] = 31,
-    [MONTH_APR - 1] = 30,
-    [MONTH_MAY - 1] = 31,
-    [MONTH_JUN - 1] = 30,
-    [MONTH_JUL - 1] = 31,
-    [MONTH_AUG - 1] = 31,
-    [MONTH_SEP - 1] = 30,
-    [MONTH_OCT - 1] = 31,
-    [MONTH_NOV - 1] = 30,
-    [MONTH_DEC - 1] = 31,
-};
-
-void RtcDisableInterrupts(void)
-{
-    sSavedIme = REG_IME;
-    REG_IME = 0;
-}
-
-void RtcRestoreInterrupts(void)
-{
-    REG_IME = sSavedIme;
-}
-
-u32 ConvertBcdToBinary(u8 bcd)
+struct Time* GetFakeRtc(void)
 {
-    if (bcd > 0x9F)
-        return 0xFF;
-
-    if ((bcd & 0xF) <= 9)
-        return (10 * ((bcd >> 4) & 0xF)) + (bcd & 0xF);
-    else
-        return 0xFF;
-}
-
-bool8 IsLeapYear(u32 year)
-{
-    if ((year % 4 == 0 && year % 100 != 0) || (year % 400 == 0))
-        return TRUE;
-
-    return FALSE;
-}
-
-u16 ConvertDateToDayCount(u8 year, u8 month, u8 day)
-{
-    s32 i;
-    u16 dayCount = 0;
-
-    for (i = year - 1; i >= 0; i--)
-    {
-        dayCount += 365;
-
-        if (IsLeapYear(i) == TRUE)
-            dayCount++;
-    }
-
-    for (i = 0; i < month - 1; i++)
-        dayCount += sNumDaysInMonths[i];
-
-    if (month > MONTH_FEB && IsLeapYear(year) == TRUE)
-        dayCount++;
-
-    dayCount += day;
-
-    return dayCount;
+    return &gSaveBlock2Ptr->fakeRTC;
 }
 
 u16 RtcGetDayCount(struct SiiRtcInfo *rtc)
 {
-    u8 year = ConvertBcdToBinary(rtc->year);
-    u8 month = ConvertBcdToBinary(rtc->month);
-    u8 day = ConvertBcdToBinary(rtc->day);
-    return ConvertDateToDayCount(year, month, day);
+    return rtc->day;
 }
 
 void RtcInit(void)
 {
-    sErrorStatus = 0;
-
-    RtcDisableInterrupts();
-    SiiRtcUnprotect();
-    sProbeResult = SiiRtcProbe();
-    RtcRestoreInterrupts();
-
-    if ((sProbeResult & 0xF) != 1)
-    {
-        sErrorStatus = RTC_INIT_ERROR;
-        return;
-    }
-
-    if (sProbeResult & 0xF0)
-        sErrorStatus = RTC_INIT_WARNING;
-    else
-        sErrorStatus = 0;
 
-    RtcGetRawInfo(&sRtc);
-    sErrorStatus = RtcCheckInfo(&sRtc);
 }
 
 u16 RtcGetErrorStatus(void)
 {
-    return sErrorStatus;
+    return 0;
 }
 
 void RtcGetInfo(struct SiiRtcInfo *rtc)
 {
-    if (sErrorStatus & RTC_ERR_FLAG_MASK)
-        *rtc = sRtcDummy;
-    else
-        RtcGetRawInfo(rtc);
-}
-
-void RtcGetDateTime(struct SiiRtcInfo *rtc)
-{
-    RtcDisableInterrupts();
-    SiiRtcGetDateTime(rtc);
-    RtcRestoreInterrupts();
-}
-
-void RtcGetStatus(struct SiiRtcInfo *rtc)
-{
-    RtcDisableInterrupts();
-    SiiRtcGetStatus(rtc);
-    RtcRestoreInterrupts();
-}
-
-void RtcGetRawInfo(struct SiiRtcInfo *rtc)
-{
-    RtcGetStatus(rtc);
-    RtcGetDateTime(rtc);
+    struct Time* time = GetFakeRtc();
+    rtc->second = time->seconds;
+    rtc->minute = time->minutes;
+    rtc->hour = time->hours;
+    rtc->day = time->days;
 }
 
 u16 RtcCheckInfo(struct SiiRtcInfo *rtc)
 {
-    u16 errorFlags = 0;
-    s32 year;
-    s32 month;
-    s32 value;
-
-    if (rtc->status & SIIRTCINFO_POWER)
-        errorFlags |= RTC_ERR_POWER_FAILURE;
-
-    if (!(rtc->status & SIIRTCINFO_24HOUR))
-        errorFlags |= RTC_ERR_12HOUR_CLOCK;
-
-    year = ConvertBcdToBinary(rtc->year);
-
-    if (year == 0xFF)
-        errorFlags |= RTC_ERR_INVALID_YEAR;
-
-    month = ConvertBcdToBinary(rtc->month);
-
-    if (month == 0xFF || month == 0 || month > MONTH_COUNT)
-        errorFlags |= RTC_ERR_INVALID_MONTH;
-
-    value = ConvertBcdToBinary(rtc->day);
-
-    if (value == 0xFF)
-        errorFlags |= RTC_ERR_INVALID_DAY;
-
-    if (month == MONTH_FEB)
-    {
-        if (value > IsLeapYear(year) + sNumDaysInMonths[month - 1])
-            errorFlags |= RTC_ERR_INVALID_DAY;
-    }
-    else
-    {
-        if (value > sNumDaysInMonths[month - 1])
-            errorFlags |= RTC_ERR_INVALID_DAY;
-    }
-
-    value = ConvertBcdToBinary(rtc->hour);
-
-    if (value > HOURS_PER_DAY)
-        errorFlags |= RTC_ERR_INVALID_HOUR;
-
-    value = ConvertBcdToBinary(rtc->minute);
-
-    if (value > MINUTES_PER_HOUR)
-        errorFlags |= RTC_ERR_INVALID_MINUTE;
-
-    value = ConvertBcdToBinary(rtc->second);
-
-    if (value > SECONDS_PER_MINUTE)
-        errorFlags |= RTC_ERR_INVALID_SECOND;
-
-    return errorFlags;
+    return 0;
 }
 
 void RtcReset(void)
 {
-    RtcDisableInterrupts();
-    SiiRtcReset();
-    RtcRestoreInterrupts();
-}
-
-void FormatDecimalTime(u8 *dest, s32 hour, s32 minute, s32 second)
-{
-    dest = ConvertIntToDecimalStringN(dest, hour, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest++ = CHAR_COLON;
-    dest = ConvertIntToDecimalStringN(dest, minute, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest++ = CHAR_COLON;
-    dest = ConvertIntToDecimalStringN(dest, second, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest = EOS;
-}
-
-void FormatHexTime(u8 *dest, s32 hour, s32 minute, s32 second)
-{
-    dest = ConvertIntToHexStringN(dest, hour, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest++ = CHAR_COLON;
-    dest = ConvertIntToHexStringN(dest, minute, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest++ = CHAR_COLON;
-    dest = ConvertIntToHexStringN(dest, second, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest = EOS;
-}
-
-void FormatHexRtcTime(u8 *dest)
-{
-    FormatHexTime(dest, sRtc.hour, sRtc.minute, sRtc.second);
-}
-
-void FormatDecimalDate(u8 *dest, s32 year, s32 month, s32 day)
-{
-    dest = ConvertIntToDecimalStringN(dest, year, STR_CONV_MODE_LEADING_ZEROS, 4);
-    *dest++ = CHAR_HYPHEN;
-    dest = ConvertIntToDecimalStringN(dest, month, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest++ = CHAR_HYPHEN;
-    dest = ConvertIntToDecimalStringN(dest, day, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest = EOS;
-}
-
-void FormatHexDate(u8 *dest, s32 year, s32 month, s32 day)
-{
-    dest = ConvertIntToHexStringN(dest, year, STR_CONV_MODE_LEADING_ZEROS, 4);
-    *dest++ = CHAR_HYPHEN;
-    dest = ConvertIntToHexStringN(dest, month, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest++ = CHAR_HYPHEN;
-    dest = ConvertIntToHexStringN(dest, day, STR_CONV_MODE_LEADING_ZEROS, 2);
-    *dest = EOS;
+    memset(GetFakeRtc(), 0, sizeof(struct Time));
 }
 
 void RtcCalcTimeDifference(struct SiiRtcInfo *rtc, struct Time *result, struct Time *t)
 {
     u16 days = RtcGetDayCount(rtc);
-    result->seconds = ConvertBcdToBinary(rtc->second) - t->seconds;
-    result->minutes = ConvertBcdToBinary(rtc->minute) - t->minutes;
-    result->hours = ConvertBcdToBinary(rtc->hour) - t->hours;
+    result->seconds = rtc->second - t->seconds;
+    result->minutes = rtc->minute - t->minutes;
+    result->hours = rtc->hour - t->hours;
     result->days = days - t->days;
 
     if (result->seconds < 0)
@@ -344,3 +132,47 @@ u32 RtcGetLocalDayCount(void)
 {
     return RtcGetDayCount(&sRtc);
 }
+
+void RtcAdvanceTime(u32 hours, u32 minutes, u32 seconds)
+{
+    struct Time* time = GetFakeRtc();
+    seconds += time->seconds;
+    minutes += time->minutes;
+    hours += time->hours;
+
+    while(seconds >= SECONDS_PER_MINUTE)
+    {
+        minutes++;
+        seconds -= SECONDS_PER_MINUTE;   
+    }
+
+    while(minutes >= MINUTES_PER_HOUR)
+    {
+        hours++;
+        minutes -= MINUTES_PER_HOUR;
+    }
+
+    while(hours >= HOURS_PER_DAY)
+    {
+        time->days++;
+        hours -= HOURS_PER_DAY;
+    }
+
+    time->seconds = seconds;
+    time->minutes = minutes;
+    time->hours = hours;
+}
+
+void RtcAdvanceTimeTo(u32 hour, u32 minute, u32 second)
+{
+    struct Time diff, target;
+    RtcCalcLocalTime();
+   
+    target.hours = hour;
+    target.minutes = minute;
+    target.seconds = second;
+    target.days = gLocalTime.days;
+   
+    CalcTimeDifference(&diff, &gLocalTime, &target);
+    RtcAdvanceTime(diff.hours, diff.minutes, diff.seconds);
+}

 

[alemazzini]

Mid-battle Evolutions (Emerald)​

Hi everyone, this is my first contribution to this thread, I've had a lot of fun doing this and I hope to add some more!

Features:

• allows your Pokémon to evolve (if it can) in the middle of a battle when it has levelled up in battle and is currently out. If they learn any moves, they will be ready to be used in battle as well.
• works with single battles, both left and right Pokémon in double battles and in multi battles (i.e. your partner's Pokémon). Your partner's Pokémon should not evolve in normal gameplay since the player can't normally get Steven's (the only trainer with whom you can gain experience) Pokémon (Metang is the only one who could theoretically evolve) to evolve anyway in the Multi Battle against Team Magma.
• If you don't want either of your left or right Pokémon to evolve, the game will stop trying to evolve them in-battle if they gain any more levels.

Preview:

Spoiler:

Source
To pull the branch:

git remote add cfp https://github.com/CtrlFootPrint/pokeemerald
git pull cfp MidBattleEvo

Alternatively, here are the changes made: https://github.com/pret/pokeemerald/compare/master...CtrlFootPrint:MidBattleEvo

I have tested these changes in a variety of different scenarios and with different teams and it seems to be working fine. If you do spot any flaws or bugs or have any questions or queries, please let me know! Any other feedback or comment is much appreciated!

I love this addition so much! I have a request, if it doesn't bother you too much, I tried to implement it for the expansion and i couldn't make it to work; talking with Lunos in pret, he helped me and told that the function needs to call a specific battlerId, but as of now battlerId is always MAX_BATTLERS_COUNT... Would you consider rework it for the expansion?

 

[Tubakid85]

Emerald Style Gender Select Intro, in FireRed

In pokemon emerald, if you chose the no option on the name confirmation menu in the intro,
it will set you back to where you select your player gender.

In firered that doesn't exist, instead, you only go back to the naming screen.

And if you typically fast forward through the intro like I do, there are times, where you accidentally skip
through the gender select screen without realizing it.

With a small change to the section of code shown below from the oak_speech.c file, that'll never be a problem again.

Spoiler:

static void Task_OakSpeech27(u8 taskId)
{
    s8 input = Menu_ProcessInputNoWrapClearOnChoose();
    switch (input)
    {
    case 0:
        PlaySE(SE_SELECT);
        gTasks[taskId].data[3] = 40;
        if (sOakSpeechResources->unk_0010 == 0)
        {
            ClearDialogWindowAndFrame(0, 1);
            CreateFadeInTask(taskId, 2);        //choose default
            gTasks[taskId].func = Task_OakSpeech30; // finalize rival name
        }
        else //otherwise chose rival name
        {
            StringExpandPlaceholders(gStringVar4, gOakText_RememberRivalName);
            OaksSpeechPrintMessage(gStringVar4, sOakSpeechResources->textSpeed);
            gTasks[taskId].func = Task_OakSpeech31;
        }
        break;
    case 1:
    case -1:
        PlaySE(SE_SELECT);
        if (sOakSpeechResources->unk_0010 == 0)
            //gTasks[taskId].func = Task_OakSpeech24; //ok think this is what I need to replace
            gTasks[taskId].func = Task_OakSpeech16; //worked perfectly
        else
            gTasks[taskId].func = Task_OakSpeech28;
        break;
    }
}

All that's needed is replacing Task_OakSpeech24 with OakSpeech16,
and it'll smoothly transition back to the gender select screen.


View attachment 97571

Just commenting to point that Task_OakSpeech16, has been updated to Task_OakSpeech_TellMeALittleAboutYourself, Task_OakSpeech27 = Task_OakSpeech_HandleConfirmNameInput, and Task_OakSpeech24 = Task_OakSpeech_FadeOutForPlayerNamingScreen

 

[jotana240]

Thought I'd share my modification of this too, as another option. I've tweaked AkimotoBubble's method a bit so that instead of pressing a different button for each set of stats, you can press A repeatedly to cycle through all of them:

Changes required are viewable in a commit here: link.

Hello, how are you? I'm already compiling to test your code, a question: how do I make it look something like this?