mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
sort out player/battle backpic asm
This commit is contained in:
parent
27e82a68c9
commit
7a8eb4e434
24
main.asm
24
main.asm
@ -35691,7 +35691,7 @@ Function2715c: ; 2715c
|
|||||||
jr .asm_27177
|
jr .asm_27177
|
||||||
|
|
||||||
.asm_27171
|
.asm_27171
|
||||||
callba GetPlayerBackpic
|
callba GetBattleBackpic
|
||||||
|
|
||||||
.asm_27177
|
.asm_27177
|
||||||
callba Function3f47c
|
callba Function3f47c
|
||||||
@ -47540,13 +47540,13 @@ Function3fbd6: ; 3fbd6
|
|||||||
; 3fbf8
|
; 3fbf8
|
||||||
|
|
||||||
Function3fbf8: ; 3fbf8
|
Function3fbf8: ; 3fbf8
|
||||||
call GetPlayerBackpic
|
call GetBattleBackpic
|
||||||
call Function3fc30
|
call Function3fc30
|
||||||
ret
|
ret
|
||||||
; 3fbff
|
; 3fbff
|
||||||
|
|
||||||
|
|
||||||
GetPlayerBackpic: ; 3fbff
|
GetBattleBackpic: ; 3fbff
|
||||||
; Load the player character's backpic (6x6) into VRAM starting from $9310.
|
; Load the player character's backpic (6x6) into VRAM starting from $9310.
|
||||||
|
|
||||||
; Special exception for Dude.
|
; Special exception for Dude.
|
||||||
@ -57081,9 +57081,7 @@ Function86810: ; 86810
|
|||||||
ld bc, $0168
|
ld bc, $0168
|
||||||
ld a, $7f
|
ld a, $7f
|
||||||
call ByteFill
|
call ByteFill
|
||||||
ld a, $22
|
callba GetPlayerBackpic
|
||||||
ld hl, $4825
|
|
||||||
rst FarCall
|
|
||||||
ld a, $31
|
ld a, $31
|
||||||
ld [$ffad], a
|
ld [$ffad], a
|
||||||
ld hl, $c51e
|
ld hl, $c51e
|
||||||
@ -57233,16 +57231,16 @@ GetPlayerIcon: ; 8832c
|
|||||||
; Get the player icon corresponding to gender
|
; Get the player icon corresponding to gender
|
||||||
|
|
||||||
; Male
|
; Male
|
||||||
ld de, $4000 ; KrissMIcon
|
ld de, ChrisSpriteGFX
|
||||||
ld b, $30 ; BANK(KrissMIcon)
|
ld b, BANK(ChrisSpriteGFX)
|
||||||
|
|
||||||
ld a, [PlayerGender]
|
ld a, [PlayerGender]
|
||||||
bit 0, a
|
bit 0, a
|
||||||
jr z, .done
|
jr z, .done
|
||||||
|
|
||||||
; Female
|
; Female
|
||||||
ld de, $7a40 ; KrissFIcon
|
ld de, KrisSpriteGFX
|
||||||
ld b, $31 ; BANK(KrissFIcon)
|
ld b, BANK(KrisSpriteGFX)
|
||||||
|
|
||||||
.done
|
.done
|
||||||
ret
|
ret
|
||||||
@ -57252,7 +57250,7 @@ GetPlayerIcon: ; 8832c
|
|||||||
INCBIN "baserom.gbc", $8833e, $88825 - $8833e
|
INCBIN "baserom.gbc", $8833e, $88825 - $8833e
|
||||||
|
|
||||||
|
|
||||||
Function88825: ; 88825
|
GetPlayerBackpic: ; 88825
|
||||||
ld a, [PlayerGender]
|
ld a, [PlayerGender]
|
||||||
bit 0, a
|
bit 0, a
|
||||||
jr z, .asm_88830
|
jr z, .asm_88830
|
||||||
@ -57260,8 +57258,8 @@ Function88825: ; 88825
|
|||||||
ret
|
ret
|
||||||
|
|
||||||
.asm_88830
|
.asm_88830
|
||||||
ld hl, $7a1a
|
ld hl, ChrisBackpic
|
||||||
ld b, $a
|
ld b, BANK(ChrisBackpic)
|
||||||
ld de, $9310
|
ld de, $9310
|
||||||
ld c, $31
|
ld c, $31
|
||||||
ld a, $40
|
ld a, $40
|
||||||
|
Loading…
x
Reference in New Issue
Block a user