summaryrefslogtreecommitdiff
path: root/engine/events/bug_contest
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-06-25 02:10:37 +0200
committermid-kid <esteve.varela@gmail.com>2018-06-25 02:10:37 +0200
commit5efce10789bc8291ca5517bdeaacab95459b3fdb (patch)
tree94eaaa56e9c7d869dd6ffe86be1abc0af3ccc2b9 /engine/events/bug_contest
parent0cbe04da44744073c4c164df970b1571b1fda1a6 (diff)
Remove even more address comments
That should be all of them this time
Diffstat (limited to 'engine/events/bug_contest')
-rw-r--r--engine/events/bug_contest/caught_mon.asm2
-rw-r--r--engine/events/bug_contest/contest.asm12
-rw-r--r--engine/events/bug_contest/display_stats.asm2
-rw-r--r--engine/events/bug_contest/judging.asm15
4 files changed, 14 insertions, 17 deletions
diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm
index fcde2b70a..45212ae3e 100644
--- a/engine/events/bug_contest/caught_mon.asm
+++ b/engine/events/bug_contest/caught_mon.asm
@@ -32,7 +32,7 @@ BugContest_SetCaughtContestMon:
ld hl, wContestMon
jp GeneratePartyMonStats
-.caughttext ; 0xe71d
+.caughttext
; Caught @ !
text_jump UnknownText_0x1c10c0
db "@"
diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm
index e08a434e0..4cf4f949a 100644
--- a/engine/events/bug_contest/contest.asm
+++ b/engine/events/bug_contest/contest.asm
@@ -6,7 +6,7 @@ GiveParkBalls:
farcall StartBugContestTimer
ret
-BugCatchingContestBattleScript:: ; 0x135eb
+BugCatchingContestBattleScript::
writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST
randomwildmon
startbattle
@@ -15,29 +15,29 @@ BugCatchingContestBattleScript:: ; 0x135eb
iffalse BugCatchingContestOutOfBallsScript
end
-BugCatchingContestOverScript:: ; 0x135f8
+BugCatchingContestOverScript::
playsound SFX_ELEVATOR_END
opentext
writetext BugCatchingContestText_BeeepTimesUp
waitbutton
jump BugCatchingContestReturnToGateScript
-BugCatchingContestOutOfBallsScript: ; 0x13603
+BugCatchingContestOutOfBallsScript:
playsound SFX_ELEVATOR_END
opentext
writetext BugCatchingContestText_ContestIsOver
waitbutton
-BugCatchingContestReturnToGateScript: ; 0x1360b
+BugCatchingContestReturnToGateScript:
closetext
jumpstd bugcontestresultswarp
-BugCatchingContestText_BeeepTimesUp: ; 0x1360f
+BugCatchingContestText_BeeepTimesUp:
; ANNOUNCER: BEEEP! Time's up!
text_jump UnknownText_0x1bd2ca
db "@"
-BugCatchingContestText_ContestIsOver: ; 0x13614
+BugCatchingContestText_ContestIsOver:
; ANNOUNCER: The Contest is over!
text_jump UnknownText_0x1bd2e7
db "@"
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index 21380149b..94a5e9511 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -96,7 +96,7 @@ DisplayAlreadyCaughtText:
ld hl, .AlreadyCaughtText
jp PrintText
-.AlreadyCaughtText: ; 0xcc0d0
+.AlreadyCaughtText:
; You already caught a @ .
text_jump UnknownText_0x1c10dd
db "@"
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index 8a77f6ab7..0f5ff2b7c 100644
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -25,7 +25,7 @@ _BugContestJudging:
call PrintText
jp BugContest_GetPlayersResult
-BugContest_FirstPlaceText: ; 0x136eb
+BugContest_FirstPlaceText:
text_jump ContestJudging_FirstPlaceText
start_asm
ld de, SFX_1ST_PLACE
@@ -34,13 +34,12 @@ BugContest_FirstPlaceText: ; 0x136eb
ld hl, BugContest_FirstPlaceScoreText
ret
-BugContest_FirstPlaceScoreText: ; 0x136fd
+BugContest_FirstPlaceScoreText:
; The winning score was @ points!
text_jump ContestJudging_FirstPlaceScoreText
db "@"
-; 0x13702
-BugContest_SecondPlaceText: ; 0x13702
+BugContest_SecondPlaceText:
; Placing second was @ , who caught a @ !@ @
text_jump ContestJudging_SecondPlaceText
start_asm
@@ -50,13 +49,12 @@ BugContest_SecondPlaceText: ; 0x13702
ld hl, BugContest_SecondPlaceScoreText
ret
-BugContest_SecondPlaceScoreText: ; 0x13714
+BugContest_SecondPlaceScoreText:
; The score was @ points!
text_jump ContestJudging_SecondPlaceScoreText
db "@"
-; 0x13719
-BugContest_ThirdPlaceText: ; 0x13719
+BugContest_ThirdPlaceText:
; Placing third was @ , who caught a @ !@ @
text_jump ContestJudging_ThirdPlaceText
start_asm
@@ -66,11 +64,10 @@ BugContest_ThirdPlaceText: ; 0x13719
ld hl, BugContest_ThirdPlaceScoreText
ret
-BugContest_ThirdPlaceScoreText: ; 0x1372b
+BugContest_ThirdPlaceScoreText:
; The score was @ points!
text_jump ContestJudging_ThirdPlaceScoreText
db "@"
-; 0x13730
LoadContestantName:
; If a = 1, get your name.