summaryrefslogtreecommitdiff
path: root/maps/ElmsLab.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/ElmsLab.asm')
-rw-r--r--maps/ElmsLab.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index c3e1a51f5..bd228e93b 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -161,7 +161,7 @@ CyndaquilPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface ELMSLAB_ELM, DOWN
- refreshscreen $0
+ refreshscreen
pokepic CYNDAQUIL
cry CYNDAQUIL
waitbutton
@@ -175,7 +175,7 @@ CyndaquilPokeBallScript:
writetext ChoseStarterText
buttonsound
waitsfx
- pokenamemem CYNDAQUIL, $0
+ pokenamemem CYNDAQUIL, MEM_BUFFER_0
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
@@ -191,7 +191,7 @@ TotodilePokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface ELMSLAB_ELM, DOWN
- refreshscreen $0
+ refreshscreen
pokepic TOTODILE
cry TOTODILE
waitbutton
@@ -205,7 +205,7 @@ TotodilePokeBallScript:
writetext ChoseStarterText
buttonsound
waitsfx
- pokenamemem TOTODILE, $0
+ pokenamemem TOTODILE, MEM_BUFFER_0
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
@@ -219,7 +219,7 @@ ChikoritaPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface ELMSLAB_ELM, DOWN
- refreshscreen $0
+ refreshscreen
pokepic CHIKORITA
cry CHIKORITA
waitbutton
@@ -233,7 +233,7 @@ ChikoritaPokeBallScript:
writetext ChoseStarterText
buttonsound
waitsfx
- pokenamemem CHIKORITA, $0
+ pokenamemem CHIKORITA, MEM_BUFFER_0
writetext ReceivedStarterText
playsound SFX_CAUGHT_MON
waitsfx
@@ -311,7 +311,7 @@ ElmsLabHealingMachine_HealParty:
special TrainerRankings_Healings
special HealParty
playmusic MUSIC_NONE
- writebyte 1 ; Machine is in Elm's Lab
+ writebyte HEALMACHINE_ELMS_LAB
special HealMachineAnim
pause 30
special RestartMapMusic
@@ -500,7 +500,7 @@ AideScript_GiveYouBalls:
opentext
writetext AideText_GiveYouBalls
buttonsound
- itemtotext POKE_BALL, $1
+ itemtotext POKE_BALL, MEM_BUFFER_1
scall AideScript_ReceiveTheBalls
giveitem POKE_BALL, 5
writetext AideText_ExplainBalls