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 /layout.link | |
| 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 'layout.link')
| -rw-r--r-- | layout.link | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/layout.link b/layout.link index 17467cc..a52e750 100644 --- a/layout.link +++ b/layout.link @@ -102,9 +102,9 @@ ROMX $01 "engine/menu/main_menu.asm@Initialize new game WRAM" "engine/dumps/bank01.asm@Function5388" "engine/menu/main_menu.asm@MainMenu" - "engine/intro.asm" - "engine/title.asm@Title screen" - "engine/title.asm@Title screen TEMPORARY" + "engine/movie/oak_speech.asm" + "engine/movie/title.asm@Title screen" + "engine/movie/title.asm@Title screen TEMPORARY" "engine/predef.asm" "engine/dumps/bank01.asm@ReanchorBGMap_NoOAMUpdate" "engine/math/math.asm" @@ -884,6 +884,7 @@ ROMX $37 ROMX $38 org $4000 + "engine/games/pikachu_minigame.asm@Pikachu Minigame" org $5403 "gfx.asm@Poker GFX" org $5f93 @@ -895,14 +896,13 @@ ROMX $38 ROMX $39 org $4000 - org $41ff + "engine/movie/game_freak_intro.asm" "gfx.asm@Gamefreak Logo GFX" - org $4adf + "engine/movie/opening_cutscene.asm" "gfx.asm@Intro Underwater GFX" - org $55ef - "gfx.asm@Intro Water Mon and Forest GFX" - org $626f + "gfx.asm@Intro Forest GFX" "gfx.asm@Intro Mon" + "slack.asm@Unknowne7e9f" ROMX $3a org $4000 |