From 507a8f3535f9de3269f2f8d7ce089dc224e93c5f Mon Sep 17 00:00:00 2001 From: surskitty Date: Fri, 2 Feb 2018 11:31:43 -0500 Subject: [PATCH] Ruins of Alph partial labels --- maps/RuinsOfAlphAerodactylChamber.asm | 8 +++--- maps/RuinsOfAlphHoOhChamber.asm | 8 +++--- maps/RuinsOfAlphKabutoChamber.asm | 20 +++++++------- maps/RuinsOfAlphOmanyteChamber.asm | 8 +++--- maps/RuinsOfAlphResearchCenter.asm | 40 +++++++++++++-------------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 91f2967a3..e80dafc21 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -52,10 +52,10 @@ MapRuinsOfAlphAerodactylChamberSignpost2Script: writebyte UNOWNPUZZLE_AERODACTYL special Special_UnownPuzzle closetext - iftrue UnknownScript_0x58df7 + iftrue .PuzzleComplete end -UnknownScript_0x58df7: +.PuzzleComplete: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_3 @@ -90,7 +90,7 @@ MapRuinsOfAlphAerodactylChamberSignpost4Script: MapRuinsOfAlphAerodactylChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER - iftrue UnknownScript_0x58e46 + iftrue .WallOpen opentext writetext UnknownText_0x58e81 writebyte UNOWNWORDS_LIGHT @@ -98,7 +98,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script: closetext end -UnknownScript_0x58e46: +.WallOpen: opentext writetext UnknownText_0x58ea2 waitbutton diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 173f35e39..ef74f2701 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -53,10 +53,10 @@ MapRuinsOfAlphHoOhChamberSignpost2Script: writebyte UNOWNPUZZLE_HO_OH special Special_UnownPuzzle closetext - iftrue UnknownScript_0x585ba + iftrue .PuzzleComplete end -UnknownScript_0x585ba: +.PuzzleComplete: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_4 @@ -91,7 +91,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script: MapRuinsOfAlphHoOhChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER - iftrue UnknownScript_0x58609 + iftrue .WallOpen opentext writetext UnknownText_0x58644 writebyte UNOWNWORDS_HO_OH @@ -99,7 +99,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script: closetext end -UnknownScript_0x58609: +.WallOpen: opentext writetext UnknownText_0x58665 waitbutton diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index df4bcb881..ec13bc04e 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -59,10 +59,10 @@ MapRuinsOfAlphKabutoChamberSignpost2Script: writebyte UNOWNPUZZLE_KABUTO special Special_UnownPuzzle closetext - iftrue UnknownScript_0x58778 + iftrue .PuzzleComplete end -UnknownScript_0x58778: +.PuzzleComplete: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_KABUTO_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_1 @@ -86,27 +86,27 @@ ScientistScript_0x587a8: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x587cf + if_equal NUM_UNOWN, .AllUnownCaught checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER - iftrue UnknownScript_0x587c9 + iftrue .WallOpen checkevent EVENT_SOLVED_KABUTO_PUZZLE - iffalse UnknownScript_0x587c0 + iffalse .PuzzleIncomplete writetext UnknownText_0x589b8 buttonsound -UnknownScript_0x587c0: +.PuzzleIncomplete: writetext UnknownText_0x588f5 waitbutton closetext spriteface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP end -UnknownScript_0x587c9: +.WallOpen: writetext UnknownText_0x5897c waitbutton closetext end -UnknownScript_0x587cf: +.AllUnownCaught: writetext UnknownText_0x594cb waitbutton closetext @@ -128,7 +128,7 @@ MapRuinsOfAlphKabutoChamberSignpost4Script: MapRuinsOfAlphKabutoChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER - iftrue UnknownScript_0x587f7 + iftrue .WallOpen opentext writetext UnknownText_0x58ad9 writebyte UNOWNWORDS_ESCAPE @@ -136,7 +136,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script: closetext end -UnknownScript_0x587f7: +.WallOpen: opentext writetext UnknownText_0x58afa waitbutton diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index e9c937526..a28cd3bdc 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -53,10 +53,10 @@ MapRuinsOfAlphOmanyteChamberSignpost2Script: writebyte UNOWNPUZZLE_OMANYTE special Special_UnownPuzzle closetext - iftrue UnknownScript_0x58c36 + iftrue .PuzzleComplete end -UnknownScript_0x58c36: +.PuzzleComplete: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_2 @@ -91,7 +91,7 @@ MapRuinsOfAlphOmanyteChamberSignpost4Script: MapRuinsOfAlphOmanyteChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER - iftrue UnknownScript_0x58c85 + iftrue .WallOpen opentext writetext UnknownText_0x58cc0 writebyte UNOWNWORDS_WATER @@ -99,7 +99,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script: closetext end -UnknownScript_0x58c85: +.WallOpen: opentext writetext UnknownText_0x58ce1 waitbutton diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 1595ce59a..2ba2abe24 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -63,13 +63,13 @@ ScientistScript_0x591d1: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x591df + if_equal NUM_UNOWN, .PrinterAvailable writetext UnknownText_0x59311 waitbutton closetext end -UnknownScript_0x591df: +.PrinterAvailable: writetext UnknownText_0x5935f waitbutton closetext @@ -79,29 +79,29 @@ ScientistScript_0x591e5: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x5920b + if_equal NUM_UNOWN, .GotAllUnown checkflag ENGINE_UNOWN_DEX - iftrue UnknownScript_0x59205 + iftrue .GotUnownDex checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - iftrue UnknownScript_0x591ff + iftrue .UnownAppeared writetext UnknownText_0x593ed waitbutton closetext end -UnknownScript_0x591ff: +.UnownAppeared: writetext UnknownText_0x59478 waitbutton closetext end -UnknownScript_0x59205: +.GotUnownDex: writetext UnknownText_0x59445 waitbutton closetext end -UnknownScript_0x5920b: +.GotAllUnown: writetext UnknownText_0x594cb waitbutton closetext @@ -112,21 +112,21 @@ ScientistScript_0x59214: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x5922e + if_equal NUM_UNOWN, .GotAllUnown checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - iftrue UnknownScript_0x59228 + iftrue .UnownAppeared writetext UnknownText_0x5954f waitbutton closetext end -UnknownScript_0x59228: +.UnownAppeared: writetext UnknownText_0x595cb waitbutton closetext end -UnknownScript_0x5922e: +.GotAllUnown: writetext UnknownText_0x59769 waitbutton closetext @@ -135,16 +135,16 @@ UnknownScript_0x5922e: MapRuinsOfAlphResearchCenterSignpost1Script: opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST - iftrue UnknownScript_0x59241 + iftrue .SkipChecking checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x59247 -UnknownScript_0x59241: + if_equal NUM_UNOWN, .GotAllUnown +.SkipChecking: writetext UnknownText_0x597b6 waitbutton closetext end -UnknownScript_0x59247: +.GotAllUnown: writetext UnknownText_0x597d9 waitbutton closetext @@ -153,16 +153,16 @@ UnknownScript_0x59247: MapRuinsOfAlphResearchCenterSignpost2Script: opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST - iftrue UnknownScript_0x5925a + iftrue .SkipChecking checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x59260 -UnknownScript_0x5925a: + if_equal NUM_UNOWN, .PrinterAvailable +.SkipChecking: writetext UnknownText_0x5980e waitbutton closetext end -UnknownScript_0x59260: +.PrinterAvailable: writetext UnknownText_0x5982d waitbutton special Special_UnownPrinter