diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-19 23:04:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 23:04:16 -0400 |
| commit | 0177688ad4d923c4970009fa87df48605bb43ed6 (patch) | |
| tree | 4c44fbb1813e78eb00f7c1690d2c23099a49113b /engine/movie/intro.asm | |
| parent | Merge pull request #277 from Rangi42/master (diff) | |
| parent | Missingno's Pokédex weight is two bytes like the rest (diff) | |
| download | pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.gz pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.xz pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.zip | |
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'engine/movie/intro.asm')
| -rwxr-xr-x | engine/movie/intro.asm | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 215b54ae..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 @@ -445,6 +440,7 @@ GameFreakIntroEnd: FightIntroBackMon: INCBIN "gfx/intro_credits/gengar.2bpp" + ds 16, $00 ; blank tile FightIntroBackMonEnd: FightIntroFrontMon: |