diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-06 00:04:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 00:04:14 -0500 |
| commit | 08ddbe843b6d29c0901ff5f0862cbb5a57b557d7 (patch) | |
| tree | 3b2ee96b21423a65b6b0e32766dc44e689a4742e /engine | |
| parent | 7a2a20528136b9a2452a313cd50c46a45f9a5cb0 (diff) | |
| parent | f619e84e4f6cd24cd4a089da58625d54ad6b3ab1 (diff) | |
Merge pull request #403 from mid-kid/master
mid-kid's patches: The Experience
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/npctrade.asm | 2 | ||||
| -rw-r--r-- | engine/pack.asm | 2 | ||||
| -rwxr-xr-x | engine/startmenu.asm | 2 | ||||
| -rwxr-xr-x | engine/tmhm2.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/npctrade.asm b/engine/npctrade.asm index f28734ea9..01631d051 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -39,7 +39,7 @@ NPCTrade:: ; fcba8 jr c, .done ; Select givemon from party - ld b, 6 + ld b, PARTYMENUACTION_GIVE_MON callba SelectTradeOrDaycareMon ld a, TRADE_CANCEL jr c, .done diff --git a/engine/pack.asm b/engine/pack.asm index 8a63d22e5..dad9a799d 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -603,7 +603,7 @@ GiveItem: ; 103fd push af res NO_TEXT_SCROLL, a ld [Options], a - ld a, $8 + ld a, PARTYMENUACTION_GIVE_ITEM ld [PartyMenuActionText], a call ClearBGPalettes callba LoadPartyMenuGFX diff --git a/engine/startmenu.asm b/engine/startmenu.asm index a935b8a07..32999cacb 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -745,7 +745,7 @@ SwitchPartyMons: ; 12aec callba HoldSwitchmonIcon callba InitPartyMenuNoCancel - ld a, 4 + ld a, PARTYMENUACTION_MOVE ld [PartyMenuActionText], a callba WritePartyMenuTilemap callba PrintPartyMenuText diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm index 6e32fdae8..8d19aaf81 100755 --- a/engine/tmhm2.asm +++ b/engine/tmhm2.asm @@ -80,7 +80,7 @@ ChooseMonToLearnTMHM_NoRefresh: ; 2c80a callba LoadPartyMenuGFX callba InitPartyMenuWithCancel callba InitPartyMenuGFX - ld a, $3 ; TeachWhichPKMNString + ld a, PARTYMENUACTION_TEACH_TMHM ld [PartyMenuActionText], a .loopback callba WritePartyMenuTilemap |