diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 13:44:28 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 13:47:33 -0400 |
| commit | 3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884 (patch) | |
| tree | 26df5e2e78812193f6945896021476a0f6dbdf7e /engine/movie | |
| parent | SONY -> RIVAL (diff) | |
| download | pokeyellow-3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884.tar.gz pokeyellow-3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884.tar.xz pokeyellow-3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884.zip | |
Identify remaining tilemap IDs
Diffstat (limited to 'engine/movie')
| -rwxr-xr-x | engine/movie/hall_of_fame.asm | 2 | ||||
| -rwxr-xr-x | engine/movie/intro.asm | 15 | ||||
| -rwxr-xr-x | engine/movie/trade.asm | 6 |
3 files changed, 9 insertions, 14 deletions
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 |