dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
parent 655910a16f 736f3bbbe0
commit e92cc7752b
118 changed files with 605 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route110_TrickHouseEntrance/scripts.inc
+9 -9
View File
@@ -367,7 +367,7 @@ Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 8269E8F
end
Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF
giveitem_std ITEM_RARE_CANDY
giveitem ITEM_RARE_CANDY
compare VAR_RESULT, TRUE
goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
compare VAR_RESULT, FALSE
@@ -377,7 +377,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF
end
Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B
giveitem_std ITEM_TIMER_BALL
giveitem ITEM_TIMER_BALL
compare VAR_RESULT, TRUE
goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
compare VAR_RESULT, FALSE
@@ -387,7 +387,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B
end
Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47
giveitem_std ITEM_HARD_STONE
giveitem ITEM_HARD_STONE
compare VAR_RESULT, TRUE
goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
compare VAR_RESULT, FALSE
@@ -397,7 +397,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47
end
Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73
giveitem_std ITEM_SMOKE_BALL
giveitem ITEM_SMOKE_BALL
compare VAR_RESULT, TRUE
goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
compare VAR_RESULT, FALSE
@@ -407,7 +407,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73
end
Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F
giveitem_std ITEM_TM12
giveitem ITEM_TM12
compare VAR_RESULT, TRUE
goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
compare VAR_RESULT, FALSE
@@ -417,7 +417,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F
end
Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB
giveitem_std ITEM_MAGNET
giveitem ITEM_MAGNET
compare VAR_RESULT, TRUE
goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
compare VAR_RESULT, FALSE
@@ -427,7 +427,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB
end
Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 8269FF7
giveitem_std ITEM_PP_MAX
giveitem ITEM_PP_MAX
compare VAR_RESULT, TRUE
goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
compare VAR_RESULT, FALSE
@@ -464,11 +464,11 @@ Route110_TrickHouseEntrance_EventScript_ChooseTent:: @ 826A070
goto Route110_TrickHouseEntrance_EventScript_GiveBlueTent
Route110_TrickHouseEntrance_EventScript_GiveRedTent:: @ 826A08A
givedecoration_std DECOR_RED_TENT
givedecoration DECOR_RED_TENT
return
Route110_TrickHouseEntrance_EventScript_GiveBlueTent:: @ 826A092
givedecoration_std DECOR_BLUE_TENT
givedecoration DECOR_BLUE_TENT
return
Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A