pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

card flip (checkpoint commit)

Browse Source
This commit is contained in:
PikalaxALT
2015-12-11 08:17:38 -05:00
parent 3980d2d736
commit f198dfd862
4 changed files with 253 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

450
engine/card_flip.asm
View File

File diff suppressed because it is too large Load Diff

8
engine/slot_machine.asm
View File

@ -265,7 +265,7 @@ Slots_Init: ; 9287e (24:687e)
Slots_BetAndStart: ; 9288e (24:688e) Slots_BetAndStart: ; 9288e (24:688e)
call Slots_AskBet call Slots_AskBet
jr nc, .proceed jr nc, .proceed
ld a, Slots_QuitJumptableIndex ld a, Slots_QuitTableIndex
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
@ -275,7 +275,7 @@ Slots_BetAndStart: ; 9288e (24:688e)
call Slots_InitBias call Slots_InitBias
ld a, 32 ld a, 32
ld [wcf64], a ld [wcf64], a
ld a, 4 ; ReelAction_NormalRateJumptableIndex ld a, 4 ; ReelAction_NormalRateTableIndex
ld [wReel1ReelAction], a ld [wReel1ReelAction], a
ld [wReel2ReelAction], a ld [wReel2ReelAction], a
ld [wReel3ReelAction], a ld [wReel3ReelAction], a
@ -455,12 +455,12 @@ Slots_RestartOrQuit: ; 929d9 (24:69d9)
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
call Slots_AskPlayAgain call Slots_AskPlayAgain
jr c, .exit_slots jr c, .exit_slots
ld a, Slots_InitJumptableIndex ld a, Slots_InitTableIndex
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
.exit_slots .exit_slots
ld a, Slots_QuitJumptableIndex ld a, Slots_QuitTableIndex
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret

31
macros.asm
View File

@ -212,7 +212,7 @@ ENDM
palettes EQUS "* 8" palettes EQUS "* 8"
ldpixel: MACRO ldpixel: MACRO
if _NARG == 5 if _NARG >= 5
lb \1, \2 * 8 + \4, \3 * 8 + \5 lb \1, \2 * 8 + \4, \3 * 8 + \5
else else
lb \1, \2 * 8, \3 * 8 lb \1, \2 * 8, \3 * 8
@ -222,7 +222,7 @@ endm
depixel EQUS "ldpixel de," depixel EQUS "ldpixel de,"
dbpixel: MACRO dbpixel: MACRO
if _NARG == 4 if _NARG >= 4
db \1 * 8 + \3, \2 * 8 + \4 db \1 * 8 + \3, \2 * 8 + \4
else else
db \1 * 8, \2 * 8 db \1 * 8, \2 * 8
@ -230,7 +230,7 @@ endc
endm endm
bgcoord: MACRO bgcoord: MACRO
IF _NARG == 4 IF _NARG >= 4
ld \1, \3 * $20 + \2 + \4 ld \1, \3 * $20 + \2 + \4
ELSE ELSE
ld \1, \3 * $20 + \2 + VBGMap0 ld \1, \3 * $20 + \2 + VBGMap0
@ -249,7 +249,7 @@ palblue EQUS "$0001 *"
dsprite: MACRO dsprite: MACRO
; conditional segment is there because not every instance of ; conditional segment is there because not every instance of
; this macro is directly OAM ; this macro is directly OAM
if _NARG == 7 ; y tile, y pxl, x tile, x pxl, vtile offset, flags, palette if _NARG >= 7 ; y tile, y pxl, x tile, x pxl, vtile offset, flags, palette
db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, (\6 << 3) + (\7 & 7) db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, (\6 << 3) + (\7 & 7)
else else
db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6 db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6
@ -257,27 +257,24 @@ endc
endm endm
jumptable_start: MACRO jumptable_start: MACRO
; Use the declare opname you want to use,
; either "dw", "dba", or "dab".
if def(__far)
purge __far
endc
if _NARG == 0 if _NARG == 0
__far = 0 __far EQUS "dw"
else else
__far = \1 ; 0: dw | 1: dba | 2: dab __far EQUS "\1"
endc endc
enum_start enum_start
endm endm
jumptable: MACRO jumptable: MACRO
if DEF(\1JumptableIndex) if DEF(\1TableIndex)
__enum__ = __enum__ + 1 __enum__ = __enum__ + 1
else else
enum \1JumptableIndex enum \1TableIndex
endc
if __far == 0
dw \1
else
if __far == 1
dba \1
else
dab \1
endc
endc endc
__far \1
endm endm

7
wram.asm
View File

@ -808,6 +808,13 @@ wSlotsDataEnd::
wSlotsEnd:: wSlotsEnd::
ds wSlots - @ ds wSlots - @
; Card Flip
wCardFlip::
wDeck:: ds 24
wDeckEnd::
wCardFlipEnd::
ds wCardFlip - @
wc6d0:: wc6d0::
PlayerSDefLevel:: ; c6d0 PlayerSDefLevel:: ; c6d0
ds 1 ds 1