summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data_8479668.s6
-rw-r--r--data/easy_chat_2.s296
-rw-r--r--data/scripts/mystery_event_club.inc2
3 files changed, 6 insertions, 298 deletions
diff --git a/data/data_8479668.s b/data/data_8479668.s
index 0ddecfe58..50ce06127 100644
--- a/data/data_8479668.s
+++ b/data/data_8479668.s
@@ -13,7 +13,7 @@
.section .rodata
- // berry_fix_program
+ // easy_chat_2
gUnknown_847A8D8::
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
@@ -27,6 +27,8 @@ gUnknown_847A913::
gUnknown_847A934::
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+ // naming_screen
+
gUnknown_847A955::
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$"
@@ -63,6 +65,8 @@ gUnknown_847AA8F::
gUnknown_847AAA8::
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
+ // union_room_chat
+
gText_UnionRoomChatKeyboard_ABCDE::
.string "ABCDE$"
diff --git a/data/easy_chat_2.s b/data/easy_chat_2.s
deleted file mode 100644
index 79be01714..000000000
--- a/data/easy_chat_2.s
+++ /dev/null
@@ -1,296 +0,0 @@
-#include "constants/region_map.h"
-#include "constants/flags.h"
-#include "constants/moves.h"
-#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
- .include "asm/macros.inc"
- .include "constants/constants.inc"
- .section .rodata
- .align 2
-
-gUnknown_843F29C:: @ 843F29C
- .2byte 0x143a, 0x1817, 0x100b, 0x200f
-
-gUnknown_843F2A4:: @ 843F2A4
- .2byte 0x0209, 0x140b, 0x1030, 0x102a
-
-gUnknown_843F2AC:: @ 843F2AC
- .byte 0, 2, 2, 0
- .4byte gUnknown_8418A2B
- .4byte gUnknown_84186D1
- .4byte gUnknown_84186EF
- .4byte gUnknown_841880E
- .4byte gUnknown_8418902
- .byte 1, 2, 3, 1
- .4byte gUnknown_8418A33
- .4byte gUnknown_8418706
- .4byte gUnknown_8418725
- .4byte gUnknown_841881B
- .4byte gUnknown_8418902
- .byte 2, 2, 3, 1
- .4byte gUnknown_8418A4A
- .4byte gUnknown_8418706
- .4byte gUnknown_8418725
- .4byte gUnknown_841883E
- .4byte gUnknown_8418902
- .byte 3, 2, 3, 1
- .4byte gUnknown_8418A61
- .4byte gUnknown_8418706
- .4byte gUnknown_8418725
- .4byte gUnknown_841885F
- .4byte gUnknown_8418902
- .byte 4, 2, 5, 2
- .4byte NULL
- .4byte gUnknown_8418780
- .4byte gUnknown_841879E
- .4byte gUnknown_841888C
- .4byte gUnknown_8418902
- .byte 5, 2, 2, 0
- .4byte NULL
- .4byte gUnknown_8418780
- .4byte gUnknown_841879E
- .4byte NULL
- .4byte NULL
- .byte 6, 2, 3, 1
- .4byte gUnknown_8418A77
- .4byte gUnknown_84187B2
- .4byte gUnknown_84187D1
- .4byte gUnknown_84188AC
- .4byte gUnknown_8418902
- .byte 7, 2, 3, 1
- .4byte gUnknown_8418AA1
- .4byte gUnknown_8418745
- .4byte gUnknown_8418763
- .4byte gUnknown_8418881
- .4byte gUnknown_8418902
- .byte 9, 2, 1, 3
- .4byte gUnknown_8418A87
- .4byte gUnknown_84188B9
- .4byte gUnknown_84188D6
- .4byte gUnknown_84188F0
- .4byte gUnknown_8418902
- .byte 14, 2, 2, 0
- .4byte gUnknown_8418AB2
- .4byte gUnknown_84186D1
- .4byte gUnknown_84187EE
- .4byte gUnknown_8418881
- .4byte gUnknown_8418902
-
-gUnknown_843F39C:: @ 843F39C data8 4x7
- .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00
- .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00
- .byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13
- .byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
-
-gUnknown_843F3B8:: @ 843F3B8 gbapal
- .incbin "graphics/link_rfu/unk_843F3F8.gbapal"
-
-gUnknown_843F3D8:: @ 843F3D8 gbapal
- .incbin "graphics/link_rfu/unk_8E9BD28.gbapal"
-
-gUnknown_843F3F8:: @ 843F3F8 4bpp
- .incbin "graphics/link_rfu/unk_843F3F8.4bpp"
-
-gUnknown_843F418:: @ 843F418 4bpp
- .incbin "graphics/link_rfu/unk_843F418.4bpp"
-
-gUnknown_843F518:: @ 843F518 4bpp
- .incbin "graphics/link_rfu/unk_843F518.4bpp"
-
-gUnknown_843F618:: @ 843F618 gbapal
- .incbin "graphics/link_rfu/unk_843F638.gbapal"
-
-gUnknown_843F638:: @ 843F638 4bpp.lz
- .incbin "graphics/link_rfu/unk_843F638.4bpp.lz"
-
-gUnknown_843F76C:: @ 843F76C gbapal
- .incbin "graphics/link_rfu/unk_843F76C.gbapal"
-
-gUnknown_843F78C:: @ 843F78C gbapal
- .incbin "graphics/link_rfu/unk_843F78C.gbapal"
-
-gUnknown_843F7AC:: @ 843F7AC 4bpp.lz
- .incbin "graphics/link_rfu/unk_843F7AC.4bpp.lz"
-
-gUnknown_843F874:: @ 843F874 gbapal
- .2byte RGB(0, 0, 0)
- .2byte RGB(0, 0, 0)
- .2byte RGB(7, 25, 31)
- .2byte RGB(21, 21, 29)
-
-gUnknown_843F87C:: @ 843F87C gbapal
- .2byte RGB(0, 0, 0)
- .2byte RGB(31, 31, 31)
- .2byte RGB(12, 12, 12)
- .2byte RGB(27, 26, 27)
- .2byte RGB(8, 17, 9)
-
- .align 2
-gUnknown_843F888:: @ 843F888 data8 6x4
- .byte 0x03, 0x04, 0x18, 0x04
- .byte 0x01, 0x04, 0x1b, 0x04
- .byte 0x03, 0x00, 0x18, 0x0a
- .byte 0x06, 0x06, 0x12, 0x04
- .byte 0x10, 0x04, 0x09, 0x02
- .byte 0x0e, 0x04, 0x12, 0x04
-
-gUnknown_843F8A0:: @ 843F8A0 bg_template
- .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb
-
-gUnknown_843F8B0:: @ 843F8B0 window_template
- .align 2
- .byte 0x01, 0x07, 0x00, 0x10, 0x02, 0x0a
- .2byte 0x0010
- @ {0x01, 0x07, 0x00, 0x10, 0x02, 0x0a, 0x0010}
- .align 2
- .byte 0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f
- .2byte 0x000a
- @ {0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f, 0x000a}
- .align 2
- .byte 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03
- .2byte 0x0000
- @ {0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000}
- .align 2
- .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
- .2byte 0x0000
- @ {0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000}
-
-gUnknown_843F8D0:: @ 843F8D0 window_template
- .align 2
- .byte 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f
- .2byte 0x0062
- @ {0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x0062}
-
-gUnknown_843F8D8:: @ 843F8D8 text
- .string "{UNDERSCORE}$"
-
-gUnknown_843F8DB:: @ 843F8DB text
- .string "{CLEAR 17}$"
-
- .align 2
-gUnknown_843F8E0:: @ 843F8E0
- .4byte gUnknown_847A8D8
- .4byte gUnknown_847A8FA
- .4byte gUnknown_847A913
- .4byte gUnknown_847A934
-
-gUnknown_843F8F0:: @ 843F8F0 sprite_sheet
- obj_tiles gUnknown_843F3F8, 0x0020, 0
- obj_tiles gUnknown_843F418, 0x0100, 2
- obj_tiles gUnknown_843F518, 0x0100, 3
- null_obj_tiles
-
-gUnknown_843F910:: @ 843F910 sprite_palette
- obj_pal gUnknown_843F3B8, 0
- obj_pal gUnknown_843F3D8, 1
- obj_pal gUnknown_8E99F24, 2
- obj_pal gUnknown_843F618, 3
- null_obj_pal
-
-gUnknown_843F938:: @ 843F938 sprite_sheet
- obj_tiles gUnknown_843F638, 0x0800, 5
- obj_tiles gUnknown_8E9BD28, 0x1000, 1
- obj_tiles gUnknown_8E99F44, 0x0800, 6
- obj_tiles gUnknown_8E9A168, 0x1000, 4
-
-gUnknown_843F958:: @ 843F958 data8
- .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00
-
-gUnknown_843F960::
- .4byte 0x00000000, 0x00000c00
-
-gUnknown_843F968:: @ 843F968 sprite_template
- spr_template 0, 0, gUnknown_843F960, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101B20
-
-gUnknown_843F980::
- .4byte 0xc0004000, 0x00000400
-
-gUnknown_843F988::
- obj_image_anim_frame 0x0000, 0
- obj_image_anim_end
-
-gUnknown_843F990::
- obj_image_anim_frame 0x0020, 0
- obj_image_anim_end
-
-gUnknown_843F998::
- obj_image_anim_frame 0x0040, 0
- obj_image_anim_end
-
-gUnknown_843F9A0::
- obj_image_anim_frame 0x0060, 0
- obj_image_anim_end
-
-gUnknown_843F9A8::
- .4byte gUnknown_843F988
- .4byte gUnknown_843F990
- .4byte gUnknown_843F998
- .4byte gUnknown_843F9A0
-
-gUnknown_843F9B8:: @ 843F9B8 sprite_template
- spr_template 1, 1, gUnknown_843F980, gUnknown_843F9A8, NULL, gDummySpriteAffineAnimTable, sub_8101B20
-
-gUnknown_843F9D0::
- .4byte 0xc0004000, 0x00000400
-
-gUnknown_843F9D8::
- obj_image_anim_frame 0x0060, 0
- obj_image_anim_end
-
-gUnknown_843F9E0::
- obj_image_anim_frame 0x0040, 4
- obj_image_anim_frame 0x0020, 4
- obj_image_anim_end
-
-gUnknown_843F9EC::
- obj_image_anim_frame 0x0040, 4
- obj_image_anim_frame 0x0000, 4
- obj_image_anim_end
-
-gUnknown_843F9F8::
- obj_image_anim_frame 0x0040, 4
- obj_image_anim_frame 0x0060, 0
- obj_image_anim_end
-
-gUnknown_843FA04::
- obj_image_anim_frame 0x0040, 4
- obj_image_anim_end
-
-gUnknown_843FA0C::
- .4byte gUnknown_843F9D8
- .4byte gUnknown_843F9E0
- .4byte gUnknown_843F9EC
- .4byte gUnknown_843F9F8
- .4byte gUnknown_843FA04
-
-gUnknown_843FA20:: @ 843FA20 sprite_template
- spr_template 4, 2, gUnknown_843F9D0, gUnknown_843FA0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_843FA38::
- .4byte 0xc0000000, 0x00000c00
-
-gUnknown_843FA40:: @ 843FA40 sprite_template
- spr_template 6, 2, gUnknown_843FA38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_843FA58::
- .4byte 0x40004000, 0x00000400
-
-gUnknown_843FA60::
- .4byte 0x40000000, 0x00000400
-
-gUnknown_843FA68::
- obj_image_anim_frame 0x0000, 0
- obj_image_anim_end
-
-gUnknown_843FA70::
- obj_image_anim_frame 0x0004, 0
- obj_image_anim_end
-
-gUnknown_843FA78::
- .4byte gUnknown_843FA68
- .4byte gUnknown_843FA70
-
-gUnknown_843FA80:: @ 843FA80 sprite_template
- spr_template 3, 2, gUnknown_843FA58, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_843FA98:: @ 843FA98 sprite_template
- spr_template 2, 2, gUnknown_843FA60, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 8034ee0b1..5c4432714 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -100,7 +100,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F
end
EventScript_GiveProfile: @ 81BEF5A
- setvar VAR_0x8004, 0
+ setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
call Common_ShowEasyChatScreen
lock
faceplayer
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-12 18:29:52 +0000