summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-22 15:57:02 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-22 15:57:02 -0400
commitc8960dd2c8043d9a10e961379996fa18fef34033 (patch)
tree7103b7349bc60badb883fb9385c213bcdfcad71b /maps
parentd5ddd9e54ec2422d6f1cd7c561c1750512d0a81d (diff)
Various annotations
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts. Renamed several functions in home. Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
Diffstat (limited to 'maps')
-rw-r--r--maps/AzaleaGym.asm28
-rw-r--r--maps/GoldenrodFlowerShop.asm34
-rw-r--r--maps/Route35NationalParkgate.asm2
-rw-r--r--maps/Route36NationalParkgate.asm176
4 files changed, 120 insertions, 120 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 263995d6d..4752a7545 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -27,7 +27,7 @@ BugsyScript_0x18ec1e:
scall AzaleaGymTriggerRockets
.FightDone
checkevent EVENT_GOT_TM49_FURY_CUTTER
- iftrue UnknownScript_0x18ec6d
+ iftrue .GotFuryCutter
setevent EVENT_BEAT_TWINS_AMY_AND_MAY
setevent EVENT_BEAT_BUG_CATCHER_BENNY
setevent EVENT_BEAT_BUG_CATCHER_AL
@@ -35,17 +35,17 @@ BugsyScript_0x18ec1e:
writetext UnknownText_0x18ee2b
keeptextopen
verbosegiveitem TM_FURY_CUTTER, 1
- iffalse UnknownScript_0x18ec71
+ iffalse .NoRoomForFuryCutter
setevent EVENT_GOT_TM49_FURY_CUTTER
writetext UnknownText_0x18eefa
closetext
loadmovesprites
end
-UnknownScript_0x18ec6d:
+.GotFuryCutter:
writetext UnknownText_0x18ef98
closetext
-UnknownScript_0x18ec71:
+.NoRoomForFuryCutter:
loadmovesprites
end
@@ -61,9 +61,9 @@ AzaleaGymTriggerRockets:
jumpstd radiotowerrockets
TrainerTwinsAmyandmay1:
- trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, TwinsAmyandmay1Script
+ trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, .AfterScript
-TwinsAmyandmay1Script:
+.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f1fc
@@ -72,9 +72,9 @@ TwinsAmyandmay1Script:
end
TrainerTwinsAmyandmay2:
- trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, TwinsAmyandmay2Script
+ trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, .AfterScript
-TwinsAmyandmay2Script:
+.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f269
@@ -83,9 +83,9 @@ TwinsAmyandmay2Script:
end
TrainerBug_catcherBug_catcher_benny:
- trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, Bug_catcherBug_catcher_bennyScript
+ trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, .AfterScript
-Bug_catcherBug_catcher_bennyScript:
+.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f053
@@ -94,9 +94,9 @@ Bug_catcherBug_catcher_bennyScript:
end
TrainerBug_catcherAl:
- trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, Bug_catcherAlScript
+ trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, .AfterScript
-Bug_catcherAlScript:
+.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f0d3
@@ -105,9 +105,9 @@ Bug_catcherAlScript:
end
TrainerBug_catcherJosh:
- trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, Bug_catcherJoshScript
+ trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, .AfterScript
-Bug_catcherJoshScript:
+.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f17e
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 08f6dc3c9..31193c714 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -5,17 +5,17 @@ GoldenrodFlowerShop_MapScriptHeader:
.MapCallbacks:
db 0
-TeacherScript_0x5535d:
+FlowerShopTeacherScript:
checkevent EVENT_FOUGHT_SUDOWOODO
- iftrue UnknownScript_0x5538f
+ iftrue .Lalala
checkevent EVENT_GOT_SQUIRTBOTTLE
- iftrue UnknownScript_0x55399
+ iftrue .GotSquirtbottle
checkevent EVENT_MET_FLORIA
- iffalse UnknownScript_0x5539f
+ iffalse .HaventMetFloria
checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
- iffalse UnknownScript_0x5538f
+ iffalse .Lalala
checkflag ENGINE_PLAINBADGE
- iffalse UnknownScript_0x5539c
+ iffalse .NoPlainBadge
faceplayer
loadfont
writetext UnknownText_0x554c2
@@ -27,7 +27,7 @@ TeacherScript_0x5535d:
clearevent EVENT_FLORIA_AT_FLOWER_SHOP
end
-UnknownScript_0x5538f:
+.Lalala:
spriteface $2, LEFT
loadfont
writetext UnknownText_0x5552e
@@ -35,22 +35,22 @@ UnknownScript_0x5538f:
loadmovesprites
end
-UnknownScript_0x55399:
+.GotSquirtbottle:
jumptextfaceplayer UnknownText_0x5550d
-UnknownScript_0x5539c:
+.NoPlainBadge:
jumptextfaceplayer UnknownText_0x55463
-UnknownScript_0x5539f:
+.HaventMetFloria:
jumptextfaceplayer UnknownText_0x553d4
-LassScript_0x553a2:
+FlowerShopFloriaScript:
faceplayer
loadfont
checkevent EVENT_FOUGHT_SUDOWOODO
- iftrue UnknownScript_0x553c5
+ iftrue .FoughtSudowoodo
checkevent EVENT_GOT_SQUIRTBOTTLE
- iftrue UnknownScript_0x553bf
+ iftrue .GotSquirtbottle
writetext UnknownText_0x55561
closetext
loadmovesprites
@@ -59,13 +59,13 @@ LassScript_0x553a2:
clearevent EVENT_FLORIA_AT_SUDOWOODO
end
-UnknownScript_0x553bf:
+.GotSquirtbottle:
writetext UnknownText_0x555e6
closetext
loadmovesprites
end
-UnknownScript_0x553c5:
+.FoughtSudowoodo:
writetext UnknownText_0x55604
closetext
loadmovesprites
@@ -172,5 +172,5 @@ GoldenrodFlowerShop_MapEventHeader:
.PersonEvents:
db 2
- person_event SPRITE_TEACHER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x5535d, -1
- person_event SPRITE_LASS, 10, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_FLORIA_AT_FLOWER_SHOP
+ person_event SPRITE_TEACHER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, FlowerShopTeacherScript, -1
+ person_event SPRITE_LASS, 10, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
index 2d166ebe0..64a37061a 100644
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -135,7 +135,7 @@ Route35NationalParkgate_LeaveTheRestBehind:
if_equal 0, Route35NationalParkgate_NoRoomInBox
Route35NationalParkgate_LessThanFullParty: ; 6a27d
- special Function71ac
+ special CheckFirstMonIsEgg
if_equal $1, Route35NationalParkgate_FirstMonIsEgg
writetext UnknownText_0x6a4c6
yesorno
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index 49a869255..c01e66d5b 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -3,59 +3,59 @@ Route36NationalParkgate_MapScriptHeader:
db 3
; triggers
- dw UnknownScript_0x6ab11, $0000
- dw UnknownScript_0x6ab12, $0000
- dw UnknownScript_0x6ab13, $0000
+ dw .Trigger1, $0000
+ dw .Trigger2, $0000
+ dw .Trigger3, $0000
.MapCallbacks:
db 2
; callbacks
- dbw 5, UnknownScript_0x6ab17
+ dbw 5, .CheckIfContestRunning
- dbw 2, UnknownScript_0x6ab23
+ dbw 2, .CheckIfContestAvailable
-UnknownScript_0x6ab11:
+.Trigger1:
end
-UnknownScript_0x6ab12:
+.Trigger2:
end
-UnknownScript_0x6ab13:
- priorityjump UnknownScript_0x6ab47
+.Trigger3:
+ priorityjump .LeftTheContestEarly
end
-UnknownScript_0x6ab17:
+.CheckIfContestRunning:
checkflag ENGINE_BUG_CONTEST_TIMER
- iftrue UnknownScript_0x6ab20
+ iftrue .BugContestIsRunning
dotrigger $0
return
-UnknownScript_0x6ab20:
+.BugContestIsRunning:
dotrigger $2
return
-UnknownScript_0x6ab23:
+.CheckIfContestAvailable:
checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
- iftrue UnknownScript_0x6ab46
+ iftrue .Return
checkcode VAR_WEEKDAY
- if_equal TUESDAY, UnknownScript_0x6ab42
- if_equal THURSDAY, UnknownScript_0x6ab42
- if_equal SATURDAY, UnknownScript_0x6ab42
+ if_equal TUESDAY, .SetContestOfficer
+ if_equal THURSDAY, .SetContestOfficer
+ if_equal SATURDAY, .SetContestOfficer
checkflag ENGINE_BUG_CONTEST_TIMER
- iftrue UnknownScript_0x6ab42
+ iftrue .SetContestOfficer
disappear $2
appear $d
return
-UnknownScript_0x6ab42:
+.SetContestOfficer:
appear $2
disappear $d
-UnknownScript_0x6ab46:
+.Return:
return
-UnknownScript_0x6ab47:
+.LeftTheContestEarly:
spriteface $0, UP
loadfont
checkcode VAR_CONTESTMINUTES
@@ -63,13 +63,13 @@ UnknownScript_0x6ab47:
RAM2MEM $0
writetext UnknownText_0x6b284
yesorno
- iffalse UnknownScript_0x6ab76
+ iffalse .GoBackToContest
writetext UnknownText_0x6b2c5
closetext
loadmovesprites
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
- scall UnknownScript_0x6ab8c
+ scall .CopyContestants
disappear $2
appear $d
applymovement $0, MovementData_0x6add1
@@ -77,7 +77,7 @@ UnknownScript_0x6ab47:
special Special_FadeInQuickly
jumpstd bugcontestresults
-UnknownScript_0x6ab76:
+.GoBackToContest:
writetext UnknownText_0x6b300
closetext
loadmovesprites
@@ -88,69 +88,69 @@ UnknownScript_0x6ab76:
warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
end
-UnknownScript_0x6ab8c:
+.CopyContestants:
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
- iftrue UnknownScript_0x6ab94
+ iftrue .Not1
appear $3
-UnknownScript_0x6ab94:
+.Not1:
checkevent EVENT_BUG_CATCHING_CONTESTANT_2A
- iftrue UnknownScript_0x6ab9c
+ iftrue .Not2
appear $4
-UnknownScript_0x6ab9c:
+.Not2:
checkevent EVENT_BUG_CATCHING_CONTESTANT_3A
- iftrue UnknownScript_0x6aba4
+ iftrue .Not3
appear $5
-UnknownScript_0x6aba4:
+.Not3:
checkevent EVENT_BUG_CATCHING_CONTESTANT_4A
- iftrue UnknownScript_0x6abac
+ iftrue .Not4
appear $6
-UnknownScript_0x6abac:
+.Not4:
checkevent EVENT_BUG_CATCHING_CONTESTANT_5A
- iftrue UnknownScript_0x6abb4
+ iftrue .Not5
appear $7
-UnknownScript_0x6abb4:
+.Not5:
checkevent EVENT_BUG_CATCHING_CONTESTANT_6A
- iftrue UnknownScript_0x6abbc
+ iftrue .Not6
appear $8
-UnknownScript_0x6abbc:
+.Not6:
checkevent EVENT_BUG_CATCHING_CONTESTANT_7A
- iftrue UnknownScript_0x6abc4
+ iftrue .Not7
appear $9
-UnknownScript_0x6abc4:
+.Not7:
checkevent EVENT_BUG_CATCHING_CONTESTANT_8A
- iftrue UnknownScript_0x6abcc
+ iftrue .Not8
appear $a
-UnknownScript_0x6abcc:
+.Not8:
checkevent EVENT_BUG_CATCHING_CONTESTANT_9A
- iftrue UnknownScript_0x6abd4
+ iftrue .Not9
appear $b
-UnknownScript_0x6abd4:
+.Not9:
checkevent EVENT_BUG_CATCHING_CONTESTANT_10A
- iftrue UnknownScript_0x6abdc
+ iftrue .Not10
appear $c
-UnknownScript_0x6abdc:
- special DrawOnMap
+.Not10:
+ special UpdateSprites
end
-OfficerScript_0x6abe0:
+Route36OfficerScriptContest:
checkcode VAR_WEEKDAY
- if_equal SUNDAY, UnknownScript_0x6acf1
- if_equal MONDAY, UnknownScript_0x6acf1
- if_equal WEDNESDAY, UnknownScript_0x6acf1
- if_equal FRIDAY, UnknownScript_0x6acf1
+ if_equal SUNDAY, _ContestNotOn
+ if_equal MONDAY, _ContestNotOn
+ if_equal WEDNESDAY, _ContestNotOn
+ if_equal FRIDAY, _ContestNotOn
faceplayer
loadfont
checkflag ENGINE_DAILY_BUG_CONTEST
- iftrue UnknownScript_0x6ac91
- scall UnknownScript_0x6ad02
+ iftrue Route36Officer_ContestHasConcluded
+ scall Route36Parkgate_DayToText
writetext UnknownText_0x6add5
yesorno
- iffalse UnknownScript_0x6ac73
+ iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
- if_greater_than $1, UnknownScript_0x6ac41
+ if_greater_than $1, .LeaveMonsWithOfficer
special CheckFirstMonFainted
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
-UnknownScript_0x6ac10:
+.ResumeStartingContest:
setflag ENGINE_BUG_CONTEST_TIMER
special PlayMapMusic
writetext UnknownText_0x6ae87
@@ -172,19 +172,19 @@ UnknownScript_0x6ac10:
warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
end
-UnknownScript_0x6ac41:
+.LeaveMonsWithOfficer:
checkcode VAR_PARTYCOUNT
- if_less_than $6, UnknownScript_0x6ac4d
+ if_less_than $6, .ContinueLeavingMons
checkcode VAR_BOXSPACE
- if_equal $0, UnknownScript_0x6ac85
-UnknownScript_0x6ac4d:
- special Function71ac
- if_equal $1, UnknownScript_0x6ac8b
+ if_equal $0, .BoxFull
+.ContinueLeavingMons:
+ special CheckFirstMonIsEgg
+ if_equal $1, .FirstMonIsEgg
writetext UnknownText_0x6afb0
yesorno
- iffalse UnknownScript_0x6ac79
+ iffalse .RefusedToLeaveMons
special CheckFirstMonFainted
- iftrue UnknownScript_0x6ac7f
+ iftrue .FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6b021
keeptextopen
@@ -192,108 +192,108 @@ UnknownScript_0x6ac4d:
playsound SFX_GOT_SAFARI_BALLS
waitbutton
keeptextopen
- jump UnknownScript_0x6ac10
+ jump .ResumeStartingContest
-UnknownScript_0x6ac73:
+.DecidedNotToJoinContest:
writetext UnknownText_0x6b0c6
closetext
loadmovesprites
end
-UnknownScript_0x6ac79:
+.RefusedToLeaveMons:
writetext UnknownText_0x6b081
closetext
loadmovesprites
end
-UnknownScript_0x6ac7f:
+.FirstMonIsFainted:
writetext UnknownText_0x6b0f2
closetext
loadmovesprites
end
-UnknownScript_0x6ac85:
+.BoxFull:
writetext UnknownText_0x6b166
closetext
loadmovesprites
end
-UnknownScript_0x6ac8b:
+.FirstMonIsEgg:
writetext UnknownText_0x6b209
closetext
loadmovesprites
end
-UnknownScript_0x6ac91:
+Route36Officer_ContestHasConcluded:
checkevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
- iftrue UnknownScript_0x6acaf
+ iftrue .Sunstone
checkevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
- iftrue UnknownScript_0x6acbe
+ iftrue .Everstone
checkevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
- iftrue UnknownScript_0x6accd
+ iftrue .GoldBerry
checkevent EVENT_CONTEST_OFFICER_HAS_BERRY
- iftrue UnknownScript_0x6acdc
+ iftrue .Berry
writetext UnknownText_0x6b32b
closetext
loadmovesprites
end
-UnknownScript_0x6acaf:
+.Sunstone:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem SUN_STONE, 1
- iffalse UnknownScript_0x6aceb
+ iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
loadmovesprites
end
-UnknownScript_0x6acbe:
+.Everstone:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem EVERSTONE, 1
- iffalse UnknownScript_0x6aceb
+ iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
loadmovesprites
end
-UnknownScript_0x6accd:
+.GoldBerry:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem GOLD_BERRY, 1
- iffalse UnknownScript_0x6aceb
+ iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
loadmovesprites
end
-UnknownScript_0x6acdc:
+.Berry:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem BERRY, 1
- iffalse UnknownScript_0x6aceb
+ iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_BERRY
loadmovesprites
end
-UnknownScript_0x6aceb:
+.BagFull:
writetext UnknownText_0x6b910
closetext
loadmovesprites
end
-UnknownScript_0x6acf1:
+_ContestNotOn:
jumptextfaceplayer UnknownText_0x6b370
OfficerScript_0x6acf4:
faceplayer
loadfont
checkflag ENGINE_DAILY_BUG_CONTEST
- iftrue UnknownScript_0x6ac91
+ iftrue Route36Officer_ContestHasConcluded
writetext UnknownText_0x6b370
closetext
loadmovesprites
end
-UnknownScript_0x6ad02:
+Route36Parkgate_DayToText:
jumpstd daytotext
end
@@ -862,7 +862,7 @@ Route36NationalParkgate_MapEventHeader:
.PersonEvents:
db 12
- person_event SPRITE_OFFICER, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
+ person_event SPRITE_OFFICER, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
person_event SPRITE_YOUNGSTER, 9, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
person_event SPRITE_ROCKER, 10, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B