dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish naming_screen

Browse Source
This commit is contained in:
PikalaxALT
2020-03-10 11:32:18 -04:00
parent 98d63a5268
commit 9aa9c22a7f
10 changed files with 1155 additions and 1950 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/naming_screen.s
-1651
View File
File diff suppressed because it is too large Load Diff
data/data_8479668.s
+12 -12
View File
@@ -29,40 +29,40 @@ gUnknown_847A934::
// naming_screen
gUnknown_847A955::
gText_NamingScreenKeyboard_abcdef::
.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::
gText_NamingScreenKeyboard_ghijkl::
.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::
gText_NamingScreenKeyboard_mnopqrs::
.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::
gText_NamingScreenKeyboard_tuvwxyz::
.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::
gText_NamingScreenKeyboard_ABCDEF::
.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::
gText_NamingScreenKeyboard_GHIJKL::
.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::
gText_NamingScreenKeyboard_MNOPQRS::
.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::
gText_NamingScreenKeyboard_TUVWXYZ::
.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::
gText_NamingScreenKeyboard_01234::
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
gUnknown_847AA76::
gText_NamingScreenKeyboard_56789::
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
gUnknown_847AA8F::
gText_NamingScreenKeyboard_Symbols1::
.string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$"
gUnknown_847AAA8::
gText_NamingScreenKeyboard_Symbols2::
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
// union_room_chat
data/naming_screen.s
-254
View File
@@ -1,254 +0,0 @@
#include "constants/maps.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
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
sNamingScreenTemplates:: @ 83E248C
.4byte gUnknown_83E245C @ NAMING_SCREEN_PLAYER
.4byte gUnknown_83E2468 @ NAMING_SCREEN_BOX
.4byte gUnknown_83E2474 @ NAMING_SCREEN_CAUGHT_MON
.4byte gUnknown_83E2474 @ NAMING_SCREEN_NAME_RATER
.4byte gUnknown_83E2480 @ NAMING_SCREEN_RIVAL
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, SpriteCB_PageSwap
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
sSpriteTemplate_InputArrow:: @ 83E2604
spr_template 10, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E7F0
sSpriteTemplate_Underscore:: @ 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
include/data_8479668.h
+13
View File
@@ -37,4 +37,17 @@ extern const u8 gUnknown_847A8FA[];
extern const u8 gUnknown_847A913[];
extern const u8 gUnknown_847A934[];
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_DATA_8479668_H
include/graphics.h
+16
View File
@@ -4899,6 +4899,22 @@ extern const u32 gEasyChatModeIcons_Tiles[];
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
include/strings.h
+8
View File
@@ -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
src/graphics.c
+2 -2
View File
@@ -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");
src/naming_screen.c
+1097 -20
View File
File diff suppressed because it is too large Load Diff
src/strings.c
+6 -6
View File
@@ -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");
sym_ewram.txt
+1 -5
View File
@@ -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"
gNamingScreenData: @ 203998C
.space 0x4
.include "src/naming_screen.o"
.align 2
.include "src/money.o"
.align 2