diff --git a/Data/Map380.rxdata b/Data/Map380.rxdata index 37c1e744e..a2f5e73df 100644 Binary files a/Data/Map380.rxdata and b/Data/Map380.rxdata differ diff --git a/Data/Map381.rxdata b/Data/Map381.rxdata index df3264ffe..55f9995d6 100644 Binary files a/Data/Map381.rxdata and b/Data/Map381.rxdata differ diff --git a/Data/Map460.rxdata b/Data/Map460.rxdata index bff22a09c..37ff531c5 100644 Binary files a/Data/Map460.rxdata and b/Data/Map460.rxdata differ diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 786141aff..970ad0795 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -230,6 +230,10 @@ VAR_STAT_FUSION_QUIZ_HIGHEST_SCORE=267 VAR_STAT_FUSION_QUIZ_NB_TIMES=268 VAR_STAT_FUSION_QUIZ_TOTAL_PTS=269 VAR_KARMA=222 +VAR_NB_QUEST_ACTIVE=97 +VAR_NB_QUEST_COMPLETED=98 + + VAR_LUNAR_FEATHERS=282 VAR_FOSSIL=271 diff --git a/Data/Scripts/052_AddOns/QuestLogScript.rb b/Data/Scripts/052_AddOns/QuestLogScript.rb index dd9c9e0e5..4b131f2c1 100644 --- a/Data/Scripts/052_AddOns/QuestLogScript.rb +++ b/Data/Scripts/052_AddOns/QuestLogScript.rb @@ -98,6 +98,7 @@ QUESTS = { "pewter_3" =>Quest.new("pewter_3", "Bug Evolution ", "A Bug Catcher in Pewter City wants you to show him a fully-evolved Bug Pokémon.", QuestBranchHotels, "BWBugCatcher_male", "Pewter City", HotelQuestColor), "pewter_field_1" => Quest.new("pewter_field_1", "Nectar garden", "An old man wants you to bring differently colored flowers for the city's garden.", QuestBranchField, "BW (039)", "Pewter City", FieldQuestColor), "pewter_field_2" => Quest.new("pewter_field_2", "I Choose You!", "A Pikachu in the PokéMart has lost its official Pokémon League Hat. Find one and give it to the Pikachu!", QuestBranchField, "YOUNGSTER_LeagueHat", "Pewter City", FieldQuestColor), + "pewter_field_3" => Quest.new("pewter_field_3", "Prehistoric Amber!", "Meetup with a scientist in Viridian Forest to look for prehistoric amber.", QuestBranchField, "BW (82)", "Pewter City", FieldQuestColor), #Cerulean hotel "cerulean_1" => Quest.new("cerulean_1", "Playing Cupid", "A boy in Cerulean City wants you bring a love letter to a Pokémon Breeder named Maude. She's probably somewhere in one of the routes near Cerulean City", QuestBranchHotels, "BW (18)", "Cerulean City", HotelQuestColor), @@ -234,11 +235,9 @@ def finishQuest(id, silent=false) Kernel.pbMessage("\\C[6]Quest completed!") if !silent - - - $game_variables[222] += 1 # karma - $game_variables[97] -= 1 #nb. quests active - $game_variables[98] += 1 #nb. quests completed + $game_variables[VAR_KARMA] += 1 # karma + $game_variables[VAR_NB_QUEST_ACTIVE] -= 1 #nb. quests active + $game_variables[VAR_NB_QUEST_COMPLETED] += 1 #nb. quests completed pbSetQuest(id, true) end diff --git a/Data/System.rxdata b/Data/System.rxdata index 4cc2ca6a6..58068d404 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ