diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:49 -0700 |
| commit | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (patch) | |
| tree | 2ffb3b9c8eca5fc4e2be2fc8aaf4965f64a13296 /engine/hall_of_fame.asm | |
| parent | Merge pull request #13 from YamaArashi/master (diff) | |
| parent | more syncing with pokered (diff) | |
| download | pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.gz pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.xz pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.zip | |
Merge pull request #16 from YamaArashi/master
sync engine code with pokered
Diffstat (limited to 'engine/hall_of_fame.asm')
| -rwxr-xr-x | engine/hall_of_fame.asm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 59e97892..554893a9 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -33,8 +33,8 @@ AnimateHallOfFame: .skipInc ld a, $90 ld [hWY], a - ld c, $1f ; BANK(Music_HallOfFame) - ld a, $ca ; MUSIC_HALL_OF_FAME + ld c, BANK(Music_HallOfFame) + ld a, MUSIC_HALL_OF_FAME call PlayMusic ld hl, wPartySpecies ld c, $ff @@ -151,7 +151,7 @@ HoFShowMonOrPlayer: HoFDisplayAndRecordMonInfo: ld a, [wHoFPartyMonIndex] - ld hl, wPartyMonNicks ; wPartyMonNicks + ld hl, wPartyMonNicks call GetPartyMonName call HoFDisplayMonInfo ld a, [wHoFPartyMonIndex] @@ -197,7 +197,7 @@ HoFMonInfoText: next "TYPE2/@" HoFLoadPlayerPics: - ld de, RedPicFront ; $6ede + ld de, RedPicFront ld a, BANK(RedPicFront) call UncompressSpriteFromDE ld a,$0 @@ -218,7 +218,8 @@ HoFLoadPlayerPics: ld c, $1 HoFLoadMonPlayerPicTileIDs: - ld b, $0 +; c = base tile ID + ld b, 0 coord hl, 12, 5 predef_jump CopyTileIDsFromList |