Dummy Game

This commit is contained in:
PikalaxALT
2015-12-28 17:09:53 -05:00
parent 57d4cb0edf
commit a2a2668233
15 changed files with 539 additions and 514 deletions

View File

@ -88,6 +88,17 @@
const POKEDEX_SHOW_7 ; $56 const POKEDEX_SHOW_7 ; $56
const POKEDEX_SHOW_8 ; $57 const POKEDEX_SHOW_8 ; $57
const_def
const MAPRADIO_POKEMON_CHANNEL
const MAPRADIO_OAKS_MON_TALK
const MAPRADIO_POKEDEX_SHOW
const MAPRADIO_PKMN_MUSIC
const MAPRADIO_LUCKY_CHANNEL
const MAPRADIO_UNOWN
const MAPRADIO_PLACES_PEOPLE
const MAPRADIO_LETS_ALL_SING
const MAPRADIO_ROCKET
const_def const_def
const BUENA_MON const BUENA_MON
const BUENA_ITEM const BUENA_ITEM

View File

@ -349,22 +349,22 @@ MAX_OUTDOOR_SPRITES EQU 23
const FACING_1F const FACING_1F
const_def const_def
const SPRITEANIMSTRUCT_INDEX const SPRITEANIMSTRUCT_INDEX ; 0
const SPRITEANIMSTRUCT_FRAMESET_ID const SPRITEANIMSTRUCT_FRAMESET_ID ; 1
const SPRITEANIMSTRUCT_ANIM_SEQ_ID const SPRITEANIMSTRUCT_ANIM_SEQ_ID ; 2
const SPRITEANIMSTRUCT_TILE_ID const SPRITEANIMSTRUCT_TILE_ID ; 3
const SPRITEANIMSTRUCT_XCOORD const SPRITEANIMSTRUCT_XCOORD ; 4
const SPRITEANIMSTRUCT_YCOORD const SPRITEANIMSTRUCT_YCOORD ; 5
const SPRITEANIMSTRUCT_XOFFSET const SPRITEANIMSTRUCT_XOFFSET ; 6
const SPRITEANIMSTRUCT_YOFFSET const SPRITEANIMSTRUCT_YOFFSET ; 7
const SPRITEANIMSTRUCT_DURATION const SPRITEANIMSTRUCT_DURATION ; 8
const SPRITEANIMSTRUCT_DURATIONOFFSET const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9
const SPRITEANIMSTRUCT_FRAME const SPRITEANIMSTRUCT_FRAME ; a
const SPRITEANIMSTRUCT_0B const SPRITEANIMSTRUCT_0B ; b
const SPRITEANIMSTRUCT_0C const SPRITEANIMSTRUCT_0C ; c
const SPRITEANIMSTRUCT_0D const SPRITEANIMSTRUCT_0D ; d
const SPRITEANIMSTRUCT_0E const SPRITEANIMSTRUCT_0E ; e
const SPRITEANIMSTRUCT_0F const SPRITEANIMSTRUCT_0F ; f
const_def const_def
const SPRITE_ANIM_FRAMESET_00 const SPRITE_ANIM_FRAMESET_00

File diff suppressed because it is too large Load Diff

View File

@ -27,7 +27,7 @@ SendMailToPC: ; 4456e
call ByteFill call ByteFill
ld a, MON_ITEM ld a, MON_ITEM
call GetPartyParamLocation call GetPartyParamLocation
ld [hl], $0 ld [hl], 0
ld hl, sMailboxCount ld hl, sMailboxCount
inc [hl] inc [hl]
call CloseSRAM call CloseSRAM
@ -355,7 +355,7 @@ InitMail: ; 0x447b9
ret ret
; 0x447da ; 0x447da
Function447da: ; 0x447da MailboxPC_GetMailAuthor: ; 0x447da
dec a dec a
ld hl, sMailbox1Author ld hl, sMailbox1Author
ld bc, MAIL_STRUCT_LENGTH ld bc, MAIL_STRUCT_LENGTH
@ -373,10 +373,10 @@ Function447da: ; 0x447da
ret ret
; 0x447fb ; 0x447fb
Function447fb: ; 0x447fb MailboxPC_PrintMailAuthor: ; 0x447fb
push de push de
ld a, [MenuSelection] ld a, [MenuSelection]
call Function447da call MailboxPC_GetMailAuthor
pop hl pop hl
jp PlaceString jp PlaceString
; 0x44806 ; 0x44806
@ -384,11 +384,11 @@ Function447fb: ; 0x447fb
MailboxPC: ; 0x44806 MailboxPC: ; 0x44806
xor a xor a
ld [OBPals + 8 * 6], a ld [OBPals + 8 * 6], a
ld a, $1 ld a, 1
ld [wCurMessageIndex], a ld [wCurMessageIndex], a
.loop .loop
call InitMail call InitMail
ld hl, MenuData4494c ld hl, .TopMenuDataHeader
call CopyMenuDataHeader call CopyMenuDataHeader
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
@ -406,9 +406,9 @@ MailboxPC: ; 0x44806
ld [wCurMessageIndex], a ld [wCurMessageIndex], a
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp $2 cp B_BUTTON
jr z, .exit jr z, .exit
call Function4484a call .Submenu
jr .loop jr .loop
.exit .exit
@ -416,18 +416,18 @@ MailboxPC: ; 0x44806
ret ret
; 0x4484a ; 0x4484a
Function4484a: ; 0x4484a .Submenu: ; 0x4484a
ld hl, MenuData44964 ld hl, .SubMenuDataHeader
call LoadMenuDataHeader call LoadMenuDataHeader
call VerticalMenu call VerticalMenu
call ExitMenu call ExitMenu
jr c, .exit jr c, .subexit
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
ld hl, .JumpTable ld hl, .JumpTable
rst JumpTable rst JumpTable
.exit .subexit
ret ret
; 0x44861 ; 0x44861
@ -455,7 +455,7 @@ Function4484a: ; 0x4484a
ld a, [MenuSelection] ld a, [MenuSelection]
dec a dec a
call .GetMailType call .GetMailType
ld a, $1 ld a, 1
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
ld hl, NumItems ld hl, NumItems
call ReceiveItem call ReceiveItem
@ -557,30 +557,30 @@ Function4484a: ; 0x4484a
.Cancel .Cancel
ret ret
MenuData4494c: ; 0x4494c .TopMenuDataHeader: ; 0x4494c
db %01000000 ; flags db %01000000 ; flags
db 1, 8 ; start coords db 1, 8 ; start coords
db 10, 18 ; end coords db 10, 18 ; end coords
dw .MenuData2 dw .TopMenuData2
db 1 ; default option db 1 ; default option
.MenuData2 .TopMenuData2
db %00010000 ; flags db %00010000 ; flags
db 4, 0 ; rows/columns? db 4, 0 ; rows/columns?
db 1 ; horizontal spacing? db 1 ; horizontal spacing?
dbw 0, wMailboxCount ; text pointer dbw 0, wMailboxCount ; text pointer
dba Function447fb dba MailboxPC_PrintMailAuthor
dbw 0,0 dba NULL
dbw 0,0 dba NULL
MenuData44964: ; 0x44964 .SubMenuDataHeader: ; 0x44964
db %01000000 ; flags db %01000000 ; flags
db 0, 0 ; start coords db 0, 0 ; start coords
db 9, $d ; end coords db 9, 13 ; end coords
dw .MenuData2 dw .SubMenuData2
db 1 ; default option db 1 ; default option
.MenuData2 .SubMenuData2
db %10000000 ; flags db %10000000 ; flags
db 4 ; items db 4 ; items
db "READ MAIL@" db "READ MAIL@"

View File

@ -413,7 +413,7 @@ DoAnimFrame: ; 8d24b
ret ret
.fourteen: ; 8d47c (23:547c) .fourteen: ; 8d47c (23:547c)
callab Functione21a1 callab DummyGame_InterpretJoypad_AnimateCursor
ret ret
.sixteen: ; 8d483 (23:5483) .sixteen: ; 8d483 (23:5483)

View File

@ -202,7 +202,7 @@ HomepageScript:
Radio1Script: Radio1Script:
opentext opentext
writebyte $0 writebyte MAPRADIO_POKEMON_CHANNEL
special MapRadio special MapRadio
closetext closetext
end end
@ -210,7 +210,7 @@ Radio1Script:
Radio2Script: Radio2Script:
; Lucky Channel ; Lucky Channel
opentext opentext
writebyte $4 writebyte MAPRADIO_LUCKY_CHANNEL
special MapRadio special MapRadio
closetext closetext
end end
@ -1807,59 +1807,59 @@ GameCornerCoinVendorScript: ; 0xbcdcd
CoinVendor_IntroScript: ; 0xbcde0 CoinVendor_IntroScript: ; 0xbcde0
farwritetext CoinVendor_IntroText farwritetext CoinVendor_IntroText
CoinVendor_SellCoinsMenuScript: ; 0xbcde4 .loop: ; 0xbcde4
special Special_DisplayMoneyAndCoinBalance special Special_DisplayMoneyAndCoinBalance
loadmenudata CoinVendor_MenuDataHeader loadmenudata .MenuDataHeader
verticalmenu verticalmenu
closewindow closewindow
if_equal $1, CoinVendor_Buy50CoinsScript if_equal $1, .Buy50
if_equal $2, CoinVendor_Buy500CoinsScript if_equal $2, .Buy500
jump CoinVendor_CancelScript jump .Cancel
; 0xbcdf7 ; 0xbcdf7
CoinVendor_Buy50CoinsScript: ; 0xbcdf7 .Buy50: ; 0xbcdf7
checkcoins 9949 checkcoins 9949
if_equal $0, CoinVendor_CoinCaseFullScript if_equal $0, .CoinCaseFull
checkmoney $0, 1000 checkmoney $0, 1000
if_equal $2, CoinVendor_NotEnoughMoneyScript if_equal $2, .NotEnoughMoney
givecoins 50 givecoins 50
takemoney $0, 1000 takemoney $0, 1000
waitsfx waitsfx
playsound SFX_TRANSACTION playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy50CoinsText farwritetext CoinVendor_Buy50CoinsText
waitbutton waitbutton
jump CoinVendor_SellCoinsMenuScript jump .loop
; 0xbce1b ; 0xbce1b
CoinVendor_Buy500CoinsScript: ; 0xbce1b .Buy500: ; 0xbce1b
checkcoins 9499 checkcoins 9499
if_equal $0, CoinVendor_CoinCaseFullScript if_equal $0, .CoinCaseFull
checkmoney $0, 10000 checkmoney $0, 10000
if_equal $2, CoinVendor_NotEnoughMoneyScript if_equal $2, .NotEnoughMoney
givecoins 500 givecoins 500
takemoney $0, 10000 takemoney $0, 10000
waitsfx waitsfx
playsound SFX_TRANSACTION playsound SFX_TRANSACTION
farwritetext CoinVendor_Buy500CoinsText farwritetext CoinVendor_Buy500CoinsText
waitbutton waitbutton
jump CoinVendor_SellCoinsMenuScript jump .loop
; 0xbce3f ; 0xbce3f
CoinVendor_NotEnoughMoneyScript: ; 0xbce3f .NotEnoughMoney: ; 0xbce3f
farwritetext CoinVendor_NotEnoughMoneyText farwritetext CoinVendor_NotEnoughMoneyText
waitbutton waitbutton
closetext closetext
end end
; 0xbce46 ; 0xbce46
CoinVendor_CoinCaseFullScript: ; 0xbce46 .CoinCaseFull: ; 0xbce46
farwritetext CoinVendor_CoinCaseFullText farwritetext CoinVendor_CoinCaseFullText
waitbutton waitbutton
closetext closetext
end end
; 0xbce4d ; 0xbce4d
CoinVendor_CancelScript: ; 0xbce4d .Cancel: ; 0xbce4d
farwritetext CoinVendor_CancelText farwritetext CoinVendor_CancelText
waitbutton waitbutton
closetext closetext
@ -1867,15 +1867,14 @@ CoinVendor_CancelScript: ; 0xbce4d
; 0xbce54 ; 0xbce54
CoinVendor_MenuDataHeader: ; 0xbce54 .MenuDataHeader
db $40 ; flags db $40 ; flags
db 04, 00 ; start coords db 04, 00 ; start coords
db 11, 15 ; end coords db 11, 15 ; end coords
dw CoinVendor_MenuData2 dw .MenuData2
db 1 ; default option db 1 ; default option
; 0xbce5c
CoinVendor_MenuData2: ; 0xbce5c .MenuData2
db $80 ; flags db $80 ; flags
db 3 ; items db 3 ; items
db " 50 : ¥1000@" db " 50 : ¥1000@"

170
home.asm
View File

@ -1984,173 +1984,3 @@ ReinitSpriteAnimFrame:: ; 3b3c
INCLUDE "home/audio.asm" INCLUDE "home/audio.asm"
INCLUDE "home/mobile.asm" INCLUDE "home/mobile.asm"
Function3eea:: ; 3eea
push hl
push bc
ld de, AttrMap - TileMap
add hl, de
inc b
inc b
inc c
inc c
call Function3f35
pop bc
pop hl
call Function3f47
ret
; 3efd
Function3efd:: ; 3efd
push hl
hlcoord 0, 12
ld b, 4
ld c, 18
call Function3f0d
pop hl
call PrintTextBoxText
ret
; 3f0d
Function3f0d:: ; 3f0d
push hl
push bc
ld de, AttrMap - TileMap
add hl, de
inc b
inc b
inc c
inc c
call Function3f35
pop bc
pop hl
call TextBoxBorder
ret
; 3f20
Function3f20:: ; 3f20
hlcoord 0, 0, AttrMap
ld b, $6
ld c, $14
call Function3f35
hlcoord 0, 0
ld b, $4
ld c, $12
call Function3f47
ret
; 3f35
Function3f35:: ; 3f35
ld a, $6
ld de, $0014
.asm_3f3a
push bc
push hl
.asm_3f3c
ld [hli], a
dec c
jr nz, .asm_3f3c
pop hl
add hl, de
pop bc
dec b
jr nz, .asm_3f3a
ret
; 3f47
Function3f47:: ; 3f47
push bc
call Function3f58
pop bc
.asm_3f4c
push bc
call Function3f68
pop bc
dec b
jr nz, .asm_3f4c
call Function3f60
ret
; 3f58
Function3f58:: ; 3f58
ld a, $63
ld d, $62
ld e, $64
jr Function3f6e
Function3f60:: ; 3f60
ld a, $68
ld d, $67
ld e, $69
jr Function3f6e
Function3f68:: ; 3f68
ld a, $7f
ld d, $65
ld e, $66
Function3f6e:: ; 3f6e
push hl
ld [hl], d
inc hl
.asm_3f71
ld [hli], a
dec c
jr nz, .asm_3f71
ld [hl], e
pop hl
ld de, $0014
add hl, de
ret
; 3f7c
Function3f7c:: ; 3f7c
call MenuBoxCoord2Tile
call GetMenuBoxDims
dec b
dec c
call Function3eea
ret
; 3f88
Function3f88:: ; 3f88
ld hl, wDecompressScratch
ld b, $0
.asm_3f8d
push bc
ld c, $8
.asm_3f90
ld a, [de]
inc de
cpl
ld [hl], $0
inc hl
ld [hli], a
dec c
jr nz, .asm_3f90
pop bc
dec c
jr nz, .asm_3f8d
ret
; 3f9f
Function3f9f:: ; 3f9f
ld hl, wDecompressScratch
.asm_3fa2
push bc
ld c, $8
.asm_3fa5
ld a, [de]
inc de
inc de
cpl
ld [hl], $0
inc hl
ld [hli], a
dec c
jr nz, .asm_3fa5
pop bc
dec c
jr nz, .asm_3fa2
ret
; 3fb5

View File

@ -92,26 +92,26 @@ Timer:: ; 3e93
ld a, [$c822] ld a, [$c822]
bit 1, a bit 1, a
jr nz, .skip_Function1118de jr nz, .skip_Timer
ld a, [rSC] ld a, [rSC]
and 1 << rSC_ON and 1 << rSC_ON
jr nz, .skip_Function1118de jr nz, .skip_Timer
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, BANK(Function1118de) ld a, BANK(_Timer)
ld [$c981], a ld [$c981], a
rst Bankswitch rst Bankswitch
call Function1118de call _Timer
pop bc pop bc
ld a, b ld a, b
ld [$c981], a ld [$c981], a
rst Bankswitch rst Bankswitch
.skip_Function1118de .skip_Timer
ld a, [rTMA] ld a, [rTMA]
ld [rTIMA], a ld [rTIMA], a
@ -142,3 +142,174 @@ Function3ed7:: ; 3ed7
ld a, [wdc02] ld a, [wdc02]
ret ret
; 3eea ; 3eea
Function3eea:: ; 3eea
push hl
push bc
ld de, AttrMap - TileMap
add hl, de
inc b
inc b
inc c
inc c
call Function3f35
pop bc
pop hl
call MobileHome_PlaceBox
ret
; 3efd
Function3efd:: ; 3efd
; unreferenced
push hl
hlcoord 0, 12
ld b, 4
ld c, 18
call .fill_attr
pop hl
call PrintTextBoxText
ret
; 3f0d
.fill_attr
push hl
push bc
ld de, AttrMap - TileMap
add hl, de
inc b
inc b
inc c
inc c
call Function3f35
pop bc
pop hl
call TextBoxBorder
ret
; 3f20
Function3f20:: ; 3f20
hlcoord 0, 0, AttrMap
ld b, 6
ld c, 20
call Function3f35
hlcoord 0, 0
ld b, 4
ld c, 18
call MobileHome_PlaceBox
ret
; 3f35
Function3f35:: ; 3f35
ld a, 6
ld de, SCREEN_WIDTH
.row
push bc
push hl
.col
ld [hli], a
dec c
jr nz, .col
pop hl
add hl, de
pop bc
dec b
jr nz, .row
ret
; 3f47
MobileHome_PlaceBox: ; 3f47
push bc
call .FillTop
pop bc
.RowLoop
push bc
call .FillMiddle
pop bc
dec b
jr nz, .RowLoop
call .FillBottom
ret
; 3f58
.FillTop
ld a, $63
ld d, $62
ld e, $64
jr .FillRow
.FillBottom
ld a, $68
ld d, $67
ld e, $69
jr .FillRow
.FillMiddle
ld a, $7f
ld d, $65
ld e, $66
.FillRow
push hl
ld [hl], d
inc hl
.FillLoop
ld [hli], a
dec c
jr nz, .FillLoop
ld [hl], e
pop hl
ld de, SCREEN_WIDTH
add hl, de
ret
; 3f7c
Function3f7c:: ; 3f7c
call MenuBoxCoord2Tile
call GetMenuBoxDims
dec b
dec c
call Function3eea
ret
; 3f88
Function3f88:: ; 3f88
ld hl, wDecompressScratch
ld b, 0
.row
push bc
ld c, 1 tiles / 2
.col
ld a, [de]
inc de
cpl
ld [hl], 0
inc hl
ld [hli], a
dec c
jr nz, .col
pop bc
dec c
jr nz, .row
ret
; 3f9f
Function3f9f:: ; 3f9f
ld hl, wDecompressScratch
.row
push bc
ld c, 1 tiles / 2
.col
ld a, [de]
inc de
inc de
cpl
ld [hl], $0
inc hl
ld [hli], a
dec c
jr nz, .col
pop bc
dec c
jr nz, .row
ret
; 3fb5

View File

@ -3859,7 +3859,7 @@ Function1118c2: ; 1118c2 (44:58c2)
inc [hl] inc [hl]
ret ret
Function1118de:: ; 1118de (44:58de) _Timer:: ; 1118de (44:58de)
ld a, [$c80b] ld a, [$c80b]
cp $4 cp $4
call z, Function111b3c call z, Function111b3c

View File

@ -13177,6 +13177,7 @@ Unknown_e00ed:
; game were meant to be here. ; game were meant to be here.
ret_e00ed: ; e00ed (38:40ed) ret_e00ed: ; e00ed (38:40ed)
; How many coins?
ret ret
; e00ee (38:40ee) ; e00ee (38:40ee)

View File

@ -1,4 +1,5 @@
Function1700b0: ; 1700b0 Function1700b0: ; 1700b0
; special
call InitBattleTowerChallengeRAM call InitBattleTowerChallengeRAM
callba Function118121 callba Function118121
ret ret

View File

@ -1004,7 +1004,7 @@ Function106464:: ; 106464
Function10649b: ; 10649b Function10649b: ; 10649b
ld a, [TextBoxFrame] ld a, [TextBoxFrame]
and $7 and $7
ld bc, $30 ld bc, 3 tiles
ld hl, Frames ld hl, Frames
call AddNTimes call AddNTimes
ld d, h ld d, h

View File

@ -142,7 +142,6 @@ Function11811a: ; 11811a
Function118121: ; 118121 Function118121: ; 118121
xor a xor a
ld [wcd38], a ld [wcd38], a
Function118125: ; 118125 Function118125: ; 118125
call Function1183cb call Function1183cb
ld a, $3 ld a, $3
@ -155,16 +154,15 @@ Function118125: ; 118125
push af push af
ld a, $3 ld a, $3
ld [rSVBK], a ld [rSVBK], a
.asm_11813e .loop
call JoyTextDelay call JoyTextDelay
call Function118473 call Function118473
ld a, [wcf66] ld a, [wcf66]
cp $f cp $f
jr c, .asm_118151 jr c, .skip
ld a, [wcd34] ld a, [wcd34]
ld [wcf66], a ld [wcf66], a
.skip
.asm_118151
call Function11854d call Function11854d
call Function11a8fa call Function11a8fa
callba Function115dd3 callba Function115dd3
@ -173,7 +171,7 @@ Function118125: ; 118125
ld a, [wcf66] ld a, [wcf66]
ld hl, wcd33 ld hl, wcd33
cp [hl] cp [hl]
jr nz, .asm_11813e jr nz, .loop
xor a xor a
ld [w3_d000], a ld [w3_d000], a
pop af pop af
@ -552,12 +550,12 @@ Function118473: ; 118473
inc a inc a
ld [wcd68], a ld [wcd68], a
cp 99 cp 99
jr z, .asm_1184a0 jr z, .ninety_nine
xor a xor a
ld [wcd67], a ld [wcd67], a
ret ret
.asm_1184a0 .ninety_nine
xor a xor a
ld [wcd65], a ld [wcd65], a
ret ret

View File

@ -4631,7 +4631,9 @@ Function17f53d: ; 17f53d
push af push af
ld a, $1 ld a, $1
ld [rSVBK], a ld [rSVBK], a
call Function17f555 call Function17f555
pop af pop af
ld [rSVBK], a ld [rSVBK], a
call ExitAllMenus call ExitAllMenus
@ -4639,21 +4641,20 @@ Function17f53d: ; 17f53d
; 17f555 ; 17f555
Function17f555: ; 17f555 Function17f555: ; 17f555
.asm_17f555 .loop
call JoyTextDelay call JoyTextDelay
call Function17f5ae call .RunJumptable
ld a, [wc303] ld a, [wc303]
bit 7, a bit 7, a
jr nz, .asm_17f56a jr nz, .quit
callba Function104000 callba Function104000
jr .asm_17f555 jr .loop
.asm_17f56a .quit
call Function17f56e call .deinit
ret ret
; 17f56e
Function17f56e: ; 17f56e .deinit
ld a, [wc300] ld a, [wc300]
cp $22 cp $22
jr z, .asm_17f597 jr z, .asm_17f597
@ -4695,11 +4696,11 @@ Function17f56e: ; 17f56e
ret ret
; 17f5ae ; 17f5ae
Function17f5ae: ; 17f5ae .RunJumptable: ; 17f5ae
jumptable Table17f5bd, wc303 jumptable .Jumptable, wc303
; 17f5bd ; 17f5bd
Table17f5bd: ; 17f5bd .Jumptable: ; 17f5bd
dw Function17f5c3 dw Function17f5c3
dw Function17ff23 dw Function17ff23
dw Function17f5d2 dw Function17f5d2
@ -4858,26 +4859,26 @@ Palette_17f6af: ; 17f6af
Function17f6b7: ; 17f6b7 Function17f6b7: ; 17f6b7
ld a, [wc300] ld a, [wc300]
call Function17f6cd call .bcd_two_digits
inc hl inc hl
ld a, [wc302] ld a, [wc302]
and $f and $f
call Function17f6d8 call .bcd_digit
ld a, [wc301] ld a, [wc301]
call Function17f6cd call .bcd_two_digits
ret ret
; 17f6cd ; 17f6cd
Function17f6cd: ; 17f6cd .bcd_two_digits: ; 17f6cd
ld c, a ld c, a
and $f0 and $f0
swap a swap a
call Function17f6d8 call .bcd_digit
ld a, c ld a, c
and $f and $f
Function17f6d8: ; 17f6d8 .bcd_digit: ; 17f6d8
add $f6 add "0"
ld [hli], a ld [hli], a
ret ret
; 17f6dc ; 17f6dc

View File

@ -787,8 +787,8 @@ PlayerSAtkLevel:: ; c6cf
ds 1 ds 1
trademon: MACRO trademon: MACRO
\1Species:: ds 1 ; wc6d0 | wc702 \1Species:: ds 1 ; wc6d0 | wDummyGameNumberTriesRemaining
\1SpeciesName:: ds PKMN_NAME_LENGTH ; wc6d1 | wc703 \1SpeciesName:: ds PKMN_NAME_LENGTH ; wc6d1 | wDummyGameLastMatches
\1Nickname:: ds PKMN_NAME_LENGTH ; wc6dc | wc70e \1Nickname:: ds PKMN_NAME_LENGTH ; wc6dc | wc70e
\1SenderName:: ds NAME_LENGTH ; wc6e7 | wc719 \1SenderName:: ds NAME_LENGTH ; wc6e7 | wc719
\1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 \1OTName:: ds NAME_LENGTH ; wc6f2 | wc724
@ -858,6 +858,22 @@ wDiscardPileEnd::
wCardFlipEnd:: wCardFlipEnd::
ds wCardFlip - @ ds wCardFlip - @
; Dummy Game
; c6d0
wDummyGame::
wDummyGameCards:: ds 9 * 5
wDummyGameCardsEnd::
wDummyGameLastCardPicked:: ds 1 ; c6fd
wDummyGameCard1:: ds 1 ; c6fe
wDummyGameCard2:: ds 1 ; c6ff
wDummyGameCard1Location:: ds 1 ; c700
wDummyGameCard2Location:: ds 1 ; c701
wDummyGameNumberTriesRemaining:: ds 1 ; c702
wDummyGameLastMatches:: ds 5 ; c703
wDummyGameCounter:: ds 1 ; c708
wDummyGameNumCardsMatched:: ds 1 ; c709
wDummyGameEnd::
ds wDummyGame - @
; Unown Puzzle ; Unown Puzzle
wUnownPuzzle:: wUnownPuzzle::
wPuzzlePieces:: wPuzzlePieces::