From f3de3a20dfccb8a57cdf9feb860bf1e89a733f50 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 22 May 2016 21:02:18 -0400 Subject: Bank11 and 14 misc functions. --- main.asm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index e9064d2b..07cd0c41 100755 --- a/main.asm +++ b/main.asm @@ -645,10 +645,15 @@ INCLUDE "engine/menu/options.asm" SECTION "bank11",ROMX,BANK[$11] - dr $44000,$45077 -LoadSpinnerArrowTiles: ; 45077 (11:5077) - dr $45077,$48000 + 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] @@ -712,10 +717,13 @@ 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,$54000 + +INCLUDE "engine/overworld/card_key.asm" + +INCLUDE "engine/menu/prize_menu.asm" + +INCLUDE "engine/hidden_object_functions14.asm" + SECTION "bank15",ROMX,BANK[$15] -- cgit v1.3.1-sl0p