diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-04-09 18:13:37 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-04-09 18:13:37 -0400 |
| commit | 3caf9a43e308af32ba23fd672ba662d2ea4c091e (patch) | |
| tree | 92d28ef34fbeeb6fddf0ef404db3de7b535305ca /engine/battle | |
| parent | Complete documentation of bank1e (diff) | |
| download | pokeyellow-3caf9a43e308af32ba23fd672ba662d2ea4c091e.tar.gz pokeyellow-3caf9a43e308af32ba23fd672ba662d2ea4c091e.tar.xz pokeyellow-3caf9a43e308af32ba23fd672ba662d2ea4c091e.zip | |
Some Bank3F Pikachu Emotions disassembling and partial documentation.
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/common_text.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index f357f695..a09241d4 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -11,7 +11,7 @@ PrintBeginningBattleText: ; f4000 (3d:4000) ld a,[wBattleType] cp $4 ; new battle type? jr nz,.notnewbattletype - callab Func_fd0d0 + callab IsPlayerPikachuAsleepInParty ld e,$24 jr c,.asm_f4026 ld e,$a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 028d332d..b69a88c5 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1899,7 +1899,7 @@ SendOutMon: ; 3ccfb (f:4cfb) ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a callab Func_f429f - callab Func_fd0d0 + callab IsPlayerPikachuAsleepInParty ld e, $24 jr c, .asm_3cd81 ld e, $a |