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

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
engine/events/npc_trade.asm
View File

@@ -22,7 +22,7 @@ NPCTrade:: ; fcba8
ld e, NPCTRADE_GIVEMON
call GetTradeAttribute
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
cp [hl]
ld a, TRADE_DIALOG_WRONG
jr nz, .done
@@ -70,7 +70,7 @@ NPCTrade:: ; fcba8
CheckTradeGender: ; fcc23
xor a
ld [MonType], a
ld [wMonType], a
ld e, NPCTRADE_GENDER
call GetTradeAttribute
@@ -136,29 +136,29 @@ DoNPCTrade: ; fcc63
call GetTradeMonName
call CopyTradeName
ld hl, PartyMonOT
ld hl, wPartyMonOT
ld bc, NAME_LENGTH
call Trade_GetAttributeOfCurrentPartymon
ld de, wPlayerTrademonOTName
call CopyTradeName
ld hl, PlayerName
ld hl, wPlayerName
ld de, wPlayerTrademonSenderName
call CopyTradeName
ld hl, PartyMon1ID
ld hl, wPartyMon1ID
ld bc, PARTYMON_STRUCT_LENGTH
call Trade_GetAttributeOfCurrentPartymon
ld de, wPlayerTrademonID
call Trade_CopyTwoBytes
ld hl, PartyMon1DVs
ld hl, wPartyMon1DVs
ld bc, PARTYMON_STRUCT_LENGTH
call Trade_GetAttributeOfCurrentPartymon
ld de, wPlayerTrademonDVs
call Trade_CopyTwoBytes
ld hl, PartyMon1Species
ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
call Trade_GetAttributeOfCurrentPartymon
ld b, h
@@ -177,15 +177,15 @@ DoNPCTrade: ; fcc63
.okay
ld [wOTTrademonCaughtData], a
ld hl, PartyMon1Level
ld hl, wPartyMon1Level
ld bc, PARTYMON_STRUCT_LENGTH
call Trade_GetAttributeOfCurrentPartymon
ld a, [hl]
ld [CurPartyLevel], a
ld [wCurPartyLevel], a
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
xor a
ld [MonType], a
ld [wMonType], a
ld [wPokemonWithdrawDepositParameter], a
callfar RemoveMonFromPartyOrBox
predef TryAddMonToParty
@@ -205,7 +205,7 @@ DoNPCTrade: ; fcc63
ld de, wOTTrademonNickname
call CopyTradeName
ld hl, PartyMonNicknames
ld hl, wPartyMonNicknames
ld bc, MON_NAME_LENGTH
call Trade_GetAttributeOfLastPartymon
ld hl, wOTTrademonNickname
@@ -220,7 +220,7 @@ DoNPCTrade: ; fcc63
ld de, wOTTrademonSenderName
call CopyTradeName
ld hl, PartyMonOT
ld hl, wPartyMonOT
ld bc, NAME_LENGTH
call Trade_GetAttributeOfLastPartymon
ld hl, wOTTrademonOTName
@@ -231,7 +231,7 @@ DoNPCTrade: ; fcc63
ld de, wOTTrademonDVs
call Trade_CopyTwoBytes
ld hl, PartyMon1DVs
ld hl, wPartyMon1DVs
ld bc, PARTYMON_STRUCT_LENGTH
call Trade_GetAttributeOfLastPartymon
ld hl, wOTTrademonDVs
@@ -242,7 +242,7 @@ DoNPCTrade: ; fcc63
ld de, wOTTrademonID + 1
call Trade_CopyTwoBytesReverseEndian
ld hl, PartyMon1ID
ld hl, wPartyMon1ID
ld bc, PARTYMON_STRUCT_LENGTH
call Trade_GetAttributeOfLastPartymon
ld hl, wOTTrademonID
@@ -251,7 +251,7 @@ DoNPCTrade: ; fcc63
ld e, NPCTRADE_ITEM
call GetTradeAttribute
push hl
ld hl, PartyMon1Item
ld hl, wPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH
call Trade_GetAttributeOfLastPartymon
pop hl
@@ -262,14 +262,14 @@ DoNPCTrade: ; fcc63
push bc
push de
push hl
ld a, [CurPartyMon]
ld a, [wCurPartyMon]
push af
ld a, [PartyCount]
ld a, [wPartyCount]
dec a
ld [CurPartyMon], a
ld [wCurPartyMon], a
farcall ComputeNPCTrademonStats
pop af
ld [CurPartyMon], a
ld [wCurPartyMon], a
pop hl
pop de
pop bc
@@ -295,13 +295,13 @@ GetTradeAttribute: ; 0xfcdc2
; 0xfcdd7
Trade_GetAttributeOfCurrentPartymon: ; fcdd7
ld a, [CurPartyMon]
ld a, [wCurPartyMon]
call AddNTimes
ret
; fcdde
Trade_GetAttributeOfLastPartymon: ; fcdde
ld a, [PartyCount]
ld a, [wPartyCount]
dec a
call AddNTimes
ld e, l
@@ -313,7 +313,7 @@ GetTradeMonName: ; fcde8
push de
ld [wd265], a
call GetBasePokemonName
ld hl, StringBuffer1
ld hl, wStringBuffer1
pop de
ret
; fcdf4
@@ -364,7 +364,7 @@ GetTradeMonNames: ; fce1b
ld a, [hl]
call GetTradeMonName
ld de, StringBuffer2
ld de, wStringBuffer2
call CopyTradeName
ld e, NPCTRADE_GIVEMON
@@ -375,7 +375,7 @@ GetTradeMonNames: ; fce1b
ld de, wMonOrItemNameBuffer
call CopyTradeName
ld hl, StringBuffer1
ld hl, wStringBuffer1
.loop
ld a, [hli]
cp "@"