From 7f0c7528f732c650736b97e623c933ddaed00774 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 24 Sep 2019 14:00:40 -0400 Subject: Finish credits decomp and data dump --- data/maps/IndigoPlateau_Exterior/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps') diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 873224926..8e7705650 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -59,7 +59,7 @@ EventScript_167264:: @ 8167264 setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 removeobject 1 removeobject 2 - special sub_80F39B4 + special Special_Credits waitstate releaseall end -- cgit v1.2.3 From d66767ed9a5eb714b98a4e4dc22728606414c39c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Sep 2019 11:09:28 -0400 Subject: Documentation and cleanup --- data/maps/PokemonLeague_HallOfFame/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps') diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index faadadcda..11df46047 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -37,7 +37,7 @@ EventScript_162D70:: @ 8162D70 call EventScript_1A651A setrespawn SPAWN_PALLET_TOWN fadescreenspeed 1, 24 - special sub_80CA2E4 + special Special_HallOfFame waitstate releaseall end -- cgit v1.2.3 From 38d2b717173e9d6b24766fc3d6e46002db684cf5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 3 Oct 2019 15:20:28 -0400 Subject: Normal hidden item script; hidden item attr enum --- data/maps/CeladonCity_GameCorner/scripts.inc | 10 +++++----- data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc | 6 +++--- data/maps/CeladonCity_Restaurant/scripts.inc | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps') diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index dca647299..9115b2812 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -39,7 +39,7 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D end EventScript_16C6E6:: @ 816C6E6 - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16C790 compare_var_to_value VAR_0x8009, 0 goto_if_eq EventScript_16C734 @@ -134,7 +134,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 checkflag FLAG_0x26E goto_if_eq EventScript_16C849 msgbox gUnknown_8196AF3 - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9990 @@ -198,7 +198,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E checkflag FLAG_0x26F goto_if_eq EventScript_16C8F0 msgbox gUnknown_8196D2B - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 @@ -228,7 +228,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE checkflag FLAG_0x270 goto_if_eq EventScript_16C950 msgbox gUnknown_8196DB7 - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 @@ -263,7 +263,7 @@ EventScript_16C96A:: @ 816C96A end EventScript_16C96C:: @ 816C96C - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 911847541..4a60c9814 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -12,7 +12,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 @@ -191,7 +191,7 @@ EventScript_16CE12:: @ 816CE12 CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 @@ -289,7 +289,7 @@ EventScript_16CF79:: @ 816CF79 CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index e52d88636..379d07271 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -12,7 +12,7 @@ CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD lock faceplayer - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if_eq EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 @@ -20,7 +20,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD goto_if_eq EventScript_16D241 additem ITEM_COIN_CASE, 1 giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE - setflag FLAG_0x243 + setflag FLAG_GOT_COIN_CASE release end -- cgit v1.2.3 From 1f6f5f369bcb2ab28d0fb73b358d075fdc195ba5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 4 Oct 2019 12:55:48 -0400 Subject: wild_pokemon_area and pokedex_area_markers --- data/maps/PalletTown_GarysHouse/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps') diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index dd3f05aa9..9f304b583 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -51,7 +51,7 @@ EventScript_168DB9:: @ 8168DB9 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_MIRAGE_RND_L, 500 + compare_var_to_value VAR_0x4025, 500 goto_if 0, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 -- cgit v1.2.3 From b01da1a59260b2ac54dd876e9cf35d2c1fb944e7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 5 Oct 2019 15:49:05 -0400 Subject: link.c through InitLocalLinkPlayer --- data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc | 4 ++-- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps') diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 7dae5f353..048ca96d6 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16EA79 end @@ -19,7 +19,7 @@ EventScript_16EA79:: @ 816EA79 IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A lock faceplayer - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 7a1941f72..83a42e67d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -220,7 +220,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 goto_if_eq EventScript_171044 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if_eq EventScript_1710F2 - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_1710FC compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 9fc141070..7cdedc60c 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 call_if 1, EventScript_164D50 @@ -26,7 +26,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 faceplayer checkflag FLAG_0x2E2 goto_if_eq EventScript_164DC2 - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_164D90 msgbox gUnknown_817D13B -- cgit v1.2.3