diff --git a/ram/wram.asm b/ram/wram.asm index de3f443f..39325ee3 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -2026,9 +2026,13 @@ wCelesteHillCaveCurScript:: db wBrunswickGladeCurScript:: db ds 2 wSSAnneBowCurScript:: db +UNION wViridianForestCurScript:: db wMuseum1FCurScript:: db wRoute13CurScript:: db +NEXTU +wBTWinnings:: ds 3 +ENDU wRoute14CurScript:: db wRoute17CurScript:: db wRoute19CurScript:: db @@ -2135,13 +2139,12 @@ wStringBuffer2:: ; cf70 wStringBuffer3:: ; cf81 ds 9 + 1 ;end BT wram - ds 79 + ds 76 NEXTU wChannel7:: channel_struct wChannel7 wChannel8:: channel_struct wChannel8 ENDU wBTStreakCnt:: db -wBTWinnings:: dw wObtainedHiddenItemsFlags:: flag_array 112 diff --git a/scripts/BattleTent.asm b/scripts/BattleTent.asm index b0dea111..a959afa6 100644 --- a/scripts/BattleTent.asm +++ b/scripts/BattleTent.asm @@ -323,7 +323,7 @@ BattleTent_InitBattle: ret BTBattleReward: - db $00, $00, $00 + db $00, $20, $00 BattleTent_AfterBattle: ld a, $ff @@ -634,7 +634,6 @@ BattleTentGuy_After: ;ld [wBTWinnings+2], a ;.done - ; todo: convert wBTWinnings to BCD ld a, [wBTWinnings] ldh [hMoney], a ld a, [wBTWinnings+1]