thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Battle Tent: working! (assuming union is ok)

Browse source
This commit is contained in:
Thorn Avery 2023-12-20 18:49:51 +11:00
parent 8e03534fc6
commit f126a26243
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ram/wram.asm
View file

@ -2030,12 +2030,13 @@ UNION
wViridianForestCurScript:: db wViridianForestCurScript:: db
wMuseum1FCurScript:: db wMuseum1FCurScript:: db
wRoute13CurScript:: db wRoute13CurScript:: db
NEXTU
wBTWinnings:: ds 3
ENDU
wRoute14CurScript:: db wRoute14CurScript:: db
wRoute17CurScript:: db wRoute17CurScript:: db
wRoute19CurScript:: db wRoute19CurScript:: db
NEXTU
wBTWinnings:: ds 3
wBTBattleReward:: ds 3
ENDU
wRoute21CurScript:: db wRoute21CurScript:: db
wSafariZoneGateCurScript:: db wSafariZoneGateCurScript:: db
wRockTunnelB1FCurScript:: db wRockTunnelB1FCurScript:: db

8
scripts/BattleTent.asm
View file

@ -342,7 +342,7 @@ BattleTent_AfterBattle:
jr z, .max ; cap out at 255 wins jr z, .max ; cap out at 255 wins
inc a inc a
ld [wBTStreakCnt], a ; increment win counter ld [wBTStreakCnt], a ; increment win counter
ld hl, BTBattleReward + 2 ld hl, wBTBattleReward + 2
ld de, wBTWinnings + 2 ld de, wBTWinnings + 2
ld c, $3 ld c, $3
predef AddBCDPredef ; for some reason this is maxing out the counter predef AddBCDPredef ; for some reason this is maxing out the counter
@ -588,6 +588,12 @@ BattleTentGuy:
ld [wBTWinnings], a ld [wBTWinnings], a
ld [wBTWinnings+1], a ld [wBTWinnings+1], a
ld [wBTWinnings+2], a ld [wBTWinnings+2], a
ld a, [BTBattleReward]
ld [wBTBattleReward], a
ld a, [BTBattleReward+1]
ld [wBTBattleReward+1], a
ld a, [BTBattleReward+2]
ld [wBTBattleReward+2], a
ld a, 1 ld a, 1
ld [wBattleTentCurScript], a ld [wBattleTentCurScript], a
jp TextScriptEnd jp TextScriptEnd