diff options
| -rw-r--r-- | constants/battle_anim_constants.asm | 1 | ||||
| -rw-r--r-- | constants/sprite_anim_constants.asm | 1 | ||||
| -rw-r--r-- | data/battle_anims/object_gfx.asm | 2 | ||||
| -rw-r--r-- | data/sprite_anims/unused_gfx.asm | 15 | ||||
| -rw-r--r-- | engine/battle_anims/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle_anims/helpers.asm | 9 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 4 | ||||
| -rw-r--r-- | engine/gfx/sprites.asm | 29 | ||||
| -rw-r--r-- | main.asm | 5 |
10 files changed, 38 insertions, 32 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index dac83db5..2b66b544 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -763,6 +763,7 @@ BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture const ANIM_BG_WOBBLE_PLAYER const ANIM_BG_WOBBLE_SCREEN +; wBattleAnimTileDict keys (see wram.asm) ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm) const_def 1 const ANIM_GFX_HIT diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 9709830e..20f23c2b 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -20,6 +20,7 @@ SPRITEANIMSTRUCT_LENGTH EQU const_value NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs ; wSpriteAnimDict keys (see wram.asm) +; UnusedSpriteAnimGFX indexes (see data/sprite_anims/unused_gfx.asm) const_def const SPRITE_ANIM_DICT_DEFAULT ; 0 const SPRITE_ANIM_DICT_GS_INTRO ; 1 diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm index 432e513d..b132c0ed 100644 --- a/data/battle_anims/object_gfx.asm +++ b/data/battle_anims/object_gfx.asm @@ -1,5 +1,5 @@ anim_obj_gfx: MACRO -; # tiles, label +; # tiles, gfx pointer db \1 dba \2 ENDM diff --git a/data/sprite_anims/unused_gfx.asm b/data/sprite_anims/unused_gfx.asm new file mode 100644 index 00000000..aadc9c01 --- /dev/null +++ b/data/sprite_anims/unused_gfx.asm @@ -0,0 +1,15 @@ +UnusedSpriteAnimGFX: +; entries correspond to SPRITE_ANIM_DICT_* constants + ; # tiles, gfx bank, gfx pointer + ; (all pointers were dummied out to .DeletedGFX) + dbbw 128, $01, .DeletedGFX ; SPRITE_ANIM_DICT_DEFAULT + dbbw 128, $01, .DeletedGFX ; SPRITE_ANIM_DICT_GS_INTRO + dbbw 128, $01, .DeletedGFX ; SPRITE_ANIM_DICT_GS_INTRO_2 + dbbw 128, $01, .DeletedGFX ; unused + dbbw 16, $37, .DeletedGFX ; unused + dbbw 16, $11, .DeletedGFX ; SPRITE_ANIM_DICT_TEXT_CURSOR + dbbw 16, $39, .DeletedGFX ; SPRITE_ANIM_DICT_GS_SPLASH (the bank includes engine/movie/splash.asm) + dbbw 16, $24, .DeletedGFX ; SPRITE_ANIM_DICT_SLOTS (the bank includes engine/games/slot_machine.asm) + dbbw 16, $21, .DeletedGFX ; SPRITE_ANIM_DICT_ARROW_CURSOR + +.DeletedGFX diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index ef5aee3f..51916ef4 100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm @@ -313,3 +313,5 @@ _ExecuteBGEffects: _QueueBGEffect: callfar QueueBGEffect ret + +INCLUDE "data/battle_anims/objects.asm" diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index 208ab614..b533988e 100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -67,6 +67,7 @@ GetBattleAnimFrame: ld hl, BATTLEANIMSTRUCT_DURATION add hl, bc ld [hl], a + dec a ld hl, BATTLEANIMSTRUCT_FRAME add hl, bc @@ -87,7 +88,7 @@ GetBattleAnimFrame: ld hl, BATTLEANIMSTRUCT_FRAME add hl, bc ld l, [hl] - ld h, $0 + ld h, 0 add hl, hl add hl, de ret @@ -121,3 +122,9 @@ LoadBattleAnimGFX: call DecompressRequest2bpp pop bc ret + +INCLUDE "data/battle_anims/framesets.asm" + +INCLUDE "data/battle_anims/oam.asm" + +INCLUDE "data/battle_anims/object_gfx.asm" diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index caa878e0..1fedb1f0 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -776,3 +776,5 @@ Movement_ContestResults_WalkAfterWarp: step DOWN turn_head UP step_end + +INCLUDE "data/text/std_text.asm" diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 2608f403..b5f298fe 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -112,8 +112,8 @@ _CGB_BattleColors: ld [wDefaultSGBLayout], a call ApplyPals _CGB_FinishBattleScreenLayout: - ld hl, TilesetBGPalette palette 7 - ld de, wBGPals1 palette 7 + ld hl, TilesetBGPalette palette PAL_BATTLE_BG_TEXT + ld de, wBGPals1 palette PAL_BATTLE_BG_TEXT ld bc, 1 palettes call CopyBytes hlcoord 0, 0, wAttrmap diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index ded71d93..94213946 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -402,9 +402,9 @@ GetSpriteAnimFrame: add hl, bc ld a, [hl] and a - jr z, .next_frame ; finished the current sequence + jr z, .next_frame dec [hl] - call .GetPointer ; load pointer from SpriteAnimFrameData + call .GetPointer ld a, [hli] push af jr .okay @@ -413,7 +413,7 @@ GetSpriteAnimFrame: ld hl, SPRITEANIMSTRUCT_FRAME add hl, bc inc [hl] - call .GetPointer ; load pointer from SpriteAnimFrameData + call .GetPointer ld a, [hli] cp dorestart_command jr z, .restart @@ -464,9 +464,6 @@ GetSpriteAnimFrame: jr .loop .GetPointer: - ; Get the data for the current frame for the current animation sequence - - ; SpriteAnimFrameData[SpriteAnim[SPRITEANIMSTRUCT_FRAMESET_ID]][SpriteAnim[SPRITEANIMSTRUCT_FRAME]] ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc ld e, [hl] @@ -486,7 +483,6 @@ GetSpriteAnimFrame: ret GetFrameOAMPointer: -; Load OAM data pointer ld e, a ld d, 0 ld hl, SpriteAnimOAMData @@ -495,13 +491,13 @@ GetFrameOAMPointer: add hl, de ret -BrokenGetStdGraphics: ; unreferenced +UnusedLoadSpriteAnimGFX: ; unreferenced push hl ld l, a ld h, 0 add hl, hl add hl, hl - ld de, BrokenStdGFXPointers ; broken 2bpp pointers + ld de, UnusedSpriteAnimGFX add hl, de ld c, [hl] inc hl @@ -524,20 +520,7 @@ INCLUDE "data/sprite_anims/framesets.asm" INCLUDE "data/sprite_anims/oam.asm" -BrokenStdGFXPointers: - ; tile count, bank, pointer - ; (all pointers were dummied out to .deleted) - dbbw 128, $01, .deleted - dbbw 128, $01, .deleted - dbbw 128, $01, .deleted - dbbw 128, $01, .deleted - dbbw 16, $37, .deleted - dbbw 16, $11, .deleted - dbbw 16, $39, .deleted - dbbw 16, $24, .deleted - dbbw 16, $21, .deleted - -.deleted +INCLUDE "data/sprite_anims/unused_gfx.asm" Sprites_Cosine: ; a = d * cos(a * pi/32) @@ -300,12 +300,8 @@ SECTION "Move Animations", ROMX INCLUDE "engine/events/bug_contest/display_stats.asm" INCLUDE "engine/battle_anims/anim_commands.asm" INCLUDE "engine/battle_anims/core.asm" -INCLUDE "data/battle_anims/objects.asm" INCLUDE "engine/battle_anims/functions.asm" INCLUDE "engine/battle_anims/helpers.asm" -INCLUDE "data/battle_anims/framesets.asm" -INCLUDE "data/battle_anims/oam.asm" -INCLUDE "data/battle_anims/object_gfx.asm" SECTION "Font Inversed", ROMX @@ -381,7 +377,6 @@ INCLUDE "engine/debug/color_picker.asm" SECTION "Standard Scripts", ROMX INCLUDE "engine/events/std_scripts.asm" -INCLUDE "data/text/std_text.asm" INCLUDE "data/text/battle.asm" |