relabel and add comment

This commit is contained in:
YamaArashi 2015-03-13 19:22:55 -07:00
parent 1115b4454d
commit 332b7b3090
5 changed files with 12 additions and 8 deletions

View file

@ -92,7 +92,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
call GoPAL_SET call GoPAL_SET
call LoadHpBarAndStatusTilePatterns call LoadHpBarAndStatusTilePatterns
call LoadEDTile call LoadEDTile
callba LoadMonPartySpriteTilePatterns callba LoadMonPartySpriteGfx
hlCoord 0, 4 hlCoord 0, 4
ld b, $9 ld b, $9
ld c, $12 ld c, $12

View file

@ -22,7 +22,7 @@ DrawPartyMenu_: ; 12cd2 (4:6cd2)
ld [H_AUTOBGTRANSFERENABLED],a ld [H_AUTOBGTRANSFERENABLED],a
call ClearScreen call ClearScreen
call UpdateSprites ; move sprites call UpdateSprites ; move sprites
callba LoadMonPartySpriteTilePatternsWithLCDDisabled ; load pokemon icon graphics callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
RedrawPartyMenu_: ; 12ce3 (4:6ce3) RedrawPartyMenu_: ; 12ce3 (4:6ce3)
ld a,[wd07d] ld a,[wd07d]

View file

@ -88,12 +88,12 @@ GetAnimationSpeed: ; 7170a (1c:570a)
PartyMonSpeeds: ; 71769 (1c:5769) PartyMonSpeeds: ; 71769 (1c:5769)
db $05,$10,$20 db $05,$10,$20
LoadMonPartySpriteTilePatterns: ; 7176c (1c:576c) LoadMonPartySpriteGfx: ; 7176c (1c:576c)
; Load mon party sprite tile patterns into VRAM during V-blank. ; Load mon party sprite tile patterns into VRAM during V-blank.
ld hl, MonPartySpritePointers ld hl, MonPartySpritePointers
ld a, $1c ld a, $1c
LoadAnimSpriteTilePatterns: ; 71771 (1c:5771) LoadAnimSpriteGfx: ; 71771 (1c:5771)
; Load animated sprite tile patterns into VRAM during V-blank. hl is the address ; Load animated sprite tile patterns into VRAM during V-blank. hl is the address
; of an array of structures that contain arguments for CopyVideoData and a is ; of an array of structures that contain arguments for CopyVideoData and a is
; the number of structures in the array. ; the number of structures in the array.
@ -125,7 +125,7 @@ LoadAnimSpriteTilePatterns: ; 71771 (1c:5771)
jr nz, .loop jr nz, .loop
ret ret
LoadMonPartySpriteTilePatternsWithLCDDisabled: ; 71791 (1c:5791) LoadMonPartySpriteGfxWithLCDDisabled: ; 71791 (1c:5791)
; Load mon party sprite tile patterns into VRAM immediately by disabling the ; Load mon party sprite tile patterns into VRAM immediately by disabling the
; LCD. ; LCD.
call DisableLCD call DisableLCD
@ -332,6 +332,10 @@ WriteMonPartySpriteOAMByMonID: ; 71882 (1c:5882)
jr WriteMonPartySpriteOAM jr WriteMonPartySpriteOAM
UnusedPartyMonSpriteFunction: ; 71890 (1c:5890) UnusedPartyMonSpriteFunction: ; 71890 (1c:5890)
; This function is unused and doesn't appear to do anything useful. It looks
; like it may have been intended to load the tile patterns and OAM data for
; the mon party sprite associated with the mon ID in a.
; However, its calculations are off and it loads garbage data.
ld a, [wcf91] ld a, [wcf91]
call GetPartyMonSpriteID call GetPartyMonSpriteID
push af push af

View file

@ -389,7 +389,7 @@ Func_707b6: ; 707b6 (1c:47b6)
call CopyVideoData call CopyVideoData
ld a, $4 ld a, $4
ld hl, RedFishingTiles ; $4866 ld hl, RedFishingTiles ; $4866
call LoadAnimSpriteTilePatterns call LoadAnimSpriteGfx
ld a, [wSpriteStateData1 + 2] ld a, [wSpriteStateData1 + 2]
ld c, a ld c, a
ld b, $0 ld b, $0

View file

@ -146,8 +146,8 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1)
Func_4120b: ; 4120b (10:520b) Func_4120b: ; 4120b (10:520b)
ld a, %11010000 ld a, %11010000
ld [rOBP1], a ld [rOBP1], a
ld b, BANK(LoadMonPartySpriteTilePatterns) ld b, BANK(LoadMonPartySpriteGfx)
ld hl, LoadMonPartySpriteTilePatterns ld hl, LoadMonPartySpriteGfx
jp Bankswitch jp Bankswitch
Trade_SwapNames: ; 41217 (10:5217) Trade_SwapNames: ; 41217 (10:5217)