diff options
Diffstat (limited to 'maps/MrPsychicsHouse.asm')
| -rw-r--r-- | maps/MrPsychicsHouse.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 04b570bdf..77f82b91e 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -2,7 +2,7 @@ const_value set 2 const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -15,7 +15,7 @@ MrPsychic: iftrue .AlreadyGotItem writetext MrPsychicText1 buttonsound - verbosegiveitem TM_PSYCHIC + verbosegiveitem TM_PSYCHIC_M iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC .AlreadyGotItem: @@ -56,14 +56,14 @@ MrPsychicsHouse_MapEventHeader: warp_def $7, $2, 5, SAFFRON_CITY warp_def $7, $3, 5, SAFFRON_CITY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 1, 0, SIGNPOST_READ, MrPsychicsHouseBookshelf - signpost 1, 1, SIGNPOST_READ, MrPsychicsHouseBookshelf + bg_event 1, 0, BGEVENT_READ, MrPsychicsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, MrPsychic, -1 + object_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 |