dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokefirered

Browse Source
This commit is contained in:
SatoMew
2019-10-08 22:46:32 +01:00
parent 78558b07b0 2a7205dec6
commit 2c254082de
359 changed files with 44517 additions and 121350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_GameCorner/scripts.inc
+5 -5
View File
@@ -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
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+3 -3
View File
@@ -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
data/maps/CeladonCity_Restaurant/scripts.inc
+2 -2
View File
@@ -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
data/maps/IndigoPlateau_Exterior/scripts.inc
+1 -1
View File
@@ -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
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -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
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -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
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -1
View File
@@ -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
data/maps/PokemonLeague_HallOfFame/scripts.inc
+1 -1
View File
@@ -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
data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
+2 -2
View File
@@ -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