This commit is contained in:
Remy Oukaour
2018-01-10 13:47:57 -05:00
parent cc95d1208d
commit 417937cffc
35 changed files with 350 additions and 300 deletions

View File

@@ -43,26 +43,26 @@ Special_CelebiShrineEvent: ; 4989a
.done
pop af
ld [VramState], a
call .RefreshPlayerSprite_ClearAllOthers
call .RestorePlayerSprite_DespawnLeaves
call CelebiEvent_SetBattleType
ret
; 498f9
.RefreshPlayerSprite_ClearAllOthers: ; 498f9
ld hl, Sprites + 2
.RestorePlayerSprite_DespawnLeaves: ; 498f9
ld hl, Sprite01TileID
xor a
ld c, $4
ld c, 4
.OAMloop:
ld [hli], a
inc hl
inc hl
ld [hli], a ; tile id
rept SPRITEOAMSTRUCT_LENGTH +- 1
inc hl
endr
inc a
dec c
jr nz, .OAMloop
ld hl, Sprites + 4 * 4
ld bc, 36 * 4
ld hl, Sprite05
ld bc, SpritesEnd - Sprite05
xor a
call ByteFill
ret

View File

@@ -62,8 +62,8 @@ ShakeHeadbuttTree: ; 8c80a
xor a
ld [hBGMapMode], a
farcall ClearSpriteAnims
ld hl, Sprites + 36 * 4
ld bc, SpritesEnd - (Sprites + 36 * 4)
ld hl, Sprite37
ld bc, SpritesEnd - Sprite37
xor a
call ByteFill
ld de, Font
@@ -393,19 +393,19 @@ FlyToAnim: ; 8cb33
ret
.RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82)
ld hl, Sprites + 2 ; Tile ID
ld hl, Sprite01TileID
xor a
ld c, $4
.loop2
ld [hli], a
inc hl
inc hl
ld c, 4
.OAMloop
ld [hli], a ; tile id
rept SPRITEOAMSTRUCT_LENGTH +- 1
inc hl
endr
inc a
dec c
jr nz, .loop2
ld hl, Sprites + 4 * 4
ld bc, SpritesEnd - (Sprites + 4 * 4)
jr nz, .OAMloop
ld hl, Sprite05
ld bc, SpritesEnd - Sprite05
xor a
call ByteFill
ret

View File

@@ -73,20 +73,20 @@ HealMachineAnim: ; 12324
call .LoadPalettes
ld de, .HealMachineGFX
ld hl, vTiles0 tile $7c
lb bc, BANK(.HealMachineGFX), $2
lb bc, BANK(.HealMachineGFX), 2
call Request2bpp
ret
; 12393
.PC_LoadBallsOntoMachine: ; 12393
ld hl, Sprites + $80
ld hl, Sprite33
ld de, .PC_ElmsLab_OAM
call .PlaceHealingMachineTile
call .PlaceHealingMachineTile
jr .LoadBallsOntoMachine
.HOF_LoadBallsOntoMachine: ; 123a1
ld hl, Sprites + $80
ld hl, Sprite33
ld de, .HOF_OAM
.LoadBallsOntoMachine: ; 123a7
@@ -249,17 +249,17 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
ld a, [de]
add c
inc de
ld [hli], a
ld [hli], a ; y
ld a, [de]
add b
inc de
ld [hli], a
ld [hli], a ; x
ld a, [de]
inc de
ld [hli], a
ld [hli], a ; tile id
ld a, [de]
inc de
ld [hli], a
ld [hli], a ; attributes
pop bc
ret
; 124c1