diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle_anims/core.asm | 2 | ||||
| -rw-r--r-- | engine/games/dummy_game.asm | 4 | ||||
| -rw-r--r-- | engine/games/slot_machine.asm | 4 | ||||
| -rw-r--r-- | engine/gfx/sprites.asm | 17 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 10 | ||||
| -rw-r--r-- | engine/movie/intro.asm | 2 | ||||
| -rw-r--r-- | engine/movie/trade_animation.asm | 4 |
7 files changed, 21 insertions, 22 deletions
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index d756a447a..ef5aee3f5 100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm @@ -288,7 +288,7 @@ GetBattleAnimTileOffset: push bc ld hl, wBattleAnimTileDict ld b, a - ld c, 10 / 2 + ld c, NUM_BATTLEANIMTILEDICT_ENTRIES .loop ld a, [hli] cp b diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index 648346fc3..c84e36fc6 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -19,10 +19,10 @@ _DummyGame: ld bc, 4 tiles ld a, BANK(DummyGameGFX) call FarCopyBytes - ld a, $8 + ld a, SPRITE_ANIM_DICT_ARROW_CURSOR ld hl, wSpriteAnimDict ld [hli], a - ld [hl], $0 + ld [hl], $00 hlcoord 0, 0 ld bc, SCREEN_HEIGHT * SCREEN_WIDTH xor a diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 0b2a08fac..2688995b4 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -144,7 +144,7 @@ _SlotMachine: call ByteFill call Slots_InitReelTiles call Slots_GetPals - ld a, $7 + ld a, SPRITE_ANIM_DICT_SLOTS ld hl, wSpriteAnimDict ld [hli], a ld [hl], $40 @@ -159,7 +159,7 @@ _SlotMachine: call Random and %00101010 ret nz - ld a, 1 + ld a, TRUE ld [wKeepSevenBiasChance], a ; 12.5% chance ret diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index 1de16dbc9..c9ffc62ee 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -1,6 +1,6 @@ ClearSpriteAnims: - ld hl, wSpriteAnimDict - ld bc, wSpriteAnimsEnd - wSpriteAnimDict + ld hl, wSpriteAnimData + ld bc, wSpriteAnimDataEnd - wSpriteAnimData .loop ld [hl], 0 inc hl @@ -168,8 +168,8 @@ _InitSpriteAnimStruct:: ld a, [de] ld [hli], a ; SPRITEANIMSTRUCT_ANIM_SEQ_ID inc de -; Look up the third field from the table in the wSpriteAnimDict array (10x2). -; Take the value and load it in +; Look up the third field in the wSpriteAnimDict mapping. +; Take the mapped value and load it in. ld a, [de] call GetSpriteAnimVTile ld [hli], a ; SPRITEANIMSTRUCT_TILE_ID @@ -373,13 +373,12 @@ InitSpriteAnimBuffer: ret GetSpriteAnimVTile: -; a = wSpriteAnimDict[a] if a in wSpriteAnimDict else 0 -; vTiles offset +; a = wSpriteAnimDict[a] if a in wSpriteAnimDict else vtile offset $00 push hl push bc ld hl, wSpriteAnimDict ld b, a - ld c, NUM_SPRITE_ANIM_STRUCTS + ld c, NUM_SPRITEANIMDICT_ENTRIES .loop ld a, [hli] cp b @@ -634,8 +633,8 @@ ClearSpriteAnims2: push de push bc push af - ld hl, wSpriteAnimDict - ld bc, wSpriteAnimsEnd - wSpriteAnimDict + ld hl, wSpriteAnimData + ld bc, wSpriteAnimDataEnd - wSpriteAnimData .loop ld [hl], 0 inc hl diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 0a436b273..eb1a4b49f 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -161,7 +161,7 @@ NamingScreen: ld hl, vTiles0 tile $00 lb bc, BANK(PokeBallSpriteGFX), 4 call Request2bpp - xor a + xor a ; SPRITE_ANIM_DICT_DEFAULT and tile offset $00 ld hl, wSpriteAnimDict ld [hli], a ld [hl], a @@ -203,7 +203,7 @@ NamingScreen: ld d, h ld hl, vTiles0 tile $04 call Request2bpp - xor a + xor a ; SPRITE_ANIM_DICT_DEFAULT and tile offset $00 ld hl, wSpriteAnimDict ld [hli], a ld [hl], a @@ -856,8 +856,8 @@ LoadNamingScreenGFX: ld a, BANK(NamingScreenGFX_Cursor) call FarCopyBytes - ld a, $5 - ld hl, wSpriteAnimDict + 9 * 2 + ld a, SPRITE_ANIM_DICT_TEXT_CURSOR + ld hl, wSpriteAnimDict + (NUM_SPRITEANIMDICT_ENTRIES - 1) * 2 ld [hli], a ld [hl], NAMINGSCREEN_CURSOR xor a @@ -925,7 +925,7 @@ _ComposeMailMessage: ld bc, 8 tiles ld a, BANK(.MailIcon) call FarCopyBytes - xor a + xor a ; SPRITE_ANIM_DICT_DEFAULT and tile offset $00 ld hl, wSpriteAnimDict ld [hli], a ld [hl], a diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 623b92ed4..15c7fb512 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -926,7 +926,7 @@ IntroScene19: ldh [hWY], a farcall ClearSpriteAnims ld hl, wSpriteAnimDict - xor a + xor a ; SPRITE_ANIM_DICT_DEFAULT ld [hli], a ld [hl], $7f call Intro_SetCGBPalUpdate diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 0b65ccfc9..063ff2285 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1355,7 +1355,7 @@ LoadTradeBallAndCableGFX: ld hl, vTiles0 tile $74 lb bc, BANK(TradeCableGFX), 4 call Request2bpp - xor a + xor a ; SPRITE_ANIM_DICT_DEFAULT ld hl, wSpriteAnimDict ld [hli], a ld [hl], $62 @@ -1369,7 +1369,7 @@ LoadTradeBubbleGFX: ld hl, vTiles0 tile $72 lb bc, BANK(TradeBubbleGFX), 4 call Request2bpp - xor a + xor a ; SPRITE_ANIM_DICT_DEFAULT ld hl, wSpriteAnimDict ld [hli], a ld [hl], $62 |