diff options
Diffstat (limited to 'maps/MrPsychicsHouse.asm')
| -rw-r--r-- | maps/MrPsychicsHouse.asm | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index da05c7a9c..f3d20a785 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,34 +1,31 @@ -MrPsychicsHouse_MapScriptHeader: ; 0x18a778 +MrPsychicsHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x18a77a -FishingGuruScript_0x18a77a: ; 0x18a77a +MrPsychic: faceplayer loadfont checkevent EVENT_GOT_TM29_PSYCHIC - iftrue UnknownScript_0x18a78f - writetext UnknownText_0x18a798 + iftrue .AlreadyGotItem + writetext MrPsychicText1 keeptextopen verbosegiveitem TM_29, 1 - iffalse UnknownScript_0x18a793 + iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC -UnknownScript_0x18a78f: ; 0x18a78f - writetext UnknownText_0x18a7bb +.AlreadyGotItem + writetext MrPsychicText2 closetext -UnknownScript_0x18a793: ; 0x18a793 +.Done loadmovesprites end -; 0x18a795 -MapMrPsychicsHouseSignpost1Script: ; 0x18a795 +MrPsychicsHouseBookshelf: jumpstd difficultbookshelf -; 0x18a798 -UnknownText_0x18a798: ; 0x18a798 +MrPsychicText1: text "…" para "…" @@ -39,17 +36,15 @@ UnknownText_0x18a798: ; 0x18a798 para "You wanted this!" done -; 0x18a7bb -UnknownText_0x18a7bb: ; 0x18a7bb +MrPsychicText2: text "TM29 is PSYCHIC." para "It may lower the" line "target's SPCL.DEF." done -; 0x18a7f0 -MrPsychicsHouse_MapEventHeader: ; 0x18a7f0 +MrPsychicsHouse_MapEventHeader: ; filler db 0, 0 @@ -63,10 +58,9 @@ MrPsychicsHouse_MapEventHeader: ; 0x18a7f0 ; signposts db 2 - signpost 1, 0, $0, MapMrPsychicsHouseSignpost1Script - signpost 1, 1, $0, MapMrPsychicsHouseSignpost1Script + signpost 1, 0, $0, MrPsychicsHouseBookshelf + signpost 1, 1, $0, MrPsychicsHouseBookshelf ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, FishingGuruScript_0x18a77a, $ffff -; 0x18a817 + person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, $ffff |