diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-22 21:05:51 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-22 21:05:51 -0400 |
| commit | 980ce8005df3ff2c2d008f3fe2c36ed357b2a2cb (patch) | |
| tree | 745646bc2baccb60da67d83e3428f4d62cd923c3 /main.asm | |
| parent | engine/printer.asm (diff) | |
| parent | Bank11 and 14 misc functions. (diff) | |
| download | pokeyellow-980ce8005df3ff2c2d008f3fe2c36ed357b2a2cb.tar.gz pokeyellow-980ce8005df3ff2c2d008f3fe2c36ed357b2a2cb.tar.xz pokeyellow-980ce8005df3ff2c2d008f3fe2c36ed357b2a2cb.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -676,10 +676,15 @@ INCLUDE "engine/menu/options.asm" SECTION "bank11",ROMX,BANK[$11] - dr $44000,$45077 -LoadSpinnerArrowTiles: ; 45077 (11:5077) - dr $45077,$46c12 + dr $44000,$44169 + +INCLUDE "engine/pokedex_rating.asm" + dr $44251,$45077 +LoadSpinnerArrowTiles: ; 45077 (11:5077) + dr $45077,$46bf3 + +INCLUDE "engine/overworld/dungeon_warps.asm" SECTION "bank12",ROMX,BANK[$12] @@ -743,10 +748,11 @@ JessieJamesPic: INCBIN "pic/ytrainer/jessiejames.pic" SECTION "bank14",ROMX,BANK[$14] dr $50000,$525d8 -PrintCardKeyText: ; 525d8 (14:65d8) - dr $525d8,$5267d -CeladonPrizeMenu: ; 5267d (14:667d) - dr $5267d,$529a2 +INCLUDE "engine/overworld/card_key.asm" + +INCLUDE "engine/menu/prize_menu.asm" + +INCLUDE "engine/hidden_object_functions14.asm" SECTION "bank15",ROMX,BANK[$15] |