summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-03-13 19:22:55 -0700
committerYamaArashi <shadow962@live.com>2015-03-13 19:22:55 -0700
commit332b7b3090445902d53cd6d424c3c7f7da308136 (patch)
treef06149eb62213a0401c515c6f922e803ce5109d2
parent1115b4454db645d2ebaa9e9f1fdd9ea86c1c4e44 (diff)
relabel and add comment
-rwxr-xr-xengine/menu/naming_screen.asm2
-rwxr-xr-xengine/menu/party_menu.asm2
-rwxr-xr-xengine/mon_party_sprites.asm10
-rwxr-xr-xengine/overworld/player_animations.asm2
-rwxr-xr-xengine/trade.asm4
5 files changed, 12 insertions, 8 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index c5babaf2..583bb5aa 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -92,7 +92,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
call GoPAL_SET
call LoadHpBarAndStatusTilePatterns
call LoadEDTile
- callba LoadMonPartySpriteTilePatterns
+ callba LoadMonPartySpriteGfx
hlCoord 0, 4
ld b, $9
ld c, $12
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index 7c163166..242edd40 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -22,7 +22,7 @@ DrawPartyMenu_: ; 12cd2 (4:6cd2)
ld [H_AUTOBGTRANSFERENABLED],a
call ClearScreen
call UpdateSprites ; move sprites
- callba LoadMonPartySpriteTilePatternsWithLCDDisabled ; load pokemon icon graphics
+ callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
RedrawPartyMenu_: ; 12ce3 (4:6ce3)
ld a,[wd07d]
diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm
index 37125bbb..d3dd8206 100755
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -88,12 +88,12 @@ GetAnimationSpeed: ; 7170a (1c:570a)
PartyMonSpeeds: ; 71769 (1c:5769)
db $05,$10,$20
-LoadMonPartySpriteTilePatterns: ; 7176c (1c:576c)
+LoadMonPartySpriteGfx: ; 7176c (1c:576c)
; Load mon party sprite tile patterns into VRAM during V-blank.
ld hl, MonPartySpritePointers
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
; of an array of structures that contain arguments for CopyVideoData and a is
; the number of structures in the array.
@@ -125,7 +125,7 @@ LoadAnimSpriteTilePatterns: ; 71771 (1c:5771)
jr nz, .loop
ret
-LoadMonPartySpriteTilePatternsWithLCDDisabled: ; 71791 (1c:5791)
+LoadMonPartySpriteGfxWithLCDDisabled: ; 71791 (1c:5791)
; Load mon party sprite tile patterns into VRAM immediately by disabling the
; LCD.
call DisableLCD
@@ -332,6 +332,10 @@ WriteMonPartySpriteOAMByMonID: ; 71882 (1c:5882)
jr WriteMonPartySpriteOAM
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]
call GetPartyMonSpriteID
push af
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 0ad31730..6602cedd 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -389,7 +389,7 @@ Func_707b6: ; 707b6 (1c:47b6)
call CopyVideoData
ld a, $4
ld hl, RedFishingTiles ; $4866
- call LoadAnimSpriteTilePatterns
+ call LoadAnimSpriteGfx
ld a, [wSpriteStateData1 + 2]
ld c, a
ld b, $0
diff --git a/engine/trade.asm b/engine/trade.asm
index 131b8493..2067c2ef 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -146,8 +146,8 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1)
Func_4120b: ; 4120b (10:520b)
ld a, %11010000
ld [rOBP1], a
- ld b, BANK(LoadMonPartySpriteTilePatterns)
- ld hl, LoadMonPartySpriteTilePatterns
+ ld b, BANK(LoadMonPartySpriteGfx)
+ ld hl, LoadMonPartySpriteGfx
jp Bankswitch
Trade_SwapNames: ; 41217 (10:5217)