diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
| commit | e25a7148d0a78549de4f33fa72d519dcaf660e97 (patch) | |
| tree | 5fcc95934c26b1fc86345b10f2a5c80fa740d083 /engine/battle/bank_e_misc.asm | |
| parent | Use more *Coord (diff) | |
| parent | named town map stuff (diff) | |
| download | pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.gz pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.xz pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.zip | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/town_map.asm
Diffstat (limited to 'engine/battle/bank_e_misc.asm')
| -rwxr-xr-x | engine/battle/bank_e_misc.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/bank_e_misc.asm index 80fa971a..2f3944e9 100755 --- a/engine/battle/bank_e_misc.asm +++ b/engine/battle/bank_e_misc.asm @@ -53,29 +53,29 @@ FormatMovesString: ; 39b87 (e:5b87) ; XXX this is called in a few places, but it doesn't appear to do anything useful InitList: ; 39bd5 (e:5bd5) - ld a, [wd11b] - cp $1 + ld a, [wInitListType] + cp INIT_ENEMYOT_LIST jr nz, .notEnemy ld hl, wEnemyPartyCount ld de, wEnemyMonOT ld a, ENEMYOT_NAME jr .done .notEnemy - cp $4 + cp INIT_PLAYEROT_LIST jr nz, .notPlayer ld hl, wPartyCount ld de, wPartyMonOT ld a, PLAYEROT_NAME jr .done .notPlayer - cp $5 + cp INIT_MON_LIST jr nz, .notMonster ld hl, wStringBuffer2 + 11 ld de, MonsterNames ld a, MONSTER_NAME jr .done .notMonster - cp $2 + cp INIT_BAG_ITEM_LIST jr nz, .notBag ld hl, wNumBagItems ld de, ItemNames |