From 3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 17 Jul 2020 13:44:28 -0400 Subject: [PATCH] Identify remaining tilemap IDs --- constants/gfx_constants.asm | 11 +++++++ data/tilemaps.asm | 51 ++++++++++------------------- engine/battle/animations.asm | 16 ++++----- engine/movie/hall_of_fame.asm | 2 +- engine/movie/intro.asm | 15 +++------ engine/movie/trade.asm | 6 ++-- gfx/pokemon/downscaled_3x3.tilemap | Bin 0 -> 9 bytes gfx/pokemon/downscaled_5x5.tilemap | Bin 0 -> 25 bytes gfx/pokemon/front.tilemap | Bin 0 -> 49 bytes gfx/pokemon/slide_down_7x3.tilemap | Bin 0 -> 21 bytes gfx/pokemon/slide_down_7x5.tilemap | Bin 0 -> 35 bytes 11 files changed, 45 insertions(+), 56 deletions(-) create mode 100644 gfx/pokemon/downscaled_3x3.tilemap create mode 100644 gfx/pokemon/downscaled_5x5.tilemap create mode 100644 gfx/pokemon/front.tilemap create mode 100644 gfx/pokemon/slide_down_7x3.tilemap create mode 100644 gfx/pokemon/slide_down_7x5.tilemap diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 6446a51f..d6d162c7 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -29,3 +29,14 @@ TRANSFERBOTTOM EQU 2 ; hRedrawRowOrColumnMode REDRAW_COL EQU 1 REDRAW_ROW EQU 2 + +; tile list ids + const_def + const TILEMAP_MON_PIC + const TILEMAP_SLIDE_DOWN_MON_PIC_7X5 + const TILEMAP_SLIDE_DOWN_MON_PIC_7X3 + const TILEMAP_GENGAR_INTRO_1 + const TILEMAP_GENGAR_INTRO_2 + const TILEMAP_GENGAR_INTRO_3 + const TILEMAP_GAME_BOY + const TILEMAP_LINK_CABLE diff --git a/data/tilemaps.asm b/data/tilemaps.asm index 7bf3d9f8..c7efb222 100644 --- a/data/tilemaps.asm +++ b/data/tilemaps.asm @@ -4,48 +4,31 @@ tile_ids: MACRO ENDM TileIDListPointerTable: +; entries correspond to TILEMAP_* constants (see constants/gfx_constants.asm) ; tilemap pointer, width, height - tile_ids Unknown_79b24, 7, 7 - tile_ids Unknown_79b55, 7, 5 - tile_ids Unknown_79b78, 7, 3 - tile_ids GengarIntroTiles1, 7, 7 - tile_ids GengarIntroTiles2, 7, 7 - tile_ids GengarIntroTiles3, 7, 7 - tile_ids GameBoyTiles, 6, 8 - tile_ids LinkCableTiles, 12, 3 + tile_ids MonTiles, 7, 7 + tile_ids SlideDownMonTiles_7x5, 7, 5 + tile_ids SlideDownMonTiles_7x3, 7, 3 + tile_ids GengarIntroTiles1, 7, 7 + tile_ids GengarIntroTiles2, 7, 7 + tile_ids GengarIntroTiles3, 7, 7 + tile_ids GameBoyTiles, 6, 8 + tile_ids LinkCableTiles, 12, 3 DownscaledMonTiles_5x5: - db $31,$38,$46,$54,$5B - db $32,$39,$47,$55,$5C - db $34,$3B,$49,$57,$5E - db $36,$3D,$4B,$59,$60 - db $37,$3E,$4C,$5A,$61 + INCBIN "gfx/pokemon/downscaled_5x5.tilemap" DownscaledMonTiles_3x3: - db $31,$46,$5B - db $34,$49,$5E - db $37,$4C,$61 + INCBIN "gfx/pokemon/downscaled_3x3.tilemap" -Unknown_79b24: - db $00,$07,$0E,$15,$1C,$23,$2A - db $01,$08,$0F,$16,$1D,$24,$2B - db $02,$09,$10,$17,$1E,$25,$2C - db $03,$0A,$11,$18,$1F,$26,$2D - db $04,$0B,$12,$19,$20,$27,$2E - db $05,$0C,$13,$1A,$21,$28,$2F - db $06,$0D,$14,$1B,$22,$29,$30 +MonTiles: + INCBIN "gfx/pokemon/front.tilemap" -Unknown_79b55: - db $00,$07,$0E,$15,$1C,$23,$2A - db $01,$08,$0F,$16,$1D,$24,$2B - db $03,$0A,$11,$18,$1F,$26,$2D - db $04,$0B,$12,$19,$20,$27,$2E - db $05,$0C,$13,$1A,$21,$28,$2F +SlideDownMonTiles_7x5: + INCBIN "gfx/pokemon/slide_down_7x5.tilemap" -Unknown_79b78: - db $00,$07,$0E,$15,$1C,$23,$2A - db $02,$09,$10,$17,$1E,$25,$2C - db $04,$0B,$12,$19,$20,$27,$2E +SlideDownMonTiles_7x3: + INCBIN "gfx/pokemon/slide_down_7x3.tilemap" GengarIntroTiles1: INCBIN "gfx/intro_credits/gengar_1.tilemap" diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index eac523a3..dae13ba0 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1148,7 +1148,7 @@ AnimationSlideMonUp: AnimationSlideMonDown: ; Slides the mon's sprite down out of the screen. - xor a + xor a ; TILEMAP_MON_PIC call GetTileIDList .loop call GetMonSpriteTileMapPointerFromRowCount @@ -1355,7 +1355,7 @@ AnimationFlashEnemyMonPic: jp CallWithTurnFlipped AnimationShowMonPic: - xor a + xor a ; TILEMAP_MON_PIC call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount call CopyPicTiles @@ -1379,7 +1379,7 @@ AnimationShakeBackAndForth: decoord 13, 0 .next - xor a + xor a ; TILEMAP_MON_PIC ld c, $10 .loop push af @@ -1424,7 +1424,7 @@ AnimationMoveMonHorizontally: jr z, .next hlcoord 11, 0 .next - xor a + xor a ; TILEMAP_MON_PIC push hl call GetTileIDList pop hl @@ -1715,8 +1715,8 @@ MinimizedMonSpriteEnd: AnimationSlideMonDownAndHide: ; Slides the mon's sprite down and disappears. Used in Acid Armor. - ld a, $1 - ld c, $2 + ld a, TILEMAP_SLIDE_DOWN_MON_PIC_7X5 + ld c, 2 .loop push bc push af @@ -1735,7 +1735,7 @@ AnimationSlideMonDownAndHide: jr nz, .loop call AnimationHideMonPic ld hl, wTempPic - ld bc, $310 + ld bc, 7 * 7 tiles xor a call FillMemory jp CopyTempPicToMonPic @@ -2007,7 +2007,7 @@ ChangeMonPic: ld [wd0b5], a call GetMonHeader predef LoadMonBackPic - xor a + xor a ; TILEMAP_MON_PIC call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount call CopyPicTiles diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 071e7ca1..a7d3ed40 100755 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -202,7 +202,7 @@ HoFLoadPlayerPics: HoFLoadMonPlayerPicTileIDs: ; c = base tile ID - ld b, 0 + ld b, TILEMAP_MON_PIC hlcoord 12, 5 predef_jump CopyTileIDsFromList diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index c5896ecb..d8ec8e6e 100755 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -1,15 +1,10 @@ -const_value = -1 + const_def -1 const MOVE_NIDORINO_RIGHT const MOVE_GENGAR_RIGHT const MOVE_GENGAR_LEFT ANIMATION_END EQU 80 -const_value = 3 - const GENGAR_INTRO_TILES1 - const GENGAR_INTRO_TILES2 - const GENGAR_INTRO_TILES3 - PlayIntro: xor a ldh [hJoyHeld], a @@ -34,7 +29,7 @@ PlayIntroScene: ldh [rOBP1], a xor a ldh [hSCX], a - ld b, GENGAR_INTRO_TILES1 + ld b, TILEMAP_GENGAR_INTRO_1 call IntroCopyTiles ld a, 0 ld [wBaseCoordX], a @@ -77,7 +72,7 @@ PlayIntroScene: ret c ; raise - ld b, GENGAR_INTRO_TILES2 + ld b, TILEMAP_GENGAR_INTRO_2 call IntroCopyTiles ld a, SFX_INTRO_RAISE call PlaySound @@ -88,7 +83,7 @@ PlayIntroScene: ret c ; slash - ld b, GENGAR_INTRO_TILES3 + ld b, TILEMAP_GENGAR_INTRO_3 call IntroCopyTiles ld a, SFX_INTRO_CRASH call PlaySound @@ -107,7 +102,7 @@ PlayIntroScene: lb de, 8 / 2, MOVE_GENGAR_LEFT call IntroMoveMon - ld b, GENGAR_INTRO_TILES1 + ld b, TILEMAP_GENGAR_INTRO_1 call IntroCopyTiles ld c, 60 call CheckForUserInterruption diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index fc2da9bd..992cbd97 100755 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm @@ -282,7 +282,7 @@ Trade_DrawOpenEndOfLinkCable: ld a, %10001011 ldh [rLCDC], a hlcoord 6, 2 - ld b, $7 ; open end of link cable tile ID list index + ld b, TILEMAP_LINK_CABLE call CopyTileIDsFromList_ZeroBaseTileID call Trade_CopyTileMapToVRAM ld a, SFX_HEAL_HP @@ -474,7 +474,7 @@ Trade_DrawLeftGameboy: ; draw gameboy pic hlcoord 5, 3 - ld b, $6 + ld b, TILEMAP_GAME_BOY call CopyTileIDsFromList_ZeroBaseTileID ; draw text box with player name below gameboy pic @@ -521,7 +521,7 @@ Trade_DrawRightGameboy: ; draw gameboy pic hlcoord 7, 8 - ld b, $6 + ld b, TILEMAP_GAME_BOY call CopyTileIDsFromList_ZeroBaseTileID ; draw text box with enemy name above link cable diff --git a/gfx/pokemon/downscaled_3x3.tilemap b/gfx/pokemon/downscaled_3x3.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..885f4a555ef52b38cd6d98e40282eae22f53a365 GIT binary patch literal 9 QcmXqXi#G9$GxtdZ01PSuk^lez literal 0 HcmV?d00001 diff --git a/gfx/pokemon/downscaled_5x5.tilemap b/gfx/pokemon/downscaled_5x5.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..bc99ac239ee5b7585df01af60022bb9218f3f096 GIT binary patch literal 25 gcmXrCa0`hxvUCrPF|qaxk2ACNj!ZDO^NC6X09ghHA^-pY literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front.tilemap b/gfx/pokemon/front.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..2f3cb316f15c473927a9648dcb18196ec399243f GIT binary patch literal 49 zcmZQz=M$At)?(z~7n4=dX5thOms8bY<`R^USJP$T7Lrs@*JI@omQvKvXX6!-R?;*8 E0BBJJnE(I) literal 0 HcmV?d00001 diff --git a/gfx/pokemon/slide_down_7x3.tilemap b/gfx/pokemon/slide_down_7x3.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..9976218b7a2dd4c90669d237bb10ac4e632a4051 GIT binary patch literal 21 ccmZQz=M$At)?(rm5SLTcVc`~%R8ZFg01?Ik