Sync with pokecrystal up to aba1f14

This commit is contained in:
xCrystal
2023-09-24 15:06:19 +02:00
parent 5e78fd1ecc
commit 2cbe0e1764
34 changed files with 4172 additions and 4172 deletions

View File

@@ -150,7 +150,7 @@ INCBIN "gfx/pokegear/fast_ship.2bpp"
InitPokegearModeIndicatorArrow:
depixel 4, 2, 4, 0
ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
ld a, SPRITE_ANIM_OBJ_POKEGEAR_ARROW
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
@@ -560,11 +560,11 @@ PokegearMap_ContinueMap:
PokegearMap_InitPlayerIcon:
push af
depixel 0, 0
ld b, SPRITE_ANIM_INDEX_RED_WALK
ld b, SPRITE_ANIM_OBJ_RED_WALK
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_BLUE_WALK
ld b, SPRITE_ANIM_OBJ_BLUE_WALK
.got_gender
ld a, b
call InitSpriteAnimStruct
@@ -587,14 +587,14 @@ PokegearMap_InitPlayerIcon:
PokegearMap_InitCursor:
push af
depixel 0, 0
ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
ld a, SPRITE_ANIM_OBJ_POKEGEAR_ARROW
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], $04
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_NULL
ld [hl], SPRITE_ANIM_FUNC_NULL
pop af
push bc
call PokegearMap_UpdateCursorPosition
@@ -632,7 +632,7 @@ PokegearMap_UpdateCursorPosition:
PokegearRadio_Init:
call InitPokegearTilemap
depixel 4, 10, 4, 4
ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
ld a, SPRITE_ANIM_OBJ_RADIO_TUNING_KNOB
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
@@ -2429,14 +2429,14 @@ TownMapMon:
farcall GetSpeciesIcon
; Animation/palette
depixel 0, 0
ld a, SPRITE_ANIM_INDEX_PARTY_MON
ld a, SPRITE_ANIM_OBJ_PARTY_MON
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], $08
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_NULL
ld [hl], SPRITE_ANIM_FUNC_NULL
ret
TownMapPlayerIcon:
@@ -2458,11 +2458,11 @@ TownMapPlayerIcon:
call Request2bpp
; Animation/palette
depixel 0, 0
ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male
ld b, SPRITE_ANIM_OBJ_RED_WALK ; Male
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
ld b, SPRITE_ANIM_OBJ_BLUE_WALK ; Female
.got_gender
ld a, b
call InitSpriteAnimStruct