diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:49:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:49:16 -0400 |
| commit | 0e217e22d8fa3e075416cb332435c3756548357e (patch) | |
| tree | 59ef21892a02c9d266f5cac36872458bdbe0de61 /data/maps | |
| parent | 2599dac8ac8c12268fca902910bfe1aab40a68ca (diff) | |
| parent | 6539884c8850aca6c2057017dba9c3d78ca15784 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/IndigoPlateau_Exterior/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PokemonLeague_HallOfFame/scripts.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 873224926..8e7705650 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -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 diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index faadadcda..11df46047 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -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 |