summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-03-22 04:08:47 -0400
committeryenatch <yenatch@gmail.com>2013-03-22 04:15:35 -0400
commitf0346a9982ed2cda3f8d0aa5f14cfb1b8b84602e (patch)
tree53a797c9816b7997aa5243ce7e94b3dbb1972e46 /main.asm
parentd7757676513e9e02fc67d99a7c60c02f74344292 (diff)
various minor additions
-battle variable constants -step counters -turn update fns
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm16
1 files changed, 15 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 22f7e3b83..2eb22f10d 100644
--- a/main.asm
+++ b/main.asm
@@ -3415,7 +3415,21 @@ GetPartyLocation: ; 3927
jp AddNTimes
; 392d
-INCBIN "baserom.gbc",$392d,$3b86 - $392d
+INCBIN "baserom.gbc", $392d, $3985 - $392d
+
+SetPlayerTurn: ; 3985
+ xor a
+ ld [hBattleTurn], a
+ ret
+; 3989
+
+SetEnemyTurn: ; 3989
+ ld a, 1
+ ld [hBattleTurn], a
+ ret
+; 398e
+
+INCBIN "baserom.gbc", $398e, $3b86 - $398e
LoadMusicByte: ; 3b86
; load music data into CurMusicByte