summaryrefslogtreecommitdiff
path: root/scripts/pokemontower6.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-21 10:36:03 -0700
committerYamaArashi <shadow962@live.com>2015-07-21 10:36:03 -0700
commit73171bfff573fa8900563319c014f3e626db6b3e (patch)
tree402ca266578eb759a30f52e05b031bad93d45ee6 /scripts/pokemontower6.asm
parentcbcdb2ec2a013beba4f321988e393419a8eed10e (diff)
named most of the used events
Diffstat (limited to 'scripts/pokemontower6.asm')
-rwxr-xr-xscripts/pokemontower6.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm
index 68260484..37ca1b33 100755
--- a/scripts/pokemontower6.asm
+++ b/scripts/pokemontower6.asm
@@ -22,7 +22,7 @@ PokemonTower6ScriptPointers: ; 60b0d (18:4b0d)
dw PokemonTower6Script4
PokemonTower6Script0: ; 60b17 (18:4b17)
- CheckEvent EVENT_10F
+ CheckEvent EVENT_BEAT_GHOST_MAROWAK
jp nz, CheckFightingMapTrainers
ld hl, CoordsData_60b45
call ArePlayerCoordsInArray
@@ -59,7 +59,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
ld a, [wBattleResult]
and a
jr nz, .asm_60b82
- SetEvent EVENT_10F
+ SetEvent EVENT_BEAT_GHOST_MAROWAK
ld a, $7
ld [hSpriteIndexOrTextID], a
call DisplayTextID