Skip to content

Commit 8627799

Browse files
DeokishisuDeokishisu
committed
Add New OW Sprites to VS Seeker Table
All new OW sprites should now animate like their vanilla counterparts did when the VS Seeker triggers a rematch. Additionally, the swimming Master Trainers now use the `RAISE_HAND_AND_SWIM` animation instead of the `RAISE_HAND_AND_STOP` one.
1 parent b271ac6 commit 8627799

File tree

7 files changed

+29
-10
lines changed

7 files changed

+29
-10
lines changed

‎data/maps/Route12/scripts.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ Route12_MapScript_SquirtleMasterMovementType::
3535
return
3636

3737
Route12_MapScript_SeadraMasterMovementType::
38-
setobjectmovementtype LOCALID_SEADRA_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
38+
setobjectmovementtype LOCALID_SEADRA_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
3939
return
4040

4141
Route12_MapScript_GoldeenMasterMovementType::
42-
setobjectmovementtype LOCALID_GOLDEEN_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
42+
setobjectmovementtype LOCALID_GOLDEEN_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
4343
return
4444

4545
Route12_MapScript_PoliwagMasterMovementType::

‎data/maps/Route13/scripts.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Route13_MapScript_SetMasterTrainerMovementTypes::
1616
end
1717

1818
Route13_MapScript_SeakingMasterMovementType::
19-
setobjectmovementtype LOCALID_SEAKING_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
19+
setobjectmovementtype LOCALID_SEAKING_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
2020
return
2121

2222
Route13_MapScript_KakunaMasterMovementType::

‎data/maps/Route19/scripts.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ Route19_MapScript_StaryuMasterMovementType::
2424
return
2525

2626
Route19_MapScript_HorseaMasterMovementType::
27-
setobjectmovementtype LOCALID_HORSEA_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
27+
setobjectmovementtype LOCALID_HORSEA_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
2828
return
2929

3030
Route19_MapScript_ShellderMasterMovementType::
31-
setobjectmovementtype LOCALID_SHELLDER_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
31+
setobjectmovementtype LOCALID_SHELLDER_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
3232
return
3333

3434
Route19_EventScript_RouteSign::

‎data/maps/Route20/scripts.inc

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ Route20_MapScript_SetMasterTrainerMovementTypes::
3434
end
3535

3636
Route20_MapScript_BlastoiseMasterMovementType::
37-
setobjectmovementtype LOCALID_BLASTOISE_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
37+
setobjectmovementtype LOCALID_BLASTOISE_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
3838
return
3939

4040
Route20_MapScript_TentacoolMasterMovementType::
4141
setobjectmovementtype LOCALID_TENTACOOL_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
4242
return
4343

4444
Route20_MapScript_CloysterMasterMovementType::
45-
setobjectmovementtype LOCALID_CLOYSTER_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
45+
setobjectmovementtype LOCALID_CLOYSTER_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
4646
return
4747

4848
Route20_MapScript_WartortleMasterMovementType::
49-
setobjectmovementtype LOCALID_WARTORTLE_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
49+
setobjectmovementtype LOCALID_WARTORTLE_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
5050
return
5151

5252

‎data/maps/Route21_South/scripts.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ Route21_South_MapScript_SlowpokeMasterMovementType::
2020
return
2121

2222
Route21_South_MapScript_PsyduckMasterMovementType::
23-
setobjectmovementtype LOCALID_PSYDUCK_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
23+
setobjectmovementtype LOCALID_PSYDUCK_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
2424
return

‎data/maps/Route4/scripts.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Route4_MapScript_EkansMasterMovementType::
3636
return
3737

3838
Route4_MapScript_GolduckMasterMovementType::
39-
setobjectmovementtype LOCALID_GOLDUCK_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_STOP
39+
setobjectmovementtype LOCALID_GOLDUCK_MASTER, MOVEMENT_TYPE_RAISE_HAND_AND_SWIM
4040
return
4141

4242
Route4_EventScript_Woman::

‎src/vs_seeker.c

+19
Original file line numberDiff line numberDiff line change
@@ -1181,10 +1181,29 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
11811181
case OBJ_EVENT_GFX_BLACKBELT:
11821182
case OBJ_EVENT_GFX_HIKER:
11831183
case OBJ_EVENT_GFX_SAILOR:
1184+
case OBJ_EVENT_GFX_PAINTER:
1185+
case OBJ_EVENT_GFX_BIRD_KEEPER:
1186+
case OBJ_EVENT_GFX_POKEMON_RANGER_M:
1187+
case OBJ_EVENT_GFX_POKEMON_RANGER_F:
1188+
case OBJ_EVENT_GFX_MASTER_BEAUTY:
1189+
case OBJ_EVENT_GFX_RUIN_MANIAC:
1190+
case OBJ_EVENT_GFX_PSYCHIC_M:
1191+
case OBJ_EVENT_GFX_PSYCHIC_F:
1192+
case OBJ_EVENT_GFX_AROMA_LADY:
1193+
case OBJ_EVENT_GFX_TWIN:
1194+
case OBJ_EVENT_GFX_YOUNG_COUPLE_M:
1195+
case OBJ_EVENT_GFX_YOUNG_COUPLE_F:
1196+
case OBJ_EVENT_GFX_ENGINEER:
1197+
case OBJ_EVENT_GFX_JUGGLER:
1198+
case OBJ_EVENT_GFX_TAMER:
1199+
case OBJ_EVENT_GFX_POKEMON_BREEDER:
1200+
case OBJ_EVENT_GFX_LADY:
1201+
case OBJ_EVENT_GFX_ROCKER_2:
11841202
return MOVEMENT_TYPE_RAISE_HAND_AND_JUMP;
11851203
case OBJ_EVENT_GFX_TUBER_M_WATER:
11861204
case OBJ_EVENT_GFX_SWIMMER_M_WATER:
11871205
case OBJ_EVENT_GFX_SWIMMER_F_WATER:
1206+
case OBJ_EVENT_GFX_SWIMMER_F_WATER_2:
11881207
return MOVEMENT_TYPE_RAISE_HAND_AND_SWIM;
11891208
default:
11901209
return MOVEMENT_TYPE_RAISE_HAND_AND_STOP;

0 commit comments

Comments
 (0)