diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/hall_of_fame.asm | 20 | ||||
| -rwxr-xr-x | engine/menu/league_pc.asm | 32 | ||||
| -rwxr-xr-x | engine/save.asm | 38 |
3 files changed, 46 insertions, 44 deletions
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index b44a88e1..28705901 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -1,7 +1,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) call Func_70423 call ClearScreen - ld c, $64 + ld c, 100 call DelayFrames call LoadFontTilePatterns call LoadTextBoxTilePatterns @@ -14,8 +14,8 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld hl, rLCDC ; $ff40 set 3, [hl] xor a - ld hl, wcc5b - ld bc, $60 + ld hl, wHallOfFame + ld bc, HOF_TEAM call FillMemory xor a ld [wcfcb], a @@ -49,7 +49,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld a, c ld [wTrainerEngageDistance], a ld hl, wPartyMon1Level ; wPartyMon1Level - ld bc, $2c + ld bc, wPartyMon2 - wPartyMon1 call AddNTimes ld a, [hl] ld [wTrainerFacingDirection], a @@ -66,7 +66,7 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) ld hl, Coord ld de, HallOfFameText call PlaceString - ld c, $b4 + ld c, 180 call DelayFrames call GBFadeOut2 pop bc @@ -75,11 +75,11 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) .asm_70241 ld a, c inc a - ld hl, wcc5b - ld bc, $10 + ld hl, wHallOfFame + ld bc, HOF_MON call AddNTimes ld [hl], $ff - call Func_73b0d + call SaveHallOfFameTeams xor a ld [wWhichTrade], a ; wWhichTrade inc a @@ -283,8 +283,8 @@ DexRatingText: ; 703ff (1c:43ff) db "@" Func_70404: ; 70404 (1c:4404) - ld hl, wcc5b - ld bc, $10 + ld hl, wHallOfFame + ld bc, HOF_MON ld a, [wTrainerEngageDistance] call AddNTimes ld a, [wWhichTrade] ; wWhichTrade diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 9048fc39..46f63420 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -16,9 +16,9 @@ PKMNLeaguePC: ; 0x7657e ld [wcd42], a ld a, [wd5a2] ld b, a - cp a, $33 + cp NUM_HOF_TEAMS + 1 jr c, .first - ld b, $32 + ld b, NUM_HOF_TEAMS sub b ld [wcd42], a .first @@ -27,7 +27,7 @@ PKMNLeaguePC: ; 0x7657e push bc ld a, [wTrainerScreenX] ld [wWhichTrade], a - callba Func_73b3f + callba LoadHallOfFameTeams call Func_765e5 pop bc jr c, .second @@ -49,28 +49,28 @@ PKMNLeaguePC: ; 0x7657e jp GBPalNormal Func_765e5: ; 765e5 (1d:65e5) - ld c, 6 -.third + ld c, PARTY_LENGTH +.loop push bc call Func_76610 call WaitForTextScrollButtonPress ld a, [hJoyHeld] bit 1, a - jr nz, .fifth - ld hl, wcc6b - ld de, wcc5b - ld bc, $0050 + jr nz, .exit + ld hl, wHallOfFame + HOF_MON + ld de, wHallOfFame + ld bc, HOF_TEAM - HOF_MON call CopyData pop bc - ld a, [wcc5b] - cp a, $FF - jr z, .fourth + ld a, [wHallOfFame + 0] + cp $ff + jr z, .done dec c - jr nz, .third -.fourth + jr nz, .loop +.done and a ret -.fifth +.exit pop bc scf ret @@ -78,7 +78,7 @@ Func_765e5: ; 765e5 (1d:65e5) Func_76610: ; 76610 (1d:6610) call GBPalWhiteOutWithDelay3 call ClearScreen - ld hl, wcc5b + ld hl, wHallOfFame ld a, [hli] ld [wWhichTrade], a ld [wcf91], a diff --git a/engine/save.asm b/engine/save.asm index 9f7e326a..1b8f1467 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -628,38 +628,40 @@ SAVCheckRandomID: ;$7ad1 ld [$0000],a ret -Func_73b0d: ; 73b0d (1c:7b0d) +SaveHallOfFameTeams: ; 73b0d (1c:7b0d) ld a, [wd5a2] dec a - cp $32 + cp NUM_HOF_TEAMS jr nc, .asm_73b28 - ld hl, $a598 - ld bc, $60 + ld hl, sHallOfFame + ld bc, HOF_TEAM call AddNTimes ld e, l ld d, h ld hl, wcc5b - ld bc, $60 - jr CopyToSRAM0 + ld bc, HOF_TEAM + jr HallOfFame_Copy + .asm_73b28 - ld hl, $a5f8 - ld de, $a598 - ld bc, $1260 - call CopyToSRAM0 + ld hl, sHallOfFame + HOF_TEAM + ld de, sHallOfFame + ld bc, HOF_TEAM * (NUM_HOF_TEAMS - 1) + call HallOfFame_Copy ld hl, wcc5b - ld de, $b7f8 - ld bc, $60 - jr CopyToSRAM0 + ld de, sHallOfFame + HOF_TEAM * (NUM_HOF_TEAMS - 1) + ld bc, HOF_TEAM + jr HallOfFame_Copy -Func_73b3f: ; 73b3f (1c:7b3f) - ld hl, $a598 - ld bc, $60 +LoadHallOfFameTeams: ; 73b3f (1c:7b3f) + ld hl, sHallOfFame + ld bc, HOF_TEAM ld a, [wWhichTrade] ; wWhichTrade call AddNTimes ld de, wcc5b - ld bc, $60 + ld bc, HOF_TEAM ; fallthrough -CopyToSRAM0: ; 73b51 (1c:7b51) + +HallOfFame_Copy: ; 73b51 (1c:7b51) ld a, $a ld [$0], a ld a, $1 |