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

SEAGALLOP constants in event scripts

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 16:46:58 -04:00
parent ab1ece13cc
commit 7e0956f459
14 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+16 -14
View File
@@ -14,6 +14,7 @@
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/map_objects.h" #include "constants/map_objects.h"
#include "constants/fame_checker.h" #include "constants/fame_checker.h"
#include "constants/seagallop.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/event.inc" .include "asm/macros/event.inc"
.set FALSE, 0 .set FALSE, 0
@@ -250,6 +251,7 @@ gStdScriptsEnd::
.include "data/maps/BirthIsland_Exterior/scripts.inc" .include "data/maps/BirthIsland_Exterior/scripts.inc"
.include "data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc" .include "data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc"
.include "data/maps/BirthIsland_Harbor/scripts.inc" .include "data/maps/BirthIsland_Harbor/scripts.inc"
.include "data/maps/NavelRock_Harbor/scripts.inc"
.include "data/maps/PalletTown/scripts.inc" .include "data/maps/PalletTown/scripts.inc"
.include "data/maps/ViridianCity/scripts.inc" .include "data/maps/ViridianCity/scripts.inc"
.include "data/maps/PewterCity/scripts.inc" .include "data/maps/PewterCity/scripts.inc"
@@ -4198,22 +4200,22 @@ EventScript_1A8FA1:: @ 81A8FA1
end end
EventScript_1A8FE3:: @ 81A8FE3 EventScript_1A8FE3:: @ 81A8FE3
setvar VAR_0x8006, 0 setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A8FEE:: @ 81A8FEE EventScript_1A8FEE:: @ 81A8FEE
setvar VAR_0x8006, 1 setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A8FF9:: @ 81A8FF9 EventScript_1A8FF9:: @ 81A8FF9
setvar VAR_0x8006, 2 setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A9004:: @ 81A9004 EventScript_1A9004:: @ 81A9004
setvar VAR_0x8006, 3 setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
@@ -4243,9 +4245,9 @@ EventScript_1A905C:: @ 81A905C
EventScript_1A909E:: @ 81A909E EventScript_1A909E:: @ 81A909E
specialvar VAR_RESULT, sub_8147500 specialvar VAR_RESULT, sub_8147500
getnumberstring 0, VAR_RESULT getnumberstring 0, VAR_RESULT
compare_var_to_value VAR_0x8004, 0 compare_var_to_value VAR_0x8004, SEAGALLOP_VERMILION_CITY
goto_if eq, EventScript_1A90BE goto_if eq, EventScript_1A90BE
compare_var_to_value VAR_0x8004, 0 compare_var_to_value VAR_0x8004, SEAGALLOP_VERMILION_CITY
goto_if ne, EventScript_1A90CC goto_if ne, EventScript_1A90CC
end end
@@ -4320,42 +4322,42 @@ EventScript_1A917F:: @ 81A917F
end end
EventScript_1A91D5:: @ 81A91D5 EventScript_1A91D5:: @ 81A91D5
setvar VAR_0x8006, 0 setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A91E0:: @ 81A91E0 EventScript_1A91E0:: @ 81A91E0
setvar VAR_0x8006, 1 setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A91EB:: @ 81A91EB EventScript_1A91EB:: @ 81A91EB
setvar VAR_0x8006, 2 setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A91F6:: @ 81A91F6 EventScript_1A91F6:: @ 81A91F6
setvar VAR_0x8006, 3 setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A9201:: @ 81A9201 EventScript_1A9201:: @ 81A9201
setvar VAR_0x8006, 4 setvar VAR_0x8006, SEAGALLOP_FOUR_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A920C:: @ 81A920C EventScript_1A920C:: @ 81A920C
setvar VAR_0x8006, 5 setvar VAR_0x8006, SEAGALLOP_FIVE_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A9217:: @ 81A9217 EventScript_1A9217:: @ 81A9217
setvar VAR_0x8006, 6 setvar VAR_0x8006, SEAGALLOP_SIX_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
EventScript_1A9222:: @ 81A9222 EventScript_1A9222:: @ 81A9222
setvar VAR_0x8006, 7 setvar VAR_0x8006, SEAGALLOP_SEVEN_ISLAND
goto EventScript_1A909E goto EventScript_1A909E
end end
data/maps/BirthIsland_Harbor/scripts.inc
+1 -17
View File
@@ -6,23 +6,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7
faceplayer faceplayer
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, 10 setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND
multichoice 20, 8, 61, 0
switch VAR_RESULT
case 0, EventScript_1A91D5
case 1, EventScript_1A90F6
case 127, EventScript_1A90F6
end
NavelRock_Harbor_MapScripts:: @ 8165420
.byte 0
NavelRock_Harbor_EventScript_165421:: @ 8165421
lock
faceplayer
message Text_181726
waitmessage
setvar VAR_0x8004, 9
multichoice 20, 8, 61, 0 multichoice 20, 8, 61, 0
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A91D5 case 0, EventScript_1A91D5
data/maps/CinnabarIsland/scripts.inc
+2 -2
View File
@@ -219,8 +219,8 @@ EventScript_1670E6:: @ 81670E6
delay 40 delay 40
setflag FLAG_HIDE_CINNABAR_SEAGALLOP setflag FLAG_HIDE_CINNABAR_SEAGALLOP
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
setvar VAR_0x8004, 8 setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND
setvar VAR_0x8006, 1 setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
goto EventScript_1A90DA goto EventScript_1A90DA
end end
data/maps/FiveIsland_Harbor/scripts.inc
+1 -1
View File
@@ -6,6 +6,6 @@ FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
faceplayer faceplayer
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, 5 setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND
goto EventScript_1A900F goto EventScript_1A900F
end end
data/maps/FourIsland_Harbor/scripts.inc
+1 -1
View File
@@ -6,6 +6,6 @@ FourIsland_Harbor_EventScript_171C99:: @ 8171C99
faceplayer faceplayer
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, 4 setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND
goto EventScript_1A900F goto EventScript_1A900F
end end
data/maps/NavelRock_Harbor/scripts.inc
+16 -1
View File
@@ -1 +1,16 @@
@ .include "data/maps/NavelRock_Harbor/scripts.inc"
NavelRock_Harbor_MapScripts:: @ 8165420
.byte 0
NavelRock_Harbor_EventScript_165421:: @ 8165421
lock
faceplayer
message Text_181726
waitmessage
setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK
multichoice 20, 8, 61, 0
switch VAR_RESULT
case 0, EventScript_1A91D5
case 1, EventScript_1A90F6
case 127, EventScript_1A90F6
end
data/maps/OneIsland_Harbor/scripts.inc
+1 -1
View File
@@ -37,6 +37,6 @@ OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
faceplayer faceplayer
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, 1 setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
goto EventScript_1A8EC5 goto EventScript_1A8EC5
end end
data/maps/SevenIsland_Harbor/scripts.inc
+1 -1
View File
@@ -6,6 +6,6 @@ SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5
faceplayer faceplayer
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, 7 setvar VAR_0x8004, SEAGALLOP_SEVEN_ISLAND
goto EventScript_1A900F goto EventScript_1A900F
end end
data/maps/SixIsland_Harbor/scripts.inc
+1 -1
View File
@@ -6,6 +6,6 @@ SixIsland_Harbor_EventScript_171E48:: @ 8171E48
faceplayer faceplayer
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, 6 setvar VAR_0x8004, SEAGALLOP_SIX_ISLAND
goto EventScript_1A900F goto EventScript_1A900F
end end
data/maps/ThreeIsland_Harbor/scripts.inc
+1 -1
View File
@@ -6,6 +6,6 @@ ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA
faceplayer faceplayer
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, 3 setvar VAR_0x8004, SEAGALLOP_THREE_ISLAND
goto EventScript_1A900F goto EventScript_1A900F
end end
data/maps/TwoIsland_Harbor/scripts.inc
+1 -1
View File
@@ -6,6 +6,6 @@ TwoIsland_Harbor_EventScript_171806:: @ 8171806
faceplayer faceplayer
message Text_181726 message Text_181726
waitmessage waitmessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, SEAGALLOP_TWO_ISLAND
goto EventScript_1A8F54 goto EventScript_1A8F54
end end
data/maps/VermilionCity/scripts.inc
+8 -8
View File
@@ -76,7 +76,7 @@ EventScript_166977:: @ 8166977
end end
EventScript_166996:: @ 8166996 EventScript_166996:: @ 8166996
setvar VAR_0x8004, 0 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if ge, EventScript_1669BB goto_if ge, EventScript_1669BB
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
@@ -96,7 +96,7 @@ EventScript_1669BB:: @ 81669BB
call EventScript_166977 call EventScript_166977
compare_var_to_value VAR_RESULT, 1 compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_166A5F goto_if eq, EventScript_166A5F
setvar VAR_0x8004, 0 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
message Text_17FBB8 message Text_17FBB8
waitmessage waitmessage
goto EventScript_1A911E goto EventScript_1A911E
@@ -159,22 +159,22 @@ EventScript_166AB1:: @ 8166AB1
EventScript_166B0B:: @ 8166B0B EventScript_166B0B:: @ 8166B0B
msgbox gUnknown_817FCEC msgbox gUnknown_817FCEC
setvar VAR_0x8004, 0 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
setvar VAR_0x8006, 9 setvar VAR_0x8006, SEAGALLOP_NAVEL_ROCK
goto EventScript_1A90DA goto EventScript_1A90DA
end end
EventScript_166B23:: @ 8166B23 EventScript_166B23:: @ 8166B23
msgbox gUnknown_817FD5F msgbox gUnknown_817FD5F
setvar VAR_0x8004, 0 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
setvar VAR_0x8006, 10 setvar VAR_0x8006, SEAGALLOP_BIRTH_ISLAND
goto EventScript_1A90DA goto EventScript_1A90DA
end end
EventScript_166B3B:: @ 8166B3B EventScript_166B3B:: @ 8166B3B
message Text_17FB23 message Text_17FB23
waitmessage waitmessage
setvar VAR_0x8004, 0 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
multichoice 19, 5, 57, 0 multichoice 19, 5, 57, 0
switch VAR_RESULT switch VAR_RESULT
case 0, EventScript_1A8FEE case 0, EventScript_1A8FEE
@@ -226,7 +226,7 @@ EventScript_166BDE:: @ 8166BDE
end end
EventScript_166BED:: @ 8166BED EventScript_166BED:: @ 8166BED
setvar VAR_0x8004, 0 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if ge, EventScript_1669BB goto_if ge, EventScript_1669BB
compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
include/constants/seagallop.h
+16
View File
@@ -0,0 +1,16 @@
#ifndef GUARD_CONSTANTS_SEAGALLOP_H
#define GUARD_CONSTANTS_SEAGALLOP_H
#define SEAGALLOP_VERMILION_CITY 0
#define SEAGALLOP_ONE_ISLAND 1
#define SEAGALLOP_TWO_ISLAND 2
#define SEAGALLOP_THREE_ISLAND 3
#define SEAGALLOP_FOUR_ISLAND 4
#define SEAGALLOP_FIVE_ISLAND 5
#define SEAGALLOP_SIX_ISLAND 6
#define SEAGALLOP_SEVEN_ISLAND 7
#define SEAGALLOP_CINNABAR_ISLAND 8
#define SEAGALLOP_NAVEL_ROCK 9
#define SEAGALLOP_BIRTH_ISLAND 10
#endif //GUARD_CONSTANTS_SEAGALLOP_H
include/seagallop.h
+1 -14
View File
@@ -1,20 +1,7 @@
#ifndef GUARD_SEAGALLOP_H #ifndef GUARD_SEAGALLOP_H
#define GUARD_SEAGALLOP_H #define GUARD_SEAGALLOP_H
enum SeaGallopDestinations #include "constants/seagallop.h"
{
SEAGALLOP_VERMILION_CITY,
SEAGALLOP_ONE_ISLAND,
SEAGALLOP_TWO_ISLAND,
SEAGALLOP_THREE_ISLAND,
SEAGALLOP_FOUR_ISLAND,
SEAGALLOP_FIVE_ISLAND,
SEAGALLOP_SIX_ISLAND,
SEAGALLOP_SEVEN_ISLAND,
SEAGALLOP_CINNABAR_ISLAND,
SEAGALLOP_NAVEL_ROCK,
SEAGALLOP_BIRTH_ISLAND
};
void ScrSpecial_SeaGallopFerry(void); void ScrSpecial_SeaGallopFerry(void);