diff options
| -rwxr-xr-x | engine/dumps/bank02.asm | 10 | ||||
| -rw-r--r-- | engine/menu/text_entry.asm | 14 | ||||
| -rw-r--r-- | engine/movie/game_freak_intro.asm | 6 | ||||
| -rw-r--r-- | engine/movie/opening_cutscene.asm | 49 | ||||
| -rw-r--r-- | engine/movie/title.asm | 12 |
5 files changed, 48 insertions, 43 deletions
diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm index 97590e4..86f11e6 100755 --- a/engine/dumps/bank02.asm +++ b/engine/dumps/bank02.asm @@ -1150,7 +1150,7 @@ Function886a: ld hl, vChars0 + $40 lb bc, BANK(GoldSpriteGFX), $04 call Request2bpp - ld de, $0000 + depixel 0, 0 ld a, $41 call InitSpriteAnimStruct ld hl, $0003 @@ -1188,7 +1188,7 @@ Function88b3: ld hl, vChars0 + $c0 lb bc, BANK(PidgeySpriteGFX), $04 call Request2bpp - ld de, $0000 + depixel 0, 0 ld a, $41 call InitSpriteAnimStruct ld hl, $0003 @@ -1443,7 +1443,7 @@ Function8c21: ld hl, wTileMapBackup ld [hli], a ld [hl], $7c - ld de, $241c + depixel 4, 3, 4, 4 ld a, $44 call InitSpriteAnimStruct call Function8c1c @@ -1568,7 +1568,7 @@ Function8cb7: ld hl, Text91c2 call PrintText call WaitBGMap - ld de, $4c23 + depixel 9, 4, 4, 3 ld a, $44 call InitSpriteAnimStruct ld hl, $0002 @@ -1577,7 +1577,7 @@ Function8cb7: ld hl, $0003 add hl, bc ld [hl], $7c - ld de, $4030 + depixel 8, 6 ld a, $4b call InitSpriteAnimStruct ld hl, $0003 diff --git a/engine/menu/text_entry.asm b/engine/menu/text_entry.asm index 14dbc85..0c9bf75 100644 --- a/engine/menu/text_entry.asm +++ b/engine/menu/text_entry.asm @@ -147,7 +147,7 @@ GetNamingScreenSetup: ld hl, wTileMapBackup ld [hl+], a ld [hl], $00 - ld de, $2420 + depixel 4, 4, 4, 0 ld a, $41 call InitSpriteAnimStruct ld hl, $0001 @@ -180,7 +180,7 @@ GetNamingScreenSetup: ld hl, wTileMapBackup ld [hli], a ld [hl], $00 - ld de, $2420 + depixel 4, 4, 4, 0 ld a, $41 call InitSpriteAnimStruct ret @@ -301,7 +301,7 @@ NamingScreenJoypadLoop: dw .ReadButtons .InitCursor: - ld de, $5818 + depixel 11, 3, 0, 0 ld a, $39 call InitSpriteAnimStruct ld a, c @@ -728,13 +728,13 @@ ComposeMailMessage: ld hl, wTileMapBackup ld [hli], a ld [hl], 0 - ld de, $2420 + depixel 4, 4, 4, 0 ld a, 8 call InitSpriteAnimStruct ld hl, $0002 add hl, bc ld [hl], 0 - ld de, $5818 + depixel 11, 3, 0, 0 ld a, $39 call InitSpriteAnimStruct ld a, c @@ -945,13 +945,13 @@ SetupMail: ld hl, wTileMapBackup ld [hli], a ld [hl], 0 - ld de, $2420 + depixel 4, 4, 4, 0 ld a, 8 call InitSpriteAnimStruct ld hl, $0002 add hl, bc ld [hl], 0 - ld de, $6018 + depixel 12, 3, 0, 0 ld a, $40 call InitSpriteAnimStruct ld a, c diff --git a/engine/movie/game_freak_intro.asm b/engine/movie/game_freak_intro.asm index e8a7a00..f3f888c 100644 --- a/engine/movie/game_freak_intro.asm +++ b/engine/movie/game_freak_intro.asm @@ -168,7 +168,7 @@ GameFreakPresents_Wait64Frames: GameFreakPresents_Star: xor a ld [wIntroSceneFrameCounter], a - ld de, $5458 + depixel 10, 11, 4, 0 ld a, $3b ; SPRITE_ANIM_INDEX_GS_INTRO_STAR call InitSpriteAnimStruct @@ -186,7 +186,7 @@ GameFreakPresents_PlaceLogo: and a ret z - ld de, $5458 + depixel 10, 11, 4, 0 ld a, $3a ; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO call InitSpriteAnimStruct call GameFreakPresents_NextScene @@ -292,7 +292,7 @@ GameFreakPresents_Sparkle: srl a ; set up a new sparkle sprite push af - ld de, $5858 + depixel 11, 11 ld a, $3c call InitSpriteAnimStruct pop af diff --git a/engine/movie/opening_cutscene.asm b/engine/movie/opening_cutscene.asm index 1eeacb5..bd475f8 100644 --- a/engine/movie/opening_cutscene.asm +++ b/engine/movie/opening_cutscene.asm @@ -370,12 +370,11 @@ Intro_InitBubble: db $40, $88 Intro_InitMagikarps: - ld de, $403f + depixel 8, 7, 0, 7 ld a, [wSGB] and a jr z, .ok - - ld de, $201f + depixel 4, 3, 0, 7 .ok ld hl, wIntroFrameCounter2 @@ -385,20 +384,25 @@ Intro_InitMagikarps: ld a, [hl] and d jr nz, .alternate_frame - ld de, $e8e0 + + depixel 29, 28 call .PlaceMagikarp - ld de, wObject8SpriteXOffset + + depixel 26, 0 call .PlaceMagikarp - ld de, $00c0 + + depixel 0, 24 call .PlaceMagikarp ret .alternate_frame - ld de, $e0f0 + depixel 28, 30 call .PlaceMagikarp - ld de, $f8c0 + + depixel 31, 24 call .PlaceMagikarp - ld de, $10e0 + + depixel 2, 28 call .PlaceMagikarp ret @@ -408,11 +412,12 @@ Intro_InitMagikarps: ret Intro_InitOmanyte: - ld de, $9038 + depixel 18, 7 call .PlaceOmanyte - ld de, $7050 + depixel 14, 10 call .PlaceOmanyte - ld de, $8078 + depixel 16, 15 +; fallback .PlaceOmanyte: ld a, $22 ; SPRITE_ANIM_INDEX_GS_INTRO_SHELLDER @@ -423,13 +428,13 @@ Intro_InitLapras: ld a, [wIntroFrameCounter2] and %00011111 ret nz - ld de, $80c0 + depixel 16, 24 ld a, $25 ; SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS call InitSpriteAnimStruct ret Intro_UnusedInitAerodactyl: ; unreferenced - ld de, $1000 + depixel 2, 0 ld a, $24 ; SPRITE_ANIM_INDEX_UNUSED_INTRO_AERODACTYL call InitSpriteAnimStruct ret @@ -752,30 +757,30 @@ Intro_InitNote: and $7f jr z, .SmallerNote - ld de, $5c30 + depixel 11, 6, 4, 0 ld a, $26 ; SPRITE_ANIM_INDEX_GS_INTRO_NOTE call InitSpriteAnimStruct ret .SmallerNote: - ld de, $5430 + depixel 10, 6, 4, 0 ld a, $27 ; SPRITE_ANIM_INDEX_GS_INTRO_SMALLER_NOTE call InitSpriteAnimStruct ret Intro_InitJigglypuff: - ld de, $7030 + depixel 14, 6 ld a, $28 ; SPRITE_ANIM_INDEX_GS_INTRO_JIGGLYPUFF call InitSpriteAnimStruct ret Intro_InitPikachu: - ld de, $70c0 + depixel 14, 24 ld a, $29 ; SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU call InitSpriteAnimStruct - ld de, $70c0 + depixel 14, 24 ld a, $2a ; SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU_TAIL call InitSpriteAnimStruct ret @@ -1123,7 +1128,7 @@ Intro_AnimateFireball: inc [hl] and 3 ret nz - ld de, $6454 + depixel 12, 10, 4, 4 ld a, $2b ; SPRITE_ANIM_INDEX_GS_INTRO_FIREBALL call InitSpriteAnimStruct ld hl, hSCX @@ -1133,13 +1138,13 @@ Intro_AnimateFireball: ret Intro_LoadBlastoiseObject: - ld de, $b008 + depixel 22, 1 ld a, $2c ; SPRITE_ANIM_INDEX_GS_INTRO_BLASTOISE call InitSpriteAnimStruct ret Intro_LoadVenusaurObject: - ld de, $b0a0 + depixel 22, 20 ld a, $2d ; SPRITE_ANIM_INDEX_GS_INTRO_VENUSAUR call InitSpriteAnimStruct ret diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 26d6f8b..23baa2f 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -161,12 +161,12 @@ TitleSequenceInit:: ret FirePositionTable:: - dw $4CE0 - dw $58A0 - dw $6490 - dw $70D0 - dw $7CB0 - dw $8800 + dbpixel 28, 9, 0, 4 + dbpixel 20, 11, 0, 0 + dbpixel 18, 12, 0, 4 + dbpixel 26, 14, 0, 0 + dbpixel 22, 15, 0, 4 + dbpixel 0, 17, 0, 0 TitleFireGFX:: INCBIN "gfx/title/fire.2bpp" TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp" |