diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-29 14:53:57 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-29 14:53:57 -0500 |
| commit | f0915e2b664f3c045cdea710aeced219396db8bb (patch) | |
| tree | 791dd3a4cc749f482593f2bd3746f904304430d0 /engine/overworld/pokecenter.asm | |
| parent | Start disassembling bank0F (Battle) (diff) | |
| download | pokeyellow-f0915e2b664f3c045cdea710aeced219396db8bb.tar.gz pokeyellow-f0915e2b664f3c045cdea710aeced219396db8bb.tar.xz pokeyellow-f0915e2b664f3c045cdea710aeced219396db8bb.zip | |
More BankF documentation
Also introduce bit direction constants and setpal macros
Diffstat (limited to 'engine/overworld/pokecenter.asm')
| -rwxr-xr-x | engine/overworld/pokecenter.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 9cedd99d..779d852c 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -25,7 +25,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) and a jp nz, .declinedHealing ; if the player chose No call SetLastBlackoutMap - callab IsPikachuInOurParty + callab IsStarterPikachuInOurParty jr nc, .notHealingPlayerPikachu call Func_154a jr nz, .notHealingPlayerPikachu @@ -41,7 +41,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call Func_154a jr nz, .playerPikachuNotOnScreen call Func_152d - callab IsPikachuInOurParty + callab IsStarterPikachuInOurParty call c, Func_6eaa .playerPikachuNotOnScreen lb bc, 1, 8 @@ -60,7 +60,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call PlaySound call Func_154a jr nz, .doNotReturnPikachu - callab IsPikachuInOurParty + callab IsStarterPikachuInOurParty call c, Func_6eaa ld a, $5 ld [wd431], a @@ -70,7 +70,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call Func_6ebb ld hl, PokemonFightingFitText call PrintText - callab IsPikachuInOurParty + callab IsStarterPikachuInOurParty jr nc, .notInParty lb bc, 15, 0 call Func_6ebb |