diff options
| author | surskitty <surskitty@gmail.com> | 2018-02-02 12:04:55 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-02-02 12:08:43 -0500 |
| commit | 955e43c630f76fae2054425a5fdd1fd93aae4066 (patch) | |
| tree | 9a441b272d02968cd68e61335ddc6a7a34cf485e | |
| parent | 1b3a26981240e2c44810bea9c753964b07ceb510 (diff) | |
Labels, labels, labels
| -rw-r--r-- | maps/RadioTower3F.asm | 24 | ||||
| -rw-r--r-- | maps/Route34IlexForestGate.asm | 20 |
2 files changed, 22 insertions, 22 deletions
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 0efc9e2db..dcb404fb8 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -32,13 +32,13 @@ GymGuyScript_0x5e556: faceplayer opentext checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x5e564 + iftrue .NoRockets writetext UnknownText_0x5e682 waitbutton closetext end -UnknownScript_0x5e564: +.NoRockets: writetext UnknownText_0x5e6eb waitbutton closetext @@ -48,37 +48,37 @@ CooltrainerFScript_0x5e56a: faceplayer opentext checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER - iftrue UnknownScript_0x5e59d + iftrue .GotSunnyDay checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x5e58a + iftrue .NoRockets checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER - iftrue UnknownScript_0x5e584 + iftrue .UsedCardKey writetext UnknownText_0x5e754 waitbutton closetext end -UnknownScript_0x5e584: +.UsedCardKey: writetext UnknownText_0x5e7cb waitbutton closetext end -UnknownScript_0x5e58a: +.NoRockets: writetext UnknownText_0x5e7e2 buttonsound verbosegiveitem TM_SUNNY_DAY - iffalse UnknownScript_0x5e5a1 + iffalse .NoRoom writetext UnknownText_0x5e821 waitbutton closetext setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER end -UnknownScript_0x5e59d: +.GotSunnyDay: writetext UnknownText_0x5e85c waitbutton -UnknownScript_0x5e5a1: +.NoRoom: closetext end @@ -131,10 +131,10 @@ MapRadioTower3FSignpost2Script:: writetext UnknownText_0x5eaa4 waitbutton checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER - iftrue UnknownScript_0x5e603 + iftrue .UsedCardKey checkitem CARD_KEY iftrue UnknownScript_0x5e605 -UnknownScript_0x5e603: +.UsedCardKey: closetext end diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 38dc04729..1e717fd25 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -24,9 +24,9 @@ Route34IlexForestGate_MapScripts: appear ROUTE34ILEXFORESTGATE_TEACHER1 return -UnknownScript_0x62d3d: +Route34IlexForestGateCelebiEvent: checkevent EVENT_FOREST_IS_RESTLESS - iffalse UnknownScript_0x62d62 + iffalse .skip showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20 spriteface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT spriteface PLAYER, RIGHT @@ -39,29 +39,29 @@ UnknownScript_0x62d3d: waitbutton closetext applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a -UnknownScript_0x62d62: +.skip: end TeacherScript_0x62d63: faceplayer opentext checkevent EVENT_FOREST_IS_RESTLESS - iftrue UnknownScript_0x62d84 + iftrue .ForestIsRestless checkevent EVENT_GOT_TM12_SWEET_SCENT - iftrue UnknownScript_0x62d7e + iftrue .GotSweetScent writetext UnknownText_0x62d9d buttonsound verbosegiveitem TM_SWEET_SCENT - iffalse UnknownScript_0x62d82 + iffalse .NoRoom setevent EVENT_GOT_TM12_SWEET_SCENT -UnknownScript_0x62d7e: +.GotSweetScent: writetext UnknownText_0x62df6 waitbutton -UnknownScript_0x62d82: +.NoRoom: closetext end -UnknownScript_0x62d84: +.ForestIsRestless: writetext UnknownText_0x62e41 buttonsound closetext @@ -148,7 +148,7 @@ Route34IlexForestGate_MapEvents: .CoordEvents: db 1 - coord_event 4, 7, 0, UnknownScript_0x62d3d + coord_event 4, 7, 0, Route34IlexForestGateCelebiEvent .BGEvents: db 0 |