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

@@ -4,13 +4,13 @@ CARDFLIP_LIGHT_ON EQU $f5
CARDFLIP_DECK_SIZE EQU 4 * 6
; two labels below called from inside ./dummy_game.asm
Unknown_e00ed: ; e00ed (38:40ed)
Unknown_e00ed:
; Graphics for an unused Game Corner
; game were meant to be here.
ret_e00ed: ; e00ed (38:40ed)
ret_e00ed:
ret
_CardFlip: ; e00ee (38:40ee)
_CardFlip:
ld hl, wOptions
set NO_TEXT_SCROLL, [hl]
call ClearBGPalettes
@@ -74,7 +74,7 @@ _CardFlip: ; e00ee (38:40ee)
res 4, [hl]
ret
.CardFlip: ; e0191 (38:4191)
.CardFlip:
ld a, [wJumptableIndex]
ld e, a
ld d, 0
@@ -85,9 +85,8 @@ _CardFlip: ; e00ee (38:40ee)
ld h, [hl]
ld l, a
jp hl
; e01a0 (38:41a0)
.Jumptable: ; e01a0
.Jumptable:
dw .AskPlayWithThree
dw .DeductCoins
dw .ChooseACard
@@ -96,15 +95,13 @@ _CardFlip: ; e00ee (38:40ee)
dw .TabulateTheResult
dw .PlayAgain
dw .Quit
; e01b0
.Increment: ; e01b0
.Increment:
ld hl, wJumptableIndex
inc [hl]
ret
; e01b5
.AskPlayWithThree: ; e01b5
.AskPlayWithThree:
ld hl, .PlayWithThreeCoinsText
call CardFlip_UpdateCoinBalanceDisplay
call YesNoBox
@@ -117,7 +114,6 @@ _CardFlip: ; e00ee (38:40ee)
ld a, 7
ld [wJumptableIndex], a
ret
; e01cd
.PlayWithThreeCoinsText: ; 0xe01cd
; Play with three coins?
@@ -125,7 +121,7 @@ _CardFlip: ; e00ee (38:40ee)
db "@"
; 0xe01d2
.DeductCoins: ; e01d2
.DeductCoins:
ld a, [wCoins]
ld h, a
ld a, [wCoins + 1]
@@ -159,7 +155,6 @@ _CardFlip: ; e00ee (38:40ee)
call WaitSFX
call .Increment
ret
; e0212
.NotEnoughCoinsText: ; 0xe0212
; Not enough coins…
@@ -167,7 +162,7 @@ _CardFlip: ; e00ee (38:40ee)
db "@"
; 0xe0217
.ChooseACard: ; e0217
.ChooseACard:
xor a
ld [hBGMapMode], a
hlcoord 0, 0
@@ -238,7 +233,6 @@ _CardFlip: ; e00ee (38:40ee)
ld [wCardFlipWhichCard], a
call .Increment
ret
; e02b2
.ChooseACardText: ; 0xe02b2
; Choose a card.
@@ -246,7 +240,7 @@ _CardFlip: ; e00ee (38:40ee)
db "@"
; 0xe02b7
.PlaceYourBet: ; e02b7
.PlaceYourBet:
ld hl, .PlaceYourBetText
call CardFlip_UpdateCoinBalanceDisplay
.betloop
@@ -262,7 +256,6 @@ _CardFlip: ; e00ee (38:40ee)
.betdone
call .Increment
ret
; e02d5
.PlaceYourBetText: ; 0xe02d5
; Place your bet.
@@ -270,7 +263,7 @@ _CardFlip: ; e00ee (38:40ee)
db "@"
; 0xe02da
.CheckTheCard: ; e02da
.CheckTheCard:
xor a
ld [hVBlankCounter], a
call CardFlip_UpdateCursorOAM
@@ -298,16 +291,14 @@ _CardFlip: ; e00ee (38:40ee)
call WaitBGMap2
call .Increment
ret
; e0314
.TabulateTheResult: ; e0314
.TabulateTheResult:
call CardFlip_CheckWinCondition
call WaitPressAorB_BlinkCursor
call .Increment
ret
; e031e
.PlayAgain: ; e031e
.PlayAgain:
call ClearSprites
ld hl, .PlayAgainText
call CardFlip_UpdateCoinBalanceDisplay
@@ -337,7 +328,6 @@ _CardFlip: ; e00ee (38:40ee)
ld a, 1
ld [wJumptableIndex], a
ret
; e0356
.PlayAgainText: ; 0xe0356
; Want to play again?
@@ -351,13 +341,12 @@ _CardFlip: ; e00ee (38:40ee)
db "@"
; 0xe0360
.Quit: ; e0360
.Quit:
ld hl, wJumptableIndex
set 7, [hl]
ret
; e0366
CardFlip_ShuffleDeck: ; e0366
CardFlip_ShuffleDeck:
ld hl, wDeck
ld bc, CARDFLIP_DECK_SIZE
xor a
@@ -384,9 +373,8 @@ CardFlip_ShuffleDeck: ; e0366
ld bc, CARDFLIP_DECK_SIZE
call ByteFill
ret
; e0398
CollapseCursorPosition: ; e0398
CollapseCursorPosition:
ld hl, 0
ld bc, 6
ld a, [wCardFlipCursorY]
@@ -396,9 +384,8 @@ CollapseCursorPosition: ; e0398
ld c, a
add hl, bc
ret
; e03ac
GetCoordsOfChosenCard: ; e03ac
GetCoordsOfChosenCard:
ld a, [wCardFlipWhichCard]
and a
jr nz, .BottomCard
@@ -412,27 +399,24 @@ GetCoordsOfChosenCard: ; e03ac
.done
ret
; e03c1
PlaceCardFaceDown: ; e03c1
PlaceCardFaceDown:
xor a
ld [hBGMapMode], a
ld de, .FaceDownCardTilemap
lb bc, 6, 5
call CardFlip_CopyToBox
ret
; e03ce
.FaceDownCardTilemap: ; e03ce
.FaceDownCardTilemap:
db $08, $09, $09, $09, $0a
db $0b, $28, $2b, $28, $0c
db $0b, $2c, $2d, $2e, $0c
db $0b, $2f, $30, $31, $0c
db $0b, $32, $33, $34, $0c
db $0d, $0e, $0e, $0e, $0f
; e03ec
CardFlip_DisplayCardFaceUp: ; e03ec
CardFlip_DisplayCardFaceUp:
xor a
ld [hBGMapMode], a
push hl
@@ -493,18 +477,16 @@ CardFlip_DisplayCardFaceUp: ; e03ec
lb bc, 6, 5
call CardFlip_FillBox
ret
; e043b
.FaceUpCardTilemap: ; e043b
.FaceUpCardTilemap:
db $18, $19, $19, $19, $1a
db $1b, $35, $7f, $7f, $1c
db $0b, $28, $28, $28, $0c
db $0b, $28, $28, $28, $0c
db $0b, $28, $28, $28, $0c
db $1d, $1e, $1e, $1e, $1f
; e0459
.Deck: ; e0459
.Deck:
; level, pic anchor (3x3)
db "1", $4e, "1", $57, "1", $69, "1", $60
db "2", $4e, "2", $57, "2", $69, "2", $60
@@ -512,9 +494,8 @@ CardFlip_DisplayCardFaceUp: ; e03ec
db "4", $4e, "4", $57, "4", $69, "4", $60
db "5", $4e, "5", $57, "5", $69, "5", $60
db "6", $4e, "6", $57, "6", $69, "6", $60
; e0489
CardFlip_UpdateCoinBalanceDisplay: ; e0489
CardFlip_UpdateCoinBalanceDisplay:
push hl
hlcoord 0, 12
ld b, 4
@@ -524,9 +505,8 @@ CardFlip_UpdateCoinBalanceDisplay: ; e0489
call PrintTextBoxText
call CardFlip_PrintCoinBalance
ret
; e049c
CardFlip_PrintCoinBalance: ; e049c
CardFlip_PrintCoinBalance:
hlcoord 9, 15
ld b, 1
ld c, 9
@@ -539,13 +519,11 @@ CardFlip_PrintCoinBalance: ; e049c
lb bc, PRINTNUM_LEADINGZEROS | 2, 4
call PrintNum
ret
; e04bc
.CoinStr:
db "COIN@"
; e04c1
CardFlip_InitTilemap: ; e04c1 (38:44c1)
CardFlip_InitTilemap:
xor a
ld [hBGMapMode], a
hlcoord 0, 0
@@ -560,12 +538,11 @@ CardFlip_InitTilemap: ; e04c1 (38:44c1)
lb bc, 4, 18
call TextBox
ret
; e04e5 (38:44e5)
CardFlip_FillGreenBox: ; e04e5
CardFlip_FillGreenBox:
ld a, $29
CardFlip_FillBox: ; e04e7 (38:44e7)
CardFlip_FillBox:
.row
push bc
push hl
@@ -581,7 +558,7 @@ CardFlip_FillBox: ; e04e7 (38:44e7)
jr nz, .row
ret
CardFlip_CopyToBox: ; e04f7 (38:44f7)
CardFlip_CopyToBox:
.row
push bc
push hl
@@ -598,9 +575,8 @@ CardFlip_CopyToBox: ; e04f7 (38:44f7)
dec b
jr nz, .row
ret
; e0509 (38:4509)
CardFlip_CopyOAM: ; e0509
CardFlip_CopyOAM:
ld de, wVirtualOAMSprite00
ld a, [hli]
.loop
@@ -623,9 +599,8 @@ CardFlip_CopyOAM: ; e0509
dec a
jr nz, .loop
ret
; e0521
CardFlip_ShiftDigitsLeftTwoPixels: ; e0521 (38:4521)
CardFlip_ShiftDigitsLeftTwoPixels:
ld de, vTiles0 tile "0"
ld hl, vTiles0 tile "0" + 2
ld bc, 10 tiles - 2
@@ -635,9 +610,8 @@ CardFlip_ShiftDigitsLeftTwoPixels: ; e0521 (38:4521)
ld [hli], a
ld [hl], a
ret
; e0534 (38:4534)
CardFlip_BlankDiscardedCardSlot: ; e0534
CardFlip_BlankDiscardedCardSlot:
xor a
ld [hBGMapMode], a
ld a, [wCardFlipFaceUpCard]
@@ -660,18 +634,16 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
ld h, [hl]
ld l, a
jp hl
; e0553
.Jumptable: ; e0553
.Jumptable:
dw .Level1
dw .Level2
dw .Level3
dw .Level4
dw .Level5
dw .Level6
; e055f
.Level1: ; e055f
.Level1:
ld hl, wDiscardPile + 4
add hl, de
ld a, [hl]
@@ -695,9 +667,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
add hl, bc
ld [hl], $3d
ret
; e0583
.Level2: ; e0583
.Level2:
ld hl, wDiscardPile - 4
add hl, de
ld a, [hl]
@@ -721,9 +692,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
add hl, bc
ld [hl], $3a
ret
; e05a7
.Level3: ; e05a7
.Level3:
ld hl, wDiscardPile + 4
add hl, de
ld a, [hl]
@@ -747,9 +717,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
add hl, bc
ld [hl], $3d
ret
; e05cb
.Level4: ; e05cb
.Level4:
ld hl, wDiscardPile - 4
add hl, de
ld a, [hl]
@@ -773,9 +742,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
add hl, bc
ld [hl], $3a
ret
; e05ef
.Level5: ; e05ef
.Level5:
ld hl, wDiscardPile + 4
add hl, de
ld a, [hl]
@@ -799,9 +767,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
add hl, bc
ld [hl], $3d
ret
; e0613
.Level6: ; e0613
.Level6:
ld hl, wDiscardPile - 4
add hl, de
ld a, [hl]
@@ -825,9 +792,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
add hl, bc
ld [hl], $3a
ret
; e0637
CardFlip_CheckWinCondition: ; e0637
CardFlip_CheckWinCondition:
call CollapseCursorPosition
add hl, hl
ld de, .Jumptable
@@ -836,9 +802,8 @@ CardFlip_CheckWinCondition: ; e0637
ld h, [hl]
ld l, a
jp hl
; e0643
.Jumptable: ; e0643
.Jumptable:
dw .Impossible
dw .Impossible
dw .PikaJiggly
@@ -894,233 +859,227 @@ CardFlip_CheckWinCondition: ; e0637
dw .JigglySix
dw .PoliSix
dw .OddSix
; e06a3
.Impossible: ; e06a3
.Impossible:
jp .Lose
; e06a6
.PikaJiggly: ; e06a6
.PikaJiggly:
ld a, [wCardFlipFaceUpCard]
and $2
jp nz, .Lose
jr .WinSix
.PoliOddish: ; e06b0
.PoliOddish:
ld a, [wCardFlipFaceUpCard]
and $2
jr nz, .WinSix
jp .Lose
.WinSix: ; e06ba
.WinSix:
ld c, $6
ld de, SFX_2ND_PLACE
jp .Payout
; e06c2
.OneTwo: ; e06c2
.OneTwo:
ld a, [wCardFlipFaceUpCard]
and $18
jr z, .WinNine
jp .Lose
.ThreeFour: ; e06cc
.ThreeFour:
ld a, [wCardFlipFaceUpCard]
and $18
cp $8
jr z, .WinNine
jp .Lose
.FiveSix: ; e06d8
.FiveSix:
ld a, [wCardFlipFaceUpCard]
and $18
cp $10
jr z, .WinNine
jp .Lose
.WinNine: ; e06e4
.WinNine:
ld c, $9
ld de, SFX_2ND_PLACE
jp .Payout
; e06ec
.Pikachu: ; e06ec
.Pikachu:
ld a, [wCardFlipFaceUpCard]
and $3
jr z, .WinTwelve
jp .Lose
.Jigglypuff: ; e06f6
.Jigglypuff:
ld a, [wCardFlipFaceUpCard]
and $3
cp $1
jr z, .WinTwelve
jp .Lose
.Poliwag: ; e0702
.Poliwag:
ld a, [wCardFlipFaceUpCard]
and $3
cp $2
jr z, .WinTwelve
jp .Lose
.Oddish: ; e070e
.Oddish:
ld a, [wCardFlipFaceUpCard]
and $3
cp $3
jr z, .WinTwelve
jp .Lose
.WinTwelve: ; e071a
.WinTwelve:
ld c, $c
ld de, SFX_2ND_PLACE
jp .Payout
; e0722
.One: ; e0722
.One:
ld a, [wCardFlipFaceUpCard]
and $1c
jr z, .WinEighteen
jp .Lose
.Two: ; e072c
.Two:
ld a, [wCardFlipFaceUpCard]
and $1c
cp $4
jr z, .WinEighteen
jp .Lose
.Three: ; e0738
.Three:
ld a, [wCardFlipFaceUpCard]
and $1c
cp $8
jr z, .WinEighteen
jp .Lose
.Four: ; e0744
.Four:
ld a, [wCardFlipFaceUpCard]
and $1c
cp $c
jr z, .WinEighteen
jp .Lose
.Five: ; e0750
.Five:
ld a, [wCardFlipFaceUpCard]
and $1c
cp $10
jr z, .WinEighteen
jp .Lose
.Six: ; e075c
.Six:
ld a, [wCardFlipFaceUpCard]
and $1c
cp $14
jr z, .WinEighteen
jp .Lose
.WinEighteen: ; e0768
.WinEighteen:
ld c, $12
ld de, SFX_2ND_PLACE
jp .Payout
; e0770
.PikaOne: ; e0770
.PikaOne:
ld e, $0
jr .CheckWin72
.JigglyOne: ; e0774
.JigglyOne:
ld e, $1
jr .CheckWin72
.PoliOne: ; e0778
.PoliOne:
ld e, $2
jr .CheckWin72
.OddOne: ; e077c
.OddOne:
ld e, $3
jr .CheckWin72
.PikaTwo: ; e0780
.PikaTwo:
ld e, $4
jr .CheckWin72
.JigglyTwo: ; e0784
.JigglyTwo:
ld e, $5
jr .CheckWin72
.PoliTwo: ; e0788
.PoliTwo:
ld e, $6
jr .CheckWin72
.OddTwo: ; e078c
.OddTwo:
ld e, $7
jr .CheckWin72
.PikaThree: ; e0790
.PikaThree:
ld e, $8
jr .CheckWin72
.JigglyThree: ; e0794
.JigglyThree:
ld e, $9
jr .CheckWin72
.PoliThree: ; e0798
.PoliThree:
ld e, $a
jr .CheckWin72
.OddThree: ; e079c
.OddThree:
ld e, $b
jr .CheckWin72
.PikaFour: ; e07a0
.PikaFour:
ld e, $c
jr .CheckWin72
.JigglyFour: ; e07a4
.JigglyFour:
ld e, $d
jr .CheckWin72
.PoliFour: ; e07a8
.PoliFour:
ld e, $e
jr .CheckWin72
.OddFour: ; e07ac
.OddFour:
ld e, $f
jr .CheckWin72
.PikaFive: ; e07b0
.PikaFive:
ld e, $10
jr .CheckWin72
.JigglyFive: ; e07b4
.JigglyFive:
ld e, $11
jr .CheckWin72
.PoliFive: ; e07b8
.PoliFive:
ld e, $12
jr .CheckWin72
.OddFive: ; e07bc
.OddFive:
ld e, $13
jr .CheckWin72
.PikaSix: ; e07c0
.PikaSix:
ld e, $14
jr .CheckWin72
.JigglySix: ; e07c4
.JigglySix:
ld e, $15
jr .CheckWin72
.PoliSix: ; e07c8
.PoliSix:
ld e, $16
jr .CheckWin72
.OddSix: ; e07cc
.OddSix:
ld e, $17
.CheckWin72: ; e07ce
.CheckWin72:
ld a, [wCardFlipFaceUpCard]
cp e
jr nz, .Lose
@@ -1128,7 +1087,7 @@ CardFlip_CheckWinCondition: ; e0637
ld de, SFX_2ND_PLACE
jr .Payout
.Lose: ; e07db
.Lose:
ld de, SFX_WRONG
call PlaySFX
ld hl, .Text_Darn
@@ -1136,7 +1095,7 @@ CardFlip_CheckWinCondition: ; e0637
call WaitSFX
ret
.Payout: ; e07eb
.Payout:
push bc
push de
ld hl, .Text_Yeah
@@ -1159,7 +1118,6 @@ CardFlip_CheckWinCondition: ; e0637
dec c
jr nz, .loop
ret
; e0811
.Text_Yeah: ; 0xe0811
; Yeah!
@@ -1173,7 +1131,7 @@ CardFlip_CheckWinCondition: ; e0637
db "@"
; 0xe081b
.AddCoinPlaySFX: ; e081b
.AddCoinPlaySFX:
ld a, [wCoins]
ld h, a
ld a, [wCoins + 1]
@@ -1186,9 +1144,8 @@ CardFlip_CheckWinCondition: ; e0637
ld de, SFX_PAY_DAY
call PlaySFX
ret
; e0833
.IsCoinCaseFull: ; e0833
.IsCoinCaseFull:
ld a, [wCoins]
cp HIGH(MAX_COINS)
jr c, .less
@@ -1207,16 +1164,14 @@ CardFlip_CheckWinCondition: ; e0637
.less
and a
ret
; e0849
PlaceOAMCardBorder: ; e0849
PlaceOAMCardBorder:
call GetCoordsOfChosenCard
ld hl, .SpriteData
call CardFlip_CopyOAM
ret
; e0853
.SpriteData: ; e0853
.SpriteData:
db 18
dsprite 0, 0, 0, 0, $04, 0
dsprite 0, 0, 1, 0, $06, 0
@@ -1241,9 +1196,8 @@ PlaceOAMCardBorder: ; e0849
dsprite 5, 0, 2, 0, $06, 0 | Y_FLIP
dsprite 5, 0, 3, 0, $06, 0 | Y_FLIP
dsprite 5, 0, 4, 0, $04, 0 | X_FLIP | Y_FLIP
; e089c
ChooseCard_HandleJoypad: ; e089c
ChooseCard_HandleJoypad:
ld hl, hJoyLast
ld a, [hl]
and D_LEFT
@@ -1258,9 +1212,8 @@ ChooseCard_HandleJoypad: ; e089c
and D_DOWN
jp nz, .d_down
ret
; e08b8
.d_left ; e08b8
.d_left
ld hl, wCardFlipCursorX
ld a, [wCardFlipCursorY]
and a
@@ -1296,9 +1249,8 @@ ChooseCard_HandleJoypad: ; e089c
ld a, $1
ld [wCardFlipCursorX], a
jp .play_sound
; e08ef
.d_right ; e08ef
.d_right
ld hl, wCardFlipCursorX
ld a, [wCardFlipCursorY]
and a
@@ -1319,7 +1271,7 @@ ChooseCard_HandleJoypad: ; e089c
inc [hl]
jr .play_sound
.d_up ; e090a
.d_up
ld hl, wCardFlipCursorY
ld a, [wCardFlipCursorX]
and a
@@ -1356,7 +1308,7 @@ ChooseCard_HandleJoypad: ; e089c
ld [wCardFlipCursorX], a
jr .play_sound
.d_down ; e093d
.d_down
ld hl, wCardFlipCursorY
ld a, [wCardFlipCursorX]
and a
@@ -1377,13 +1329,12 @@ ChooseCard_HandleJoypad: ; e089c
inc [hl]
inc [hl]
.play_sound ; e0959
.play_sound
ld de, SFX_POKEBALLS_PLACED_ON_TABLE
call PlaySFX
ret
; e0960
CardFlip_UpdateCursorOAM: ; e0960
CardFlip_UpdateCursorOAM:
call ClearSprites
ld a, [hCGB]
and a
@@ -1407,9 +1358,8 @@ CardFlip_UpdateCursorOAM: ; e0960
ld l, a
call CardFlip_CopyOAM
ret
; e0981
.OAMData: ; e0981
.OAMData:
cardflip_cursor: MACRO
if _NARG >= 5
dbpixel \1, \2, \3, \4
@@ -1475,9 +1425,8 @@ ENDM
cardflip_cursor 15, 12, 0, 4, .SingleTile
cardflip_cursor 17, 12, 0, 4, .SingleTile
cardflip_cursor 19, 12, 0, 4, .SingleTile
; e0a41
.SingleTile: ; e0a41
.SingleTile:
db 6
dsprite 0, 0, -1, 7, $00, 0 | PRIORITY
dsprite 0, 0, 0, 0, $02, 0 | PRIORITY
@@ -1486,7 +1435,7 @@ ENDM
dsprite 0, 5, 0, 0, $02, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 1, 0, $03, 0 | PRIORITY
.PokeGroup: ; e0a5a
.PokeGroup:
db 26
dsprite 0, 0, -1, 7, $00, 0 | PRIORITY
dsprite 0, 0, 0, 0, $02, 0 | PRIORITY
@@ -1515,7 +1464,7 @@ ENDM
dsprite 10, 1, 0, 0, $02, 0 | Y_FLIP | PRIORITY
dsprite 10, 1, 1, 0, $03, 0 | PRIORITY
.NumGroup: ; e0ac3
.NumGroup:
db 20
dsprite 0, 0, -1, 7, $00, 0 | PRIORITY
dsprite 0, 0, 0, 0, $02, 0 | PRIORITY
@@ -1538,7 +1487,7 @@ ENDM
dsprite 0, 5, 7, 0, $02, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 8, 0, $03, 0 | PRIORITY
.NumGroupPair: ; e0b14
.NumGroupPair:
db 30
dsprite 0, 0, 0, 0, $00, 0 | PRIORITY
dsprite 0, 0, 1, 0, $02, 0 | PRIORITY
@@ -1571,7 +1520,7 @@ ENDM
dsprite 2, 1, 8, 0, $03, 0 | PRIORITY
dsprite 2, 1, 9, 0, $03, 0 | PRIORITY
.PokeGroupPair: ; e0b8d
.PokeGroupPair:
db 38
dsprite 0, 0, -1, 7, $00, 0 | PRIORITY
dsprite 0, 0, 3, 0, $00, 0 | X_FLIP | PRIORITY
@@ -1612,15 +1561,14 @@ ENDM
dsprite 11, 1, 2, 0, $02, 0 | Y_FLIP | PRIORITY
dsprite 11, 1, 3, 0, $03, 0 | X_FLIP | Y_FLIP | PRIORITY
.Impossible: ; e0c26
.Impossible:
db 4
dsprite 0, 0, 0, 0, $00, 0 | PRIORITY
dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | PRIORITY
dsprite 1, 0, 0, 0, $00, 0 | Y_FLIP | PRIORITY
dsprite 1, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY
; e0c37
CardFlip_InitAttrPals: ; e0c37 (38:4c37)
CardFlip_InitAttrPals:
ld a, [hCGB]
and a
ret z
@@ -1666,27 +1614,24 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
pop af
ld [rSVBK], a
ret
; e0c93 (38:4c93)
.palettes ; e0c93
.palettes
INCLUDE "gfx/card_flip/card_flip.pal"
; e0cdb
CardFlipLZ03: ; e0cdb
CardFlipLZ03:
INCBIN "gfx/card_flip/card_flip_3.2bpp.lz"
CardFlipOffButtonGFX: ; e0cf6
CardFlipOffButtonGFX:
INCBIN "gfx/card_flip/off.2bpp"
CardFlipOnButtonGFX: ; e0d06
CardFlipOnButtonGFX:
INCBIN "gfx/card_flip/on.2bpp"
CardFlipLZ01: ; e0d16
CardFlipLZ01:
INCBIN "gfx/card_flip/card_flip_1.2bpp.lz"
CardFlipLZ02: ; e0ea8
CardFlipLZ02:
INCBIN "gfx/card_flip/card_flip_2.2bpp.lz"
CardFlipTilemap: ; e110c
CardFlipTilemap:
INCBIN "gfx/card_flip/card_flip.tilemap"
; e1190

View File

@@ -1,4 +1,4 @@
_DummyGame: ; e1e5b (38:5e5b)
_DummyGame:
call .LoadGFXAndPals
call DelayFrame
.loop
@@ -243,9 +243,8 @@ endr
ld [wJumptableIndex], a
ret
; e2010
DummyGame_CheckMatch: ; e2010
DummyGame_CheckMatch:
ld hl, wDummyGameCard1
ld a, [hli]
cp [hl]
@@ -322,7 +321,6 @@ DummyGame_CheckMatch: ; e2010
inc bc
ret
; e2093
DummyGameText_Yeah: ; 0xe2093
; , yeah!
@@ -336,7 +334,7 @@ DummyGameText_Darn: ; 0xe2098
db "@"
; 0xe209d
DummyGame_InitBoard: ; e209d
DummyGame_InitBoard:
ld hl, wDummyGameCards
ld bc, wDummyGameCardsEnd - wDummyGameCards
xor a
@@ -385,9 +383,8 @@ DummyGame_InitBoard: ; e209d
jr nz, .loop
ret
; e20e5
DummyGame_SampleTilePlacement: ; e20e5
DummyGame_SampleTilePlacement:
push hl
ld de, wDummyGameCards
.loop
@@ -408,9 +405,8 @@ DummyGame_SampleTilePlacement: ; e20e5
inc hl
ret
; e2101
DummyGame_GetDistributionOfTiles: ; e2101
DummyGame_GetDistributionOfTiles:
ld a, [wMenuCursorY]
dec a
ld l, a
@@ -426,9 +422,8 @@ DummyGame_GetDistributionOfTiles: ; e2101
db $02, $03, $06, $06, $06, $08, $08, $06
db $02, $02, $04, $06, $06, $08, $08, $09
db $02, $02, $02, $04, $07, $08, $08, $0c
; e2128
DummyGame_PlaceCard: ; e2128
DummyGame_PlaceCard:
ld a, [wDummyGameLastCardPicked]
sla a
sla a
@@ -446,9 +441,8 @@ DummyGame_PlaceCard: ; e2128
call DelayFrames
ret
; e2142
DummyGame_DeleteCard: ; e2142
DummyGame_DeleteCard:
ld a, $1
ld [hli], a
ld [hld], a
@@ -460,9 +454,8 @@ DummyGame_DeleteCard: ; e2142
call DelayFrames
ret
; e2152
DummyGame_InitStrings: ; e2152
DummyGame_InitStrings:
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $1
@@ -483,9 +476,8 @@ DummyGame_InitStrings: ; e2152
db "とったもの@"
.japstr2
db "あと かい@"
; e2183
DummyGame_Card2Coord: ; e2183
DummyGame_Card2Coord:
ld d, 0
.find_row
sub 9
@@ -511,9 +503,8 @@ DummyGame_Card2Coord: ; e2183
add hl, de
ret
; e21a1
DummyGame_InterpretJoypad_AnimateCursor: ; e21a1 (38:61a1)
DummyGame_InterpretJoypad_AnimateCursor:
ld a, [wJumptableIndex]
cp $7
jr nc, .quit
@@ -606,7 +597,6 @@ DummyGame_InterpretJoypad_AnimateCursor: ; e21a1 (38:61a1)
ld [hl], a
ret
; e2221 (38:6221)
LZ_e2221: ; e2221
LZ_e2221:
INCBIN "gfx/dummy_game/dummy_game.2bpp.lz"

File diff suppressed because it is too large Load Diff

View File

@@ -3,7 +3,7 @@ PUZZLE_VOID EQU $ef
puzcoord EQUS "* 6 +"
_UnownPuzzle: ; e1190
_UnownPuzzle:
ld a, [hInMenu]
push af
ld a, $1
@@ -88,9 +88,8 @@ _UnownPuzzle: ; e1190
ld a, LCDC_DEFAULT
ld [rLCDC], a
ret
; e124e
InitUnownPuzzlePiecePositions: ; e124e
InitUnownPuzzlePiecePositions:
ld c, 1
ld b, 16
.load_loop
@@ -111,9 +110,8 @@ InitUnownPuzzlePiecePositions: ; e124e
dec b
jr nz, .load_loop
ret
; e126d
.PuzzlePieceInitialPositions: ; e126d
.PuzzlePieceInitialPositions:
initpuzcoord: MACRO
rept _NARG / 2
db \1 puzcoord \2
@@ -128,9 +126,8 @@ ENDM
initpuzcoord 4,0, 4,5
initpuzcoord 5,0, 5,5
; START > CANCEL
; e127d
PlaceStartCancelBox: ; e127d
PlaceStartCancelBox:
call PlaceStartCancelBoxBorder
hlcoord 5, 16
ld a, $f6
@@ -141,9 +138,8 @@ PlaceStartCancelBox: ; e127d
dec c
jr nz, .loop
ret
; e128d
PlaceStartCancelBoxBorder: ; e128d
PlaceStartCancelBoxBorder:
hlcoord 4, 15
ld a, $f0
ld [hli], a
@@ -172,9 +168,8 @@ PlaceStartCancelBoxBorder: ; e128d
ld a, $f5
ld [hl], a
ret
; e12ca
UnownPuzzleJumptable: ; e12ca
UnownPuzzleJumptable:
ld a, [wJumptableIndex]
ld e, a
ld d, 0
@@ -185,13 +180,11 @@ UnownPuzzleJumptable: ; e12ca
ld h, [hl]
ld l, a
jp hl
; e12d9
.Jumptable: ; e12d9
.Jumptable:
dw .Function
; e12db
.Function: ; e12db
.Function:
ld a, [hJoyPressed]
and START
jp nz, UnownPuzzle_Quit
@@ -299,9 +292,8 @@ UnownPuzzleJumptable: ; e12ca
.play_sfx
call PlaySFX
ret
; e1376
UnownPuzzle_A: ; e1376
UnownPuzzle_A:
ld a, [wHoldingUnownPuzzlePiece]
and a
jr nz, .TryPlacePiece
@@ -348,19 +340,18 @@ UnownPuzzle_A: ; e1376
call SimpleWaitPressAorB
ld a, TRUE
ld [wSolvedUnownPuzzle], a
UnownPuzzle_Quit: ; e13de
UnownPuzzle_Quit:
ld hl, wJumptableIndex
set 7, [hl]
ret
UnownPuzzle_InvalidAction: ; e13e4
UnownPuzzle_InvalidAction:
ld de, SFX_WRONG
call PlaySFX
call WaitSFX
ret
; e13ee
UnownPuzzle_FillBox: ; e13ee
UnownPuzzle_FillBox:
ld de, SCREEN_WIDTH
.row
push bc
@@ -375,9 +366,8 @@ UnownPuzzle_FillBox: ; e13ee
dec b
jr nz, .row
ret
; e13fe
UnownPuzzle_UpdateTilemap: ; e13fe
UnownPuzzle_UpdateTilemap:
xor a
ld [wUnownPuzzleCursorPosition], a
ld c, 6 * 6
@@ -400,9 +390,8 @@ UnownPuzzle_UpdateTilemap: ; e13fe
dec c
jr nz, .loop
ret
; e141f
PlaceUnownPuzzlePieceGFX: ; e141f
PlaceUnownPuzzlePieceGFX:
ld a, $2 ; tilemap coords
call GetUnownPuzzleCoordData
ld a, [hli]
@@ -427,9 +416,8 @@ PlaceUnownPuzzlePieceGFX: ; e141f
dec b
jr nz, .row
ret
; e1441
FillUnoccupiedPuzzleSpace: ; e1441
FillUnoccupiedPuzzleSpace:
ld a, 2 ; tilemap coords
call GetUnownPuzzleCoordData
ld a, [hli]
@@ -454,9 +442,8 @@ FillUnoccupiedPuzzleSpace: ; e1441
dec b
jr nz, .row
ret
; e1463
GetUnownPuzzleCoordData: ; e1463
GetUnownPuzzleCoordData:
ld e, a
ld d, 0
ld hl, UnownPuzzleCoordData
@@ -467,9 +454,8 @@ rept 6
add hl, de
endr
ret
; e1475
UnownPuzzle_CheckCurrentTileOccupancy: ; e1475
UnownPuzzle_CheckCurrentTileOccupancy:
ld hl, wPuzzlePieces
ld a, [wUnownPuzzleCursorPosition]
ld e, a
@@ -477,9 +463,8 @@ UnownPuzzle_CheckCurrentTileOccupancy: ; e1475
add hl, de
ld a, [hl]
ret
; e1481
GetCurrentPuzzlePieceVTileCorner: ; e1481
GetCurrentPuzzlePieceVTileCorner:
ld a, [wUnownPuzzleHeldPiece]
ld hl, .Corners
add l
@@ -489,9 +474,8 @@ GetCurrentPuzzlePieceVTileCorner: ; e1481
ld h, a
ld a, [hl]
ret
; e148f
.Corners: ; e148f
.Corners:
; 00, 01, 02
; 0c, 0d, 0e
; 18, 19, 1a
@@ -500,9 +484,8 @@ GetCurrentPuzzlePieceVTileCorner: ; e1481
db $24, $27, $2a, $2d
db $48, $4b, $4e, $51
db $6c, $6f, $72, $75
; e14a0
CheckSolvedUnownPuzzle: ; e14a0
CheckSolvedUnownPuzzle:
ld hl, .SolvedPuzzleConfiguration
ld de, wPuzzlePieces
ld c, 6 * 6
@@ -520,18 +503,16 @@ CheckSolvedUnownPuzzle: ; e14a0
.not_solved
and a
ret
; e14b5
.SolvedPuzzleConfiguration: ; e14b5
.SolvedPuzzleConfiguration:
db $00, $00, $00, $00, $00, $00
db $00, $01, $02, $03, $04, $00
db $00, $05, $06, $07, $08, $00
db $00, $09, $0a, $0b, $0c, $00
db $00, $0d, $0e, $0f, $10, $00
db $00, $00, $00, $00, $00, $00
; e14d9
RedrawUnownPuzzlePieces: ; e14d9
RedrawUnownPuzzlePieces:
call GetCurrentPuzzlePieceVTileCorner
ld [wd002], a
xor a
@@ -570,9 +551,8 @@ RedrawUnownPuzzlePieces: ; e14d9
ld [de], a ; attributes
inc de
jr .loop
; e150f
.OAM_HoldingPiece: ; e150f
.OAM_HoldingPiece:
dsprite -1, -4, -1, -4, $00, 0
dsprite -1, -4, 0, -4, $01, 0
dsprite -1, -4, 0, 4, $02, 0
@@ -584,7 +564,7 @@ RedrawUnownPuzzlePieces: ; e14d9
dsprite 0, 4, 0, 4, $1a, 0
db -1
.OAM_NotHoldingPiece: ; e1534
.OAM_NotHoldingPiece:
dsprite -1, -4, -1, -4, $00, 0
dsprite -1, -4, 0, -4, $01, 0
dsprite -1, -4, 0, 4, $00, 0 | X_FLIP
@@ -596,7 +576,7 @@ RedrawUnownPuzzlePieces: ; e14d9
dsprite 0, 4, 0, 4, $00, 0 | X_FLIP | Y_FLIP
db -1
UnownPuzzleCoordData: ; e1559
UnownPuzzleCoordData:
puzzle_coords: MACRO
dbpixel \1, \2, \3, \4
@@ -646,7 +626,7 @@ ENDM
puzzle_coords 15, 18, 4, 4, 13, 15, PUZZLE_BORDER, 0
puzzle_coords 18, 18, 4, 4, 16, 15, PUZZLE_BORDER, 0
ConvertLoadedPuzzlePieces: ; e1631
ConvertLoadedPuzzlePieces:
ld hl, vTiles2
ld de, vTiles0
ld b, 6
@@ -667,9 +647,8 @@ ConvertLoadedPuzzlePieces: ; e1631
jr nz, .loop
call UnownPuzzle_AddPuzzlePieceBorders
ret
; e1654
.EnlargePuzzlePieceTiles: ; e1654
.EnlargePuzzlePieceTiles:
; double size
ld c, 6
.loop1
@@ -738,9 +717,8 @@ ConvertLoadedPuzzlePieces: ; e1631
dec c
jr nz, .loop1
ret
; e16aa
.GetEnlargedTile: ; e16aa
.GetEnlargedTile:
push hl
ld hl, .EnlargedTiles
add l
@@ -751,18 +729,16 @@ ConvertLoadedPuzzlePieces: ; e1631
ld a, [hl]
pop hl
ret
; e16b7
.EnlargedTiles: ; e16b7
.EnlargedTiles:
x = 0
rept 16
db ((x & %1000) * %11000) + ((x & %0100) * %1100) + ((x & %0010) * %110) + ((x & %0001) * %11)
x = x + 1
endr
; e16c7
UnownPuzzle_AddPuzzlePieceBorders: ; e16c7
UnownPuzzle_AddPuzzlePieceBorders:
ld hl, PuzzlePieceBorderData
ld a, 8
.loop
@@ -784,9 +760,8 @@ endr
dec a
jr nz, .loop
ret
; e16e2
.LoadGFX: ; e16e2
.LoadGFX:
lb bc, 4, 4
.loop1
push bc
@@ -817,9 +792,8 @@ endr
dec b
jr nz, .loop1
ret
; e1703
PuzzlePieceBorderData: ; e1703
PuzzlePieceBorderData:
dw .TileBordersGFX + 0 tiles, vTiles0 tile $00
dw .TileBordersGFX + 1 tiles, vTiles0 tile $01
dw .TileBordersGFX + 2 tiles, vTiles0 tile $02
@@ -828,12 +802,11 @@ PuzzlePieceBorderData: ; e1703
dw .TileBordersGFX + 5 tiles, vTiles0 tile $18
dw .TileBordersGFX + 6 tiles, vTiles0 tile $19
dw .TileBordersGFX + 7 tiles, vTiles0 tile $1a
; e1723
.TileBordersGFX: ; e1723
.TileBordersGFX:
INCBIN "gfx/unown_puzzle/tile_borders.2bpp"
LoadUnownPuzzlePiecesGFX: ; e17a3
LoadUnownPuzzlePiecesGFX:
ld a, [wScriptVar]
maskbits NUM_UNOWN_PUZZLES
ld e, a
@@ -848,30 +821,28 @@ LoadUnownPuzzlePiecesGFX: ; e17a3
call Decompress
call ConvertLoadedPuzzlePieces
ret
; e17bd
.LZPointers: ; e17bd
.LZPointers:
; entries correspond to UNOWNPUZZLE_* constants
dw KabutoPuzzleLZ
dw OmanytePuzzleLZ
dw AerodactylPuzzleLZ
dw HoOhPuzzleLZ
; e17c5
UnownPuzzleCursorGFX: ; e17c5
UnownPuzzleCursorGFX:
INCBIN "gfx/unown_puzzle/cursor.2bpp"
UnownPuzzleStartCancelLZ: ; e1805
UnownPuzzleStartCancelLZ:
INCBIN "gfx/unown_puzzle/start_cancel.2bpp.lz"
HoOhPuzzleLZ: ; e18ab
HoOhPuzzleLZ:
INCBIN "gfx/unown_puzzle/hooh.2bpp.lz"
AerodactylPuzzleLZ: ; e19fb
AerodactylPuzzleLZ:
INCBIN "gfx/unown_puzzle/aerodactyl.2bpp.lz"
KabutoPuzzleLZ: ; e1bab
KabutoPuzzleLZ:
INCBIN "gfx/unown_puzzle/kabuto.2bpp.lz"
OmanytePuzzleLZ: ; e1c9b
OmanytePuzzleLZ:
INCBIN "gfx/unown_puzzle/omanyte.2bpp.lz"