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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-09-03 14:31:04 -04:00
committed by GitHub
parent ab56ac41a1 ccd527b782
commit 0400ee2124
353 changed files with 20156 additions and 19152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PalletTown_RivalsHouse/scripts.inc
+3 -3
View File
@@ -32,7 +32,7 @@ PalletTown_RivalsHouse_EventScript_Daisy::
goto_if_ge VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_RivalsHouse_EventScript_HeardBattledRival
msgbox PalletTown_RivalsHouse_Text_HiBrothersAtLab
closemessage
applymovement LOCALID_DAISY, Movement_FaceOriginalDirection
applymovement LOCALID_DAISY, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -136,12 +136,12 @@ PalletTown_RivalsHouse_EventScript_GiveTownMap::
closemessage
checkitemspace ITEM_TOWN_MAP
goto_if_eq VAR_RESULT, FALSE, PalletTown_RivalsHouse_EventScript_NoRoomForTownMap
applymovement LOCALID_DAISY, Movement_WalkInPlaceFasterRight
applymovement LOCALID_DAISY, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
removeobject LOCALID_TOWN_MAP
setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
delay 15
applymovement LOCALID_DAISY, Movement_FacePlayer
applymovement LOCALID_DAISY, Common_Movement_FacePlayer
waitmovement 0
delay 12
giveitem_msg PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM