diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-16 08:19:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 08:19:11 -0400 |
| commit | d3a01f777d2bbb3bc5ec6822af893d16fda19936 (patch) | |
| tree | 20c078b267b5b35055f30e64e726931e63031166 /engine/movie | |
| parent | Merge pull request #274 from Rangi42/master (diff) | |
| parent | Disassemble the BLUEMONS.GB debug ROM (diff) | |
| download | pokeyellow-d3a01f777d2bbb3bc5ec6822af893d16fda19936.tar.gz pokeyellow-d3a01f777d2bbb3bc5ec6822af893d16fda19936.tar.xz pokeyellow-d3a01f777d2bbb3bc5ec6822af893d16fda19936.zip | |
Merge pull request #275 from Rangi42/master
Disassemble the BLUEMONS.GB debug ROM
Diffstat (limited to 'engine/movie')
| -rwxr-xr-x | engine/movie/intro.asm | 2 | ||||
| -rwxr-xr-x | engine/movie/title.asm | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index fc404b82..215b54ae 100755 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -361,7 +361,7 @@ IntroDrawBlackBars: ld c, BG_MAP_WIDTH * 4 jp IntroPlaceBlackTiles -EmptyFunc4: +EmptyFunc2: ret IntroNidorinoAnimation0: diff --git a/engine/movie/title.asm b/engine/movie/title.asm index bdb24d6a..7b883cfd 100755 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -252,6 +252,11 @@ ENDC and D_UP | SELECT | B_BUTTON cp D_UP | SELECT | B_BUTTON jp z, .doClearSaveDialogue +IF DEF(_DEBUG) + ld a, b + bit BIT_SELECT, a + jp nz, DebugMenu +ENDC jp MainMenu .doClearSaveDialogue |