From cc8c36ee149b287b7a1cabb85abb4bf42873a3b2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Nov 2015 18:59:49 -0500 Subject: Creation of constants for OBJECT_09 indices --- engine/mart.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/mart.asm') diff --git a/engine/mart.asm b/engine/mart.asm index 2c3dac0e7..81ab22d12 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -29,7 +29,7 @@ MartDialog: ; 15a61 ld a, 0 ld [EngineBuffer1], a xor a - ld [MovementAnimation], a + ld [EngineBuffer5], a call StandardMart ret ; 15a6e @@ -129,7 +129,7 @@ LoadMartPointer: ; 15b10 ld bc, 16 call ByteFill xor a - ld [MovementAnimation], a + ld [EngineBuffer5], a ld [wBargainShopFlags], a ld [FacingDirection], a ret @@ -157,10 +157,10 @@ endr StandardMart: ; 15b47 .loop - ld a, [MovementAnimation] + ld a, [EngineBuffer5] ld hl, .MartFunctions rst JumpTable - ld [MovementAnimation], a + ld [EngineBuffer5], a cp $ff jr nz, .loop ret -- cgit v1.2.3 From 0b8fe4bac31c83a8164567da6d7889a18ab3eb4b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 16 Nov 2015 22:29:54 -0500 Subject: More specials; bank 12 mobile --- engine/mart.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/mart.asm') diff --git a/engine/mart.asm b/engine/mart.asm index 81ab22d12..8fa7888c2 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -470,7 +470,7 @@ endr BuyMenuLoop: ; 15cef - callba Function24ae8 + callba PlaceMoneyTopRightOW call UpdateSprites ld hl, MenuDataHeader_Buy call CopyMenuDataHeader @@ -875,7 +875,7 @@ Function15ee0: ; 15ee0 .okay_to_sell ld hl, Text_Mart_SellHowMany call PrintText - callba Function24af8 + callba PlaceMoneyTopRightMenu callba Function24fe1 call ExitMenu jr c, .declined @@ -899,7 +899,7 @@ Function15ee0: ; 15ee0 ld hl, Text_Mart_SoldForAmount call PrintTextBoxText call PlayTransactionSound - callba Function24af0 + callba PlaceMoneyBottomLeftOW call JoyWaitAorB .declined -- cgit v1.2.3 From 27ef600ace40671a78f5bb3a71f507e42c175f50 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 17 Nov 2015 17:56:49 -0500 Subject: Here's the mail it never fails --- engine/mart.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/mart.asm') diff --git a/engine/mart.asm b/engine/mart.asm index 8fa7888c2..2aa410760 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -377,7 +377,7 @@ BuyMenu: ; 15c62 .loop call BuyMenuLoop ; menu loop jr nc, .loop - call Function2b3c + call ReturnToCallingMenu ret ; 15c7d -- cgit v1.2.3 From d972564175bcee324877f1e016fafd349c50e7d3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Nov 2015 16:04:53 -0500 Subject: link and seer labels --- engine/mart.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/mart.asm') diff --git a/engine/mart.asm b/engine/mart.asm index 2aa410760..87c805c25 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -477,9 +477,9 @@ BuyMenuLoop: ; 15cef ld a, [wd045] ld [wMenuCursorBuffer], a ld a, [wd045 + 1] - ld [wd0e4], a + ld [wMenuScrollPosition], a call HandleScrollingMenu - ld a, [wd0e4] + ld a, [wMenuScrollPosition] ld [wd045 + 1], a ld a, [MenuSelection2] ld [wd045], a @@ -658,7 +658,7 @@ MenuDataHeader_Buy: ; 0x15e18 dbw 0, CurMart dba PlaceMenuItemName dba .PrintBCDPrices - dba Function244c3 + dba UpdateItemDescription ; 15e30 .PrintBCDPrices: ; 15e30 -- cgit v1.2.3