Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Identify functions #126

Merged
merged 1 commit into from
Jan 24, 2025
Merged

Identify functions #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions engine/overworld/map_sprites.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ _InitMapSprites::
; if the map is an inside map (i.e. mapID >= FIRST_INDOOR_MAP)
call LoadSpriteSetFromMapHeader
call LoadMapSpriteTilePatterns
call Func_14150
call LoadMapSpritesImageBaseOffset
ret

; Loads sprite set for outside maps (cities and routes) and sets VRAM slots.
Expand Down Expand Up @@ -46,7 +46,7 @@ InitOutsideMapSprites:
call CopyData ; copy it to wSpriteSet
call LoadMapSpriteTilePatterns
.skipLoadingSpriteSet
call Func_14150
call LoadMapSpritesImageBaseOffset
scf
ret

Expand All @@ -73,14 +73,14 @@ LoadSpriteSetFromMapHeader:
jr z, .continue ; if the sprite slot is not used
ld c, a
call CheckForFourTileSprite ; is this a four tile sprite?
jr nc, .isFourTileSprite
jr nc, .isNotFourTileSprite
; loop through the space reserved for four tile picture IDs
ld de, wSpriteSet + 9
ld b, 2
call CheckIfPictureIDAlreadyLoaded
jr .continue

.isFourTileSprite
.isNotFourTileSprite
; loop through the space reserved for regular picture IDs
ld de, wSpriteSet
ld b, 9
Expand Down Expand Up @@ -247,7 +247,7 @@ ReadSpriteSheetData:
scf
ret

Func_14150:
LoadMapSpritesImageBaseOffset:
ld a, $1
ld [wSpritePlayerStateData2ImageBaseOffset], a ; vram slot for player
ld a, $2
Expand All @@ -259,7 +259,7 @@ Func_14150:
ld a, [hl] ; [x#SPRITESTATEDATA1_PICTUREID]
and a ; is the sprite unused?
jr z, .spriteUnused
call Func_14179
call GetSpriteImageBaseOffset
push hl
ld de, wSpritePlayerStateData2ImageBaseOffset - wSpriteStateData1
add hl, de ; [x#SPRITESTATEDATA2_IMAGEBASEOFFSET]
Expand All @@ -273,7 +273,7 @@ Func_14150:
jr nz, .loop
ret

Func_14179:
GetSpriteImageBaseOffset:
push de
push bc
ld c, a ; c = picture ID
Expand Down
Loading