diff options
| author | dannye <33dannye@gmail.com> | 2020-11-14 21:46:05 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-14 21:54:23 -0600 |
| commit | 48dc6a8cf4da512273e79e49346b35dcc225f773 (patch) | |
| tree | 52ca406cccaf728156d4d0f43d77b93ba0d75da4 /engine/battle | |
| parent | b88572fbccecc8d125fe8a50365751f0530d1a9a (diff) | |
| parent | 66377fca32c63ca9e362d2d2ce15f0692260ce53 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle')
| -rw-r--r--[-rwxr-xr-x] | engine/battle/animations.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/battle/core.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/battle/end_of_battle.asm | 0 | ||||
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/battle/misc.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/battle/read_trainer_party.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/battle/safari_zone.asm | 0 |
7 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 4110e8b6..4110e8b6 100755..100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 415b287c..415b287c 100755..100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index e64f54e7..e64f54e7 100755..100644 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 76d89ba9..fd21b29e 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -77,7 +77,7 @@ CopyMonPicFromBGToSpriteVRAM: ld [hli], a ld a, d ld [hli], a - ld a, OAM_OBP1 | 4 + ld a, OAM_OBP1 | OAM_HIGH_PALS ld [hli], a inc d dec c diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index df9145f2..df9145f2 100755..100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 02fbfeda..02fbfeda 100755..100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index a61f402f..a61f402f 100755..100644 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm |