From 746006911096730ea6d5f14bfff5957ef9b5bc2c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 11:35:31 -0500 Subject: sub_8143910 --- data/data_83FECCC.s | 63 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 21 deletions(-) (limited to 'data') diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 2e5c0e6c7..15416aed2 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1956,67 +1956,88 @@ gUnknown_841D198:: @ 841D198 .incbin "baserom.gba", 0x41D198, 0xCB8 gUnknown_841DE50:: @ 841DE50 - .incbin "baserom.gba", 0x41DE50, 0x1 + .string "$" gUnknown_841DE51:: @ 841DE51 - .incbin "baserom.gba", 0x41DE51, 0x1 + .string "$" gUnknown_841DE52:: @ 841DE52 - .incbin "baserom.gba", 0x41DE52, 0x1 + .string "$" gUnknown_841DE53:: @ 841DE53 - .incbin "baserom.gba", 0x41DE53, 0x1 + .string "$" gUnknown_841DE54:: @ 841DE54 - .incbin "baserom.gba", 0x41DE54, 0x28 + .string "$" + +gUnknown_841DE55:: @ 841DE55 + .incbin "baserom.gba", 0x41DE55, 0x27 @ japanese gUnknown_841DE7C:: @ 841DE7C - .incbin "baserom.gba", 0x41DE7C, 0x1 + .string "$" gUnknown_841DE7D:: @ 841DE7D - .incbin "baserom.gba", 0x41DE7D, 0x18 + .string "$" + +gUnknown_841DE7E:: @ 841DE7E + .incbin "baserom.gba", 0x0041de7e, 0x17 @ japanese gUnknown_841DE95:: @ 841DE95 - .incbin "baserom.gba", 0x41DE95, 0x1 + .string "$" gUnknown_841DE96:: @ 841DE96 - .incbin "baserom.gba", 0x41DE96, 0x1 + .string "$" gUnknown_841DE97:: @ 841DE97 - .incbin "baserom.gba", 0x41DE97, 0x1 + .string "$" gUnknown_841DE98:: @ 841DE98 - .incbin "baserom.gba", 0x41DE98, 0x1 + .string "$" gUnknown_841DE99:: @ 841DE99 - .incbin "baserom.gba", 0x41DE99, 0x1 + .string "$" gUnknown_841DE9A:: @ 841DE9A - .incbin "baserom.gba", 0x41DE9A, 0x1 + .string "$" gUnknown_841DE9B:: @ 841DE9B - .incbin "baserom.gba", 0x41DE9B, 0x1 + .string "$" gUnknown_841DE9C:: @ 841DE9C - .incbin "baserom.gba", 0x41DE9C, 0x1 + .string "$" gUnknown_841DE9D:: @ 841DE9D - .incbin "baserom.gba", 0x41DE9D, 0x53 + .string "Communication error…\n" + .string "Please check all connections,\n" + .string "then turn the power OFF and ON.$" gUnknown_841DEF0:: @ 841DEF0 - .incbin "baserom.gba", 0x41DEF0, 0x15 + .string "Communication error…$" gUnknown_841DF05:: @ 841DF05 - .incbin "baserom.gba", 0x41DF05, 0x47 + .string "Move closer to your link partner(s).\n" + .string "Avoid obstacles between partners.$" gUnknown_841DF4C:: @ 841DF4C - .incbin "baserom.gba", 0x41DF4C, 0x1F + .string "A Button: Registration Counter$" gUnknown_841DF6B:: @ 841DF6B - .incbin "baserom.gba", 0x41DF6B, 0x17 + .string "A Button: Title Screen$" gUnknown_841DF82:: @ 841DF82 - .incbin "baserom.gba", 0x41DF82, 0x23 + .string "{STR_VAR_1}P LINK$" + +gUnknown_841DF8B:: @ 841DF8B + .string "BRONZE$" + +gUnknown_841DF92:: @ 841DF92 + .string "COPPER$" + +gUnknown_841DF99:: @ 841DF99 + .string "SILVER$" + +gUnknown_841DFA0:: @ 841DFA0 + .string "GOLD$" gUnknown_841DFA5:: @ 841DFA5 .incbin "baserom.gba", 0x41DFA5, 0x7 -- cgit v1.2.3 From 939ae833c3364d7ea7543c4db56df5c90b4e9d8d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Nov 2018 19:17:38 -0500 Subject: through sub_81445C0 --- data/data_845FD54.s | 86 ----------------------------------------------------- data/data_8466FB8.s | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 86 deletions(-) create mode 100644 data/data_8466FB8.s (limited to 'data') diff --git a/data/data_845FD54.s b/data/data_845FD54.s index d2b52192d..d05e14570 100644 --- a/data/data_845FD54.s +++ b/data/data_845FD54.s @@ -598,89 +598,3 @@ gUnknown_8466EE8:: @ 8466EE8 gUnknown_8466EF0:: @ 8466EF0 .incbin "baserom.gba", 0x466EF0, 0x10 - -gUnknown_8466F00:: @ 8466F00 - .incbin "baserom.gba", 0x466F00, 0x28 - - .align 2 -gUnknown_8466F28:: @ 8466F28 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" - - .align 2 -gUnknown_8466F5C:: @ 8466F5C - .asciz "0" - - .align 2 -gUnknown_8466F60:: @ 8466F60 - .incbin "baserom.gba", 0x466F60, 0x20 - - .align 2 -gUnknown_8466F80:: @ 8466F80 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - - .align 2 -gUnknown_8466FB8:: @ 8466FB8 - .asciz "size <= ME_SEND_BUF_SIZE" - - .align 2 -gUnknown_8466FD4:: @ 8466FD4 - .asciz "cmd->parameter == NULL" - - .align 2 -gUnknown_8466FEC:: @ 8466FEC - .asciz "cmd->flag == FALSE" - - .align 2 -gUnknown_8467000:: @ 8467000 - .asciz "cmd->flag == FALSE && cmd->parameter == NULL" - - .align 2 -gUnknown_8467030:: @ 8467030 - .incbin "baserom.gba", 0x467030, 0x14 - - .align 2 -gUnknown_8467044:: @ 8467044 - .asciz "svr->mainseqno < NELEMS(func_tbl)" - - .align 2 -gUnknown_8467068:: @ 8467068 - .incbin "baserom.gba", 0x467068, 0x8 - -gUnknown_8467070:: @ 8467070 - .incbin "baserom.gba", 0x467070, 0x4 - -gUnknown_8467074:: @ 8467074 - .incbin "baserom.gba", 0x467074, 0xEE4 - -gUnknown_8467F58:: @ 8467F58 - .incbin "baserom.gba", 0x467F58, 0x8 - -gUnknown_8467F60:: @ 8467F60 - .incbin "baserom.gba", 0x467F60, 0x40 - -gUnknown_8467FA0:: @ 8467FA0 - .incbin "baserom.gba", 0x467FA0, 0x18 - -gUnknown_8467FB8:: @ 8467FB8 - .incbin "baserom.gba", 0x467FB8, 0x80 - -gUnknown_8468038:: @ 8468038 - .incbin "baserom.gba", 0x468038, 0x8 - -gUnknown_8468040:: @ 8468040 - .incbin "baserom.gba", 0x468040, 0x10 - -gUnknown_8468050:: @ 8468050 - .incbin "baserom.gba", 0x468050, 0x6D0 - -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 diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s new file mode 100644 index 000000000..3f4fd49cd --- /dev/null +++ b/data/data_8466FB8.s @@ -0,0 +1,76 @@ + .section .rodata + + .align 2 +gUnknown_8466F60:: @ 8466F60 + .incbin "baserom.gba", 0x466F60, 0x20 + + .align 2 +gUnknown_8466F80:: @ 8466F80 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" + + .align 2 +gUnknown_8466FB8:: @ 8466FB8 + .asciz "size <= ME_SEND_BUF_SIZE" + + .align 2 +gUnknown_8466FD4:: @ 8466FD4 + .asciz "cmd->parameter == NULL" + + .align 2 +gUnknown_8466FEC:: @ 8466FEC + .asciz "cmd->flag == FALSE" + + .align 2 +gUnknown_8467000:: @ 8467000 + .asciz "cmd->flag == FALSE && cmd->parameter == NULL" + + .align 2 +gUnknown_8467030:: @ 8467030 + .incbin "baserom.gba", 0x467030, 0x14 + + .align 2 +gUnknown_8467044:: @ 8467044 + .asciz "svr->mainseqno < NELEMS(func_tbl)" + + .align 2 +gUnknown_8467068:: @ 8467068 + .incbin "baserom.gba", 0x467068, 0x8 + +gUnknown_8467070:: @ 8467070 + .incbin "baserom.gba", 0x467070, 0x4 + +gUnknown_8467074:: @ 8467074 + .incbin "baserom.gba", 0x467074, 0xEE4 + +gUnknown_8467F58:: @ 8467F58 + .incbin "baserom.gba", 0x467F58, 0x8 + +gUnknown_8467F60:: @ 8467F60 + .incbin "baserom.gba", 0x467F60, 0x40 + +gUnknown_8467FA0:: @ 8467FA0 + .incbin "baserom.gba", 0x467FA0, 0x18 + +gUnknown_8467FB8:: @ 8467FB8 + .incbin "baserom.gba", 0x467FB8, 0x80 + +gUnknown_8468038:: @ 8468038 + .incbin "baserom.gba", 0x468038, 0x8 + +gUnknown_8468040:: @ 8468040 + .incbin "baserom.gba", 0x468040, 0x10 + +gUnknown_8468050:: @ 8468050 + .incbin "baserom.gba", 0x468050, 0x6D0 + +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 -- cgit v1.2.3 From 294b150d70385a117e1324fd1e13bab25bfaabc9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 08:47:58 -0500 Subject: Set up to decomp mevent_server --- data/data_8466FB8.s | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 3f4fd49cd..21ee2e1df 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -2,7 +2,14 @@ .align 2 gUnknown_8466F60:: @ 8466F60 - .incbin "baserom.gba", 0x466F60, 0x20 + .4byte sub_8144C34 + .4byte sub_8144C5C + .4byte sub_8144C60 + .4byte sub_8144C80 + .4byte sub_8144CA0 + .4byte sub_8144E6C + .4byte sub_8144E84 + .4byte sub_8144EBC .align 2 gUnknown_8466F80:: @ 8466F80 @@ -26,7 +33,11 @@ gUnknown_8467000:: @ 8467000 .align 2 gUnknown_8467030:: @ 8467030 - .incbin "baserom.gba", 0x467030, 0x14 + .4byte sub_8145080 + .4byte sub_8145088 + .4byte sub_814508C + .4byte sub_81450A8 + .4byte sub_81450C4 .align 2 gUnknown_8467044:: @ 8467044 -- cgit v1.2.3 From f178d06946a4debf6a0551094d3ef2f70b7b364c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 12:26:24 -0500 Subject: through mevent_srv_ish_exec --- data/data_8466FB8.s | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 21ee2e1df..bdfdaaa6b 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -1,16 +1,5 @@ .section .rodata - .align 2 -gUnknown_8466F60:: @ 8466F60 - .4byte sub_8144C34 - .4byte sub_8144C5C - .4byte sub_8144C60 - .4byte sub_8144C80 - .4byte sub_8144CA0 - .4byte sub_8144E6C - .4byte sub_8144E84 - .4byte sub_8144EBC - .align 2 gUnknown_8466F80:: @ 8466F80 .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" -- cgit v1.2.3 From 8a8e86fa4fe0a7932f475c7aa8424ea840327e4b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 15:26:16 -0500 Subject: split mevent_server --- data/data_8466FB8.s | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index bdfdaaa6b..c34887d86 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -1,27 +1,7 @@ .section .rodata .align 2 -gUnknown_8466F80:: @ 8466F80 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" - - .align 2 -gUnknown_8466FB8:: @ 8466FB8 - .asciz "size <= ME_SEND_BUF_SIZE" - - .align 2 -gUnknown_8466FD4:: @ 8466FD4 - .asciz "cmd->parameter == NULL" - - .align 2 -gUnknown_8466FEC:: @ 8466FEC - .asciz "cmd->flag == FALSE" - - .align 2 -gUnknown_8467000:: @ 8467000 - .asciz "cmd->flag == FALSE && cmd->parameter == NULL" - - .align 2 -gUnknown_8467030:: @ 8467030 +func_tbl:: @ 8467030 .4byte sub_8145080 .4byte sub_8145088 .4byte sub_814508C -- cgit v1.2.3 From b9a6cba30a3ee44ccb14548d198accd7f6bbfa8d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Nov 2018 16:51:22 -0500 Subject: Finish decomp of mevent_server --- data/data_8466FB8.s | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index c34887d86..0ca0bcbf3 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -1,17 +1,5 @@ .section .rodata - .align 2 -func_tbl:: @ 8467030 - .4byte sub_8145080 - .4byte sub_8145088 - .4byte sub_814508C - .4byte sub_81450A8 - .4byte sub_81450C4 - - .align 2 -gUnknown_8467044:: @ 8467044 - .asciz "svr->mainseqno < NELEMS(func_tbl)" - .align 2 gUnknown_8467068:: @ 8467068 .incbin "baserom.gba", 0x467068, 0x8 -- cgit v1.2.3 From 2fbe528d5e2db723db338cb2d1635f0fa76ac905 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 1 Dec 2018 20:27:35 -0500 Subject: Attempt to give meaningful names to mevent srv fields --- data/data_83FECCC.s | 5 ++- data/data_8466FB8.s | 13 +++---- data/mevent/script_common.inc | 84 +++++++++++++++++++++++++++++++++++++++++++ data/mevent/script_ish.inc | 65 +++++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 9 deletions(-) create mode 100644 data/mevent/script_common.inc create mode 100644 data/mevent/script_ish.inc (limited to 'data') 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 -- cgit v1.2.3 From 884f1934e8bf34813701f745140f1d8429e8beaf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 10:02:39 -0500 Subject: start decompiling mevent_8145654 --- data/data_8466FB8.s | 133 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 127 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index ee830ca04..6883ab138 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -5,13 +5,78 @@ .align 2 gUnknown_8467068:: @ 8467068 - .incbin "baserom.gba", 0x467068, 0x8 + .byte 0x00, 0x02, 0x03 + .byte 0x00, 0x01, 0x02 + .align 2 gUnknown_8467070:: @ 8467070 - .incbin "baserom.gba", 0x467070, 0x4 + .byte 0x07, 0x04, 0x07 + .align 2 gUnknown_8467074:: @ 8467074 - .incbin "baserom.gba", 0x467074, 0xEE4 + @ {0x01, 0x01, 0x01, 0x19, 0x04, 0x0f, 0x029c}, + @ {0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f, 0x01bc}, + @ {0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f, 0x0130} + .byte 0x01, 0x01, 0x01, 0x19, 0x04, 0x0f + .2byte 0x029c + .byte 0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f + .2byte 0x01bc + .byte 0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f + .2byte 0x0130 + +gUnknown_846708C:: + .incbin "baserom.gba", 0x46708c, 0x20 + +gUnknown_84670AC:: + .incbin "baserom.gba", 0x4670ac, 0x20 + +gUnknown_84670CC:: + .incbin "baserom.gba", 0x4670cc, 0x20 + +gUnknown_84670EC:: + .incbin "baserom.gba", 0x4670ec, 0x20 + +gUnknown_846710C:: + .incbin "baserom.gba", 0x46710c, 0x20 + +gUnknown_846712C:: + .incbin "baserom.gba", 0x46712c, 0x20 + +gUnknown_846714C:: + .incbin "baserom.gba", 0x46714c, 0x20 + +gUnknown_846716C:: + .incbin "baserom.gba", 0x46716c, 0x20 + +gUnknown_846718C:: + .incbin "baserom.gba", 0x46718c, 0xFC + +gUnknown_8467288:: + .incbin "baserom.gba", 0x467288, 0xF4 + +gUnknown_846737C:: + .incbin "baserom.gba", 0x46737c, 0xF4 + +gUnknown_8467470:: + .incbin "baserom.gba", 0x467470, 0xE8 + +gUnknown_8467558:: + .incbin "baserom.gba", 0x467558, 0xD4 + +gUnknown_846762C:: + .incbin "baserom.gba", 0x46762c, 0xD4 + +gUnknown_8467700:: + .incbin "baserom.gba", 0x467700, 0x234 + +gUnknown_8467934:: + .incbin "baserom.gba", 0x467934, 0x148 + +gUnknown_8467A7C:: + .incbin "baserom.gba", 0x467a7c, 0x230 + +gUnknown_8467CAC:: + .incbin "baserom.gba", 0x467cac, 0x2AC gUnknown_8467F58:: @ 8467F58 .incbin "baserom.gba", 0x467F58, 0x8 @@ -23,7 +88,14 @@ gUnknown_8467FA0:: @ 8467FA0 .incbin "baserom.gba", 0x467FA0, 0x18 gUnknown_8467FB8:: @ 8467FB8 - .incbin "baserom.gba", 0x467FB8, 0x80 + .4byte 0x0001, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C + .4byte 0x1001, gUnknown_846737C, gUnknown_8467470, gUnknown_84670AC + .4byte 0x2001, gUnknown_8467558, gUnknown_846762C, gUnknown_84670CC + .4byte 0x3001, gUnknown_8467558, gUnknown_846762C, gUnknown_84670EC + .4byte 0x4001, gUnknown_8467558, gUnknown_846762C, gUnknown_846710C + .4byte 0x5001, gUnknown_8467558, gUnknown_846762C, gUnknown_846712C + .4byte 0x6001, gUnknown_8467700, gUnknown_8467934, gUnknown_846714C + .4byte 0x7001, gUnknown_8467A7C, gUnknown_8467CAC, gUnknown_846716C gUnknown_8468038:: @ 8468038 .incbin "baserom.gba", 0x468038, 0x8 @@ -32,10 +104,59 @@ gUnknown_8468040:: @ 8468040 .incbin "baserom.gba", 0x468040, 0x10 gUnknown_8468050:: @ 8468050 - .incbin "baserom.gba", 0x468050, 0x6D0 + .incbin "baserom.gba", 0x468050, 0x10 + +gUnknown_8468060:: + .incbin "baserom.gba", 0x468060, 0x20 + +gUnknown_8468080:: + .incbin "baserom.gba", 0x468080, 0x20 + +gUnknown_84680A0:: + .incbin "baserom.gba", 0x4680A0, 0x20 + +gUnknown_84680C0:: + .incbin "baserom.gba", 0x4680C0, 0x80 + +gUnknown_8468140:: + .incbin "baserom.gba", 0x468140, 0xdc + +gUnknown_846821C:: + .incbin "baserom.gba", 0x46821C, 0x30 + +gUnknown_846824C:: + .incbin "baserom.gba", 0x46824C, 0xc0 + +gUnknown_846830C:: + .incbin "baserom.gba", 0x46830C, 0x70 + +gUnknown_846837C:: + .incbin "baserom.gba", 0x46837C, 0xcc + +gUnknown_8468448:: + .incbin "baserom.gba", 0x468448, 0x90 + +gUnknown_84684D8:: + .incbin "baserom.gba", 0x4684D8, 0xdc + +gUnknown_84685B4:: + .incbin "baserom.gba", 0x4685B4, 0x90 + +gUnknown_8468644:: + .incbin "baserom.gba", 0x468644, 0xdc gUnknown_8468720:: @ 8468720 - .incbin "baserom.gba", 0x468720, 0xC0 + .4byte 1, gUnknown_84680C0, gUnknown_8468140, gUnknown_8468060 + .4byte 1, gUnknown_846821C, gUnknown_846824C, gUnknown_84670AC + .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670CC + .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670EC + .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846710C + .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846712C + .4byte 1, gUnknown_8468448, gUnknown_84684D8, gUnknown_8468080 + .4byte 1, gUnknown_84685B4, gUnknown_8468644, gUnknown_84680A0 + +gUnknown_84687A0:: + .incbin "baserom.gba", 0x4687a0, 0x40 .include "data/mevent/script_ish.inc" .include "data/mevent/script_common.inc" -- cgit v1.2.3 From 8f0f725039e9b0ae9de440df28e1eb4bd7d00dc3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 11:42:45 -0500 Subject: sub_814571C and associated graphics dump --- data/data_8466FB8.s | 49 ++++++++++++++++++++------------ data/graphics/mevent/gfx_46718C.png | Bin 0 -> 330 bytes data/graphics/mevent/gfx_46737C.png | Bin 0 -> 314 bytes data/graphics/mevent/gfx_467558.png | Bin 0 -> 288 bytes data/graphics/mevent/gfx_467700.png | Bin 0 -> 558 bytes data/graphics/mevent/gfx_467A7C.png | Bin 0 -> 551 bytes data/graphics/mevent/pal_46708C.pal | 19 +++++++++++++ data/graphics/mevent/pal_4670AC.pal | 19 +++++++++++++ data/graphics/mevent/pal_4670CC.pal | 19 +++++++++++++ data/graphics/mevent/pal_4670EC.pal | 19 +++++++++++++ data/graphics/mevent/pal_46710C.pal | 19 +++++++++++++ data/graphics/mevent/pal_46712C.pal | 19 +++++++++++++ data/graphics/mevent/pal_46714C.pal | 19 +++++++++++++ data/graphics/mevent/pal_46716C.pal | 19 +++++++++++++ data/graphics/mevent/tilemap_467288.bin | Bin 0 -> 1200 bytes data/graphics/mevent/tilemap_467470.bin | Bin 0 -> 1200 bytes data/graphics/mevent/tilemap_46762C.bin | Bin 0 -> 1200 bytes data/graphics/mevent/tilemap_467934.bin | Bin 0 -> 1200 bytes data/graphics/mevent/tilemap_467CAC.bin | Bin 0 -> 1200 bytes 19 files changed, 183 insertions(+), 18 deletions(-) create mode 100644 data/graphics/mevent/gfx_46718C.png create mode 100644 data/graphics/mevent/gfx_46737C.png create mode 100644 data/graphics/mevent/gfx_467558.png create mode 100644 data/graphics/mevent/gfx_467700.png create mode 100644 data/graphics/mevent/gfx_467A7C.png create mode 100644 data/graphics/mevent/pal_46708C.pal create mode 100644 data/graphics/mevent/pal_4670AC.pal create mode 100644 data/graphics/mevent/pal_4670CC.pal create mode 100644 data/graphics/mevent/pal_4670EC.pal create mode 100644 data/graphics/mevent/pal_46710C.pal create mode 100644 data/graphics/mevent/pal_46712C.pal create mode 100644 data/graphics/mevent/pal_46714C.pal create mode 100644 data/graphics/mevent/pal_46716C.pal create mode 100644 data/graphics/mevent/tilemap_467288.bin create mode 100644 data/graphics/mevent/tilemap_467470.bin create mode 100644 data/graphics/mevent/tilemap_46762C.bin create mode 100644 data/graphics/mevent/tilemap_467934.bin create mode 100644 data/graphics/mevent/tilemap_467CAC.bin (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 6883ab138..f6d8ebaff 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -25,58 +25,71 @@ gUnknown_8467074:: @ 8467074 .2byte 0x0130 gUnknown_846708C:: - .incbin "baserom.gba", 0x46708c, 0x20 + .incbin "data/graphics/mevent/pal_46708C.gbapal" gUnknown_84670AC:: - .incbin "baserom.gba", 0x4670ac, 0x20 + .incbin "data/graphics/mevent/pal_4670AC.gbapal" gUnknown_84670CC:: - .incbin "baserom.gba", 0x4670cc, 0x20 + .incbin "data/graphics/mevent/pal_4670CC.gbapal" gUnknown_84670EC:: - .incbin "baserom.gba", 0x4670ec, 0x20 + .incbin "data/graphics/mevent/pal_4670EC.gbapal" gUnknown_846710C:: - .incbin "baserom.gba", 0x46710c, 0x20 + .incbin "data/graphics/mevent/pal_46710C.gbapal" gUnknown_846712C:: - .incbin "baserom.gba", 0x46712c, 0x20 + .incbin "data/graphics/mevent/pal_46712C.gbapal" gUnknown_846714C:: - .incbin "baserom.gba", 0x46714c, 0x20 + .incbin "data/graphics/mevent/pal_46714C.gbapal" gUnknown_846716C:: - .incbin "baserom.gba", 0x46716c, 0x20 + .incbin "data/graphics/mevent/pal_46716C.gbapal" + .align 2 gUnknown_846718C:: - .incbin "baserom.gba", 0x46718c, 0xFC + .incbin "data/graphics/mevent/gfx_46718C.4bpp.lz" + .align 2 gUnknown_8467288:: - .incbin "baserom.gba", 0x467288, 0xF4 + .incbin "data/graphics/mevent/tilemap_467288.bin.lz" + .align 2 gUnknown_846737C:: - .incbin "baserom.gba", 0x46737c, 0xF4 + .incbin "data/graphics/mevent/gfx_46737C.4bpp.lz" + .align 2 gUnknown_8467470:: - .incbin "baserom.gba", 0x467470, 0xE8 + .incbin "data/graphics/mevent/tilemap_467470.bin.lz" + .align 2 gUnknown_8467558:: - .incbin "baserom.gba", 0x467558, 0xD4 + .incbin "data/graphics/mevent/gfx_467558.4bpp.lz" + .align 2 gUnknown_846762C:: - .incbin "baserom.gba", 0x46762c, 0xD4 + .incbin "data/graphics/mevent/tilemap_46762C.bin.lz" + .align 2 gUnknown_8467700:: - .incbin "baserom.gba", 0x467700, 0x234 + .incbin "data/graphics/mevent/gfx_467700.4bpp.lz" + .align 2 gUnknown_8467934:: - .incbin "baserom.gba", 0x467934, 0x148 + .incbin "data/graphics/mevent/tilemap_467934.bin.lz" + .align 2 gUnknown_8467A7C:: - .incbin "baserom.gba", 0x467a7c, 0x230 + .incbin "data/graphics/mevent/gfx_467A7C.4bpp.lz" + .align 2 gUnknown_8467CAC:: - .incbin "baserom.gba", 0x467cac, 0x2AC + .incbin "data/graphics/mevent/tilemap_467CAC.bin.lz" + +gUnknown_8467DF4:: + .incbin "baserom.gba", 0x467DF4, 0x164 gUnknown_8467F58:: @ 8467F58 .incbin "baserom.gba", 0x467F58, 0x8 diff --git a/data/graphics/mevent/gfx_46718C.png b/data/graphics/mevent/gfx_46718C.png new file mode 100644 index 000000000..bf52445e6 Binary files /dev/null and b/data/graphics/mevent/gfx_46718C.png differ diff --git a/data/graphics/mevent/gfx_46737C.png b/data/graphics/mevent/gfx_46737C.png new file mode 100644 index 000000000..1a23f8b94 Binary files /dev/null and b/data/graphics/mevent/gfx_46737C.png differ diff --git a/data/graphics/mevent/gfx_467558.png b/data/graphics/mevent/gfx_467558.png new file mode 100644 index 000000000..c28edd891 Binary files /dev/null and b/data/graphics/mevent/gfx_467558.png differ diff --git a/data/graphics/mevent/gfx_467700.png b/data/graphics/mevent/gfx_467700.png new file mode 100644 index 000000000..f31385746 Binary files /dev/null and b/data/graphics/mevent/gfx_467700.png differ diff --git a/data/graphics/mevent/gfx_467A7C.png b/data/graphics/mevent/gfx_467A7C.png new file mode 100644 index 000000000..f94b6c50f Binary files /dev/null and b/data/graphics/mevent/gfx_467A7C.png differ diff --git a/data/graphics/mevent/pal_46708C.pal b/data/graphics/mevent/pal_46708C.pal new file mode 100644 index 000000000..9c5ef9b26 --- /dev/null +++ b/data/graphics/mevent/pal_46708C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 213 +74 74 74 +98 106 106 +213 189 74 +238 213 82 +246 246 213 +255 255 255 +230 230 213 +238 238 213 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_4670AC.pal b/data/graphics/mevent/pal_4670AC.pal new file mode 100644 index 000000000..18c2be3fd --- /dev/null +++ b/data/graphics/mevent/pal_4670AC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +197 189 213 +205 230 255 +115 139 197 +49 74 82 +0 0 0 +0 0 0 +222 255 246 +197 255 222 +222 238 255 +156 180 222 +156 106 115 +172 139 164 +255 255 255 diff --git a/data/graphics/mevent/pal_4670CC.pal b/data/graphics/mevent/pal_4670CC.pal new file mode 100644 index 000000000..db02d5d4b --- /dev/null +++ b/data/graphics/mevent/pal_4670CC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 230 230 +255 197 197 +255 164 164 +246 139 139 +238 90 90 +255 255 255 diff --git a/data/graphics/mevent/pal_4670EC.pal b/data/graphics/mevent/pal_4670EC.pal new file mode 100644 index 000000000..bfbf036a5 --- /dev/null +++ b/data/graphics/mevent/pal_4670EC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 255 230 +213 255 189 +189 230 156 +164 213 131 +148 197 106 +255 255 255 diff --git a/data/graphics/mevent/pal_46710C.pal b/data/graphics/mevent/pal_46710C.pal new file mode 100644 index 000000000..fa41ee3b0 --- /dev/null +++ b/data/graphics/mevent/pal_46710C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 246 255 +205 238 246 +180 222 246 +156 197 238 +115 156 197 +255 255 255 diff --git a/data/graphics/mevent/pal_46712C.pal b/data/graphics/mevent/pal_46712C.pal new file mode 100644 index 000000000..8a71f5846 --- /dev/null +++ b/data/graphics/mevent/pal_46712C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +131 131 139 +164 156 172 +197 189 213 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 238 197 +230 230 139 +222 222 115 +213 213 90 +189 189 57 +255 255 255 diff --git a/data/graphics/mevent/pal_46714C.pal b/data/graphics/mevent/pal_46714C.pal new file mode 100644 index 000000000..01832b5e2 --- /dev/null +++ b/data/graphics/mevent/pal_46714C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +164 156 90 +164 148 90 +197 197 90 +213 205 90 +222 213 90 +213 213 106 +238 246 98 +230 222 98 +213 205 98 +197 180 98 +238 230 98 +246 238 106 diff --git a/data/graphics/mevent/pal_46716C.pal b/data/graphics/mevent/pal_46716C.pal new file mode 100644 index 000000000..28a498b57 --- /dev/null +++ b/data/graphics/mevent/pal_46716C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +156 156 156 +139 139 148 +180 180 197 +197 189 205 +205 205 222 +189 189 189 +197 230 222 +189 213 213 +180 197 197 +156 164 172 +222 222 230 +230 230 238 diff --git a/data/graphics/mevent/tilemap_467288.bin b/data/graphics/mevent/tilemap_467288.bin new file mode 100644 index 000000000..8e4a4717b Binary files /dev/null and b/data/graphics/mevent/tilemap_467288.bin differ diff --git a/data/graphics/mevent/tilemap_467470.bin b/data/graphics/mevent/tilemap_467470.bin new file mode 100644 index 000000000..b59dbabb5 Binary files /dev/null and b/data/graphics/mevent/tilemap_467470.bin differ diff --git a/data/graphics/mevent/tilemap_46762C.bin b/data/graphics/mevent/tilemap_46762C.bin new file mode 100644 index 000000000..aba2b9e92 Binary files /dev/null and b/data/graphics/mevent/tilemap_46762C.bin differ diff --git a/data/graphics/mevent/tilemap_467934.bin b/data/graphics/mevent/tilemap_467934.bin new file mode 100644 index 000000000..1800bff4d Binary files /dev/null and b/data/graphics/mevent/tilemap_467934.bin differ diff --git a/data/graphics/mevent/tilemap_467CAC.bin b/data/graphics/mevent/tilemap_467CAC.bin new file mode 100644 index 000000000..1800bff4d Binary files /dev/null and b/data/graphics/mevent/tilemap_467CAC.bin differ -- cgit v1.2.3 From 30d4803a44a8f11ee88c4d4e37cef9f2373b3542 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 16:06:01 -0500 Subject: sub_8145D18 --- data/data_8466FB8.s | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index f6d8ebaff..e7b8c4fbb 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -89,7 +89,10 @@ gUnknown_8467CAC:: .incbin "data/graphics/mevent/tilemap_467CAC.bin.lz" gUnknown_8467DF4:: - .incbin "baserom.gba", 0x467DF4, 0x164 + .incbin "baserom.gba", 0x467DF4, 0x100 + +gUnknown_8467EF4:: + .incbin "baserom.gba", 0x467EF4, 0x64 gUnknown_8467F58:: @ 8467F58 .incbin "baserom.gba", 0x467F58, 0x8 -- cgit v1.2.3 From 9e34e6b53d8c21c79e67c7b46ac658506abb4ed3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 16:38:07 -0500 Subject: sub_8146060 --- data/data_8466FB8.s | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index e7b8c4fbb..38cd46b8c 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -89,16 +89,45 @@ gUnknown_8467CAC:: .incbin "data/graphics/mevent/tilemap_467CAC.bin.lz" gUnknown_8467DF4:: - .incbin "baserom.gba", 0x467DF4, 0x100 + .incbin "data/graphics/mevent/pal_467DF4.gbapal" + +gUnknown_8467E14:: + .incbin "data/graphics/mevent/pal_467E14.gbapal" + +gUnknown_8467E34:: + .incbin "data/graphics/mevent/pal_467E34.gbapal" + +gUnknown_8467E54:: + .incbin "data/graphics/mevent/pal_467E54.gbapal" + +gUnknown_8467E74:: + .incbin "data/graphics/mevent/pal_467E74.gbapal" + +gUnknown_8467E94:: + .incbin "data/graphics/mevent/pal_467E94.gbapal" + +gUnknown_8467EB4:: + .incbin "data/graphics/mevent/pal_467EB4.gbapal" + +gUnknown_8467ED4:: + .incbin "data/graphics/mevent/pal_467ED4.gbapal" gUnknown_8467EF4:: - .incbin "baserom.gba", 0x467EF4, 0x64 + .incbin "data/graphics/mevent/gfx_467F58.4bpp.lz" gUnknown_8467F58:: @ 8467F58 - .incbin "baserom.gba", 0x467F58, 0x8 + .4byte gUnknown_8467EF4 + .2byte 0x0100, 0x8000 gUnknown_8467F60:: @ 8467F60 - .incbin "baserom.gba", 0x467F60, 0x40 + obj_pal gUnknown_8467DF4, 0x8000 + obj_pal gUnknown_8467E14, 0x8000 + obj_pal gUnknown_8467E34, 0x8000 + obj_pal gUnknown_8467E54, 0x8000 + obj_pal gUnknown_8467E74, 0x8000 + obj_pal gUnknown_8467E94, 0x8000 + obj_pal gUnknown_8467EB4, 0x8000 + obj_pal gUnknown_8467ED4, 0x8000 gUnknown_8467FA0:: @ 8467FA0 .incbin "baserom.gba", 0x467FA0, 0x18 -- cgit v1.2.3 From 39a9e186e05fd87d7b4787822b7207e8ab9fd9fd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 17:01:48 -0500 Subject: Decompile mevent_8145654 data so far --- data/data_835B488.s | 8 ++- data/data_8466FB8.s | 139 ---------------------------------------------------- 2 files changed, 7 insertions(+), 140 deletions(-) (limited to 'data') diff --git a/data/data_835B488.s b/data/data_835B488.s index de6460b81..44e4fe725 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -751,7 +751,13 @@ sFanfares:: @ 83AC990 .incbin "baserom.gba", 0x3AC990, 0x40 gUnknown_83AC9D0:: @ 83AC9D0 - .incbin "baserom.gba", 0x3AC9D0, 0x238 + .incbin "baserom.gba", 0x3AC9D0, 0x28 + +gUnknown_83AC9F8:: + .incbin "baserom.gba", 0x3AC9F8, 0x8 + +gUnknown_83ACA00:: + .incbin "baserom.gba", 0x3ACA00, 0x208 gUnknown_83ACC08:: @ 83ACC08 .incbin "baserom.gba", 0x3ACC08, 0x440 diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 38cd46b8c..7acd28401 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -3,145 +3,6 @@ .section .rodata - .align 2 -gUnknown_8467068:: @ 8467068 - .byte 0x00, 0x02, 0x03 - .byte 0x00, 0x01, 0x02 - - .align 2 -gUnknown_8467070:: @ 8467070 - .byte 0x07, 0x04, 0x07 - - .align 2 -gUnknown_8467074:: @ 8467074 - @ {0x01, 0x01, 0x01, 0x19, 0x04, 0x0f, 0x029c}, - @ {0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f, 0x01bc}, - @ {0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f, 0x0130} - .byte 0x01, 0x01, 0x01, 0x19, 0x04, 0x0f - .2byte 0x029c - .byte 0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f - .2byte 0x01bc - .byte 0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f - .2byte 0x0130 - -gUnknown_846708C:: - .incbin "data/graphics/mevent/pal_46708C.gbapal" - -gUnknown_84670AC:: - .incbin "data/graphics/mevent/pal_4670AC.gbapal" - -gUnknown_84670CC:: - .incbin "data/graphics/mevent/pal_4670CC.gbapal" - -gUnknown_84670EC:: - .incbin "data/graphics/mevent/pal_4670EC.gbapal" - -gUnknown_846710C:: - .incbin "data/graphics/mevent/pal_46710C.gbapal" - -gUnknown_846712C:: - .incbin "data/graphics/mevent/pal_46712C.gbapal" - -gUnknown_846714C:: - .incbin "data/graphics/mevent/pal_46714C.gbapal" - -gUnknown_846716C:: - .incbin "data/graphics/mevent/pal_46716C.gbapal" - - .align 2 -gUnknown_846718C:: - .incbin "data/graphics/mevent/gfx_46718C.4bpp.lz" - - .align 2 -gUnknown_8467288:: - .incbin "data/graphics/mevent/tilemap_467288.bin.lz" - - .align 2 -gUnknown_846737C:: - .incbin "data/graphics/mevent/gfx_46737C.4bpp.lz" - - .align 2 -gUnknown_8467470:: - .incbin "data/graphics/mevent/tilemap_467470.bin.lz" - - .align 2 -gUnknown_8467558:: - .incbin "data/graphics/mevent/gfx_467558.4bpp.lz" - - .align 2 -gUnknown_846762C:: - .incbin "data/graphics/mevent/tilemap_46762C.bin.lz" - - .align 2 -gUnknown_8467700:: - .incbin "data/graphics/mevent/gfx_467700.4bpp.lz" - - .align 2 -gUnknown_8467934:: - .incbin "data/graphics/mevent/tilemap_467934.bin.lz" - - .align 2 -gUnknown_8467A7C:: - .incbin "data/graphics/mevent/gfx_467A7C.4bpp.lz" - - .align 2 -gUnknown_8467CAC:: - .incbin "data/graphics/mevent/tilemap_467CAC.bin.lz" - -gUnknown_8467DF4:: - .incbin "data/graphics/mevent/pal_467DF4.gbapal" - -gUnknown_8467E14:: - .incbin "data/graphics/mevent/pal_467E14.gbapal" - -gUnknown_8467E34:: - .incbin "data/graphics/mevent/pal_467E34.gbapal" - -gUnknown_8467E54:: - .incbin "data/graphics/mevent/pal_467E54.gbapal" - -gUnknown_8467E74:: - .incbin "data/graphics/mevent/pal_467E74.gbapal" - -gUnknown_8467E94:: - .incbin "data/graphics/mevent/pal_467E94.gbapal" - -gUnknown_8467EB4:: - .incbin "data/graphics/mevent/pal_467EB4.gbapal" - -gUnknown_8467ED4:: - .incbin "data/graphics/mevent/pal_467ED4.gbapal" - -gUnknown_8467EF4:: - .incbin "data/graphics/mevent/gfx_467F58.4bpp.lz" - -gUnknown_8467F58:: @ 8467F58 - .4byte gUnknown_8467EF4 - .2byte 0x0100, 0x8000 - -gUnknown_8467F60:: @ 8467F60 - obj_pal gUnknown_8467DF4, 0x8000 - obj_pal gUnknown_8467E14, 0x8000 - obj_pal gUnknown_8467E34, 0x8000 - obj_pal gUnknown_8467E54, 0x8000 - obj_pal gUnknown_8467E74, 0x8000 - obj_pal gUnknown_8467E94, 0x8000 - obj_pal gUnknown_8467EB4, 0x8000 - obj_pal gUnknown_8467ED4, 0x8000 - -gUnknown_8467FA0:: @ 8467FA0 - .incbin "baserom.gba", 0x467FA0, 0x18 - -gUnknown_8467FB8:: @ 8467FB8 - .4byte 0x0001, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C - .4byte 0x1001, gUnknown_846737C, gUnknown_8467470, gUnknown_84670AC - .4byte 0x2001, gUnknown_8467558, gUnknown_846762C, gUnknown_84670CC - .4byte 0x3001, gUnknown_8467558, gUnknown_846762C, gUnknown_84670EC - .4byte 0x4001, gUnknown_8467558, gUnknown_846762C, gUnknown_846710C - .4byte 0x5001, gUnknown_8467558, gUnknown_846762C, gUnknown_846712C - .4byte 0x6001, gUnknown_8467700, gUnknown_8467934, gUnknown_846714C - .4byte 0x7001, gUnknown_8467A7C, gUnknown_8467CAC, gUnknown_846716C - gUnknown_8468038:: @ 8468038 .incbin "baserom.gba", 0x468038, 0x8 -- cgit v1.2.3 From 5151db6054d0704584fdf53e55840e262cde32a4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 17:25:59 -0500 Subject: sub_8146288 --- data/data_8466FB8.s | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 7acd28401..389b0d584 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -3,14 +3,24 @@ .section .rodata + .macro window_template bg, left, top, width, height, pal, baseTile + .byte \bg, \left, \top, \width, \height, \pal + .2byte \baseTile + .endm + gUnknown_8468038:: @ 8468038 - .incbin "baserom.gba", 0x468038, 0x8 + .byte 0x00, 0x02, 0x03 + .byte 0x00, 0x01, 0x02 + .align 2 gUnknown_8468040:: @ 8468040 - .incbin "baserom.gba", 0x468040, 0x10 + window_template 0x00, 0x01, 0x00, 0x1c, 0x03, 0x0f, 0x0000 + window_template 0x02, 0x01, 0x03, 0x1c, 0x14, 0x0f, 0x0000 + .align 2 gUnknown_8468050:: @ 8468050 - .incbin "baserom.gba", 0x468050, 0x10 + .byte 0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98 + .2byte 0x0000, 0x0002, 0x1000, 0x1000, 0x0000 gUnknown_8468060:: .incbin "baserom.gba", 0x468060, 0x20 -- cgit v1.2.3 From ecc4af703a163336219a87d7b4755da1406c5f2e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 19:01:51 -0500 Subject: Add missing graphics files --- data/graphics/mevent/gfx_467EF4.png | Bin 0 -> 147 bytes data/graphics/mevent/pal_467DF4.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E14.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E34.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E54.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E74.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467E94.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467EB4.pal | 19 +++++++++++++++++++ data/graphics/mevent/pal_467ED4.pal | 19 +++++++++++++++++++ 9 files changed, 152 insertions(+) create mode 100644 data/graphics/mevent/gfx_467EF4.png create mode 100644 data/graphics/mevent/pal_467DF4.pal create mode 100644 data/graphics/mevent/pal_467E14.pal create mode 100644 data/graphics/mevent/pal_467E34.pal create mode 100644 data/graphics/mevent/pal_467E54.pal create mode 100644 data/graphics/mevent/pal_467E74.pal create mode 100644 data/graphics/mevent/pal_467E94.pal create mode 100644 data/graphics/mevent/pal_467EB4.pal create mode 100644 data/graphics/mevent/pal_467ED4.pal (limited to 'data') diff --git a/data/graphics/mevent/gfx_467EF4.png b/data/graphics/mevent/gfx_467EF4.png new file mode 100644 index 000000000..aa0475ec0 Binary files /dev/null and b/data/graphics/mevent/gfx_467EF4.png differ diff --git a/data/graphics/mevent/pal_467DF4.pal b/data/graphics/mevent/pal_467DF4.pal new file mode 100644 index 000000000..7314ddbc8 --- /dev/null +++ b/data/graphics/mevent/pal_467DF4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +189 189 164 +205 205 172 +213 213 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E14.pal b/data/graphics/mevent/pal_467E14.pal new file mode 100644 index 000000000..333dd9280 --- /dev/null +++ b/data/graphics/mevent/pal_467E14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +164 156 180 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E34.pal b/data/graphics/mevent/pal_467E34.pal new file mode 100644 index 000000000..3fca3cdf3 --- /dev/null +++ b/data/graphics/mevent/pal_467E34.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +246 139 139 +246 180 180 +255 230 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E54.pal b/data/graphics/mevent/pal_467E54.pal new file mode 100644 index 000000000..f5125b4c9 --- /dev/null +++ b/data/graphics/mevent/pal_467E54.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +164 213 131 +197 230 180 +238 255 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E74.pal b/data/graphics/mevent/pal_467E74.pal new file mode 100644 index 000000000..e8ec07ab5 --- /dev/null +++ b/data/graphics/mevent/pal_467E74.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +156 197 238 +197 222 246 +238 246 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467E94.pal b/data/graphics/mevent/pal_467E94.pal new file mode 100644 index 000000000..783979089 --- /dev/null +++ b/data/graphics/mevent/pal_467E94.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 90 +222 222 139 +238 238 197 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467EB4.pal b/data/graphics/mevent/pal_467EB4.pal new file mode 100644 index 000000000..1c74daace --- /dev/null +++ b/data/graphics/mevent/pal_467EB4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +205 189 98 +222 205 115 +230 222 98 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_467ED4.pal b/data/graphics/mevent/pal_467ED4.pal new file mode 100644 index 000000000..d1d92ba57 --- /dev/null +++ b/data/graphics/mevent/pal_467ED4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +197 197 197 +205 205 205 +213 213 213 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 -- cgit v1.2.3 From f92002b6da5ca426143864df5b679888cef8a9d8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Dec 2018 19:02:49 -0500 Subject: Correct dims for shadow gfx --- data/graphics/mevent/gfx_467EF4.png | Bin 147 -> 116 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'data') diff --git a/data/graphics/mevent/gfx_467EF4.png b/data/graphics/mevent/gfx_467EF4.png index aa0475ec0..51a1aeb0c 100644 Binary files a/data/graphics/mevent/gfx_467EF4.png and b/data/graphics/mevent/gfx_467EF4.png differ -- cgit v1.2.3 From 59b87e9d2af887401736d8fd06d3a9266e3983e5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 10:09:28 -0500 Subject: sub_8146980 --- data/data_8466FB8.s | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 389b0d584..276658b7a 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -3,25 +3,7 @@ .section .rodata - .macro window_template bg, left, top, width, height, pal, baseTile - .byte \bg, \left, \top, \width, \height, \pal - .2byte \baseTile - .endm - -gUnknown_8468038:: @ 8468038 - .byte 0x00, 0x02, 0x03 - .byte 0x00, 0x01, 0x02 - .align 2 -gUnknown_8468040:: @ 8468040 - window_template 0x00, 0x01, 0x00, 0x1c, 0x03, 0x0f, 0x0000 - window_template 0x02, 0x01, 0x03, 0x1c, 0x14, 0x0f, 0x0000 - - .align 2 -gUnknown_8468050:: @ 8468050 - .byte 0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98 - .2byte 0x0000, 0x0002, 0x1000, 0x1000, 0x0000 - gUnknown_8468060:: .incbin "baserom.gba", 0x468060, 0x20 -- cgit v1.2.3 From c500754d6bfbfc1ae0d67b89e725bcb0014de892 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 10:40:38 -0500 Subject: Finish decomp and dism of mevent_8145654 --- data/data_8466FB8.s | 52 ++------------------------------ data/graphics/mevent/gfx_4680C0.png | Bin 0 -> 169 bytes data/graphics/mevent/gfx_46821C.png | Bin 0 -> 103 bytes data/graphics/mevent/gfx_46830C.png | Bin 0 -> 146 bytes data/graphics/mevent/gfx_468448.png | Bin 0 -> 173 bytes data/graphics/mevent/gfx_4685B4.png | Bin 0 -> 173 bytes data/graphics/mevent/pal_468060.pal | 19 ++++++++++++ data/graphics/mevent/pal_468080.pal | 19 ++++++++++++ data/graphics/mevent/pal_4680A0.pal | 19 ++++++++++++ data/graphics/mevent/tilemap_468140.bin | Bin 0 -> 1440 bytes data/graphics/mevent/tilemap_46824C.bin | Bin 0 -> 1440 bytes data/graphics/mevent/tilemap_46837C.bin | Bin 0 -> 1440 bytes data/graphics/mevent/tilemap_4684D8.bin | Bin 0 -> 1440 bytes data/graphics/mevent/tilemap_468644.bin | Bin 0 -> 1440 bytes 14 files changed, 59 insertions(+), 50 deletions(-) create mode 100644 data/graphics/mevent/gfx_4680C0.png create mode 100644 data/graphics/mevent/gfx_46821C.png create mode 100644 data/graphics/mevent/gfx_46830C.png create mode 100644 data/graphics/mevent/gfx_468448.png create mode 100644 data/graphics/mevent/gfx_4685B4.png create mode 100644 data/graphics/mevent/pal_468060.pal create mode 100644 data/graphics/mevent/pal_468080.pal create mode 100644 data/graphics/mevent/pal_4680A0.pal create mode 100644 data/graphics/mevent/tilemap_468140.bin create mode 100644 data/graphics/mevent/tilemap_46824C.bin create mode 100644 data/graphics/mevent/tilemap_46837C.bin create mode 100644 data/graphics/mevent/tilemap_4684D8.bin create mode 100644 data/graphics/mevent/tilemap_468644.bin (limited to 'data') diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 276658b7a..9436bc4fd 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -4,57 +4,9 @@ .section .rodata .align 2 -gUnknown_8468060:: - .incbin "baserom.gba", 0x468060, 0x20 - -gUnknown_8468080:: - .incbin "baserom.gba", 0x468080, 0x20 - -gUnknown_84680A0:: - .incbin "baserom.gba", 0x4680A0, 0x20 - -gUnknown_84680C0:: - .incbin "baserom.gba", 0x4680C0, 0x80 - -gUnknown_8468140:: - .incbin "baserom.gba", 0x468140, 0xdc - -gUnknown_846821C:: - .incbin "baserom.gba", 0x46821C, 0x30 - -gUnknown_846824C:: - .incbin "baserom.gba", 0x46824C, 0xc0 - -gUnknown_846830C:: - .incbin "baserom.gba", 0x46830C, 0x70 - -gUnknown_846837C:: - .incbin "baserom.gba", 0x46837C, 0xcc - -gUnknown_8468448:: - .incbin "baserom.gba", 0x468448, 0x90 - -gUnknown_84684D8:: - .incbin "baserom.gba", 0x4684D8, 0xdc - -gUnknown_84685B4:: - .incbin "baserom.gba", 0x4685B4, 0x90 - -gUnknown_8468644:: - .incbin "baserom.gba", 0x468644, 0xdc - -gUnknown_8468720:: @ 8468720 - .4byte 1, gUnknown_84680C0, gUnknown_8468140, gUnknown_8468060 - .4byte 1, gUnknown_846821C, gUnknown_846824C, gUnknown_84670AC - .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670CC - .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_84670EC - .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846710C - .4byte 1, gUnknown_846830C, gUnknown_846837C, gUnknown_846712C - .4byte 1, gUnknown_8468448, gUnknown_84684D8, gUnknown_8468080 - .4byte 1, gUnknown_84685B4, gUnknown_8468644, gUnknown_84680A0 - gUnknown_84687A0:: - .incbin "baserom.gba", 0x4687a0, 0x40 + .string "You have collected all STAMPs!\n" + .string "Want to input a CARD as a prize?$" .include "data/mevent/script_ish.inc" .include "data/mevent/script_common.inc" diff --git a/data/graphics/mevent/gfx_4680C0.png b/data/graphics/mevent/gfx_4680C0.png new file mode 100644 index 000000000..1a27f3213 Binary files /dev/null and b/data/graphics/mevent/gfx_4680C0.png differ diff --git a/data/graphics/mevent/gfx_46821C.png b/data/graphics/mevent/gfx_46821C.png new file mode 100644 index 000000000..aab27d16c Binary files /dev/null and b/data/graphics/mevent/gfx_46821C.png differ diff --git a/data/graphics/mevent/gfx_46830C.png b/data/graphics/mevent/gfx_46830C.png new file mode 100644 index 000000000..3c2b8e6d1 Binary files /dev/null and b/data/graphics/mevent/gfx_46830C.png differ diff --git a/data/graphics/mevent/gfx_468448.png b/data/graphics/mevent/gfx_468448.png new file mode 100644 index 000000000..137dbe9f3 Binary files /dev/null and b/data/graphics/mevent/gfx_468448.png differ diff --git a/data/graphics/mevent/gfx_4685B4.png b/data/graphics/mevent/gfx_4685B4.png new file mode 100644 index 000000000..137dbe9f3 Binary files /dev/null and b/data/graphics/mevent/gfx_4685B4.png differ diff --git a/data/graphics/mevent/pal_468060.pal b/data/graphics/mevent/pal_468060.pal new file mode 100644 index 000000000..970736bbb --- /dev/null +++ b/data/graphics/mevent/pal_468060.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 213 +74 74 74 +98 106 106 +213 189 74 +238 213 82 +246 246 213 +255 255 255 +230 230 213 +238 238 213 +246 246 238 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/data/graphics/mevent/pal_468080.pal b/data/graphics/mevent/pal_468080.pal new file mode 100644 index 000000000..01832b5e2 --- /dev/null +++ b/data/graphics/mevent/pal_468080.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +164 156 90 +164 148 90 +197 197 90 +213 205 90 +222 213 90 +213 213 106 +238 246 98 +230 222 98 +213 205 98 +197 180 98 +238 230 98 +246 238 106 diff --git a/data/graphics/mevent/pal_4680A0.pal b/data/graphics/mevent/pal_4680A0.pal new file mode 100644 index 000000000..28a498b57 --- /dev/null +++ b/data/graphics/mevent/pal_4680A0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +156 156 156 +139 139 148 +180 180 197 +197 189 205 +205 205 222 +189 189 189 +197 230 222 +189 213 213 +180 197 197 +156 164 172 +222 222 230 +230 230 238 diff --git a/data/graphics/mevent/tilemap_468140.bin b/data/graphics/mevent/tilemap_468140.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/data/graphics/mevent/tilemap_468140.bin differ diff --git a/data/graphics/mevent/tilemap_46824C.bin b/data/graphics/mevent/tilemap_46824C.bin new file mode 100644 index 000000000..72c7ea278 Binary files /dev/null and b/data/graphics/mevent/tilemap_46824C.bin differ diff --git a/data/graphics/mevent/tilemap_46837C.bin b/data/graphics/mevent/tilemap_46837C.bin new file mode 100644 index 000000000..c7b2e3e21 Binary files /dev/null and b/data/graphics/mevent/tilemap_46837C.bin differ diff --git a/data/graphics/mevent/tilemap_4684D8.bin b/data/graphics/mevent/tilemap_4684D8.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/data/graphics/mevent/tilemap_4684D8.bin differ diff --git a/data/graphics/mevent/tilemap_468644.bin b/data/graphics/mevent/tilemap_468644.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/data/graphics/mevent/tilemap_468644.bin differ -- cgit v1.2.3 From 931f19d2ead516a5fb5a2a15784391ea02bdbbc3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 20:21:35 -0500 Subject: Port mystery_event_script --- data/data_83FECCC.s | 2 +- data/data_8471F00.s | 46 ++++++++++++++++++++--------------- data/mystery_event_script_cmd_table.s | 3 ++- 3 files changed, 29 insertions(+), 22 deletions(-) (limited to 'data') diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index c89f5f308..9c39a96d2 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -556,7 +556,7 @@ gExpandedPlaceholder_Green:: @ 8415A5C gText_EggNickname:: @ 8415A62 .incbin "baserom.gba", 0x415A62, 0x4 -gUnknown_8415A66:: @ 8415A66 +gText_Pokemon:: @ 8415A66 .incbin "baserom.gba", 0x415A66, 0x8 gUnknown_8415A6E:: @ 8415A6E diff --git a/data/data_8471F00.s b/data/data_8471F00.s index b9767d933..93d5ea372 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -337,32 +337,38 @@ gUnknown_84827B4:: @ 84827B4 gUnknown_84886E8:: @ 84886E8 .incbin "baserom.gba", 0x4886E8, 0x588 -gUnknown_8488C70:: @ 8488C70 - .incbin "baserom.gba", 0x488C70, 0x32 +gText_MysteryGiftBerry:: @ 8488C70 + .string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" -gUnknown_8488CA2:: @ 8488CA2 - .incbin "baserom.gba", 0x488CA2, 0x2C +gText_MysteryGiftBerryTransform:: @ 8488CA2 + .string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" -gUnknown_8488CCE:: @ 8488CCE - .incbin "baserom.gba", 0x488CCE, 0x28 +gText_MysteryGiftBerryObtained:: @ 8488CCE + .string "The {STR_VAR_1} BERRY has already been\nobtained.$" -gUnknown_8488CF6:: @ 8488CF6 - .incbin "baserom.gba", 0x488CF6, 0x34 +gText_MysteryGiftSpecialRibbon:: @ 8488CF6 + .string "A special RIBBON was awarded to\nyour party POKéMON.$" -gUnknown_8488D2A:: @ 8488D2A - .incbin "baserom.gba", 0x488D2A, 0x36 +gText_MysteryGiftNationalDex:: @ 8488D2A + .string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$" -gUnknown_8488D60:: @ 8488D60 - .incbin "baserom.gba", 0x488D60, 0x1C +gText_MysteryGiftRareWord:: @ 8488D60 + .string "A rare word has been added.$" -gUnknown_8488D7C:: @ 8488D7C - .incbin "baserom.gba", 0x488D7C, 0x12 +gText_MysteryGiftSentOver:: @ 8488D7C + .string "{STR_VAR_1} was sent over!$" -gUnknown_8488D8E:: @ 8488D8E - .incbin "baserom.gba", 0x488D8E, 0x2F +gText_MysteryGiftFullParty:: @ 8488D8E + .string "Your party is full.\n{STR_VAR_1} could not be sent over.$" -gUnknown_8488DBD:: @ 8488DBD - .incbin "baserom.gba", 0x488DBD, 0x40 +gText_MysteryGiftNewTrainer:: @ 8488DBD + .string "A new TRAINER has arrived in\nHOENN.$" -gUnknown_8488DFD:: @ 8488DFD - .incbin "baserom.gba", 0x488DFD, 0xB6B +gUnknown_8488DE1:: + .incbin "baserom.gba", 0x488DE1, 0x1C + +gText_MysteryGiftCantBeUsed:: @ 8488DFD + .string "This data can’t be used in\nthis version.$" + +gUnknown_8488E26:: + .incbin "baserom.gba", 0x488E26, 0xB42 diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s index 76b7ab5a5..4b85804a1 100644 --- a/data/mystery_event_script_cmd_table.s +++ b/data/mystery_event_script_cmd_table.s @@ -1,4 +1,5 @@ .section script_data, "aw", %progbits -gUnknown_81DBCF0:: @ 81DBCF0 +gMysteryEventScriptCmdTable:: @ 81DBCF0 .incbin "baserom.gba", 0x1DBCF0, 0x44 +gMysteryEventScriptCmdTableEnd:: @ 81DBD34 -- cgit v1.2.3 From 089703dc086d03081f80aa90c2978a0f091d7d77 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Dec 2018 21:15:42 -0500 Subject: Decompile (partially) mystery_event_msg --- data/data_8471F00.s | 36 ---- data/mystery_event_msg.s | 343 ++++++++++++++++++++++++++++++++++ data/mystery_event_script_cmd_table.s | 18 +- 3 files changed, 360 insertions(+), 37 deletions(-) create mode 100644 data/mystery_event_msg.s (limited to 'data') diff --git a/data/data_8471F00.s b/data/data_8471F00.s index 93d5ea372..28454ac2d 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -336,39 +336,3 @@ gUnknown_84827B4:: @ 84827B4 gUnknown_84886E8:: @ 84886E8 .incbin "baserom.gba", 0x4886E8, 0x588 - -gText_MysteryGiftBerry:: @ 8488C70 - .string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" - -gText_MysteryGiftBerryTransform:: @ 8488CA2 - .string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" - -gText_MysteryGiftBerryObtained:: @ 8488CCE - .string "The {STR_VAR_1} BERRY has already been\nobtained.$" - -gText_MysteryGiftSpecialRibbon:: @ 8488CF6 - .string "A special RIBBON was awarded to\nyour party POKéMON.$" - -gText_MysteryGiftNationalDex:: @ 8488D2A - .string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$" - -gText_MysteryGiftRareWord:: @ 8488D60 - .string "A rare word has been added.$" - -gText_MysteryGiftSentOver:: @ 8488D7C - .string "{STR_VAR_1} was sent over!$" - -gText_MysteryGiftFullParty:: @ 8488D8E - .string "Your party is full.\n{STR_VAR_1} could not be sent over.$" - -gText_MysteryGiftNewTrainer:: @ 8488DBD - .string "A new TRAINER has arrived in\nHOENN.$" - -gUnknown_8488DE1:: - .incbin "baserom.gba", 0x488DE1, 0x1C - -gText_MysteryGiftCantBeUsed:: @ 8488DFD - .string "This data can’t be used in\nthis version.$" - -gUnknown_8488E26:: - .incbin "baserom.gba", 0x488E26, 0xB42 diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s new file mode 100644 index 000000000..c8e10ea4c --- /dev/null +++ b/data/mystery_event_msg.s @@ -0,0 +1,343 @@ +#include "constants/flags.h" +#include "constants/moves.h" +#include "constants/songs.h" +#include "constants/species.h" +#include "constants/vars.h" + .include "asm/macros.inc" + .include "asm/macros/event.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 1 + +MysteryEventScript_StampCard:: @ 8488E26 + .incbin "baserom.gba", 0x488E26, 0xB42 + +@ setvaddress MysteryEventScript_StampCard +@ setorcopyvar VAR_RESULT, 1 +@ specialvar VAR_0x8008, sub_813986C +@ setorcopyvar VAR_RESULT, 0 +@ specialvar VAR_0x8009, sub_813986C +@ subvar VAR_0x8008, 32777 +@ getnumberstring 0, VAR_0x8008 +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftStampCard +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftStampCard: +@ .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" +@ +@ MysteryEventScript_SurfPichu:: @ 8674D3D +@ setvaddress MysteryEventScript_SurfPichu +@ checkflag FLAG_MYSTERY_EVENT_DONE +@ vgoto_if 0, SurfPichu_GiveIfPossible +@ gotoram +@ +@ SurfPichu_GiveIfPossible: @ 8674D4C +@ specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 +@ vgoto_if 1, SurfPichu_FullParty +@ setflag FLAG_MYSTERY_EVENT_DONE +@ vcall SurfPichu_GiveEgg +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftEgg +@ waitmessage +@ waitbutton +@ playfanfare MUS_FANFA4 +@ waitfanfare +@ release +@ end +@ +@ SurfPichu_FullParty: @ 8674D73 +@ lock +@ faceplayer +@ vmessage sText_FullParty +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ SurfPichu_GiveEgg: @ 8674D7E +@ giveegg SPECIES_PICHU +@ setobedience VAR_EVENT_PICHU_SLOT +@ setcatchlocale VAR_EVENT_PICHU_SLOT, 255 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 +@ vgoto_if 1, SurfPichu_Slot1 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 +@ vgoto_if 1, SurfPichu_Slot2 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 +@ vgoto_if 1, SurfPichu_Slot3 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 +@ vgoto_if 1, SurfPichu_Slot4 +@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 +@ vgoto_if 1, SurfPichu_Slot5 +@ return +@ +@ SurfPichu_Slot1: @ 8674DC0 +@ setpokemove 1, 2, MOVE_SURF +@ return +@ +@ SurfPichu_Slot2:: @ 8674DC6 +@ setpokemove 2, 2, MOVE_SURF +@ return +@ +@ SurfPichu_Slot3: @ 8674DCC +@ setpokemove 3, 2, MOVE_SURF +@ return +@ +@ SurfPichu_Slot4: @ 8674DD2 +@ setpokemove 4, 2, MOVE_SURF +@ return +@ +@ SurfPichu_Slot5: @ 8674DD8 +@ setpokemove 5, 2, MOVE_SURF +@ return +@ +@ sText_MysteryGiftEgg: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" +@ +@ sText_FullParty: +@ .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" +@ +@ MysteryEventScript_VisitingTrainer:: @ 8674EC1 +@ setvaddress MysteryEventScript_VisitingTrainer +@ special ValidateEReaderTrainer +@ compare_var_to_value VAR_RESULT, 0 +@ vgoto_if 1, MysteryEventScript_VisitingTrainerArrived +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftVisitingTrainer +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ MysteryEventScript_VisitingTrainerArrived: @ 8674EDF +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftVisitingTrainer_2 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftVisitingTrainer: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" +@ +@ sText_MysteryGiftVisitingTrainer_2: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" +@ +@ MysteryEventScript_BattleCard:: @ 867513C +@ setvaddress MysteryEventScript_BattleCard +@ checkflag FLAG_MYSTERY_EVENT_DONE +@ vgoto_if 1, MysteryEventScript_BattleCardInfo +@ setorcopyvar VAR_RESULT, 2 +@ specialvar VAR_0x8008, sub_813986C +@ compare_var_to_value VAR_0x8008, 3 +@ vgoto_if 0, MysteryEventScript_BattleCardInfo +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftBattleCountCard_2 +@ waitmessage +@ waitbutton +@ giveitem ITEM_POTION +@ release +@ setflag FLAG_MYSTERY_EVENT_DONE +@ end +@ +@ MysteryEventScript_BattleCardInfo: @ 8675179 +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftBattleCountCard +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftBattleCountCard: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" +@ +@ sText_MysteryGiftBattleCountCard_2: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" +@ +@ MysteryEventScript_AuroraTicket:: @ 867533C +@ setvaddress MysteryEventScript_AuroraTicket +@ lock +@ faceplayer +@ checkflag FLAG_0x13A +@ vgoto_if 1, AuroraTicket_Obtained +@ checkflag FLAG_0x1AD +@ vgoto_if 1, AuroraTicket_Obtained +@ checkitem ITEM_AURORA_TICKET, 1 +@ compare_var_to_value VAR_RESULT, 1 +@ vgoto_if 1, AuroraTicket_Obtained +@ vmessage sText_AuroraTicket1 +@ waitmessage +@ waitbutton +@ checkitemspace ITEM_AURORA_TICKET, 1 +@ compare_var_to_value VAR_RESULT, 0 +@ vgoto_if 1, AuroraTicket_NoBagSpace +@ giveitem ITEM_AURORA_TICKET +@ setflag FLAG_0x8D5 +@ setflag FLAG_0x13A +@ vmessage sText_AuroraTicket2 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ AuroraTicket_NoBagSpace: @ 8675397 +@ vmessage sText_AuroraTicketNoPlace +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ AuroraTicket_Obtained: @ 86753A0 +@ vmessage sText_AuroraTicketGot +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_AuroraTicket1: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" +@ +@ sText_AuroraTicket2: +@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +@ +@ sText_AuroraTicketGot: +@ .string "Thank you for using the MYSTERY\nGIFT System.$" +@ +@ sText_AuroraTicketNoPlace: +@ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +@ +@ MysteryEventScript_MysticTicket:: @ 867550B +@ setvaddress MysteryEventScript_MysticTicket +@ lock +@ faceplayer +@ checkflag FLAG_0x13B +@ vgoto_if 1, MysticTicket_Obtained +@ checkflag FLAG_0x091 +@ vgoto_if 1, MysticTicket_Obtained +@ checkflag FLAG_0x092 +@ vgoto_if 1, MysticTicket_Obtained +@ checkitem ITEM_MYSTIC_TICKET, 1 +@ compare_var_to_value VAR_RESULT, 1 +@ vgoto_if 1, MysticTicket_Obtained +@ vmessage sText_MysticTicket2 +@ waitmessage +@ waitbutton +@ checkitemspace ITEM_MYSTIC_TICKET, 1 +@ compare_var_to_value VAR_RESULT, 0 +@ vgoto_if 1, MysticTicket_NoBagSpace +@ giveitem ITEM_MYSTIC_TICKET +@ setflag FLAG_0x8E0 +@ setflag FLAG_0x13B +@ vmessage sText_MysticTicket1 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ MysticTicket_NoBagSpace: @ 867556F +@ vmessage sText_MysticTicketNoPlace +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ MysticTicket_Obtained: @ 8675578 +@ vmessage sText_MysticTicketGot +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysticTicket2: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" +@ +@ sText_MysticTicket1: +@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +@ +@ sText_MysticTicketGot: +@ .string "Thank you for using the MYSTERY\nGIFT System.$" +@ +@ sText_MysticTicketNoPlace: +@ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +@ +@ MysteryEventScript_AlteringCave:: @ 86756E3 +@ setvaddress MysteryEventScript_AlteringCave +@ addvar VAR_ALTERING_CAVE_WILD_SET, 1 +@ compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 +@ vgoto_if 0, MysteryEventScript_AlteringCave_ +@ setvar VAR_ALTERING_CAVE_WILD_SET, 0 +@ MysteryEventScript_AlteringCave_: @ 86756FD +@ lock +@ faceplayer +@ vmessage sText_MysteryGiftAlteringCave +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftAlteringCave:: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" +@ +@ MysteryEventScript_OldSeaMap:: @ 86757F4 +@ setvaddress MysteryEventScript_OldSeaMap +@ lock +@ faceplayer +@ checkflag FLAG_0x13C +@ vgoto_if 1, OldSeaMap_Obtained +@ checkflag FLAG_0x1CA +@ vgoto_if 1, OldSeaMap_Obtained +@ checkitem ITEM_OLD_SEA_MAP, 1 +@ compare_var_to_value VAR_RESULT, 1 +@ vgoto_if 1, OldSeaMap_Obtained +@ vmessage sText_MysteryGiftOldSeaMap +@ waitmessage +@ waitbutton +@ checkitemspace ITEM_OLD_SEA_MAP, 1 +@ compare_var_to_value VAR_RESULT, 0 +@ vgoto_if 1, OldSeaMap_NoBagSpace +@ giveitem ITEM_OLD_SEA_MAP +@ setflag FLAG_0x8D6 +@ setflag FLAG_0x13C +@ vmessage sText_MysteryGiftOldSeaMap_1 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ OldSeaMap_NoBagSpace: @ 867584F +@ vmessage sText_MysteryGiftOldSeaMap_3 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ OldSeaMap_Obtained: @ 8675858 +@ vmessage sText_MysteryGiftOldSeaMap_2 +@ waitmessage +@ waitbutton +@ release +@ end +@ +@ sText_MysteryGiftOldSeaMap: +@ .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" +@ +@ sText_MysteryGiftOldSeaMap_1: +@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" +@ +@ sText_MysteryGiftOldSeaMap_2: +@ .string "Thank you for using the MYSTERY\nGIFT System.$" +@ +@ sText_MysteryGiftOldSeaMap_3: +@ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s index 4b85804a1..5dbcf50ee 100644 --- a/data/mystery_event_script_cmd_table.s +++ b/data/mystery_event_script_cmd_table.s @@ -1,5 +1,21 @@ .section script_data, "aw", %progbits gMysteryEventScriptCmdTable:: @ 81DBCF0 - .incbin "baserom.gba", 0x1DBCF0, 0x44 + .4byte MEScrCmd_nop + .4byte MEScrCmd_checkcompat + .4byte MEScrCmd_end + .4byte MEScrCmd_setmsg + .4byte MEScrCmd_setstatus + .4byte MEScrCmd_runscript + .4byte MEScrCmd_initramscript + .4byte MEScrCmd_setenigmaberry + .4byte MEScrCmd_giveribbon + .4byte MEScrCmd_givenationaldex + .4byte MEScrCmd_addrareword + .4byte MEScrCmd_setrecordmixinggift + .4byte MEScrCmd_givepokemon + .4byte MEScrCmd_addtrainer + .4byte MEScrCmd_enableresetrtc + .4byte MEScrCmd_checksum + .4byte MEScrCmd_crc gMysteryEventScriptCmdTableEnd:: @ 81DBD34 -- cgit v1.2.3 From 2ce8cad8d2666ecaa9996dc99c7ff3d68d87f4e8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Dec 2018 08:09:54 -0500 Subject: Fix alignment --- data/mystery_event_msg.s | 93 ++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 47 deletions(-) (limited to 'data') diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index c8e10ea4c..48be143d7 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -9,10 +9,9 @@ .section .rodata - .align 1 - -MysteryEventScript_StampCard:: @ 8488E26 - .incbin "baserom.gba", 0x488E26, 0xB42 + .align 2 +MysteryEventScript_StampCard:: @ 8488E2 + .incbin "baserom.gba", 0x488E28, 0xB40 @ setvaddress MysteryEventScript_StampCard @ setorcopyvar VAR_RESULT, 1 @@ -28,16 +27,16 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftStampCard: @ .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" -@ +@ @ MysteryEventScript_SurfPichu:: @ 8674D3D @ setvaddress MysteryEventScript_SurfPichu @ checkflag FLAG_MYSTERY_EVENT_DONE @ vgoto_if 0, SurfPichu_GiveIfPossible @ gotoram -@ +@ @ SurfPichu_GiveIfPossible: @ 8674D4C @ specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount @ compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 @@ -53,7 +52,7 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitfanfare @ release @ end -@ +@ @ SurfPichu_FullParty: @ 8674D73 @ lock @ faceplayer @@ -62,7 +61,7 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ SurfPichu_GiveEgg: @ 8674D7E @ giveegg SPECIES_PICHU @ setobedience VAR_EVENT_PICHU_SLOT @@ -78,33 +77,33 @@ MysteryEventScript_StampCard:: @ 8488E26 @ compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 @ vgoto_if 1, SurfPichu_Slot5 @ return -@ +@ @ SurfPichu_Slot1: @ 8674DC0 @ setpokemove 1, 2, MOVE_SURF @ return -@ +@ @ SurfPichu_Slot2:: @ 8674DC6 @ setpokemove 2, 2, MOVE_SURF @ return -@ +@ @ SurfPichu_Slot3: @ 8674DCC @ setpokemove 3, 2, MOVE_SURF @ return -@ +@ @ SurfPichu_Slot4: @ 8674DD2 @ setpokemove 4, 2, MOVE_SURF @ return -@ +@ @ SurfPichu_Slot5: @ 8674DD8 @ setpokemove 5, 2, MOVE_SURF @ return -@ +@ @ sText_MysteryGiftEgg: @ .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" -@ +@ @ sText_FullParty: @ .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" -@ +@ @ MysteryEventScript_VisitingTrainer:: @ 8674EC1 @ setvaddress MysteryEventScript_VisitingTrainer @ special ValidateEReaderTrainer @@ -117,7 +116,7 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ MysteryEventScript_VisitingTrainerArrived: @ 8674EDF @ lock @ faceplayer @@ -126,13 +125,13 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftVisitingTrainer: @ .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" -@ +@ @ sText_MysteryGiftVisitingTrainer_2: @ .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" -@ +@ @ MysteryEventScript_BattleCard:: @ 867513C @ setvaddress MysteryEventScript_BattleCard @ checkflag FLAG_MYSTERY_EVENT_DONE @@ -150,7 +149,7 @@ MysteryEventScript_StampCard:: @ 8488E26 @ release @ setflag FLAG_MYSTERY_EVENT_DONE @ end -@ +@ @ MysteryEventScript_BattleCardInfo: @ 8675179 @ lock @ faceplayer @@ -159,13 +158,13 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftBattleCountCard: @ .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" -@ +@ @ sText_MysteryGiftBattleCountCard_2: @ .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" -@ +@ @ MysteryEventScript_AuroraTicket:: @ 867533C @ setvaddress MysteryEventScript_AuroraTicket @ lock @@ -191,33 +190,33 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ AuroraTicket_NoBagSpace: @ 8675397 @ vmessage sText_AuroraTicketNoPlace @ waitmessage @ waitbutton @ release @ end -@ +@ @ AuroraTicket_Obtained: @ 86753A0 @ vmessage sText_AuroraTicketGot @ waitmessage @ waitbutton @ release @ end -@ +@ @ sText_AuroraTicket1: @ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" -@ +@ @ sText_AuroraTicket2: @ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ +@ @ sText_AuroraTicketGot: @ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ +@ @ sText_AuroraTicketNoPlace: @ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -@ +@ @ MysteryEventScript_MysticTicket:: @ 867550B @ setvaddress MysteryEventScript_MysticTicket @ lock @@ -245,33 +244,33 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ MysticTicket_NoBagSpace: @ 867556F @ vmessage sText_MysticTicketNoPlace @ waitmessage @ waitbutton @ release @ end -@ +@ @ MysticTicket_Obtained: @ 8675578 @ vmessage sText_MysticTicketGot @ waitmessage @ waitbutton @ release @ end -@ +@ @ sText_MysticTicket2: @ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" -@ +@ @ sText_MysticTicket1: @ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ +@ @ sText_MysticTicketGot: @ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ +@ @ sText_MysticTicketNoPlace: @ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -@ +@ @ MysteryEventScript_AlteringCave:: @ 86756E3 @ setvaddress MysteryEventScript_AlteringCave @ addvar VAR_ALTERING_CAVE_WILD_SET, 1 @@ -286,10 +285,10 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftAlteringCave:: @ .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" -@ +@ @ MysteryEventScript_OldSeaMap:: @ 86757F4 @ setvaddress MysteryEventScript_OldSeaMap @ lock @@ -315,29 +314,29 @@ MysteryEventScript_StampCard:: @ 8488E26 @ waitbutton @ release @ end -@ +@ @ OldSeaMap_NoBagSpace: @ 867584F @ vmessage sText_MysteryGiftOldSeaMap_3 @ waitmessage @ waitbutton @ release @ end -@ +@ @ OldSeaMap_Obtained: @ 8675858 @ vmessage sText_MysteryGiftOldSeaMap_2 @ waitmessage @ waitbutton @ release @ end -@ +@ @ sText_MysteryGiftOldSeaMap: @ .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" -@ +@ @ sText_MysteryGiftOldSeaMap_1: @ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ +@ @ sText_MysteryGiftOldSeaMap_2: @ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ +@ @ sText_MysteryGiftOldSeaMap_3: @ .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -- cgit v1.2.3 From ff24ec3ece411cf189f7f4d54110a77e79cea73e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Dec 2018 08:30:20 -0500 Subject: Dump special pointers --- data/event_scripts.s | 3 +- data/specials.inc | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 457 insertions(+), 2 deletions(-) create mode 100644 data/specials.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index c27df1946..5aef19caa 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -9,8 +9,7 @@ gScriptCmdTableEnd:: @ 815FD08 gUnknown_815FD0C:: @ 815FD0C .incbin "baserom.gba", 0x15FD0C, 0x54 -gUnknown_815FD60:: @ 815FD60 - .incbin "baserom.gba", 0x15FD60, 0x6F0 + .include "data/specials.inc" gUnknown_8160450:: @ 8160450 .incbin "baserom.gba", 0x160450, 0x28 diff --git a/data/specials.inc b/data/specials.inc new file mode 100644 index 000000000..171a6fd8e --- /dev/null +++ b/data/specials.inc @@ -0,0 +1,456 @@ +.macro def_special ptr +.global SPECIAL_\ptr +.set SPECIAL_\ptr, __special__ +.set __special__, __special__ + 1 + .4byte \ptr + .endm + +.set __special__, 0 + .align 2 + +gSpecials:: @ 815FD60 + def_special sp000_heal_pokemon + def_special SetCableClubWarp + def_special sub_807E654 + def_special sub_807E704 + def_special sub_8081744 + def_special sub_8081770 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8081064 + def_special sub_80810CC + def_special sub_80810F4 + def_special sub_80098B8 + def_special sub_80819C8 + def_special sub_8081978 + def_special sub_80819B8 + def_special sub_808130C + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special SavePlayerParty + def_special LoadPlayerParty + def_special sub_80A0334 + def_special sp02A_crash_sound + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special IsEnigmaBerryValid + def_special sub_80803CC + def_special sub_80805D8 + def_special sub_8080618 + def_special ScrSpecial_HasTrainerBeenFought + def_special ScrSpecial_EndTrainerApproach + def_special sub_8080628 + def_special sub_810CD4C + def_special sub_810CEB4 + def_special sub_80805B0 + def_special sub_808C6A8 + def_special CheckForAlivePartyMons + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CBEBC + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8081128 + def_special sub_806F67C + def_special nullsub_56 + def_special sub_80FEE44 + def_special sub_80BDA7C + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80A0918 + def_special sub_80A0930 + def_special sub_80A096C + def_special sub_80A0984 + def_special sub_80CBFA0 + def_special TV_CopyNicknameToStringVar1AndEnsureTerminated + def_special TV_CheckMonOTIDEqualsPlayerID + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80BDB1C + def_special nullsub_75 + def_special sub_809A540 + def_special CalculatePlayerPartyCount + def_special CountPartyNonEggMons + def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA68C + def_special DrawWholeMapView + def_special sub_80CA69C + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA6BC + def_special sub_80CA6DC + def_special sub_80CA714 + def_special sub_80CA758 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8055DC4 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_807F888 + def_special ChangePokemonNickname + def_special sub_80BF8FC + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8113364 + def_special sub_8113288 + def_special sub_81133A4 + def_special sub_8113064 + def_special sub_81132CC + def_special sub_8113510 + def_special sub_81130A8 + def_special sub_8113530 + def_special sub_8082E54 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA74C + def_special GetDaycareMonNicknames + def_special sub_80464B4 + def_special RejectEggFromDayCare + def_special GiveEggFromDaycare + def_special SetDaycareCompatibilityString + def_special GetSelectedMonNickAndSpecies + def_special StoreSelectedPokemonInDaycare + def_special ChooseSendDaycareMon + def_special ShowDaycareLevelMenu + def_special GetNumLevelsGainedFromDaycare + def_special GetDaycareCost + def_special TakePokemonFromDaycare + def_special ScriptHatchMon + def_special sub_8046FD4 + def_special sub_8046EAC + def_special sub_80CD228 + def_special IsEnoughForCostInVar0x8005 + def_special SubtractMoneyFromVar0x8005 + def_special ExecuteWhiteOut + def_special sub_80CA3C4 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80A0EC4 + def_special sub_80A0EEC + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA3D8 + def_special sub_80CA524 + def_special sub_80CA86C + def_special sub_80CA9A8 + def_special sub_80CB204 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80BF93C + def_special sub_80BF9BC + def_special sub_80BFBA8 + def_special ScrSpecial_GetPokemonNicknameAndMoveName + def_special ScrSpecial_CountPokemonMoves + def_special sub_80E4634 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA664 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CA76C + def_special sub_80E5970 + def_special sub_80E5C28 + def_special sub_80E6648 + def_special sub_80E67FC + def_special sub_80E7538 + def_special sub_80E6900 + def_special sub_80E6A0C + def_special sub_80E6C8C + def_special sub_80E6E14 + def_special sub_80E6FB8 + def_special sub_80E7058 + def_special sub_80E71D0 + def_special sub_80E724C + def_special sub_80E72B8 + def_special sub_80A0380 + def_special ValidateEReaderTrainer + def_special nullsub_75 + def_special sub_80A03D8 + def_special sub_80EB6AC + def_special sub_80EB6FC + def_special sub_80CA7EC + def_special sub_8053A9C + def_special sub_8053D68 + def_special sub_8054440 + def_special sub_8053D2C + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sp109_CreatePCMenu + def_special sub_80CA574 + def_special sub_80CA618 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_61 + def_special DoSoftReset + def_special sub_80CA2E4 + def_special sub_80CB498 + def_special nullsub_75 + def_special SpawnScriptFieldObject + def_special RemoveScriptFieldObject + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CAAAC + def_special sub_80CAABC + def_special player_get_direction_lower_nybble + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special LeadMonHasEffortRibbon + def_special GivLeadMonEffortRibbon + def_special ScrSpecial_AreLeadMonEVsMaxedOut + def_special sub_8069740 + def_special sub_8069768 + def_special sub_8141D9C + def_special nullsub_75 + def_special sub_80CA804 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CAB78 + def_special nullsub_75 + def_special sub_80CABD0 + def_special nullsub_75 + def_special sub_80CB580 + def_special nullsub_75 + def_special sub_80CAC08 + def_special sub_806E99C + def_special sub_80CAC28 + def_special sub_807FA68 + def_special sub_807F9D8 + def_special sub_807FABC + def_special sub_8080398 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_807B6C0 + def_special sp13E_warp_to_last_warp + def_special sp13F_fall_to_last_warp + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80E5E70 + def_special sub_807F998 + def_special nullsub_75 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_80CAD54 + def_special sub_80BFC14 + def_special nullsub_75 + def_special nullsub_75 + def_special LoadPlayerBag + def_special sub_807F0B0 + def_special nullsub_75 + def_special nullsub_75 + def_special sub_8088F58 + def_special sub_80CAD7C + def_special nullsub_75 + def_special sub_80E759C + def_special GetNameOfEnigmaBerryInPlayerParty + def_special nullsub_75 + def_special sub_810B82C + def_special sub_807F904 + def_special sub_80CA630 + def_special sub_80CB7C4 + def_special sub_80CBC5C + def_special sub_80CADC4 + def_special sub_80CADEC + def_special sub_805D1A8 + def_special sub_80CB0A8 + def_special sub_80CB1D8 + def_special GetDaycarePokemonCount + def_special sub_80CB63C + def_special sub_80CBD80 + def_special sub_80CBDB0 + def_special sub_80CBDCC + def_special sub_810C444 + def_special sub_80CC7B4 + def_special ChangeBoxPokemonNickname + def_special sub_80CC2BC + def_special sub_80CC3CC + def_special sub_80CC524 + def_special sub_8009480 + def_special sub_8115A24 + def_special BerryBlenderLinkJoinGroup + def_special UnionRoomSpecial + def_special sub_814F1D4 + def_special EnableNationalPokedex + def_special sub_80699E0 + def_special sub_80699BC + def_special sub_810C3A4 + def_special SetFlavorTextFlagFromSpecialVars + def_special UpdatePickStateFromSpecialVar8005 + def_special sub_8054C48 + def_special sub_8046B40 + def_special sub_8046B70 + def_special sub_8046B94 + def_special sub_8046BBC + def_special sub_8046BDC + def_special sub_8146E78 + def_special sub_80CC48C + def_special sub_812B220 + def_special sub_812B234 + def_special sub_812B248 + def_special sub_8143FC8 + def_special sub_810B810 + def_special sub_811999C + def_special sp182_move_string + def_special sub_811390C + def_special sub_80CC4D4 + def_special sub_80CC730 + def_special sub_8110AB4 + def_special sub_8112364 + def_special sub_8146CE8 + def_special get_unknown_box_id + def_special sub_809D504 + def_special sub_809D620 + def_special sub_812781C + def_special sub_8127888 + def_special sub_80803FC + def_special sub_812B35C + def_special sub_815D334 + def_special sub_8149A18 + def_special sub_806E25C + def_special sub_815D9E8 + def_special sub_814B504 + def_special sub_80CC8CC + def_special sub_80CC948 + def_special sub_812B478 + def_special sub_812B484 + def_special sub_810B82C + def_special sub_8099FAC + def_special sub_815F094 + def_special sub_815F114 + def_special sub_815EEB0 + def_special sub_815EF5C + def_special sub_815F070 + def_special sub_80CC974 + def_special sub_814EA7C + def_special sub_80CCB94 + def_special sub_80CCCF8 + def_special sub_80F39B4 + def_special sub_8153810 + def_special sub_809D764 + def_special sub_809D8C0 + def_special sub_8147500 + def_special player_get_direction_lower_nybble + def_special sub_80CCDFC + def_special sub_80CD008 + def_special sub_8147594 + def_special sub_80CD034 + def_special sub_815D834 + def_special sub_8088F84 + def_special sub_80CD074 + def_special sub_80CD098 + def_special sub_811B15C + def_special sub_80CD0F4 + def_special sub_809C4A8 + def_special sub_81537C0 + def_special sub_809C5FC + def_special sub_80CB328 + def_special sub_80CD154 + def_special sub_80CD1B4 + def_special sub_8044838 +gSpecialsEnd:: -- cgit v1.2.3 From d08f95be8afc1b400d791f93b05fe9e8daf0ee7a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Dec 2018 08:52:53 -0500 Subject: dump script command, special var, and std script pointers --- data/event_scripts.s | 86 +++++++++++++++--- data/script_cmd_table.inc | 219 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 291 insertions(+), 14 deletions(-) create mode 100644 data/script_cmd_table.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 5aef19caa..bc5e09b79 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,18 +1,46 @@ .section script_data, "aw", %progbits -gScriptCmdTable:: @ 815F9B4 - .incbin "baserom.gba", 0x15F9B4, 0x354 - -gScriptCmdTableEnd:: @ 815FD08 - .incbin "baserom.gba", 0x15FD08, 0x4 - -gUnknown_815FD0C:: @ 815FD0C - .incbin "baserom.gba", 0x15FD0C, 0x54 + .include "data/script_cmd_table.inc" + + .align 2 +gSpecialVars:: @ 815FD0C + .4byte gUnknown_20370B8 + .4byte gUnknown_20370BA + .4byte gUnknown_20370BC + .4byte gUnknown_20370BE + .4byte gUnknown_20370C0 + .4byte gSpecialVar_0x8005 + .4byte gUnknown_20370C4 + .4byte gUnknown_20370C6 + .4byte gUnknown_20370C8 + .4byte gUnknown_20370CA + .4byte gUnknown_20370CC + .4byte gUnknown_20370CE + .4byte gUnknown_20370D4 + .4byte gUnknown_20370D0 + .4byte gUnknown_203AD30 + .4byte gUnknown_20370D2 + .4byte gSpecialVar_MonBoxId + .4byte gSpecialVar_MonBoxPos + .4byte gUnknown_20370DA + .4byte gUnknown_20370DC + .4byte gUnknown_20370DE .include "data/specials.inc" -gUnknown_8160450:: @ 8160450 - .incbin "baserom.gba", 0x160450, 0x28 + .align 2 +gStdScripts:: @ 8160450 + .4byte gStdScript_81A667B + .4byte gStdScript_81A67B3 + .4byte gStdScript_81A4E3F + .4byte gStdScript_81A4E4A + .4byte gStdScript_81A4E54 + .4byte gStdScript_81A4E5C + .4byte gStdScript_81A501F + .4byte gStdScript_81A676C + .4byte gStdScript_81A8E58 + .4byte gStdScript_81A4E66 +gStdScripts_End:: gUnknown_8160478:: @ 8160478 .incbin "baserom.gba", 0x160478, 0x886C @@ -21,7 +49,22 @@ gUnknown_8168CE4:: @ 8168CE4 .incbin "baserom.gba", 0x168CE4, 0x33 gUnknown_8168D17:: @ 8168D17 - .incbin "baserom.gba", 0x168D17, 0x3C19D + .incbin "baserom.gba", 0x168D17, 0x3C128 + +gStdScript_81A4E3F:: + .incbin "baserom.gba", 0x1A4E3F, 0xB + +gStdScript_81A4E4A:: + .incbin "baserom.gba", 0x1A4E4A, 0xA + +gStdScript_81A4E54:: + .incbin "baserom.gba", 0x1A4E54, 0x8 + +gStdScript_81A4E5C:: + .incbin "baserom.gba", 0x1A4E5C, 0xA + +gStdScript_81A4E66:: + .incbin "baserom.gba", 0x1A4E66, 0x4E gUnknown_81A4EB4:: @ 81A4EB4 .incbin "baserom.gba", 0x1A4EB4, 0xD @@ -39,7 +82,10 @@ gUnknown_81A4F3E:: @ 81A4F3E .incbin "baserom.gba", 0x1A4F3E, 0x35 gUnknown_81A4F73:: @ 81A4F73 - .incbin "baserom.gba", 0x1A4F73, 0x117 + .incbin "baserom.gba", 0x1A4F73, 0xAC + +gStdScript_81A501F:: + .incbin "baserom.gba", 0x1A501F, 0x6B gUnknown_81A508A:: @ 81A508A .incbin "baserom.gba", 0x1A508A, 0x3EC @@ -51,7 +97,16 @@ gUnknown_81A6481:: @ 81A6481 .incbin "baserom.gba", 0x1A6481, 0xCA gUnknown_81A654B:: @ 81A654B - .incbin "baserom.gba", 0x1A654B, 0x2F8 + .incbin "baserom.gba", 0x1A654B, 0x130 + +gStdScript_81A667B:: + .incbin "baserom.gba", 0x1A667B, 0xF1 + +gStdScript_81A676C:: + .incbin "baserom.gba", 0x1A676C, 0x47 + +gStdScript_81A67B3:: + .incbin "baserom.gba", 0x1A67B3, 0x90 gUnknown_81A6843:: @ 81A6843 .incbin "baserom.gba", 0x1A6843, 0x112 @@ -225,7 +280,10 @@ gUnknown_81A8DD8:: @ 81A8DD8 .incbin "baserom.gba", 0x1A8DD8, 0x25 gUnknown_81A8DFD:: @ 81A8DFD - .incbin "baserom.gba", 0x1A8DFD, 0x4309 + .incbin "baserom.gba", 0x1A8DFD, 0x5B + +gStdScript_81A8E58:: + .incbin "baserom.gba", 0x1A8E58, 0x42AE .include "data/text/fame_checker.inc" diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc new file mode 100644 index 000000000..29850d685 --- /dev/null +++ b/data/script_cmd_table.inc @@ -0,0 +1,219 @@ + .align 2 + +gScriptCmdTable:: @ 815F9B4 + .4byte sub_8069ED0 + .4byte sub_8069ED4 + .4byte ScrCmd_end + .4byte ScrCmd_return + .4byte ScrCmd_call + .4byte ScrCmd_goto + .4byte ScrCmd_goto_if + .4byte ScrCmd_call_if + .4byte ScrCmd_gotostd + .4byte ScrCmd_callstd + .4byte ScrCmd_gotostd_if + .4byte ScrCmd_callstd_if + .4byte ScrCmd_gotoram + .4byte ScrCmd_killscript + .4byte ScrCmd_setmysteryeventstatus + .4byte ScrCmd_loadword + .4byte ScrCmd_loadbyte + .4byte ScrCmd_writebytetoaddr + .4byte ScrCmd_loadbytefromaddr + .4byte ScrCmd_setptrbyte + .4byte ScrCmd_copylocal + .4byte ScrCmd_copybyte + .4byte ScrCmd_setvar + .4byte ScrCmd_addvar + .4byte ScrCmd_subvar + .4byte ScrCmd_copyvar + .4byte ScrCmd_setorcopyvar + .4byte ScrCmd_compare_local_to_local + .4byte ScrCmd_compare_local_to_value + .4byte ScrCmd_compare_local_to_addr + .4byte ScrCmd_compare_addr_to_local + .4byte ScrCmd_compare_addr_to_value + .4byte ScrCmd_compare_addr_to_addr + .4byte ScrCmd_compare_var_to_value + .4byte ScrCmd_compare_var_to_var + .4byte ScrCmd_callnative + .4byte ScrCmd_gotonative + .4byte sub_8069EFC + .4byte sub_8069F3C + .4byte sub_8069FA4 + .4byte ScrCmd_delay + .4byte ScrCmd_setflag + .4byte ScrCmd_clearflag + .4byte ScrCmd_checkflag + .4byte sub_806A9D4 + .4byte sub_806A9D8 + .4byte sub_806A9DC + .4byte ScrCmd_playse + .4byte sub_806B094 + .4byte ScrCmd_playfanfare + .4byte sub_806B0CC + .4byte sub_806B0E0 + .4byte sub_806B120 + .4byte sub_806B134 + .4byte sub_806B154 + .4byte sub_806B17C + .4byte sub_806B1C8 + .4byte ScrCmd_warp + .4byte ScrCmd_warpsilent + .4byte ScrCmd_warpdoor + .4byte ScrCmd_warphole + .4byte sub_806AC70 + .4byte ScrCmd_setwarp + .4byte ScrCmd_setdynamicwarp + .4byte sub_806AE90 + .4byte sub_806AF10 + .4byte ScrCmd_getplayerxy + .4byte ScrCmd_getpartysize + .4byte sub_806A610 + .4byte ScrCmd_takeitem + .4byte sub_806A6A0 + .4byte sub_806A6E4 + .4byte ScrCmd_checkitemtype + .4byte ScrCmd_givepcitem + .4byte ScrCmd_checkpcitem + .4byte sub_806A7DC + .4byte sub_806A7F0 + .4byte sub_806A818 + .4byte sub_806A804 + .4byte ScrCmd_applymovement + .4byte ScrCmd_applymovement_at + .4byte ScrCmd_waitmovement + .4byte ScrCmd_waitmovement_at + .4byte ScrCmd_removeobject + .4byte ScrCmd_removeobject_at + .4byte ScrCmd_addobject + .4byte ScrCmd_addobject_at + .4byte ScrCmd_setobjectxy + .4byte ScrCmd_showobject_at + .4byte ScrCmd_hideobject_at + .4byte ScrCmd_faceplayer + .4byte ScrCmd_turnobject + .4byte ScrCmd_trainerbattle + .4byte sub_806C2D8 + .4byte ScrCmd_ontrainerbattleend + .4byte ScrCmd_ontrainerbattleendgoto + .4byte ScrCmd_checktrainerflag + .4byte ScrCmd_settrainerflag + .4byte ScrCmd_cleartrainerflag + .4byte ScrCmd_setobjectxyperm + .4byte ScrCmd_moveobjectoffscreen + .4byte ScrCmd_setobjectmovementtype + .4byte sub_806B878 + .4byte sub_806B80C + .4byte sub_806B88C + .4byte ScrCmd_lockall + .4byte ScrCmd_lock + .4byte ScrCmd_releaseall + .4byte ScrCmd_release + .4byte sub_806BA3C + .4byte ScrCmd_yesnobox + .4byte ScrCmd_multichoice + .4byte ScrCmd_multichoicedefault + .4byte ScrCmd_multichoicegrid + .4byte sub_806BB38 + .4byte sub_806BB8C + .4byte sub_806BB98 + .4byte sub_806BB9C + .4byte sub_806BBD8 + .4byte sub_806BBF8 + .4byte sub_806BC04 + .4byte ScrCmd_givemon + .4byte ScrCmd_giveegg + .4byte ScrCmd_setmonmove + .4byte ScrCmd_checkpartymove + .4byte ScrCmd_bufferspeciesname + .4byte ScrCmd_bufferleadmonspeciesname + .4byte ScrCmd_bufferpartymonnick + .4byte ScrCmd_bufferitemname + .4byte sub_806BE34 + .4byte ScrCmd_buffermovename + .4byte ScrCmd_buffernumberstring + .4byte ScrCmd_bufferstdstring + .4byte ScrCmd_bufferstring + .4byte sub_806C3AC + .4byte sub_806C3C0 + .4byte sub_806C3D4 + .4byte ScrCmd_playslotmachine + .4byte sub_806C410 + .4byte sub_806C418 + .4byte sub_806C424 + .4byte sub_806C428 + .4byte sub_806C42C + .4byte ScrCmd_random + .4byte ScrCmd_givemoney + .4byte ScrCmd_takemoney + .4byte ScrCmd_checkmoney + .4byte sub_806C1CC + .4byte sub_806C21C + .4byte sub_806C228 + .4byte sub_806C414 + .4byte ScrCmd_fadescreen + .4byte ScrCmd_fadescreenspeed + .4byte ScrCmd_setflashradius + .4byte ScrCmd_animateflash + .4byte sub_806B85C + .4byte ScrCmd_dofieldeffect + .4byte ScrCmd_setfieldeffectarg + .4byte ScrCmd_waitfieldeffect + .4byte ScrCmd_setrespawn + .4byte ScrCmd_checkplayergender + .4byte ScrCmd_playmoncry + .4byte ScrCmd_setmetatile + .4byte ScrCmd_resetweather + .4byte ScrCmd_setweather + .4byte ScrCmd_doweather + .4byte ScrCmd_setstepcallback + .4byte ScrCmd_setmaplayoutindex + .4byte ScrCmd_setobjectpriority + .4byte ScrCmd_resetobjectpriority + .4byte ScrCmd_createvobject + .4byte ScrCmd_turnvobject + .4byte ScrCmd_opendoor + .4byte ScrCmd_closedoor + .4byte sub_806C688 + .4byte ScrCmd_setdooropen + .4byte ScrCmd_setdoorclosed + .4byte sub_806C724 + .4byte sub_806C728 + .4byte ScrCmd_checkcoins + .4byte ScrCmd_givecoins + .4byte ScrCmd_takecoins + .4byte ScrCmd_setwildbattle + .4byte sub_806C39C + .4byte ScrCmd_setvaddress + .4byte ScrCmd_vgoto + .4byte ScrCmd_vcall + .4byte ScrCmd_vgoto_if + .4byte ScrCmd_vcall_if + .4byte ScrCmd_vmessage + .4byte ScrCmd_vloadword + .4byte ScrCmd_vbufferstring + .4byte sub_806C258 + .4byte ScrCmd_hidecoinsbox + .4byte ScrCmd_updatecoinsbox + .4byte ScrCmd_incrementgamestat + .4byte ScrCmd_setescapewarp + .4byte sub_806C540 + .4byte ScrCmd_bufferboxname + .4byte sub_806B7EC + .4byte sub_806B828 + .4byte sub_806B850 + .4byte sub_806C7BC + .4byte sub_806C7C8 + .4byte sub_806A888 + .4byte ScrCmd_setmonobedient + .4byte ScrCmd_checkmonobedience + .4byte sub_806A28C + .4byte sub_806A8C0 + .4byte sub_806ACF8 + .4byte sub_806C844 + .4byte sub_806BC40 + .4byte sub_806BD90 + +gScriptCmdTableEnd:: @ 815FD08 + .4byte sub_8069ED0 -- cgit v1.2.3 From 7a166940d0621fdeac0b16ddaa4de6f235837c9c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Dec 2018 09:21:18 -0500 Subject: Dump multiboot programs and librfu_rodata --- data/berry_fix.mb | Bin 0 -> 15348 bytes data/librfu_rodata.s | 30 ++++++++++++++++++++++++------ data/multiboot_berry_glitch_fix.s | 2 +- data/multiboot_pokemon_colosseum.s | 2 +- data/pokemon_colosseum.mb | Bin 0 -> 163840 bytes 5 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 data/berry_fix.mb create mode 100644 data/pokemon_colosseum.mb (limited to 'data') diff --git a/data/berry_fix.mb b/data/berry_fix.mb new file mode 100644 index 000000000..0afff07f5 Binary files /dev/null and b/data/berry_fix.mb differ diff --git a/data/librfu_rodata.s b/data/librfu_rodata.s index 867a1a17c..c6ca84f4b 100644 --- a/data/librfu_rodata.s +++ b/data/librfu_rodata.s @@ -1,10 +1,28 @@ .section .rodata -gUnknown_86FC03C:: @ 86FC03C - .incbin "baserom.gba", 0x6FC03C, 0x2C + .set VERSION_MAJOR, 1 + .set VERSION_MINOR, 0 + .set VERSION_REVISION, 24 -gUnknown_86FC068:: @ 86FC068 - .incbin "baserom.gba", 0x6FC068, 0xC + .align 2 +_Str_RfuHeader:: + .byte 2, 14, 0, 10, 9, 5, 7, 2 + .byte 0, 15, 1, 3, 3, 0, 31, 0 + .byte 3, 22, 18, 14, 13, 9, 11, 3 + .byte 15, 15, 1, 3, 3, 0, 0x7f, 0 + + .ascii "RFU_V" + .byte VERSION_MAJOR + 0x30 + .byte VERSION_MINOR + 0x30 + .byte (VERSION_REVISION / 10) + 0x30 + .byte (VERSION_REVISION % 10) + 0x30 + .byte 0 + + .align 2 +_Str_RFU_MBOOT:: + .asciz "RFU-MBOOT" + + .align 2 +_Str_Sio32ID:: + .asciz "NINTENDOSio32ID_030820" -gUnknown_86FC074:: @ 86FC074 - .incbin "baserom.gba", 0x6FC074, 0x18 diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index 0e4bcf384..bc417a8ba 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_BerryGlitchFix_Start:: @ 86FFC6C - .incbin "baserom.gba", 0x6FFC6C, 0x3BF4 + .incbin "data/berry_fix.mb" gMultiBootProgram_BerryGlitchFix_End:: diff --git a/data/multiboot_pokemon_colosseum.s b/data/multiboot_pokemon_colosseum.s index 64df89692..bbc47a9e8 100644 --- a/data/multiboot_pokemon_colosseum.s +++ b/data/multiboot_pokemon_colosseum.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_PokemonColosseum_Start:: @ 8703860 - .incbin "baserom.gba", 0x703860, 0x28000 + .incbin "data/pokemon_colosseum.mb" gMultiBootProgram_PokemonColosseum_End:: diff --git a/data/pokemon_colosseum.mb b/data/pokemon_colosseum.mb new file mode 100644 index 000000000..2ff3f88bc Binary files /dev/null and b/data/pokemon_colosseum.mb differ -- cgit v1.2.3 From c14c6d36f8a60fd561f7c24339b575807bc6066f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 5 Dec 2018 08:43:55 -0500 Subject: Rename most special vars --- data/event_scripts.s | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index bc5e09b79..9baa201e5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4,22 +4,22 @@ .align 2 gSpecialVars:: @ 815FD0C - .4byte gUnknown_20370B8 - .4byte gUnknown_20370BA - .4byte gUnknown_20370BC - .4byte gUnknown_20370BE - .4byte gUnknown_20370C0 + .4byte gSpecialVar_0x8000 + .4byte gSpecialVar_0x8001 + .4byte gSpecialVar_0x8002 + .4byte gSpecialVar_0x8003 + .4byte gSpecialVar_0x8004 .4byte gSpecialVar_0x8005 - .4byte gUnknown_20370C4 - .4byte gUnknown_20370C6 - .4byte gUnknown_20370C8 - .4byte gUnknown_20370CA - .4byte gUnknown_20370CC - .4byte gUnknown_20370CE - .4byte gUnknown_20370D4 - .4byte gUnknown_20370D0 - .4byte gUnknown_203AD30 - .4byte gUnknown_20370D2 + .4byte gSpecialVar_0x8006 + .4byte gSpecialVar_0x8007 + .4byte gSpecialVar_0x8008 + .4byte gSpecialVar_0x8009 + .4byte gSpecialVar_0x800A + .4byte gSpecialVar_0x800B + .4byte gSpecialVar_Facing + .4byte gSpecialVar_Result + .4byte gSpecialVar_ItemId + .4byte gSpecialVar_LastTalked .4byte gSpecialVar_MonBoxId .4byte gSpecialVar_MonBoxPos .4byte gUnknown_20370DA -- cgit v1.2.3 From f91b71d3955e5df5455ec7a302b45c7f174100bf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Dec 2018 20:17:31 -0500 Subject: Port over berry fix program --- data/berry_fix.mb | Bin 15348 -> 0 bytes data/multiboot_berry_glitch_fix.s | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 data/berry_fix.mb (limited to 'data') diff --git a/data/berry_fix.mb b/data/berry_fix.mb deleted file mode 100644 index 0afff07f5..000000000 Binary files a/data/berry_fix.mb and /dev/null differ diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index bc417a8ba..1eb843d3f 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_BerryGlitchFix_Start:: @ 86FFC6C - .incbin "data/berry_fix.mb" + .incbin "berry_fix/berry_fix.gba" gMultiBootProgram_BerryGlitchFix_End:: -- cgit v1.2.3