Identify remaining tilemap IDs

This commit is contained in:
Rangi 2020-07-17 13:44:28 -04:00
parent 30ecbf6ea3
commit 3c1cdbc4d0
11 changed files with 47 additions and 56 deletions

View file

@ -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

View file

@ -202,7 +202,7 @@ HoFLoadPlayerPics:
HoFLoadMonPlayerPicTileIDs:
; c = base tile ID
ld b, 0
ld b, TILEMAP_MON_PIC
hlcoord 12, 5
predef_jump CopyTileIDsFromList

View file

@ -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

View file

@ -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