From 39524cdb766660a7bf6d60379040349652cecc04 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 15 Jul 2015 15:48:44 -0400 Subject: More enumeration of constants, more annotations of scripts. --- maps/DragonShrine.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/DragonShrine.asm') diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 5cde05b25..12b61b4ee 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -116,7 +116,7 @@ UnknownScript_0x18d100: closetext loadmovesprites playsound SFX_ENTER_DOOR - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_CLAIR appear $5 waitbutton @@ -147,7 +147,7 @@ UnknownScript_0x18d100: writetext UnknownText_0x18d520 closetext loadmovesprites - showemote $0, $5, 15 + showemote EMOTE_SHOCK, $5, 15 loadfont writetext UnknownText_0x18d9ae closetext -- cgit v1.2.3 From 894955f9d922de5fc33e6c0aa7af9795dbcbc158 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 Jul 2015 18:10:10 -0400 Subject: Special script annotation, trainer constant enumeration, person-event structure update --- maps/DragonShrine.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'maps/DragonShrine.asm') diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 12b61b4ee..6c6ac51c3 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -23,7 +23,7 @@ UnknownScript_0x18d023: writetext UnknownText_0x18d2ea keeptextopen UnknownScript_0x18d030: - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 @@ -85,7 +85,7 @@ UnknownScript_0x18d0a9: iftrue UnknownScript_0x18d079 checkevent EVENT_002 iftrue UnknownScript_0x18d061 - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x18d049 UnknownScript_0x18d0cb: loadmovesprites @@ -109,7 +109,7 @@ UnknownScript_0x18d0cb: iftrue UnknownScript_0x18d061 checkevent EVENT_002 iftrue UnknownScript_0x18d049 - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x18d030 UnknownScript_0x18d100: writetext UnknownText_0x18d47c @@ -184,13 +184,13 @@ UnknownScript_0x18d100: playsound SFX_ENTER_DOOR disappear $5 waitbutton - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB end ElderScript_0x18d1a5: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x18d1f9 checkevent EVENT_006 iftrue UnknownScript_0x18d1ff @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: ; people-events db 4 - person_event SPRITE_ELDER, 5, 9, $6, $0, 255, 255, $0, 0, ElderScript_0x18d1a5, EVENT_000 - person_event SPRITE_ELDER, 8, 6, $9, $0, 255, 255, $0, 0, ElderScript_0x18d205, EVENT_000 - person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, EVENT_000 - person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_790 + person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790 -- cgit v1.2.3 From 0fcef5fc087dc30817410d7692d53e2c382828d5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 17 Jul 2015 17:17:10 -0400 Subject: More annotations and interpretations of functions and scripts --- maps/DragonShrine.asm | 116 +++++++++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'maps/DragonShrine.asm') diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 6c6ac51c3..e8fdc5016 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -3,91 +3,91 @@ DragonShrine_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x18d01e, $0000 - dw UnknownScript_0x18d022, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 0 -UnknownScript_0x18d01e: - priorityjump UnknownScript_0x18d023 +.Trigger1: + priorityjump DragonShrineTestScript end -UnknownScript_0x18d022: +.Trigger2: end -UnknownScript_0x18d023: +DragonShrineTestScript: applymovement $0, MovementData_0x18d2bf applymovement $2, MovementData_0x18d2c7 loadfont writetext UnknownText_0x18d2ea keeptextopen -UnknownScript_0x18d030: - setevent EVENT_CHRIS2_IN_CABLE_CLUB +.Question1: + setevent EVENT_001 writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0cb - if_equal $3, UnknownScript_0x18d0a9 + if_equal $1, .RightAnswer + if_equal $2, .WrongAnswer + if_equal $3, .RightAnswer end -UnknownScript_0x18d049: +.Question2: setevent EVENT_002 writetext UnknownText_0x18d3d3 keeptextopen loadmenudata MenuDataHeader_0x18d234 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0cb -UnknownScript_0x18d061: + if_equal $1, .RightAnswer + if_equal $2, .RightAnswer + if_equal $3, .WrongAnswer +.Question3: setevent EVENT_003 writetext UnknownText_0x18d3f3 keeptextopen loadmenudata MenuDataHeader_0x18d258 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0cb - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0a9 -UnknownScript_0x18d079: + if_equal $1, .WrongAnswer + if_equal $2, .RightAnswer + if_equal $3, .RightAnswer +.Question4: setevent EVENT_004 writetext UnknownText_0x18d420 keeptextopen loadmenudata MenuDataHeader_0x18d283 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0cb - if_equal $3, UnknownScript_0x18d0a9 -UnknownScript_0x18d091: + if_equal $1, .RightAnswer + if_equal $2, .WrongAnswer + if_equal $3, .RightAnswer +.Question5: setevent EVENT_005 writetext UnknownText_0x18d44a keeptextopen loadmenudata MenuDataHeader_0x18d2a5 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0cb - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0cb -UnknownScript_0x18d0a9: + if_equal $1, .WrongAnswer + if_equal $2, .RightAnswer + if_equal $3, .WrongAnswer +.RightAnswer: checkevent EVENT_005 - iftrue UnknownScript_0x18d100 + iftrue .PassedTheTest writetext UnknownText_0x18d82d keeptextopen checkevent EVENT_004 - iftrue UnknownScript_0x18d091 + iftrue .Question5 checkevent EVENT_003 - iftrue UnknownScript_0x18d079 + iftrue .Question4 checkevent EVENT_002 - iftrue UnknownScript_0x18d061 - checkevent EVENT_CHRIS2_IN_CABLE_CLUB - iftrue UnknownScript_0x18d049 -UnknownScript_0x18d0cb: + iftrue .Question3 + checkevent EVENT_001 + iftrue .Question2 +.WrongAnswer: loadmovesprites spriteface $2, LEFT loadfont @@ -102,16 +102,16 @@ UnknownScript_0x18d0cb: setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG loadfont checkevent EVENT_005 - iftrue UnknownScript_0x18d091 + iftrue .Question5 checkevent EVENT_004 - iftrue UnknownScript_0x18d079 + iftrue .Question4 checkevent EVENT_003 - iftrue UnknownScript_0x18d061 + iftrue .Question3 checkevent EVENT_002 - iftrue UnknownScript_0x18d049 - checkevent EVENT_CHRIS2_IN_CABLE_CLUB - iftrue UnknownScript_0x18d030 -UnknownScript_0x18d100: + iftrue .Question2 + checkevent EVENT_001 + iftrue .Question1 +.PassedTheTest: writetext UnknownText_0x18d47c closetext loadmovesprites @@ -160,7 +160,7 @@ UnknownScript_0x18d100: playsound SFX_GET_BADGE waitbutton special RestartMapMusic - specialphonecall $8 + specialphonecall ELMCALL_MASTERBALL dotrigger $1 domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1 writetext UnknownText_0x18d9f2 @@ -184,30 +184,30 @@ UnknownScript_0x18d100: playsound SFX_ENTER_DOOR disappear $5 waitbutton - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 end ElderScript_0x18d1a5: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB - iftrue UnknownScript_0x18d1f9 + checkevent EVENT_000 + iftrue .DontGiveDratiniYet checkevent EVENT_006 - iftrue UnknownScript_0x18d1ff + iftrue .ReceivedDratini checkevent EVENT_GOT_DRATINI - iffalse UnknownScript_0x18d1c5 + iffalse .GiveDratini checkevent EVENT_BEAT_RIVAL_IN_MT_MOON - iftrue UnknownScript_0x18d1f3 + iftrue .BeatRivalInMtMoon writetext UnknownText_0x18d724 closetext loadmovesprites end -UnknownScript_0x18d1c5: +.GiveDratini: writetext UnknownText_0x18d604 closetext checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x18d1ed + if_equal 6, .PartyFull writetext UnknownText_0x18d697 playsound SFX_CAUGHT_MON waitbutton @@ -221,25 +221,25 @@ UnknownScript_0x18d1c5: loadmovesprites end -UnknownScript_0x18d1ed: +.PartyFull: writetext UnknownText_0x18d6ac closetext loadmovesprites end -UnknownScript_0x18d1f3: +.BeatRivalInMtMoon: writetext UnknownText_0x18d782 closetext loadmovesprites end -UnknownScript_0x18d1f9: +.DontGiveDratiniYet: writetext UnknownText_0x18d5e5 closetext loadmovesprites end -UnknownScript_0x18d1ff: +.ReceivedDratini: writetext UnknownText_0x18d6ca closetext loadmovesprites @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: ; people-events db 4 - person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_CHRIS1_IN_CABLE_CLUB - person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_CHRIS1_IN_CABLE_CLUB - person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 + person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 + person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790 -- cgit v1.2.3 From e674869018ffe8f9be2351b2b569eb7300910e6a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 18 Jul 2015 15:46:38 -0400 Subject: Updated signpost items and person_event flags --- maps/DragonShrine.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps/DragonShrine.asm') diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index e8fdc5016..798b8d4a6 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -684,4 +684,4 @@ DragonShrine_MapEventHeader: person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 - person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790 + person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR -- cgit v1.2.3 From 94129b6b451fc7770ea75ffbdcbaab4967f513bd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 19 Jul 2015 04:58:31 -0400 Subject: Finished the decoration attributes table Interpretation of the Decoration Attributes table is complete. Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map. --- maps/DragonShrine.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'maps/DragonShrine.asm') diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 798b8d4a6..7344e6b6d 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: ; people-events db 4 - person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 - person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 - person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 - person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR + person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 + person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 + person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 + person_event SPRITE_CLAIR, 12, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR -- cgit v1.2.3 From bef792f2d21ccac0127aeffd9e0838aba81f44b6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 20 Jul 2015 03:51:52 -0400 Subject: More label updates, moved predefs to new file Also named most of the engine and event flag constants. --- maps/DragonShrine.asm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'maps/DragonShrine.asm') diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 7344e6b6d..af1d5ff46 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -23,7 +23,7 @@ DragonShrineTestScript: writetext UnknownText_0x18d2ea keeptextopen .Question1: - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 @@ -35,7 +35,7 @@ DragonShrineTestScript: end .Question2: - setevent EVENT_002 + setevent EVENT_DRAGON_SHRINE_QUESTION_2 writetext UnknownText_0x18d3d3 keeptextopen loadmenudata MenuDataHeader_0x18d234 @@ -45,7 +45,7 @@ DragonShrineTestScript: if_equal $2, .RightAnswer if_equal $3, .WrongAnswer .Question3: - setevent EVENT_003 + setevent EVENT_DRAGON_SHRINE_QUESTION_3 writetext UnknownText_0x18d3f3 keeptextopen loadmenudata MenuDataHeader_0x18d258 @@ -55,7 +55,7 @@ DragonShrineTestScript: if_equal $2, .RightAnswer if_equal $3, .RightAnswer .Question4: - setevent EVENT_004 + setevent EVENT_DRAGON_SHRINE_QUESTION_4 writetext UnknownText_0x18d420 keeptextopen loadmenudata MenuDataHeader_0x18d283 @@ -65,7 +65,7 @@ DragonShrineTestScript: if_equal $2, .WrongAnswer if_equal $3, .RightAnswer .Question5: - setevent EVENT_005 + setevent EVENT_DRAGON_SHRINE_QUESTION_5 writetext UnknownText_0x18d44a keeptextopen loadmenudata MenuDataHeader_0x18d2a5 @@ -75,17 +75,17 @@ DragonShrineTestScript: if_equal $2, .RightAnswer if_equal $3, .WrongAnswer .RightAnswer: - checkevent EVENT_005 + checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .PassedTheTest writetext UnknownText_0x18d82d keeptextopen - checkevent EVENT_004 + checkevent EVENT_DRAGON_SHRINE_QUESTION_4 iftrue .Question5 - checkevent EVENT_003 + checkevent EVENT_DRAGON_SHRINE_QUESTION_3 iftrue .Question4 - checkevent EVENT_002 + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 iftrue .Question3 - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Question2 .WrongAnswer: loadmovesprites @@ -101,15 +101,15 @@ DragonShrineTestScript: loadmovesprites setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG loadfont - checkevent EVENT_005 + checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .Question5 - checkevent EVENT_004 + checkevent EVENT_DRAGON_SHRINE_QUESTION_4 iftrue .Question4 - checkevent EVENT_003 + checkevent EVENT_DRAGON_SHRINE_QUESTION_3 iftrue .Question3 - checkevent EVENT_002 + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 iftrue .Question2 - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Question1 .PassedTheTest: writetext UnknownText_0x18d47c @@ -184,15 +184,15 @@ DragonShrineTestScript: playsound SFX_ENTER_DOOR disappear $5 waitbutton - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS end ElderScript_0x18d1a5: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue .DontGiveDratiniYet - checkevent EVENT_006 + checkevent EVENT_JUST_RECEIVED_DRATINI iftrue .ReceivedDratini checkevent EVENT_GOT_DRATINI iffalse .GiveDratini @@ -215,7 +215,7 @@ ElderScript_0x18d1a5: checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG special SpecialDratini setevent EVENT_GOT_DRATINI - setevent EVENT_006 + setevent EVENT_JUST_RECEIVED_DRATINI writetext UnknownText_0x18d6ca closetext loadmovesprites @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: ; people-events db 4 - person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 - person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 - person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 + person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_CLAIR, 12, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR -- cgit v1.2.3 From 5631bdc0d7f90d5036b71489883d787715983d41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 21 Jul 2015 00:02:21 -0400 Subject: Added labels to different parts of the map script and event headers --- maps/DragonShrine.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'maps/DragonShrine.asm') diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index af1d5ff46..0136c24bc 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,12 +1,12 @@ DragonShrine_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger1: @@ -668,18 +668,18 @@ DragonShrine_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $9, $4, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F warp_def $9, $5, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS -- cgit v1.2.3