summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/rfu_union_tool.s43
-rw-r--r--data/union_room_message.s (renamed from data/union_room.s)347
2 files changed, 47 insertions, 343 deletions
diff --git a/data/rfu_union_tool.s b/data/rfu_union_tool.s
new file mode 100644
index 000000000..0c6460116
--- /dev/null
+++ b/data/rfu_union_tool.s
@@ -0,0 +1,43 @@
+#include "constants/region_map.h"
+#include "constants/flags.h"
+#include "constants/moves.h"
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+ .section .rodata
+ .align 2
+
+gUnknown_8457120:: @ 8457120
+ .byte 0x09, 0x08, 0x07, 0x02, 0x06, 0x05, 0x04, 0x03, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00
+
+ .align 2
+gUnknown_8457138:: @ 8457138
+ abspath "rfu_union_tool.c"
+
+ .align 2
+gUnknown_8457174:: @ 8457174
+ .asciz "0"
+
+ .align 2
+gUnknown_8457178:: @ 8457178
+ .asciz "UnionObjWork != NULL"
+
+gUnknown_845718D:: @ 845718D
+ .byte 0xA4, 0xFE
+
+gUnknown_845718F:: @ 845718F
+ .byte 0xA5, 0xFE
+
+ .align 2
+gUnknown_8457194:: @ 8457194
+ .2byte 0x01FC, 0x0000 @ BgTemplate
+
+gUnknown_8457198:: @ 8457198
+ .byte 0x00, 0x02, 0x0F, 0x1A, 0x04, 0x0E @ window template
+ .2byte 0x0014
+
+ @ ???
+ .byte -1, 0, 0, 0
+ .byte 0, 0, 0, 0
+
+gUnknown_84571A8:: @ 84571A8
+ .byte 0x01, 0x02, 0x03, 0x00
diff --git a/data/union_room.s b/data/union_room_message.s
index 9bcc4a193..0d72f7c1d 100644
--- a/data/union_room.s
+++ b/data/union_room_message.s
@@ -4,347 +4,8 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
- .align 2
-
-gUnknown_8456C74:: @ 8456C74
- .word gUnknown_84571AC
- .word gUnknown_8459394
- .word gUnknown_84593A4
- .word gUnknown_84593B4
- .word gUnknown_84593C4
- .word gUnknown_84593D4
- .word gUnknown_84593E4
- .word gUnknown_84593F4
- .word gUnknown_84593DC
- .word gUnknown_8459400
- .word gUnknown_8459410
- .word gUnknown_845941C
- .word gUnknown_845942C
- .word gUnknown_8459434
- .word gUnknown_8459440
- .word gUnknown_84571AC
- .word gUnknown_84571AC
- .word gUnknown_84571AC
- .word gUnknown_84571AC
- .word gUnknown_84571AC
- .word gUnknown_84571AC
- .word gUnknown_84593E4
- .word gUnknown_84593F4
-
-gUnknown_8456CD0:: @ 8456CD0
- .byte 0x00, 0x00, 0x00, 0x1E, 0x02, 0x0F @ window template
- .2byte 0x0008
-
- @ pal table?
-gUnknown_8456CD8:: @ 8456CD8
- .2byte 0x0201, 0x0000
- .2byte 0x0202, 0x0000
- .2byte 0x0403, 0x0000
- .2byte 0x0204, 0x0000
- .2byte 0x2509, 0x0000
- .2byte 0x250A, 0x0000
- .2byte 0x350B, 0x0000
- .2byte 0x350D, 0x0000
- .2byte 0x350E, 0x0000
-
-gUnknown_8456CFC:: @ 8456CFC
- .byte 0x00, 0x01, 0x03, 0x0D, 0x0A, 0x0F @ window template
- .2byte 0x0044
-
-gUnknown_8456D04:: @ 8456D04
- .byte 0x00, 0x10, 0x03, 0x07, 0x04, 0x0F @ window template
- .2byte 0x00C6
-
-gUnknown_8456D0C:: @ 8456D0C
- .word gUnknown_84571AC, 0
- .word gUnknown_84571AC, 1
- .word gUnknown_84571AC, 2
- .word gUnknown_84571AC, 3
- .word gUnknown_84571AC, 4
-
-gUnknown_8456D34:: @ 8456D34
- .word gUnknown_8456D0C
- .word NULL
- .word sub_81164C8
- .2byte 0x0005
- .2byte 0x0005
- .byte 0x00, 0x00, 0x01, 0x00, 0x20, 0x31, 0x10, 0x42
-
-gUnknown_8456D4C:: @ 8456D4C
- .byte 0x00, 0x01, 0x03, 0x11, 0x0A, 0x0F @ window template
- .2byte 0x0044
-
-gUnknown_8456D54:: @ 8456D54
- .byte 0x00, 0x14, 0x03, 0x07, 0x04, 0x0F @ window template
- .2byte 0x00EE
-
-gUnknown_8456D5C:: @ 8456D5C
- .word gUnknown_84571AC, 0
- .word gUnknown_84571AC, 1
- .word gUnknown_84571AC, 2
- .word gUnknown_84571AC, 3
- .word gUnknown_84571AC, 4
- .word gUnknown_84571AC, 5
- .word gUnknown_84571AC, 6
- .word gUnknown_84571AC, 7
- .word gUnknown_84571AC, 8
- .word gUnknown_84571AC, 9
- .word gUnknown_84571AC, 10
- .word gUnknown_84571AC, 11
- .word gUnknown_84571AC, 12
- .word gUnknown_84571AC, 13
- .word gUnknown_84571AC, 14
- .word gUnknown_84571AC, 15
-
-gUnknown_8456DDC:: @ 8456DDC
- .word gUnknown_8456D5C
- .word ListMenuDefaultCursorMoveFunc
- .word sub_8116F94
- .2byte 0x0010
- .2byte 0x0005
- .byte 0x00, 0x00, 0x08, 0x00, 0x20, 0x31, 0x50, 0x02
-
-gUnknown_8456DF4:: @ 8456DF4
- .byte 0x00, 0x14, 0x06, 0x08, 0x07, 0x0F @ window template?
- .2byte 0x0001
-
-gUnknown_8456DFC:: @ 8456DFC
- .word gUnknown_8459354, 0x00000208
- .word gUnknown_8459344, 0x00000241
- .word gUnknown_845934C, 0x00000245
- .word gUnknown_8459360, 0x00000040
-
-gUnknown_8456E1C:: @ 8456E1C
- .word gUnknown_8456DFC
- .word ListMenuDefaultCursorMoveFunc
- .word NULL
- .2byte 0x0004
- .2byte 0x0004
- .byte 0x00, 0x00, 0x08, 0x00, 0x20, 0x31, 0x01, 0x02
-
-gUnknown_8456E34:: @ 8456E34
- .byte 0x00, 0x12, 0x08, 0x0B, 0x05, 0x0F @ window template
- .2byte 0x0001
-
-gUnknown_8456E3C:: @ 8456E3C
- .word gText_Register, 1
- .word gUnknown_8459370, 2
- .word gUnknown_8459360, 3
-
-gUnknown_8456E54:: @ 8456E54
- .word gUnknown_8456E3C
- .word ListMenuDefaultCursorMoveFunc
- .word NULL
- .2byte 0x0003
- .2byte 0x0003
- .byte 0x00, 0x00, 0x08, 0x00, 0x20, 0x31, 0x01, 0x02
-
-gUnknown_8456E6C:: @ 8456E6C
- .byte 0x00, 0x14, 0x02, 0x09, 0x0B, 0x0F @ window template
- .2byte 0x0001
-
-gUnknown_8456E74:: @ 8456E74
- .word gTypeNames + 0x00, 0
- .word gTypeNames + 0x46, 10
- .word gTypeNames + 0x4D, 11
- .word gTypeNames + 0x5B, 13
- .word gTypeNames + 0x54, 12
- .word gTypeNames + 0x69, 15
- .word gTypeNames + 0x1C, 4
- .word gTypeNames + 0x23, 5
- .word gTypeNames + 0x0E, 2
- .word gTypeNames + 0x62, 14
- .word gTypeNames + 0x07, 1
- .word gTypeNames + 0x15, 3
- .word gTypeNames + 0x2A, 6
- .word gTypeNames + 0x31, 7
- .word gTypeNames + 0x70, 16
- .word gTypeNames + 0x38, 8
- .word gTypeNames + 0x77, 17
- .word gUnknown_8459360, 18
-
-gUnknown_8456F04:: @ 8456F04
- .word gUnknown_8456E74
- .word ListMenuDefaultCursorMoveFunc
- .word NULL
- .2byte 0x0012
- .2byte 0x0006
- .byte 0x00, 0x00, 0x08, 0x00, 0x22, 0x31, 0x01, 0x02
-
-gUnknown_8456F1C:: @ 8456F1C
- .byte 0x00, 0x01, 0x01, 0x1C, 0x02, 0x0D @ window template
- .2byte 0x0001
-
-gUnknown_8456F24:: @ 8456F24
- .byte 0x00, 0x01, 0x05, 0x1C, 0x0A, 0x0D @ window template
- .2byte 0x0039
-
-gUnknown_8456F2C:: @ 8456F2C
- .word gUnknown_84571AC, -3
- .word gUnknown_84571AC, 0
- .word gUnknown_84571AC, 1
- .word gUnknown_84571AC, 2
- .word gUnknown_84571AC, 3
- .word gUnknown_84571AC, 4
- .word gUnknown_84571AC, 5
- .word gUnknown_84571AC, 6
- .word gUnknown_84571AC, 7
- .word gUnknown_8459368, 8
-
-gUnknown_8456F7C:: @ 8456F7C
- .word gUnknown_8456F2C
- .word ListMenuDefaultCursorMoveFunc
- .word sub_811ACA4
- .2byte 0x000A
- .2byte 0x0005
- .byte 0x00, 0x00, 0x0C, 0x00, 0xE2, 0xDF, 0x09, 0x02
-
- @ unused window template?
- .byte 0x00, 0x01, 0x05, 0x1C, 0x0A, 0x0D
- .2byte 0x0039
-
-gUnknown_8456F9C:: @ 8456F9C
- .word gUnknown_84571AC, 0
- .word gUnknown_84571AC, 1
- .word gUnknown_84571AC, 2
- .word gUnknown_84571AC, 3
- .word gUnknown_84571AC, 4
- .word gUnknown_84571AC, 5
- .word gUnknown_84571AC, 6
- .word gUnknown_84571AC, 7
- .word gUnknown_84571AC, 8
- .word gUnknown_84571AC, 9
- .word gUnknown_84571AC, 10
- .word gUnknown_84571AC, 11
- .word gUnknown_84571AC, 12
- .word gUnknown_84571AC, 13
- .word gUnknown_84571AC, 14
- .word gUnknown_84571AC, 15
-
-gUnknown_845701C:: @ 845701C
- .word gUnknown_8456F9C
- .word ListMenuDefaultCursorMoveFunc
- .word nullsub_92
- .2byte 0x0010
- .2byte 0x0004
- .byte 0x00, 0x00, 0x08, 0x01, 0x20, 0x31, 0x41, 0x02
-
-gUnknown_8457034:: @ 8457034
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- @ starts at gUnknown_082F0474 in pokeemerald, union link groups
-gUnknown_845704C:: @ 845704C
- .byte 0x01, 0xFF, 0x00, 0x00
-gUnknown_8457050:: @ 8457050
- .byte 0x02, 0xFF, 0x00, 0x00
-gUnknown_8457054:: @ 8457054
- .byte 0x03, 0xFF, 0x00, 0x00
-gUnknown_8457058:: @ 8457058
- .byte 0x04, 0xFF, 0x00, 0x00
-gUnknown_845705C:: @ 845705C
- .byte 0x09, 0xFF, 0x00, 0x00
-gUnknown_8457060:: @ 8457060
- .byte 0x0A, 0xFF, 0x00, 0x00
-gUnknown_8457064:: @ 8457064
- .byte 0x0B, 0xFF, 0x00, 0x00
-gUnknown_8457068:: @ 8457068
- .byte 0x15, 0xFF, 0x00, 0x00
-gUnknown_845706C:: @ 845706C
- .byte 0x16, 0xFF, 0x00, 0x00
-gUnknown_8457070:: @ 8457070
- .byte 0x40, 0x41, 0x44, 0x45, 0x48, 0x51, 0x52, 0x53, 0x54, 0xFF, 0x00, 0x00
-gUnknown_845707C:: @ 845707C
- .byte 0x0C, 0xFF, 0x00, 0x00
-gUnknown_8457080:: @ 8457080
- .byte 0x01, 0x02, 0x03, 0x04, 0x09, 0x0A, 0x0B, 0x15, 0x16, 0x0D, 0xFF, 0x00
-gUnknown_845708C:: @ 845708C
- .byte 0x01, 0x02, 0x03, 0x04, 0x0A, 0xFF, 0x00, 0x00
-
-gUnknown_8457094:: @ 8457094
- .word gUnknown_845704C
- .word gUnknown_8457050
- .word gUnknown_8457054
- .word gUnknown_8457058
- .word gUnknown_845705C
- .word gUnknown_8457060
- .word gUnknown_8457064
- .word gUnknown_8457068
- .word gUnknown_845706C
- .word gUnknown_8457070
- .word gUnknown_845707C
- .word gUnknown_8457080
- .word gUnknown_845708C
-
-gUnknown_84570C8:: @ 84570C8
- .byte 0x01, 0x02, 0x03, 0x04, 0x09, 0x0A, 0x0B, 0x15, 0x16, 0xF7, 0x00, 0xAF, 0xF7, 0x01, 0xFF, 0x00
-
-gUnknown_84570D8:: @ 84570D8
- .byte 0x29, 0x36, 0x27, 0x12, 0x13, 0x14, 0x19, 0x1A, 0x00, 0x00, 0x2A, 0x3A, 0x28, 0x16, 0x17, 0x18, 0x1C, 0x1D, 0x00, 0x00
-
-gUnknown_84570EC:: @ 84570EC
- .2byte 0x0004
- .2byte 0x0006
- .2byte 0x000D
- .2byte 0x0008
- .2byte 0x000A
- .2byte 0x0006
- .2byte 0x0001
- .2byte 0x0008
- .2byte 0x000D
- .2byte 0x0004
- .2byte 0x0007
- .2byte 0x0004
- .2byte 0x0001
- .2byte 0x0004
- .2byte 0x0007
- .2byte 0x0008
-
-gUnknown_845710C:: @ 845710C
- .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01
-
-gUnknown_8457116:: @ 8457116
- .byte 0x00, 0x02, 0x01, 0x04, 0x03
-
-gUnknown_845711B:: @ 845711B
- .byte 0x01, 0x03, 0x01, 0x04, 0x02
-
-gUnknown_8457120:: @ 8457120
- .byte 0x09, 0x08, 0x07, 0x02, 0x06, 0x05, 0x04, 0x03, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00
-
- .align 2
-gUnknown_8457138:: @ 8457138
- abspath "rfu_union_tool.c"
-
- .align 2
-gUnknown_8457174:: @ 8457174
- .asciz "0"
-
- .align 2
-gUnknown_8457178:: @ 8457178
- .asciz "UnionObjWork != NULL"
-
-gUnknown_845718D:: @ 845718D
- .byte 0xA4, 0xFE
-
-gUnknown_845718F:: @ 845718F
- .byte 0xA5, 0xFE, 0x00, 0x00, 0x00
-
-gUnknown_8457194:: @ 8457194
- .2byte 0x01FC, 0x0000 @ BgTemplate
-
-gUnknown_8457198:: @ 8457198
- .byte 0x00, 0x02, 0x0F, 0x1A, 0x04, 0x0E @ window template
- .2byte 0x0014
-
- @ ???
- .byte -1, 0, 0, 0
- .byte 0, 0, 0, 0
-
-gUnknown_84571A8:: @ 84571A8
- .byte 0x01, 0x02, 0x03, 0x00
+ .align 2
gUnknown_84571AC:: @ 84571AC
.string "$"
@@ -533,7 +194,7 @@ gUnknown_8457554:: @ 8457554
.string "An “OK” was sent\nto {STR_VAR_1}.$"
.align 2
-gUnknown_845756C:: @ 845756C
+gUnknown_845756C:: @ 845756C
.string "The other TRAINER doesn't appear\nto be available now…\p$"
.align 2
@@ -587,7 +248,7 @@ gUnknown_845771C:: @ 845771C
.string "Quit being a member?$"
.align 2
-gUnknown_8457734:: @ 8457734
+gUnknown_8457734:: @ 8457734
.string "You stopped being a member.\p$"
.align 2
@@ -1393,7 +1054,7 @@ gUnknown_8459250:: @ 8459250
gUnknown_845928C:: @ 845928C
.string "Awaiting a response from the\n"
.string "WIRELESS COMMUNICATION SYSTEM.$"
-
+
.align 2
.string "ほかの さんかしゃが そろうまで\n"
.string "しょうしょう おまちください$"