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

trainer card

Browse Source
This commit is contained in:
PikalaxALT
2015-12-28 10:57:04 -05:00
parent f030315b1f
commit 57d4cb0edf
18 changed files with 616 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle/anim_commands.asm
View File

@@ -1169,7 +1169,7 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
.done
pop af
ld [CurPartySpecies], a ; CurPartySpecies
ld b, SCGB_01
ld b, SCGB_BATTLE_COLORS
call GetSGBLayout
pop af
ld [rSVBK], a

10
battle/core.asm
View File

@@ -2994,7 +2994,7 @@ SetUpBattlePartyMenu_NoLoop: ; 3d2f7
SetUpBattlePartyMenu: ; switch to fullscreen menu?
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
callba InitBattlePartyMenuPals
callba InitPartyMenuBGPal7
callba InitPartyMenuGFX
ret
; 3d313
@@ -3141,7 +3141,7 @@ LostBattle: ; 3d38e
jr nz, .LostLinkBattle
; Greyscale
ld b, SCGB_00
ld b, SCGB_BATTLE_GRAYSCALE
call GetSGBLayout
call SetPalettes
jr .end
@@ -7360,7 +7360,7 @@ FinishBattleAnim: ; 3ee27
push bc
push de
push hl
ld b, SCGB_01
ld b, SCGB_BATTLE_COLORS
call GetSGBLayout
call SetPalettes
call DelayFrame
@@ -8495,7 +8495,7 @@ BattleIntro: ; 3f4dd
callba ClearBattleRAM
call InitEnemy
call BackUpVBGMap2
ld b, SCGB_00
ld b, SCGB_BATTLE_GRAYSCALE
call GetSGBLayout
ld hl, rLCDC
res 6, [hl]
@@ -9418,7 +9418,7 @@ InitBattleDisplay: ; 3fb6c
ld [rWY], a
call WaitBGMap
call HideSprites
ld b, SCGB_01
ld b, SCGB_BATTLE_COLORS
call GetSGBLayout
call SetPalettes
ld a, $90

2
battle/effect_commands.asm
View File

@@ -9168,7 +9168,7 @@ BattleCommand_BatonPass: ; 379c9
hlcoord 1, 0
lb bc, 4, 10
call ClearBox
ld b, SCGB_01
ld b, SCGB_BATTLE_COLORS
call GetSGBLayout
call SetPalettes
call BatonPass_LinkPlayerSwitch

10
constants/cgb_constants.asm
View File

@@ -1,10 +1,10 @@
const_def
const SCGB_00
const SCGB_01
const SCGB_02
const SCGB_BATTLE_GRAYSCALE
const SCGB_BATTLE_COLORS
const SCGB_POKEGEAR_PALS
const SCGB_STATS_SCREEN_HP_PALS
const SCGB_04
const SCGB_05
const SCGB_SLOT_MACHINE
const SCGB_06
const SCGB_07
const SCGB_08
@@ -20,7 +20,7 @@
const SCGB_12
const SCGB_13
const SCGB_PACKPALS
const SCGB_15
const SCGB_TRAINER_CARD
const SCGB_16
const SCGB_17
const SCGB_18

8
engine/color.asm
View File

@@ -112,7 +112,7 @@ Function8aa4: ; 8aa4
Function8ad1: ; 8ad1
ld hl, PalPacket_9c56 + 1
call CopyFourPalettes
call Function971a
call InitPartyMenuOBPals
call WipeAttrMap
ret
; 8ade
@@ -759,7 +759,7 @@ CGB_ApplyPartyMenuHPPals: ; 96f3 CGB layout $fc
; 971a
Function971a: ; 971a
InitPartyMenuOBPals: ; 971a
ld hl, Palettes_b681
ld de, UnknOBPals
ld bc, 2 palettes
@@ -2262,7 +2262,7 @@ Palettes_b719: ; b719
; b729
Palettes_b729: ; b729
MalePokegearPals: ; b729
RGB 28, 31, 20
RGB 21, 21, 21
RGB 13, 13, 13
@@ -2295,7 +2295,7 @@ Palettes_b729: ; b729
; b759
Palettes_b759: ; b759
FemalePokegearPals: ; b759
RGB 28, 31, 20
RGB 21, 21, 21
RGB 13, 13, 13

4
engine/mon_icons.asm
View File

@@ -44,7 +44,7 @@ endr
dw Function8e97d
dw Function8e99a
dw Function8e898
dw Function8e8b1
dw Mobile_InitPartyMenuBGPal71
dw Function8e862
@@ -100,7 +100,7 @@ Function8e898: ; 8e898 (23:6898)
ld [hl], a
ret
Function8e8b1: ; 8e8b1 (23:68b1)
Mobile_InitPartyMenuBGPal71: ; 8e8b1 (23:68b1)
call InitPartyMenuIcon
call SetPartyMonIconAnimSpeed
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID

8
engine/pokegear.asm
View File

@@ -79,7 +79,7 @@ Function90bea: ; 90bea (24:4bea)
ld [wc6db], a
call Function90d9e
call Function90da8
ld b, SCGB_02
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
ld a, [hCGB]
@@ -1955,7 +1955,7 @@ _FlyMap: ; 91af3
call Request1bpp
call FlyMap
call ret_91c8f
ld b, SCGB_02
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
.loop
@@ -2377,7 +2377,7 @@ _Area: ; 91d11
call TownMapPals
hlbgcoord 0, 0
call TownMapBGUpdate
ld b, SCGB_02
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
xor a
@@ -2893,7 +2893,7 @@ Function92311: ; 92311
ld [wd003], a
ld a, b
ld [wd004], a
ld b, SCGB_02
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
.loop

2
engine/slot_machine.asm
View File

@@ -39,7 +39,7 @@ _SlotMachine:
ld bc, VBGMap1 - VBGMap0
ld a, " "
call ByteFill
ld b, SCGB_05
ld b, SCGB_SLOT_MACHINE
call GetSGBLayout
callab ClearSpriteAnims
ld hl, wSlots

2
engine/stats_screen.asm
View File

@@ -83,7 +83,7 @@ StatsScreenBattle: ; 4dcf7
or $1
ld [wcf64], a
.loop
callba Function100dd2
callba Mobile_SetOverworldDelay
ld a, [wJumptableIndex]
and $7f
ld hl, StatsScreenPointerTable

2
engine/town_map.asm
View File

@@ -40,7 +40,7 @@ _TownMap: ; 9191c
ld [wd004], a
ld a, b
ld [wd005], a
ld b, SCGB_02
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
ld a, [hCGB]

293
engine/trainer_card.asm
View File

File diff suppressed because it is too large Load Diff

2
event/whiteout.asm
View File

@@ -42,7 +42,7 @@ OverworldBGMap: ; 124fa
; 1250a
BattleBGMap: ; 1250a
ld b, SCGB_00
ld b, SCGB_BATTLE_GRAYSCALE
call GetSGBLayout
call SetPalettes
ret

2
main.asm
View File

@@ -12543,7 +12543,7 @@ GetPlayerIcon: ; 8832c
ret
; 8833e
Function8833e: ; 8833e
GetCardPic: ; 8833e
ld hl, ChrisCardPic
ld a, [PlayerGender]
bit 0, a

340
misc/fixed_words.asm
View File

File diff suppressed because it is too large Load Diff

287
misc/mobile_40.asm
View File

File diff suppressed because it is too large Load Diff

23
misc/mobile_46.asm
View File

@@ -5491,9 +5491,9 @@ Function11a90f: ; 11a90f
.asm_11a94f
xor a
ld [$c31f], a
ld a, $20
ld a, $c320 % $100
ld [$c31b], a
ld a, $c3
ld a, $c320 / $100
ld [$c31c], a
hlcoord 1, 14
ld a, l
@@ -7057,12 +7057,13 @@ Function11b3d9: ; 11b3d9
; 11b444
Function11b444: ; 11b444
call Function11b44b
call Function11b45c
; special
call Mobile46_InitJumptable
call Mobile46_RunJumptable
ret
; 11b44b
Function11b44b: ; 11b44b
Mobile46_InitJumptable: ; 11b44b
xor a
ld [wJumptableIndex], a
ld [wcf64], a
@@ -7072,9 +7073,9 @@ Function11b44b: ; 11b44b
ret
; 11b45c
Function11b45c: ; 11b45c
Mobile46_RunJumptable: ; 11b45c
.loop
call Function11b46a
call .IterateJumptable
call DelayFrame
ld a, [wJumptableIndex]
cp 4
@@ -7082,7 +7083,7 @@ Function11b45c: ; 11b45c
ret
; 11b46a
Function11b46a: ; 11b46a
.IterateJumptable: ; 11b46a
jumptable .Jumptable, wJumptableIndex
.Jumptable
@@ -7377,7 +7378,7 @@ Function11b5e8: ; 11b5e8
ld a, [$a826]
ld [wcd31], a
call CloseSRAM
call Function11b44b
call Mobile46_InitJumptable
call .loop
ret
@@ -7732,11 +7733,11 @@ Function11b879: ; 11b879
; 11b920
Function11b920: ; 11b920
call Function11b44b
call Mobile46_InitJumptable
ld a, $5
call GetSRAMBank
ld hl, $a81f
ld de, BattleMonNick + 5
ld de, wc626
ld bc, $0008
call CopyBytes
call CloseSRAM

91
predef/cgb.asm
View File

@@ -33,16 +33,16 @@ Predef_LoadSGBLayoutCGB: ; 8d59
; 8d7a
.dw: ; 8d7a
dw _CGB00
dw _CGB01
dw _CGB02
dw _CGB03
dw _CGB_BattleGrayscale
dw _CGB_BattleColors
dw _CGB_PokegearPals
dw _CGB_StatsScreenHPPals
dw _CGB04
dw _CGB05
dw _CGB_SlotMachine
dw _CGB06
dw _CGB07
dw _CGB08
dw _CGB09
dw _CGB_MapPals
dw _CGB0a
dw _CGB0b
dw _CGB0c
@@ -53,8 +53,8 @@ Predef_LoadSGBLayoutCGB: ; 8d59
dw _CGB11
dw _CGB12
dw _CGB13
dw _CGB14
dw _CGB15
dw _CGB_PackPals
dw _CGB_TrainerCard
dw _CGB16
dw _CGB17
dw _CGB18
@@ -66,22 +66,22 @@ Predef_LoadSGBLayoutCGB: ; 8d59
dw _CGB1e
; 8db8
_CGB00: ; 8db8
_CGB_BattleGrayscale: ; 8db8
ld hl, PalPacket_9c66 + 1
ld de, UnknBGPals
ld c, $4
call CopyPalettes
ld hl, PalPacket_9c66 + 1
ld de, UnknBGPals + $20
ld de, UnknBGPals + 4 palettes
ld c, $4
call CopyPalettes
ld hl, PalPacket_9c66 + 1
ld de, UnknOBPals
ld c, $2
call CopyPalettes
jr Function8e23
jr _CGB_FinishBattleScreenLayout
_CGB01: ; 8ddb
_CGB_BattleColors: ; 8ddb
ld de, UnknBGPals
call GetBattlemonBackpicPalettePointer
push hl
@@ -112,11 +112,11 @@ _CGB01: ; 8ddb
call LoadPalette_White_Col1_Col2_Black
pop hl
call LoadPalette_White_Col1_Col2_Black
ld a, SCGB_01
ld a, SCGB_BATTLE_COLORS
ld [SGBPredef], a
call ApplyPals
Function8e23: ; 8e23
call InitBattlePartyMenuPals
_CGB_FinishBattleScreenLayout: ; 8e23
call InitPartyMenuBGPal7
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $2
@@ -146,8 +146,8 @@ Function8e23: ; 8e23
ld a, $7
call ByteFill
ld hl, Palettes_979c
ld de, UnknOBPals + $10
ld bc, $30
ld de, UnknOBPals + 2 palettes
ld bc, 6 palettes
ld a, $5
call FarCopyWRAM
call ApplyAttrMap
@@ -155,9 +155,9 @@ Function8e23: ; 8e23
; 8e85
InitBattlePartyMenuPals: ; 8e85
InitPartyMenuBGPal7: ; 8e85
callba Function100dc0
Function8e8b: ; 8e8b
Mobile_InitPartyMenuBGPal7: ; 8e8b
ld hl, Palette_b311
jr nc, .not_mobile
ld hl, Palette_b309
@@ -169,7 +169,7 @@ Function8e8b: ; 8e8b
ret
; 8e9f
Function8e9f: ; 8e9f
InitPartyMenuBGPal0: ; 8e9f
callba Function100dc0
ld hl, Palette_b311
jr nc, .not_mobile
@@ -182,16 +182,16 @@ Function8e9f: ; 8e9f
ret
; 8eb9
_CGB02: ; 8eb9
_CGB_PokegearPals: ; 8eb9
ld a, [PlayerGender]
bit 0, a
jr z, .asm_8ec5
ld hl, Palettes_b759
jr .asm_8ec8
jr z, .male
ld hl, FemalePokegearPals
jr .got_pals
.asm_8ec5
ld hl, Palettes_b729
.asm_8ec8
.male
ld hl, MalePokegearPals
.got_pals
ld de, UnknBGPals
ld bc, 6 palettes
ld a, $5
@@ -202,7 +202,7 @@ _CGB02: ; 8eb9
ret
; 8edb
_CGB03: ; 8edb
_CGB_StatsScreenHPPals: ; 8edb
ld de, UnknBGPals
ld a, [wcda1]
ld l, a
@@ -289,23 +289,23 @@ _CGB04: ; 8f70
call LoadHLPaletteIntoDE
ld a, [CurPartySpecies]
cp $ff
jr nz, .asm_8f8a
jr nz, .is_pokemon
ld hl, Palette8fba
call LoadHLPaletteIntoDE
jr .asm_8f90
jr .got_palette
.asm_8f8a
.is_pokemon
call GetMonPalettePointer_
call LoadPalette_White_Col1_Col2_Black
.asm_8f90
.got_palette
call WipeAttrMap
hlcoord 1, 1, AttrMap
lb bc, 7, 7
ld a, $1
call FillBoxCGB
call Function971a
call InitPartyMenuOBPals
ld hl, Palette8fc2
ld de, UnknOBPals + $38
ld de, UnknOBPals + 7 palettes
ld bc, 1 palettes
ld a, $5
call FarCopyWRAM
@@ -351,7 +351,7 @@ _CGB17: ; 8fca
lb bc, 7, 7
ld a, $1
call FillBoxCGB
call Function971a
call InitPartyMenuOBPals
call ApplyAttrMap
call ApplyPals
ld a, $1
@@ -374,7 +374,7 @@ Function9009: ; 9009
lb bc, 7, 7
ld a, $1
call FillBoxCGB
call Function971a
call InitPartyMenuOBPals
call ApplyAttrMap
call ApplyPals
ld a, $1
@@ -402,7 +402,7 @@ _CGB16: ; 903e
lb bc, 7, 7
ld a, $1
call FillBoxCGB
call Function971a
call InitPartyMenuOBPals
call ApplyAttrMap
call ApplyPals
ld a, $1
@@ -410,7 +410,7 @@ _CGB16: ; 903e
ret
; 906e
_CGB05: ; 906e
_CGB_SlotMachine: ; 906e
ld hl, Palettes_b7a9
ld de, UnknBGPals
ld bc, $80
@@ -574,6 +574,7 @@ _CGB08: ; 91ad
ld bc, 16 palettes
ld a, $5
call FarCopyWRAM
ld hl, PalPacket_9cb6 + 1
call CopyFourPalettes
call WipeAttrMap
@@ -581,7 +582,7 @@ _CGB08: ; 91ad
ret
; 91c8
_CGB09: ; 91c8
_CGB_MapPals: ; 91c8
call LoadMapPals
ld a, SCGB_MAPPALS
ld [SGBPredef], a
@@ -591,9 +592,9 @@ _CGB09: ; 91c8
_CGB0a: ; 91d1
ld hl, PalPacket_9c56 + 1
call CopyFourPalettes
call Function8e9f
call InitBattlePartyMenuPals
call Function971a
call InitPartyMenuBGPal0
call InitPartyMenuBGPal7
call InitPartyMenuOBPals
call ApplyAttrMap
ret
; 91e4
@@ -683,7 +684,7 @@ _CGB18: ; 925e
ret
; 9289
_CGB15: ; 9289
_CGB_TrainerCard: ; 9289
ld de, UnknBGPals
xor a
call GetTrainerPalettePointer
@@ -834,7 +835,7 @@ _CGB10: ; 93ba
ret
; 93d3
_CGB14: ; 93d3
_CGB_PackPals: ; 93d3
; pack pals
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
@@ -948,7 +949,7 @@ _CGB14: ; 93d3
; 9499
_CGB12: ; 9499
call _CGB09
call _CGB_MapPals
ld de, SCREEN_WIDTH
hlcoord 0, 0, AttrMap
ld a, [wMenuBorderTopCoord]

34
predef/sgb.asm
View File

@@ -24,16 +24,16 @@ Predef_LoadSGBLayout: ; 864c
; 866f
.Jumptable: ; 866f
dw .SGB00
dw .SGB01
dw .SGB02
dw .SGB03
dw .SGB_BattleGrayscale
dw .SGB_BattleColors
dw .SGB_PokegearPals
dw .SGB_StatsScreenHPPals
dw .SGB04
dw .SGB05
dw .SGB_SlotMachine
dw .SGB06
dw .SGB07
dw .SGB08
dw .SGB09
dw .SGB_MapPals
dw .SGB0a
dw .SGB0b
dw .SGB0c
@@ -44,8 +44,8 @@ Predef_LoadSGBLayout: ; 864c
dw .SGB11
dw .SGB12
dw .SGB13
dw .SGB14
dw .SGB15
dw .SGB_PackPals
dw .SGB_TrainerCard
dw .SGB16
dw .SGB17
dw .SGB18
@@ -57,13 +57,13 @@ Predef_LoadSGBLayout: ; 864c
dw .SGB1e
; 86ad
.SGB00: ; 86ad
.SGB_BattleGrayscale: ; 86ad
ld hl, PalPacket_9c66
ld de, BlkPacket_9aa6
ret
; 86b4
.SGB01: ; 86b4
.SGB_BattleColors: ; 86b4
ld hl, BlkPacket_9aa6
call Function9809
@@ -135,7 +135,7 @@ endr
ld hl, wSGBPals
ld de, wSGBPals + $10
ld a, SCGB_01
ld a, SCGB_BATTLE_COLORS
ld [SGBPredef], a
ret
; 873c
@@ -160,13 +160,13 @@ endr
ret
; 875c
.SGB02: ; 875c
.SGB_PokegearPals: ; 875c
ld hl, PalPacket_9c76
ld de, BlkPacket_9a86
ret
; 8763
.SGB03: ; 8763
.SGB_StatsScreenHPPals: ; 8763
ld hl, PalPacket_9ce6
ld de, wSGBPals
ld bc, $10
@@ -290,13 +290,13 @@ endr
ret
; 884b
.SGB14: ; 884b
.SGB_PackPals: ; 884b
ld hl, PalPacket_9c36
ld de, BlkPacket_9a86
ret
; 8852
.SGB05: ; 8852
.SGB_SlotMachine: ; 8852
ld hl, PalPacket_9c96
ld de, BlkPacket_9b06
ret
@@ -367,7 +367,7 @@ endr
ret
; 88b1
.SGB09: ; 88b1
.SGB_MapPals: ; 88b1
ld hl, PalPacket_9bd6
ld de, wSGBPals
ld bc, $10
@@ -426,7 +426,7 @@ endr
; 891a
.SGB0d:
.SGB15: ; 891a
.SGB_TrainerCard: ; 891a
ld hl, PalPacket_9cb6
ld de, BlkPacket_9a86
ret