pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Card Flip

Browse Source
This commit is contained in:
PikalaxALT 2015-12-11 16:59:40 -05:00
parent b65fe57db6
commit ecd277204a
22 changed files with 653 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
battle/anim_commands.asm
View File

@ -241,7 +241,7 @@ Functioncc220: ; cc220
ld [hBGMapAddress], a ld [hBGMapAddress], a
ld a, (VBGMap0 tile $28) / $100 ld a, (VBGMap0 tile $28) / $100
ld [hBGMapAddress + 1], a ld [hBGMapAddress + 1], a
call Function3200 call WaitBGMap2
ld a, $60 ld a, $60
ld [hWY], a ld [hWY], a
xor a xor a

2
battle/core.asm
View File

@ -8934,7 +8934,7 @@ DisplayLinkRecord: ; 3f836
xor a xor a
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
call Function3200 call WaitBGMap2
ld b, SCGB_08 ld b, SCGB_08
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes

1172
engine/card_flip.asm
View File

File diff suppressed because it is too large Load Diff

4
engine/credits.asm
View File

@ -556,13 +556,13 @@ Function109a95: ; 109a95 (42:5a95)
ld bc, $14 ld bc, $14
ld a, $1 ld a, $1
call ByteFill call ByteFill
call Function3200 call WaitBGMap2
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld [hBGMapAddress], a ld [hBGMapAddress], a
hlcoord 0, 0 hlcoord 0, 0
call Function109aff call Function109aff
call Function3200 call WaitBGMap2
ret ret
Function109aff: ; 109aff (42:5aff) Function109aff: ; 109aff (42:5aff)

4
engine/debug.asm
View File

@ -1149,7 +1149,7 @@ TilesetColorTest:
ld [hMapAnims], a ld [hMapAnims], a
call ClearSprites call ClearSprites
call OverworldTextModeSwitch call OverworldTextModeSwitch
call Function3200 call WaitBGMap2
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld de, DebugColorTestGFX + $10 ld de, DebugColorTestGFX + $10
@ -1184,7 +1184,7 @@ TilesetColorTest:
call Function821d2 call Function821d2
call Function821f4 call Function821f4
call Function8220f call Function8220f
call Function3200 call WaitBGMap2
ld [wJumptableIndex], a ld [wJumptableIndex], a
ld a, $40 ld a, $40
ld [hWY], a ld [hWY], a

2
engine/intro_menu.asm
View File

@ -1036,7 +1036,7 @@ StartTitleScreen: ; 6219
ld hl, rLCDC ld hl, rLCDC
res 2, [hl] res 2, [hl]
call ClearScreen call ClearScreen
call Function3200 call WaitBGMap2
xor a xor a
ld [hLCDStatCustom], a ld [hLCDStatCustom], a
ld [hSCX], a ld [hSCX], a

12
engine/link.asm
View File

@ -15,7 +15,7 @@ LinkCommunications: ; 28000
call LoadStandardFont call LoadStandardFont
call LoadFontsBattleExtra call LoadFontsBattleExtra
callba Function16d69a callba Function16d69a
call Function3200 call WaitBGMap2
hlcoord 3, 8 hlcoord 3, 8
ld b, $2 ld b, $2
ld c, $c ld c, $c
@ -26,7 +26,7 @@ LinkCommunications: ; 28000
ld de, String28419 ld de, String28419
call PlaceString call PlaceString
call Function28eff call Function28eff
call Function3200 call WaitBGMap2
ld hl, wcf5d ld hl, wcf5d
xor a xor a
ld [hli], a ld [hli], a
@ -497,7 +497,7 @@ Function283b2: ; 283b2
call ClearScreen call ClearScreen
ld b, SCGB_08 ld b, SCGB_08
call GetSGBLayout call GetSGBLayout
call Function3200 call WaitBGMap2
ret ret
; 283ed ; 283ed
@ -1311,7 +1311,7 @@ Function2888b: ; 2888b
ld [wcfa5], a ld [wcfa5], a
xor a xor a
ld [wcfa6], a ld [wcfa6], a
call Function3200 call WaitBGMap2
Function288c5: ; 288c5 Function288c5: ; 288c5
callba Function16d70c callba Function16d70c
@ -1602,7 +1602,7 @@ Function28b22: ; 28b22
call ClearScreen call ClearScreen
ld b, SCGB_08 ld b, SCGB_08
call GetSGBLayout call GetSGBLayout
call Function3200 call WaitBGMap2
xor a xor a
ld [wcfbb], a ld [wcfbb], a
xor a xor a
@ -1721,7 +1721,7 @@ Function28b87: ; 28b87
call Function1bd3 call Function1bd3
push af push af
call Call_ExitMenu call Call_ExitMenu
call Function3200 call WaitBGMap2
pop af pop af
bit 1, a bit 1, a
jr nz, .asm_28c33 jr nz, .asm_28c33

4
engine/main_menu.asm
View File

@ -388,7 +388,7 @@ Function49f16: ; 49f16
ld de, String_0x49fe9 ld de, String_0x49fe9
hlcoord 1, 14 hlcoord 1, 14
call PlaceString call PlaceString
call Function3200 call WaitBGMap2
call SetPalettes call SetPalettes
call Function1bc9 call Function1bc9
ld hl, MenuSelection2 ld hl, MenuSelection2
@ -1071,7 +1071,7 @@ Function4a4c4: ; 4a4c4 (12:64c4)
ld e, l ld e, l
hlcoord 1, 16 hlcoord 1, 16
call PlaceString call PlaceString
call Function3200 call WaitBGMap2
call SetPalettes call SetPalettes
call Function1bc9 call Function1bc9
ld hl, MenuSelection2 ld hl, MenuSelection2

2
engine/time_capsule/conversion.asm
View File

@ -379,7 +379,7 @@ Functionfb8c8: ; fb8c8
call LoadFontsExtra call LoadFontsExtra
call LoadStandardFont call LoadStandardFont
callba Pokedex_PlaceFrontpicTopLeftCorner callba Pokedex_PlaceFrontpicTopLeftCorner
call Function3200 call WaitBGMap2
callba GetEnemyMonDVs callba GetEnemyMonDVs
ld a, [hli] ld a, [hli]
ld [TempMonDVs], a ld [TempMonDVs], a

2
engine/town_map.asm
View File

@ -31,7 +31,7 @@ _TownMap: ; 9191c
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function91a04 call Function91a04
call Function3200 call WaitBGMap2
ld a, [wd002] ld a, [wd002]
call Function9106a call Function9106a
ld a, [wd003] ld a, [wd003]

2
event/unown.asm
View File

@ -150,7 +150,7 @@ endr
ld bc, AttrMap - TileMap ld bc, AttrMap - TileMap
add hl, bc add hl, bc
call Function8aee9 call Function8aee9
call Function3200 call WaitBGMap2
call JoyWaitAorB call JoyWaitAorB
call PlayClickSFX call PlayClickSFX
call WriteBackup call WriteBackup

2
event/whiteout.asm
View File

@ -35,7 +35,7 @@ Script_Whiteout: ; 0x124ce
OverworldBGMap: ; 124fa OverworldBGMap: ; 124fa
call ClearPalettes call ClearPalettes
call ClearScreen call ClearScreen
call Function3200 call WaitBGMap2
call HideSprites call HideSprites
call RotateThreePalettesLeft call RotateThreePalettesLeft
ret ret

2
home.asm
View File

@ -542,7 +542,7 @@ WaitBGMap:: ; 31f6
ret ret
; 3200 ; 3200
Function3200:: ; 0x3200 WaitBGMap2:: ; 0x3200
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .bg0 jr z, .bg0

4
home/map.asm
View File

@ -2033,7 +2033,7 @@ Function2b5c:: ; 2b5c
ld b, SCGB_09 ld b, SCGB_09
call GetSGBLayout call GetSGBLayout
callba Function49409 callba Function49409
call Function3200 call WaitBGMap2
callba FadeInPalettes callba FadeInPalettes
call EnableSpriteUpdates call EnableSpriteUpdates
ret ret
@ -2053,7 +2053,7 @@ Function2b74:: ; 0x2b74
ld hl, VramState ld hl, VramState
set 0, [hl] set 0, [hl]
call UpdateSprites call UpdateSprites
call Function3200 call WaitBGMap2
ld b, SCGB_09 ld b, SCGB_09
call GetSGBLayout call GetSGBLayout
callba Function49409 callba Function49409

1
macros.asm
View File

@ -220,6 +220,7 @@ endc
endm endm
depixel EQUS "ldpixel de," depixel EQUS "ldpixel de,"
bcpixel EQUS "ldpixel bc,"
dbpixel: MACRO dbpixel: MACRO
if _NARG >= 4 if _NARG >= 4

18
main.asm
View File

@ -769,7 +769,7 @@ Function8000: ; 8000
ld bc, AttrMapEnd - AttrMap ld bc, AttrMapEnd - AttrMap
ld a, $7 ld a, $7
call ByteFill call ByteFill
call Function3200 call WaitBGMap2
call SetPalettes call SetPalettes
ret ret
; 8029 ; 8029
@ -7647,7 +7647,7 @@ ClearPCItemScreen: ; e58b
hlcoord 0,12 hlcoord 0,12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call TextBox
call Function3200 call WaitBGMap2
call SetPalettes ; load regular palettes? call SetPalettes ; load regular palettes?
ret ret
; 0xe5bb ; 0xe5bb
@ -13483,13 +13483,13 @@ InitGender: ; 48dcb (12:4dcb)
call Function48e14 call Function48e14
call Function48e47 call Function48e47
call Function48e64 call Function48e64
call Function3200 call WaitBGMap2
call SetPalettes call SetPalettes
ld hl, TextJump_AreYouABoyOrAreYouAGirl ld hl, TextJump_AreYouABoyOrAreYouAGirl
call PrintText call PrintText
ld hl, .MenuDataHeader ld hl, .MenuDataHeader
call LoadMenuDataHeader call LoadMenuDataHeader
call Function3200 call WaitBGMap2
call InterpretMenu2 call InterpretMenu2
call WriteBackup call WriteBackup
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -14814,13 +14814,13 @@ Function4d319: ; 4d319
callba Function4d354 callba Function4d354
callba Function16d673 callba Function16d673
callba Function28eff callba Function28eff
call Function3200 call WaitBGMap2
ret ret
; 4d354 ; 4d354
Function4d354: ; 4d354 Function4d354: ; 4d354
call WaitBGMap call WaitBGMap
call Function3200 call WaitBGMap2
ret ret
; 4d35b ; 4d35b
@ -16110,7 +16110,7 @@ Function4e881: ; 4e881
call EnableLCD call EnableLCD
ld hl, .SavingRecordDontTurnOff ld hl, .SavingRecordDontTurnOff
call PrintText call PrintText
call Function3200 call WaitBGMap2
call SetPalettes call SetPalettes
ret ret
; 4e8bd ; 4e8bd
@ -16150,7 +16150,7 @@ Function4e8c2: ; 4e8c2
ld [hSCY], a ld [hSCY], a
ld [hSCX], a ld [hSCX], a
call EnableLCD call EnableLCD
call Function3200 call WaitBGMap2
call SetPalettes call SetPalettes
ret ret
; 4e906 ; 4e906
@ -20305,7 +20305,7 @@ Function1de247: ; 1de247
ld b, SCREEN_HEIGHT ld b, SCREEN_HEIGHT
hlcoord 19, 0, AttrMap hlcoord 19, 0, AttrMap
call Bank77_FillColumn call Bank77_FillColumn
call Function3200 call WaitBGMap2
pop hl pop hl
ld a, l ld a, l
ld [hBGMapAddress], a ld [hBGMapAddress], a

2
misc/mobile_12.asm
View File

@ -112,7 +112,7 @@ InitMobileProfile: ; 4802f (12:402f)
ld de, String_48275 ld de, String_48275
call PlaceString call PlaceString
call Function48187 call Function48187
call Function3200 call WaitBGMap2
call SetPalettes call SetPalettes
call Function1bc9 call Function1bc9
ld hl, MenuSelection2 ld hl, MenuSelection2

2
misc/mobile_12_2.asm
View File

@ -825,7 +825,7 @@ UnknownText_0x4ad51: ; 0x4ad51
Function4ad56: ; 4ad56 Function4ad56: ; 4ad56
callba OpenPartyStats callba OpenPartyStats
call Function3200 call WaitBGMap2
ret ret
; 4ad60 ; 4ad60

2
misc/mobile_22.asm
View File

@ -1308,7 +1308,7 @@ Function89844: ; 89844
call Function894bb call Function894bb
call Function897af call Function897af
push bc push bc
call Function3200 call WaitBGMap2
call SetPalettes call SetPalettes
pop bc pop bc
ret ret

2
misc/mobile_46.asm
View File

@ -1295,7 +1295,7 @@ Function118936:
ld a, $40 ld a, $40
or [hl] or [hl]
ld [hl], a ld [hl], a
call Function3200 call WaitBGMap2
ld a, $1 ld a, $1
ld [wcd4f], a ld [wcd4f], a
ld a, $1 ld a, $1

4
misc/mobile_5b.asm
View File

@ -1038,7 +1038,7 @@ Function16d6ce: ; 16d6ce
call Function16d6e1 call Function16d6e1
callba Function87d callba Function87d
call Call_ExitMenu call Call_ExitMenu
call Function3200 call WaitBGMap2
ret ret
; 16d6e1 ; 16d6e1
@ -1051,7 +1051,7 @@ Function16d6e1: ; 16d6e1
ld de, .Waiting ld de, .Waiting
call PlaceString call PlaceString
call WaitBGMap call WaitBGMap
call Function3200 call WaitBGMap2
ld c, $32 ld c, $32
jp DelayFrames jp DelayFrames
; 16d701 ; 16d701

6
wram.asm
View File

@ -815,6 +815,9 @@ wDeck:: ds 24
wDeckEnd:: wDeckEnd::
; c6e8 ; c6e8
wCardFlipNumCardsPlayed:: ds 1 wCardFlipNumCardsPlayed:: ds 1
wCardFlipFaceUpCard:: ds 1
wDiscardPile:: ds 24
wDiscardPileEnd::
wCardFlipEnd:: wCardFlipEnd::
ds wCardFlip - @ ds wCardFlip - @
@ -1435,15 +1438,18 @@ wNrOfBeatenBattleTowerTrainers::
wMomBankDigitCursorPosition:: wMomBankDigitCursorPosition::
wIntroSceneFrameCounter:: wIntroSceneFrameCounter::
wHoldingUnownPuzzlePiece:: wHoldingUnownPuzzlePiece::
wCardFlipCursorY::
wcf64:: ds 1 wcf64:: ds 1
IF !DEF(CRYSTAL11) IF !DEF(CRYSTAL11)
wPokedexStatus:: wPokedexStatus::
ENDC ENDC
wTitleScreenTimerLo:: wTitleScreenTimerLo::
wUnownPuzzleCursorPosition:: wUnownPuzzleCursorPosition::
wCardFlipCursorX::
wcf65:: ds 1 wcf65:: ds 1
wTitleScreenTimerHi:: wTitleScreenTimerHi::
wUnownPuzzleHeldPiece:: wUnownPuzzleHeldPiece::
wCardFlipWhichCard::
wcf66:: ds 1 wcf66:: ds 1
Requested2bpp:: ; cf67 Requested2bpp:: ; cf67