Rename "dummy game" to "memory game"

pret · Nov 9, 2020 · 62b756c · 62b756c
1 parent 7254c10
commit 62b756c
Show file tree

Hide file tree

Showing 12 changed files with 129 additions and 129 deletions.
diff --git a/constants/sprite_anim_constants.asm b/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

diff --git a/data/events/special_pointers.asm b/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

diff --git a/data/sprite_anims/sequences.asm b/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

diff --git a/data/text/common_2.asm b/data/text/common_2.asm
@@ -1368,11 +1368,11 @@ _TrainerRankingNoDataText:: ; unreferenced
 	para ""
 	done
 
-_DummyGameYeahText::
+_MemoryGameYeahText::
 	text " , yeah!"
 	done
 
-_DummyGameDarnText::
+_MemoryGameDarnText::
 	text "Darn…"
 	done
 

diff --git a/engine/events/specials.asm b/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
 

diff --git a/engine/games/card_flip.asm b/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.