serial/trade/misc

4 files changed, 45 insertions, 10 deletions

diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm
index e875622d..f9e3fe19 100644
--- a/constants/hardware_constants.asm
+++ b/constants/hardware_constants.asm
@@ -30,6 +30,9 @@ OAM_X_FLIP    EQU 5
 OAM_Y_FLIP    EQU 6
 OAM_PRIORITY  EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
 
+; serial
+START_TRANSFER_EXTERNAL_CLOCK EQU $80
+START_TRANSFER_INTERNAL_CLOCK EQU $81
 
 ; Hardware registers
 rJOYP       EQU $ff00 ; Joypad (R/W)
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index b864ab85..fd80eab2 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -26,4 +26,40 @@ SCREEN_HEIGHT EQU 18
 NPC_MOVEMENT_DOWN  EQU $00
 NPC_MOVEMENT_UP    EQU $40
 NPC_MOVEMENT_LEFT  EQU $80
-NPC_MOVEMENT_RIGHT EQU $C0
\ No newline at end of file
+NPC_MOVEMENT_RIGHT EQU $C0
+
+; two option menu constants
+YES_NO_MENU       EQU 0
+NORTH_WEST_MENU   EQU 1
+SOUTH_EAST_MENU   EQU 2
+WIDE_YES_NO_MENU  EQU 3
+NORTH_EAST_MENU   EQU 4
+TRADE_CANCEL_MENU EQU 5
+HEAL_CANCEL_MENU  EQU 6
+NO_YES_MENU       EQU 7
+
+; serial
+
+ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01
+ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK EQU $02
+
+USING_EXTERNAL_CLOCK       EQU $01
+USING_INTERNAL_CLOCK       EQU $02
+CONNECTION_NOT_ESTABLISHED EQU $ff
+
+; signals the start of an array of bytes transferred over the link cable
+SERIAL_PREAMBLE_BYTE EQU $FD
+
+; this byte is used when there is no data to send
+SERIAL_NO_DATA_BYTE EQU $FE
+
+; signals the end of one part of a patch list (there are two parts) for player/enemy party data
+SERIAL_PATCH_LIST_PART_TERMINATOR EQU $FF
+
+LINK_STATE_NONE          EQU $00 ; not using link
+LINK_STATE_IN_CABLE_CLUB EQU $01 ; in a cable club room (Colosseum or Trade Centre)
+LINK_STATE_START_TRADE   EQU $02 ; pre-trade selection screen initialisation
+LINK_STATE_START_BATTLE  EQU $03 ; pre-battle initialisation
+LINK_STATE_BATTLING      EQU $04 ; in a link battle
+LINK_STATE_RESET         EQU $05 ; reset game (unused)
+LINK_STATE_TRADING       EQU $32 ; in a link trade
\ No newline at end of file
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index 676f06f2..dfbb500e 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -175,10 +175,10 @@ NUM_ATTACKS EQU const_value + -1
 	const STATUS_AFFECTED_ANIM
 	const ANIM_A8
 	const ANIM_A9
-	const ANIM_AA
-	const ANIM_AB
-	const ANIM_AC
-	const ANIM_AD
+	const TRADE_BALL_DROP_ANIM
+	const TRADE_BALL_SHAKE_ANIM
+	const TRADE_BALL_TILT_ANIM
+	const TRADE_BALL_POOF_ANIM
 	const XSTATITEM_ANIM ; use X Attack/Defense/Speed/Special
 	const ANIM_AF
 	const ANIM_B0
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index e06ca2ce..067c8707 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -2,13 +2,9 @@
 SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
 
 ; Overload W_GRASSMONS
-wd893 EQU $d893 ; W_GRASSMONS + 11
-wd896 EQU $d896 ;  W_GRASSMONS + 14
+wSerialEnemyDataBlock EQU $d893 ; W_GRASSMONS + 11
 
 ; Overload enemy party data
 W_WATERRATE EQU $d8a4 ; wEnemyMon1Species
 W_WATERMONS EQU $d8a5 ; wEnemyMon1Species + 1
 
-; Overload enemy stat modifiers
-wTradeMonNick EQU $cd1e ; wPlayerMonAccuracyMod
-