diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-01-28 23:31:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-28 23:31:15 -0500 |
| commit | afb899016938d03911eaafb85c7caa1c67680210 (patch) | |
| tree | 26e5d73301ab16e060c4a16171e0a5aa3c47d732 /engine/events | |
| parent | Comment on size of union (diff) | |
| download | pokeyellow-afb899016938d03911eaafb85c7caa1c67680210.tar.gz pokeyellow-afb899016938d03911eaafb85c7caa1c67680210.tar.xz pokeyellow-afb899016938d03911eaafb85c7caa1c67680210.zip | |
Miscellaneous cleanup (#488)
Co-authored-by: SatoMew <SatoMew@users.noreply.github.com>
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/evolve_trade.asm | 4 | ||||
| -rw-r--r-- | engine/events/hidden_objects/vermilion_gym_trash.asm | 2 | ||||
| -rw-r--r-- | engine/events/in_game_trades.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/events/evolve_trade.asm b/engine/events/evolve_trade.asm index 56069fac..8daf2b05 100644 --- a/engine/events/evolve_trade.asm +++ b/engine/events/evolve_trade.asm @@ -1,4 +1,4 @@ -EvolveTradeMon: +InGameTrade_CheckForTradeEvo: ; Verify the TradeMon's species name before ; attempting to initiate a trade evolution. @@ -34,7 +34,7 @@ EvolveTradeMon: ld a, [wPartyCount] dec a ld [wWhichPokemon], a - ld a, $1 + ld a, TRUE ld [wForceEvolution], a ld a, LINK_STATE_TRADING ld [wLinkState], a diff --git a/engine/events/hidden_objects/vermilion_gym_trash.asm b/engine/events/hidden_objects/vermilion_gym_trash.asm index 92fb1406..28cb15a6 100644 --- a/engine/events/hidden_objects/vermilion_gym_trash.asm +++ b/engine/events/hidden_objects/vermilion_gym_trash.asm @@ -47,7 +47,7 @@ GymTrashScript: add hl, de ld a, [hli] -; There is a bug in this code. It should calculate a value in the range [0, 3] +; Bug: This code should calculate a value in the range [0, 3], ; but if the mask and random number don't have any 1 bits in common, then ; the result of the AND will be 0. When 1 is subtracted from that, the value ; will become $ff. This will result in 255 being added to hl, which will cause diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm index ce4ffe3c..228c6bf8 100644 --- a/engine/events/in_game_trades.asm +++ b/engine/events/in_game_trades.asm @@ -137,7 +137,7 @@ InGameTrade_DoTrade: ld [wMonDataLocation], a call AddPartyMon call InGameTrade_CopyDataToReceivedMon - callfar EvolveTradeMon + callfar InGameTrade_CheckForTradeEvo call ClearScreen call InGameTrade_RestoreScreen farcall RedrawMapView |