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/text_script.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/text_script.asm')
| -rw-r--r-- | home/text_script.asm | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/home/text_script.asm b/home/text_script.asm index b9c3c8e4..a6881dc5 100644 --- a/home/text_script.asm +++ b/home/text_script.asm @@ -146,15 +146,7 @@ DisplayPokemartDialogue:: call LoadItemList ld a, PRICEDITEMLISTMENU ld [wListMenuID], a - ldh a, [hLoadedROMBank] - push af - ld a, BANK(DisplayPokemartDialogue_) - ldh [hLoadedROMBank], a - ld [MBC1RomBank], a - call DisplayPokemartDialogue_ - pop af - ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + homecall DisplayPokemartDialogue_ jp AfterDisplayingTextID PokemartGreetingText:: @@ -185,15 +177,7 @@ DisplayPokemonCenterDialogue:: ldh [hItemPrice + 2], a inc hl - ldh a, [hLoadedROMBank] - push af - ld a, BANK(DisplayPokemonCenterDialogue_) - ldh [hLoadedROMBank], a - ld [MBC1RomBank], a - call DisplayPokemonCenterDialogue_ - pop af - ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + homecall DisplayPokemonCenterDialogue_ jp AfterDisplayingTextID DisplaySafariGameOverText:: |