summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data_83FECCC.s5
-rw-r--r--data/data_8466FB8.s13
-rw-r--r--data/mevent/script_common.inc84
-rw-r--r--data/mevent/script_ish.inc65
4 files changed, 158 insertions, 9 deletions
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index 15416aed2..c89f5f308 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -3176,7 +3176,10 @@ gUnknown_8459580:: @ 8459580
.incbin "baserom.gba", 0x459580, 0x8
gUnknown_8459588:: @ 8459588
- .incbin "baserom.gba", 0x459588, 0xAC
+ .incbin "baserom.gba", 0x459588, 0x64
+
+gUnknown_84595EC::
+ .incbin "baserom.gba", 0x4595EC, 0x48
gUnknown_8459634:: @ 8459634
.incbin "baserom.gba", 0x459634, 0x8
diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s
index 0ca0bcbf3..ee830ca04 100644
--- a/data/data_8466FB8.s
+++ b/data/data_8466FB8.s
@@ -1,3 +1,6 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
.section .rodata
.align 2
@@ -34,11 +37,5 @@ gUnknown_8468050:: @ 8468050
gUnknown_8468720:: @ 8468720
.incbin "baserom.gba", 0x468720, 0xC0
-gUnknown_84687E0:: @ 84687E0
- .incbin "baserom.gba", 0x4687E0, 0x38C
-
-gUnknown_8468B6C:: @ 8468B6C
- .incbin "baserom.gba", 0x468B6C, 0x60
-
-gUnknown_8468BCC:: @ 8468BCC
- .incbin "baserom.gba", 0x468BCC, 0x90
+ .include "data/mevent/script_ish.inc"
+ .include "data/mevent/script_common.inc"
diff --git a/data/mevent/script_common.inc b/data/mevent/script_common.inc
new file mode 100644
index 000000000..abf03ab95
--- /dev/null
+++ b/data/mevent/script_common.inc
@@ -0,0 +1,84 @@
+gUnknown_8468920::
+ .4byte 0x12, 0x10, gUnknown_8468810
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x14, NULL
+ .4byte 0x00, 0x0a, NULL
+ .4byte 0x12, 0x10, gUnknown_8468820
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x14, NULL
+ .4byte 0x00, 0x0b, NULL
+ .4byte 0x12, 0x10, gUnknown_84688E0
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x14, NULL
+ .4byte 0x00, 0x09, NULL
+
+gUnknown_84689B0::
+ .4byte 0x12, 0x10, gUnknown_8468898
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x14, NULL
+ .4byte 0x00, 0x07, NULL
+
+gUnknown_84689E0::
+ .4byte 0x12, 0x28, gUnknown_8468870
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x0e, 0x00, NULL
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x13, NULL
+ .4byte 0x08, 0x00, NULL
+ .4byte 0x04, 0x01, gUnknown_84689B0
+ .4byte 0x12, 0x10, gUnknown_84688A8
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x14, NULL
+ .4byte 0x00, 0x03, NULL
+
+gUnknown_8468A64::
+ .4byte 0x12, 0x30, gUnknown_8468840
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x0d, 0x00, NULL
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x0f, 0x00, NULL
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x14, NULL
+ .4byte 0x00, 0x02, NULL
+
+gUnknown_8468AC4::
+ .4byte 0x12, 0x28, gUnknown_84688B8
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x13, NULL
+ .4byte 0x08, 0x00, NULL
+ .4byte 0x04, 0x00, gUnknown_8468A64
+ .4byte 0x03, 0x00, gUnknown_84595EC
+
+gUnknown_8468B0C::
+ .4byte 0x12, 0x10, gUnknown_84688F0
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x14, NULL
+ .4byte 0x00, 0x05, NULL
+ .4byte 0x12, 0x10, gUnknown_8468830
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x14, NULL
+ .4byte 0x00, 0x00, NULL
+
+gUnknown_8468B6C:: @ 8468B6C
+ .4byte 0x1b, 0x00, NULL
+ .4byte 0x12, 0x20, gUnknown_84687F0
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x11, NULL
+ .4byte 0x05, 0x00, NULL
+ .4byte 0x06, 0x00, NULL
+ .4byte 0x04, 0x00, gUnknown_8468920
+ .4byte 0x03, 0x00, gUnknown_84689E0
+
+gUnknown_8468BCC:: @ 8468BCC
+ .4byte 0x1a, 0x00, NULL
+ .4byte 0x1c, 0x00, NULL
+ .4byte 0x12, 0x20, gUnknown_84687F0
+ .4byte 0x01, 0x00, NULL
+ .4byte 0x02, 0x11, NULL
+ .4byte 0x05, 0x00, NULL
+ .4byte 0x06, 0x00, NULL
+ .4byte 0x04, 0x00, gUnknown_8468920
+ .4byte 0x07, 0x00, NULL
+ .4byte 0x04, 0x02, gUnknown_8468AC4
+ .4byte 0x04, 0x00, gUnknown_8468A64
+ .4byte 0x03, 0x00, gUnknown_8468B0C
diff --git a/data/mevent/script_ish.inc b/data/mevent/script_ish.inc
new file mode 100644
index 000000000..3d79cf1ee
--- /dev/null
+++ b/data/mevent/script_ish.inc
@@ -0,0 +1,65 @@
+gUnknown_84687E0:: @ 84687E0
+ .4byte 0x02, 0x10 @ RECEIVE ID(0x10)
+ .4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
+
+gUnknown_84687F0::
+ .4byte 0x08, 0x00 @ SEND HEADER MAYBE
+ .4byte 0x03, 0x00 @ WAIT SEND
+ .4byte 0x02, 0x10 @ RECEIVE ID(0x10)
+ .4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
+
+gUnknown_8468810::
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x0a @ RETURN 0x0a
+
+gUnknown_8468820::
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x0b @ RETURN 0x0b
+
+gUnknown_8468830::
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x00 @ RETURN 0x00
+
+gUnknown_8468840::
+ .4byte 0x02, 0x16 @ RECEIVE ID(0x16)
+ .4byte 0x0a, 0x00 @ RECEIVE_TO_SAVE_FILE
+ .4byte 0x02, 0x19 @ RECEIVE ID(0x19)
+ .4byte 0x11, 0x00 @ RECEIVE_TO_RAM_SCRIPT
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x02 @ RETURN 0x02
+
+gUnknown_8468870::
+ .4byte 0x02, 0x17 @ RECEIVE ID(0x17)
+ .4byte 0x09, 0x00 @ VALIDATE BUFF3120
+ .4byte 0x03, 0x00 @ WAIT SEND
+ .4byte 0x02, 0x10 @ RECEIVE ID(0x10)
+ .4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
+
+gUnknown_8468898::
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x07 @ RETURN 0x07
+
+gUnknown_84688A8::
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x03 @ RETURN 0x03
+
+gUnknown_84688B8::
+ .4byte 0x0d, 0x00 @ REQUEST PARAMETER
+ .4byte 0x0e, 0x00 @ SEND PARAMETER
+ .4byte 0x03, 0x00 @ WAIT SEND
+ .4byte 0x02, 0x10 @ RECEIVE ID(0x10)
+ .4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
+
+gUnknown_84688E0::
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x09 @ RETURN 0x09
+
+gUnknown_84688F0::
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x05 @ RETURN 0x05
+
+gUnknown_8468900::
+ .4byte 0x02, 0x15 @ RECEIVE ID(0x15)
+ .4byte 0x0c, 0x00 @ READ PACKET AND COMPUTE SOMETHING
+ .4byte 0x14, 0x00 @ SEND ALL
+ .4byte 0x01, 0x0d @ RETURN 0x0d
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 12:14:29 +0000