From c6e099a580d7651ffb4a34d2a8406a10ea2ba230 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 13 Aug 2016 01:00:46 -0700 Subject: split ai_scripts.s --- Makefile | 4 ++-- data/ai_scripts.s | 10 ---------- data/battle_ai_scripts.s | 7 +++++++ data/contest_ai_scripts.s | 7 +++++++ ld_script.txt | 3 ++- 5 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 data/ai_scripts.s create mode 100644 data/battle_ai_scripts.s create mode 100644 data/contest_ai_scripts.s diff --git a/Makefile b/Makefile index f7f214025..e190356c9 100644 --- a/Makefile +++ b/Makefile @@ -40,9 +40,9 @@ ASM_OBJS := asm/crt0.o asm/rom3.o asm/rom_8040EB4.o asm/rom4.o asm/rom_8074BAC.o asm/libgcnmultiboot.o asm/m4a_1.o asm/m4a_3.o asm/libagbsyscall.o DATA_ASM_OBJS := data/data2.o data/graphics.o data/sound_data.o \ -data/event_scripts.o data/battle_anim_scripts.o data/ai_scripts.o \ +data/event_scripts.o data/battle_anim_scripts.o \ data/battle_scripts_1.o data/battle_scripts_2.o data/field_effect_scripts.o \ -data/script_funcs.o +data/battle_ai_scripts.o data/contest_ai_scripts.o data/script_funcs.o OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) pokeruby_OBJS := $(OBJS:.o=_ruby.o) diff --git a/data/ai_scripts.s b/data/ai_scripts.s deleted file mode 100644 index ab90e8dcb..000000000 --- a/data/ai_scripts.s +++ /dev/null @@ -1,10 +0,0 @@ - .include "asm/macros.s" - .include "constants/constants.s" - - .section script_data, "aw", %progbits - -gUnknown_081DA01C:: @ 81DA01C - .incbin "baserom.gba", 0x001da01c, 0x20fc - -gUnknown_081DC118:: @ 81DC118 - .incbin "baserom.gba", 0x001dc118, 0x9dc diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s new file mode 100644 index 000000000..aa60e9821 --- /dev/null +++ b/data/battle_ai_scripts.s @@ -0,0 +1,7 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + +gUnknown_081DA01C:: @ 81DA01C + .incbin "baserom.gba", 0x001da01c, 0x20fc diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s new file mode 100644 index 000000000..cb73a2e9c --- /dev/null +++ b/data/contest_ai_scripts.s @@ -0,0 +1,7 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + +gUnknown_081DC118:: @ 81DC118 + .incbin "baserom.gba", 0x001dc118, 0x9dc diff --git a/ld_script.txt b/ld_script.txt index ddcac2d5a..4e13bc0bf 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -85,7 +85,8 @@ SECTIONS { data/battle_scripts_1.o(script_data); data/field_effect_scripts.o(script_data); data/battle_scripts_2.o(script_data); - data/ai_scripts.o(script_data); + data/battle_ai_scripts.o(script_data); + data/contest_ai_scripts.o(script_data); data/script_funcs.o(script_data); } =0 -- cgit v1.2.3