Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Identify more WRAM labels, and start a <X>_DummyFunction label convention

Browse Source
This commit is contained in:
Rangi
2020-10-28 13:35:39 -04:00
parent 6d333bed5f
commit ea426a8879
42 changed files with 255 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
engine/events/npc_trade.asm
View File

@@ -56,11 +56,12 @@ NPCTrade::
call DisableSpriteUpdates
ld a, [wJumptableIndex]
push af
ld a, [wcf64]
; wTradeDialog aliases wFrameCounter, which TradeAnimation uses
ld a, [wTradeDialog]
push af
predef TradeAnimation
pop af
ld [wcf64], a
ld [wTradeDialog], a
pop af
ld [wJumptableIndex], a
call ReturnToMapWithSpeechTextbox
@@ -107,7 +108,7 @@ Trade_GetDialog:
ld e, NPCTRADE_DIALOG
call GetTradeAttribute
ld a, [hl]
ld [wcf64], a
ld [wTradeDialog], a
ret
DoNPCTrade:
@@ -392,7 +393,7 @@ PrintTradeText:
ld bc, 2 * 4
ld hl, TradeTexts
call AddNTimes
ld a, [wcf64]
ld a, [wTradeDialog]
ld c, a
add hl, bc
add hl, bc