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

WIP Battle Tent: BCD Add not working :(

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

7
ram/wram.asm
View file

@ -2026,9 +2026,13 @@ wCelesteHillCaveCurScript:: db
wBrunswickGladeCurScript:: db wBrunswickGladeCurScript:: db
ds 2 ds 2
wSSAnneBowCurScript:: db wSSAnneBowCurScript:: db
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
@ -2135,13 +2139,12 @@ wStringBuffer2:: ; cf70
wStringBuffer3:: ; cf81 wStringBuffer3:: ; cf81
ds 9 + 1 ds 9 + 1
;end BT wram ;end BT wram
ds 79 ds 76
NEXTU NEXTU
wChannel7:: channel_struct wChannel7 wChannel7:: channel_struct wChannel7
wChannel8:: channel_struct wChannel8 wChannel8:: channel_struct wChannel8
ENDU ENDU
wBTStreakCnt:: db wBTStreakCnt:: db
wBTWinnings:: dw
wObtainedHiddenItemsFlags:: flag_array 112 wObtainedHiddenItemsFlags:: flag_array 112

3
scripts/BattleTent.asm
View file

@ -323,7 +323,7 @@ BattleTent_InitBattle:
ret ret
BTBattleReward: BTBattleReward:
db $00, $00, $00 db $00, $20, $00
BattleTent_AfterBattle: BattleTent_AfterBattle:
ld a, $ff ld a, $ff
@ -634,7 +634,6 @@ BattleTentGuy_After:
;ld [wBTWinnings+2], a ;ld [wBTWinnings+2], a
;.done ;.done
; todo: convert wBTWinnings to BCD
ld a, [wBTWinnings] ld a, [wBTWinnings]
ldh [hMoney], a ldh [hMoney], a
ld a, [wBTWinnings+1] ld a, [wBTWinnings+1]