summaryrefslogtreecommitdiff
path: root/maps/VioletGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VioletGym.asm')
-rw-r--r--maps/VioletGym.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 84effea16..12480e21f 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -4,7 +4,7 @@ const_value set 2
const VIOLETGYM_YOUNGSTER2
const VIOLETGYM_GYM_GUY
-VioletGym_MapScriptHeader:
+VioletGym_MapScripts:
.SceneScripts:
db 0
@@ -20,7 +20,7 @@ FalknerScript_0x683c2:
waitbutton
closetext
winlosstext UnknownText_0x6854a, 0
- loadtrainer FALKNER, 1
+ loadtrainer FALKNER, FALKNER1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_FALKNER
@@ -36,7 +36,7 @@ FalknerScript_0x683c2:
iftrue .SpeechAfterTM
setevent EVENT_BEAT_BIRD_KEEPER_ROD
setevent EVENT_BEAT_BIRD_KEEPER_ABE
- setmapscene ELMS_LAB, $2
+ setmapscene ELMS_LAB, 2
specialphonecall SPECIALCALL_ASSISTANT
writetext UnknownText_0x685c8
buttonsound
@@ -109,7 +109,7 @@ VioletGymStatue:
iftrue .Beaten
jumpstd gymstatue1
.Beaten:
- trainertotext FALKNER, 1, $1
+ trainertotext FALKNER, FALKNER1, MEM_BUFFER_1
jumpstd gymstatue2
UnknownText_0x68473:
@@ -281,7 +281,7 @@ VioletGymGuyWinText:
line "time at all!"
done
-VioletGym_MapEventHeader:
+VioletGym_MapEvents:
; filler
db 0, 0