summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-06-05 19:23:26 -0400
committerentrpntr <entrpntr@gmail.com>2020-06-09 06:27:03 -0400
commitfe03203e22fc252eeb962a04d8f7235fd3792a2c (patch)
tree11f2c1f4fbfbc25fbabf904cbbddae55adf61675 /wram.asm
parent74f86d7501ad76ec51081c6aca93001968b689a1 (diff)
Preliminary commit that builds.
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm13
1 files changed, 13 insertions, 0 deletions
diff --git a/wram.asm b/wram.asm
index 4a52dbcc..39935a0c 100644
--- a/wram.asm
+++ b/wram.asm
@@ -720,8 +720,21 @@ wPlayerMoveStruct:: move_struct wPlayerMoveStruct
wEnemyMonNick:: ds MON_NAME_LENGTH ; caf6
wBattleMonNick:: ds MON_NAME_LENGTH ; cb01
+UNION ; cb0c
+; battle mon
wBattleMon:: battle_struct wBattleMon ; cb0c
+NEXTU ; cb0c
+ ds 4
+wIntroJumptableIndex:: db
+wcb11:: dw
+wcb13:: dw
+wcb15:: dw
+wcb17:: db
+wcb18:: db
+wcb19:: db
+ENDU ; cb2c
+
wcb2c:: ds 1 ; cb2c
wcb2d:: ds 1 ; cb2d
wEnemyTrainerItem1:: db ; cb2e