diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:03 -0500 |
| commit | d3f13528754b985e892385dbd88c3c9a95681f1b (patch) | |
| tree | 4a18885606996ff59bb714afb5db9a548e2f94a7 /home/move_mon.asm | |
| parent | abaf9fee7c73e708ef8c3e7a1ed710bfc9ec6f6e (diff) | |
| parent | e16dec874a239c162680b169391d3c0c7ee1fc70 (diff) | |
Merge pull request #301 from Rangi42/master
Sync home and macro code with pokeyellow
Diffstat (limited to 'home/move_mon.asm')
| -rw-r--r-- | home/move_mon.asm | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/home/move_mon.asm b/home/move_mon.asm index 3e69e6d0..c766fbd5 100644 --- a/home/move_mon.asm +++ b/home/move_mon.asm @@ -231,27 +231,9 @@ CalcStat:: ret AddEnemyMonToPlayerParty:: - ldh a, [hLoadedROMBank] - push af - ld a, BANK(_AddEnemyMonToPlayerParty) - ldh [hLoadedROMBank], a - ld [MBC1RomBank], a - call _AddEnemyMonToPlayerParty - pop bc - ld a, b - ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + homecall_sf _AddEnemyMonToPlayerParty ret MoveMon:: - ldh a, [hLoadedROMBank] - push af - ld a, BANK(_MoveMon) - ldh [hLoadedROMBank], a - ld [MBC1RomBank], a - call _MoveMon - pop bc - ld a, b - ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + homecall_sf _MoveMon ret |