From f3d0f2f1a4316e8793acc59a7fd3bc851a39355a Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 3 May 2013 02:43:04 -0400 Subject: [PATCH] user/opponent party attribute functions --- main.asm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/main.asm b/main.asm index 6ff248df1..5fdece4fb 100644 --- a/main.asm +++ b/main.asm @@ -3817,7 +3817,33 @@ GetPartyLocation: ; 3927 ; 392d -INCBIN "baserom.gbc", $392d, $395d - $392d +INCBIN "baserom.gbc", $392d, $3945 - $392d + + +UserPartyAttr: ; 3945 + push af + ld a, [hBattleTurn] + and a + jr nz, .asm_394e + pop af + jr BattlePartyAttr +.asm_394e + pop af + jr OTPartyAttr +; 3951 + + +OpponentPartyAttr: ; 3951 + push af + ld a, [hBattleTurn] + and a + jr z, .asm_395a + pop af + jr BattlePartyAttr +.asm_395a + pop af + jr OTPartyAttr +; 395d BattlePartyAttr: ; 395d