From 91e305255cb4861ad1ecc486c7e07c94476016f0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 5 Nov 2019 21:27:47 -0500 Subject: [PATCH] Dump battle scripts 1 --- asm/macros/battle_script.inc | 3 +- baserom.ips | Bin 442990 -> 430442 bytes data/battle_message.s | 309 +- data/battle_scripts_1.s | 4382 +++++++++++++++++++- include/battle_string_ids.h | 47 +- include/constants/battle_script_commands.h | 2 +- 6 files changed, 4489 insertions(+), 254 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index c1c76807f..fea575042 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -515,8 +515,9 @@ .byte \bank .endm - .macro atk5d + .macro atk5d addr .byte 0x5d + .4byte \addr .endm .macro atk5e bank diff --git a/baserom.ips b/baserom.ips index c0a516b06eb7c96caaec0d94d647e2c69b73689f..ad0030b85e5ede02541a80ea595e72616ed4a6c1 100644 GIT binary patch delta 53 zcmaFYBK>NS6jy*_h_i=G#+yHTHgfIx!zw#%4Xa1{d0j>zW&&bnAZ7t#*6rtY+2&6H E0C2n(ga7~l delta 12718 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