From 5ae35e57702a17f118d53c35e13772b140fd37f9 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 30 Mar 2023 21:23:46 +0200 Subject: [PATCH] Label wOTLinkBattleRNData --- engine/link/link.asm | 4 ++-- ram/wram.asm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/link/link.asm b/engine/link/link.asm index 76de6e9a4..b933a99c6 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -247,7 +247,7 @@ endc ldh [rIE], a ld hl, wLinkBattleRNPreamble - ld de, wEnemyMon + ld de, wOTLinkBattleRNData ld bc, SERIAL_RN_PREAMBLE_LENGTH + SERIAL_RNS_LENGTH vc_hook Wireless_ExchangeBytes_RNG_state call Serial_ExchangeBytes @@ -1204,7 +1204,7 @@ Link_CopyRandomNumbers: ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ret z - ld hl, wEnemyMonSpecies + ld hl, wOTLinkBattleRNData call Link_FindFirstNonControlCharacter_AllowZero ld de, wLinkBattleRNs ld c, 10 diff --git a/ram/wram.asm b/ram/wram.asm index 9414f0336..eba069ea7 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -2631,11 +2631,15 @@ ENDU wTempEnemyMonSpecies:: db wTempBattleMonSpecies:: db +UNION +wOTLinkBattleRNData:: ds SERIAL_RN_PREAMBLE_LENGTH + SERIAL_RNS_LENGTH +NEXTU wEnemyMon:: battle_struct wEnemyMon wEnemyMonBaseStats:: ds NUM_EXP_STATS wEnemyMonCatchRate:: db wEnemyMonBaseExp:: db wEnemyMonEnd:: +ENDU wBattleMode:: ; 0: overworld