diff options
| author | Engezerstorung <154867622+Engezerstorung@users.noreply.github.com> | 2025-01-24 01:08:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-23 19:08:38 -0500 |
| commit | 636e1192f626fc221f721214a15be0cb2d4c5df7 (patch) | |
| tree | 33c6ff5d9930a973de3fdc64d22701708392f08b | |
| parent | Use exported constants for VC patch (#124) (diff) | |
| download | pokeyellow-636e1192f626fc221f721214a15be0cb2d4c5df7.tar.gz pokeyellow-636e1192f626fc221f721214a15be0cb2d4c5df7.tar.xz pokeyellow-636e1192f626fc221f721214a15be0cb2d4c5df7.zip | |
Identify unnamed functions in map_sprites.asm (#126)
Also fix a label name
| -rw-r--r-- | engine/overworld/map_sprites.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index b6ce4229..7e807c65 100644 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -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. @@ -46,7 +46,7 @@ InitOutsideMapSprites: call CopyData ; copy it to wSpriteSet call LoadMapSpriteTilePatterns .skipLoadingSpriteSet - call Func_14150 + call LoadMapSpritesImageBaseOffset scf ret @@ -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 @@ -247,7 +247,7 @@ ReadSpriteSheetData: scf ret -Func_14150: +LoadMapSpritesImageBaseOffset: ld a, $1 ld [wSpritePlayerStateData2ImageBaseOffset], a ; vram slot for player ld a, $2 @@ -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] @@ -273,7 +273,7 @@ Func_14150: jr nz, .loop ret -Func_14179: +GetSpriteImageBaseOffset: push de push bc ld c, a ; c = picture ID |