PikalaxALT
@@ -1470,8 +1470,8 @@ _0805E8E0:
|
||||
bx r1
|
||||
thumb_func_end TrySpawnObjectEvent
|
||||
|
||||
thumb_func_start sub_805E8E8
|
||||
sub_805E8E8: @ 805E8E8
|
||||
thumb_func_start MakeObjectTemplateFromObjectEventGraphicsInfo
|
||||
MakeObjectTemplateFromObjectEventGraphicsInfo: @ 805E8E8
|
||||
push {r4-r7,lr}
|
||||
adds r6, r1, 0
|
||||
adds r4, r2, 0
|
||||
@@ -1515,7 +1515,7 @@ _0805E936:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_805E8E8
|
||||
thumb_func_end MakeObjectTemplateFromObjectEventGraphicsInfo
|
||||
|
||||
thumb_func_start MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
|
||||
MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex: @ 805E940
|
||||
@@ -1527,7 +1527,7 @@ MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex: @ 805E940
|
||||
lsrs r1, 14
|
||||
adds r1, r4
|
||||
ldr r1, [r1]
|
||||
bl sub_805E8E8
|
||||
bl MakeObjectTemplateFromObjectEventGraphicsInfo
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1565,7 +1565,7 @@ AddPseudoObjectEvent: @ 805E978
|
||||
lsrs r4, 24
|
||||
add r3, sp, 0x18
|
||||
mov r2, sp
|
||||
bl sub_805E8E8
|
||||
bl MakeObjectTemplateFromObjectEventGraphicsInfo
|
||||
mov r0, sp
|
||||
ldrh r1, [r0, 0x2]
|
||||
ldr r0, _0805E9F0 @ =0x0000ffff
|
||||
@@ -1649,7 +1649,7 @@ sprite_new: @ 805E9F8
|
||||
add r3, sp, 0x1C
|
||||
adds r0, r5, 0
|
||||
mov r2, sp
|
||||
bl sub_805E8E8
|
||||
bl MakeObjectTemplateFromObjectEventGraphicsInfo
|
||||
mov r1, sp
|
||||
ldr r2, _0805EB3C @ =0x0000ffff
|
||||
adds r0, r2, 0
|
||||
@@ -1799,7 +1799,7 @@ sub_805EB44: @ 805EB44
|
||||
add r3, sp, 0x18
|
||||
adds r0, r6, 0
|
||||
mov r2, sp
|
||||
bl sub_805E8E8
|
||||
bl MakeObjectTemplateFromObjectEventGraphicsInfo
|
||||
mov r1, sp
|
||||
ldr r2, _0805EC28 @ =0x0000ffff
|
||||
adds r0, r2, 0
|
||||
|
||||
-4594
File diff suppressed because it is too large
Load Diff
@@ -13,159 +13,6 @@
|
||||
|
||||
.section .rodata
|
||||
|
||||
// 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$"
|
||||
|
||||
gUnknown_847A8FA::
|
||||
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
|
||||
|
||||
gUnknown_847A913::
|
||||
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
|
||||
|
||||
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}.$"
|
||||
|
||||
gUnknown_847A976::
|
||||
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$"
|
||||
|
||||
gUnknown_847A997::
|
||||
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
|
||||
|
||||
gUnknown_847A9B8::
|
||||
.string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
|
||||
|
||||
gUnknown_847A9D9::
|
||||
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$"
|
||||
|
||||
gUnknown_847A9FA::
|
||||
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$"
|
||||
|
||||
gUnknown_847AA1B::
|
||||
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
|
||||
|
||||
gUnknown_847AA3C::
|
||||
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
|
||||
|
||||
gUnknown_847AA5D::
|
||||
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
|
||||
|
||||
gUnknown_847AA76::
|
||||
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
|
||||
|
||||
gUnknown_847AA8F::
|
||||
.string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$"
|
||||
|
||||
gUnknown_847AAA8::
|
||||
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
|
||||
|
||||
// union_room_chat
|
||||
|
||||
gText_UnionRoomChatKeyboard_ABCDE::
|
||||
.string "ABCDE$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_FGHIJ::
|
||||
.string "FGHIJ$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_KLMNO::
|
||||
.string "KLMNO$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_PQRST::
|
||||
.string "PQRST$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_UVWXY::
|
||||
.string "UVWXY$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Z::
|
||||
.string "Z $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_01234Upper::
|
||||
.string "01234$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_56789Upper::
|
||||
.string "56789$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_PunctuationUpper::
|
||||
.string ".,!? $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_SymbolsUpper::
|
||||
.string "-/&… $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_abcde::
|
||||
.string "abcde$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_fghij::
|
||||
.string "fghij$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_klmno::
|
||||
.string "klmno$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_pqrst::
|
||||
.string "pqrst$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_uvwxy::
|
||||
.string "uvwxy$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_z::
|
||||
.string "z $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_01234Lower::
|
||||
.string "01234$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_56789Lower::
|
||||
.string "56789$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_PunctuationLower::
|
||||
.string ".,!? $"
|
||||
|
||||
gText_UnionRoomChatKeyboard_SymbolsLower::
|
||||
.string "-/&… $"
|
||||
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
.string "$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji1::
|
||||
.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji2::
|
||||
.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji3::
|
||||
.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji4::
|
||||
.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji5::
|
||||
.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji6::
|
||||
.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji7::
|
||||
.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji8::
|
||||
.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji9::
|
||||
.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
|
||||
|
||||
gText_UnionRoomChatKeyboard_Emoji10::
|
||||
.string "{EXTRA 210}{EXTRA 208}ょ: $"
|
||||
|
||||
@ 847ABAC
|
||||
.align 2
|
||||
.include "data/trainer_tower/trainers.inc"
|
||||
|
||||
@@ -1,458 +0,0 @@
|
||||
#include "constants/maps.h"
|
||||
#include "constants/species.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnknown_83E1800:: @ 83E1800
|
||||
.incbin "graphics/interface/naming_screen_83E1800.4bpp"
|
||||
|
||||
gUnknown_83E18C0:: @ 83E18C0
|
||||
.incbin "graphics/interface/naming_screen_83E18C0.4bpp"
|
||||
|
||||
gUnknown_83E1980:: @ 83E1980
|
||||
.incbin "graphics/interface/naming_screen_83E1980.4bpp"
|
||||
|
||||
gUnknown_83E2280:: @ 83E2280
|
||||
.4byte Text_MonSentToBoxInSomeonesPC
|
||||
.4byte Text_MonSentToBoxInBillsPC
|
||||
.4byte Text_MonSentToBoxSomeonesBoxFull
|
||||
.4byte Text_MonSentToBoxBillsBoxFull
|
||||
|
||||
gUnknown_83E2290:: @ 83E2290
|
||||
.4byte 0x000001e0
|
||||
@ {
|
||||
@ .bg = 0,
|
||||
@ .charBaseIndex = 0,
|
||||
@ .mapBaseIndex = 30,
|
||||
@ .screenSize = 0,
|
||||
@ .paletteMode = 0,
|
||||
@ .priority = 0,
|
||||
@ .baseTile = 0x0000
|
||||
@ }
|
||||
.4byte 0x000011d9
|
||||
@ {
|
||||
@ .bg = 1,
|
||||
@ .charBaseIndex = 2,
|
||||
@ .mapBaseIndex = 29,
|
||||
@ .screenSize = 0,
|
||||
@ .paletteMode = 0,
|
||||
@ .priority = 1,
|
||||
@ .baseTile = 0x0000
|
||||
@ }
|
||||
.4byte 0x000021ca
|
||||
@ {
|
||||
@ .bg = 2,
|
||||
@ .charBaseIndex = 2,
|
||||
@ .mapBaseIndex = 28,
|
||||
@ .screenSize = 0,
|
||||
@ .paletteMode = 0,
|
||||
@ .priority = 2,
|
||||
@ .baseTile = 0x0000
|
||||
@ }
|
||||
.4byte 0x000031ff
|
||||
@ {
|
||||
@ .bg = 3,
|
||||
@ .charBaseIndex = 3,
|
||||
@ .mapBaseIndex = 31,
|
||||
@ .screenSize = 0,
|
||||
@ .paletteMode = 0,
|
||||
@ .priority = 3,
|
||||
@ .baseTile = 0x0000
|
||||
@ }
|
||||
|
||||
gUnknown_83E22A0:: @ 83E22A0
|
||||
.byte 1, 3, 10, 19, 8, 10
|
||||
.2byte 0x0030
|
||||
@ {
|
||||
@ .bg = 1,
|
||||
@ .tilemapLeft = 3,
|
||||
@ .tilemapTop = 10,
|
||||
@ .width = 19,
|
||||
@ .height = 8,
|
||||
@ .paletteNum = 10,
|
||||
@ .baseBlock = 0x0030
|
||||
@ }
|
||||
.byte 2, 3, 10, 19, 8, 10
|
||||
.2byte 0x00c8
|
||||
@ {
|
||||
@ .bg = 2,
|
||||
@ .tilemapLeft = 3,
|
||||
@ .tilemapTop = 10,
|
||||
@ .width = 19,
|
||||
@ .height = 8,
|
||||
@ .paletteNum = 10,
|
||||
@ .baseBlock = 0x00c8
|
||||
@ }
|
||||
.byte 3, 8, 6, 14, 2, 10
|
||||
.2byte 0x0030
|
||||
@ {
|
||||
@ .bg = 3,
|
||||
@ .tilemapLeft = 8,
|
||||
@ .tilemapTop = 6,
|
||||
@ .width = 14,
|
||||
@ .height = 2,
|
||||
@ .paletteNum = 10,
|
||||
@ .baseBlock = 0x0030
|
||||
@ }
|
||||
.byte 3, 9, 4, 16, 2, 10
|
||||
.2byte 0x004c
|
||||
@ {
|
||||
@ .bg = 3,
|
||||
@ .tilemapLeft = 9,
|
||||
@ .tilemapTop = 4,
|
||||
@ .width = 16,
|
||||
@ .height = 2,
|
||||
@ .paletteNum = 10,
|
||||
@ .baseBlock = 0x004c
|
||||
@ }
|
||||
.byte 0, 0, 0, 30, 2, 11
|
||||
.2byte 0x006c
|
||||
@ {
|
||||
@ .bg = 0,
|
||||
@ .tilemapLeft = 0,
|
||||
@ .tilemapTop = 0,
|
||||
@ .width = 30,
|
||||
@ .height = 2,
|
||||
@ .paletteNum = 11,
|
||||
@ .baseBlock = 0x006c
|
||||
@ }
|
||||
.byte 255, 0, 0, 0, 0, 0
|
||||
.2byte 0x0000
|
||||
@ {
|
||||
@ .bg = 255,
|
||||
@ .tilemapLeft = 0,
|
||||
@ .tilemapTop = 0,
|
||||
@ .width = 0,
|
||||
@ .height = 0,
|
||||
@ .paletteNum = 0,
|
||||
@ .baseBlock = 0x0000
|
||||
@ }
|
||||
|
||||
gUnknown_83E22D0:: @ 83E22D0
|
||||
.string "abcdef .", 8
|
||||
.string "ghijkl ,", 8
|
||||
.string "mnopqrs", 8
|
||||
.string "tuvwxyz", 8
|
||||
.string "ABCDEF .", 8
|
||||
.string "GHIJKL ,", 8
|
||||
.string "MNOPQRS", 8
|
||||
.string "TUVWXYZ", 8
|
||||
.string "01234", 8
|
||||
.string "56789", 8
|
||||
.string "!?♂♀/-", 8
|
||||
.string "…“”‘'", 8
|
||||
|
||||
gUnknown_83E2330:: @ 83E2330
|
||||
.byte 0x08, 0x08, 0x06
|
||||
|
||||
gUnknown_83E2333:: @ 83E2333
|
||||
.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x16, 0x2c, 0x42, 0x58, 0x6e, 0x00, 0x00
|
||||
|
||||
gUnknown_83E234B:: @ 83E234B
|
||||
.byte 0x00, 0x02, 0x01
|
||||
|
||||
gUnknown_83E234E:: @ 83E234E
|
||||
.byte 0x01, 0x00, 0x02
|
||||
|
||||
gUnknown_83E2351:: @ 83E2351
|
||||
.byte 0x02, 0x01, 0x00
|
||||
|
||||
gUnknown_83E2354:: @ 83E2354
|
||||
.4byte sub_809E384
|
||||
.4byte sub_809E3AC
|
||||
.4byte sub_809E440
|
||||
.4byte sub_809E4D4
|
||||
|
||||
gUnknown_83E2364:: @ 83E2364
|
||||
.2byte 0x0000, 0xfffc, 0xfffe, 0xffff
|
||||
|
||||
gUnknown_83E236C:: @ 83E236C
|
||||
.2byte 0x0002, 0x0003, 0x0002, 0x0001
|
||||
|
||||
gUnknown_83E2374:: @ 83E2374
|
||||
.byte 0x01, 0x02, 0x03, 0x00
|
||||
|
||||
gUnknown_83E2378:: @ 83E2378
|
||||
.4byte sub_809EC7C
|
||||
.4byte sub_809ECD0
|
||||
.4byte sub_809ECD4
|
||||
.4byte sub_809ED48
|
||||
|
||||
gUnknown_83E2388:: @ 83E2388
|
||||
.2byte 0x0001, 0x0003, 0x0002
|
||||
|
||||
gUnknown_83E238E:: @ 83E238E
|
||||
.2byte 0x0004, 0x0006, 0x0005
|
||||
|
||||
gUnknown_83E2394:: @ 83E2394
|
||||
.4byte nullsub_54
|
||||
.4byte sub_809EF54
|
||||
.4byte sub_809EFB0
|
||||
.4byte sub_809EFF0
|
||||
.4byte sub_809F04C
|
||||
|
||||
gUnknown_83E23A8:: @ 83E23A8
|
||||
obj_image_anim_frame 0, 10
|
||||
obj_image_anim_frame 24, 10
|
||||
obj_image_anim_frame 0, 10
|
||||
obj_image_anim_frame 32, 10
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gUnknown_83E23BC:: @ 83E23BC
|
||||
.4byte gUnknown_83E23A8
|
||||
|
||||
gUnknown_83E23C0:: @ 83E23C0
|
||||
obj_tiles gUnknown_83E1980, 0x0900, 255
|
||||
|
||||
gUnknown_83E23C8:: @ 83E23C8
|
||||
obj_pal gUnknown_8E98004, 255
|
||||
|
||||
gUnknown_83E23D0:: @ 83E23D0
|
||||
.4byte sub_809F11C
|
||||
.4byte KeyboardKeyHandler_Page
|
||||
.4byte KeyboardKeyHandler_Backspace
|
||||
.4byte KeyboardKeyHandler_OK
|
||||
|
||||
gUnknown_83E23E0:: @ 83E23E0
|
||||
.4byte InputState_Disabled
|
||||
.4byte InputState_Enabled
|
||||
|
||||
gUnknown_83E23E8:: @ 83E23E8
|
||||
.2byte 0x0000, 0x0000, 0x0000, 0xffff, 0x0001
|
||||
|
||||
gUnknown_83E23F2:: @ 83E23F2
|
||||
.2byte 0x0000, 0xffff, 0x0001, 0x0000, 0x0000
|
||||
|
||||
gUnknown_83E23FC:: @ 83E23FC
|
||||
.2byte 0x0000, 0x0001, 0x0001, 0x0002
|
||||
|
||||
gUnknown_83E2404:: @ 83E2404
|
||||
.2byte 0x0000, 0x0000, 0x0003, 0x0000
|
||||
|
||||
gUnknown_83E240C:: @ 83E240C
|
||||
.4byte sub_809F49C
|
||||
.4byte sub_809F49C
|
||||
.4byte sub_809F4F0
|
||||
.4byte sub_809F4F0
|
||||
.4byte sub_809F49C
|
||||
|
||||
gUnknown_83E2420:: @ 83E2420
|
||||
.4byte nullsub_55
|
||||
.4byte sub_809F5C4
|
||||
|
||||
gUnknown_83E2428:: @ 83E2428
|
||||
.byte 0x00, 0x09, 0x08, 0x00
|
||||
.byte 0x05, 0x04, 0x00, 0x00
|
||||
|
||||
gUnknown_83E2430:: @ 83E2430
|
||||
.byte 0x0d, 0x01, 0x02, 0x00
|
||||
|
||||
gUnknown_83E2434:: @ 83E2434
|
||||
.byte 0x0e, 0x01, 0x02, 0x00
|
||||
|
||||
gUnknown_83E2438:: @ 83E2438
|
||||
.byte 0x0f, 0x01, 0x02, 0x00
|
||||
|
||||
gUnknown_83E243C:: @ 83E243C
|
||||
.byte 0xee, 0xdd, 0xff, 0x00
|
||||
|
||||
gUnknown_83E2440:: @ 83E2440
|
||||
.4byte gUnknown_83E2434
|
||||
.4byte gUnknown_83E2430
|
||||
.4byte gUnknown_83E2438
|
||||
|
||||
gUnknown_83E244C:: @ 83E244C
|
||||
.4byte gUnknown_8E98398
|
||||
.4byte gUnknown_8E98458
|
||||
.4byte gUnknown_8E98518
|
||||
|
||||
gUnknown_83E2458:: @ 83E2458
|
||||
.byte 0x0f, 0x01, 0x02
|
||||
|
||||
.align 2
|
||||
gUnknown_83E245C:: @ 83E245C
|
||||
.byte 0x00, 0x07, 0x01, 0x00, 0x01
|
||||
.align 2
|
||||
.4byte gUnknown_8418E47
|
||||
|
||||
gUnknown_83E2468:: @ 83E2468
|
||||
.byte 0x00, 0x08, 0x02, 0x00, 0x01
|
||||
.align 2
|
||||
.4byte gUnknown_8418E52
|
||||
|
||||
gUnknown_83E2474:: @ 83E2474
|
||||
.byte 0x00, 0x0a, 0x03, 0x01, 0x01
|
||||
.align 2
|
||||
.4byte gUnknown_8418E5C
|
||||
|
||||
gUnknown_83E2480:: @ 83E2480
|
||||
.byte 0x00, 0x07, 0x04, 0x00, 0x01
|
||||
.align 2
|
||||
.4byte gUnknown_8418E69
|
||||
|
||||
gUnknown_83E248C:: @ 83E248C
|
||||
.4byte gUnknown_83E245C
|
||||
.4byte gUnknown_83E2468
|
||||
.4byte gUnknown_83E2474
|
||||
.4byte gUnknown_83E2474
|
||||
.4byte gUnknown_83E2480
|
||||
|
||||
gUnknown_83E24A0:: @ 83E24A0
|
||||
.4byte 0x00000000, 0x00000000
|
||||
|
||||
gUnknown_83E24A8:: @ 3E24A8
|
||||
.4byte 0x40000000, 0x00000000
|
||||
|
||||
gUnknown_83E24B0:: @ 3E24B0
|
||||
.4byte 0x80004000, 0x00000000
|
||||
|
||||
gUnknown_83E24B8:: @ 83E24B8
|
||||
subsprite 236, 240, 1, 0x0000, 32x8
|
||||
subsprite 12, 240, 1, 0x0004, 8x8
|
||||
subsprite 236, 248, 1, 0x0005, 32x8
|
||||
subsprite 12, 248, 1, 0x0009, 8x8
|
||||
subsprite 236, 0, 1, 0x000a, 32x8
|
||||
subsprite 12, 0, 1, 0x000e, 8x8
|
||||
subsprite 236, 8, 1, 0x000f, 32x8
|
||||
subsprite 12, 8, 1, 0x0013, 8x8
|
||||
|
||||
gUnknown_83E24D8:: @ 83E24D8
|
||||
subsprite 244, 252, 1, 0x0000, 16x8
|
||||
subsprite 4, 252, 1, 0x0002, 8x8
|
||||
|
||||
gUnknown_83E24E0:: @ 83E24E0
|
||||
subsprite 236, 244, 1, 0x0000, 32x8
|
||||
subsprite 12, 244, 1, 0x0004, 8x8
|
||||
subsprite 236, 252, 1, 0x0005, 32x8
|
||||
subsprite 12, 252, 1, 0x0009, 8x8
|
||||
subsprite 236, 4, 1, 0x000a, 32x8
|
||||
subsprite 12, 4, 1, 0x000e, 8x8
|
||||
|
||||
gUnknown_83E24F8::
|
||||
subsprite 248, 244, 3, 0x0000, 16x8
|
||||
subsprite 248, 252, 3, 0x0002, 16x8
|
||||
subsprite 248, 4, 3, 0x0004, 16x8
|
||||
|
||||
gUnknown_83E2504:: @ 83E2504
|
||||
.byte 0x08
|
||||
.align 2
|
||||
.4byte gUnknown_83E24B8
|
||||
|
||||
gUnknown_83E250C:: @ 83E250C
|
||||
.byte 0x02
|
||||
.align 2
|
||||
.4byte gUnknown_83E24D8
|
||||
.byte 0x02
|
||||
.align 2
|
||||
.4byte gUnknown_83E24D8
|
||||
.byte 0x02
|
||||
.align 2
|
||||
.4byte gUnknown_83E24D8
|
||||
|
||||
gUnknown_83E2524:: @ 83E2524
|
||||
.byte 0x06
|
||||
.align 2
|
||||
.4byte gUnknown_83E24E0
|
||||
|
||||
gUnknown_83E252C:: @ 83E252C
|
||||
.byte 0x03
|
||||
.align 2
|
||||
.4byte gUnknown_83E24F8
|
||||
|
||||
gUnknown_83E2534:: @ 83E2534
|
||||
obj_frame_tiles gUnknown_83E1800, 0x00c0
|
||||
obj_frame_tiles gUnknown_83E18C0, 0x00c0
|
||||
|
||||
gUnknown_83E2544:: @ 83E2544
|
||||
obj_image_anim_frame 0, 1
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gUnknown_83E254C:: @ 83E254C
|
||||
obj_image_anim_frame 4, 8
|
||||
obj_image_anim_frame 8, 8
|
||||
obj_image_anim_end
|
||||
|
||||
gUnknown_83E2558:: @ 83E2558
|
||||
obj_image_anim_frame 0, 2
|
||||
obj_image_anim_frame 1, 2
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gUnknown_83E2564:: @ 83E2564
|
||||
.4byte gUnknown_83E2544
|
||||
|
||||
gUnknown_83E2568:: @ 83E2568
|
||||
.4byte gUnknown_83E2544
|
||||
.4byte gUnknown_83E254C
|
||||
|
||||
gUnknown_83E2570:: @ 83E2570
|
||||
.4byte gUnknown_83E2558
|
||||
|
||||
gUnknown_83E2574:: @ 83E2574
|
||||
spr_template 2, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809EC54
|
||||
|
||||
gUnknown_83E258C:: @ 83E258C
|
||||
spr_template 3, 1, gUnknown_83E24B0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
gUnknown_83E25A4:: @ 83E25A4
|
||||
spr_template 4, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
gUnknown_83E25BC:: @ 83E25BC
|
||||
spr_template 0, 6, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
gUnknown_83E25D4:: @ 83E25D4
|
||||
spr_template 1, 7, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
gUnknown_83E25EC:: @ 83E25EC
|
||||
spr_template 7, 5, gUnknown_83E24A8, gUnknown_83E2568, NULL, gDummySpriteAffineAnimTable, sub_809E700
|
||||
|
||||
gUnknown_83E2604:: @ 83E2604
|
||||
spr_template 10, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E7F0
|
||||
|
||||
gUnknown_83E261C:: @ 83E261C
|
||||
spr_template 11, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E83C
|
||||
|
||||
gUnknown_83E2634:: @ 83E2634
|
||||
spr_template 65535, 0, gUnknown_83E24A0, gUnknown_83E2570, gUnknown_83E2534, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
gUnknown_83E264C:: @ 83E264C
|
||||
.4byte gUnknown_847A955
|
||||
.4byte gUnknown_847A976
|
||||
.4byte gUnknown_847A997
|
||||
.4byte gUnknown_847A9B8
|
||||
.4byte gUnknown_847A9D9
|
||||
.4byte gUnknown_847A9FA
|
||||
.4byte gUnknown_847AA1B
|
||||
.4byte gUnknown_847AA3C
|
||||
.4byte gUnknown_847AA5D
|
||||
.4byte gUnknown_847AA76
|
||||
.4byte gUnknown_847AA8F
|
||||
.4byte gUnknown_847AAA8
|
||||
|
||||
gUnknown_83E267C:: @ 83E267C
|
||||
obj_tiles gUnknown_8E98858, 0x01e0, 0
|
||||
obj_tiles gUnknown_8E98A38, 0x01e0, 1
|
||||
obj_tiles gUnknown_8E985D8, 0x0280, 2
|
||||
obj_tiles gUnknown_8E98FD8, 0x0100, 3
|
||||
obj_tiles gUnknown_8E98C18, 0x0060, 4
|
||||
obj_tiles gUnknown_8E98CB8, 0x0060, 5
|
||||
obj_tiles gUnknown_8E98D58, 0x0060, 6
|
||||
obj_tiles gUnknown_8E98DF8, 0x0080, 7
|
||||
obj_tiles gUnknown_8E98E98, 0x0080, 8
|
||||
obj_tiles gUnknown_8E98F38, 0x0080, 9
|
||||
obj_tiles gUnknown_8E990D8, 0x0020, 10
|
||||
obj_tiles gUnknown_8E990F8, 0x0020, 11
|
||||
null_obj_tiles
|
||||
|
||||
gUnknown_83E26E4:: @ 83E26E4
|
||||
obj_pal gUnknown_8E98024, 0
|
||||
obj_pal gUnknown_8E98044, 1
|
||||
obj_pal gUnknown_8E98064, 2
|
||||
obj_pal gUnknown_8E98084, 3
|
||||
obj_pal gUnknown_8E980A4, 4
|
||||
obj_pal gUnknown_8E980C4, 5
|
||||
obj_pal gUnknown_8E980A4, 6
|
||||
obj_pal gUnknown_8E980A4, 7
|
||||
null_obj_pal
|
||||
@@ -128,6 +128,7 @@ void SetSpritePosToMapCoords(s16 x, s16 y, s16 *x2, s16 *y2);
|
||||
void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible);
|
||||
u8 ZCoordToPriority(u8 z);
|
||||
void SetObjectSubpriorityByZCoord(u8 z, struct Sprite * sprite, u8 offset);
|
||||
void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables);
|
||||
|
||||
// Exported data declarations
|
||||
|
||||
|
||||
@@ -24,5 +24,6 @@ void sub_8083598(u8 a0);
|
||||
void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId);
|
||||
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused);
|
||||
void ReturnToFieldFromFlyMapSelect(void);
|
||||
void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
|
||||
|
||||
#endif //GUARD_FIELD_EFFECTS_H
|
||||
|
||||
@@ -37,5 +37,6 @@ bool8 PartyHasMonWithSurf(void);
|
||||
bool8 IsPlayerSurfingNorth(void);
|
||||
void player_get_pos_including_state_based_drift(s16 *x, s16 *y);
|
||||
void sub_805CBE8(void);
|
||||
u8 sub_805C7C8(u8 state, u8 gender);
|
||||
|
||||
#endif //GUARD_FIELD_PLAYER_AVATAR_H
|
||||
|
||||
@@ -21,6 +21,7 @@ void nullsub_61(void);
|
||||
u8 ContextNpcGetTextColor(void);
|
||||
void SetPCBoxToSendMon(u8);
|
||||
u16 GetPCBoxToSendMon(void);
|
||||
bool8 IsDestinationBoxFull(void);
|
||||
bool8 ShouldShowBoxWasFullMessage(void);
|
||||
u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr);
|
||||
u8 GetUnlockedSeviiAreas(void);
|
||||
|
||||
@@ -4895,4 +4895,26 @@ extern const u32 gEasyChatRedRectangularCursor_Tiles[];
|
||||
extern const u32 gEasyChatSelectGroupHelp_Tiles[];
|
||||
extern const u32 gEasyChatModeIcons_Tiles[];
|
||||
|
||||
// naming_screen
|
||||
extern const u32 gUnknown_8E982BC[];
|
||||
extern const u32 gUnknown_8E98458[];
|
||||
extern const u32 gUnknown_8E98398[];
|
||||
extern const u32 gUnknown_8E98518[];
|
||||
extern const u32 gNamingScreenMenu_Gfx[];
|
||||
extern const u16 gUnknown_8E98004[];
|
||||
extern const u16 gUnknown_8E97FE4[];
|
||||
extern const u16 gNamingScreenMenu_Pal[];
|
||||
extern const u16 gUnknown_8E98858[];
|
||||
extern const u16 gUnknown_8E98A38[];
|
||||
extern const u16 gUnknown_8E985D8[];
|
||||
extern const u16 gUnknown_8E98FD8[];
|
||||
extern const u16 gUnknown_8E98C18[];
|
||||
extern const u16 gUnknown_8E98CB8[];
|
||||
extern const u16 gUnknown_8E98D58[];
|
||||
extern const u16 gUnknown_8E98DF8[];
|
||||
extern const u16 gUnknown_8E98E98[];
|
||||
extern const u16 gUnknown_8E98F38[];
|
||||
extern const u16 gUnknown_8E990D8[];
|
||||
extern const u16 gUnknown_8E990F8[];
|
||||
|
||||
#endif //GUARD_GRAPHICS_H
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#ifndef GUARD_DATA_8479668_H
|
||||
#define GUARD_DATA_8479668_H
|
||||
#ifndef GUARD_KEYBOARD_TEXT_H
|
||||
#define GUARD_KEYBOARD_TEXT_H
|
||||
|
||||
extern const u8 gText_UnionRoomChatKeyboard_ABCDE[];
|
||||
extern const u8 gText_UnionRoomChatKeyboard_FGHIJ[];
|
||||
@@ -37,4 +37,17 @@ extern const u8 gUnknown_847A8FA[];
|
||||
extern const u8 gUnknown_847A913[];
|
||||
extern const u8 gUnknown_847A934[];
|
||||
|
||||
#endif //GUARD_DATA_8479668_H
|
||||
extern const u8 gText_NamingScreenKeyboard_abcdef[];
|
||||
extern const u8 gText_NamingScreenKeyboard_ghijkl[];
|
||||
extern const u8 gText_NamingScreenKeyboard_mnopqrs[];
|
||||
extern const u8 gText_NamingScreenKeyboard_tuvwxyz[];
|
||||
extern const u8 gText_NamingScreenKeyboard_ABCDEF[];
|
||||
extern const u8 gText_NamingScreenKeyboard_GHIJKL[];
|
||||
extern const u8 gText_NamingScreenKeyboard_MNOPQRS[];
|
||||
extern const u8 gText_NamingScreenKeyboard_TUVWXYZ[];
|
||||
extern const u8 gText_NamingScreenKeyboard_01234[];
|
||||
extern const u8 gText_NamingScreenKeyboard_56789[];
|
||||
extern const u8 gText_NamingScreenKeyboard_Symbols1[];
|
||||
extern const u8 gText_NamingScreenKeyboard_Symbols2[];
|
||||
|
||||
#endif //GUARD_KEYBOARD_TEXT_H
|
||||
@@ -6,9 +6,9 @@
|
||||
#define NAMING_SCREEN_PLAYER 0
|
||||
#define NAMING_SCREEN_BOX 1
|
||||
#define NAMING_SCREEN_CAUGHT_MON 2
|
||||
#define NAMING_SCREEN_3 3
|
||||
#define NAMING_SCREEN_WALDA 4
|
||||
#define NAMING_SCREEN_NAME_RATER 3
|
||||
#define NAMING_SCREEN_RIVAL 4
|
||||
|
||||
void DoNamingScreen(u8 caseId, u8* dst, u16 monSpecies, u8 monGender, u32 monPersonality, void (*callback)(void));
|
||||
void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 monSpecies, u16 monGender, u32 monPersonality, MainCallback returnCallback);
|
||||
|
||||
#endif // GUARD_NAMING_SCREEN_H
|
||||
|
||||
@@ -6,13 +6,12 @@
|
||||
#define TOTAL_BOXES_COUNT 14
|
||||
#define IN_BOX_COUNT 30
|
||||
|
||||
u8* GetBoxNamePtr(u8 boxNumber);
|
||||
u8 *GetBoxNamePtr(u8 boxNumber);
|
||||
struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 monPosition);
|
||||
void SetBoxMonNickFromAnyBox(u8 boxId, u8 monPosition, u8 * newNick);
|
||||
void CompactPartySlots(void);
|
||||
u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
|
||||
void sub_808BCB4(u8 boxId, u8 monPosition);
|
||||
u8 * GetBoxNamePtr(u8 boxId);
|
||||
void sub_808CE60(void);
|
||||
void ResetPokemonStorageSystem(void);
|
||||
u8 StorageGetCurrentBox(void);
|
||||
|
||||
@@ -1350,4 +1350,12 @@ extern const u8 gUnknown_8418AA1[];
|
||||
extern const u8 gUnknown_8418AB2[];
|
||||
extern const u8 gUnknown_841EE2B[];
|
||||
|
||||
// naming_screen
|
||||
extern const u8 gText_MoveOkBack[];
|
||||
extern const u8 gText_AlphabetUpperLower[];
|
||||
extern const u8 gText_YourName[];
|
||||
extern const u8 gText_BoxName[];
|
||||
extern const u8 gText_PkmnsNickname[];
|
||||
extern const u8 gText_RivalsName[];
|
||||
|
||||
#endif //GUARD_STRINGS_H
|
||||
|
||||
+3
-2
@@ -141,7 +141,7 @@ SECTIONS {
|
||||
src/special_field_anim.o(.text);
|
||||
src/berry.o(.text);
|
||||
src/script_menu.o(.text);
|
||||
asm/naming_screen.o(.text);
|
||||
src/naming_screen.o(.text);
|
||||
src/money.o(.text);
|
||||
src/script_pokemon_util.o(.text);
|
||||
src/field_poison.o(.text);
|
||||
@@ -459,7 +459,7 @@ SECTIONS {
|
||||
src/special_field_anim.o(.rodata);
|
||||
src/berry.o(.rodata);
|
||||
src/script_menu.o(.rodata);
|
||||
data/naming_screen.o(.rodata);
|
||||
src/naming_screen.o(.rodata);
|
||||
src/pokemon_size_record.o(.rodata);
|
||||
src/item_use.o(.rodata);
|
||||
src/battle_anim_effects_1.o(.rodata);
|
||||
@@ -591,6 +591,7 @@ SECTIONS {
|
||||
src/trainer_tower.o(.rodata);
|
||||
src/minigame_countdown.o(.rodata);
|
||||
src/berry_fix_program.o(.rodata);
|
||||
src/keyboard_text.o(.rodata);
|
||||
data/data_8479668.o(.rodata);
|
||||
|
||||
/* These should not be moved to C files */
|
||||
|
||||
+1
-1
@@ -1967,7 +1967,7 @@ static void CB2_EggHatch_1(void)
|
||||
species = GetMonData(&gPlayerParty[sEggHatchData->eggPartyID], MON_DATA_SPECIES);
|
||||
gender = GetMonGender(&gPlayerParty[sEggHatchData->eggPartyID]);
|
||||
personality = GetMonData(&gPlayerParty[sEggHatchData->eggPartyID], MON_DATA_PERSONALITY, 0);
|
||||
DoNamingScreen(3, gStringVar3, species, gender, personality, EggHatchSetMonNickname);
|
||||
DoNamingScreen(NAMING_SCREEN_NAME_RATER, gStringVar3, species, gender, personality, EggHatchSetMonNickname);
|
||||
break;
|
||||
case 1:
|
||||
case -1:
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#include "global.h"
|
||||
#include "gflib.h"
|
||||
#include "data_8479668.h"
|
||||
#include "keyboard_text.h"
|
||||
#include "decompress.h"
|
||||
#include "easy_chat.h"
|
||||
#include "graphics.h"
|
||||
|
||||
@@ -1637,7 +1637,7 @@ void ChangeBoxPokemonNickname(void)
|
||||
species = GetBoxMonData(pokemon, MON_DATA_SPECIES, NULL);
|
||||
gender = GetBoxMonGender(pokemon);
|
||||
personality = GetBoxMonData(pokemon, MON_DATA_PERSONALITY, NULL);
|
||||
DoNamingScreen(3, gStringVar2, species, gender, personality, ChangeBoxPokemonNickname_CB);
|
||||
DoNamingScreen(NAMING_SCREEN_NAME_RATER, gStringVar2, species, gender, personality, ChangeBoxPokemonNickname_CB);
|
||||
}
|
||||
|
||||
static void ChangeBoxPokemonNickname_CB(void)
|
||||
@@ -1657,7 +1657,7 @@ void ChangePokemonNickname(void)
|
||||
species = GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES, NULL);
|
||||
gender = GetMonGender(&gPlayerParty[gSpecialVar_0x8004]);
|
||||
personality = GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_PERSONALITY, NULL);
|
||||
DoNamingScreen(3, gStringVar2, species, gender, personality, ChangePokemonNickname_CB);
|
||||
DoNamingScreen(NAMING_SCREEN_NAME_RATER, gStringVar2, species, gender, personality, ChangePokemonNickname_CB);
|
||||
}
|
||||
|
||||
static void ChangePokemonNickname_CB(void)
|
||||
|
||||
+2
-2
@@ -1182,14 +1182,14 @@ const u32 gUnknown_8E97EC4[] = INCBIN_U32("graphics/interface/learn_move.bin.lz"
|
||||
|
||||
const u16 gUnknown_8E97FE4[] = INCBIN_U16("graphics/interface/naming_screen_8E97FE4.gbapal");
|
||||
const u16 gUnknown_8E98004[] = INCBIN_U16("graphics/interface/naming_screen_8E98004.gbapal");
|
||||
const u16 gUnknown_8E98024[] = INCBIN_U16("graphics/interface/naming_screen_8E98024.gbapal");
|
||||
const u16 gNamingScreenMenu_Pal[] = INCBIN_U16("graphics/interface/naming_screen_8E98024.gbapal");
|
||||
const u16 gUnknown_8E98044[] = INCBIN_U16("graphics/interface/naming_screen_8E98044.gbapal");
|
||||
const u16 gUnknown_8E98064[] = INCBIN_U16("graphics/interface/naming_screen_8E98064.gbapal");
|
||||
const u16 gUnknown_8E98084[] = INCBIN_U16("graphics/interface/naming_screen_8E98084.gbapal");
|
||||
const u16 gUnknown_8E980A4[] = INCBIN_U16("graphics/interface/naming_screen_8E980A4.gbapal");
|
||||
const u16 gUnknown_8E980C4[] = INCBIN_U16("graphics/interface/naming_screen_8E980C4.gbapal");
|
||||
|
||||
const u32 gUnknown_8E980E4[] = INCBIN_U32("graphics/interface/naming_screen_menu.4bpp.lz");
|
||||
const u32 gNamingScreenMenu_Gfx[] = INCBIN_U32("graphics/interface/naming_screen_menu.4bpp.lz");
|
||||
const u32 gUnknown_8E982BC[] = INCBIN_U32("graphics/interface/naming_screen_menu.bin.lz");
|
||||
const u32 gUnknown_8E98398[] = INCBIN_U32("graphics/interface/naming_screen_E98398.bin.lz");
|
||||
const u32 gUnknown_8E98458[] = INCBIN_U32("graphics/interface/naming_screen_E98458.bin.lz");
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
#include "global.h"
|
||||
|
||||
// easy_chat_3
|
||||
const u8 gUnknown_847A8D8[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others");
|
||||
const u8 gUnknown_847A8FA[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L");
|
||||
const u8 gUnknown_847A913[] = _("{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} ");
|
||||
const u8 gUnknown_847A934[] = _("{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
|
||||
const u8 gText_NamingScreenKeyboard_abcdef[] = _("{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.");
|
||||
const u8 gText_NamingScreenKeyboard_ghijkl[] = _("{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},");
|
||||
const u8 gText_NamingScreenKeyboard_mnopqrs[] = _("{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} ");
|
||||
const u8 gText_NamingScreenKeyboard_tuvwxyz[] = _("{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_ABCDEF[] = _("{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.");
|
||||
const u8 gText_NamingScreenKeyboard_GHIJKL[] = _("{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},");
|
||||
const u8 gText_NamingScreenKeyboard_MNOPQRS[] = _("{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_TUVWXYZ[] = _("{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} ");
|
||||
const u8 gText_NamingScreenKeyboard_01234[] = _("{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} ");
|
||||
const u8 gText_NamingScreenKeyboard_56789[] = _("{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} ");
|
||||
const u8 gText_NamingScreenKeyboard_Symbols1[] = _("{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-");
|
||||
const u8 gText_NamingScreenKeyboard_Symbols2[] = _("{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} ");
|
||||
|
||||
// union_room_chat
|
||||
const u8 gText_UnionRoomChatKeyboard_ABCDE[] = _("ABCDE");
|
||||
const u8 gText_UnionRoomChatKeyboard_FGHIJ[] = _("FGHIJ");
|
||||
const u8 gText_UnionRoomChatKeyboard_KLMNO[] = _("KLMNO");
|
||||
const u8 gText_UnionRoomChatKeyboard_PQRST[] = _("PQRST");
|
||||
const u8 gText_UnionRoomChatKeyboard_UVWXY[] = _("UVWXY");
|
||||
const u8 gText_UnionRoomChatKeyboard_Z[] = _("Z ");
|
||||
const u8 gText_UnionRoomChatKeyboard_01234Upper[] = _("01234");
|
||||
const u8 gText_UnionRoomChatKeyboard_56789Upper[] = _("56789");
|
||||
const u8 gText_UnionRoomChatKeyboard_PunctuationUpper[] = _(".,!? ");
|
||||
const u8 gText_UnionRoomChatKeyboard_SymbolsUpper[] = _("-/&… ");
|
||||
const u8 gText_UnionRoomChatKeyboard_abcde[] = _("abcde");
|
||||
const u8 gText_UnionRoomChatKeyboard_fghij[] = _("fghij");
|
||||
const u8 gText_UnionRoomChatKeyboard_klmno[] = _("klmno");
|
||||
const u8 gText_UnionRoomChatKeyboard_pqrst[] = _("pqrst");
|
||||
const u8 gText_UnionRoomChatKeyboard_uvwxy[] = _("uvwxy");
|
||||
const u8 gText_UnionRoomChatKeyboard_z[] = _("z ");
|
||||
const u8 gText_UnionRoomChatKeyboard_01234Lower[] = _("01234");
|
||||
const u8 gText_UnionRoomChatKeyboard_56789Lower[] = _("56789");
|
||||
const u8 gText_UnionRoomChatKeyboard_PunctuationLower[] = _(".,!? ");
|
||||
const u8 gText_UnionRoomChatKeyboard_SymbolsLower[] = _("-/&… ");
|
||||
const u8 gText_BlankString_847AB39[] = _("");
|
||||
const u8 gText_BlankString_847AB3A[] = _("");
|
||||
const u8 gText_BlankString_847AB3B[] = _("");
|
||||
const u8 gText_BlankString_847AB3C[] = _("");
|
||||
const u8 gText_BlankString_847AB3D[] = _("");
|
||||
const u8 gText_BlankString_847AB3E[] = _("");
|
||||
const u8 gText_BlankString_847AB3F[] = _("");
|
||||
const u8 gText_BlankString_847AB40[] = _("");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji1[] = _("{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji2[] = _("{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji3[] = _("{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji4[] = _("♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji5[] = _("{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji6[] = _("{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji7[] = _("{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji8[] = _("{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji9[] = _("{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}");
|
||||
const u8 gText_UnionRoomChatKeyboard_Emoji10[] = _("{EXTRA 210}{EXTRA 208}ょ: ");
|
||||
+2401
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -1223,13 +1223,13 @@ static void Task_OakSpeech25(u8 taskId)
|
||||
GetDefaultName(sOakSpeechResources->unk_0010, 0);
|
||||
if (sOakSpeechResources->unk_0010 == 0)
|
||||
{
|
||||
DoNamingScreen(0, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnFromNamingScreen);
|
||||
DoNamingScreen(NAMING_SCREEN_PLAYER, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_ReturnFromNamingScreen);
|
||||
}
|
||||
else
|
||||
{
|
||||
ClearStdWindowAndFrameToTransparent(gTasks[taskId].data[13], 1);
|
||||
RemoveWindow(gTasks[taskId].data[13]);
|
||||
DoNamingScreen(4, gSaveBlock1Ptr->rivalName, 0, 0, 0, CB2_ReturnFromNamingScreen);
|
||||
DoNamingScreen(NAMING_SCREEN_RIVAL, gSaveBlock1Ptr->rivalName, 0, 0, 0, CB2_ReturnFromNamingScreen);
|
||||
}
|
||||
DestroyLinkedPikaOrGrassPlatformSprites(taskId, 1);
|
||||
FreeAllWindowBuffers();
|
||||
|
||||
+6
-6
@@ -767,12 +767,12 @@ const u8 gText_SaveFailedScreen_SaveCompleted[] = _("Save completed.\n“Please
|
||||
const u8 gUnknown_8418E36[] = _("れんらくせん");
|
||||
const u8 gUnknown_8418E3D[] = _("ひみつきち");
|
||||
const u8 gUnknown_8418E43[] = _("アジト");
|
||||
const u8 gUnknown_8418E47[] = _("YOUR NAME?");
|
||||
const u8 gUnknown_8418E52[] = _("BOX NAME?");
|
||||
const u8 gUnknown_8418E5C[] = _("'s nickname?");
|
||||
const u8 gUnknown_8418E69[] = _("RIVAL's NAME?");
|
||||
const u8 gUnknown_8418E77[] = _("{DPAD_ANY}MOVE {A_BUTTON}OK {B_BUTTON}BACK");
|
||||
const u8 gUnknown_8418E8A[] = _("");
|
||||
const u8 gText_YourName[] = _("YOUR NAME?");
|
||||
const u8 gText_BoxName[] = _("BOX NAME?");
|
||||
const u8 gText_PkmnsNickname[] = _("'s nickname?");
|
||||
const u8 gText_RivalsName[] = _("RIVAL's NAME?");
|
||||
const u8 gText_MoveOkBack[] = _("{DPAD_ANY}MOVE {A_BUTTON}OK {B_BUTTON}BACK");
|
||||
const u8 gText_AlphabetUpperLower[] = _("");
|
||||
const u8 gText_RegionMap_Space[] = _(" ");
|
||||
const u8 gText_RegionMap_AButtonGuide[] = _("{A_BUTTON}GUIDE");
|
||||
const u8 gText_RegionMap_AButtonCancel[] = _("{A_BUTTON}CANCEL");
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "task.h"
|
||||
#include "union_room_chat.h"
|
||||
#include "union_room_chat_display.h"
|
||||
#include "data_8479668.h"
|
||||
#include "keyboard_text.h"
|
||||
#include "constants/songs.h"
|
||||
|
||||
#define MESSAGE_BUFFER_NCHAR 15
|
||||
|
||||
+1
-5
@@ -233,12 +233,8 @@ gUnknown_203982C: @ 203982C
|
||||
.include "src/special_field_anim.o"
|
||||
.align 2
|
||||
.include "src/script_menu.o"
|
||||
|
||||
.align 2
|
||||
@ .include "src/naming_screen.o"
|
||||
gUnknown_203998C: @ 203998C
|
||||
.space 0x4
|
||||
|
||||
.include "src/naming_screen.o"
|
||||
.align 2
|
||||
.include "src/money.o"
|
||||
.align 2
|
||||
|
||||
Reference in New Issue
Block a user