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

Identify mobile Name Card exchange labels

Browse Source
This commit is contained in:
Rangi
2020-10-30 10:45:31 -04:00
parent ba5bc304f9
commit 1237156948
9 changed files with 194 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
constants/scgb_constants.asm
View File

@ -35,6 +35,12 @@
SCGB_PARTY_MENU_HP_BARS EQU $fc SCGB_PARTY_MENU_HP_BARS EQU $fc
SCGB_DEFAULT EQU $ff SCGB_DEFAULT EQU $ff
; GetCrystalCGBLayout arguments (see engine/gfx/crystal_layouts.asm)
const_def
const CRYSTAL_CGB_MOBILE_0
const CRYSTAL_CGB_MOBILE_1
const CRYSTAL_CGB_NAME_CARD
; PredefPals indexes (see gfx/sgb/predef.pal) ; PredefPals indexes (see gfx/sgb/predef.pal)
; GetPredefPal arguments (see engine/gfx/color.asm) ; GetPredefPal arguments (see engine/gfx/color.asm)
const_def const_def

10
data/text/common_2.asm
View File

@ -260,14 +260,14 @@ _MysteryGiftSentHomeText::
text "'s home." text "'s home."
prompt prompt
_MysteryGiftReceivedCardText:: _NameCardReceivedCardText::
text "Received" text "Received"
line "@" line "@"
text_ram wMysteryGiftCardHolderName text_ram wMysteryGiftCardHolderName
text "'s CARD." text "'s CARD."
prompt prompt
_MysteryGiftListedCardText:: _NameCardListedCardText::
text_ram wMysteryGiftCardHolderName text_ram wMysteryGiftCardHolderName
text "'s CARD was" text "'s CARD was"
line "listed as no.@" line "listed as no.@"
@ -275,17 +275,17 @@ _MysteryGiftListedCardText::
text "." text "."
prompt prompt
_MysteryGiftNotRegisteredCardText:: _NameCardNotRegisteredCardText::
text "The CARD was not" text "The CARD was not"
line "registered." line "registered."
prompt prompt
_MysteryGiftLinkCancelledText:: _NameCardLinkCancelledText::
text "The link has been" text "The link has been"
line "cancelled." line "cancelled."
prompt prompt
_MysteryGiftLinkCommErrorText:: _NameCardLinkCommErrorText::
text "Communication" text "Communication"
line "error." line "error."
prompt prompt

9
engine/gfx/cgb_layouts.asm
View File

@ -17,19 +17,18 @@ LoadSGBLayoutCGB:
ld l, a ld l, a
ld h, 0 ld h, 0
add hl, hl add hl, hl
ld de, .dw ld de, .Jumptable
add hl, de add hl, de
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, .ReturnFromJumpTable ld de, .done
push de push de
jp hl jp hl
.done:
.ReturnFromJumpTable:
ret ret
.dw .Jumptable:
dw _CGB_BattleGrayscale dw _CGB_BattleGrayscale
dw _CGB_BattleColors dw _CGB_BattleColors
dw _CGB_PokegearPals dw _CGB_PokegearPals

74
engine/gfx/crystal_layouts.asm
View File

@ -1,16 +1,16 @@
GetMysteryGift_MobileAdapterLayout: GetCrystalCGBLayout:
ld a, b ld a, b
cp SCGB_DEFAULT cp SCGB_DEFAULT
jr nz, .not_ram jr nz, .not_default
ld a, [wDefaultSGBLayout] ld a, [wDefaultSGBLayout]
.not_ram .not_default
push af push af
farcall ResetBGPals farcall ResetBGPals
pop af pop af
ld l, a ld l, a
ld h, 0 ld h, 0
add hl, hl add hl, hl
ld de, .dw ld de, .Jumptable
add hl, de add hl, de
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -18,15 +18,16 @@ GetMysteryGift_MobileAdapterLayout:
ld de, .done ld de, .done
push de push de
jp hl jp hl
.done .done:
ret ret
.dw .Jumptable:
dw MG_Mobile_Layout00 dw _CrystalCGB_MobileLayout0
dw MG_Mobile_Layout01 dw _CrystalCGB_MobileLayout1
dw MG_Mobile_Layout02 dw _CrystalCGB_NameCard
MG_Mobile_Layout_FillBox: Crystal_FillBoxCGB:
; This is a copy of FillBoxCGB.
.row .row
push bc push bc
push hl push hl
@ -42,7 +43,8 @@ MG_Mobile_Layout_FillBox:
jr nz, .row jr nz, .row
ret ret
MG_Mobile_Layout_WipeAttrmap: Crystal_WipeAttrmap:
; This is a copy of WipeAttrmap.
hlcoord 0, 0, wAttrmap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a xor a
@ -62,9 +64,9 @@ MG_Mobile_Layout_LoadPals:
call FarCopyWRAM call FarCopyWRAM
ret ret
MG_Mobile_Layout00: _CrystalCGB_MobileLayout0:
call MG_Mobile_Layout_LoadPals call MG_Mobile_Layout_LoadPals
call MG_Mobile_Layout_WipeAttrmap call Crystal_WipeAttrmap
call MG_Mobile_Layout_CreatePalBoxes call MG_Mobile_Layout_CreatePalBoxes
farcall ApplyAttrmap farcall ApplyAttrmap
farcall ApplyPals farcall ApplyPals
@ -74,33 +76,33 @@ MG_Mobile_Layout_CreatePalBoxes:
hlcoord 0, 0, wAttrmap hlcoord 0, 0, wAttrmap
lb bc, 4, 1 lb bc, 4, 1
ld a, $1 ld a, $1
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
lb bc, 2, 1 lb bc, 2, 1
ld a, $2 ld a, $2
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
lb bc, 6, 1 lb bc, 6, 1
ld a, $3 ld a, $3
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
hlcoord 1, 0, wAttrmap hlcoord 1, 0, wAttrmap
ld a, $1 ld a, $1
lb bc, 3, 18 lb bc, 3, 18
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
lb bc, 2, 18 lb bc, 2, 18
ld a, $2 ld a, $2
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
lb bc, 12, 18 lb bc, 12, 18
ld a, $3 ld a, $3
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
hlcoord 19, 0, wAttrmap hlcoord 19, 0, wAttrmap
lb bc, 4, 1 lb bc, 4, 1
ld a, $1 ld a, $1
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
lb bc, 2, 1 lb bc, 2, 1
ld a, $2 ld a, $2
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
lb bc, 6, 1 lb bc, 6, 1
ld a, $3 ld a, $3
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
hlcoord 0, 12, wAttrmap hlcoord 0, 12, wAttrmap
ld bc, 6 * SCREEN_WIDTH ld bc, 6 * SCREEN_WIDTH
ld a, $7 ld a, $7
@ -129,14 +131,14 @@ Function49420::
call FarCopyWRAM call FarCopyWRAM
ret ret
MG_Mobile_Layout01: _CrystalCGB_MobileLayout1:
call MG_Mobile_Layout_LoadPals call MG_Mobile_Layout_LoadPals
ld de, wBGPals1 palette PAL_BG_TEXT ld de, wBGPals1 palette PAL_BG_TEXT
ld hl, .TextPalette ld hl, .TextPalette
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call MG_Mobile_Layout_WipeAttrmap call Crystal_WipeAttrmap
hlcoord 0, 0, wAttrmap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a xor a
@ -170,7 +172,7 @@ Function49480:
hlcoord 0, 0, wAttrmap hlcoord 0, 0, wAttrmap
lb bc, 4, SCREEN_WIDTH lb bc, 4, SCREEN_WIDTH
ld a, $7 ld a, $7
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
hlcoord 0, 2, wAttrmap hlcoord 0, 2, wAttrmap
ld a, $4 ld a, $4
ld [hl], a ld [hl], a
@ -182,7 +184,7 @@ Function49496:
hlcoord 0, 0, wAttrmap hlcoord 0, 0, wAttrmap
lb bc, 2, SCREEN_WIDTH lb bc, 2, SCREEN_WIDTH
ld a, $7 ld a, $7
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
hlcoord 0, 1, wAttrmap hlcoord 0, 1, wAttrmap
ld a, $4 ld a, $4
ld [hl], a ld [hl], a
@ -192,14 +194,14 @@ Function49496:
INCLUDE "engine/tilesets/tileset_palettes.asm" INCLUDE "engine/tilesets/tileset_palettes.asm"
MG_Mobile_Layout02: _CrystalCGB_NameCard:
ld hl, .BGPalette ld hl, .BGPalette
ld de, wBGPals1 ld de, wBGPals1
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
farcall ApplyPals farcall ApplyPals
call MG_Mobile_Layout_WipeAttrmap call Crystal_WipeAttrmap
farcall ApplyAttrmap farcall ApplyAttrmap
ld hl, .OBPalette ld hl, .OBPalette
ld de, wOBPals1 ld de, wOBPals1
@ -236,38 +238,38 @@ _InitMG_Mobile_LinkTradePalMap:
hlcoord 0, 0, wAttrmap hlcoord 0, 0, wAttrmap
lb bc, 16, 2 lb bc, 16, 2
ld a, $4 ld a, $4
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
ld a, $3 ld a, $3
ldcoord_a 0, 1, wAttrmap ldcoord_a 0, 1, wAttrmap
ldcoord_a 0, 14, wAttrmap ldcoord_a 0, 14, wAttrmap
hlcoord 2, 0, wAttrmap hlcoord 2, 0, wAttrmap
lb bc, 8, 18 lb bc, 8, 18
ld a, $5 ld a, $5
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
hlcoord 2, 8, wAttrmap hlcoord 2, 8, wAttrmap
lb bc, 8, 18 lb bc, 8, 18
ld a, $6 ld a, $6
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
hlcoord 0, 16, wAttrmap hlcoord 0, 16, wAttrmap
lb bc, 2, SCREEN_WIDTH lb bc, 2, SCREEN_WIDTH
ld a, $4 ld a, $4
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
ld a, $3 ld a, $3
lb bc, 6, 1 lb bc, 6, 1
hlcoord 6, 1, wAttrmap hlcoord 6, 1, wAttrmap
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
ld a, $3 ld a, $3
lb bc, 6, 1 lb bc, 6, 1
hlcoord 17, 1, wAttrmap hlcoord 17, 1, wAttrmap
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
ld a, $3 ld a, $3
lb bc, 6, 1 lb bc, 6, 1
hlcoord 6, 9, wAttrmap hlcoord 6, 9, wAttrmap
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
ld a, $3 ld a, $3
lb bc, 6, 1 lb bc, 6, 1
hlcoord 17, 9, wAttrmap hlcoord 17, 9, wAttrmap
call MG_Mobile_Layout_FillBox call Crystal_FillBoxCGB
ld a, $2 ld a, $2
hlcoord 2, 16, wAttrmap hlcoord 2, 16, wAttrmap
ld [hli], a ld [hli], a

231
engine/link/mystery_gift.asm
View File

File diff suppressed because it is too large Load Diff

8
mobile/mobile_12.asm
View File

@ -45,8 +45,8 @@ InitMobileProfile:
ld [wMusicFadeID + 1], a ld [wMusicFadeID + 1], a
ld c, 20 ld c, 20
call DelayFrames call DelayFrames
ld b, $1 ld b, CRYSTAL_CGB_MOBILE_1
call GetMysteryGift_MobileAdapterLayout call GetCrystalCGBLayout
call ClearBGPalettes call ClearBGPalettes
hlcoord 0, 0 hlcoord 0, 0
ld b, 2 ld b, 2
@ -652,8 +652,8 @@ Wakayama: db "わかやまけん@" ; Wakayama
Function48689: Function48689:
ld c, 7 ld c, 7
call DelayFrames call DelayFrames
ld b, $1 ld b, CRYSTAL_CGB_MOBILE_1
call GetMysteryGift_MobileAdapterLayout call GetCrystalCGBLayout
call ClearBGPalettes call ClearBGPalettes
hlcoord 0, 0 hlcoord 0, 0
ld b, 4 ld b, 4

2
mobile/mobile_22.asm
View File

@ -3964,7 +3964,7 @@ Function8ab3b:
Function8ab93: Function8ab93:
call ClearBGPalettes call ClearBGPalettes
call LoadStandardMenuHeader call LoadStandardMenuHeader
farcall Function105688 farcall DoNameCardSwap
call ClearSprites call ClearSprites
call Function891fe call Function891fe
call Function89b28 call Function89b28

2
mobile/mobile_menu.asm
View File

@ -603,7 +603,7 @@ Function4a485:
ret ret
Function4a492: Function4a492:
call MG_Mobile_Layout00 call _CrystalCGB_MobileLayout0
ret ret
MainMenu_MobileStudium: MainMenu_MobileStudium:

4
wram.asm
View File

@ -1006,6 +1006,10 @@ UNION
wMysteryGiftTrainer:: ds 1 + (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 1 wMysteryGiftTrainer:: ds 1 + (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 1
wMysteryGiftTrainerEnd:: wMysteryGiftTrainerEnd::
NEXTU
wNameCardData:: ds NAME_LENGTH + 2 + 2 + 1 + 8 + 12
wNameCardDataEnd::
NEXTU NEXTU
wMysteryGiftCardHolderName:: ds PLAYER_NAME_LENGTH wMysteryGiftCardHolderName:: ds PLAYER_NAME_LENGTH
ENDU ENDU