diff options
| author | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-03-10 16:22:08 -0500 |
|---|---|---|
| committer | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-03-10 16:22:08 -0500 |
| commit | 0589bd582764cb84bc759943b727973dd9166bbd (patch) | |
| tree | 77e73de8056e1f9804f76cb0e0229b363fb42fa7 | |
| parent | 42b93f8359b07bc99516f5cf6cf1f42ec65ba029 (diff) | |
Fix Typos / Use Box Constants
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.
| -rw-r--r-- | data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc | 8 | ||||
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | src/pokemon.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 04242aeab..54d791f77 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -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 diff --git a/include/global.h b/include/global.h index 1942b23c3..dbe913595 100644 --- a/include/global.h +++ b/include/global.h @@ -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. diff --git a/src/pokemon.c b/src/pokemon.c index f58aee9b3..b523c4cb9 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -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; |