diff options
Diffstat (limited to 'maps/EarlsPokemonAcademy.asm')
| -rw-r--r-- | maps/EarlsPokemonAcademy.asm | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 64b541994..c77a8afa6 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,3 +1,11 @@ +const_value set 2 + const EARLSPOKEMONACADEMY_FISHER + const EARLSPOKEMONACADEMY_YOUNGSTER1 + const EARLSPOKEMONACADEMY_GAMEBOY_KID1 + const EARLSPOKEMONACADEMY_GAMEBOY_KID2 + const EARLSPOKEMONACADEMY_YOUNGSTER2 + const EARLSPOKEMONACADEMY_POKEDEX + EarlsPokemonAcademy_MapScriptHeader: .MapTriggers: db 0 @@ -6,7 +14,7 @@ EarlsPokemonAcademy_MapScriptHeader: db 0 AcademyEarl: - applymovement $2, MovementData_0x68b2d + applymovement EARLSPOKEMONACADEMY_FISHER, MovementData_0x68b2d faceplayer loadfont writetext UnknownText_0x68b3b @@ -20,14 +28,14 @@ AcademyEarl: yesorno iffalse .Done writetext UnknownText_0x68c7b + waitbutton closetext - loadmovesprites end .Done writetext UnknownText_0x68d31 + waitbutton closetext - loadmovesprites end YoungsterScript_0x68a83: @@ -37,18 +45,18 @@ GameboyKidScript_0x68a86: faceplayer loadfont writetext UnknownText_0x68dda + waitbutton closetext - loadmovesprites - spriteface $4, DOWN + spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN end GameboyKidScript_0x68a91: faceplayer loadfont writetext UnknownText_0x68e07 + waitbutton closetext - loadmovesprites - spriteface $5, DOWN + spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN end YoungsterScript_0x68a9c: @@ -66,32 +74,32 @@ AcademyBlackboard: if_equal $3, .Sleep if_equal $4, .Burn if_equal $5, .Freeze - loadmovesprites + closetext end .Poison writetext AcademyPoisonText - closetext + waitbutton jump .Loop .Paralysis writetext AcademyParalysisText - closetext + waitbutton jump .Loop .Sleep writetext AcademySleepText - closetext + waitbutton jump .Loop .Burn writetext AcademyBurnText - closetext + waitbutton jump .Loop .Freeze: writetext AcademyFreezeText - closetext + waitbutton jump .Loop .MenuHeader @@ -128,9 +136,9 @@ AcademyNotebook: yesorno iffalse .Done writetext AcademyNotebookText3 - closetext + waitbutton .Done - loadmovesprites + closetext end AcademyStickerMachine: |