From f5a444af5d4e7b33706bc051c3e932d3d75d8a24 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 17 Jun 2021 16:56:13 -0400 Subject: Replace simple ewram access with battle struct, 2 --- data/btl_attrs.s | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/btl_attrs.s b/data/btl_attrs.s index 54328e7c7..e7868555b 100644 --- a/data/btl_attrs.s +++ b/data/btl_attrs.s @@ -98,11 +98,40 @@ gUnknown_Debug_821F58C:: gUnknown_Debug_821F598:: .byte 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0x09, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0x4b, 0x00, 0x00, 0x02, 0x80, 0x00, 0x00, 0x00 + .align 2, 0 + @ struct Pokeblock gUnknown_Debug_821F5AC:: - .byte 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x03, 0x00, 0x00, 0x14, 0x00, 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x14, 0x14, 0x00, 0x06, 0x14, 0x00, 0x14, 0x00, 0x00, 0x14, 0x00, 0x07, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x14, 0x00, 0x14, 0x14, 0x00 - .byte 0x09, 0x14, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x00, 0x14, 0x14, 0x00, 0x0b, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00 - .byte 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + @ color, spicy, dry, sweet, bitter, sour, feel + .byte 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x14 + .align 2, 0 + .byte 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14 + .align 2, 0 + .byte 0x03, 0x00, 0x00, 0x14, 0x00, 0x00, 0x14 + .align 2, 0 + .byte 0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x14 + .align 2, 0 + .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x14, 0x14 + .align 2, 0 + .byte 0x06, 0x14, 0x00, 0x14, 0x00, 0x00, 0x14 + .align 2, 0 + .byte 0x07, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14 + .align 2, 0 + .byte 0x08, 0x00, 0x00, 0x14, 0x00, 0x14, 0x14 + .align 2, 0 + .byte 0x09, 0x14, 0x00, 0x00, 0x14, 0x00, 0x14 + .align 2, 0 + .byte 0x0a, 0x00, 0x14, 0x00, 0x00, 0x14, 0x14 + .align 2, 0 + .byte 0x0b, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00 + .align 2, 0 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00 + .align 2, 0 + .byte 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .align 2, 0 + .byte 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x14 + .align 2, 0 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .align 2, 0 .ifdef ENGLISH Str_821F624:: @ 0x821F624 -- cgit v1.2.3