diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-14 04:12:40 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-14 04:12:40 -0700 |
| commit | 53ae0e93fad9f4c3eaef92f102b1eeb531e59d68 (patch) | |
| tree | cfc859d11d462e8b4bab1968360a9a85cd83154d /engine/hall_of_fame.asm | |
| parent | 9eefed45f7ff3b9ee6023fb0829528e34aa0729a (diff) | |
Use monster struct macros in wram. Rename related labels for consistency.
Diffstat (limited to 'engine/hall_of_fame.asm')
| -rwxr-xr-x | engine/hall_of_fame.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 981e1db5..b44a88e1 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -36,7 +36,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld c, BANK(Music_HallOfFame) ld a, MUSIC_HALL_OF_FAME call PlayMusic - ld hl, W_PARTYMON1 ; W_PARTYMON1 + ld hl, wPartySpecies ld c, $ff .asm_701fb ld a, [hli] @@ -48,7 +48,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld [wWhichTrade], a ; wWhichTrade ld a, c ld [wTrainerEngageDistance], a - ld hl, W_PARTYMON1_LEVEL ; W_PARTYMON1_LEVEL + ld hl, wPartyMon1Level ; wPartyMon1Level ld bc, $2c call AddNTimes ld a, [hl] @@ -105,7 +105,7 @@ Func_70278: ; 70278 (1c:4278) ld a, [wWhichTrade] ; wWhichTrade ld [wcf91], a ld [wd0b5], a - ld [wcfd9], a + ld [wBattleMonSpecies2], a ld [wcf1d], a ld a, [wTrainerScreenY] and a @@ -152,7 +152,7 @@ Func_70278: ; 70278 (1c:4278) Func_702e1: ; 702e1 (1c:42e1) ld a, [wTrainerEngageDistance] - ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME + ld hl, wPartyMonNicks ; wPartyMonNicks call GetPartyMonName call Func_702f0 jp Func_70404 @@ -232,7 +232,7 @@ Func_70377: ; 70377 (1c:4377) call TextBoxBorder FuncCoord 7, 2 ld hl, Coord - ld de, W_PLAYERNAME ; wd158 + ld de, wPlayerName ; wd158 call PlaceString FuncCoord 1, 6 ld hl, Coord |