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/MauvilleCity_BikeShop/scripts.inc
+6 -6
View File
@@ -44,13 +44,13 @@ MauvilleCity_BikeShop_EventScript_YesFar:: @ 820EC4A
MauvilleCity_BikeShop_EventScript_GetMachBike:: @ 820EC53
msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT
giveitem_std ITEM_MACH_BIKE
giveitem ITEM_MACH_BIKE
goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end
MauvilleCity_BikeShop_EventScript_GetAcroBike:: @ 820EC6D
msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT
giveitem_std ITEM_ACRO_BIKE
giveitem ITEM_ACRO_BIKE
goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end
@@ -89,16 +89,16 @@ MauvilleCity_BikeShop_EventScript_KeepBike:: @ 820ECE5
MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 820ECEF
incrementgamestat GAME_STAT_TRADED_BIKES
msgbox MauvilleCity_BikeShop_Text_ExchangedAcroForMach, MSGBOX_DEFAULT
takeitem ITEM_ACRO_BIKE, 1
giveitem_std ITEM_MACH_BIKE
removeitem ITEM_ACRO_BIKE
giveitem ITEM_MACH_BIKE
goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end
MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 820ED10
incrementgamestat GAME_STAT_TRADED_BIKES
msgbox MauvilleCity_BikeShop_Text_ExchangedMachForAcro, MSGBOX_DEFAULT
takeitem ITEM_MACH_BIKE, 1
giveitem_std ITEM_ACRO_BIKE
removeitem ITEM_MACH_BIKE
giveitem ITEM_ACRO_BIKE
goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
end