diff options
Diffstat (limited to 'maps/RuinsOfAlphResearchCenter.asm')
| -rw-r--r-- | maps/RuinsOfAlphResearchCenter.asm | 69 |
1 files changed, 31 insertions, 38 deletions
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 1595ce59a..0b136853f 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 RuinsOfAlphResearchCenter_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .GetUnownDex + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING + scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: @@ -22,7 +20,7 @@ RuinsOfAlphResearchCenter_MapScripts: .ScientistCallback: checkscene - if_equal 1, .ShowScientist + ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist return .ShowScientist: @@ -40,7 +38,7 @@ RuinsOfAlphResearchCenter_MapScripts: pause 30 playsound SFX_TRANSACTION pause 30 - spriteface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN + objectface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN opentext writetext UnknownText_0x59278 waitbutton @@ -55,7 +53,7 @@ RuinsOfAlphResearchCenter_MapScripts: waitbutton closetext applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 - setscene 0 + setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING special RestartMapMusic end @@ -63,7 +61,7 @@ ScientistScript_0x591d1: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x591df + ifequal NUM_UNOWN, UnknownScript_0x591df writetext UnknownText_0x59311 waitbutton closetext @@ -79,7 +77,7 @@ ScientistScript_0x591e5: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x5920b + ifequal NUM_UNOWN, UnknownScript_0x5920b checkflag ENGINE_UNOWN_DEX iftrue UnknownScript_0x59205 checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS @@ -112,7 +110,7 @@ ScientistScript_0x59214: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x5922e + ifequal NUM_UNOWN, UnknownScript_0x5922e checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 writetext UnknownText_0x5954f @@ -137,7 +135,7 @@ MapRuinsOfAlphResearchCenterSignpost1Script: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x59247 + ifequal NUM_UNOWN, UnknownScript_0x59247 UnknownScript_0x59241: writetext UnknownText_0x597b6 waitbutton @@ -155,7 +153,7 @@ MapRuinsOfAlphResearchCenterSignpost2Script: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x59260 + ifequal NUM_UNOWN, UnknownScript_0x59260 UnknownScript_0x5925a: writetext UnknownText_0x5980e waitbutton @@ -165,7 +163,7 @@ UnknownScript_0x5925a: UnknownScript_0x59260: writetext UnknownText_0x5982d waitbutton - special Special_UnownPrinter + special UnownPrinter closetext end @@ -393,25 +391,20 @@ UnknownText_0x59886: done RuinsOfAlphResearchCenter_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 6, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 7, 6, RUINS_OF_ALPH_OUTSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script - bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script - bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script - -.ObjectEvents: - db 3 - object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 - object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 - object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6 + warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6 + + db 0 ; coord events + + db 3 ; bg events + bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script + bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script + bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script + + db 3 ; object events + object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 + object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 + object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST |