Rename "dummy game" to "memory game"

constants/sprite_anim_constants.asm

@@ -46,7 +46,7 @@ NUM_SPRITEANIMDICT_ENTRIES EQU 10
 	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR       ; 09
 	const SPRITE_ANIM_INDEX_RED_WALK                  ; 0a
 	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_TRADE_POKE_BALL           ; 0e
 	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_MAIL_CURSOR               ; 0c
 	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_TRADE_POKE_BALL           ; 10
 	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE          ; 11

data/events/special_pointers.asm

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

data/sprite_anims/sequences.asm

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

data/text/common_2.asm

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

engine/events/specials.asm

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

engine/games/card_flip.asm

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

engine/games/memory_game.asm

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

engine/gfx/sprite_anims.asm

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

gfx/lz.mk

@@ -8,7 +8,7 @@ gfx/battle/dude.2bpp.lz: LZFLAGS += --align 4
 
 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/suicune_close.2bpp.lz: LZFLAGS += --method 2 --align 4

main.asm

@@ -479,7 +479,7 @@ SECTION "bank38", ROMX
 INCLUDE "engine/events/print_unown_2.asm"
 INCLUDE "engine/games/card_flip.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"
 
 

wram.asm

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