diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 16 | ||||
| -rw-r--r-- | data/maps/BirthIsland_Harbor/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/NavelRock_Harbor/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/VermilionCity/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index bfa50b73f..51ae70416 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4169,7 +4169,7 @@ EventScript_1A8EC5:: @ 81A8EC5 end EventScript_1A8F12:: @ 81A8F12 - multichoice 19, 5, MULTICHOICE_SEA_GALLOP_V23, FALSE + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V23, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FF9 @@ -4192,7 +4192,7 @@ EventScript_1A8F54:: @ 81A8F54 end EventScript_1A8FA1:: @ 81A8FA1 - multichoice 19, 5, MULTICHOICE_SEA_GALLOP_V13, FALSE + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V13, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FEE @@ -4235,7 +4235,7 @@ EventScript_1A900F:: @ 81A900F end EventScript_1A905C:: @ 81A905C - multichoice 19, 5, MULTICHOICE_SEA_GALLOP_V12, FALSE + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V12, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FEE @@ -4271,7 +4271,7 @@ EventScript_1A90DA:: @ 81A90DA goto_if eq, EventScript_1A7AE0 special sub_8112364 fadescreen 1 - special ScrSpecial_SeaGallopFerry + special ScrSpecial_SeagallopFerry waitstate end @@ -4296,9 +4296,9 @@ Movement_1A911C:: @ 81A911C EventScript_1A911E:: @ 81A911E setvar VAR_0x8005, 0 - special Special_DrawSeaGallopDestinationMenu + special Special_DrawSeagallopDestinationMenu waitstate - specialvar VAR_0x8006, Special_GetSelectedSeaGallopDestination + specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_VERMILION_CITY, EventScript_1A91D5 case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0 @@ -4311,9 +4311,9 @@ EventScript_1A911E:: @ 81A911E EventScript_1A917F:: @ 81A917F setvar VAR_0x8005, 1 - special Special_DrawSeaGallopDestinationMenu + special Special_DrawSeagallopDestinationMenu waitstate - specialvar VAR_0x8006, Special_GetSelectedSeaGallopDestination + specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 774837274..6df635f1a 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -7,7 +7,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 message Text_181726 waitmessage setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND - multichoice 20, 8, MULTICHOICE_SEA_GALLOP_VERMILION, FALSE + multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT case 0, EventScript_1A91D5 case 1, EventScript_1A90F6 diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index a82b30573..60832d168 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -8,7 +8,7 @@ NavelRock_Harbor_EventScript_165421:: @ 8165421 message Text_181726 waitmessage setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK - multichoice 20, 8, MULTICHOICE_SEA_GALLOP_VERMILION, FALSE + multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT case 0, EventScript_1A91D5 case 1, EventScript_1A90F6 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index bf1c38578..fcacff2e3 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -175,7 +175,7 @@ EventScript_166B3B:: @ 8166B3B message Text_17FB23 waitmessage setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - multichoice 19, 5, MULTICHOICE_SEA_GALLOP_123, FALSE + multichoice 19, 5, MULTICHOICE_SEAGALLOP_123, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A8FF9 diff --git a/data/specials.inc b/data/specials.inc index 1e38298a2..169ea0182 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -387,7 +387,7 @@ gSpecials:: @ 815FD60 def_special IsThereMonInRoute5Daycare def_special GetNumLevelsGainedForRoute5DaycareMon def_special TakePokemonFromRoute5Daycare - def_special ScrSpecial_SeaGallopFerry + def_special ScrSpecial_SeagallopFerry def_special Special_PlayerPartyContainsSpecies def_special Special_SetSomeVariable def_special HelpSystem_BackupSomeVariable @@ -431,8 +431,8 @@ gSpecials:: @ 815FD60 def_special Special_HasLearnedAllMovesFromCapeBrinkTutor def_special Special_Credits def_special sub_8153810 - def_special Special_DrawSeaGallopDestinationMenu - def_special Special_GetSelectedSeaGallopDestination + def_special Special_DrawSeagallopDestinationMenu + def_special Special_GetSelectedSeagallopDestination def_special sub_8147500 def_special GetPlayerFacingDirection def_special Special_DeoxysSound |