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

@@ -9329,27 +9329,27 @@ CopyBackpic: ; 3fc30
; 3fc5b
.LoadTrainerBackpicAsOAM: ; 3fc5b
ld hl, Sprites
ld hl, Sprite01
xor a
ld [hMapObjectIndexBuffer], a
ld b, $6
ld e, 21 * 8
ld b, 6
ld e, (SCREEN_WIDTH + 1) * TILE_WIDTH
.outer_loop
ld c, $3
ld d, 8 * 8
ld c, 3
ld d, 8 * TILE_WIDTH
.inner_loop
ld [hl], d
ld [hl], d ; y
inc hl
ld [hl], e
ld [hl], e ; x
inc hl
ld a, [hMapObjectIndexBuffer]
ld [hli], a
ld [hli], a ; tile id
inc a
ld [hMapObjectIndexBuffer], a
ld a, $1
ld [hli], a
ld a, PAL_BATTLE_OB_PLAYER
ld [hli], a ; attributes
ld a, d
add $8
add 1 * TILE_WIDTH
ld d, a
dec c
jr nz, .inner_loop
@@ -9357,7 +9357,7 @@ CopyBackpic: ; 3fc30
add $3
ld [hMapObjectIndexBuffer], a
ld a, e
add $8
add 1 * TILE_WIDTH
ld e, a
dec b
jr nz, .outer_loop

View File

@@ -60,9 +60,9 @@ BattleIntroSlidingPics: ; 4e980
; 4e9d6
.subfunction3 ; 4e9d6
ld hl, Sprites + 1 ; x pixel
ld hl, Sprite01XCoord
ld c, $12 ; 18
ld de, $4
ld de, SPRITEOAMSTRUCT_LENGTH
.loop3
dec [hl]
dec [hl]

View File

@@ -28,7 +28,7 @@ ShowPlayerMonsRemaining: ; 2c01c
ld [hl], a
ld a, 8
ld [wPlaceBallsDirection], a
ld hl, Sprites
ld hl, Sprite01
jp LoadTrainerHudOAM
; 2c03a
@@ -44,7 +44,7 @@ ShowOTTrainerMonsRemaining: ; 2c03a
ld [hl], 4 * 8
ld a, -8
ld [wPlaceBallsDirection], a
ld hl, Sprites + PARTY_LENGTH * 4
ld hl, Sprite07
jp LoadTrainerHudOAM
; 2c059
@@ -193,7 +193,7 @@ LinkBattle_TrainerHuds: ; 2c10d
ld [hl], 8 * 8
ld a, $8
ld [wPlaceBallsDirection], a
ld hl, Sprites
ld hl, Sprite01
call LoadTrainerHudOAM
ld hl, OTPartyMon1HP
@@ -203,7 +203,7 @@ LinkBattle_TrainerHuds: ; 2c10d
ld a, 10 * 8
ld [hli], a
ld [hl], 13 * 8
ld hl, Sprites + PARTY_LENGTH * 4
ld hl, Sprite07
jp LoadTrainerHudOAM
; 2c143
@@ -212,13 +212,13 @@ LoadTrainerHudOAM: ; 2c143
ld c, PARTY_LENGTH
.loop
ld a, [wPlaceBallsY]
ld [hli], a
ld [hli], a ; y
ld a, [wPlaceBallsX]
ld [hli], a
ld [hli], a ; x
ld a, [de]
ld [hli], a
ld a, $3
ld [hli], a
ld [hli], a ; tile id
ld a, PAL_BATTLE_OB_YELLOW
ld [hli], a ; attributes
ld a, [wPlaceBallsX]
ld b, a
ld a, [wPlaceBallsDirection]