diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-21 17:15:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 17:15:25 -0800 |
| commit | b97287be2923a037cd9aa5f3b35887feb31b0c03 (patch) | |
| tree | 87932039e558304c5c832d2146517d8be4010fe9 /gfx | |
| parent | 88f1b8165b4e0ce0e416e26d7cb7b3105b8f8c31 (diff) | |
| parent | e5f9fddb86cd005d0dbcbb0fd1d4a04d3e6fee45 (diff) | |
Merge pull request #397 from mid-kid/master
A few more labels and comments
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/font/overworld.png (renamed from gfx/unknown/1065ad.png) | bin | 752 -> 752 bytes | |||
| -rw-r--r-- | gfx/font/space.png (renamed from gfx/unknown/106dad.png) | bin | 71 -> 71 bytes | |||
| -rwxr-xr-x | gfx/load_pics.asm | 22 | ||||
| -rw-r--r-- | gfx/pics/animation.asm | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/gfx/unknown/1065ad.png b/gfx/font/overworld.png Binary files differindex 106c712dd..106c712dd 100644 --- a/gfx/unknown/1065ad.png +++ b/gfx/font/overworld.png diff --git a/gfx/unknown/106dad.png b/gfx/font/space.png Binary files differindex 726178132..726178132 100644 --- a/gfx/unknown/106dad.png +++ b/gfx/font/space.png diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm index b66117de9..78e65dc81 100755 --- a/gfx/load_pics.asm +++ b/gfx/load_pics.asm @@ -70,7 +70,7 @@ FrontpicPredef: ; 5108b xor a ld [hBGMapMode], a call _GetFrontpic - call Function51103 + call GetAnimatedFrontpic pop af ld [rSVBK], a ret @@ -83,7 +83,7 @@ _GetFrontpic: ; 510a5 ld b, a push bc call GetFrontpicPointer - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a ld a, b ld de, wDecompressScratch + $800 @@ -91,7 +91,7 @@ _GetFrontpic: ; 510a5 pop bc ld hl, wDecompressScratch ld de, wDecompressScratch + $800 - call Function512ab + call PadFrontpic pop hl push hl ld de, wDecompressScratch @@ -131,8 +131,8 @@ GLOBAL PicPointers, UnownPicPointers pop bc ret -Function51103: ; 51103 - ld a, $1 +GetAnimatedFrontpic: ; 51103 + ld a, BANK(VTiles3) ld [rVBK], a push hl ld de, wDecompressScratch @@ -144,7 +144,7 @@ Function51103: ; 51103 ld de, 7 * 7 tiles add hl, de push hl - ld a, $1 + ld a, BANK(BasePicSize) ld hl, BasePicSize call GetFarWRAMByte pop hl @@ -163,7 +163,7 @@ Function51103: ; 51103 push hl push bc - call Function5114f + call LoadFrontpicTiles pop bc pop hl ld de, wDecompressScratch @@ -174,7 +174,7 @@ Function51103: ; 51103 ld [rVBK], a ret -Function5114f: ; 5114f +LoadFrontpicTiles: ; 5114f ld hl, wDecompressScratch swap c ld a, c @@ -186,13 +186,13 @@ Function5114f: ; 5114f push bc call LoadFrontpic pop bc -.asm_51161 +.loop push bc ld c, $0 call LoadFrontpic pop bc dec b - jr nz, .asm_51161 + jr nz, .loop ret GetBackpic: ; 5116c @@ -413,7 +413,7 @@ FixBackpicAlignment: ; 5127c pop de ret -Function512ab: ; 512ab +PadFrontpic: ; 512ab ld a, b cp 6 jr z, .six diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index e26592fd7..aa32fbe94 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -123,7 +123,7 @@ LoadMonAnimation: ; d00a3 SetUpPokeAnim: ; d00b4 ld a, [rSVBK] push af - ld a, $2 + ld a, BANK(wPokeAnimSceneIndex) ld [rSVBK], a ld a, [wPokeAnimSceneIndex] ld c, a @@ -313,7 +313,7 @@ AnimateMon_CheckIfPokemon: ; d01c6 PokeAnim_InitPicAttributes: ; d01d6 ld a, [rSVBK] push af - ld a, $2 + ld a, BANK(wPokeAnimSceneIndex) ld [rSVBK], a push bc @@ -366,7 +366,7 @@ PokeAnim_InitPicAttributes: ; d01d6 PokeAnim_InitAnim: ; d0228 ld a, [rSVBK] push af - ld a, $2 + ld a, BANK(wPokeAnimExtraFlag) ld [rSVBK], a push bc ld hl, wPokeAnimExtraFlag @@ -1007,7 +1007,7 @@ GetMonAnimPointer: ; d055c PokeAnim_GetFrontpicDims: ; d05b4 ld a, [rSVBK] push af - ld a, $1 + ld a, BANK(CurPartySpecies) ld [rSVBK], a ld a, [CurPartySpecies] ld [CurSpecies], a |
