Remove all address comments

This commit is contained in:
mid-kid
2018-06-24 16:09:41 +02:00
parent 131875d3e3
commit 1d9a68dbdd
616 changed files with 12133 additions and 20380 deletions

View File

@@ -1,4 +1,4 @@
BugContest_SetCaughtContestMon: ; e6ce
BugContest_SetCaughtContestMon:
ld a, [wContestMon]
and a
jr z, .firstcatch
@@ -18,7 +18,7 @@ BugContest_SetCaughtContestMon: ; e6ce
call PrintText
ret
.generatestats ; e6fd
.generatestats
ld a, [wTempEnemyMonSpecies]
ld [wCurSpecies], a
ld [wCurPartySpecies], a

View File

@@ -1,4 +1,4 @@
GiveParkBalls: ; 135db
GiveParkBalls:
xor a
ld [wContestMon], a
ld a, 20

View File

@@ -1,4 +1,4 @@
SelectRandomBugContestContestants: ; 139a8
SelectRandomBugContestContestants:
; Select five random people to participate in the current contest.
; First we have to make sure that any old data is cleared away.
@@ -54,9 +54,8 @@ SelectRandomBugContestContestants: ; 139a8
dec c
jr nz, .loop2
ret
; 139ed
CheckBugContestContestantFlag: ; 139ed
CheckBugContestContestantFlag:
; Checks the flag of the Bug Catching Contestant whose index is loaded in a.
; Bug: If a >= NUM_BUG_CONTESTANTS when this is called,
@@ -73,11 +72,10 @@ CheckBugContestContestantFlag: ; 139ed
ld b, CHECK_FLAG
call EventFlagAction
ret
; 139fe
INCLUDE "data/events/bug_contest_flags.asm"
ContestDropOffMons: ; 13a12
ContestDropOffMons:
ld hl, wPartyMon1HP
ld a, [hli]
or [hl]
@@ -100,9 +98,8 @@ ContestDropOffMons: ; 13a12
ld a, $1
ld [wScriptVar], a
ret
; 13a31
ContestReturnMons: ; 13a31
ContestReturnMons:
; Restore the species of the second mon.
ld hl, wPartySpecies + 1
ld a, [wBugContestSecondPartySpecies]
@@ -120,4 +117,3 @@ ContestReturnMons: ; 13a31
ld a, b
ld [wPartyCount], a
ret
; 13a47

View File

@@ -1,4 +1,4 @@
DisplayCaughtContestMonStats: ; cc000
DisplayCaughtContestMonStats:
call ClearBGPalettes
call ClearTileMap
call ClearSprites
@@ -86,12 +86,12 @@ DisplayCaughtContestMonStats: ; cc000
.This:
db " THIS <PKMN> @"
SwitchMonText: ; cc0c2
SwitchMonText:
; Switch #MON?
text_jump UnknownText_0x1c10cf
db "@"
DisplayAlreadyCaughtText: ; cc0c7
DisplayAlreadyCaughtText:
call GetPokemonName
ld hl, .AlreadyCaughtText
jp PrintText
@@ -103,5 +103,5 @@ DisplayAlreadyCaughtText: ; cc0c7
DummyPredef2F:
DummyPredef38:
DummyPredef39: ; cc0d5
DummyPredef39:
ret

View File

@@ -1,4 +1,4 @@
_BugContestJudging: ; 1369d
_BugContestJudging:
call ContestScore
farcall StubbedTrainerRankings_BugContestScore
call BugContest_JudgeContestants
@@ -24,7 +24,6 @@ _BugContestJudging: ; 1369d
ld hl, BugContest_FirstPlaceText
call PrintText
jp BugContest_GetPlayersResult
; 136eb
BugContest_FirstPlaceText: ; 0x136eb
text_jump ContestJudging_FirstPlaceText
@@ -34,7 +33,6 @@ BugContest_FirstPlaceText: ; 0x136eb
call WaitSFX
ld hl, BugContest_FirstPlaceScoreText
ret
; 136fd
BugContest_FirstPlaceScoreText: ; 0x136fd
; The winning score was @ points!
@@ -51,7 +49,6 @@ BugContest_SecondPlaceText: ; 0x13702
call WaitSFX
ld hl, BugContest_SecondPlaceScoreText
ret
; 13714
BugContest_SecondPlaceScoreText: ; 0x13714
; The score was @ points!
@@ -68,7 +65,6 @@ BugContest_ThirdPlaceText: ; 0x13719
call WaitSFX
ld hl, BugContest_ThirdPlaceScoreText
ret
; 1372b
BugContest_ThirdPlaceScoreText: ; 0x1372b
; The score was @ points!
@@ -76,7 +72,7 @@ BugContest_ThirdPlaceScoreText: ; 0x1372b
db "@"
; 0x13730
LoadContestantName: ; 13730
LoadContestantName:
; If a = 1, get your name.
dec a ; BUG_CONTEST_PLAYER
jr z, .player
@@ -131,14 +127,12 @@ LoadContestantName: ; 13730
ld de, wBugContestWinnerName
ld bc, NAME_LENGTH
jp CopyBytes
; 13783
INCLUDE "data/events/bug_contest_winners.asm"
; 13807
BugContest_GetPlayersResult: ; 13807
BugContest_GetPlayersResult:
ld hl, wBugContestThirdPlaceWinnerID
ld de, - BUG_CONTESTANT_SIZE
ld b, 3 ; 3rd, 2nd, or 1st
@@ -152,9 +146,8 @@ BugContest_GetPlayersResult: ; 13807
.done
ret
; 13819
BugContest_JudgeContestants: ; 13819
BugContest_JudgeContestants:
call ClearContestResults
call ComputeAIContestantScores
ld hl, wBugContestTempWinnerID
@@ -168,9 +161,8 @@ BugContest_JudgeContestants: ; 13819
ld [hl], a
call DetermineContestWinners
ret
; 13833
ClearContestResults: ; 13833
ClearContestResults:
ld hl, wBugContestResults
ld b, wBugContestWinnersEnd - wBugContestResults
xor a
@@ -179,9 +171,8 @@ ClearContestResults: ; 13833
dec b
jr nz, .loop
ret
; 1383e
DetermineContestWinners: ; 1383e
DetermineContestWinners:
ld de, wBugContestTempScore
ld hl, wBugContestFirstPlaceScore
ld c, 2
@@ -224,9 +215,8 @@ DetermineContestWinners: ; 1383e
.done
ret
; 138a0
CopyTempContestant: ; 138a0
CopyTempContestant:
; Could've just called CopyBytes.
ld de, wBugContestTempWinnerID
rept BUG_CONTESTANT_SIZE + -1
@@ -238,9 +228,8 @@ endr
inc de
ld [hl], a
ret
; 138b0
ComputeAIContestantScores: ; 138b0
ComputeAIContestantScores:
ld e, 0
.loop
push de
@@ -298,9 +287,8 @@ ComputeAIContestantScores: ; 138b0
cp NUM_BUG_CONTESTANTS
jr nz, .loop
ret
; 13900
ContestScore: ; 13900
ContestScore:
; Determine the player's score in the Bug Catching Contest.
xor a
@@ -383,9 +371,8 @@ ContestScore: ; 13900
.done
ret
; 1397f
.AddContestStat: ; 1397f
.AddContestStat:
ld hl, hMultiplicand
add [hl]
ld [hl], a
@@ -393,4 +380,3 @@ ContestScore: ; 13900
dec hl
inc [hl]
ret
; 13988