diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-18 10:32:50 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-18 10:32:50 -0500 |
| commit | 1a987d1e1ab96ca9553d4253c72858057332a03a (patch) | |
| tree | d101dc054e112304f327a5359532ee972e8da81a /engine/intro.asm | |
| parent | fb0a630c062cbb18026abe2792339dea27fac4d8 (diff) | |
| parent | 696cffd3ae51d23855a7eb1fc5b62e69198dbf36 (diff) | |
Merge pull request #114 from YamaArashi/master
Commented SGB palettes and other things
Diffstat (limited to 'engine/intro.asm')
| -rwxr-xr-x | engine/intro.asm | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/engine/intro.asm b/engine/intro.asm index 46f0c37a..29aa4ef4 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -1,3 +1,7 @@ +MOVE_GENGAR_RIGHT EQU $00 +MOVE_GENGAR_LEFT EQU $01 +MOVE_NIDORINO_RIGHT EQU $ff + PlayIntro: ; 41682 (10:5682) xor a ld [hJoyHeld], a @@ -14,8 +18,8 @@ PlayIntro: ; 41682 (10:5682) ret PlayIntroScene: ; 4169d (10:569d) - ld b, $7 - call GoPAL_SET + ld b, SET_PAL_NIDORINO_INTRO + call RunPaletteCommand ld a, %11100100 ld [rBGP], a ld [rOBP0], a @@ -30,7 +34,7 @@ PlayIntroScene: ; 4169d (10:569d) ld [W_BASECOORDY], a lb bc, 6, 6 call InitIntroNidorinoOAM - ld de, $28ff ; move Nidorino right by 80 pixels + lb de, 80 / 2, MOVE_NIDORINO_RIGHT call IntroMoveMon ret c @@ -69,7 +73,7 @@ PlayIntroScene: ; 4169d (10:569d) call IntroCopyTiles ld a, SFX_INTRO_RAISE call PlaySound - ld de, $401 ; move Gengar left by 8 pixels + lb de, 8 / 2, MOVE_GENGAR_LEFT call IntroMoveMon ld c, $1e call CheckForUserInterruption @@ -80,7 +84,7 @@ PlayIntroScene: ; 4169d (10:569d) call IntroCopyTiles ld a, SFX_INTRO_CRASH call PlaySound - ld de, $800 ; move Gengar right by 16 pixels + lb de, 16 / 2, MOVE_GENGAR_RIGHT call IntroMoveMon ; hip ld a, SFX_INTRO_HIP @@ -93,7 +97,7 @@ PlayIntroScene: ; 4169d (10:569d) call CheckForUserInterruption ret c - ld de, $401 ; move Gengar left by 8 pixels + lb de, 8 / 2, MOVE_GENGAR_LEFT call IntroMoveMon ld b, $3 call IntroCopyTiles @@ -298,8 +302,8 @@ LoadIntroGraphics: ; 41852 (10:5852) jp FarCopyData2 PlayShootingStar: ; 4188a (10:588a) - ld b, $c - call GoPAL_SET + ld b, SET_PAL_GAME_FREAK_INTRO + call RunPaletteCommand callba LoadCopyrightAndTextBoxTiles ld a, $e4 ld [rBGP], a |