Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Version specific tweaks of post whiteout script (#9521)
Some checks are pending
CI / build-emerald (push) Waiting to run
Details
CI / build-firered (push) Waiting to run
Details
CI / build-leafgreen (push) Waiting to run
Details
CI / release (push) Waiting to run
Details
CI / test (push) Waiting to run
Details
CI / build (push) Blocked by required conditions
Details
CI / docs_validate (push) Waiting to run
Details
CI / allcontributors (push) Waiting to run
Details
Docs / deploy (push) Waiting to run
Details

Browse Source 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
This commit is contained in:
FosterProgramming 2026-03-16 13:17:35 +01:00 committed by GitHub
parent b475d1ce87
commit 77fa8e086b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/event_scripts.s
View File

@ -1062,7 +1062,7 @@ EventScript_AfterWhiteOutHeal::
lockall
msgbox gText_FirstShouldRestoreMonsHealth
call EventScript_PkmnCenterNurse_TakeAndHealPkmn
call_if_unset FLAG_DEFEATED_RUSTBORO_GYM, EventScript_AfterWhiteOutHealMsgPreRoxanne
call_if_unset FLAG_DEFEATED_RUSTBORO_GYM, EventScript_AfterWhiteOutHealMsgPreFirstBoss
call_if_set FLAG_DEFEATED_RUSTBORO_GYM, EventScript_AfterWhiteOutHealMsg
applymovement VAR_LAST_TALKED, Movement_PkmnCenterNurse_Bow
waitmovement 0
@ -1070,7 +1070,7 @@ EventScript_AfterWhiteOutHeal::
releaseall
end
EventScript_AfterWhiteOutHealMsgPreRoxanne::
EventScript_AfterWhiteOutHealMsgPreFirstBoss::
msgbox gText_MonsHealedShouldBuyPotions
return
@ -1080,6 +1080,7 @@ EventScript_AfterWhiteOutHealMsg::
EventScript_AfterWhiteOutMomHeal::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_PLAYERS_HOUSE_1F_MOM, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox gText_HadQuiteAnExperienceTakeRest
@ -1432,7 +1433,7 @@ gText_HadQuiteAnExperienceTakeRest::
gText_MomExplainHPGetPotions::
.string "MOM: Oh, good! You and your\n"
.string "POKéMON are looking great.\p"
.string "I just heard from PROF. BIRCH.\p"
.string "I just heard from {STR_VAR_1}.\p"
.string "He said that POKéMON's energy is\n"
.string "measured in HP.\p"
.string "If your POKéMON lose their HP,\n"

2
data/maps/PalletTown_PlayersHouse_1F_Frlg/map.json
View File

@ -17,7 +17,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_MOM",
"local_id": "LOCALID_PLAYERS_HOUSE_1F_MOM",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_MOM_FRLG",
"x": 8,

2
data/maps/PalletTown_PlayersHouse_1F_Frlg/scripts.inc
View File

@ -9,7 +9,7 @@ PalletTown_PlayersHouse_1F_EventScript_Mom::
call_if_eq VAR_RESULT, MALE, PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale
call_if_eq VAR_RESULT, FEMALE, PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale
closemessage
applymovement LOCALID_MOM, Common_Movement_FaceOriginalDirection
applymovement LOCALID_PLAYERS_HOUSE_1F_MOM, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end

13
data/scripts/pkmn_center_nurse_frlg.inc
View File

@ -1,3 +1,16 @@
EventScript_AfterWhiteOutHeal_Frlg::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
msgbox gText_FirstShouldRestoreMonsHealth
call EventScript_PkmnCenterNurse_TakeAndHealPkmn_Frlg
call_if_unset FLAG_DEFEATED_BROCK, EventScript_AfterWhiteOutHealMsgPreFirstBoss
call_if_set FLAG_DEFEATED_BROCK, EventScript_AfterWhiteOutHealMsg
applymovement VAR_LAST_TALKED, Movement_Bow
waitmovement 0
fadedefaultbgm
releaseall
end
EventScript_PkmnCenterNurse_Frlg::
message Text_WelcomeWantToHealPkmn_Frlg
waitmessage

2
include/event_scripts.h
View File

@ -630,6 +630,8 @@ extern const u8 EventScript_SelectWithoutRegisteredItem[];
extern const u8 EventScript_WhiteOut[];
extern const u8 EventScript_AfterWhiteOutMomHeal[];
extern const u8 EventScript_AfterWhiteOutHeal[];
extern const u8 EventScript_AfterWhiteOutHeal_Frlg[];
extern const u8 EventScript_AfterWhiteOutHealMsgPreFirstBoss[];
extern const u8 EventScript_ResetMrBriney[];
extern const u8 EventScript_DoLinkRoomExit[];
extern const u8 CableClub_EventScript_TooBusyToNotice[];

2
src/data/heal_locations.json
View File

@ -196,7 +196,7 @@
"respawn_x": 8,
"respawn_y": 5,
"respawn_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F",
"respawn_npc": "LOCALID_MOM"
"respawn_npc": "LOCALID_PLAYERS_HOUSE_1F_MOM"
},
{
"id": "HEAL_LOCATION_VIRIDIAN_CITY",

12
src/field_screen_effect.c
View File

@ -1454,9 +1454,21 @@ static void Task_RushInjuredPokemonToCenter(u8 taskId)
{
DestroyTask(taskId);
if (gTasks[taskId].tIsPlayerHouse)
{
if (IS_FRLG)
StringCopy(gStringVar1, COMPOUND_STRING("PROF. OAK"));
else
StringCopy(gStringVar1, COMPOUND_STRING("PROF. BIRCH"));
ScriptContext_SetupScript(EventScript_AfterWhiteOutMomHeal);
}
else if (IS_FRLG)
{
ScriptContext_SetupScript(EventScript_AfterWhiteOutHeal_Frlg);
}
else
{
ScriptContext_SetupScript(EventScript_AfterWhiteOutHeal);
}
}
break;
}

1
src/heal_location.c
View File

@ -102,4 +102,5 @@ void SetWhiteoutRespawnWarpAndHealerNPC(struct WarpData *warp)
warp->x = sWhiteoutRespawnHealCenterMapIdxs[healLocationId - 1][2];
warp->y = sWhiteoutRespawnHealCenterMapIdxs[healLocationId - 1][3];
gSpecialVar_LastTalked = healNpcLocalId;
gSpecialVar_0x800B = healNpcLocalId;
}