dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Typos / Use Box Constants

Browse Source 
The Celadon City scripts that give Eevee misspelled it as Eeevee. Fixed.

The comment explaining `boxRSEggsUnlocked` in the `ExternalEventFlags` struct had an incorrect deposit requirement listed and was fixed.

Also, replaced the literals with the `TOTAL_BOXES_COUNT` and `IN_BOX_COUNT` constants in `pokemon.c`'s `IsPokemonStorageFull` function. Thanks hjk321 for pointing that out.
This commit is contained in:
Deokishisu
2021-03-10 16:22:08 -05:00
parent 42b93f8359
commit 0589bd5827
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+4 -4
View File
@@ -13,15 +13,15 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D
setvar VAR_TEMP_1, SPECIES_EEVEE
givemon SPECIES_EEVEE, 25, ITEM_NONE
compare VAR_RESULT, 0
goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty
goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty
compare VAR_RESULT, 1
goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC
goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC
compare VAR_RESULT, 2
goto_if_eq EventScript_NoMoreRoomForPokemon
release
end
CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6
CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty:: @ 816C4A6
removeobject LOCALID_EEVEE_POKEBALL
playfanfare MUS_LEVEL_UP
message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
@@ -36,7 +36,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6
goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
end
CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA
CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC:: @ 816C4DA
removeobject LOCALID_EEVEE_POKEBALL
playfanfare MUS_LEVEL_UP
message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
include/global.h
+1 -1
View File
@@ -736,7 +736,7 @@ struct ExternalEventData
struct ExternalEventFlags
{
u8 usedBoxRS:1; // Set by Pokémon Box: Ruby & Sapphire; denotes whether this save has connected to it and triggered the free False Swipe Swablu Egg giveaway.
u8 boxRSEggsUnlocked:2; // Set by Pokémon Box: Ruby & Sapphire; denotes the number of Eggs unlocked from deposits; 1 for ExtremeSpeed Zigzagoon (at 100 deposited), 2 for Pay Day Skitty (at 500 deposited), 3 for Surf Pichu (at 1500 deposited)
u8 boxRSEggsUnlocked:2; // Set by Pokémon Box: Ruby & Sapphire; denotes the number of Eggs unlocked from deposits; 1 for ExtremeSpeed Zigzagoon (at 100 deposited), 2 for Pay Day Skitty (at 500 deposited), 3 for Surf Pichu (at 1499 deposited)
u8 padding:5;
u8 unknownFlag1;
u8 receivedGCNJirachi; // Both the US Colosseum Bonus Disc and PAL/AUS Pokémon Channel use this field. One cannot receive a WISHMKR Jirachi and CHANNEL Jirachi with the same savefile.
src/pokemon.c
+2 -2
View File
@@ -3799,8 +3799,8 @@ static bool8 IsPokemonStorageFull(void)
{
s32 i, j;
for (i = 0; i < 14; i++)
for (j = 0; j < 30; j++)
for (i = 0; i < TOTAL_BOXES_COUNT; i++)
for (j = 0; j < IN_BOX_COUNT; j++)
if (GetBoxMonDataAt(i, j, MON_DATA_SPECIES) == SPECIES_NONE)
return FALSE;