diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:02 -0500 |
| commit | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (patch) | |
| tree | ab357b894c9457b3d1d38fd49300df34412168f8 /home/pokemon.asm | |
| parent | Merge pull request #59 from Rangi42/master (diff) | |
| parent | Sync more with pokered (diff) | |
| download | pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.gz pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.xz pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.zip | |
Merge pull request #60 from Rangi42/master
Organize home and macro code
Diffstat (limited to 'home/pokemon.asm')
| -rw-r--r-- | home/pokemon.asm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/home/pokemon.asm b/home/pokemon.asm index 3e08906f..8e304fd3 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -5,7 +5,6 @@ DrawHPBar:: push hl push de - ;push bc ; Left ld a, $71 ; "HP:" @@ -61,7 +60,6 @@ DrawHPBar:: add e ld [hl], a .done - ;pop bc pop de pop hl ret @@ -124,7 +122,8 @@ LoadFrontSpriteByMonIndex:: pop hl ldh a, [hLoadedROMBank] push af - switchbank CopyUncompressedPicToHL + ld a, BANK(CopyUncompressedPicToHL) + call BankswitchCommon xor a ldh [hStartTileID], a call CopyUncompressedPicToHL @@ -355,7 +354,7 @@ PrintStatusCondition:: ret PrintStatusConditionNotFainted:: - homecall_jump_sf PrintStatusAilment + homejp_sf PrintStatusAilment ; function to print pokemon level, leaving off the ":L" if the level is at least 100 ; INPUT: @@ -404,7 +403,8 @@ GetwMoves:: GetMonHeader:: ldh a, [hLoadedROMBank] push af - switchbank BaseStats + ld a, BANK(BaseStats) + call BankswitchCommon push bc push de push hl @@ -423,8 +423,6 @@ GetMonHeader:: ld b, $77 ; size of Aerodactyl fossil sprite cp FOSSIL_AERODACTYL ; Aerodactyl fossil jr z, .specialID - ;cp MEW - ;jr z, .mew predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a, [wd11e] dec a |