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

setrespawn

Browse Source
This commit is contained in:
PikalaxALT
2019-05-16 13:57:21 -04:00
parent 247608c3b3
commit 4156dd6b57
24 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC
.byte 0 .byte 0
CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7 CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7
setrespawn 7 setrespawn SPAWN_CELADON_CITY
end end
CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB
data/maps/CeruleanCity_Gym/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ EventScript_16AAD3:: @ 816AAD3
special SetFlavorTextFlagFromSpecialVars special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B1 setflag FLAG_0x4B1
setflag FLAG_0x821 setflag FLAG_0x821
setrespawn 4 setrespawn SPAWN_CERULEAN_CITY
setvar VAR_0x8008, 2 setvar VAR_0x8008, 2
call EventScript_1A6B18 call EventScript_1A6B18
goto EventScript_16AAF9 goto EventScript_16AAF9
data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D
.byte 0 .byte 0
CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38 CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38
setrespawn 4 setrespawn SPAWN_CERULEAN_CITY
end end
CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C
data/maps/CinnabarIsland_Gym/scripts.inc
+1 -1
View File
@@ -69,7 +69,7 @@ EventScript_16DA06:: @ 816DA06
special SetFlavorTextFlagFromSpecialVars special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B6 setflag FLAG_0x4B6
setflag FLAG_UNK826 setflag FLAG_UNK826
setrespawn 9 setrespawn SPAWN_CINNABAR_ISLAND
setvar VAR_0x4071, 1 setvar VAR_0x4071, 1
clearflag FLAG_0x062 clearflag FLAG_0x062
setvar VAR_0x8008, 7 setvar VAR_0x8008, 7
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7
.byte 0 .byte 0
CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2 CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2
setrespawn 9 setrespawn SPAWN_CINNABAR_ISLAND
end end
CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6
data/maps/FiveIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1
.byte 0 .byte 0
FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC
setrespawn 18 setrespawn SPAWN_FIVE_ISLAND
end end
FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00
data/maps/FourIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA
.byte 0 .byte 0
FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5 FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5
setrespawn 17 setrespawn SPAWN_FOUR_ISLAND
end end
FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9
data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1
.byte 0 .byte 0
FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC
setrespawn 8 setrespawn SPAWN_FUCHSIA_CITY
end end
FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A
.byte 0 .byte 0
IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65
setrespawn 10 setrespawn SPAWN_INDIGO_PLATEAU
specialvar VAR_RESULT, sub_806E25C specialvar VAR_RESULT, sub_806E25C
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
call_if 1, EventScript_16EA79 call_if 1, EventScript_16EA79
data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF
.byte 0 .byte 0
LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA
setrespawn 5 setrespawn SPAWN_LAVENDER_TOWN
end end
LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -27,7 +27,7 @@ EventScript_170C36:: @ 8170C36
return return
OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E
setrespawn 14 setrespawn SPAWN_ONE_ISLAND
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
call_if 1, EventScript_170C73 call_if 1, EventScript_170C73
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE
end end
EventScript_168CBA:: @ 8168CBA EventScript_168CBA:: @ 8168CBA
setrespawn 1 setrespawn SPAWN_PALLET_TOWN
return return
PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE
data/maps/PewterCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760
.byte 0 .byte 0
PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B
setrespawn 3 setrespawn SPAWN_PEWTER_CITY
end end
PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F
data/maps/PokemonLeague_HallOfFame/scripts.inc
+1 -1
View File
@@ -35,7 +35,7 @@ EventScript_162D70:: @ 8162D70
delay 40 delay 40
setvar VAR_0x4001, 1 setvar VAR_0x4001, 1
call EventScript_1A651A call EventScript_1A651A
setrespawn 1 setrespawn SPAWN_PALLET_TOWN
fadescreenspeed 1, 24 fadescreenspeed 1, 24
special sub_80CA2E4 special sub_80CA2E4
waitstate waitstate
data/maps/Route10_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F
Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A
setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F
setrespawn 13 setrespawn SPAWN_ROUTE10
end end
Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41
data/maps/Route4_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739
Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744
setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F
setrespawn 12 setrespawn SPAWN_ROUTE4
end end
Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B
data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC
.byte 0 .byte 0
SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7 SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7
setrespawn 11 setrespawn SPAWN_SAFFRON_CITY
end end
SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB
data/maps/SevenIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89
.byte 0 .byte 0
SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94 SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94
setrespawn 19 setrespawn SPAWN_SEVEN_ISLAND
end end
SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A
.byte 0 .byte 0
SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A
setrespawn 20 setrespawn SPAWN_SIX_ISLAND
compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0
call_if 1, EventScript_171D89 call_if 1, EventScript_171D89
end end
data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832
.byte 0 .byte 0
ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D
setrespawn 16 setrespawn SPAWN_THREE_ISLAND
end end
ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841
data/maps/TwoIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4
.byte 0 .byte 0
TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF
setrespawn 15 setrespawn SPAWN_TWO_ISLAND
end end
TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3
data/maps/VermilionCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424
.byte 0 .byte 0
VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F
setrespawn 6 setrespawn SPAWN_VERMILION_CITY
end end
VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433
data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0
.byte 0 .byte 0
ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB
setrespawn 2 setrespawn SPAWN_VIRIDIAN_CITY
end end
ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF
include/constants/spawn_points.h
+20 -20
View File
@@ -1,26 +1,26 @@
#ifndef GUARD_CONSTANTS_SPAWN_POINTS_H #ifndef GUARD_CONSTANTS_SPAWN_POINTS_H
#define GUARD_CONSTANTS_SPAWN_POINTS_H #define GUARD_CONSTANTS_SPAWN_POINTS_H
#define SPAWN_PALLET_TOWN 0 #define SPAWN_PALLET_TOWN 1
#define SPAWN_VIRIDIAN_CITY 1 #define SPAWN_VIRIDIAN_CITY 2
#define SPAWN_PEWTER_CITY 2 #define SPAWN_PEWTER_CITY 3
#define SPAWN_CERULEAN_CITY 3 #define SPAWN_CERULEAN_CITY 4
#define SPAWN_LAVENDER_TOWN 4 #define SPAWN_LAVENDER_TOWN 5
#define SPAWN_VERMILION_CITY 5 #define SPAWN_VERMILION_CITY 6
#define SPAWN_CELADON_CITY 6 #define SPAWN_CELADON_CITY 7
#define SPAWN_FUCHSIA_CITY 7 #define SPAWN_FUCHSIA_CITY 8
#define SPAWN_CINNABAR_ISLAND 8 #define SPAWN_CINNABAR_ISLAND 9
#define SPAWN_INDIGO_PLATEAU 9 #define SPAWN_INDIGO_PLATEAU 10
#define SPAWN_SAFFRON_CITY 10 #define SPAWN_SAFFRON_CITY 11
#define SPAWN_ROUTE4 11 #define SPAWN_ROUTE4 12
#define SPAWN_ROUTE10 12 #define SPAWN_ROUTE10 13
#define SPAWN_ONE_ISLAND 13 #define SPAWN_ONE_ISLAND 14
#define SPAWN_TWO_ISLAND 14 #define SPAWN_TWO_ISLAND 15
#define SPAWN_THREE_ISLAND 15 #define SPAWN_THREE_ISLAND 16
#define SPAWN_FOUR_ISLAND 16 #define SPAWN_FOUR_ISLAND 17
#define SPAWN_FIVE_ISLAND 17 #define SPAWN_FIVE_ISLAND 18
#define SPAWN_SEVEN_ISLAND 18 #define SPAWN_SEVEN_ISLAND 19
#define SPAWN_SIX_ISLAND 19 #define SPAWN_SIX_ISLAND 20
#define NUM_SPAWN_POINTS 20 #define NUM_SPAWN_POINTS 20
#endif //GUARD_CONSTANTS_SPAWN_POINTS_H #endif //GUARD_CONSTANTS_SPAWN_POINTS_H