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

@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
SECTION "Credits", ROMX
Credits:: ; 109847
Credits::
bit 6, b ; Hall Of Fame
ld a, $0
jr z, .okay
@@ -104,18 +104,16 @@ Credits:: ; 109847
pop af
ld [rSVBK], a
ret
; 1098fd
Credits_HandleAButton: ; 1098fd
Credits_HandleAButton:
ld a, [hJoypadDown]
and A_BUTTON
ret z
ld a, [wJumptableIndex]
bit 7, a
ret
; 109908
Credits_HandleBButton: ; 109908
Credits_HandleBButton:
ld a, [hJoypadDown]
and B_BUTTON
ret z
@@ -136,9 +134,8 @@ Credits_HandleBButton: ; 109908
ret z
dec [hl]
ret
; 109926
Credits_Jumptable: ; 109926
Credits_Jumptable:
ld a, [wJumptableIndex]
and $f
ld e, a
@@ -150,9 +147,8 @@ Credits_Jumptable: ; 109926
ld h, [hl]
ld l, a
jp hl
; 109937
.Jumptable: ; 109937 (42:5937)
.Jumptable:
dw ParseCredits
dw Credits_Next
dw Credits_Next
@@ -167,24 +163,24 @@ Credits_Jumptable: ; 109926
dw Credits_RequestGFX
dw Credits_LoopBack
Credits_Next: ; 109951 (42:5951)
Credits_Next:
ld hl, wJumptableIndex
inc [hl]
ret
Credits_LoopBack: ; 109956 (42:5956)
Credits_LoopBack:
ld hl, wJumptableIndex
ld a, [hl]
and $f0
ld [hl], a
ret
Credits_PrepBGMapUpdate: ; 10995e (42:595e)
Credits_PrepBGMapUpdate:
xor a
ld [hBGMapMode], a
jp Credits_Next
Credits_UpdateGFXRequestPath: ; 109964 (42:5964)
Credits_UpdateGFXRequestPath:
call Credits_LoadBorderGFX
ld a, l
ld [wRequested2bppSource], a
@@ -196,14 +192,14 @@ Credits_UpdateGFXRequestPath: ; 109964 (42:5964)
ld [wRequested2bppDest + 1], a
jr Credits_RequestGFX
Credits_RequestGFX: ; 10997b (42:597b)
Credits_RequestGFX:
xor a
ld [hBGMapMode], a
ld a, $8
ld [wRequested2bpp], a
jp Credits_Next
Credits_LYOverride: ; 109986 (42:5986)
Credits_LYOverride:
ld a, [rLY]
cp $30
jr c, Credits_LYOverride
@@ -217,17 +213,16 @@ Credits_LYOverride: ; 109986 (42:5986)
call .Fill
jp Credits_Next
.Fill: ; 1099a3 (42:59a3)
.Fill:
ld c, $8
.loop
ld [hli], a
dec c
jr nz, .loop
ret
; 1099aa
ParseCredits: ; 1099aa
ParseCredits:
ld hl, wJumptableIndex
bit 7, [hl]
jp nz, .done
@@ -397,10 +392,9 @@ ParseCredits: ; 1099aa
pop de
pop hl
ret
; 109a95
ConstructCreditsTilemap: ; 109a95 (42:5a95)
ConstructCreditsTilemap:
xor a
ld [hBGMapMode], a
ld a, $c
@@ -453,7 +447,7 @@ ConstructCreditsTilemap: ; 109a95 (42:5a95)
call WaitBGMap2
ret
.InitTopPortion: ; 109aff (42:5aff)
.InitTopPortion:
ld b, 5
.outer_loop
push hl
@@ -478,7 +472,7 @@ endr
jr nz, .outer_loop
ret
DrawCreditsBorder: ; 109b1d (42:5b1d)
DrawCreditsBorder:
ld c, SCREEN_WIDTH / 4
.loop
push af
@@ -492,7 +486,7 @@ endr
jr nz, .loop
ret
GetCreditsPalette: ; 109b2c
GetCreditsPalette:
call .GetPalAddress
push hl
@@ -541,9 +535,8 @@ GetCreditsPalette: ; 109b2c
CreditsPalettes:
INCLUDE "gfx/credits/credits.pal"
; 109bca
Credits_LoadBorderGFX: ; 109bca (42:5bca)
Credits_LoadBorderGFX:
ld hl, wCreditsBorderFrame
ld a, [hl]
cp $ff
@@ -572,9 +565,8 @@ Credits_LoadBorderGFX: ; 109bca (42:5bca)
.init
ld hl, wCreditsFaux2bpp
ret
; 109bf1 (42:5bf1)
.Frames: ; 109bf1
.Frames:
dw CreditsPichuGFX
dw CreditsPichuGFX + 16 tiles
dw CreditsPichuGFX + 32 tiles
@@ -591,14 +583,13 @@ Credits_LoadBorderGFX: ; 109bca (42:5bca)
dw CreditsIgglybuffGFX + 16 tiles
dw CreditsIgglybuffGFX + 32 tiles
dw CreditsIgglybuffGFX + 48 tiles
; 109c11
Credits_TheEnd: ; 109c11 (42:5c11)
Credits_TheEnd:
ld a, $40
hlcoord 6, 9
call .Load
hlcoord 6, 10
.Load: ; 109c1c (42:5c1c)
.Load:
ld c, 8
.loop
ld [hli], a
@@ -606,7 +597,6 @@ Credits_TheEnd: ; 109c11 (42:5c11)
dec c
jr nz, .loop
ret
; 109c24 (42:5c24)
CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp"

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
EvolutionAnimation: ; 4e5e1
EvolutionAnimation:
push hl
push de
push bc
@@ -27,9 +27,8 @@ EvolutionAnimation: ; 4e5e1
scf
ret
; 4e607
.EvolutionAnimation: ; 4e607
.EvolutionAnimation:
ld a, %11100100
ld [rOBP0], a
@@ -150,20 +149,17 @@ EvolutionAnimation: ; 4e5e1
ld a, [wPlayerHPPal]
call PlayMonCry
ret
; 4e703
.GetSGBLayout: ; 4e703
.GetSGBLayout:
ld b, SCGB_EVOLUTION
jp GetSGBLayout
; 4e708
.PlaceFrontpic: ; 4e708
.PlaceFrontpic:
call GetBaseData
hlcoord 7, 2
jp PrepMonFrontpic
; 4e711
.LoadFrontpic: ; 4e711
.LoadFrontpic:
call GetBaseData
ld a, $1
ld [wBoxAlignment], a
@@ -172,9 +168,8 @@ EvolutionAnimation: ; 4e5e1
xor a
ld [wBoxAlignment], a
ret
; 4e726
.AnimationSequence: ; 4e726
.AnimationSequence:
call ClearJoypad
lb bc, 1, 2 * 7 ; flash b times, wait c frames in between
.loop
@@ -195,9 +190,8 @@ EvolutionAnimation: ; 4e5e1
.exit_sequence
scf
ret
; 4e741
.Flash: ; 4e741
.Flash:
ld a, -7 * 7 ; new stage
ld [wEvolutionPicOffset], a
call .ReplaceFrontpic
@@ -207,9 +201,8 @@ EvolutionAnimation: ; 4e5e1
dec b
jr nz, .Flash
ret
; 4e755
.ReplaceFrontpic: ; 4e755
.ReplaceFrontpic:
push bc
xor a
ld [hBGMapMode], a
@@ -233,9 +226,8 @@ EvolutionAnimation: ; 4e5e1
call WaitBGMap
pop bc
ret
; 4e779
.WaitFrames_CheckPressedB: ; 4e779
.WaitFrames_CheckPressedB:
call DelayFrame
push bc
call JoyTextDelay
@@ -255,9 +247,8 @@ EvolutionAnimation: ; 4e5e1
jr nz, .loop3
scf
ret
; 4e794
.check_statused ; 4e794
.check_statused
ld a, [wCurPartyMon]
ld hl, wPartyMon1Species
call GetPartyLocation
@@ -265,9 +256,8 @@ EvolutionAnimation: ; 4e5e1
ld c, l
farcall CheckFaintedFrzSlp
ret
; 4e7a6
.PlayEvolvedSFX: ; 4e7a6
.PlayEvolvedSFX:
ld a, [wEvolutionCanceled]
and a
ret nz
@@ -292,9 +282,8 @@ EvolutionAnimation: ; 4e5e1
pop af
ld [wJumptableIndex], a
ret
; 4e7cf
.balls_of_light ; 4e7cf
.balls_of_light
ld hl, wJumptableIndex
ld a, [hl]
cp 32
@@ -311,9 +300,8 @@ EvolutionAnimation: ; 4e5e1
.done_balls
scf
ret
; 4e7e8
.GenerateBallOfLight: ; 4e7e8
.GenerateBallOfLight:
push de
depixel 9, 11
ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
@@ -333,9 +321,8 @@ EvolutionAnimation: ; 4e5e1
add hl, bc
ld [hl], $10
ret
; 4e80c
.AnimateBallsOfLight: ; 4e80c
.AnimateBallsOfLight:
push bc
callfar PlaySpriteAnimations
; a = (([hVBlankCounter] + 4) / 2) % NUM_PALETTES
@@ -360,7 +347,6 @@ endr
pop bc
call DelayFrame
ret
; 4e831
.GFX:

View File

@@ -1,4 +1,4 @@
GBCOnlyScreen: ; 4ea82
GBCOnlyScreen:
ld a, [hCGB]
and a
@@ -37,10 +37,9 @@ GBCOnlyScreen: ; 4ea82
.loop
call DelayFrame
jr .loop
; 4eac5
DrawGBCOnlyScreen: ; 4eac5
DrawGBCOnlyScreen:
call DrawGBCOnlyBorder
@@ -63,10 +62,9 @@ DrawGBCOnlyScreen: ; 4eac5
call PlaceString
ret
; 4eaea
DrawGBCOnlyBorder: ; 4eaea
DrawGBCOnlyBorder:
hlcoord 0, 0
ld [hl], 0 ; top-left
@@ -94,18 +92,16 @@ DrawGBCOnlyBorder: ; 4eaea
ld [hl], 7 ; bottom-right
ret
; 4eb15
.FillRow: ; 4eb15
.FillRow:
ld c, SCREEN_WIDTH - 2
.next_column
ld [hli], a
dec c
jr nz, .next_column
ret
; 4eb1c
.FillColumn: ; 4eb1c
.FillColumn:
ld de, SCREEN_WIDTH
ld c, SCREEN_HEIGHT - 2
.next_row
@@ -114,10 +110,9 @@ DrawGBCOnlyBorder: ; 4eaea
dec c
jr nz, .next_row
ret
; 4eb27
DrawGBCOnlyGraphic: ; 4eb27
DrawGBCOnlyGraphic:
ld de, SCREEN_WIDTH
.y
push bc
@@ -133,17 +128,14 @@ DrawGBCOnlyGraphic: ; 4eb27
dec c
jr nz, .y
ret
; 4eb38
GBCOnlyString: ; 4eb38
GBCOnlyString:
db "This Game Pak is"
next "designed only for"
next "use on the"
next "Game Boy Color.@"
; 4eb76
GBCOnlyGFX: ; 4eb76
GBCOnlyGFX:
INCBIN "gfx/sgb/gbc_only.2bpp.lz"
; 4f0bc

View File

@@ -1,4 +1,4 @@
InitDisplayForHallOfFame: ; 4e881
InitDisplayForHallOfFame:
call ClearBGPalettes
call ClearTileMap
call ClearSprites
@@ -28,7 +28,7 @@ InitDisplayForHallOfFame: ; 4e881
text_jump UnknownText_0x1bd39e
db "@"
InitDisplayForRedCredits: ; 4e8c2
InitDisplayForRedCredits:
call ClearBGPalettes
call ClearTileMap
call ClearSprites
@@ -60,7 +60,7 @@ InitDisplayForRedCredits: ; 4e8c2
call SetPalettes
ret
ResetDisplayBetweenHallOfFameMons: ; 4e906
ResetDisplayBetweenHallOfFameMons:
ld a, [rSVBK]
push af
ld a, BANK(wDecompressScratch)

View File

@@ -1,4 +1,4 @@
_TitleScreen: ; 10ed67
_TitleScreen:
call ClearBGPalettes
call ClearSprites
@@ -228,9 +228,8 @@ _TitleScreen: ; 10ed67
call PlaySFX
ret
; 10eea7
SuicuneFrameIterator: ; 10eea7
SuicuneFrameIterator:
ld hl, wd002
ld a, [hl]
ld c, a
@@ -257,17 +256,15 @@ SuicuneFrameIterator: ; 10eea7
ld a, $3
ld [hBGMapThird], a
ret
; 10eece
.Frames: ; 10eece
.Frames:
db $80 ; vTiles4 tile $00
db $88 ; vTiles4 tile $08
db $00 ; vTiles5 tile $00
db $08 ; vTiles5 tile $08
; 10eed2
LoadSuicuneFrame: ; 10eed2
LoadSuicuneFrame:
hlcoord 6, 12
ld b, 6
.bgrows
@@ -290,9 +287,8 @@ LoadSuicuneFrame: ; 10eed2
dec b
jr nz, .bgrows
ret
; 10eeef
DrawTitleGraphic: ; 10eeef
DrawTitleGraphic:
; input:
; hl: draw location
; b: height
@@ -320,9 +316,8 @@ DrawTitleGraphic: ; 10eeef
dec b
jr nz, .bgrows
ret
; 10ef06
InitializeBackground: ; 10ef06
InitializeBackground:
ld hl, wVirtualOAMSprite00
ld d, -$22
ld e, $0
@@ -337,9 +332,8 @@ InitializeBackground: ; 10ef06
dec c
jr nz, .loop
ret
; 10ef1c
.InitColumn: ; 10ef1c
.InitColumn:
ld c, $6
ld b, $40
.loop2
@@ -358,10 +352,9 @@ InitializeBackground: ; 10ef06
dec c
jr nz, .loop2
ret
; 10ef32
AnimateTitleCrystal: ; 10ef32
AnimateTitleCrystal:
; Move the title screen crystal downward until it's fully visible
; Stop at y=6
@@ -384,19 +377,15 @@ endr
jr nz, .loop
ret
; 10ef46
TitleSuicuneGFX: ; 10ef46
TitleSuicuneGFX:
INCBIN "gfx/title/suicune.2bpp.lz"
; 10f326
TitleLogoGFX: ; 10f326
TitleLogoGFX:
INCBIN "gfx/title/logo.2bpp.lz"
; 10fcee
TitleCrystalGFX: ; 10fcee
TitleCrystalGFX:
INCBIN "gfx/title/crystal.2bpp.lz"
; 10fede
TitleScreenPalettes:
INCLUDE "gfx/title/title.pal"

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
UnusedTitleScreen: ; 10c000
UnusedTitleScreen:
call ClearBGPalettes
call ClearTileMap
@@ -96,30 +96,24 @@ UnusedTitleScreen: ; 10c000
call PlayMusic
ret
; 10c0b1
UnusedTitleBG_GFX: ; 10c0b1
UnusedTitleBG_GFX:
INCBIN "gfx/title/old_bg.2bpp"
; 10d0b1
UnusedTitleBG_Tilemap: ; 10d0b1
UnusedTitleBG_Tilemap:
; 32x32 (alternating tiles and attributes)
INCBIN "gfx/title/old_bg.tilemap"
; 10d8b1
UnusedTitleBG_Palettes: ; 10d8b1
UnusedTitleBG_Palettes:
INCLUDE "gfx/title/old_bg.pal"
; 10dab1
UnusedTitleFG_GFX: ; 10dab1
UnusedTitleFG_GFX:
INCBIN "gfx/title/old_fg.2bpp"
; 10eab1
UnusedTitleFG_Palettes: ; 10eab1
UnusedTitleFG_Palettes:
INCLUDE "gfx/title/old_fg.pal"
; 10ecb1
UnusedTitleFG_OAM: ; 10ecb1
UnusedTitleFG_OAM:
dsprite 3, 0, 7, 0, $00, 1
dsprite 3, 0, 8, 0, $02, 1
dsprite 3, 0, 9, 0, $04, 1
@@ -160,9 +154,8 @@ UnusedTitleFG_OAM: ; 10ecb1
dsprite 11, 0, 12, 0, $4a, 1
dsprite 11, 0, 13, 0, $4c, 1
dsprite 11, 0, 14, 0, $4e, 1
; 10ed51
Function10ed51: ; 10ed51
Function10ed51:
call _TitleScreen
.loop
call JoyTextDelay
@@ -175,4 +168,3 @@ Function10ed51: ; 10ed51
jr .loop
.done
ret
; 10ed67