diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-05 16:17:47 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-05 16:17:47 -0500 |
| commit | c3911c80cf8400f81518532c13912c647b81b880 (patch) | |
| tree | fd6feac2d6e5355ceb24c793b4567fdaa7ce5e24 /yellow | |
| parent | bankB misc functions (diff) | |
| download | pokeyellow-c3911c80cf8400f81518532c13912c647b81b880.tar.gz pokeyellow-c3911c80cf8400f81518532c13912c647b81b880.tar.xz pokeyellow-c3911c80cf8400f81518532c13912c647b81b880.zip | |
BankD misc functions
Game Corner stuff and (unused) titlescreen2.asm
Diffstat (limited to 'yellow')
| -rwxr-xr-x | yellow/main.asm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index 24b6250f..a8279d91 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -3997,7 +3997,9 @@ WeepinbellPicBack: INCBIN "pic/monback/weepinbellb.pic" VictreebelPicFront: INCBIN "pic/ymon/victreebel.pic" VictreebelPicBack: INCBIN "pic/monback/victreebelb.pic" - dr $3749e,$38000 +INCLUDE "engine/titlescreen2.asm" +INCLUDE "engine/slot_machine.asm" +INCLUDE "engine/game_corner_slots.asm" SECTION "bank0E",ROMX,BANK[$0E] @@ -4306,7 +4308,9 @@ SECTION "bank1E",ROMX,BANK[$1E] dr $78000,$78757 AnimationTileset2: ; 78757 (1e:4757) - dr $78757,$797af + dr $78757,$78c17 +SlotMachineTiles2: ; 78c17 (1e:4c17) + dr $78c17,$797af AnimationSubstitute: ; 797af (1e:57af) dr $797af,$79816 HideSubstituteShowMonAnim: ; 79816 (1e:5816) |