diff options
Diffstat (limited to 'engine/hall_of_fame.asm')
| -rwxr-xr-x | engine/hall_of_fame.asm | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index f84053e3..f02107cc 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -14,18 +14,18 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld hl, rLCDC ; $ff40 set 3, [hl] xor a - ld hl, $cc5b + ld hl, wcc5b ld bc, $60 call FillMemory xor a - ld [$cfcb], a + ld [wcfcb], a ld [$ffd7], a ld [W_SPRITEFLIPPED], a - ld [$d358], a - ld [$cd40], a + ld [wd358], a + ld [wTrainerScreenY], a inc a ld [H_AUTOBGTRANSFERENABLED], a ; $ffba - ld hl, $d5a2 + ld hl, wd5a2 ld a, [hl] inc a jr z, .asm_701eb @@ -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 ; $d164 + ld hl, W_PARTYMON1 ; W_PARTYMON1 ld c, $ff .asm_701fb ld a, [hli] @@ -45,24 +45,24 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) inc c push hl push bc - ld [wWhichTrade], a ; $cd3d + ld [wWhichTrade], a ; wWhichTrade ld a, c - ld [$cd3e], a - ld hl, W_PARTYMON1_LEVEL ; $d18c + ld [wTrainerEngageDistance], a + ld hl, W_PARTYMON1_LEVEL ; W_PARTYMON1_LEVEL ld bc, $2c call AddNTimes ld a, [hl] - ld [$cd3f], a + ld [wTrainerFacingDirection], a call Func_70278 call Func_702e1 ld c, $50 call DelayFrames - FuncCoord 2, 13 ; $c4a6 + FuncCoord 2, 13 ld hl, Coord ld b, $3 ld c, $e call TextBoxBorder - FuncCoord 4, 15 ; $c4d0 + FuncCoord 4, 15 ld hl, Coord ld de, HallOfFameText call PlaceString @@ -75,15 +75,15 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) .asm_70241 ld a, c inc a - ld hl, $cc5b + ld hl, wcc5b ld bc, $10 call AddNTimes ld [hl], $ff call Func_73b0d xor a - ld [wWhichTrade], a ; $cd3d + ld [wWhichTrade], a ; wWhichTrade inc a - ld [$cd40], a + ld [wTrainerScreenY], a call Func_70278 call Func_70377 call Func_70423 @@ -102,18 +102,18 @@ Func_70278: ; 70278 (1c:4278) ld [$ffaf], a ld a, $c0 ld [$ffae], a - ld a, [wWhichTrade] ; $cd3d - ld [$cf91], a - ld [$d0b5], a - ld [$cfd9], a - ld [$cf1d], a - ld a, [$cd40] + ld a, [wWhichTrade] ; wWhichTrade + ld [wcf91], a + ld [wd0b5], a + ld [wcfd9], a + ld [wcf1d], a + ld a, [wTrainerScreenY] and a jr z, .asm_7029d call Func_7033e jr .asm_702ab .asm_7029d - FuncCoord 12, 5 ; $c410 + FuncCoord 12, 5 ld hl, Coord call GetMonHeader call LoadFrontSpriteByMonIndex @@ -129,7 +129,7 @@ Func_70278: ; 70278 (1c:4278) call Func_7036d ld d, $a0 ld e, $4 - ld a, [$cf1b] + ld a, [wcf1b] and a jr z, .asm_702c7 sla e @@ -151,37 +151,37 @@ Func_70278: ; 70278 (1c:4278) ret Func_702e1: ; 702e1 (1c:42e1) - ld a, [$cd3e] - ld hl, W_PARTYMON1NAME ; $d2b5 + ld a, [wTrainerEngageDistance] + ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME call GetPartyMonName call Func_702f0 jp Func_70404 Func_702f0: ; 702f0 (1c:42f0) - FuncCoord 0, 2 ; $c3c8 + FuncCoord 0, 2 ld hl, Coord ld b, $9 ld c, $a call TextBoxBorder - FuncCoord 2, 6 ; $c41a + FuncCoord 2, 6 ld hl, Coord ld de, HoFMonInfoText call PlaceString - FuncCoord 1, 4 ; $c3f1 + FuncCoord 1, 4 ld hl, Coord - ld de, $cd6d + ld de, wcd6d call PlaceString - ld a, [$cd3f] - FuncCoord 8, 7 ; $c434 + ld a, [wTrainerFacingDirection] + FuncCoord 8, 7 ld hl, Coord call PrintLevelCommon - ld a, [wWhichTrade] ; $cd3d - ld [$d0b5], a - FuncCoord 3, 9 ; $c457 + ld a, [wWhichTrade] ; wWhichTrade + ld [wd0b5], a + FuncCoord 3, 9 ld hl, Coord ld a, $4b call Predef ; indirect jump to Func_27d6b (27d6b (9:7d6b)) - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade jp PlayCry HoFMonInfoText: ; 70329 (1c:4329) @@ -210,58 +210,58 @@ Func_7033e: ; 7033e (1c:433e) Func_7036d: ; 7036d (1c:436d) ld b, $0 - FuncCoord 12, 5 ; $c410 + FuncCoord 12, 5 ld hl, Coord ld a, $31 jp Predef ; indirect jump to Func_79dda (79dda (1e:5dda)) Func_70377: ; 70377 (1c:4377) - ld hl, $d747 + ld hl, wd747 set 3, [hl] ld a, $56 call Predef ; indirect jump to DisplayDexRating (44169 (11:4169)) - FuncCoord 0, 4 ; $c3f0 + FuncCoord 0, 4 ld hl, Coord ld b, $6 ld c, $a call TextBoxBorder - FuncCoord 5, 0 ; $c3a5 + FuncCoord 5, 0 ld hl, Coord ld b, $2 ld c, $9 call TextBoxBorder - FuncCoord 7, 2 ; $c3cf + FuncCoord 7, 2 ld hl, Coord - ld de, W_PLAYERNAME ; $d158 + ld de, W_PLAYERNAME ; wd158 call PlaceString - FuncCoord 1, 6 ; $c419 + FuncCoord 1, 6 ld hl, Coord ld de, HoFPlayTimeText call PlaceString - FuncCoord 5, 7 ; $c431 + FuncCoord 5, 7 ld hl, Coord - ld de, $da41 + ld de, W_PLAYTIMEHOURS + 1 ld bc, $103 call PrintNumber ld [hl], $6d inc hl - ld de, $da43 + ld de, W_PLAYTIMEMINUTES + 1 ld bc, $8102 call PrintNumber - FuncCoord 1, 9 ; $c455 + FuncCoord 1, 9 ld hl, Coord ld de, HoFMoneyText call PlaceString - FuncCoord 4, 10 ; $c46c + FuncCoord 4, 10 ld hl, Coord - ld de, wPlayerMoney ; $d347 + ld de, wPlayerMoney ; wPlayerMoney ld c, $a3 call PrintBCDNumber ld hl, DexSeenOwnedText call Func_703e2 ld hl, DexRatingText call Func_703e2 - ld hl, $cc5d + ld hl, wcc5d Func_703e2: ; 703e2 (1c:43e2) call PrintText @@ -283,24 +283,24 @@ DexRatingText: ; 703ff (1c:43ff) db "@" Func_70404: ; 70404 (1c:4404) - ld hl, $cc5b + ld hl, wcc5b ld bc, $10 - ld a, [$cd3e] + ld a, [wTrainerEngageDistance] call AddNTimes - ld a, [wWhichTrade] ; $cd3d + ld a, [wWhichTrade] ; wWhichTrade ld [hli], a - ld a, [$cd3f] + ld a, [wTrainerFacingDirection] ld [hli], a ld e, l ld d, h - ld hl, $cd6d + ld hl, wcd6d ld bc, $b jp CopyData Func_70423: ; 70423 (1c:4423) ld a, $a - ld [$cfc8], a - ld [$cfc9], a + ld [wcfc8], a + ld [wcfc9], a ld a, $ff ld [wMusicHeaderPointer], a jp GBFadeOut2 |