diff options
Diffstat (limited to 'maps/ElmsLab.asm')
| -rw-r--r-- | maps/ElmsLab.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 14acb93a..41839262 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -18,7 +18,7 @@ ElmsLab_MapScripts: db 0 ; callbacks .MeetElm: - priorityjump .WalkUpToElm + prioritysjump .WalkUpToElm end .DummyScene1: @@ -65,10 +65,10 @@ ElmCheckEverstone: iftrue ElmGiveEverstoneScript checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse ElmCheckTogepiEgg - writebyte TOGEPI + setval TOGEPI special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript - writebyte TOGETIC + setval TOGETIC special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext ElmThoughtEggHatchedText @@ -77,13 +77,13 @@ ElmCheckEverstone: end ElmEggHatchedScript: - writebyte TOGEPI + setval TOGEPI special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript - writebyte TOGETIC + setval TOGETIC special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript - jump ElmCheckGotEggAgain + sjump ElmCheckGotEggAgain ElmCheckTogepiEgg: checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE @@ -133,17 +133,17 @@ CyndaquilPokeBallScript: writetext ChoseStarterText promptbutton waitsfx - pokenamemem CYNDAQUIL, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, CYNDAQUIL writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx promptbutton givepoke CYNDAQUIL, 5, BERRY closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal RIGHT, ElmDirectionsScript applymovement PLAYER, AfterCyndaquilMovement - jump ElmDirectionsScript + sjump ElmDirectionsScript TotodilePokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -163,7 +163,7 @@ TotodilePokeBallScript: writetext ChoseStarterText promptbutton waitsfx - pokenamemem TOTODILE, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, TOTODILE writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -171,7 +171,7 @@ TotodilePokeBallScript: givepoke TOTODILE, 5, BERRY closetext applymovement PLAYER, AfterTotodileMovement - jump ElmDirectionsScript + sjump ElmDirectionsScript ChikoritaPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -191,7 +191,7 @@ ChikoritaPokeBallScript: writetext ChoseStarterText promptbutton waitsfx - pokenamemem CHIKORITA, STRING_BUFFER_3 + getmonname STRING_BUFFER_3, CHIKORITA writetext ReceivedStarterText playsound SFX_CAUGHT_MON waitsfx @@ -199,7 +199,7 @@ ChikoritaPokeBallScript: givepoke CHIKORITA, 5, BERRY closetext applymovement PLAYER, AfterChikoritaMovement - jump ElmDirectionsScript + sjump ElmDirectionsScript DidntChooseStarterScript: writetext DidntChooseStarterText @@ -267,7 +267,7 @@ ElmsLabHealingMachine: ElmsLabHealingMachine_HealParty: special HealParty playmusic MUSIC_NONE - writebyte HEALMACHINE_ELMS_LAB + setval HEALMACHINE_ELMS_LAB special HealMachineAnim pause 30 special RestartMapMusic @@ -376,7 +376,7 @@ ElmGiveTicketScript: ElmJumpBackScript1: closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal DOWN, ElmJumpDownScript ifequal UP, ElmJumpUpScript ifequal LEFT, ElmJumpLeftScript @@ -385,7 +385,7 @@ ElmJumpBackScript1: ElmJumpBackScript2: closetext - checkcode VAR_FACING + readvar VAR_FACING ifequal DOWN, ElmJumpUpScript ifequal UP, ElmJumpDownScript ifequal LEFT, ElmJumpRightScript @@ -455,7 +455,7 @@ AideScript_GiveYouBalls: opentext writetext AideText_GiveYouBalls promptbutton - itemtotext POKE_BALL, STRING_BUFFER_4 + getitemname STRING_BUFFER_4, POKE_BALL scall AideScript_ReceiveTheBalls giveitem POKE_BALL, 5 writetext AideText_ExplainBalls @@ -526,7 +526,7 @@ ElmsLabWindow: iftrue .Normal checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON iftrue .BreakIn - jump .Normal + sjump .Normal .BreakIn: writetext ElmsLabWindowText2 |