diff options
Diffstat (limited to 'maps/MrPokemonsHouse.asm')
| -rw-r--r-- | maps/MrPokemonsHouse.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 779783a5c..fa9ac1206 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -127,20 +127,20 @@ UnknownScript_0x196ec9: domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 specialphonecall $2 - clearevent EVENT_702 + clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x196f49 checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x196f4d - setevent EVENT_641 + setevent EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB end UnknownScript_0x196f49: - setevent EVENT_642 + setevent EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB end UnknownScript_0x196f4d: - setevent EVENT_640 + setevent EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB end MapMrPokemonsHouseSignpost1Script: @@ -384,13 +384,13 @@ MrPokemonsHouse_MapEventHeader: ; signposts db 5 - signpost 1, 0, $0, MapMrPokemonsHouseSignpost1Script - signpost 1, 1, $0, MapMrPokemonsHouseSignpost1Script - signpost 1, 6, $0, MapMrPokemonsHouseSignpost3Script - signpost 1, 7, $0, MapMrPokemonsHouseSignpost3Script - signpost 4, 6, $0, MapMrPokemonsHouseSignpost4Script + signpost 1, 0, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script + signpost 1, 1, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script + signpost 1, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script + signpost 1, 7, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script + signpost 4, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost4Script ; people-events db 2 - person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, -1 - person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C9 + person_event SPRITE_GENTLEMAN, 9, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, GentlemanScript_0x196e97, -1 + person_event SPRITE_OAK, 9, 10, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C9 |