diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/tmhm2.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/tmhm2.asm')
| -rwxr-xr-x | engine/tmhm2.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm index 8d19aaf81..c111fa7f9 100755 --- a/engine/tmhm2.asm +++ b/engine/tmhm2.asm @@ -23,7 +23,7 @@ TMHMPocket: ; 2c76f (b:476f) .ConvertItemToTMHMNumber: ; 2c798 (b:4798) ld a, [CurItem] ld c, a - callab GetNumberedTMHM + callfar GetNumberedTMHM ld a, c ld [CurItem], a ret @@ -31,7 +31,7 @@ TMHMPocket: ; 2c76f (b:476f) ConvertCurItemIntoCurTMHM: ; 2c7a7 (b:47a7) ld a, [CurItem] ld c, a - callab GetTMHMNumber + callfar GetTMHMNumber ld a, c ld [wCurTMHM], a ret @@ -77,18 +77,18 @@ ChooseMonToLearnTMHM: ; 2c7fb call CopyBytes call ClearBGPalettes ChooseMonToLearnTMHM_NoRefresh: ; 2c80a - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuGFX + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuGFX ld a, PARTYMENUACTION_TEACH_TMHM ld [PartyMenuActionText], a .loopback - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText call WaitBGMap call SetPalettes call DelayFrame - callba PartyMenuSelect + farcall PartyMenuSelect push af ld a, [CurPartySpecies] cp EGG @@ -138,7 +138,7 @@ TeachTMHM: ; 2c867 jr .nope .compatible - callab KnowsMove + callfar KnowsMove jr c, .nope predef LearnMove @@ -146,13 +146,13 @@ TeachTMHM: ; 2c867 and a jr z, .nope - callba TrainerRankings_TMsHMsTaught + farcall TrainerRankings_TMsHMsTaught ld a, [CurItem] call IsHM ret c ld c, HAPPINESS_LEARNMOVE - callab ChangeHappiness + callfar ChangeHappiness call ConsumeTM jr .learned_move |