diff --git a/Makefile b/Makefile index 66a80d3c5..1e08b1cd1 100644 --- a/Makefile +++ b/Makefile @@ -63,11 +63,14 @@ asm/librfu.o \ asm/libagbsyscall.o \ asm/libc.o -DATA_ASM_OBJS := data/data1.o data/data2.o data/anim_mon_front_pics.o \ +DATA_ASM_OBJS := data/data2.o data/anim_mon_front_pics.o \ data/graphics.o data/unknown_serial_data.o data/multiboot_berry_glitch_fix.o \ data/multiboot_pokemon_colosseum.o data/libagbbackup_rodata.o \ data/librtc_rodata.o data/librfu_rodata.o data/sound_data.o \ -data/m4a_tables.o +data/m4a_tables.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/battle_ai_scripts.o data/contest_ai_scripts.o data/script_funcs.o OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s new file mode 100644 index 000000000..8efb5abfc --- /dev/null +++ b/data/battle_ai_scripts.s @@ -0,0 +1,8 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + + .align 2 +gUnknown_082DBEF8:: @ 82DBEF8 + .incbin "base_emerald.gba", 0x2dbef8, 0x2458 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s new file mode 100644 index 000000000..7383898db --- /dev/null +++ b/data/battle_anim_scripts.s @@ -0,0 +1,19 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + +gUnknown_082C8D64:: @ 82C8D64 + .incbin "base_emerald.gba", 0x2c8d64, 0x8 + +gUnknown_082C8D6C:: @ 82C8D6C + .incbin "base_emerald.gba", 0x2c8d6c, 0x590 + +gUnknown_082C92FC:: @ 82C92FC + .incbin "base_emerald.gba", 0x2c92fc, 0x24 + +gUnknown_082C9320:: @ 82C9320 + .incbin "base_emerald.gba", 0x2c9320, 0x5c + +gUnknown_082C937C:: @ 82C937C + .incbin "base_emerald.gba", 0x2c937c, 0xf32c diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s new file mode 100644 index 000000000..a6aa8abce --- /dev/null +++ b/data/battle_scripts_1.s @@ -0,0 +1,553 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + +gUnknown_082D86A8:: @ 82D86A8 + .incbin "base_emerald.gba", 0x2d86a8, 0x388 + +gUnknown_082D8A30:: @ 82D8A30 + .incbin "base_emerald.gba", 0x2d8a30, 0x1e + +gUnknown_082D8A4E:: @ 82D8A4E + .incbin "base_emerald.gba", 0x2d8a4e, 0x12 + +gUnknown_082D8A60:: @ 82D8A60 + .incbin "base_emerald.gba", 0x2d8a60, 0x274 + +gUnknown_082D8CD4:: @ 82D8CD4 + .incbin "base_emerald.gba", 0x2d8cd4, 0x91 + +gUnknown_082D8D65:: @ 82D8D65 + .incbin "base_emerald.gba", 0x2d8d65, 0x6fd + +gUnknown_082D9462:: @ 82D9462 + .incbin "base_emerald.gba", 0x2d9462, 0xa7f + +gUnknown_082D9EE1:: @ 82D9EE1 + .incbin "base_emerald.gba", 0x2d9ee1, 0x1a + +gUnknown_082D9EFB:: @ 82D9EFB + .incbin "base_emerald.gba", 0x2d9efb, 0x21 + +gUnknown_082D9F1C:: @ 82D9F1C + .incbin "base_emerald.gba", 0x2d9f1c, 0x88e + +gUnknown_082DA7AA:: @ 82DA7AA + .incbin "base_emerald.gba", 0x2da7aa, 0xd + +gUnknown_082DA7B7:: @ 82DA7B7 + .incbin "base_emerald.gba", 0x2da7b7, 0xd + +gUnknown_082DA7C4:: @ 82DA7C4 + .incbin "base_emerald.gba", 0x2da7c4, 0x9 + +gUnknown_082DA7CD:: @ 82DA7CD + .incbin "base_emerald.gba", 0x2da7cd, 0x160 + +gUnknown_082DA92D:: @ 82DA92D + .incbin "base_emerald.gba", 0x2da92d, 0x3d + +gUnknown_082DA96A:: @ 82DA96A + .incbin "base_emerald.gba", 0x2da96a, 0x3 + +gUnknown_082DA96D:: @ 82DA96D + .incbin "base_emerald.gba", 0x2da96d, 0x9e + +gUnknown_082DAA0B:: @ 82DAA0B + .incbin "base_emerald.gba", 0x2daa0b, 0x2a + +gUnknown_082DAA35:: @ 82DAA35 + .incbin "base_emerald.gba", 0x2daa35, 0x52 + +gUnknown_082DAA87:: @ 82DAA87 + .incbin "base_emerald.gba", 0x2daa87, 0x54 + +gUnknown_082DAADB:: @ 82DAADB + .incbin "base_emerald.gba", 0x2daadb, 0xe + +gUnknown_082DAAE9:: @ 82DAAE9 + .incbin "base_emerald.gba", 0x2daae9, 0x7 + +gUnknown_082DAAF0:: @ 82DAAF0 + .incbin "base_emerald.gba", 0x2daaf0, 0x7 + +gUnknown_082DAAF7:: @ 82DAAF7 + .incbin "base_emerald.gba", 0x2daaf7, 0x7 + +gUnknown_082DAAFE:: @ 82DAAFE + .incbin "base_emerald.gba", 0x2daafe, 0x4 + +gUnknown_082DAB02:: @ 82DAB02 + .incbin "base_emerald.gba", 0x2dab02, 0x9 + +gUnknown_082DAB0B:: @ 82DAB0B + .incbin "base_emerald.gba", 0x2dab0b, 0x6 + +gUnknown_082DAB11:: @ 82DAB11 + .incbin "base_emerald.gba", 0x2dab11, 0x4 + +gUnknown_082DAB15:: @ 82DAB15 + .incbin "base_emerald.gba", 0x2dab15, 0xa4 + +gUnknown_082DABB9:: @ 82DABB9 + .incbin "base_emerald.gba", 0x2dabb9, 0x4 + +gUnknown_082DABBD:: @ 82DABBD + .incbin "base_emerald.gba", 0x2dabbd, 0x6f + +gUnknown_082DAC2C:: @ 82DAC2C + .incbin "base_emerald.gba", 0x2dac2c, 0x1b + +gUnknown_082DAC47:: @ 82DAC47 + .incbin "base_emerald.gba", 0x2dac47, 0x82 + +gUnknown_082DACC9:: @ 82DACC9 + .incbin "base_emerald.gba", 0x2dacc9, 0x9 + +gUnknown_082DACD2:: @ 82DACD2 + .incbin "base_emerald.gba", 0x2dacd2, 0xe + +gUnknown_082DACE0:: @ 82DACE0 + .incbin "base_emerald.gba", 0x2dace0, 0x7 + +gUnknown_082DACE7:: @ 82DACE7 + .incbin "base_emerald.gba", 0x2dace7, 0x13 + +gUnknown_082DACFA:: @ 82DACFA + .incbin "base_emerald.gba", 0x2dacfa, 0x11 + +gUnknown_082DAD0B:: @ 82DAD0B + .incbin "base_emerald.gba", 0x2dad0b, 0xa + +gUnknown_082DAD15:: @ 82DAD15 + .incbin "base_emerald.gba", 0x2dad15, 0x5c + +gUnknown_082DAD71:: @ 82DAD71 + .incbin "base_emerald.gba", 0x2dad71, 0xb + +gUnknown_082DAD7C:: @ 82DAD7C + .incbin "base_emerald.gba", 0x2dad7c, 0x48 + +gUnknown_082DADC4:: @ 82DADC4 + .incbin "base_emerald.gba", 0x2dadc4, 0x14 + +gUnknown_082DADD8:: @ 82DADD8 + .incbin "base_emerald.gba", 0x2dadd8, 0x2b + +gUnknown_082DAE03:: @ 82DAE03 + .incbin "base_emerald.gba", 0x2dae03, 0xa + +gUnknown_082DAE0D:: @ 82DAE0D + .incbin "base_emerald.gba", 0x2dae0d, 0x7 + +gUnknown_082DAE14:: @ 82DAE14 + .incbin "base_emerald.gba", 0x2dae14, 0xb + +gUnknown_082DAE1F:: @ 82DAE1F + .incbin "base_emerald.gba", 0x2dae1f, 0x4 + +gUnknown_082DAE23:: @ 82DAE23 + .incbin "base_emerald.gba", 0x2dae23, 0x7 + +gUnknown_082DAE2A:: @ 82DAE2A + .incbin "base_emerald.gba", 0x2dae2a, 0xd + +gUnknown_082DAE37:: @ 82DAE37 + .incbin "base_emerald.gba", 0x2dae37, 0x7 + +gUnknown_082DAE3E:: @ 82DAE3E + .incbin "base_emerald.gba", 0x2dae3e, 0x1b + +gUnknown_082DAE59:: @ 82DAE59 + .incbin "base_emerald.gba", 0x2dae59, 0x37 + +gUnknown_082DAE90:: @ 82DAE90 + .incbin "base_emerald.gba", 0x2dae90, 0x37 + +gUnknown_082DAEC7:: @ 82DAEC7 + .incbin "base_emerald.gba", 0x2daec7, 0x3e + +gUnknown_082DAF05:: @ 82DAF05 + .incbin "base_emerald.gba", 0x2daf05, 0x1b + +gUnknown_082DAF20:: @ 82DAF20 + .incbin "base_emerald.gba", 0x2daf20, 0x7 + +gUnknown_082DAF27:: @ 82DAF27 + .incbin "base_emerald.gba", 0x2daf27, 0x9c + +gUnknown_082DAFC3:: @ 82DAFC3 + .incbin "base_emerald.gba", 0x2dafc3, 0x2 + +gUnknown_082DAFC5:: @ 82DAFC5 + .incbin "base_emerald.gba", 0x2dafc5, 0x11 + +gUnknown_082DAFD6:: @ 82DAFD6 + .incbin "base_emerald.gba", 0x2dafd6, 0x7 + +gUnknown_082DAFDD:: @ 82DAFDD + .incbin "base_emerald.gba", 0x2dafdd, 0x7 + +gUnknown_082DAFE4:: @ 82DAFE4 + .incbin "base_emerald.gba", 0x2dafe4, 0x8e + +gUnknown_082DB072:: @ 82DB072 + .incbin "base_emerald.gba", 0x2db072, 0x4 + +gUnknown_082DB076:: @ 82DB076 + .incbin "base_emerald.gba", 0x2db076, 0x4 + +gUnknown_082DB07A:: @ 82DB07A + .incbin "base_emerald.gba", 0x2db07a, 0xf + +gUnknown_082DB089:: @ 82DB089 + .incbin "base_emerald.gba", 0x2db089, 0xf + +gUnknown_082DB098:: @ 82DB098 + .incbin "base_emerald.gba", 0x2db098, 0x8 + +gUnknown_082DB0A0:: @ 82DB0A0 + .incbin "base_emerald.gba", 0x2db0a0, 0x4 + +gUnknown_082DB0A4:: @ 82DB0A4 + .incbin "base_emerald.gba", 0x2db0a4, 0xb + +gUnknown_082DB0AF:: @ 82DB0AF + .incbin "base_emerald.gba", 0x2db0af, 0x8 + +gUnknown_082DB0B7:: @ 82DB0B7 + .incbin "base_emerald.gba", 0x2db0b7, 0x37 + +gUnknown_082DB0EE:: @ 82DB0EE + .incbin "base_emerald.gba", 0x2db0ee, 0x29 + +gUnknown_082DB117:: @ 82DB117 + .incbin "base_emerald.gba", 0x2db117, 0x51 + +gUnknown_082DB168:: @ 82DB168 + .incbin "base_emerald.gba", 0x2db168, 0xe + +gUnknown_082DB176:: @ 82DB176 + .incbin "base_emerald.gba", 0x2db176, 0xb + +gUnknown_082DB181:: @ 82DB181 + .incbin "base_emerald.gba", 0x2db181, 0x4 + +gUnknown_082DB185:: @ 82DB185 + .incbin "base_emerald.gba", 0x2db185, 0x8 + +gUnknown_082DB18D:: @ 82DB18D + .incbin "base_emerald.gba", 0x2db18d, 0x7 + +gUnknown_082DB194:: @ 82DB194 + .incbin "base_emerald.gba", 0x2db194, 0x18 + +gUnknown_082DB1AC:: @ 82DB1AC + .incbin "base_emerald.gba", 0x2db1ac, 0x1b + +gUnknown_082DB1C7:: @ 82DB1C7 + .incbin "base_emerald.gba", 0x2db1c7, 0x7 + +gUnknown_082DB1CE:: @ 82DB1CE + .incbin "base_emerald.gba", 0x2db1ce, 0x7 + +gUnknown_082DB1D5:: @ 82DB1D5 + .incbin "base_emerald.gba", 0x2db1d5, 0x2a + +gUnknown_082DB1FF:: @ 82DB1FF + .incbin "base_emerald.gba", 0x2db1ff, 0x14 + +gUnknown_082DB213:: @ 82DB213 + .incbin "base_emerald.gba", 0x2db213, 0xd + +gUnknown_082DB220:: @ 82DB220 + .incbin "base_emerald.gba", 0x2db220, 0x14 + +gUnknown_082DB234:: @ 82DB234 + .incbin "base_emerald.gba", 0x2db234, 0x9 + +gUnknown_082DB23D:: @ 82DB23D + .incbin "base_emerald.gba", 0x2db23d, 0x22 + +gUnknown_082DB25F:: @ 82DB25F + .incbin "base_emerald.gba", 0x2db25f, 0xb + +gUnknown_082DB26A:: @ 82DB26A + .incbin "base_emerald.gba", 0x2db26a, 0xd + +gUnknown_082DB277:: @ 82DB277 + .incbin "base_emerald.gba", 0x2db277, 0xb + +gUnknown_082DB282:: @ 82DB282 + .incbin "base_emerald.gba", 0x2db282, 0x9 + +gUnknown_082DB28B:: @ 82DB28B + .incbin "base_emerald.gba", 0x2db28b, 0x10 + +gUnknown_082DB29B:: @ 82DB29B + .incbin "base_emerald.gba", 0x2db29b, 0xb + +gUnknown_082DB2A6:: @ 82DB2A6 + .incbin "base_emerald.gba", 0x2db2a6, 0x9 + +gUnknown_082DB2AF:: @ 82DB2AF + .incbin "base_emerald.gba", 0x2db2af, 0xe + +gUnknown_082DB2BD:: @ 82DB2BD + .incbin "base_emerald.gba", 0x2db2bd, 0x43 + +gUnknown_082DB300:: @ 82DB300 + .incbin "base_emerald.gba", 0x2db300, 0x7 + +gUnknown_082DB307:: @ 82DB307 + .incbin "base_emerald.gba", 0x2db307, 0x7 + +gUnknown_082DB30E:: @ 82DB30E + .incbin "base_emerald.gba", 0x2db30e, 0x12 + +gUnknown_082DB320:: @ 82DB320 + .incbin "base_emerald.gba", 0x2db320, 0x7 + +gUnknown_082DB327:: @ 82DB327 + .incbin "base_emerald.gba", 0x2db327, 0xd + +gUnknown_082DB334:: @ 82DB334 + .incbin "base_emerald.gba", 0x2db334, 0xb + +gUnknown_082DB33F:: @ 82DB33F + .incbin "base_emerald.gba", 0x2db33f, 0x11 + +gUnknown_082DB350:: @ 82DB350 + .incbin "base_emerald.gba", 0x2db350, 0x11 + +gUnknown_082DB361:: @ 82DB361 + .incbin "base_emerald.gba", 0x2db361, 0x17 + +gUnknown_082DB378:: @ 82DB378 + .incbin "base_emerald.gba", 0x2db378, 0xaa + +gUnknown_082DB422:: @ 82DB422 + .incbin "base_emerald.gba", 0x2db422, 0xe + +gUnknown_082DB430:: @ 82DB430 + .incbin "base_emerald.gba", 0x2db430, 0x14 + +gUnknown_082DB444:: @ 82DB444 + .incbin "base_emerald.gba", 0x2db444, 0xe + +gUnknown_082DB452:: @ 82DB452 + .incbin "base_emerald.gba", 0x2db452, 0xa + +gUnknown_082DB45C:: @ 82DB45C + .incbin "base_emerald.gba", 0x2db45c, 0x14 + +gUnknown_082DB470:: @ 82DB470 + .incbin "base_emerald.gba", 0x2db470, 0x14 + +gUnknown_082DB484:: @ 82DB484 + .incbin "base_emerald.gba", 0x2db484, 0x25 + +gUnknown_082DB4A9:: @ 82DB4A9 + .incbin "base_emerald.gba", 0x2db4a9, 0xf + +gUnknown_082DB4B8:: @ 82DB4B8 + .incbin "base_emerald.gba", 0x2db4b8, 0x9 + +gUnknown_082DB4C1:: @ 82DB4C1 + .incbin "base_emerald.gba", 0x2db4c1, 0x69 + +gUnknown_082DB52A:: @ 82DB52A + .incbin "base_emerald.gba", 0x2db52a, 0x14 + +gUnknown_082DB53E:: @ 82DB53E + .incbin "base_emerald.gba", 0x2db53e, 0x14 + +gUnknown_082DB552:: @ 82DB552 + .incbin "base_emerald.gba", 0x2db552, 0xe + +gUnknown_082DB560:: @ 82DB560 + .incbin "base_emerald.gba", 0x2db560, 0xe + +gUnknown_082DB56E:: @ 82DB56E + .incbin "base_emerald.gba", 0x2db56e, 0x1 + +gUnknown_082DB56F:: @ 82DB56F + .incbin "base_emerald.gba", 0x2db56f, 0x22 + +gUnknown_082DB591:: @ 82DB591 + .incbin "base_emerald.gba", 0x2db591, 0x1 + +gUnknown_082DB592:: @ 82DB592 + .incbin "base_emerald.gba", 0x2db592, 0x15 + +gUnknown_082DB5A7:: @ 82DB5A7 + .incbin "base_emerald.gba", 0x2db5a7, 0x1 + +gUnknown_082DB5A8:: @ 82DB5A8 + .incbin "base_emerald.gba", 0x2db5a8, 0x1f + +gUnknown_082DB5C7:: @ 82DB5C7 + .incbin "base_emerald.gba", 0x2db5c7, 0xa + +gUnknown_082DB5D1:: @ 82DB5D1 + .incbin "base_emerald.gba", 0x2db5d1, 0xc + +gUnknown_082DB5DD:: @ 82DB5DD + .incbin "base_emerald.gba", 0x2db5dd, 0xc + +gUnknown_082DB5E9:: @ 82DB5E9 + .incbin "base_emerald.gba", 0x2db5e9, 0xc + +gUnknown_082DB5F5:: @ 82DB5F5 + .incbin "base_emerald.gba", 0x2db5f5, 0xe + +gUnknown_082DB603:: @ 82DB603 + .incbin "base_emerald.gba", 0x2db603, 0x1c + +gUnknown_082DB61F:: @ 82DB61F + .incbin "base_emerald.gba", 0x2db61f, 0x10 + +gUnknown_082DB62F:: @ 82DB62F + .incbin "base_emerald.gba", 0x2db62f, 0x10 + +gUnknown_082DB63F:: @ 82DB63F + .incbin "base_emerald.gba", 0x2db63f, 0xe + +gUnknown_082DB64D:: @ 82DB64D + .incbin "base_emerald.gba", 0x2db64d, 0x7 + +gUnknown_082DB654:: @ 82DB654 + .incbin "base_emerald.gba", 0x2db654, 0x1b + +gUnknown_082DB66F:: @ 82DB66F + .incbin "base_emerald.gba", 0x2db66f, 0xd + +gUnknown_082DB67C:: @ 82DB67C + .incbin "base_emerald.gba", 0x2db67c, 0x3 + +gUnknown_082DB67F:: @ 82DB67F + .incbin "base_emerald.gba", 0x2db67f, 0x3 + +gUnknown_082DB682:: @ 82DB682 + .incbin "base_emerald.gba", 0x2db682, 0xa + +gUnknown_082DB68C:: @ 82DB68C + .incbin "base_emerald.gba", 0x2db68c, 0x9 + +gUnknown_082DB695:: @ 82DB695 + .incbin "base_emerald.gba", 0x2db695, 0x10 + +gUnknown_082DB6A5:: @ 82DB6A5 + .incbin "base_emerald.gba", 0x2db6a5, 0x8 + +gUnknown_082DB6AD:: @ 82DB6AD + .incbin "base_emerald.gba", 0x2db6ad, 0x2c + +gUnknown_082DB6D9:: @ 82DB6D9 + .incbin "base_emerald.gba", 0x2db6d9, 0x17 + +gUnknown_082DB6F0:: @ 82DB6F0 + .incbin "base_emerald.gba", 0x2db6f0, 0xb + +gUnknown_082DB6FB:: @ 82DB6FB + .incbin "base_emerald.gba", 0x2db6fb, 0xb + +gUnknown_082DB706:: @ 82DB706 + .incbin "base_emerald.gba", 0x2db706, 0x6 + +gUnknown_082DB70C:: @ 82DB70C + .incbin "base_emerald.gba", 0x2db70c, 0x12 + +gUnknown_082DB71E:: @ 82DB71E + .incbin "base_emerald.gba", 0x2db71e, 0x6 + +gUnknown_082DB724:: @ 82DB724 + .incbin "base_emerald.gba", 0x2db724, 0x12 + +gUnknown_082DB736:: @ 82DB736 + .incbin "base_emerald.gba", 0x2db736, 0x6 + +gUnknown_082DB73C:: @ 82DB73C + .incbin "base_emerald.gba", 0x2db73c, 0x12 + +gUnknown_082DB74E:: @ 82DB74E + .incbin "base_emerald.gba", 0x2db74e, 0x6 + +gUnknown_082DB754:: @ 82DB754 + .incbin "base_emerald.gba", 0x2db754, 0x12 + +gUnknown_082DB766:: @ 82DB766 + .incbin "base_emerald.gba", 0x2db766, 0x6 + +gUnknown_082DB76C:: @ 82DB76C + .incbin "base_emerald.gba", 0x2db76c, 0x12 + +gUnknown_082DB77E:: @ 82DB77E + .incbin "base_emerald.gba", 0x2db77e, 0x6 + +gUnknown_082DB784:: @ 82DB784 + .incbin "base_emerald.gba", 0x2db784, 0x10 + +gUnknown_082DB794:: @ 82DB794 + .incbin "base_emerald.gba", 0x2db794, 0x6 + +gUnknown_082DB79A:: @ 82DB79A + .incbin "base_emerald.gba", 0x2db79a, 0x14 + +gUnknown_082DB7AE:: @ 82DB7AE + .incbin "base_emerald.gba", 0x2db7ae, 0x6 + +gUnknown_082DB7B4:: @ 82DB7B4 + .incbin "base_emerald.gba", 0x2db7b4, 0x10 + +gUnknown_082DB7C4:: @ 82DB7C4 + .incbin "base_emerald.gba", 0x2db7c4, 0x1d + +gUnknown_082DB7E1:: @ 82DB7E1 + .incbin "base_emerald.gba", 0x2db7e1, 0x10 + +gUnknown_082DB7F1:: @ 82DB7F1 + .incbin "base_emerald.gba", 0x2db7f1, 0x6 + +gUnknown_082DB7F7:: @ 82DB7F7 + .incbin "base_emerald.gba", 0x2db7f7, 0x1b + +gUnknown_082DB812:: @ 82DB812 + .incbin "base_emerald.gba", 0x2db812, 0x4 + +gUnknown_082DB816:: @ 82DB816 + .incbin "base_emerald.gba", 0x2db816, 0xe + +gUnknown_082DB824:: @ 82DB824 + .incbin "base_emerald.gba", 0x2db824, 0x2a + +gUnknown_082DB84E:: @ 82DB84E + .incbin "base_emerald.gba", 0x2db84e, 0x1b + +gUnknown_082DB869:: @ 82DB869 + .incbin "base_emerald.gba", 0x2db869, 0x10 + +gUnknown_082DB879:: @ 82DB879 + .incbin "base_emerald.gba", 0x2db879, 0x4 + +gUnknown_082DB87D:: @ 82DB87D + .incbin "base_emerald.gba", 0x2db87d, 0x4 + +gUnknown_082DB881:: @ 82DB881 + .incbin "base_emerald.gba", 0x2db881, 0x3d + +gUnknown_082DB8BE:: @ 82DB8BE + .incbin "base_emerald.gba", 0x2db8be, 0x35 + +gUnknown_082DB8F3:: @ 82DB8F3 + .incbin "base_emerald.gba", 0x2db8f3, 0xc7 + +gUnknown_082DB9BA:: @ 82DB9BA + .incbin "base_emerald.gba", 0x2db9ba, 0x7 + +gUnknown_082DB9C1:: @ 82DB9C1 + .incbin "base_emerald.gba", 0x2db9c1, 0x7 + +gUnknown_082DB9C8:: @ 82DB9C8 + .incbin "base_emerald.gba", 0x2db9c8, 0xc diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s new file mode 100644 index 000000000..54938855b --- /dev/null +++ b/data/battle_scripts_2.s @@ -0,0 +1,28 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + +gUnknown_082DBD08:: @ 82DBD08 + .incbin "base_emerald.gba", 0x2dbd08, 0x34 + +gUnknown_082DBD3C:: @ 82DBD3C + .incbin "base_emerald.gba", 0x2dbd3c, 0x18 + +gUnknown_082DBD54:: @ 82DBD54 + .incbin "base_emerald.gba", 0x2dbd54, 0x4 + +gUnknown_082DBD58:: @ 82DBD58 + .incbin "base_emerald.gba", 0x2dbd58, 0x2c + +gUnknown_082DBD84:: @ 82DBD84 + .incbin "base_emerald.gba", 0x2dbd84, 0x46 + +gUnknown_082DBDCA:: @ 82DBDCA + .incbin "base_emerald.gba", 0x2dbdca, 0xa + +gUnknown_082DBDD4:: @ 82DBDD4 + .incbin "base_emerald.gba", 0x2dbdd4, 0x2e + +gUnknown_082DBE02:: @ 82DBE02 + .incbin "base_emerald.gba", 0x2dbe02, 0xf6 diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s new file mode 100644 index 000000000..a4f56c68c --- /dev/null +++ b/data/contest_ai_scripts.s @@ -0,0 +1,8 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + + .align 2 +gUnknown_082DE350:: @ 82DE350 + .incbin "base_emerald.gba", 0x2de350, 0x9dc diff --git a/data/data1.s b/data/event_scripts.s similarity index 51% rename from data/data1.s rename to data/event_scripts.s index 1e5d3eb90..a8f87c0bc 100644 --- a/data/data1.s +++ b/data/event_scripts.s @@ -1,5 +1,3 @@ -@ the first big chunk of data - .include "asm/macros.s" .include "constants/constants.s" @@ -643,605 +641,3 @@ gUnknown_082C8C2A:: @ 82C8C2A gUnknown_082C8C7A:: @ 82C8C7A .incbin "base_emerald.gba", 0x2c8c7a, 0xea - -gUnknown_082C8D64:: @ 82C8D64 - .incbin "base_emerald.gba", 0x2c8d64, 0x8 - -gUnknown_082C8D6C:: @ 82C8D6C - .incbin "base_emerald.gba", 0x2c8d6c, 0x590 - -gUnknown_082C92FC:: @ 82C92FC - .incbin "base_emerald.gba", 0x2c92fc, 0x24 - -gUnknown_082C9320:: @ 82C9320 - .incbin "base_emerald.gba", 0x2c9320, 0x5c - -gUnknown_082C937C:: @ 82C937C - .incbin "base_emerald.gba", 0x2c937c, 0xf32c - -gUnknown_082D86A8:: @ 82D86A8 - .incbin "base_emerald.gba", 0x2d86a8, 0x388 - -gUnknown_082D8A30:: @ 82D8A30 - .incbin "base_emerald.gba", 0x2d8a30, 0x1e - -gUnknown_082D8A4E:: @ 82D8A4E - .incbin "base_emerald.gba", 0x2d8a4e, 0x12 - -gUnknown_082D8A60:: @ 82D8A60 - .incbin "base_emerald.gba", 0x2d8a60, 0x274 - -gUnknown_082D8CD4:: @ 82D8CD4 - .incbin "base_emerald.gba", 0x2d8cd4, 0x91 - -gUnknown_082D8D65:: @ 82D8D65 - .incbin "base_emerald.gba", 0x2d8d65, 0x6fd - -gUnknown_082D9462:: @ 82D9462 - .incbin "base_emerald.gba", 0x2d9462, 0xa7f - -gUnknown_082D9EE1:: @ 82D9EE1 - .incbin "base_emerald.gba", 0x2d9ee1, 0x1a - -gUnknown_082D9EFB:: @ 82D9EFB - .incbin "base_emerald.gba", 0x2d9efb, 0x21 - -gUnknown_082D9F1C:: @ 82D9F1C - .incbin "base_emerald.gba", 0x2d9f1c, 0x88e - -gUnknown_082DA7AA:: @ 82DA7AA - .incbin "base_emerald.gba", 0x2da7aa, 0xd - -gUnknown_082DA7B7:: @ 82DA7B7 - .incbin "base_emerald.gba", 0x2da7b7, 0xd - -gUnknown_082DA7C4:: @ 82DA7C4 - .incbin "base_emerald.gba", 0x2da7c4, 0x9 - -gUnknown_082DA7CD:: @ 82DA7CD - .incbin "base_emerald.gba", 0x2da7cd, 0x160 - -gUnknown_082DA92D:: @ 82DA92D - .incbin "base_emerald.gba", 0x2da92d, 0x3d - -gUnknown_082DA96A:: @ 82DA96A - .incbin "base_emerald.gba", 0x2da96a, 0x3 - -gUnknown_082DA96D:: @ 82DA96D - .incbin "base_emerald.gba", 0x2da96d, 0x9e - -gUnknown_082DAA0B:: @ 82DAA0B - .incbin "base_emerald.gba", 0x2daa0b, 0x2a - -gUnknown_082DAA35:: @ 82DAA35 - .incbin "base_emerald.gba", 0x2daa35, 0x52 - -gUnknown_082DAA87:: @ 82DAA87 - .incbin "base_emerald.gba", 0x2daa87, 0x54 - -gUnknown_082DAADB:: @ 82DAADB - .incbin "base_emerald.gba", 0x2daadb, 0xe - -gUnknown_082DAAE9:: @ 82DAAE9 - .incbin "base_emerald.gba", 0x2daae9, 0x7 - -gUnknown_082DAAF0:: @ 82DAAF0 - .incbin "base_emerald.gba", 0x2daaf0, 0x7 - -gUnknown_082DAAF7:: @ 82DAAF7 - .incbin "base_emerald.gba", 0x2daaf7, 0x7 - -gUnknown_082DAAFE:: @ 82DAAFE - .incbin "base_emerald.gba", 0x2daafe, 0x4 - -gUnknown_082DAB02:: @ 82DAB02 - .incbin "base_emerald.gba", 0x2dab02, 0x9 - -gUnknown_082DAB0B:: @ 82DAB0B - .incbin "base_emerald.gba", 0x2dab0b, 0x6 - -gUnknown_082DAB11:: @ 82DAB11 - .incbin "base_emerald.gba", 0x2dab11, 0x4 - -gUnknown_082DAB15:: @ 82DAB15 - .incbin "base_emerald.gba", 0x2dab15, 0xa4 - -gUnknown_082DABB9:: @ 82DABB9 - .incbin "base_emerald.gba", 0x2dabb9, 0x4 - -gUnknown_082DABBD:: @ 82DABBD - .incbin "base_emerald.gba", 0x2dabbd, 0x6f - -gUnknown_082DAC2C:: @ 82DAC2C - .incbin "base_emerald.gba", 0x2dac2c, 0x1b - -gUnknown_082DAC47:: @ 82DAC47 - .incbin "base_emerald.gba", 0x2dac47, 0x82 - -gUnknown_082DACC9:: @ 82DACC9 - .incbin "base_emerald.gba", 0x2dacc9, 0x9 - -gUnknown_082DACD2:: @ 82DACD2 - .incbin "base_emerald.gba", 0x2dacd2, 0xe - -gUnknown_082DACE0:: @ 82DACE0 - .incbin "base_emerald.gba", 0x2dace0, 0x7 - -gUnknown_082DACE7:: @ 82DACE7 - .incbin "base_emerald.gba", 0x2dace7, 0x13 - -gUnknown_082DACFA:: @ 82DACFA - .incbin "base_emerald.gba", 0x2dacfa, 0x11 - -gUnknown_082DAD0B:: @ 82DAD0B - .incbin "base_emerald.gba", 0x2dad0b, 0xa - -gUnknown_082DAD15:: @ 82DAD15 - .incbin "base_emerald.gba", 0x2dad15, 0x5c - -gUnknown_082DAD71:: @ 82DAD71 - .incbin "base_emerald.gba", 0x2dad71, 0xb - -gUnknown_082DAD7C:: @ 82DAD7C - .incbin "base_emerald.gba", 0x2dad7c, 0x48 - -gUnknown_082DADC4:: @ 82DADC4 - .incbin "base_emerald.gba", 0x2dadc4, 0x14 - -gUnknown_082DADD8:: @ 82DADD8 - .incbin "base_emerald.gba", 0x2dadd8, 0x2b - -gUnknown_082DAE03:: @ 82DAE03 - .incbin "base_emerald.gba", 0x2dae03, 0xa - -gUnknown_082DAE0D:: @ 82DAE0D - .incbin "base_emerald.gba", 0x2dae0d, 0x7 - -gUnknown_082DAE14:: @ 82DAE14 - .incbin "base_emerald.gba", 0x2dae14, 0xb - -gUnknown_082DAE1F:: @ 82DAE1F - .incbin "base_emerald.gba", 0x2dae1f, 0x4 - -gUnknown_082DAE23:: @ 82DAE23 - .incbin "base_emerald.gba", 0x2dae23, 0x7 - -gUnknown_082DAE2A:: @ 82DAE2A - .incbin "base_emerald.gba", 0x2dae2a, 0xd - -gUnknown_082DAE37:: @ 82DAE37 - .incbin "base_emerald.gba", 0x2dae37, 0x7 - -gUnknown_082DAE3E:: @ 82DAE3E - .incbin "base_emerald.gba", 0x2dae3e, 0x1b - -gUnknown_082DAE59:: @ 82DAE59 - .incbin "base_emerald.gba", 0x2dae59, 0x37 - -gUnknown_082DAE90:: @ 82DAE90 - .incbin "base_emerald.gba", 0x2dae90, 0x37 - -gUnknown_082DAEC7:: @ 82DAEC7 - .incbin "base_emerald.gba", 0x2daec7, 0x3e - -gUnknown_082DAF05:: @ 82DAF05 - .incbin "base_emerald.gba", 0x2daf05, 0x1b - -gUnknown_082DAF20:: @ 82DAF20 - .incbin "base_emerald.gba", 0x2daf20, 0x7 - -gUnknown_082DAF27:: @ 82DAF27 - .incbin "base_emerald.gba", 0x2daf27, 0x9c - -gUnknown_082DAFC3:: @ 82DAFC3 - .incbin "base_emerald.gba", 0x2dafc3, 0x2 - -gUnknown_082DAFC5:: @ 82DAFC5 - .incbin "base_emerald.gba", 0x2dafc5, 0x11 - -gUnknown_082DAFD6:: @ 82DAFD6 - .incbin "base_emerald.gba", 0x2dafd6, 0x7 - -gUnknown_082DAFDD:: @ 82DAFDD - .incbin "base_emerald.gba", 0x2dafdd, 0x7 - -gUnknown_082DAFE4:: @ 82DAFE4 - .incbin "base_emerald.gba", 0x2dafe4, 0x8e - -gUnknown_082DB072:: @ 82DB072 - .incbin "base_emerald.gba", 0x2db072, 0x4 - -gUnknown_082DB076:: @ 82DB076 - .incbin "base_emerald.gba", 0x2db076, 0x4 - -gUnknown_082DB07A:: @ 82DB07A - .incbin "base_emerald.gba", 0x2db07a, 0xf - -gUnknown_082DB089:: @ 82DB089 - .incbin "base_emerald.gba", 0x2db089, 0xf - -gUnknown_082DB098:: @ 82DB098 - .incbin "base_emerald.gba", 0x2db098, 0x8 - -gUnknown_082DB0A0:: @ 82DB0A0 - .incbin "base_emerald.gba", 0x2db0a0, 0x4 - -gUnknown_082DB0A4:: @ 82DB0A4 - .incbin "base_emerald.gba", 0x2db0a4, 0xb - -gUnknown_082DB0AF:: @ 82DB0AF - .incbin "base_emerald.gba", 0x2db0af, 0x8 - -gUnknown_082DB0B7:: @ 82DB0B7 - .incbin "base_emerald.gba", 0x2db0b7, 0x37 - -gUnknown_082DB0EE:: @ 82DB0EE - .incbin "base_emerald.gba", 0x2db0ee, 0x29 - -gUnknown_082DB117:: @ 82DB117 - .incbin "base_emerald.gba", 0x2db117, 0x51 - -gUnknown_082DB168:: @ 82DB168 - .incbin "base_emerald.gba", 0x2db168, 0xe - -gUnknown_082DB176:: @ 82DB176 - .incbin "base_emerald.gba", 0x2db176, 0xb - -gUnknown_082DB181:: @ 82DB181 - .incbin "base_emerald.gba", 0x2db181, 0x4 - -gUnknown_082DB185:: @ 82DB185 - .incbin "base_emerald.gba", 0x2db185, 0x8 - -gUnknown_082DB18D:: @ 82DB18D - .incbin "base_emerald.gba", 0x2db18d, 0x7 - -gUnknown_082DB194:: @ 82DB194 - .incbin "base_emerald.gba", 0x2db194, 0x18 - -gUnknown_082DB1AC:: @ 82DB1AC - .incbin "base_emerald.gba", 0x2db1ac, 0x1b - -gUnknown_082DB1C7:: @ 82DB1C7 - .incbin "base_emerald.gba", 0x2db1c7, 0x7 - -gUnknown_082DB1CE:: @ 82DB1CE - .incbin "base_emerald.gba", 0x2db1ce, 0x7 - -gUnknown_082DB1D5:: @ 82DB1D5 - .incbin "base_emerald.gba", 0x2db1d5, 0x2a - -gUnknown_082DB1FF:: @ 82DB1FF - .incbin "base_emerald.gba", 0x2db1ff, 0x14 - -gUnknown_082DB213:: @ 82DB213 - .incbin "base_emerald.gba", 0x2db213, 0xd - -gUnknown_082DB220:: @ 82DB220 - .incbin "base_emerald.gba", 0x2db220, 0x14 - -gUnknown_082DB234:: @ 82DB234 - .incbin "base_emerald.gba", 0x2db234, 0x9 - -gUnknown_082DB23D:: @ 82DB23D - .incbin "base_emerald.gba", 0x2db23d, 0x22 - -gUnknown_082DB25F:: @ 82DB25F - .incbin "base_emerald.gba", 0x2db25f, 0xb - -gUnknown_082DB26A:: @ 82DB26A - .incbin "base_emerald.gba", 0x2db26a, 0xd - -gUnknown_082DB277:: @ 82DB277 - .incbin "base_emerald.gba", 0x2db277, 0xb - -gUnknown_082DB282:: @ 82DB282 - .incbin "base_emerald.gba", 0x2db282, 0x9 - -gUnknown_082DB28B:: @ 82DB28B - .incbin "base_emerald.gba", 0x2db28b, 0x10 - -gUnknown_082DB29B:: @ 82DB29B - .incbin "base_emerald.gba", 0x2db29b, 0xb - -gUnknown_082DB2A6:: @ 82DB2A6 - .incbin "base_emerald.gba", 0x2db2a6, 0x9 - -gUnknown_082DB2AF:: @ 82DB2AF - .incbin "base_emerald.gba", 0x2db2af, 0xe - -gUnknown_082DB2BD:: @ 82DB2BD - .incbin "base_emerald.gba", 0x2db2bd, 0x43 - -gUnknown_082DB300:: @ 82DB300 - .incbin "base_emerald.gba", 0x2db300, 0x7 - -gUnknown_082DB307:: @ 82DB307 - .incbin "base_emerald.gba", 0x2db307, 0x7 - -gUnknown_082DB30E:: @ 82DB30E - .incbin "base_emerald.gba", 0x2db30e, 0x12 - -gUnknown_082DB320:: @ 82DB320 - .incbin "base_emerald.gba", 0x2db320, 0x7 - -gUnknown_082DB327:: @ 82DB327 - .incbin "base_emerald.gba", 0x2db327, 0xd - -gUnknown_082DB334:: @ 82DB334 - .incbin "base_emerald.gba", 0x2db334, 0xb - -gUnknown_082DB33F:: @ 82DB33F - .incbin "base_emerald.gba", 0x2db33f, 0x11 - -gUnknown_082DB350:: @ 82DB350 - .incbin "base_emerald.gba", 0x2db350, 0x11 - -gUnknown_082DB361:: @ 82DB361 - .incbin "base_emerald.gba", 0x2db361, 0x17 - -gUnknown_082DB378:: @ 82DB378 - .incbin "base_emerald.gba", 0x2db378, 0xaa - -gUnknown_082DB422:: @ 82DB422 - .incbin "base_emerald.gba", 0x2db422, 0xe - -gUnknown_082DB430:: @ 82DB430 - .incbin "base_emerald.gba", 0x2db430, 0x14 - -gUnknown_082DB444:: @ 82DB444 - .incbin "base_emerald.gba", 0x2db444, 0xe - -gUnknown_082DB452:: @ 82DB452 - .incbin "base_emerald.gba", 0x2db452, 0xa - -gUnknown_082DB45C:: @ 82DB45C - .incbin "base_emerald.gba", 0x2db45c, 0x14 - -gUnknown_082DB470:: @ 82DB470 - .incbin "base_emerald.gba", 0x2db470, 0x14 - -gUnknown_082DB484:: @ 82DB484 - .incbin "base_emerald.gba", 0x2db484, 0x25 - -gUnknown_082DB4A9:: @ 82DB4A9 - .incbin "base_emerald.gba", 0x2db4a9, 0xf - -gUnknown_082DB4B8:: @ 82DB4B8 - .incbin "base_emerald.gba", 0x2db4b8, 0x9 - -gUnknown_082DB4C1:: @ 82DB4C1 - .incbin "base_emerald.gba", 0x2db4c1, 0x69 - -gUnknown_082DB52A:: @ 82DB52A - .incbin "base_emerald.gba", 0x2db52a, 0x14 - -gUnknown_082DB53E:: @ 82DB53E - .incbin "base_emerald.gba", 0x2db53e, 0x14 - -gUnknown_082DB552:: @ 82DB552 - .incbin "base_emerald.gba", 0x2db552, 0xe - -gUnknown_082DB560:: @ 82DB560 - .incbin "base_emerald.gba", 0x2db560, 0xe - -gUnknown_082DB56E:: @ 82DB56E - .incbin "base_emerald.gba", 0x2db56e, 0x1 - -gUnknown_082DB56F:: @ 82DB56F - .incbin "base_emerald.gba", 0x2db56f, 0x22 - -gUnknown_082DB591:: @ 82DB591 - .incbin "base_emerald.gba", 0x2db591, 0x1 - -gUnknown_082DB592:: @ 82DB592 - .incbin "base_emerald.gba", 0x2db592, 0x15 - -gUnknown_082DB5A7:: @ 82DB5A7 - .incbin "base_emerald.gba", 0x2db5a7, 0x1 - -gUnknown_082DB5A8:: @ 82DB5A8 - .incbin "base_emerald.gba", 0x2db5a8, 0x1f - -gUnknown_082DB5C7:: @ 82DB5C7 - .incbin "base_emerald.gba", 0x2db5c7, 0xa - -gUnknown_082DB5D1:: @ 82DB5D1 - .incbin "base_emerald.gba", 0x2db5d1, 0xc - -gUnknown_082DB5DD:: @ 82DB5DD - .incbin "base_emerald.gba", 0x2db5dd, 0xc - -gUnknown_082DB5E9:: @ 82DB5E9 - .incbin "base_emerald.gba", 0x2db5e9, 0xc - -gUnknown_082DB5F5:: @ 82DB5F5 - .incbin "base_emerald.gba", 0x2db5f5, 0xe - -gUnknown_082DB603:: @ 82DB603 - .incbin "base_emerald.gba", 0x2db603, 0x1c - -gUnknown_082DB61F:: @ 82DB61F - .incbin "base_emerald.gba", 0x2db61f, 0x10 - -gUnknown_082DB62F:: @ 82DB62F - .incbin "base_emerald.gba", 0x2db62f, 0x10 - -gUnknown_082DB63F:: @ 82DB63F - .incbin "base_emerald.gba", 0x2db63f, 0xe - -gUnknown_082DB64D:: @ 82DB64D - .incbin "base_emerald.gba", 0x2db64d, 0x7 - -gUnknown_082DB654:: @ 82DB654 - .incbin "base_emerald.gba", 0x2db654, 0x1b - -gUnknown_082DB66F:: @ 82DB66F - .incbin "base_emerald.gba", 0x2db66f, 0xd - -gUnknown_082DB67C:: @ 82DB67C - .incbin "base_emerald.gba", 0x2db67c, 0x3 - -gUnknown_082DB67F:: @ 82DB67F - .incbin "base_emerald.gba", 0x2db67f, 0x3 - -gUnknown_082DB682:: @ 82DB682 - .incbin "base_emerald.gba", 0x2db682, 0xa - -gUnknown_082DB68C:: @ 82DB68C - .incbin "base_emerald.gba", 0x2db68c, 0x9 - -gUnknown_082DB695:: @ 82DB695 - .incbin "base_emerald.gba", 0x2db695, 0x10 - -gUnknown_082DB6A5:: @ 82DB6A5 - .incbin "base_emerald.gba", 0x2db6a5, 0x8 - -gUnknown_082DB6AD:: @ 82DB6AD - .incbin "base_emerald.gba", 0x2db6ad, 0x2c - -gUnknown_082DB6D9:: @ 82DB6D9 - .incbin "base_emerald.gba", 0x2db6d9, 0x17 - -gUnknown_082DB6F0:: @ 82DB6F0 - .incbin "base_emerald.gba", 0x2db6f0, 0xb - -gUnknown_082DB6FB:: @ 82DB6FB - .incbin "base_emerald.gba", 0x2db6fb, 0xb - -gUnknown_082DB706:: @ 82DB706 - .incbin "base_emerald.gba", 0x2db706, 0x6 - -gUnknown_082DB70C:: @ 82DB70C - .incbin "base_emerald.gba", 0x2db70c, 0x12 - -gUnknown_082DB71E:: @ 82DB71E - .incbin "base_emerald.gba", 0x2db71e, 0x6 - -gUnknown_082DB724:: @ 82DB724 - .incbin "base_emerald.gba", 0x2db724, 0x12 - -gUnknown_082DB736:: @ 82DB736 - .incbin "base_emerald.gba", 0x2db736, 0x6 - -gUnknown_082DB73C:: @ 82DB73C - .incbin "base_emerald.gba", 0x2db73c, 0x12 - -gUnknown_082DB74E:: @ 82DB74E - .incbin "base_emerald.gba", 0x2db74e, 0x6 - -gUnknown_082DB754:: @ 82DB754 - .incbin "base_emerald.gba", 0x2db754, 0x12 - -gUnknown_082DB766:: @ 82DB766 - .incbin "base_emerald.gba", 0x2db766, 0x6 - -gUnknown_082DB76C:: @ 82DB76C - .incbin "base_emerald.gba", 0x2db76c, 0x12 - -gUnknown_082DB77E:: @ 82DB77E - .incbin "base_emerald.gba", 0x2db77e, 0x6 - -gUnknown_082DB784:: @ 82DB784 - .incbin "base_emerald.gba", 0x2db784, 0x10 - -gUnknown_082DB794:: @ 82DB794 - .incbin "base_emerald.gba", 0x2db794, 0x6 - -gUnknown_082DB79A:: @ 82DB79A - .incbin "base_emerald.gba", 0x2db79a, 0x14 - -gUnknown_082DB7AE:: @ 82DB7AE - .incbin "base_emerald.gba", 0x2db7ae, 0x6 - -gUnknown_082DB7B4:: @ 82DB7B4 - .incbin "base_emerald.gba", 0x2db7b4, 0x10 - -gUnknown_082DB7C4:: @ 82DB7C4 - .incbin "base_emerald.gba", 0x2db7c4, 0x1d - -gUnknown_082DB7E1:: @ 82DB7E1 - .incbin "base_emerald.gba", 0x2db7e1, 0x10 - -gUnknown_082DB7F1:: @ 82DB7F1 - .incbin "base_emerald.gba", 0x2db7f1, 0x6 - -gUnknown_082DB7F7:: @ 82DB7F7 - .incbin "base_emerald.gba", 0x2db7f7, 0x1b - -gUnknown_082DB812:: @ 82DB812 - .incbin "base_emerald.gba", 0x2db812, 0x4 - -gUnknown_082DB816:: @ 82DB816 - .incbin "base_emerald.gba", 0x2db816, 0xe - -gUnknown_082DB824:: @ 82DB824 - .incbin "base_emerald.gba", 0x2db824, 0x2a - -gUnknown_082DB84E:: @ 82DB84E - .incbin "base_emerald.gba", 0x2db84e, 0x1b - -gUnknown_082DB869:: @ 82DB869 - .incbin "base_emerald.gba", 0x2db869, 0x10 - -gUnknown_082DB879:: @ 82DB879 - .incbin "base_emerald.gba", 0x2db879, 0x4 - -gUnknown_082DB87D:: @ 82DB87D - .incbin "base_emerald.gba", 0x2db87d, 0x4 - -gUnknown_082DB881:: @ 82DB881 - .incbin "base_emerald.gba", 0x2db881, 0x3d - -gUnknown_082DB8BE:: @ 82DB8BE - .incbin "base_emerald.gba", 0x2db8be, 0x35 - -gUnknown_082DB8F3:: @ 82DB8F3 - .incbin "base_emerald.gba", 0x2db8f3, 0xc7 - -gUnknown_082DB9BA:: @ 82DB9BA - .incbin "base_emerald.gba", 0x2db9ba, 0x7 - -gUnknown_082DB9C1:: @ 82DB9C1 - .incbin "base_emerald.gba", 0x2db9c1, 0x7 - -gUnknown_082DB9C8:: @ 82DB9C8 - .incbin "base_emerald.gba", 0x2db9c8, 0xc - -@ 82DB9D4 - .include "data/field_effect_scripts.s" - - .align 2, 0 - -gUnknown_082DBD08:: @ 82DBD08 - .incbin "base_emerald.gba", 0x2dbd08, 0x34 - -gUnknown_082DBD3C:: @ 82DBD3C - .incbin "base_emerald.gba", 0x2dbd3c, 0x18 - -gUnknown_082DBD54:: @ 82DBD54 - .incbin "base_emerald.gba", 0x2dbd54, 0x4 - -gUnknown_082DBD58:: @ 82DBD58 - .incbin "base_emerald.gba", 0x2dbd58, 0x2c - -gUnknown_082DBD84:: @ 82DBD84 - .incbin "base_emerald.gba", 0x2dbd84, 0x46 - -gUnknown_082DBDCA:: @ 82DBDCA - .incbin "base_emerald.gba", 0x2dbdca, 0xa - -gUnknown_082DBDD4:: @ 82DBDD4 - .incbin "base_emerald.gba", 0x2dbdd4, 0x2e - -gUnknown_082DBE02:: @ 82DBE02 - .incbin "base_emerald.gba", 0x2dbe02, 0xf6 - -gUnknown_082DBEF8:: @ 82DBEF8 - .incbin "base_emerald.gba", 0x2dbef8, 0x2458 - -gUnknown_082DE350:: @ 82DE350 - .incbin "base_emerald.gba", 0x2de350, 0x9dc - -gUnknown_082DED2C:: @ 82DED2C - .incbin "base_emerald.gba", 0x2ded2c, 0x44 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 0bc02c664..89f3a2505 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,3 +1,8 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + .align 2, 0 gFieldEffectScriptPointers:: @ 82DB9D4 diff --git a/data/script_funcs.s b/data/script_funcs.s new file mode 100644 index 000000000..276807fa5 --- /dev/null +++ b/data/script_funcs.s @@ -0,0 +1,21 @@ + .section script_data, "aw", %progbits + + .align 2 +gUnknown_082DED2C:: @ 82DED2C + .4byte sub_8153A80 + .4byte sub_8153A30 + .4byte script_status_stop_and_ret_1 + .4byte sub_8153A94 + .4byte sub_8153A84 + .4byte sub_8153ACC + .4byte sub_8153BE4 + .4byte sub_8153AE8 + .4byte sub_8153BB0 + .4byte sub_8153C4C + .4byte sub_8153C70 + .4byte sub_8153C9C + .4byte sub_8153CC8 + .4byte sub_8153DD4 + .4byte sub_8153E1C + .4byte sub_8153E40 + .4byte sub_8153E88 diff --git a/ld_script.txt b/ld_script.txt index 3914fe005..6ab6fbee2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -52,7 +52,14 @@ SECTIONS { script_data : ALIGN(4) { - data/data1.o(script_data); + data/event_scripts.o(script_data); + data/battle_anim_scripts.o(script_data); + data/battle_scripts_1.o(script_data); + data/field_effect_scripts.o(script_data); + data/battle_scripts_2.o(script_data); + data/battle_ai_scripts.o(script_data); + data/contest_ai_scripts.o(script_data); + data/script_funcs.o(script_data); } =0 lib_text :