Rename "dummy game" to "memory game"

This commit is contained in:
Rangi 2020-11-08 19:32:57 -05:00
parent 7254c10093
commit 62b756c46e
12 changed files with 129 additions and 129 deletions

View File

@ -46,7 +46,7 @@ NUM_SPRITEANIMDICT_ENTRIES EQU 10
const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR ; 09 const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR ; 09
const SPRITE_ANIM_INDEX_RED_WALK ; 0a const SPRITE_ANIM_INDEX_RED_WALK ; 0a
const SPRITE_ANIM_INDEX_UNUSED_CURSOR ; 0b const SPRITE_ANIM_INDEX_UNUSED_CURSOR ; 0b
const SPRITE_ANIM_INDEX_DUMMY_GAME ; 0c const SPRITE_ANIM_INDEX_MEMORY_GAME_CURSOR ; 0c
const SPRITE_ANIM_INDEX_POKEGEAR_ARROW ; 0d const SPRITE_ANIM_INDEX_POKEGEAR_ARROW ; 0d
const SPRITE_ANIM_INDEX_TRADE_POKE_BALL ; 0e const SPRITE_ANIM_INDEX_TRADE_POKE_BALL ; 0e
const SPRITE_ANIM_INDEX_TRADE_POOF ; 0f const SPRITE_ANIM_INDEX_TRADE_POOF ; 0f
@ -96,7 +96,7 @@ NUM_SPRITEANIMDICT_ENTRIES EQU 10
const SPRITE_ANIM_SEQ_SLOTS_EGG ; 0b const SPRITE_ANIM_SEQ_SLOTS_EGG ; 0b
const SPRITE_ANIM_SEQ_MAIL_CURSOR ; 0c const SPRITE_ANIM_SEQ_MAIL_CURSOR ; 0c
const SPRITE_ANIM_SEQ_UNUSED_CURSOR ; 0d const SPRITE_ANIM_SEQ_UNUSED_CURSOR ; 0d
const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR ; 0e const SPRITE_ANIM_SEQ_MEMORY_GAME_CURSOR ; 0e
const SPRITE_ANIM_SEQ_POKEGEAR_ARROW ; 0f const SPRITE_ANIM_SEQ_POKEGEAR_ARROW ; 0f
const SPRITE_ANIM_SEQ_TRADE_POKE_BALL ; 10 const SPRITE_ANIM_SEQ_TRADE_POKE_BALL ; 10
const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE ; 11 const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE ; 11

View File

@ -55,7 +55,7 @@ SpecialsPointers::
add_special UnownPuzzle add_special UnownPuzzle
add_special SlotMachine add_special SlotMachine
add_special CardFlip add_special CardFlip
add_special UnusedDummyGame ; unused add_special UnusedMemoryGame ; unused
add_special ClearBGPalettesBufferScreen ; unused add_special ClearBGPalettesBufferScreen ; unused
add_special FadeOutPalettes add_special FadeOutPalettes
add_special BattleTowerFade add_special BattleTowerFade

View File

@ -25,8 +25,8 @@ SpriteAnimSeqData:
db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_UNUSED_CURSOR ; SPRITE_ANIM_INDEX_UNUSED_CURSOR
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_UNUSED_CURSOR, SPRITE_ANIM_DICT_ARROW_CURSOR db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_UNUSED_CURSOR, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_INDEX_DUMMY_GAME ; SPRITE_ANIM_INDEX_MEMORY_GAME_CURSOR
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR, SPRITE_ANIM_DICT_ARROW_CURSOR db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_MEMORY_GAME_CURSOR, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_INDEX_POKEGEAR_ARROW ; SPRITE_ANIM_INDEX_POKEGEAR_ARROW
db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_POKEGEAR_ARROW, SPRITE_ANIM_DICT_ARROW_CURSOR db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_POKEGEAR_ARROW, SPRITE_ANIM_DICT_ARROW_CURSOR
; SPRITE_ANIM_INDEX_TRADE_POKE_BALL ; SPRITE_ANIM_INDEX_TRADE_POKE_BALL

View File

@ -1368,11 +1368,11 @@ _TrainerRankingNoDataText:: ; unreferenced
para "" para ""
done done
_DummyGameYeahText:: _MemoryGameYeahText::
text " , yeah!" text " , yeah!"
done done
_DummyGameDarnText:: _MemoryGameDarnText::
text "Darn…" text "Darn…"
done done

View File

@ -206,11 +206,11 @@ CardFlip:
call StartGameCornerGame call StartGameCornerGame
ret ret
UnusedDummyGame: UnusedMemoryGame:
call CheckCoinsAndCoinCase call CheckCoinsAndCoinCase
ret c ret c
ld a, BANK(_DummyGame) ld a, BANK(_MemoryGame)
ld hl, _DummyGame ld hl, _MemoryGame
call StartGameCornerGame call StartGameCornerGame
ret ret

View File

@ -4,7 +4,7 @@ CARDFLIP_LIGHT_ON EQU "♀" ; $f5
CARDFLIP_DECK_SIZE EQUS "(wDeckEnd - wDeck)" CARDFLIP_DECK_SIZE EQUS "(wDeckEnd - wDeck)"
assert wDiscardPileEnd - wDiscardPile == wDeckEnd - wDeck assert wDiscardPileEnd - wDiscardPile == wDeckEnd - wDeck
DummyGameGFX: MemoryGameGFX:
; Graphics for an unused Game Corner ; Graphics for an unused Game Corner
; game were meant to be here. ; game were meant to be here.

View File

@ -1,4 +1,4 @@
_DummyGame: _MemoryGame:
call .LoadGFXAndPals call .LoadGFXAndPals
call DelayFrame call DelayFrame
.loop .loop
@ -11,13 +11,13 @@ _DummyGame:
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
callfar ClearSpriteAnims callfar ClearSpriteAnims
ld hl, DummyGameLZ ld hl, MemoryGameLZ
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
call Decompress call Decompress
ld hl, DummyGameGFX ld hl, MemoryGameGFX
ld de, vTiles0 tile $00 ld de, vTiles0 tile $00
ld bc, 4 tiles ld bc, 4 tiles
ld a, BANK(DummyGameGFX) ld a, BANK(MemoryGameGFX)
call FarCopyBytes call FarCopyBytes
ld a, SPRITE_ANIM_DICT_ARROW_CURSOR ld a, SPRITE_ANIM_DICT_ARROW_CURSOR
ld hl, wSpriteAnimDict ld hl, wSpriteAnimDict
@ -71,7 +71,7 @@ _DummyGame:
dw .AskPlayAgain dw .AskPlayAgain
.RestartGame: .RestartGame:
call DummyGame_InitStrings call MemoryGame_InitStrings
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
ret ret
@ -84,45 +84,45 @@ _DummyGame:
ret ret
.proceed .proceed
call DummyGame_InitBoard call MemoryGame_InitBoard
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
xor a xor a
ld [wDummyGameCounter], a ld [wMemoryGameCounter], a
ld hl, wDummyGameLastMatches ld hl, wMemoryGameLastMatches
rept 4 rept 4
ld [hli], a ld [hli], a
endr endr
ld [hl], a ld [hl], a
ld [wDummyGameNumCardsMatched], a ld [wMemoryGameNumCardsMatched], a
.InitBoardTilemapAndCursorObject: .InitBoardTilemapAndCursorObject:
ld hl, wDummyGameCounter ld hl, wMemoryGameCounter
ld a, [hl] ld a, [hl]
cp 45 cp 45
jr nc, .spawn_object jr nc, .spawn_object
inc [hl] inc [hl]
call DummyGame_Card2Coord call MemoryGame_Card2Coord
xor a xor a
ld [wDummyGameLastCardPicked], a ld [wMemoryGameLastCardPicked], a
call DummyGame_PlaceCard call MemoryGame_PlaceCard
ret ret
.spawn_object .spawn_object
depixel 6, 3, 4, 4 depixel 6, 3, 4, 4
ld a, SPRITE_ANIM_INDEX_DUMMY_GAME ld a, SPRITE_ANIM_INDEX_MEMORY_GAME_CURSOR
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, 5 ld a, 5
ld [wDummyGameNumberTriesRemaining], a ld [wMemoryGameNumberTriesRemaining], a
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
ret ret
.CheckTriesRemaining: .CheckTriesRemaining:
ld a, [wDummyGameNumberTriesRemaining] ld a, [wMemoryGameNumberTriesRemaining]
hlcoord 17, 0 hlcoord 17, 0
add "0" add "0"
ld [hl], a ld [hl], a
ld hl, wDummyGameNumberTriesRemaining ld hl, wMemoryGameNumberTriesRemaining
ld a, [hl] ld a, [hl]
and a and a
jr nz, .next_try jr nz, .next_try
@ -133,60 +133,60 @@ endr
.next_try .next_try
dec [hl] dec [hl]
xor a xor a
ld [wDummyGameCardChoice], a ld [wMemoryGameCardChoice], a
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
.PickCard1: .PickCard1:
ld a, [wDummyGameCardChoice] ld a, [wMemoryGameCardChoice]
and a and a
ret z ret z
dec a dec a
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, wDummyGameCards ld hl, wMemoryGameCards
add hl, de add hl, de
ld a, [hl] ld a, [hl]
cp -1 cp -1
ret z ret z
ld [wDummyGameLastCardPicked], a ld [wMemoryGameLastCardPicked], a
ld [wDummyGameCard1], a ld [wMemoryGameCard1], a
ld a, e ld a, e
ld [wDummyGameCard1Location], a ld [wMemoryGameCard1Location], a
call DummyGame_Card2Coord call MemoryGame_Card2Coord
call DummyGame_PlaceCard call MemoryGame_PlaceCard
xor a xor a
ld [wDummyGameCardChoice], a ld [wMemoryGameCardChoice], a
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
ret ret
.PickCard2: .PickCard2:
ld a, [wDummyGameCardChoice] ld a, [wMemoryGameCardChoice]
and a and a
ret z ret z
dec a dec a
ld hl, wDummyGameCard1Location ld hl, wMemoryGameCard1Location
cp [hl] cp [hl]
ret z ret z
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, wDummyGameCards ld hl, wMemoryGameCards
add hl, de add hl, de
ld a, [hl] ld a, [hl]
cp -1 cp -1
ret z ret z
ld [wDummyGameLastCardPicked], a ld [wMemoryGameLastCardPicked], a
ld [wDummyGameCard2], a ld [wMemoryGameCard2], a
ld a, e ld a, e
ld [wDummyGameCard2Location], a ld [wMemoryGameCard2Location], a
call DummyGame_Card2Coord call MemoryGame_Card2Coord
call DummyGame_PlaceCard call MemoryGame_PlaceCard
ld a, 64 ld a, 64
ld [wDummyGameCounter], a ld [wMemoryGameCounter], a
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
.DelayPickAgain: .DelayPickAgain:
ld hl, wDummyGameCounter ld hl, wMemoryGameCounter
ld a, [hl] ld a, [hl]
and a and a
jr z, .PickAgain jr z, .PickAgain
@ -194,7 +194,7 @@ endr
ret ret
.PickAgain: .PickAgain:
call DummyGame_CheckMatch call MemoryGame_CheckMatch
ld a, $3 ld a, $3
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
@ -204,27 +204,27 @@ endr
and A_BUTTON and A_BUTTON
ret z ret z
xor a xor a
ld [wDummyGameCounter], a ld [wMemoryGameCounter], a
.RevelationLoop: .RevelationLoop:
ld hl, wDummyGameCounter ld hl, wMemoryGameCounter
ld a, [hl] ld a, [hl]
cp 45 cp 45
jr nc, .finish_round jr nc, .finish_round
inc [hl] inc [hl]
push af push af
call DummyGame_Card2Coord call MemoryGame_Card2Coord
pop af pop af
push hl push hl
ld e, a ld e, a
ld d, $0 ld d, $0
ld hl, wDummyGameCards ld hl, wMemoryGameCards
add hl, de add hl, de
ld a, [hl] ld a, [hl]
pop hl pop hl
cp -1 cp -1
jr z, .RevelationLoop jr z, .RevelationLoop
ld [wDummyGameLastCardPicked], a ld [wMemoryGameLastCardPicked], a
call DummyGame_PlaceCard call MemoryGame_PlaceCard
jr .RevelationLoop jr .RevelationLoop
.finish_round .finish_round
@ -243,68 +243,68 @@ endr
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
DummyGame_CheckMatch: MemoryGame_CheckMatch:
ld hl, wDummyGameCard1 ld hl, wMemoryGameCard1
ld a, [hli] ld a, [hli]
cp [hl] cp [hl]
jr nz, .no_match jr nz, .no_match
ld a, [wDummyGameCard1Location] ld a, [wMemoryGameCard1Location]
call DummyGame_Card2Coord call MemoryGame_Card2Coord
call DummyGame_DeleteCard call MemoryGame_DeleteCard
ld a, [wDummyGameCard2Location] ld a, [wMemoryGameCard2Location]
call DummyGame_Card2Coord call MemoryGame_Card2Coord
call DummyGame_DeleteCard call MemoryGame_DeleteCard
ld a, [wDummyGameCard1Location] ld a, [wMemoryGameCard1Location]
ld e, a ld e, a
ld d, $0 ld d, $0
ld hl, wDummyGameCards ld hl, wMemoryGameCards
add hl, de add hl, de
ld [hl], -1 ld [hl], -1
ld a, [wDummyGameCard2Location] ld a, [wMemoryGameCard2Location]
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, wDummyGameCards ld hl, wMemoryGameCards
add hl, de add hl, de
ld [hl], -1 ld [hl], -1
ld hl, wDummyGameLastMatches ld hl, wMemoryGameLastMatches
.find_empty_slot .find_empty_slot
ld a, [hli] ld a, [hli]
and a and a
jr nz, .find_empty_slot jr nz, .find_empty_slot
dec hl dec hl
ld a, [wDummyGameCard1] ld a, [wMemoryGameCard1]
ld [hl], a ld [hl], a
ld [wDummyGameLastCardPicked], a ld [wMemoryGameLastCardPicked], a
ld hl, wDummyGameNumCardsMatched ld hl, wMemoryGameNumCardsMatched
ld e, [hl] ld e, [hl]
inc [hl] inc [hl]
inc [hl] inc [hl]
ld d, 0 ld d, 0
hlcoord 5, 0 hlcoord 5, 0
add hl, de add hl, de
call DummyGame_PlaceCard call MemoryGame_PlaceCard
ld hl, .VictoryText ld hl, .VictoryText
call PrintText call PrintText
ret ret
.no_match .no_match
xor a xor a
ld [wDummyGameLastCardPicked], a ld [wMemoryGameLastCardPicked], a
ld a, [wDummyGameCard1Location] ld a, [wMemoryGameCard1Location]
call DummyGame_Card2Coord call MemoryGame_Card2Coord
call DummyGame_PlaceCard call MemoryGame_PlaceCard
ld a, [wDummyGameCard2Location] ld a, [wMemoryGameCard2Location]
call DummyGame_Card2Coord call MemoryGame_Card2Coord
call DummyGame_PlaceCard call MemoryGame_PlaceCard
ld hl, DummyGameDarnText ld hl, MemoryGameDarnText
call PrintText call PrintText
ret ret
@ -312,60 +312,60 @@ DummyGame_CheckMatch:
text_asm text_asm
push bc push bc
hlcoord 2, 13 hlcoord 2, 13
call DummyGame_PlaceCard call MemoryGame_PlaceCard
ld hl, DummyGameYeahText ld hl, MemoryGameYeahText
pop bc pop bc
inc bc inc bc
inc bc inc bc
inc bc inc bc
ret ret
DummyGameYeahText: MemoryGameYeahText:
text_far _DummyGameYeahText text_far _MemoryGameYeahText
text_end text_end
DummyGameDarnText: MemoryGameDarnText:
text_far _DummyGameDarnText text_far _MemoryGameDarnText
text_end text_end
DummyGame_InitBoard: MemoryGame_InitBoard:
ld hl, wDummyGameCards ld hl, wMemoryGameCards
ld bc, wDummyGameCardsEnd - wDummyGameCards ld bc, wMemoryGameCardsEnd - wMemoryGameCards
xor a xor a
call ByteFill call ByteFill
call DummyGame_GetDistributionOfTiles call MemoryGame_GetDistributionOfTiles
ld c, 2 ld c, 2
ld b, [hl] ld b, [hl]
call DummyGame_SampleTilePlacement call MemoryGame_SampleTilePlacement
ld c, 8 ld c, 8
ld b, [hl] ld b, [hl]
call DummyGame_SampleTilePlacement call MemoryGame_SampleTilePlacement
ld c, 4 ld c, 4
ld b, [hl] ld b, [hl]
call DummyGame_SampleTilePlacement call MemoryGame_SampleTilePlacement
ld c, 7 ld c, 7
ld b, [hl] ld b, [hl]
call DummyGame_SampleTilePlacement call MemoryGame_SampleTilePlacement
ld c, 3 ld c, 3
ld b, [hl] ld b, [hl]
call DummyGame_SampleTilePlacement call MemoryGame_SampleTilePlacement
ld c, 6 ld c, 6
ld b, [hl] ld b, [hl]
call DummyGame_SampleTilePlacement call MemoryGame_SampleTilePlacement
ld c, 1 ld c, 1
ld b, [hl] ld b, [hl]
call DummyGame_SampleTilePlacement call MemoryGame_SampleTilePlacement
ld c, 5 ld c, 5
ld hl, wDummyGameCards ld hl, wMemoryGameCards
ld b, wDummyGameCardsEnd - wDummyGameCards ld b, wMemoryGameCardsEnd - wMemoryGameCards
.loop .loop
ld a, [hl] ld a, [hl]
and a and a
@ -377,9 +377,9 @@ DummyGame_InitBoard:
jr nz, .loop jr nz, .loop
ret ret
DummyGame_SampleTilePlacement: MemoryGame_SampleTilePlacement:
push hl push hl
ld de, wDummyGameCards ld de, wMemoryGameCards
.loop .loop
call Random call Random
and %00111111 and %00111111
@ -398,7 +398,7 @@ DummyGame_SampleTilePlacement:
inc hl inc hl
ret ret
DummyGame_GetDistributionOfTiles: MemoryGame_GetDistributionOfTiles:
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
ld l, a ld l, a
@ -415,8 +415,8 @@ DummyGame_GetDistributionOfTiles:
db $02, $02, $04, $06, $06, $08, $08, $09 db $02, $02, $04, $06, $06, $08, $08, $09
db $02, $02, $02, $04, $07, $08, $08, $0c db $02, $02, $02, $04, $07, $08, $08, $0c
DummyGame_PlaceCard: MemoryGame_PlaceCard:
ld a, [wDummyGameLastCardPicked] ld a, [wMemoryGameLastCardPicked]
sla a sla a
sla a sla a
add 4 add 4
@ -433,7 +433,7 @@ DummyGame_PlaceCard:
call DelayFrames call DelayFrames
ret ret
DummyGame_DeleteCard: MemoryGame_DeleteCard:
ld a, $1 ld a, $1
ld [hli], a ld [hli], a
ld [hld], a ld [hld], a
@ -445,7 +445,7 @@ DummyGame_DeleteCard:
call DelayFrames call DelayFrames
ret ret
DummyGame_InitStrings: MemoryGame_InitStrings:
hlcoord 0, 0 hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $1 ld a, $1
@ -467,7 +467,7 @@ DummyGame_InitStrings:
.japstr2 .japstr2
db "あと かい@" db "あと かい@"
DummyGame_Card2Coord: MemoryGame_Card2Coord:
ld d, 0 ld d, 0
.find_row .find_row
sub 9 sub 9
@ -493,7 +493,7 @@ DummyGame_Card2Coord:
add hl, de add hl, de
ret ret
DummyGame_InterpretJoypad_AnimateCursor: MemoryGame_InterpretJoypad_AnimateCursor:
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
cp $7 cp $7
jr nc, .quit jr nc, .quit
@ -527,7 +527,7 @@ DummyGame_InterpretJoypad_AnimateCursor:
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
inc a inc a
ld [wDummyGameCardChoice], a ld [wMemoryGameCardChoice], a
ret ret
.pressed_left .pressed_left
@ -586,5 +586,5 @@ DummyGame_InterpretJoypad_AnimateCursor:
ld [hl], a ld [hl], a
ret ret
DummyGameLZ: MemoryGameLZ:
INCBIN "gfx/dummy_game/dummy_game.2bpp.lz" INCBIN "gfx/memory_game/memory_game.2bpp.lz"

View File

@ -27,7 +27,7 @@ DoAnimFrame:
dw AnimSeq_SlotsChanseyEgg dw AnimSeq_SlotsChanseyEgg
dw AnimSeq_MailCursor dw AnimSeq_MailCursor
dw AnimSeq_UnusedCursor dw AnimSeq_UnusedCursor
dw AnimSeq_DummyGameCursor dw AnimSeq_MemoryGameCursor
dw AnimSeq_PokegearArrow dw AnimSeq_PokegearArrow
dw AnimSeq_TradePokeBall dw AnimSeq_TradePokeBall
dw AnimSeq_TradeTubeBulge dw AnimSeq_TradeTubeBulge
@ -407,8 +407,8 @@ AnimSeq_PokegearArrow:
callfar AnimatePokegearModeIndicatorArrow callfar AnimatePokegearModeIndicatorArrow
ret ret
AnimSeq_DummyGameCursor: AnimSeq_MemoryGameCursor:
callfar DummyGame_InterpretJoypad_AnimateCursor callfar MemoryGame_InterpretJoypad_AnimateCursor
ret ret
AnimSeq_TradePokeBall: AnimSeq_TradePokeBall:

View File

@ -8,7 +8,7 @@ gfx/battle/dude.2bpp.lz: LZFLAGS += --align 4
gfx/diploma/diploma.2bpp.lz: LZFLAGS += --method 8 --align 1 gfx/diploma/diploma.2bpp.lz: LZFLAGS += --method 8 --align 1
gfx/dummy_game/dummy_game.2bpp.lz: LZFLAGS += --method 2 --align 4 gfx/memory_game/memory_game.2bpp.lz: LZFLAGS += --method 2 --align 4
gfx/intro/%.lz: LZFLAGS += --align 4 gfx/intro/%.lz: LZFLAGS += --align 4
gfx/intro/suicune_close.2bpp.lz: LZFLAGS += --method 2 --align 4 gfx/intro/suicune_close.2bpp.lz: LZFLAGS += --method 2 --align 4

View File

Before

Width:  |  Height:  |  Size: 445 B

After

Width:  |  Height:  |  Size: 445 B

View File

@ -479,7 +479,7 @@ SECTION "bank38", ROMX
INCLUDE "engine/events/print_unown_2.asm" INCLUDE "engine/events/print_unown_2.asm"
INCLUDE "engine/games/card_flip.asm" INCLUDE "engine/games/card_flip.asm"
INCLUDE "engine/games/unown_puzzle.asm" INCLUDE "engine/games/unown_puzzle.asm"
INCLUDE "engine/games/dummy_game.asm" INCLUDE "engine/games/memory_game.asm"
INCLUDE "engine/pokemon/bills_pc.asm" INCLUDE "engine/pokemon/bills_pc.asm"

View File

@ -849,18 +849,18 @@ wDiscardPile:: ds 4 * 6
wDiscardPileEnd:: wDiscardPileEnd::
NEXTU NEXTU
; dummy game ; unused memory game
wDummyGameCards:: ds 9 * 5 wMemoryGameCards:: ds 9 * 5
wDummyGameCardsEnd:: wMemoryGameCardsEnd::
wDummyGameLastCardPicked:: db wMemoryGameLastCardPicked:: db
wDummyGameCard1:: db wMemoryGameCard1:: db
wDummyGameCard2:: db wMemoryGameCard2:: db
wDummyGameCard1Location:: db wMemoryGameCard1Location:: db
wDummyGameCard2Location:: db wMemoryGameCard2Location:: db
wDummyGameNumberTriesRemaining:: db wMemoryGameNumberTriesRemaining:: db
wDummyGameLastMatches:: ds 5 wMemoryGameLastMatches:: ds 5
wDummyGameCounter:: db wMemoryGameCounter:: db
wDummyGameNumCardsMatched:: db wMemoryGameNumCardsMatched:: db
NEXTU NEXTU
; mobile data ; mobile data
@ -1412,8 +1412,8 @@ wCardFlipCursorX:: db
wCardFlipWhichCard:: db wCardFlipWhichCard:: db
NEXTU NEXTU
; dummy game ; unused memory game
wDummyGameCardChoice:: db wMemoryGameCardChoice:: db
NEXTU NEXTU
; magnet train ; magnet train