Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
118 changed files with 605 additions and 638 deletions
+2 -2
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
@@ -314,7 +314,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 OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt
applymovement 6, RusturfTunnel_Movement_GruntEscape