From 70224f0ea390aa7c97718029c24d367507fdd50f Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Tue, 3 Dec 2024 17:15:29 +0100 Subject: [PATCH 1/4] Fixes items preventing other switch in effects (#5732) Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com> --- data/battle_scripts_1.s | 6 +- include/battle_scripts.h | 1 + include/battle_util.h | 28 +- src/battle_main.c | 2 +- src/battle_script_commands.c | 8 +- src/battle_util.c | 317 +++++++++++------------ test/battle/hold_effect/booster_energy.c | 25 ++ test/battle/hold_effect/cure_status.c | 27 ++ 8 files changed, 230 insertions(+), 184 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3d24cbfdf0..b38dc4b7f8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -10079,6 +10079,10 @@ BattleScript_BerserkGeneRet_End: end3 BattleScript_BoosterEnergyEnd2:: + call BattleScript_BoosterEnergyRet + end2 + +BattleScript_BoosterEnergyRet:: playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, sB_ANIM_ARG1 call BattleScript_AbilityPopUpScripting printstring STRINGID_BOOSTERENERGYACTIVATES @@ -10086,7 +10090,7 @@ BattleScript_BoosterEnergyEnd2:: printstring STRINGID_STATWASHEIGHTENED waitmessage B_WAIT_TIME_MED removeitem BS_SCRIPTING - end2 + return BattleScript_EffectSnow:: attackcanceler diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 1148c955e5..3c58b28e1e 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -518,6 +518,7 @@ extern const u8 BattleScript_AromaVeilProtectsRet[]; extern const u8 BattleScript_LowerAtkSpAtk[]; extern const u8 BattleScript_Terastallization[]; extern const u8 BattleScript_BoosterEnergyEnd2[]; +extern const u8 BattleScript_BoosterEnergyRet[]; extern const u8 BattleScript_TeraShellDistortingTypeMatchups[]; extern const u8 BattleScript_TeraFormChange[]; diff --git a/include/battle_util.h b/include/battle_util.h index e3fc7d869f..82f4ed2ce1 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -65,16 +65,20 @@ enum { #define ABILITYEFFECT_WATER_SPORT 253 // Only used if B_SPORT_TURNS >= GEN_6 // For the first argument of ItemBattleEffects, to deteremine which block of item effects to try -#define ITEMEFFECT_ON_SWITCH_IN 0 -#define ITEMEFFECT_NORMAL 1 -#define ITEMEFFECT_DUMMY 2 // Unused, empty -#define ITEMEFFECT_MOVE_END 3 -#define ITEMEFFECT_KINGSROCK 4 -#define ITEMEFFECT_TARGET 5 -#define ITEMEFFECT_ORBS 6 -#define ITEMEFFECT_LIFEORB_SHELLBELL 7 -#define ITEMEFFECT_USE_LAST_ITEM 8 // move end effects for just the battler, not whole field -#define ITEMEFFECT_STATS_CHANGED 9 // For White Herb and Eject Pack +enum ItemEffect +{ + ITEMEFFECT_NONE, + ITEMEFFECT_ON_SWITCH_IN, + ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN, + ITEMEFFECT_NORMAL, + ITEMEFFECT_MOVE_END, + ITEMEFFECT_KINGSROCK, + ITEMEFFECT_TARGET, + ITEMEFFECT_ORBS, + ITEMEFFECT_LIFEORB_SHELLBELL, + ITEMEFFECT_USE_LAST_ITEM, // move end effects for just the battler, not whole field + ITEMEFFECT_STATS_CHANGED, // For White Herb and Eject Pack +}; #define WEATHER_HAS_EFFECT ((!IsAbilityOnField(ABILITY_CLOUD_NINE) && !IsAbilityOnField(ABILITY_AIR_LOCK))) @@ -208,7 +212,7 @@ bool32 IsBattlerProtected(u32 battlerAtk, u32 battlerDef, u32 move); bool32 CanBattlerEscape(u32 battler); // no ability check void BattleScriptExecute(const u8 *BS_ptr); void BattleScriptPushCursorAndCallback(const u8 *BS_ptr); -u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn); +u32 ItemBattleEffects(enum ItemEffect, u32 battler, bool32 moveTurn); void ClearVariousBattlerFlags(u32 battler); void HandleAction_RunBattleScript(void); u32 SetRandomTarget(u32 battler); @@ -265,7 +269,7 @@ void TryRestoreHeldItems(void); bool32 CanStealItem(u32 battlerStealing, u32 battlerItem, u16 item); void TrySaveExchangedItem(u32 battler, u16 stolenItem); bool32 IsPartnerMonFromSameTrainer(u32 battler); -u8 TryHandleSeed(u32 battler, u32 terrainFlag, u8 statId, u16 itemId, bool32 execute); +u32 TryHandleSeed(u32 battler, u32 terrainFlag, u32 statId, u32 itemId, enum ItemEffect caseID); bool32 IsBattlerAffectedByHazards(u32 battler, bool32 toxicSpikes); void SortBattlersBySpeed(u8 *battlers, bool32 slowToFast); bool32 CompareStat(u32 battler, u8 statId, u8 cmpTo, u8 cmpKind); diff --git a/src/battle_main.c b/src/battle_main.c index ecad0d4e82..075dd3dd3c 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3900,7 +3900,7 @@ static void TryDoEventsBeforeFirstTurn(void) case FIRST_TURN_EVENTS_ITEM_EFFECTS: while (gBattleStruct->switchInBattlerCounter < gBattlersCount) // From fastest to slowest { - if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBattlerByTurnOrder[gBattleStruct->switchInBattlerCounter++], FALSE)) + if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN, gBattlerByTurnOrder[gBattleStruct->switchInBattlerCounter++], FALSE)) return; } gBattleStruct->switchInBattlerCounter = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 29c1c02edc..12a2e215bf 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10410,16 +10410,16 @@ static void Cmd_various(void) switch (GetBattlerHoldEffectParam(battler)) { case HOLD_EFFECT_PARAM_ELECTRIC_TERRAIN: - effect = TryHandleSeed(battler, STATUS_FIELD_ELECTRIC_TERRAIN, STAT_DEF, item, FALSE); + effect = TryHandleSeed(battler, STATUS_FIELD_ELECTRIC_TERRAIN, STAT_DEF, item, ITEMEFFECT_NONE); break; case HOLD_EFFECT_PARAM_GRASSY_TERRAIN: - effect = TryHandleSeed(battler, STATUS_FIELD_GRASSY_TERRAIN, STAT_DEF, item, FALSE); + effect = TryHandleSeed(battler, STATUS_FIELD_GRASSY_TERRAIN, STAT_DEF, item, ITEMEFFECT_NONE); break; case HOLD_EFFECT_PARAM_MISTY_TERRAIN: - effect = TryHandleSeed(battler, STATUS_FIELD_MISTY_TERRAIN, STAT_SPDEF, item, FALSE); + effect = TryHandleSeed(battler, STATUS_FIELD_MISTY_TERRAIN, STAT_SPDEF, item, ITEMEFFECT_NONE); break; case HOLD_EFFECT_PARAM_PSYCHIC_TERRAIN: - effect = TryHandleSeed(battler, STATUS_FIELD_PSYCHIC_TERRAIN, STAT_SPDEF, item, FALSE); + effect = TryHandleSeed(battler, STATUS_FIELD_PSYCHIC_TERRAIN, STAT_SPDEF, item, ITEMEFFECT_NONE); break; } diff --git a/src/battle_util.c b/src/battle_util.c index 5238bbfc53..b376a20920 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6799,7 +6799,7 @@ bool32 HasEnoughHpToEatBerry(u32 battler, u32 hpFraction, u32 itemId) return FALSE; } -static u8 HealConfuseBerry(u32 battler, u32 itemId, u32 flavorId, bool32 end2) +static u32 HealConfuseBerry(u32 battler, u32 itemId, u32 flavorId, enum ItemEffect caseID) { if (HasEnoughHpToEatBerry(battler, (B_CONFUSE_BERRIES_HEAL >= GEN_7 ? 4 : 2), itemId) && (B_HEAL_BLOCKING < GEN_5 || !(gStatuses3[battler] & STATUS3_HEAL_BLOCK))) @@ -6817,7 +6817,7 @@ static u8 HealConfuseBerry(u32 battler, u32 itemId, u32 flavorId, bool32 end2) gBattlerAbility = battler; } gBattleScripting.battler = battler; - if (end2) + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) { if (GetFlavorRelationByPersonality(gBattleMons[battler].personality, flavorId) < 0) BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); @@ -6838,7 +6838,7 @@ static u8 HealConfuseBerry(u32 battler, u32 itemId, u32 flavorId, bool32 end2) return 0; } -static u8 StatRaiseBerry(u32 battler, u32 itemId, u32 statId, bool32 end2) +static u32 StatRaiseBerry(u32 battler, u32 itemId, u32 statId, enum ItemEffect caseID) { if (CompareStat(battler, statId, MAX_STAT_STAGE, CMP_LESS_THAN) && HasEnoughHpToEatBerry(battler, GetBattlerItemHoldEffectParam(battler, itemId), itemId)) { @@ -6852,7 +6852,7 @@ static u8 StatRaiseBerry(u32 battler, u32 itemId, u32 statId, bool32 end2) gBattleScripting.animArg1 = STAT_ANIM_PLUS1 + statId; gBattleScripting.animArg2 = 0; - if (end2) + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) { BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); } @@ -6863,10 +6863,10 @@ static u8 StatRaiseBerry(u32 battler, u32 itemId, u32 statId, bool32 end2) } return ITEM_STATS_CHANGE; } - return 0; + return ITEM_NO_EFFECT; } -static u8 RandomStatRaiseBerry(u32 battler, u32 itemId, bool32 end2) +static u32 RandomStatRaiseBerry(u32 battler, u32 itemId, enum ItemEffect caseID) { s32 i; u16 stringId; @@ -6902,7 +6902,7 @@ static u8 RandomStatRaiseBerry(u32 battler, u32 itemId, bool32 end2) gBattleScripting.animArg1 = STAT_ANIM_PLUS2 + i + 1; gBattleScripting.animArg2 = 0; - if (end2) + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) { BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); } @@ -6917,12 +6917,12 @@ static u8 RandomStatRaiseBerry(u32 battler, u32 itemId, bool32 end2) return 0; } -static u8 TrySetMicleBerry(u32 battler, u32 itemId, bool32 end2) +static u32 TrySetMicleBerry(u32 battler, u32 itemId, enum ItemEffect caseID) { if (HasEnoughHpToEatBerry(battler, 4, itemId)) { gBattleStruct->usedMicleBerry |= 1u << battler; - if (end2) + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) { BattleScriptExecute(BattleScript_MicleBerryActivateEnd2); } @@ -6985,7 +6985,7 @@ static u8 DamagedStatBoostBerryEffect(u32 battler, u8 statId, u8 category) return 0; } -u8 TryHandleSeed(u32 battler, u32 terrainFlag, u8 statId, u16 itemId, bool32 execute) +u32 TryHandleSeed(u32 battler, u32 terrainFlag, u32 statId, u32 itemId, enum ItemEffect caseID) { if (gFieldStatuses & terrainFlag && CompareStat(battler, statId, MAX_STAT_STAGE, CMP_LESS_THAN)) { @@ -6995,7 +6995,7 @@ u8 TryHandleSeed(u32 battler, u32 terrainFlag, u8 statId, u16 itemId, bool32 exe SET_STATCHANGER(statId, 1, FALSE); gBattleScripting.animArg1 = STAT_ANIM_PLUS1 + statId; gBattleScripting.animArg2 = 0; - if (execute) + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) { BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); } @@ -7009,7 +7009,7 @@ u8 TryHandleSeed(u32 battler, u32 terrainFlag, u8 statId, u16 itemId, bool32 exe return 0; } -static u32 ItemRestorePp(u32 battler, u32 itemId, bool32 execute) +static u32 ItemRestorePp(u32 battler, u32 itemId, enum ItemEffect caseID) { struct Pokemon *party = GetBattlerParty(battler); struct Pokemon *mon = &party[gBattlerPartyIndexes[battler]]; @@ -7037,7 +7037,7 @@ static u32 ItemRestorePp(u32 battler, u32 itemId, bool32 execute) PREPARE_MOVE_BUFFER(gBattleTextBuff1, move); - if (execute) + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) { BattleScriptExecute(BattleScript_BerryPPHealEnd2); } @@ -7056,7 +7056,7 @@ static u32 ItemRestorePp(u32 battler, u32 itemId, bool32 execute) return 0; } -static u8 ItemHealHp(u32 battler, u32 itemId, bool32 end2, bool32 percentHeal) +static u32 ItemHealHp(u32 battler, u32 itemId, enum ItemEffect caseID, bool32 percentHeal) { if (!(gBattleScripting.overrideBerryRequirements && gBattleMons[battler].hp == gBattleMons[battler].maxHP) && (B_HEAL_BLOCKING < GEN_5 || !(gStatuses3[battler] & STATUS3_HEAL_BLOCK)) @@ -7072,7 +7072,7 @@ static u8 ItemHealHp(u32 battler, u32 itemId, bool32 end2, bool32 percentHeal) gBattleMoveDamage *= 2; gBattlerAbility = battler; // in SWSH, berry juice shows ability pop up but has no effect. This is mimicked here - if (end2) + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) { BattleScriptExecute(BattleScript_ItemHealHP_RemoveItemEnd2); } @@ -7153,9 +7153,9 @@ static bool32 GetMentalHerbEffect(u32 battler) return ret; } -static u8 TryConsumeMirrorHerb(u32 battler, bool32 execute) +static u32 TryConsumeMirrorHerb(u32 battler, enum ItemEffect caseID) { - u8 effect = 0; + u32 effect = 0; if (gProtectStructs[battler].eatMirrorHerb) { @@ -7164,7 +7164,7 @@ static u8 TryConsumeMirrorHerb(u32 battler, bool32 execute) gBattleScripting.battler = battler; gProtectStructs[battler].eatMirrorHerb = 0; ChooseStatBoostAnimation(battler); - if (execute) + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) { BattleScriptExecute(BattleScript_MirrorHerbCopyStatChangeEnd2); } @@ -7178,7 +7178,7 @@ static u8 TryConsumeMirrorHerb(u32 battler, bool32 execute) return effect; } -static inline u32 TryBoosterEnergy(u32 battler) +static inline u32 TryBoosterEnergy(u32 battler, enum ItemEffect caseID) { if (gBattleStruct->boosterEnergyActivates & (1u << battler) || gBattleMons[battler].status2 & STATUS2_TRANSFORMED) return ITEM_NO_EFFECT; @@ -7189,7 +7189,15 @@ static inline u32 TryBoosterEnergy(u32 battler) PREPARE_STAT_BUFFER(gBattleTextBuff1, GetHighestStatId(battler)); gBattlerAbility = gBattleScripting.battler = battler; gBattleStruct->boosterEnergyActivates |= 1u << battler; - BattleScriptExecute(BattleScript_BoosterEnergyEnd2); + if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseID == ITEMEFFECT_NORMAL) + { + BattleScriptExecute(BattleScript_BoosterEnergyEnd2); + } + else + { + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BoosterEnergyRet; + } return ITEM_EFFECT_OTHER; } @@ -7224,59 +7232,59 @@ static u8 ItemEffectMoveEnd(u32 battler, u16 holdEffect) { case HOLD_EFFECT_MICLE_BERRY: if (B_HP_BERRIES >= GEN_4) - effect = TrySetMicleBerry(battler, gLastUsedItem, FALSE); + effect = TrySetMicleBerry(battler, gLastUsedItem, ITEMEFFECT_NONE); break; case HOLD_EFFECT_RESTORE_HP: if (B_HP_BERRIES >= GEN_4) - effect = ItemHealHp(battler, gLastUsedItem, FALSE, FALSE); + effect = ItemHealHp(battler, gLastUsedItem, ITEMEFFECT_NONE, FALSE); break; case HOLD_EFFECT_RESTORE_PCT_HP: if (B_BERRIES_INSTANT >= GEN_4) - effect = ItemHealHp(battler, gLastUsedItem, FALSE, TRUE); + effect = ItemHealHp(battler, gLastUsedItem, ITEMEFFECT_NONE, TRUE); break; case HOLD_EFFECT_RESTORE_PP: if (B_BERRIES_INSTANT >= GEN_4) - effect = ItemRestorePp(battler, gLastUsedItem, FALSE); + effect = ItemRestorePp(battler, gLastUsedItem, ITEMEFFECT_NONE); break; case HOLD_EFFECT_CONFUSE_SPICY: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SPICY, FALSE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SPICY, ITEMEFFECT_NONE); break; case HOLD_EFFECT_CONFUSE_DRY: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_DRY, FALSE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_DRY, ITEMEFFECT_NONE); break; case HOLD_EFFECT_CONFUSE_SWEET: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SWEET, FALSE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SWEET, ITEMEFFECT_NONE); break; case HOLD_EFFECT_CONFUSE_BITTER: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_BITTER, FALSE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_BITTER, ITEMEFFECT_NONE); break; case HOLD_EFFECT_CONFUSE_SOUR: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SOUR, FALSE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SOUR, ITEMEFFECT_NONE); break; case HOLD_EFFECT_ATTACK_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_ATK, FALSE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_ATK, ITEMEFFECT_NONE); break; case HOLD_EFFECT_DEFENSE_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_DEF, FALSE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_DEF, ITEMEFFECT_NONE); break; case HOLD_EFFECT_SPEED_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPEED, FALSE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPEED, ITEMEFFECT_NONE); break; case HOLD_EFFECT_SP_ATTACK_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPATK, FALSE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPATK, ITEMEFFECT_NONE); break; case HOLD_EFFECT_SP_DEFENSE_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPDEF, FALSE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPDEF, ITEMEFFECT_NONE); break; case HOLD_EFFECT_ENIGMA_BERRY: // consume and heal if hit by super effective move if (B_BERRIES_INSTANT >= GEN_4) @@ -7292,7 +7300,7 @@ static u8 ItemEffectMoveEnd(u32 battler, u16 holdEffect) break; case HOLD_EFFECT_RANDOM_STAT_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = RandomStatRaiseBerry(battler, gLastUsedItem, FALSE); + effect = RandomStatRaiseBerry(battler, gLastUsedItem, ITEMEFFECT_NONE); break; case HOLD_EFFECT_CURE_PAR: if (gBattleMons[battler].status1 & STATUS1_PARALYSIS && !UnnerveOn(battler, gLastUsedItem)) @@ -7427,20 +7435,79 @@ static u8 ItemEffectMoveEnd(u32 battler, u16 holdEffect) effect = ITEM_STATS_CHANGE; break; case HOLD_EFFECT_MIRROR_HERB: - effect = TryConsumeMirrorHerb(battler, FALSE); + effect = TryConsumeMirrorHerb(battler, ITEMEFFECT_NONE); break; } return effect; } -u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) +static inline bool32 TryCureStatus(u32 battler, enum ItemEffect caseId) { - int i = 0, moveType; - u8 effect = ITEM_NO_EFFECT; - u32 battlerHoldEffect = 0, atkHoldEffect; - u8 atkHoldEffectParam; - u16 atkItem; + u32 effect = ITEM_NO_EFFECT; + u32 string = 0; + + if ((gBattleMons[battler].status1 & STATUS1_ANY || gBattleMons[battler].status2 & STATUS2_CONFUSION) && !UnnerveOn(battler, gLastUsedItem)) + { + if (gBattleMons[battler].status1 & STATUS1_PSN_ANY) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); + string++; + } + if (gBattleMons[battler].status1 & STATUS1_SLEEP) + { + gBattleMons[battler].status2 &= ~STATUS2_NIGHTMARE; + StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); + string++; + } + if (gBattleMons[battler].status1 & STATUS1_PARALYSIS) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); + string++; + } + if (gBattleMons[battler].status1 & STATUS1_BURN) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); + string++; + } + if (gBattleMons[battler].status1 & STATUS1_FREEZE || gBattleMons[battler].status1 & STATUS1_FROSTBITE) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); + string++; + } + if (gBattleMons[battler].status2 & STATUS2_CONFUSION) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); + string++; + } + if (string <= 1) + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CURED_PROBLEM; + else + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_NORMALIZED_STATUS; + gBattleMons[battler].status1 = 0; + RemoveConfusionStatus(battler); + if (caseId == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN || caseId == ITEMEFFECT_NORMAL) + { + BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2); + } + else + { + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet; + } + effect = ITEM_STATUS_CHANGE; + } + + return effect; +} + +u32 ItemBattleEffects(enum ItemEffect caseID, u32 battler, bool32 moveTurn) +{ + u32 moveType = 0; + u32 effect = ITEM_NO_EFFECT; + u32 battlerHoldEffect = 0, atkHoldEffect = 0; + u32 atkHoldEffectParam = 0; + u32 atkItem = 0; if (caseID != ITEMEFFECT_USE_LAST_ITEM) { @@ -7454,7 +7521,10 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) switch (caseID) { + case ITEMEFFECT_NONE: + break; case ITEMEFFECT_ON_SWITCH_IN: + case ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN: if (!gSpecialStatuses[battler].switchInItemDone) { switch (battlerHoldEffect) @@ -7476,43 +7546,43 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) break; case HOLD_EFFECT_CONFUSE_SPICY: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SPICY, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SPICY, caseID); break; case HOLD_EFFECT_CONFUSE_DRY: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_DRY, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_DRY, caseID); break; case HOLD_EFFECT_CONFUSE_SWEET: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SWEET, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SWEET, caseID); break; case HOLD_EFFECT_CONFUSE_BITTER: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_BITTER, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_BITTER, caseID); break; case HOLD_EFFECT_CONFUSE_SOUR: if (B_BERRIES_INSTANT >= GEN_4) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SOUR, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SOUR, caseID); break; case HOLD_EFFECT_ATTACK_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_ATK, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_ATK, caseID); break; case HOLD_EFFECT_DEFENSE_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_DEF, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_DEF, caseID); break; case HOLD_EFFECT_SPEED_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPEED, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPEED, caseID); break; case HOLD_EFFECT_SP_ATTACK_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPATK, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPATK, caseID); break; case HOLD_EFFECT_SP_DEFENSE_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPDEF, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPDEF, caseID); break; case HOLD_EFFECT_CRITICAL_UP: if (B_BERRIES_INSTANT >= GEN_4 @@ -7527,7 +7597,7 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) break; case HOLD_EFFECT_RANDOM_STAT_UP: if (B_BERRIES_INSTANT >= GEN_4) - effect = RandomStatRaiseBerry(battler, gLastUsedItem, TRUE); + effect = RandomStatRaiseBerry(battler, gLastUsedItem, caseID); break; case HOLD_EFFECT_CURE_PAR: if (B_BERRIES_INSTANT >= GEN_4 @@ -7589,59 +7659,16 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) } break; case HOLD_EFFECT_CURE_STATUS: - if (B_BERRIES_INSTANT >= GEN_4 - && (gBattleMons[battler].status1 & STATUS1_ANY || gBattleMons[battler].status2 & STATUS2_CONFUSION) - && !UnnerveOn(battler, gLastUsedItem)) - { - i = 0; - if (gBattleMons[battler].status1 & STATUS1_PSN_ANY) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); - i++; - } - if (gBattleMons[battler].status1 & STATUS1_SLEEP) - { - gBattleMons[battler].status2 &= ~STATUS2_NIGHTMARE; - StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); - i++; - } - if (gBattleMons[battler].status1 & STATUS1_PARALYSIS) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); - i++; - } - if (gBattleMons[battler].status1 & STATUS1_BURN) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); - i++; - } - if (gBattleMons[battler].status1 & STATUS1_FREEZE || gBattleMons[battler].status1 & STATUS1_FROSTBITE) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); - i++; - } - if (gBattleMons[battler].status2 & STATUS2_CONFUSION) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); - i++; - } - if (i <= 1) - gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CURED_PROBLEM; - else - gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_NORMALIZED_STATUS; - gBattleMons[battler].status1 = 0; - RemoveConfusionStatus(battler); - BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2); - effect = ITEM_STATUS_CHANGE; - } + if (B_BERRIES_INSTANT >= GEN_4) + effect = TryCureStatus(battler, caseID); break; case HOLD_EFFECT_RESTORE_HP: if (B_BERRIES_INSTANT >= GEN_4) - effect = ItemHealHp(battler, gLastUsedItem, TRUE, FALSE); + effect = ItemHealHp(battler, gLastUsedItem, caseID, FALSE); break; case HOLD_EFFECT_RESTORE_PCT_HP: if (B_BERRIES_INSTANT >= GEN_4) - effect = ItemHealHp(battler, gLastUsedItem, TRUE, TRUE); + effect = ItemHealHp(battler, gLastUsedItem, caseID, TRUE); break; case HOLD_EFFECT_AIR_BALLOON: effect = ITEM_EFFECT_OTHER; @@ -7660,16 +7687,16 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) switch (GetBattlerHoldEffectParam(battler)) { case HOLD_EFFECT_PARAM_ELECTRIC_TERRAIN: - effect = TryHandleSeed(battler, STATUS_FIELD_ELECTRIC_TERRAIN, STAT_DEF, gLastUsedItem, TRUE); + effect = TryHandleSeed(battler, STATUS_FIELD_ELECTRIC_TERRAIN, STAT_DEF, gLastUsedItem, caseID); break; case HOLD_EFFECT_PARAM_GRASSY_TERRAIN: - effect = TryHandleSeed(battler, STATUS_FIELD_GRASSY_TERRAIN, STAT_DEF, gLastUsedItem, TRUE); + effect = TryHandleSeed(battler, STATUS_FIELD_GRASSY_TERRAIN, STAT_DEF, gLastUsedItem, caseID); break; case HOLD_EFFECT_PARAM_MISTY_TERRAIN: - effect = TryHandleSeed(battler, STATUS_FIELD_MISTY_TERRAIN, STAT_SPDEF, gLastUsedItem, TRUE); + effect = TryHandleSeed(battler, STATUS_FIELD_MISTY_TERRAIN, STAT_SPDEF, gLastUsedItem, caseID); break; case HOLD_EFFECT_PARAM_PSYCHIC_TERRAIN: - effect = TryHandleSeed(battler, STATUS_FIELD_PSYCHIC_TERRAIN, STAT_SPDEF, gLastUsedItem, TRUE); + effect = TryHandleSeed(battler, STATUS_FIELD_PSYCHIC_TERRAIN, STAT_SPDEF, gLastUsedItem, caseID); break; } break; @@ -7709,10 +7736,10 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) effect = ITEM_STATS_CHANGE; break; case HOLD_EFFECT_MIRROR_HERB: - effect = TryConsumeMirrorHerb(battler, TRUE); + effect = TryConsumeMirrorHerb(battler, caseID); break; case HOLD_EFFECT_BOOSTER_ENERGY: - effect = TryBoosterEnergy(battler); + effect = TryBoosterEnergy(battler, caseID); break; } if (effect != 0) @@ -7736,15 +7763,15 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) { case HOLD_EFFECT_RESTORE_HP: if (!moveTurn) - effect = ItemHealHp(battler, gLastUsedItem, TRUE, FALSE); + effect = ItemHealHp(battler, gLastUsedItem, caseID, FALSE); break; case HOLD_EFFECT_RESTORE_PCT_HP: if (!moveTurn) - effect = ItemHealHp(battler, gLastUsedItem, TRUE, TRUE); + effect = ItemHealHp(battler, gLastUsedItem, caseID, TRUE); break; case HOLD_EFFECT_RESTORE_PP: if (!moveTurn) - effect = ItemRestorePp(battler, gLastUsedItem, TRUE); + effect = ItemRestorePp(battler, gLastUsedItem, caseID); break; case HOLD_EFFECT_RESTORE_STATS: effect = RestoreWhiteHerbStats(battler); @@ -7786,43 +7813,43 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) break; case HOLD_EFFECT_CONFUSE_SPICY: if (!moveTurn) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SPICY, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SPICY, caseID); break; case HOLD_EFFECT_CONFUSE_DRY: if (!moveTurn) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_DRY, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_DRY, caseID); break; case HOLD_EFFECT_CONFUSE_SWEET: if (!moveTurn) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SWEET, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SWEET, caseID); break; case HOLD_EFFECT_CONFUSE_BITTER: if (!moveTurn) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_BITTER, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_BITTER, caseID); break; case HOLD_EFFECT_CONFUSE_SOUR: if (!moveTurn) - effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SOUR, TRUE); + effect = HealConfuseBerry(battler, gLastUsedItem, FLAVOR_SOUR, caseID); break; case HOLD_EFFECT_ATTACK_UP: if (!moveTurn) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_ATK, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_ATK, caseID); break; case HOLD_EFFECT_DEFENSE_UP: if (!moveTurn) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_DEF, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_DEF, caseID); break; case HOLD_EFFECT_SPEED_UP: if (!moveTurn) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPEED, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPEED, caseID); break; case HOLD_EFFECT_SP_ATTACK_UP: if (!moveTurn) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPATK, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPATK, caseID); break; case HOLD_EFFECT_SP_DEFENSE_UP: if (!moveTurn) - effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPDEF, TRUE); + effect = StatRaiseBerry(battler, gLastUsedItem, STAT_SPDEF, caseID); break; case HOLD_EFFECT_CRITICAL_UP: if (!moveTurn && !(gBattleMons[battler].status2 & STATUS2_FOCUS_ENERGY_ANY) @@ -7836,7 +7863,7 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) break; case HOLD_EFFECT_RANDOM_STAT_UP: if (!moveTurn) - effect = RandomStatRaiseBerry(battler, gLastUsedItem, TRUE); + effect = RandomStatRaiseBerry(battler, gLastUsedItem, caseID); break; case HOLD_EFFECT_CURE_PAR: if (gBattleMons[battler].status1 & STATUS1_PARALYSIS && !UnnerveOn(battler, gLastUsedItem)) @@ -7894,49 +7921,7 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) } break; case HOLD_EFFECT_CURE_STATUS: - if ((gBattleMons[battler].status1 & STATUS1_ANY || gBattleMons[battler].status2 & STATUS2_CONFUSION) && !UnnerveOn(battler, gLastUsedItem)) - { - i = 0; - if (gBattleMons[battler].status1 & STATUS1_PSN_ANY) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); - i++; - } - if (gBattleMons[battler].status1 & STATUS1_SLEEP) - { - gBattleMons[battler].status2 &= ~STATUS2_NIGHTMARE; - StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); - i++; - } - if (gBattleMons[battler].status1 & STATUS1_PARALYSIS) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); - i++; - } - if (gBattleMons[battler].status1 & STATUS1_BURN) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); - i++; - } - if (gBattleMons[battler].status1 & STATUS1_FREEZE || gBattleMons[battler].status1 & STATUS1_FROSTBITE) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); - i++; - } - if (gBattleMons[battler].status2 & STATUS2_CONFUSION) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); - i++; - } - if (i <= 1) - gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CURED_PROBLEM; - else - gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_NORMALIZED_STATUS; - gBattleMons[battler].status1 = 0; - RemoveConfusionStatus(battler); - BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2); - effect = ITEM_STATUS_CHANGE; - } + effect = TryCureStatus(battler, caseID); break; case HOLD_EFFECT_MENTAL_HERB: if (GetMentalHerbEffect(battler)) @@ -7949,7 +7934,7 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) break; case HOLD_EFFECT_MICLE_BERRY: if (!moveTurn) - effect = TrySetMicleBerry(battler, gLastUsedItem, TRUE); + effect = TrySetMicleBerry(battler, gLastUsedItem, caseID); break; case HOLD_EFFECT_BERSERK_GENE: BufferStatChange(battler, STAT_ATK, STRINGID_STATROSE); @@ -7967,10 +7952,10 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) effect = ITEM_STATS_CHANGE; break; case HOLD_EFFECT_MIRROR_HERB: - effect = TryConsumeMirrorHerb(battler, TRUE); + effect = TryConsumeMirrorHerb(battler, caseID); break; case HOLD_EFFECT_BOOSTER_ENERGY: - effect = TryBoosterEnergy(battler); + effect = TryBoosterEnergy(battler, caseID); break; } diff --git a/test/battle/hold_effect/booster_energy.c b/test/battle/hold_effect/booster_energy.c index a63f462b72..072eb8df60 100644 --- a/test/battle/hold_effect/booster_energy.c +++ b/test/battle/hold_effect/booster_energy.c @@ -209,3 +209,28 @@ SINGLE_BATTLE_TEST("Booster Energy can't be tricked if a Paradox species is invo MESSAGE("But it failed!"); } } + +DOUBLE_BATTLE_TEST("Booster Energy triggers correctly for all battlers if multiple fainted the previous turn") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_CATERPIE) { HP(1); } + PLAYER(SPECIES_GOUGING_FIRE) { Item(ITEM_BOOSTER_ENERGY); } + PLAYER(SPECIES_IRON_MOTH) { Item(ITEM_BOOSTER_ENERGY); } + OPPONENT(SPECIES_CATERPIE) { HP(1); } + OPPONENT(SPECIES_CATERPIE) { HP(1); } + OPPONENT(SPECIES_FLUTTER_MANE) { Item(ITEM_BOOSTER_ENERGY); } + OPPONENT(SPECIES_CATERPIE); + } WHEN { + TURN { MOVE(playerLeft, MOVE_EXPLOSION); + SEND_OUT(opponentRight, 3); + SEND_OUT(opponentLeft, 2); + SEND_OUT(playerRight, 3); + SEND_OUT(playerLeft, 2); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, playerLeft); + ABILITY_POPUP(playerLeft, ABILITY_PROTOSYNTHESIS); + ABILITY_POPUP(playerRight, ABILITY_QUARK_DRIVE); + ABILITY_POPUP(opponentLeft, ABILITY_PROTOSYNTHESIS); + } +} diff --git a/test/battle/hold_effect/cure_status.c b/test/battle/hold_effect/cure_status.c index d954983f88..133eeafb41 100644 --- a/test/battle/hold_effect/cure_status.c +++ b/test/battle/hold_effect/cure_status.c @@ -265,3 +265,30 @@ SINGLE_BATTLE_TEST("Player Pokemon can be further poisoned with Toxic spikes aft STATUS_ICON(player, poison: TRUE); } } + +DOUBLE_BATTLE_TEST("Lum Berry correctly cures all battlers if multiple fainted the previous turn") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_CATERPIE) { HP(1); } + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LUM_BERRY); Status1(STATUS1_BURN); } + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LUM_BERRY); Status1(STATUS1_POISON); } + OPPONENT(SPECIES_CATERPIE) { HP(1); } + OPPONENT(SPECIES_CATERPIE) { HP(1); } + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LUM_BERRY); Status1(STATUS1_PARALYSIS); } + OPPONENT(SPECIES_CATERPIE); + } WHEN { + TURN { MOVE(playerLeft, MOVE_EXPLOSION); + SEND_OUT(opponentRight, 3); + SEND_OUT(opponentLeft, 2); + SEND_OUT(playerRight, 3); + SEND_OUT(playerLeft, 2); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, playerLeft); + } THEN { + EXPECT_EQ(playerLeft->status1, STATUS1_NONE); + EXPECT_EQ(playerRight->status1, STATUS1_NONE); + EXPECT_EQ(opponentLeft->status1, STATUS1_NONE); + + } +} From 5c180a0b09cec08ddc42ac84ccceef86de217095 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 4 Dec 2024 11:30:19 -0300 Subject: [PATCH 2/4] Added FONT_SHORT_NARROWER (#5101) --- charmap.txt | 1 + data/scripts/debug.inc | 119 ++++++++++++++++++++++++ graphics/fonts/latin_short_narrower.png | Bin 0 -> 4374 bytes graphics/fonts/latin_small_narrower.png | Bin 7037 -> 4397 bytes graphics_file_rules.mk | 3 + include/fonts.h | 2 + include/text.h | 1 + src/debug.c | 11 +++ src/fonts.c | 36 +++++++ src/text.c | 77 ++++++++++++++- 10 files changed, 249 insertions(+), 1 deletion(-) create mode 100644 graphics/fonts/latin_short_narrower.png diff --git a/charmap.txt b/charmap.txt index 63c2f6ebe1..3a2081e304 100644 --- a/charmap.txt +++ b/charmap.txt @@ -465,6 +465,7 @@ FONT_SMALL_NARROW = FC 06 08 FONT_NARROWER = FC 06 0A FONT_SMALL_NARROWER = FC 06 0B FONT_SHORT_NARROW = FC 06 0C +FONT_SHORT_NARROWER = FC 06 0D @ colors diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 4851c87c40..9da3f529fc 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -447,3 +447,122 @@ Debug_EventScript_EWRAMCounters:: Debug_EventScript_EWRAMCounters_Text:: .string "Follower Steps: {STR_VAR_1}.\n" .string "Fishing Chain: {STR_VAR_2}.$" + +Debug_EventScript_FontTest_Text_1:: + .string "{FONT_SHORT_NARROWER}" @ Edit this to test your font + .string "Angel Adept Blind Bodice Clique\n" + .string "Coast Dunce Docile Enact Eosin\l" + .string "Furlong Focal Gnome Gondola Human\l" + .string "Hoist Inlet Iodine Justin Jocose\l" + .string "Knoll Koala Linden Loads Milliner\l" + .string "Modal Number Nodule Onset Oddball\l" + .string "Pneumo Poncho Quanta Qophs Rhone\l" + .string "Roman Snout Sodium Tundra Tocsin\l" + .string "Uncle Udder Vulcan Vocal Whale\l" + .string "Woman Xmas Xenon Yunnan Young\l" + .string "Zloty Zodiac.$" + +Debug_EventScript_FontTest_Text_2:: + .string "{FONT_SHORT_NARROWER}" @ Edit this to test your font + .string "Angel angel adept for the nuance loads\n" + .string "of the arena cocoa and quaalude. Blind\l" + .string "blind bodice for the submit oboe of the\l" + .string "club snob and abbot. Clique clique\l" + .string "coast for the pouch loco of the franc\l" + .string "assoc and accede. Dunce dunce docile\l" + .string "for the loudness mastodon of the\l" + .string "loud statehood and huddle.$" + +Debug_EventScript_FontTest_Text_3:: + .string "{FONT_SHORT_NARROWER}" @ Edit this to test your font + .string "Enact enact eosin for the quench coed\n" + .string "of the pique canoe and bleep. Furlong\l" + .string "furlong focal for the genuflect\l" + .string "profound of the motif aloof and offers.\l" + .string "Gnome gnome gondola for the impugn\l" + .string "logos of the unplug analog and smuggle.\l" + .string "Human human hoist for the buddhist\l" + .string "alcohol of the riyadh caliph and\l" + .string "bathhouse.$" + +Debug_EventScript_FontTest_Text_4:: + .string "{FONT_SHORT_NARROWER}" @ Edit this to test your font + .string "Inlet inlet iodine for the quince\n" + .string "champion of the ennui scampi and shiite.\l" + .string "Justin justin jocose for the djibouti\l" + .string "sojourn of the oranj raj and hajjis.\l" + .string "Knoll knoll koala for the banknote\l" + .string "lookout of the dybbuk outlook and\l" + .string "trekked. Linden linden loads for the\l" + .string "ulna monolog of the consul menthol and\l" + .string "shallot.$" + +Debug_EventScript_FontTest_Text_5:: + .string "{FONT_SHORT_NARROWER}" @ Edit this to test your font + .string "Milliner milliner modal for the alumna\n" + .string "solomon of the album custom and summon.\l" + .string "Number number nodule for the unmade\l" + .string "economic of the shotgun bison and\l" + .string "tunnel. Onset onset oddball for the\l" + .string "abandon podium of the antiquo tempo\l" + .string "and moonlit. Pneumo pneumo poncho for\l" + .string "the dauphin opossum of the holdup\l" + .string "bishop and supplies.$" + +Debug_EventScript_FontTest_Text_6:: + .string "{FONT_SHORT_NARROWER}" @ Edit this to test your font + .string "Quanta quanta qophs for the inquest\n" + .string "sheqel of the cinq coq and suqqu. Rhone\l" + .string "rhone roman for the burnt porous of the\l" + .string "lemur clamor and carrot. Snout snout\l" + .string "sodium for the ensnare bosom of the\l" + .string "genus pathos and missing. Tundra\l" + .string "tundra tocsin for the nutmeg isotope\l" + .string "of the peasant ingot and ottoman.$" + +Debug_EventScript_FontTest_Text_7:: + .string "{FONT_SHORT_NARROWER}" @ Edit this to test your font + .string "Uncle uncle udder for the dunes cloud\n" + .string "of the hindu thou and continuum. Vulcan\l" + .string "vulcan vocal for the alluvial ovoid of\l" + .string "the yugoslav chekhov and revved. Whale\l" + .string "whale woman for the meanwhile blowout\l" + .string "of the forepaw meadow and glowworm.\l" + .string "Xmas xmas xenon for the bauxite\l" + .string "doxology of the tableaux equinox and\l" + .string "exxon.$" + +Debug_EventScript_FontTest_Text_8:: + .string "{FONT_SHORT_NARROWER}" @ Edit this to test your font + .string "Yunnan yunnan young for the dynamo\n" + .string "coyote of the obloquy employ and\l" + .string "sayyid. Zloty zloty zodiac for the gizmo\l" + .string "ozone of the franz laissez and buzzing.$" + +Debug_PrintFontTest:: + msgbox Debug_EventScript_FontTest_Text_1, MSGBOX_DEFAULT + msgbox Debug_EventScript_FontTest_Text_2, MSGBOX_DEFAULT + msgbox Debug_EventScript_FontTest_Text_3, MSGBOX_DEFAULT + msgbox Debug_EventScript_FontTest_Text_4, MSGBOX_DEFAULT + msgbox Debug_EventScript_FontTest_Text_5, MSGBOX_DEFAULT + msgbox Debug_EventScript_FontTest_Text_6, MSGBOX_DEFAULT + msgbox Debug_EventScript_FontTest_Text_7, MSGBOX_DEFAULT + msgbox Debug_EventScript_FontTest_Text_8, MSGBOX_DEFAULT + releaseall + end + +Debug_EventScript_FontTest:: + lockall + goto Debug_PrintFontTest +@ goto_if_eq VAR_RESULT, 0, Debug_NoPokemon +@ dynmultipush Debug_EventScript_InflictStatus1_Text_Single, 0 +@ dynmultipush Debug_EventScript_InflictStatus1_Text_PartyWide, 1 +@ dynmultipush Debug_EventScript_InflictStatus1_Text_Close, 2 +@ dynmultistack 0, 0, FALSE, 3 FALSE, 0, NULL +@ switch VAR_RESULT +@ case 0, Debug_EventScript_InflictStatus1_Single +@ case 1, Debug_EventScript_InflictStatus1_Party +@ case 2, Debug_EventScript_InflictStatus1_Close +@Debug_EventScript_InflictStatus1_Close: +@ releaseall +@ end diff --git a/graphics/fonts/latin_short_narrower.png b/graphics/fonts/latin_short_narrower.png new file mode 100644 index 0000000000000000000000000000000000000000..9c79ae474fdc289bea5a2332d0847001c3aeb190 GIT binary patch literal 4374 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 literal 0 HcmV?d00001 diff --git a/graphics/fonts/latin_small_narrower.png b/graphics/fonts/latin_small_narrower.png index a183bed7cc286937c85ea2f7d7245fa41750ae85..d03f1b8ad0e2dd74778b0054d91943ab79943dc0 100644 GIT binary patch literal 4397 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ⅇt1ES35YB82ljNRtAOe95-zvH&hbaLAMB(Lk6WY_1`)> zk+o%S>*2Vb4H1%OxW+E69;13Oh5eGu4yyurw2OlKhYUK!pQAj5cgfY0+#Z*yZU zddB|zbr747yy$aSJ$o&OCU)NmVny=^OO=;V`AbHijKL;J*8 ziQ`;_CESGJY^)4JTgYFQ(F{jxl1vM;bo^iJCjcdX(W4rxL@@{kxs76G&{{CoNch&G zVDM1UZip|A(jT#Sd4_kD8Emw*CL4?5jqkbZqnq@PD!$l~n0|t7Fo^rqx&6-poIXXc KetE(-<-Y*@4^nRc literal 7037 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 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 39d634e19d..9f1be162f4 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -248,6 +248,9 @@ $(FONTGFXDIR)/small_narrower.latfont: $(FONTGFXDIR)/latin_small_narrower.png $(FONTGFXDIR)/short_narrow.latfont: $(FONTGFXDIR)/latin_short_narrow.png $(GFX) $< $@ +$(FONTGFXDIR)/short_narrower.latfont: $(FONTGFXDIR)/latin_short_narrower.png + $(GFX) $< $@ + $(FONTGFXDIR)/small.hwjpnfont: $(FONTGFXDIR)/japanese_small.png $(GFX) $< $@ diff --git a/include/fonts.h b/include/fonts.h index a6be35db98..5e6a9ffad5 100644 --- a/include/fonts.h +++ b/include/fonts.h @@ -21,5 +21,7 @@ extern const u8 gFontSmallNarrowerLatinGlyphWidths[]; extern const u16 gFontSmallNarrowerLatinGlyphs[]; extern const u8 gFontShortNarrowLatinGlyphWidths[]; extern const u16 gFontShortNarrowLatinGlyphs[]; +extern const u8 gFontShortNarrowerLatinGlyphWidths[]; +extern const u16 gFontShortNarrowerLatinGlyphs[]; #endif // GUARD_FONTS_H diff --git a/include/text.h b/include/text.h index 55500868dc..a148410c2f 100644 --- a/include/text.h +++ b/include/text.h @@ -21,6 +21,7 @@ enum { FONT_NARROWER, FONT_SMALL_NARROWER, FONT_SHORT_NARROW, + FONT_SHORT_NARROWER, }; // Return values for font functions diff --git a/src/debug.c b/src/debug.c index f1c403fc1e..590e415b7e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -89,6 +89,7 @@ enum UtilDebugMenu DEBUG_UTIL_MENU_ITEM_SAVEBLOCK, DEBUG_UTIL_MENU_ITEM_ROM_SPACE, DEBUG_UTIL_MENU_ITEM_WEATHER, + DEBUG_UTIL_MENU_ITEM_FONT_TEST, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS, @@ -365,6 +366,7 @@ static void DebugAction_Util_CheckSaveBlock(u8 taskId); static void DebugAction_Util_CheckROMSpace(u8 taskId); static void DebugAction_Util_Weather(u8 taskId); static void DebugAction_Util_Weather_SelectId(u8 taskId); +static void DebugAction_Util_FontTest(u8 taskId); static void DebugAction_Util_CheckWallClock(u8 taskId); static void DebugAction_Util_SetWallClock(u8 taskId); static void DebugAction_Util_WatchCredits(u8 taskId); @@ -453,6 +455,7 @@ static void DebugAction_BerryFunctions_Weeds(u8 taskId); extern const u8 Debug_FlagsNotSetOverworldConfigMessage[]; extern const u8 Debug_FlagsNotSetBattleConfigMessage[]; extern const u8 Debug_FlagsAndVarNotSetBattleConfigMessage[]; +extern const u8 Debug_EventScript_FontTest[]; extern const u8 Debug_EventScript_CheckEVs[]; extern const u8 Debug_EventScript_CheckIVs[]; extern const u8 Debug_EventScript_InflictStatus1[]; @@ -525,6 +528,7 @@ static const u8 sDebugText_Util_SaveBlockSpace[] = _("Save Block space static const u8 sDebugText_Util_ROMSpace[] = _("ROM space…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Util_Weather[] = _("Set weather…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Util_Weather_ID[] = _("Weather ID: {STR_VAR_3}\n{STR_VAR_1}\n{STR_VAR_2}"); +static const u8 sDebugText_Util_FontTest[] = _("Font Test…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Util_CheckWallClock[] = _("Check wall clock…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Util_SetWallClock[] = _("Set wall clock…{CLEAR_TO 110}{RIGHT_ARROW}"); static const u8 sDebugText_Util_WatchCredits[] = _("Watch credits…{CLEAR_TO 110}{RIGHT_ARROW}"); @@ -714,6 +718,7 @@ static const struct ListMenuItem sDebugMenu_Items_Utilities[] = [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = {sDebugText_Util_SaveBlockSpace, DEBUG_UTIL_MENU_ITEM_SAVEBLOCK}, [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = {sDebugText_Util_ROMSpace, DEBUG_UTIL_MENU_ITEM_ROM_SPACE}, [DEBUG_UTIL_MENU_ITEM_WEATHER] = {sDebugText_Util_Weather, DEBUG_UTIL_MENU_ITEM_WEATHER}, + [DEBUG_UTIL_MENU_ITEM_FONT_TEST] = {sDebugText_Util_FontTest, DEBUG_UTIL_MENU_ITEM_FONT_TEST}, [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = {sDebugText_Util_CheckWallClock, DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK}, [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = {sDebugText_Util_SetWallClock, DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK}, [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = {sDebugText_Util_WatchCredits, DEBUG_UTIL_MENU_ITEM_WATCHCREDITS}, @@ -884,6 +889,7 @@ static void (*const sDebugMenu_Actions_Utilities[])(u8) = [DEBUG_UTIL_MENU_ITEM_SAVEBLOCK] = DebugAction_Util_CheckSaveBlock, [DEBUG_UTIL_MENU_ITEM_ROM_SPACE] = DebugAction_Util_CheckROMSpace, [DEBUG_UTIL_MENU_ITEM_WEATHER] = DebugAction_Util_Weather, + [DEBUG_UTIL_MENU_ITEM_FONT_TEST] = DebugAction_Util_FontTest, [DEBUG_UTIL_MENU_ITEM_CHECKWALLCLOCK] = DebugAction_Util_CheckWallClock, [DEBUG_UTIL_MENU_ITEM_SETWALLCLOCK] = DebugAction_Util_SetWallClock, [DEBUG_UTIL_MENU_ITEM_WATCHCREDITS] = DebugAction_Util_WatchCredits, @@ -2294,6 +2300,11 @@ static void DebugAction_Util_Weather_SelectId(u8 taskId) } } +static void DebugAction_Util_FontTest(u8 taskId) +{ + Debug_DestroyMenu_Full_Script(taskId, Debug_EventScript_FontTest); +} + static void DebugAction_Util_CheckWallClock(u8 taskId) { Debug_DestroyMenu_Full_Script(taskId, PlayersHouse_2F_EventScript_CheckWallClock); diff --git a/src/fonts.c b/src/fonts.c index 2dcb0a7e78..2eb8ed062b 100644 --- a/src/fonts.c +++ b/src/fonts.c @@ -288,6 +288,42 @@ ALIGNED(4) const u8 gFontShortNarrowLatinGlyphWidths[] = { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3, }; +ALIGNED(4) const u16 gFontShortNarrowerLatinGlyphs[] = INCBIN_U16("graphics/fonts/short_narrower.latfont"); +ALIGNED(4) const u8 gFontShortNarrowerLatinGlyphWidths[] = { + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 4, 4, + 8, 4, 4, 4, 5, 5, 4, 4, 3, 4, 4, 4, 4, 4, 4, 3, + 4, 4, 4, 4, 4, 6, 4, 4, 4, 5, 4, 5, 8, 6, 6, 3, + 3, 3, 3, 3, 8, 8, 3, 5, 5, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 5, 5, 4, 8, 8, 8, 7, 8, 8, 4, 4, 6, 4, 4, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3, 3, 3, 3, 3, 4, + 3, 3, 3, 3, 3, 3, 3, 5, 3, 7, 7, 7, 7, 0, 0, 3, + 4, 5, 6, 7, 4, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 7, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 3, 5, 3, + 5, 5, 5, 3, 3, 5, 5, 6, 3, 6, 6, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 5, 5, 4, 4, 4, 4, 4, 4, 4, + 4, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 4, 4, + 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, + 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 10, 10, 10, 10, 8, 8, 10, 8, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3, +}; + ALIGNED(4) const u16 gFontSmallJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/small.hwjpnfont"); ALIGNED(4) const u16 gFontNormalJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/normal.hwjpnfont"); diff --git a/src/text.c b/src/text.c index acb2871a86..29ffc5ea3a 100644 --- a/src/text.c +++ b/src/text.c @@ -26,6 +26,7 @@ static u16 FontFunc_SmallNarrow(struct TextPrinter *); static u16 FontFunc_Narrower(struct TextPrinter *); static u16 FontFunc_SmallNarrower(struct TextPrinter *); static u16 FontFunc_ShortNarrow(struct TextPrinter *); +static u16 FontFunc_ShortNarrower(struct TextPrinter *); static void DecompressGlyph_Small(u16, bool32); static void DecompressGlyph_Normal(u16, bool32); static void DecompressGlyph_Short(u16, bool32); @@ -35,6 +36,7 @@ static void DecompressGlyph_Bold(u16); static void DecompressGlyph_Narrower(u16, bool32); static void DecompressGlyph_SmallNarrower(u16, bool32); static void DecompressGlyph_ShortNarrow(u16, bool32); +static void DecompressGlyph_ShortNarrower(u16, bool32); static u32 GetGlyphWidth_Small(u16, bool32); static u32 GetGlyphWidth_Normal(u16, bool32); static u32 GetGlyphWidth_Short(u16, bool32); @@ -43,6 +45,7 @@ static u32 GetGlyphWidth_SmallNarrow(u16, bool32); static u32 GetGlyphWidth_Narrower(u16, bool32); static u32 GetGlyphWidth_SmallNarrower(u16, bool32); static u32 GetGlyphWidth_ShortNarrow(u16, bool32); +static u32 GetGlyphWidth_ShortNarrower(u16, bool32); static EWRAM_DATA struct TextPrinter sTempTextPrinter = {0}; static EWRAM_DATA struct TextPrinter sTextPrinters[WINDOWS_MAX] = {0}; @@ -102,6 +105,7 @@ static const struct GlyphWidthFunc sGlyphWidthFuncs[] = { FONT_NARROWER, GetGlyphWidth_Narrower }, { FONT_SMALL_NARROWER, GetGlyphWidth_SmallNarrower }, { FONT_SHORT_NARROW, GetGlyphWidth_ShortNarrow }, + { FONT_SHORT_NARROWER, GetGlyphWidth_ShortNarrower }, }; struct @@ -260,6 +264,16 @@ static const struct FontInfo sFontInfos[] = .bgColor = 1, .shadowColor = 3, }, + [FONT_SHORT_NARROWER] = { + .fontFunction = FontFunc_ShortNarrower, + .maxLetterWidth = 5, + .maxLetterHeight = 14, + .letterSpacing = 0, + .lineSpacing = 0, + .fgColor = 2, + .bgColor = 1, + .shadowColor = 3, + }, }; static const u8 sMenuCursorDimensions[][2] = @@ -277,6 +291,7 @@ static const u8 sMenuCursorDimensions[][2] = [FONT_NARROWER] = { 8, 15 }, [FONT_SMALL_NARROWER] = { 8, 8 }, [FONT_SHORT_NARROW] = { 8, 14 }, + [FONT_SHORT_NARROWER] = { 8, 14 }, }; static const u16 sFontBoldJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/bold.hwjpnfont"); @@ -850,6 +865,18 @@ static u16 FontFunc_ShortNarrow(struct TextPrinter *textPrinter) return RenderText(textPrinter); } +static u16 FontFunc_ShortNarrower(struct TextPrinter *textPrinter) +{ + struct TextPrinterSubStruct *subStruct = (struct TextPrinterSubStruct *)(&textPrinter->subStructFields); + + if (subStruct->hasFontIdBeenSet == FALSE) + { + subStruct->fontId = FONT_SHORT_NARROWER; + subStruct->hasFontIdBeenSet = TRUE; + } + return RenderText(textPrinter); +} + void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter) { struct TextPrinterSubStruct *subStruct = (struct TextPrinterSubStruct *)(&textPrinter->subStructFields); @@ -1238,6 +1265,9 @@ static u16 RenderText(struct TextPrinter *textPrinter) case FONT_SHORT_NARROW: DecompressGlyph_ShortNarrow(currChar, textPrinter->japanese); break; + case FONT_SHORT_NARROWER: + DecompressGlyph_ShortNarrower(currChar, textPrinter->japanese); + break; case FONT_BRAILLE: break; } @@ -2161,6 +2191,50 @@ static u32 GetGlyphWidth_ShortNarrow(u16 glyphId, bool32 isJapanese) return gFontShortNarrowLatinGlyphWidths[glyphId]; } +static void DecompressGlyph_ShortNarrower(u16 glyphId, bool32 isJapanese) +{ + const u16 *glyphs; + + if (isJapanese == TRUE) + { + glyphs = gFontShortJapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); + DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop); + DecompressGlyphTile(glyphs + 0x8, gCurGlyph.gfxBufferTop + 8); + DecompressGlyphTile(glyphs + 0x80, gCurGlyph.gfxBufferBottom); // gCurGlyph + 0x20 + DecompressGlyphTile(glyphs + 0x88, gCurGlyph.gfxBufferBottom + 8); // gCurGlyph + 0x60 + gCurGlyph.width = gFontShortJapaneseGlyphWidths[glyphId]; + gCurGlyph.height = 14; + } + else + { + glyphs = gFontShortNarrowerLatinGlyphs + (0x20 * glyphId); + gCurGlyph.width = gFontShortNarrowerLatinGlyphWidths[glyphId]; + + if (gCurGlyph.width <= 8) + { + DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop); + DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom); + } + else + { + DecompressGlyphTile(glyphs, gCurGlyph.gfxBufferTop); + DecompressGlyphTile(glyphs + 0x8, gCurGlyph.gfxBufferTop + 8); + DecompressGlyphTile(glyphs + 0x10, gCurGlyph.gfxBufferBottom); + DecompressGlyphTile(glyphs + 0x18, gCurGlyph.gfxBufferBottom + 8); + } + + gCurGlyph.height = 14; + } +} + +static u32 GetGlyphWidth_ShortNarrower(u16 glyphId, bool32 isJapanese) +{ + if (isJapanese == TRUE) + return gFontShortJapaneseGlyphWidths[glyphId]; + else + return gFontShortNarrowerLatinGlyphWidths[glyphId]; +} + static const s8 sNarrowerFontIds[] = { [FONT_SMALL] = FONT_SMALL_NARROW, @@ -2175,7 +2249,8 @@ static const s8 sNarrowerFontIds[] = [FONT_BOLD] = -1, [FONT_NARROWER] = -1, [FONT_SMALL_NARROWER] = -1, - [FONT_SHORT_NARROW] = -1, + [FONT_SHORT_NARROW] = FONT_SHORT_NARROWER, + [FONT_SHORT_NARROWER] = -1, }; // If the narrowest font ID doesn't fit the text, we still return that From 93e733820c3d7736185c36d934ccb3889d609fa3 Mon Sep 17 00:00:00 2001 From: psf <77138753+pkmnsnfrn@users.noreply.github.com> Date: Wed, 4 Dec 2024 07:54:39 -0800 Subject: [PATCH 3/4] Added instructions in PR template to make crediting people more clear (#5755) --- .github/pull_request_template.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 6a74e9fbd5..f083a2a23f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -17,7 +17,8 @@ ## **People who collaborated with me in this PR** - + + ## Feature(s) this PR does NOT handle: From c714caa27aba5c838faca1509f41f98311073f47 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Wed, 4 Dec 2024 18:22:35 +0000 Subject: [PATCH 4/4] trainerproc: Fix showing incorrect error context (#5769) --- tools/trainerproc/main.c | 98 ++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 45 deletions(-) diff --git a/tools/trainerproc/main.c b/tools/trainerproc/main.c index 8b939a955f..f1bcf1bfa4 100644 --- a/tools/trainerproc/main.c +++ b/tools/trainerproc/main.c @@ -251,51 +251,6 @@ static bool set_parse_error(struct Parser *p, struct SourceLocation location, co return false; } -static bool show_parse_error(struct Parser *p) -{ - // Print error message. - int n = fprintf(stderr, "%s:%d: ", p->source->path, p->error_location.line); - fprintf(stderr, "error: %s\n", p->error); - - // Seek to the line. - int line, begin, end; - for (line = 1, begin = 0; begin < p->source->buffer_n; begin++) - { - if (p->error_location.line == line) - break; - if (p->source->buffer[begin] == '\n') - line++; - } - for (end = begin; end < p->source->buffer_n; end++) - { - if (p->source->buffer[end] == '\n') - break; - } - - // Print the source line. - fprintf(stderr, "%s:%d: %.*s\n", p->source->path, p->error_location.line, end - begin, &p->source->buffer[begin]); - - // Print caret pointing at the column. - fprintf(stderr, "%*s", n, ""); - for (int column = 1; column < p->error_location.column && begin + column < end; column++) - { - unsigned char c = p->source->buffer[begin + column]; - fputc(c == '\t' ? c : ' ', stderr); - } - fprintf(stderr, "^\n"); - - p->error = NULL; - p->fatal_error = true; - - return false; -} - -static bool set_show_parse_error(struct Parser *p, struct SourceLocation location, const char *error) -{ - set_parse_error(p, location, error); - return show_parse_error(p); -} - __attribute__((warn_unused_result)) static bool peek_char(struct Parser *p, unsigned char *c) { @@ -618,6 +573,59 @@ static bool match_move_identifier(struct Parser *p, struct Token *t) return true; } +static bool show_parse_error(struct Parser *p) +{ + // Print error message. + int n = fprintf(stderr, "%s:%d: ", p->source->path, p->error_location.line); + fprintf(stderr, "error: %s\n", p->error); + + struct Parser p_ = { + .source = p->source, + .location = { .line = 1, .column = 1 }, + .offset = 0, + }; + + for (;;) { + if (p->error_location.line == p_.location.line) + break; + if (!match_empty_line(&p_)) + skip_line(&p_); + if (match_eof(&p_)) + assert(false); + } + + int begin = p_.offset; + int end; + for (end = begin; end < p->source->buffer_n; end++) + { + if (p->source->buffer[end] == '\n') + break; + } + + // Print the source line. + fprintf(stderr, "%s:%d: %.*s\n", p->source->path, p->error_location.line, end - begin, &p->source->buffer[begin]); + + // Print caret pointing at the column. + fprintf(stderr, "%*s", n, ""); + for (int column = 1; column < p->error_location.column && begin + column < end; column++) + { + unsigned char c = p->source->buffer[begin + column]; + fputc(c == '\t' ? c : ' ', stderr); + } + fprintf(stderr, "^\n"); + + p->error = NULL; + p->fatal_error = true; + + return false; +} + +static bool set_show_parse_error(struct Parser *p, struct SourceLocation location, const char *error) +{ + set_parse_error(p, location, error); + return show_parse_error(p); +} + __attribute__((warn_unused_result)) static bool parse_section(struct Parser *p, struct Token *section) {