diff options
Diffstat (limited to 'maps/DragonShrine.asm')
| -rw-r--r-- | maps/DragonShrine.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index e5cbf358a..199b43ce8 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -160,7 +160,7 @@ DragonShrineTestScript: playsound SFX_GET_BADGE waitbutton special RestartMapMusic - specialphonecall ELMCALL_MASTERBALL + specialphonecall SPECIALCALL_MASTERBALL dotrigger $1 domaptrigger DRAGONS_DEN_B1F, $1 writetext UnknownText_0x18d9f2 @@ -211,7 +211,7 @@ ElderScript_0x18d1a5: writetext UnknownText_0x18d697 playsound SFX_CAUGHT_MON waitbutton - givepoke DRATINI, 15, 0, 0 + givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG special SpecialDratini setevent EVENT_GOT_DRATINI @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_ELDER, 5, 9, $6, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_ELDER, 8, 6, $9, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_ELDER, 8, 11, $8, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CLAIR, 12, 8, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR + person_event SPRITE_ELDER, 1, 5, $6, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_ELDER, 4, 2, $9, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_ELDER, 4, 7, $8, 0, 0, -1, -1, 0, 0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CLAIR, 8, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR |