diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:37:53 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:37:53 -0500 |
| commit | cd649184f556db777d592671a7274bfa4a8423d7 (patch) | |
| tree | dca56b6c0accb03b4256268faaee2705d373b933 /engine/battle/bank_e_misc.asm | |
| parent | Mention Jap grammar (diff) | |
| download | pokeyellow-cd649184f556db777d592671a7274bfa4a8423d7.tar.gz pokeyellow-cd649184f556db777d592671a7274bfa4a8423d7.tar.xz pokeyellow-cd649184f556db777d592671a7274bfa4a8423d7.zip | |
Rename/organize part 1 of 4
rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github
Diffstat (limited to 'engine/battle/bank_e_misc.asm')
| -rwxr-xr-x | engine/battle/bank_e_misc.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/bank_e_misc.asm index 6ef4065f..80fa971a 100755 --- a/engine/battle/bank_e_misc.asm +++ b/engine/battle/bank_e_misc.asm @@ -52,40 +52,40 @@ FormatMovesString: ; 39b87 (e:5b87) ret ; XXX this is called in a few places, but it doesn't appear to do anything useful -Func_39bd5: ; 39bd5 (e:5bd5) +InitList: ; 39bd5 (e:5bd5) ld a, [wd11b] cp $1 - jr nz, .asm_39be6 + jr nz, .notEnemy ld hl, wEnemyPartyCount ld de, wEnemyMonOT ld a, ENEMYOT_NAME - jr .asm_39c18 -.asm_39be6 + jr .done +.notEnemy cp $4 - jr nz, .calcAttackStat4 + jr nz, .notPlayer ld hl, wPartyCount ld de, wPartyMonOT ld a, PLAYEROT_NAME - jr .asm_39c18 -.calcAttackStat4 + jr .done +.notPlayer cp $5 - jr nz, .asm_39c02 + jr nz, .notMonster ld hl, wStringBuffer2 + 11 ld de, MonsterNames ld a, MONSTER_NAME - jr .asm_39c18 -.asm_39c02 + jr .done +.notMonster cp $2 - jr nz, .asm_39c10 + jr nz, .notBag ld hl, wNumBagItems ld de, ItemNames ld a, ITEM_NAME - jr .asm_39c18 -.asm_39c10 + jr .done +.notBag ld hl, wStringBuffer2 + 11 ld de, ItemNames ld a, ITEM_NAME -.asm_39c18 +.done ld [wNameListType], a ld a, l ld [wList], a |