Fix the party selection bit

I am shaky on using this area of WRAM but it seems to make the party menu work as desired.

Crashes when trying to load the opponent.
This commit is contained in:
Llinos Evans 2023-05-13 17:47:15 +01:00
parent ec61a039b8
commit 64dea915e8
2 changed files with 17 additions and 16 deletions

View file

@ -120,6 +120,7 @@ RedrawPartyMenu_::
db "ABLE@" db "ABLE@"
.notAbleToLearnMoveText .notAbleToLearnMoveText
db "NOT ABLE@" db "NOT ABLE@"
;battletent
.battleTentMenu .battleTentMenu
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
inc a inc a
@ -297,7 +298,7 @@ PartyMenuSwapMonText:
PartyMenuBattleTentText: ; 12e93 (4:6e93) PartyMenuBattleTentText: ; 12e93 (4:6e93)
text_far _PartyMenuBattleTentText text_far _PartyMenuBattleTentText
db "@" text_end
PotionText: PotionText:
text_far _PotionText text_far _PotionText

View file

@ -405,23 +405,10 @@ wSlotMachineSevenAndBarModeChance:: db
; ROM back to return to when the player is done with the slot machine ; ROM back to return to when the player is done with the slot machine
wSlotMachineSavedROMBank:: db wSlotMachineSavedROMBank:: db
;battle tent data
wBTOrder:: dw
wBTStreakCnt:: db
wBTClass:: db
wBTDataEnd::
wStringBuffer1:: ; cf5f
ds 16 + 1
wStringBuffer2:: ; cf70
ds 16 + 1
wStringBuffer3:: ; cf81
ds 9 + 1
;end BT wram
; Move Buffer stuff for Mateo's code ; Move Buffer stuff for Mateo's code
wMoveBuffer:: wMoveBuffer::
wRelearnableMoves:: wRelearnableMoves::
ds 115 ds 164
; Try not to use this stack. ; Try not to use this stack.
; A good amount of space is needed to store data for the move relearner. ; A good amount of space is needed to store data for the move relearner.
; If it's like, 2, it'll lag like crazy and show garbage from elsewhere. ; If it's like, 2, it'll lag like crazy and show garbage from elsewhere.
@ -2117,7 +2104,20 @@ wBattleTentCurScript:: db
wGameProgressFlagsEnd:: wGameProgressFlagsEnd::
UNION UNION
ds 128 ; Surely this position will not cause any issues at all.
;battle tent data
wBTOrder:: dw
wBTStreakCnt:: db
wBTClass:: db
wBTDataEnd::
wStringBuffer1:: ; cf5f
ds 16 + 1
wStringBuffer2:: ; cf70
ds 16 + 1
wStringBuffer3:: ; cf81
ds 9 + 1
;end BT wram
ds 79
NEXTU NEXTU
wChannel7:: channel_struct wChannel7 wChannel7:: channel_struct wChannel7
wChannel8:: channel_struct wChannel8 wChannel8:: channel_struct wChannel8