diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
| commit | ce3ec76762d9e2f0c560e2ea7868678418883143 (patch) | |
| tree | 13bd307196f870d59157ab803c858c205eba6921 /engine/hall_of_fame.asm | |
| parent | 604eb493c42b457f9e006e2cf67f29c15e0d1d0b (diff) | |
| parent | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow into merge-pokeredmerge-pokered
Diffstat (limited to 'engine/hall_of_fame.asm')
| -rwxr-xr-x | engine/hall_of_fame.asm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index acd22ffe..61ed65c8 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] @@ -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 |