diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
| commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
| tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /engine/battle/bank3d_battle.asm | |
| parent | Is this an OAM printer? (diff) | |
| parent | Clean up main.asm (diff) | |
| download | pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.gz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.xz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/battle/bank3d_battle.asm')
| -rw-r--r-- | engine/battle/bank3d_battle.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm index 4fd37bc4..2b2809d9 100644 --- a/engine/battle/bank3d_battle.asm +++ b/engine/battle/bank3d_battle.asm @@ -166,7 +166,7 @@ _LoadTrainerPic: ; f615a (3d:615a) ld a, $77 ld c, a jp LoadUncompressedSpriteData - + LoadMonBackPic: ; f6178 (3d:6178) ; Assumes the monster's attributes have ; been loaded with GetMonHeader. @@ -186,7 +186,7 @@ LoadMonBackPic: ; f6178 (3d:6178) ld a, [H_LOADEDROMBANK] ld b, a jp CopyVideoData - + AnimateSendingOutMon: ; f61a6 (3d:f61a6) ld a, [wPredefRegisters] ld h, a @@ -256,7 +256,7 @@ CopyUncompressedPicToHL: ; f6203 (3d:6203) dec b jr nz, .asm_f6211 ret - + .asm_f6220 push bc ld b, $0 @@ -279,7 +279,7 @@ CopyUncompressedPicToHL: ; f6203 (3d:6203) dec b jr nz, .asm_f6227 ret - + INCLUDE "engine/battle/init_battle_variables.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" INCLUDE "engine/battle/moveEffects/heal_effect.asm" |