diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
| commit | 286c160c27e58caad32f776cec684eb8cb2cb22a (patch) | |
| tree | d89563a88a9674837896d6e88b9c9431b708bf97 /engine/intro.asm | |
| parent | c8a5720cca08631dcc20d036731e261a09a9a76e (diff) | |
| parent | 188ac8a9b4816dd98df0108314e58885c3b07452 (diff) | |
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
engine/battle/1c.asm
Diffstat (limited to 'engine/intro.asm')
| -rwxr-xr-x | engine/intro.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/intro.asm b/engine/intro.asm index 767522e7..8e344e48 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -199,7 +199,7 @@ Func_417c7: ; 417c7 (10:57c7) ret Func_417f0: ; 417f0 (10:57f0) - ld hl, $9c00 + ld hl, vBGMap1 ld bc, $240 jr asm_417fe @@ -275,22 +275,22 @@ Func_41849: ; 41849 (10:5849) LoadIntroGraphics: ; 41852 (10:5852) ld hl, FightIntroBackMon ; $5a99 - ld de, $9000 + ld de, vChars2 ld bc, $600 ld a, BANK(FightIntroBackMon) call FarCopyData2 ld hl, GameFreakIntro ; $5959 - ld de, $9600 + ld de, vChars2 + $600 ld bc, $140 ld a, BANK(GameFreakIntro) call FarCopyData2 ld hl, GameFreakIntro ; $5959 - ld de, $8800 + ld de, vChars1 ld bc, $140 ld a, BANK(GameFreakIntro) call FarCopyData2 ld hl, FightIntroFrontMon ; $6099 - ld de, $8000 + ld de, vChars0 ld bc, $6c0 ld a, BANK(FightIntroFrontMon) jp FarCopyData2 @@ -341,10 +341,10 @@ Func_418e9: ; 418e9 (10:58e9) ld hl, Coord ld c, $50 call Func_41807 - ld hl, $9c00 + ld hl, vBGMap1 ld c, $80 call Func_41807 - ld hl, $9dc0 + ld hl, vBGMap1 + $1c0 ld c, $80 jp Func_41807 @@ -425,7 +425,7 @@ IntroNidorinoAnimation7: ; 41950 (10:5950) db $50 ; list terminator GameFreakIntro: ; 41959 (10:5959) - INCBIN "gfx/gamefreak_intro.h8.2bpp" + INCBIN "gfx/gamefreak_intro.2bpp" INCBIN "gfx/gamefreak_logo.2bpp" ds $10 ; blank tile |