Merge branch 'mistress' into renewables

This commit is contained in:
Thorn Avery 2023-12-09 06:56:15 +11:00
commit b85e6fb85f
101 changed files with 490 additions and 412 deletions

View file

@ -179,13 +179,15 @@ ResetLegendaryPokemon:
; ordering in data/events/trades.asm
; trades 0-7
ld b, %11111111
; ld b, %11111111
ld b, %00000000
ld a, [wCompletedInGameTradeFlags]
and b
ld [wCompletedInGameTradeFlags], a
; trades 8-15
ld b, %00000011
; ld b, %00000011
ld b, %00000000
ld a, [wCompletedInGameTradeFlags+1]
and b
ld [wCompletedInGameTradeFlags+1], a