thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack

Browse source
This commit is contained in:
MementoMartha 2023-04-09 16:56:39 +01:00
parent 3d7d98c894 7c6ccdde26
commit 56793e1d11
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
engine/events/in_game_trades.asm
View file

@ -57,9 +57,9 @@ DoInGameTradeDialogue:
jr nz, .printText
call InGameTrade_DoTrade
jr c, .printText
ld a, [wInGameTradeGiveMonSpecies]
cp NO_MON
jr z, .printText
ld a, [wInGameTradeGiveMonSpecies]; for trader
cp NO_MON ; for trader
jr z, .printText ; for trader
ld hl, TradedForText
call PrintText
.printText
@ -101,23 +101,23 @@ InGameTrade_DoTrade:
ld a, $1
jp c, .tradeFailed ; jump if the player didn't select a pokemon
ld a, [wInGameTradeGiveMonSpecies]
cp NO_MON
jr z, .skip_mon_check
cp NO_MON ; for trader
jr z, .skip_mon_check ; for trader
ld b, a
ld a, [wcf91]
cp b
ld a, $2
jp nz, .tradeFailed ; jump if the selected mon's species is not the required one
.skip_mon_check
jp nz, .tradeFailed ; jump if the selected mon's species is not the required one - changed for trader
.skip_mon_check ; for trader
ld a, [wWhichPokemon]
ld hl, wPartyMon1Level
ld bc, wPartyMon2 - wPartyMon1
call AddNTimes
ld a, [hl]
ld [wCurEnemyLVL], a
ld a, [wInGameTradeGiveMonSpecies]
cp NO_MON
jr z, .skip_flag_set
ld a, [wInGameTradeGiveMonSpecies] ; for trader
cp NO_MON ; for trader
jr z, .skip_flag_set ; for trader
ld hl, wCompletedInGameTradeFlags
ld a, [wWhichTrade]
ld c, a
@ -131,14 +131,14 @@ InGameTrade_DoTrade:
ld a, [wCurEnemyLVL]
push af
call LoadHpBarAndStatusTilePatterns
ld a, [wInGameTradeGiveMonSpecies]
cp NO_MON
jr nz, .normal_in_game_trade_data
call TradeSelf_PrepareTradeData
jr .self_trade_data
.normal_in_game_trade_data
ld a, [wInGameTradeGiveMonSpecies] ; for trader
cp NO_MON ; for trader
jr nz, .normal_in_game_trade_data ; for trader
call TradeSelf_PrepareTradeData ; for trader
jr .self_trade_data ; for trader
.normal_in_game_trade_data ; for trader
call InGameTrade_PrepareTradeData
.self_trade_data
.self_trade_data ; for trader
predef InternalClockTradeAnim
pop af
ld [wCurEnemyLVL], a
@ -148,9 +148,9 @@ InGameTrade_DoTrade:
ld [wcf91], a
xor a
push af
ld a, [wInGameTradeGiveMonSpecies]
cp NO_MON
jr z, .skip_swap_mons
ld a, [wInGameTradeGiveMonSpecies] ; for trader
cp NO_MON ; for trader
jr z, .skip_swap_mons ; for trader
pop af
ld [wRemoveMonFromBox], a
call RemovePokemon