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

Rename some labels

Browse Source 
- Remove "Buffer" suffix from some byte and word quantities
- Change "Ptr" to "Pointer"

Fixes #789
This commit is contained in:
Rangi
2020-12-23 16:29:30 -05:00
parent 1a054661ec
commit 99e66c2557
106 changed files with 584 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
engine/events/npc_trade.asm
View File

@@ -21,7 +21,7 @@ NPCTrade::
jr c, .done
ld e, NPCTRADE_GIVEMON
call GetTradeAttribute
call GetTradeAttr
ld a, [wCurPartySpecies]
cp [hl]
ld a, TRADE_DIALOG_WRONG
@@ -72,7 +72,7 @@ CheckTradeGender:
ld [wMonType], a
ld e, NPCTRADE_GENDER
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
and a ; TRADE_GENDER_EITHER
jr z, .matching
@@ -106,19 +106,19 @@ TradeFlagAction:
Trade_GetDialog:
ld e, NPCTRADE_DIALOG
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
ld [wTradeDialog], a
ret
DoNPCTrade:
ld e, NPCTRADE_GIVEMON
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
ld [wPlayerTrademonSpecies], a
ld e, NPCTRADE_GETMON
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
ld [wOTTrademonSpecies], a
@@ -164,7 +164,7 @@ DoNPCTrade:
ld [wPlayerTrademonCaughtData], a
ld e, NPCTRADE_DIALOG
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
cp TRADE_DIALOGSET_GIRL
ld a, CAUGHT_BY_GIRL
@@ -187,7 +187,7 @@ DoNPCTrade:
predef TryAddMonToParty
ld e, NPCTRADE_DIALOG
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
cp TRADE_DIALOGSET_GIRL
ld b, CAUGHT_BY_UNKNOWN
@@ -197,7 +197,7 @@ DoNPCTrade:
farcall SetGiftPartyMonCaughtData
ld e, NPCTRADE_NICK
call GetTradeAttribute
call GetTradeAttr
ld de, wOTTrademonNickname
call CopyTradeName
@@ -208,7 +208,7 @@ DoNPCTrade:
call CopyTradeName
ld e, NPCTRADE_OT_NAME
call GetTradeAttribute
call GetTradeAttr
push hl
ld de, wOTTrademonOTName
call CopyTradeName
@@ -223,7 +223,7 @@ DoNPCTrade:
call CopyTradeName
ld e, NPCTRADE_DVS
call GetTradeAttribute
call GetTradeAttr
ld de, wOTTrademonDVs
call Trade_CopyTwoBytes
@@ -234,7 +234,7 @@ DoNPCTrade:
call Trade_CopyTwoBytes
ld e, NPCTRADE_OT_ID
call GetTradeAttribute
call GetTradeAttr
ld de, wOTTrademonID + 1
call Trade_CopyTwoBytesReverseEndian
@@ -245,7 +245,7 @@ DoNPCTrade:
call Trade_CopyTwoBytes
ld e, NPCTRADE_ITEM
call GetTradeAttribute
call GetTradeAttr
push hl
ld hl, wPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH
@@ -272,7 +272,7 @@ DoNPCTrade:
pop af
ret
GetTradeAttribute:
GetTradeAttr:
ld d, 0
push de
ld a, [wJumptableIndex]
@@ -302,7 +302,7 @@ Trade_GetAttributeOfLastPartymon:
GetTradeMonName:
push de
ld [wNamedObjectIndexBuffer], a
ld [wNamedObjectIndex], a
call GetBasePokemonName
ld hl, wStringBuffer1
pop de
@@ -345,7 +345,7 @@ Trade_CopyTwoBytesReverseEndian:
GetTradeMonNames:
ld e, NPCTRADE_GETMON
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
call GetTradeMonName
@@ -353,7 +353,7 @@ GetTradeMonNames:
call CopyTradeName
ld e, NPCTRADE_GIVEMON
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
call GetTradeMonName
@@ -369,7 +369,7 @@ GetTradeMonNames:
dec hl
push hl
ld e, NPCTRADE_GENDER
call GetTradeAttribute
call GetTradeAttr
ld a, [hl]
pop hl
and a ; TRADE_GENDER_EITHER