diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-12-17 15:56:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-17 15:56:19 -0500 |
commit | b1ae1098d06d9865c767471e539fa65f77101aaa (patch) | |
tree | 4b6d8fc9c449169705e224508a8d5e238fda18ab /gfx/gfx.asm | |
parent | 9352a537c39471410314be76cf866e058a9349bf (diff) | |
parent | 37e60a9457643720dae714f8d2df0cf5ad31d919 (diff) |
Merge pull request #84 from ZoomTen/pikachu-minigame
Disassemble opening cutscene, Game Freak intro, and Pikachu minigame
Diffstat (limited to 'gfx/gfx.asm')
-rw-r--r-- | gfx/gfx.asm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gfx/gfx.asm b/gfx/gfx.asm index 44e1c07..8c3fb8a 100644 --- a/gfx/gfx.asm +++ b/gfx/gfx.asm @@ -546,12 +546,22 @@ INCBIN "gfx/splash/game_freak_logo_oam.2bpp" SECTION "gfx.asm@Intro Underwater GFX", ROMX IntroUnderwaterGFX:: INCBIN "gfx/intro/underwater.2bpp" - -SECTION "gfx.asm@Intro Water Mon and Forest GFX", ROMX +Intro_WaterTilemap:: +INCBIN "gfx/intro/water_tilemap.bin" +Intro_WaterMeta:: +INCBIN "gfx/intro/water.bin" IntroWaterPokemonGFX:: INCBIN "gfx/intro/water_pokemon.2bpp" + +SECTION "gfx.asm@Intro Forest GFX", ROMX IntroForestGFX:: INCBIN "gfx/intro/forest.2bpp" +IntroForestLogGFX:: +INCBIN "gfx/intro/forest_log.2bpp" +Intro_GrassTilemap:: +INCBIN "gfx/intro/forest_tilemap.bin" +Intro_GrassMeta:: +INCBIN "gfx/intro/forest.bin" SECTION "gfx.asm@Intro Mon", ROMX IntroJigglypuffPikachuGFX:: |