ref: ae909428aebb13ff08dc019b81c42b1c21a47249
parent: 7547ad839cf1c8141b931d08ef16a894e7db68c9
author: surskitty <[email protected]>
date: Thu Feb 1 18:30:17 EST 2018
Incomplete labelling
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -13,23 +13,23 @@
.MapCallbacks:
db 0
-GentlemanScript_0x1917e9:
+PokemonFanClubPresident:
faceplayer
opentext
checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
- iftrue UnknownScript_0x191815
+ iftrue .HeardSpeech
checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL
- iftrue UnknownScript_0x191802
+ iftrue .HeardSpeechButBagFull
writetext UnknownText_0x191881
yesorno
- iffalse UnknownScript_0x19181b
+ iffalse .NotListening
writetext UnknownText_0x191911
buttonsound
-UnknownScript_0x191802:
+.HeardSpeechButBagFull:
writetext UnknownText_0x191a3d
buttonsound
verbosegiveitem RARE_CANDY
- iffalse UnknownScript_0x19181f
+ iffalse .BagFull
setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
writetext UnknownText_0x191a72
waitbutton
@@ -36,16 +36,16 @@
closetext
end
-UnknownScript_0x191815:
+.HeardSpeech:
writetext UnknownText_0x191ae0
waitbutton
closetext
end
-UnknownScript_0x19181b:
+.NotListening:
writetext UnknownText_0x191b38
waitbutton
-UnknownScript_0x19181f:
+.BagFull:
closetext
end
@@ -52,33 +52,33 @@
PokemonFanClubReceptionistScript:
jumptextfaceplayer PokemonFanClubReceptionistText
-FisherScript_0x191824:
+PokemonFanClubClefairyGuy:
faceplayer
opentext
checkevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
- iftrue UnknownScript_0x19185f
+ iftrue .GotLostItem
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x191838
+ iftrue .FoundClefairyDoll
writetext UnknownText_0x191ba0
waitbutton
closetext
end
-UnknownScript_0x191838:
+.FoundClefairyDoll:
writetext UnknownText_0x191bff
checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
- iftrue UnknownScript_0x191844
+ iftrue .MetCopycat
waitbutton
closetext
end
-UnknownScript_0x191844:
+.MetCopycat:
buttonsound
writetext UnknownText_0x191c5a
buttonsound
waitsfx
giveitem LOST_ITEM
- iffalse UnknownScript_0x191865
+ iffalse .NoRoom
disappear POKEMONFANCLUB_FAIRY
writetext UnknownText_0x191d0a
playsound SFX_KEY_ITEM
@@ -88,13 +88,13 @@
closetext
end
-UnknownScript_0x19185f:
+.GotLostItem:
writetext UnknownText_0x191d1e
waitbutton
closetext
end
-UnknownScript_0x191865:
+.NoRoom:
writetext UnknownText_0x191d58
waitbutton
closetext
@@ -115,10 +115,10 @@
end
MapPokemonFanClubSignpost0Script:
- jumptext UnknownText_0x191dfc
+ jumptext PokemonFanClubListenSignText
MapPokemonFanClubSignpost1Script:
- jumptext UnknownText_0x191e29
+ jumptext PokemonFanClubBraggingSignText
UnknownText_0x191881:
text "I'm the CHAIRMAN"
@@ -285,13 +285,13 @@
text "BAYLEEF: Li liif!"
done
-UnknownText_0x191dfc:
+PokemonFanClubListenSignText:
text "Let's all listen"
line "politely to other"
cont "trainers."
done
-UnknownText_0x191e29:
+PokemonFanClubBraggingSignText:
text "If someone brags,"
line "brag right back!"
done
@@ -315,9 +315,9 @@
.ObjectEvents:
db 6
- object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
+ object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubPresident, -1
object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
- object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
+ object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuy, -1
object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1
object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL
object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -24,13 +24,13 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x199338
+ iftrue .ReturnedPart
writetext UnknownText_0x19938d
waitbutton
closetext
end
-UnknownScript_0x199338:
+.ReturnedPart:
writetext UnknownText_0x19940d
waitbutton
closetext
@@ -40,13 +40,13 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x19934c
+ iftrue .ReturnedPart
writetext UnknownText_0x199460
waitbutton
closetext
end
-UnknownScript_0x19934c:
+.ReturnedPart:
writetext UnknownText_0x1994ae
waitbutton
closetext
@@ -62,13 +62,13 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x199366
+ iftrue .ReturnedPart
writetext UnknownText_0x1995fc
waitbutton
closetext
end
-UnknownScript_0x199366:
+.ReturnedPart:
writetext UnknownText_0x19964b
waitbutton
closetext