From a2a17bba926d1465108ab55c47f9145494ff78e5 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 17 Nov 2017 17:50:07 +0100 Subject: more work on wild encounter --- data/scripts/field_move_scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts') diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index fd2ff3b01..76f2aac6b 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -116,7 +116,7 @@ Route111_EventScript_2907FB:: @ 82907FB specialvar VAR_RESULT, sub_81393FC compare_var_to_value VAR_RESULT, 1 goto_eq Route111_EventScript_290829 - special rock_smash_wild_pokemon_encounter + special RockSmashWildEncounter compare_var_to_value VAR_RESULT, 0 goto_eq Route111_EventScript_290829 waitstate -- cgit v1.2.3 From 8fd30813062f9588529461f44df333a6bcfde411 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 18 Nov 2017 16:11:34 +0100 Subject: start working on berry blender --- data/scripts/pokeblocks.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index e77e4d789..d8f2f2e48 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -303,7 +303,7 @@ LilycoveCity_ContestLobby_EventScript_293CEE:: @ 8293CEE LilycoveCity_ContestLobby_EventScript_293D2C:: @ 8293D2C copyvar VAR_0x8004, VAR_0x8009 fadescreen 1 - special sub_807FA80 + special DoBerryBlending waitstate releaseall end @@ -635,7 +635,7 @@ LilycoveCity_ContestLobby_EventScript_294147:: @ 8294147 removeobject 239 removeobject 238 removeobject 237 - special sub_807FA80 + special DoBerryBlending waitstate releaseall end -- cgit v1.2.3 From a3b5af17eabb255e983e61c6306e30f27de82524 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 19 Nov 2017 22:48:46 +0100 Subject: berry blender is done --- data/scripts/pokeblocks.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index d8f2f2e48..a93c44615 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -290,7 +290,7 @@ LilycoveCity_ContestLobby_EventScript_293CEE:: @ 8293CEE checkitem ITEM_POKEBLOCK_CASE, 1 compare_var_to_value VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293D43 - specialvar VAR_RESULT, sub_8136EF4 + specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare_var_to_value VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293D39 specialvar VAR_RESULT, PlayerHasBerries @@ -365,7 +365,7 @@ LilycoveCity_ContestLobby_EventScript_293DC6:: @ 8293DC6 compare_var_to_value VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293E14 msgbox LilycoveCity_ContestLobby_Text_293237, 4 - specialvar VAR_RESULT, sub_8136EF4 + specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare_var_to_value VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91 compare_var_to_value VAR_RESULT, 65535 @@ -431,7 +431,7 @@ LilycoveCity_ContestLobby_EventScript_293EA3:: @ 8293EA3 compare_var_to_value VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293EF1 msgbox LilycoveCity_ContestLobby_Text_29354E, 4 - specialvar VAR_RESULT, sub_8136EF4 + specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare_var_to_value VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E compare_var_to_value VAR_RESULT, 65535 @@ -470,7 +470,7 @@ LilycoveCity_ContestLobby_EventScript_293F28:: @ 8293F28 specialvar VAR_RESULT, PlayerHasBerries compare_var_to_value VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293F1E - specialvar VAR_RESULT, sub_8136EF4 + specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare_var_to_value VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293F64 compare_var_to_value VAR_RESULT, 65535 @@ -536,7 +536,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8:: @ 8293FF8 checkitem ITEM_POKEBLOCK_CASE, 1 compare_var_to_value VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294028 - specialvar VAR_RESULT, sub_8136EF4 + specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare_var_to_value VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_294028 dodailyevents @@ -570,7 +570,7 @@ LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055 checkitem ITEM_POKEBLOCK_CASE, 1 compare_var_to_value VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_29416C - specialvar VAR_RESULT, sub_8136EF4 + specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare_var_to_value VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_294092 compare_var_to_value VAR_RESULT, 65535 -- cgit v1.2.3 From 4e25ef10f2883ef228b7d6c26162d2b00dc3c291 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 20 Nov 2017 16:40:02 +0100 Subject: wild encounter review changes --- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SootopolisCity.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 6f968b4d0..984d53295 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -127,7 +127,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 clearflag FLAG_0x3E6 clearflag FLAG_0x3E5 setflag FLAG_0x347 - setflag FLAG_0x053 + setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS clearflag FLAG_0x3B0 clearflag FLAG_0x3B1 setflag FLAG_SYS_WEATHER_CTRL diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 33b65714b..d9eaee6eb 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -545,7 +545,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 3 - clearflag FLAG_0x053 + clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm BGM_RUNECITY delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -598,7 +598,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 2 - clearflag FLAG_0x053 + clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm BGM_NAMINORI delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 -- cgit v1.2.3