diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /engine/battle/draw_hud_pokeball_gfx.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'engine/battle/draw_hud_pokeball_gfx.asm')
| -rw-r--r-- | engine/battle/draw_hud_pokeball_gfx.asm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 7198d984..8cfd30af 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -1,7 +1,7 @@ DrawAllPokeballs: ; 3a849 (e:6849) call LoadPartyPokeballGfx call SetupOwnPartyPokeballs - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a ret z ; return if wild pokémon jp SetupEnemyPartyPokeballs @@ -13,7 +13,7 @@ DrawEnemyPokeballs: ; 3a857 (e:6857) LoadPartyPokeballGfx: ; 3a85d (e:685d) ld de, PokeballTileGraphics ld hl, vSprites + $310 - lb bc, BANK(PokeballTileGraphics), $04 + lb bc, BANK(PokeballTileGraphics), (PokeballTileGraphicsEnd - PokeballTileGraphics) / $10 jp CopyVideoData SetupOwnPartyPokeballs: ; 3a869 (e:6869) @@ -22,7 +22,7 @@ SetupOwnPartyPokeballs: ; 3a869 (e:6869) ld de, wPartyCount call SetupPokeballs ld a, $60 - ld hl, W_BASECOORDX + ld hl, wBaseCoordX ld [hli], a ld [hl], a ld a, 8 @@ -35,7 +35,7 @@ SetupEnemyPartyPokeballs: ; 3a887 (e:6887) ld hl, wEnemyMons ld de, wEnemyPartyCount call SetupPokeballs - ld hl, W_BASECOORDX + ld hl, wBaseCoordX ld a, $48 ld [hli], a ld [hl], $20 @@ -98,19 +98,19 @@ WritePokeballOAMData: ; 3a8e1 (e:68e1) ld de, wBuffer ld c, PARTY_LENGTH .loop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] ld [hli], a ld a, [de] ld [hli], a xor a ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] ld b, a ld a, [wHUDPokeballGfxOffsetX] add b - ld [W_BASECOORDX], a + ld [wBaseCoordX], a inc de dec c jr nz, .loop @@ -168,7 +168,7 @@ SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) ld hl, wPartyMons ld de, wPartyCount call SetupPokeballs - ld hl, W_BASECOORDX + ld hl, wBaseCoordX ld a, $50 ld [hli], a ld [hl], $40 @@ -179,7 +179,7 @@ SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) ld hl, wEnemyMons ld de, wEnemyPartyCount call SetupPokeballs - ld hl, W_BASECOORDX + ld hl, wBaseCoordX ld a, $50 ld [hli], a ld [hl], $68 @@ -189,3 +189,4 @@ SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948) ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon) PokeballTileGraphics:: ; 3a97e (e:697e) INCBIN "gfx/pokeball.2bpp" +PokeballTileGraphicsEnd: |