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-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCity_House5/scripts.inc
+17 -23
View File
@@ -6,14 +6,12 @@ CeruleanCity_House5_EventScript_BerryPowderMan::
faceplayer
goto_if_set FLAG_GOT_POWDER_JAR, CeruleanCity_House5_EventScript_AskToExchangePowder
msgbox CeruleanCity_House1_Text_AnyInterestInBerries, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CeruleanCity_House5_EventScript_NoInterestInBerries
goto_if_eq VAR_RESULT, NO, CeruleanCity_House5_EventScript_NoInterestInBerries
goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, CeruleanCity_House5_EventScript_NoBerries
msgbox CeruleanCity_House1_Text_HaveJustTheThing
setflag FLAG_GOT_POWDER_JAR
giveitem ITEM_POWDER_JAR
compare VAR_RESULT, FALSE
goto_if_eq EventScript_BagIsFull
goto_if_eq VAR_RESULT, FALSE, EventScript_BagIsFull
msgbox CeruleanCity_House1_Text_GoCrushBerriesAtDirectCorner
release
end
@@ -57,77 +55,77 @@ CeruleanCity_House5_EventScript_ChooseExchangeItem::
end
CeruleanCity_House5_EventScript_EnergyPowder::
getitemname 0, ITEM_ENERGY_POWDER
bufferitemname STR_VAR_1, ITEM_ENERGY_POWDER
setvar VAR_0x8008, ITEM_ENERGY_POWDER
setvar VAR_0x8009, 50
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_EnergyRoot::
getitemname 0, ITEM_ENERGY_ROOT
bufferitemname STR_VAR_1, ITEM_ENERGY_ROOT
setvar VAR_0x8008, ITEM_ENERGY_ROOT
setvar VAR_0x8009, 80
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_HealPowder::
getitemname 0, ITEM_HEAL_POWDER
bufferitemname STR_VAR_1, ITEM_HEAL_POWDER
setvar VAR_0x8008, ITEM_HEAL_POWDER
setvar VAR_0x8009, 50
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_RevivalHerb::
getitemname 0, ITEM_REVIVAL_HERB
bufferitemname STR_VAR_1, ITEM_REVIVAL_HERB
setvar VAR_0x8008, ITEM_REVIVAL_HERB
setvar VAR_0x8009, 300
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_Protein::
getitemname 0, ITEM_PROTEIN
bufferitemname STR_VAR_1, ITEM_PROTEIN
setvar VAR_0x8008, ITEM_PROTEIN
setvar VAR_0x8009, 1000
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_Iron::
getitemname 0, ITEM_IRON
bufferitemname STR_VAR_1, ITEM_IRON
setvar VAR_0x8008, ITEM_IRON
setvar VAR_0x8009, 1000
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_Carbos::
getitemname 0, ITEM_CARBOS
bufferitemname STR_VAR_1, ITEM_CARBOS
setvar VAR_0x8008, ITEM_CARBOS
setvar VAR_0x8009, 1000
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_Calcium::
getitemname 0, ITEM_CALCIUM
bufferitemname STR_VAR_1, ITEM_CALCIUM
setvar VAR_0x8008, ITEM_CALCIUM
setvar VAR_0x8009, 1000
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_Zinc::
getitemname 0, ITEM_ZINC
bufferitemname STR_VAR_1, ITEM_ZINC
setvar VAR_0x8008, ITEM_ZINC
setvar VAR_0x8009, 1000
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_HPUp::
getitemname 0, ITEM_HP_UP
bufferitemname STR_VAR_1, ITEM_HP_UP
setvar VAR_0x8008, ITEM_HP_UP
setvar VAR_0x8009, 1000
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
end
CeruleanCity_House5_EventScript_PPUp::
getitemname 0, ITEM_PP_UP
bufferitemname STR_VAR_1, ITEM_PP_UP
setvar VAR_0x8008, ITEM_PP_UP
setvar VAR_0x8009, 3000
goto CeruleanCity_House5_EventScript_ExchangePowderForItem
@@ -141,21 +139,17 @@ CeruleanCity_House5_EventScript_ExitMenu::
CeruleanCity_House5_EventScript_ExchangePowderForItem::
msgbox CeruleanCity_House1_Text_YoullExchangeBerryPowderForItem, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem
goto_if_eq VAR_RESULT, NO, CeruleanCity_House5_EventScript_ChooseExchangeItem
copyvar VAR_0x8004, VAR_0x8009
specialvar VAR_RESULT, Script_HasEnoughBerryPowder
compare VAR_RESULT, FALSE
goto_if_eq CeruleanCity_House5_EventScript_NotEnoughBerryPowder
goto_if_eq VAR_RESULT, FALSE, CeruleanCity_House5_EventScript_NotEnoughBerryPowder
giveitem VAR_0x8008
compare VAR_RESULT, FALSE
goto_if_eq CeruleanCity_House5_EventScript_BagIsFull
goto_if_eq VAR_RESULT, FALSE, CeruleanCity_House5_EventScript_BagIsFull
copyvar VAR_0x8004, VAR_0x8009
special Script_TakeBerryPowder
special PrintPlayerBerryPowderAmount
msgbox CeruleanCity_House1_Text_TradeMoreBerryPowder, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem
goto_if_eq VAR_RESULT, YES, CeruleanCity_House5_EventScript_ChooseExchangeItem
msgbox CeruleanCity_House1_Text_HopeToSeeYouAgain
special RemoveBerryPowderVendorMenu
release