diff options
author | surskitty <surskitty@gmail.com> | 2018-01-23 23:40:25 -0500 |
---|---|---|
committer | surskitty <surskitty@gmail.com> | 2018-01-23 23:40:25 -0500 |
commit | 076e604387677c57aad7931c644cb3a7c2025351 (patch) | |
tree | 21c19f88211a1a0520d80e26b69695321d207fda | |
parent | fbc6fe4722f3faa69f4126ea3d2fe3a41fcba16d (diff) |
Labelling some more UnknownScripts. These files remain incomplete.
-rw-r--r-- | maps/Route43MahoganyGate.asm | 8 | ||||
-rw-r--r-- | maps/VermilionPort.asm | 18 | ||||
-rw-r--r-- | maps/ViridianCity.asm | 16 |
3 files changed, 21 insertions, 21 deletions
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index d3d2758ea..d5c29c18a 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -8,17 +8,17 @@ Route43MahoganyGate_MapScripts: .MapCallbacks: db 0 -OfficerScript_0x19ab0b: +Route43MahoganyGateOfficer: faceplayer opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x19ab19 + iftrue .RocketsCleared writetext UnknownText_0x19ab1f waitbutton closetext end -UnknownScript_0x19ab19: +.RocketsCleared: writetext UnknownText_0x19ab65 waitbutton closetext @@ -57,4 +57,4 @@ Route43MahoganyGate_MapEvents: .ObjectEvents: db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index c71739ef6..f698ef9ea 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -149,18 +149,18 @@ SailorScript_0x74e97: checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x74eda - if_equal TUESDAY, UnknownScript_0x74eda - if_equal THURSDAY, UnknownScript_0x74ee0 - if_equal FRIDAY, UnknownScript_0x74ee0 - if_equal SATURDAY, UnknownScript_0x74ee0 + if_equal MONDAY, .NextShipWednesday + if_equal TUESDAY, .NextShipWednesday + if_equal THURSDAY, .NextShipSunday + if_equal FRIDAY, .NextShipSunday + if_equal SATURDAY, .NextShipSunday writetext UnknownText_0x74f4d yesorno iffalse UnknownScript_0x74e87 writetext UnknownText_0x74f8b buttonsound checkitem S_S_TICKET - iffalse UnknownScript_0x74ed4 + iffalse .NoTicket writetext UnknownText_0x74fc2 waitbutton closetext @@ -168,19 +168,19 @@ SailorScript_0x74e97: applymovement PLAYER, MovementData_0x74efe jump SailorScript_0x74dc4 -UnknownScript_0x74ed4: +.NoTicket: writetext UnknownText_0x74ff2 waitbutton closetext end -UnknownScript_0x74eda: +.NextShipWednesday: writetext UnknownText_0x75059 waitbutton closetext end -UnknownScript_0x74ee0: +.NextShipSunday: writetext UnknownText_0x75080 waitbutton closetext diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 1825c1bc7..54899e2a4 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -16,24 +16,24 @@ ViridianCity_MapScripts: setflag ENGINE_FLYPOINT_VIRIDIAN return -GrampsScript_0x1a9a4c: +ViridianCityCoffeeGramps: faceplayer opentext writetext UnknownText_0x1a9aa5 yesorno - iffalse UnknownScript_0x1a9a5b + iffalse .no writetext UnknownText_0x1a9b6f waitbutton closetext end -UnknownScript_0x1a9a5b: +.no: writetext UnknownText_0x1a9bb7 waitbutton closetext end -GrampsScript_0x1a9a61: +ViridianCityGrampsNearGym: faceplayer opentext checkevent EVENT_BLUE_IN_CINNABAR @@ -49,7 +49,7 @@ GrampsScript_0x1a9a61: closetext end -FisherScript_0x1a9a75: +ViridianCityDreamEaterFisher: faceplayer opentext checkevent EVENT_GOT_TM42_DREAM_EATER @@ -241,7 +241,7 @@ ViridianCity_MapEvents: .ObjectEvents: db 4 - object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 - object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 - object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 + object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 + object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 + object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 |