Port some macro/script fixes from pokefirered

This commit is contained in:
GriffinR
2020-01-11 12:02:58 -05:00
parent 8b1595ebc3
commit f2e7b1507e
107 changed files with 528 additions and 561 deletions

View File

@@ -62,7 +62,7 @@ RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE
call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer
compare VAR_TEMP_1, 3
call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer
giveitem_std ITEM_HM04
giveitem ITEM_HM04
setflag FLAG_RECEIVED_HM04
msgbox RusturfTunnel_Text_ExplainStrength, MSGBOX_DEFAULT
closemessage
@@ -317,7 +317,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2
msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat
msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT
giveitem_std ITEM_DEVON_GOODS
giveitem ITEM_DEVON_GOODS
closemessage
applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt
applymovement 6, RusturfTunnel_Movement_GruntEscape