ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

mon anim with master

Browse Source
This commit is contained in:
DizzyEggg 2018-01-29 14:40:50 +01:00
commit 78fc471f32
57 changed files with 2438 additions and 4761 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/battle_frontier_1.s
View File

@ -7096,7 +7096,7 @@ _081926B0:
movs r1, 0x1
str r1, [sp, 0x8]
ldr r1, =sub_8190938
bl sub_80D2CC4
bl CreateMonIcon
ldr r1, [r6]
adds r1, r4
strb r0, [r1]
@ -8779,7 +8779,7 @@ _081934B0:
mov r1, r10
str r1, [sp, 0x8]
ldr r1, =sub_8190938
bl sub_80D2CC4
bl CreateMonIcon
ldr r1, [r6]
adds r1, r4
strb r0, [r1]
@ -8927,7 +8927,7 @@ _081935FA:
movs r1, 0x1
str r1, [sp, 0x8]
ldr r1, =sub_8190938
bl sub_80D2CC4
bl CreateMonIcon
ldr r1, [r6]
adds r1, r4
strb r0, [r1]

2
asm/berry_tag_screen.s
View File

@ -486,7 +486,7 @@ sub_817804C: @ 817804C
str r6, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r4-r6}
pop {r0}

2
asm/credits.s
View File

@ -149,7 +149,7 @@ _081755E4:
movs r0, 0
movs r1, 0x1
adds r3, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4,r5}
pop {r0}

26
asm/field_effect.s
View File

@ -764,8 +764,8 @@ _080B608E:
bx r0
thumb_func_end sub_80B6070
thumb_func_start sub_80B609C
sub_80B609C: @ 80B609C
thumb_func_start MultiplyInvertedPaletteRGBComponents
MultiplyInvertedPaletteRGBComponents: @ 80B609C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@ -832,7 +832,7 @@ sub_80B609C: @ 80B609C
pop {r0}
bx r0
.pool
thumb_func_end sub_80B609C
thumb_func_end MultiplyInvertedPaletteRGBComponents
thumb_func_start sub_80B6128
sub_80B6128: @ 80B6128
@ -1469,7 +1469,7 @@ _080B65D8:
mov r9, r3
add r4, r9
ldrb r3, [r4]
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
ldrh r4, [r7, 0x32]
adds r4, 0x2
mov r0, r8
@ -1488,7 +1488,7 @@ _080B65D8:
ldrb r2, [r2]
add r4, r9
ldrb r3, [r4]
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
ldrh r4, [r7, 0x32]
adds r4, 0x1
mov r3, r8
@ -1507,7 +1507,7 @@ _080B65D8:
ldrb r2, [r2]
add r4, r9
ldrb r3, [r4]
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
ldrh r4, [r7, 0x32]
lsls r4, 24
lsrs r4, 24
@ -1527,7 +1527,7 @@ _080B65D8:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r10
bl IndexOfSpritePaletteTag
lsls r0, 24
@ -1538,7 +1538,7 @@ _080B65D8:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
movs r3, 0x34
ldrsh r0, [r7, r3]
cmp r0, 0x2
@ -1612,7 +1612,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 24
@ -1624,7 +1624,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 24
@ -1636,7 +1636,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 24
@ -1647,7 +1647,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
mov r0, r8
bl IndexOfSpritePaletteTag
lsls r0, 24
@ -1658,7 +1658,7 @@ _080B6718:
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
pop {r3}
mov r8, r3
pop {r4-r6}

12
asm/field_player_avatar.s
View File

@ -2602,8 +2602,8 @@ _0808BD2C:
.pool
thumb_func_end sub_808BCF4
thumb_func_start sub_808BD3C
sub_808BD3C: @ 808BD3C
thumb_func_start GetRivalAvatarGraphicsIdByStateIdAndGender
GetRivalAvatarGraphicsIdByStateIdAndGender: @ 808BD3C
lsls r0, 24
lsls r1, 24
lsrs r1, 24
@ -2614,7 +2614,7 @@ sub_808BD3C: @ 808BD3C
ldrb r0, [r1]
bx lr
.pool
thumb_func_end sub_808BD3C
thumb_func_end GetRivalAvatarGraphicsIdByStateIdAndGender
thumb_func_start GetPlayerAvatarGraphicsIdByStateIdAndGender
@ u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 stateId, u8 gender)
@ -4538,7 +4538,7 @@ fish9: @ 808CC64
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@ -4695,7 +4695,7 @@ fishB: @ 808CD94
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
movs r0, 0xD
strh r0, [r5, 0x8]
movs r0, 0x1
@ -4743,7 +4743,7 @@ fishC: @ 808CE04
movs r0, 0
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]

8
asm/field_specials.s
View File

@ -5639,7 +5639,7 @@ _0813AAAA:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B312C
lsls r0, r5, 1
adds r1, r0, r1
@ -5665,7 +5665,7 @@ _0813AAE8:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B3142
lsls r0, r5, 1
adds r1, r0, r1
@ -5712,7 +5712,7 @@ _0813AB5C:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B314E
lsls r0, r5, 1
adds r0, r1
@ -5736,7 +5736,7 @@ _0813AB94:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_085B315C
lsls r0, r5, 1
adds r0, r1

2
asm/item_menu.s
View File

@ -6043,7 +6043,7 @@ bag_menu_print: @ 81AE0BC
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r3,r4}
mov r8, r3

30
asm/link.s
View File

@ -28911,7 +28911,7 @@ _08018720:
movs r1, 0x1
movs r2, 0x4
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
movs r0, 0
adds r1, r7, 0
movs r2, 0xDE
@ -28927,7 +28927,7 @@ _08018720:
movs r0, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
movs r0, 0
movs r1, 0x2
bl CopyWindowToVram
@ -29099,7 +29099,7 @@ sub_8018884: @ 8018884
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
movs r0, 0x1
movs r1, 0x1
movs r2, 0xF
@ -29452,7 +29452,7 @@ _08018B4A:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
ldrb r0, [r4]
movs r1, 0x1
movs r2, 0xF
@ -29598,7 +29598,7 @@ _08018C8C:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
ldrb r0, [r5]
movs r1, 0x1
movs r2, 0xF
@ -33150,7 +33150,7 @@ _0801A93A:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4-r7}
pop {r0}
@ -33471,7 +33471,7 @@ sub_801AB68: @ 801AB68
movs r1, 0x1
adds r2, r6, 0
ldr r3, [sp, 0x14]
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r3-r5}
mov r8, r3
@ -48548,7 +48548,7 @@ _08022616:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
b _0802269C
.pool
_08022668:
@ -48575,7 +48575,7 @@ _08022668:
str r4, [sp, 0x10]
movs r1, 0x2
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_0802269C:
ldr r1, =0x000001bb
adds r0, r6, r1
@ -49451,7 +49451,7 @@ _08022D42:
movs r0, 0
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _08022DB2
.pool
_08022D90:
@ -49470,7 +49470,7 @@ _08022D90:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
_08022DB2:
movs r0, 0
movs r1, 0x3
@ -52034,7 +52034,7 @@ _080241A6:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -52393,7 +52393,7 @@ _08024460:
str r1, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _080244AC
.pool
_08024490:
@ -52409,7 +52409,7 @@ _08024490:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
_080244AC:
movs r0, 0
movs r1, 0x3
@ -64123,7 +64123,7 @@ _0802A3AE:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _0802A410
.pool
_0802A3D8:

4
asm/list_menu.s
View File

@ -773,7 +773,7 @@ ListMenuPrint: @ 81AE9B4
str r6, [sp, 0x10]
adds r2, r7, 0
mov r3, r12
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
ldrb r1, [r5, 0x3]
movs r0, 0x7F
ands r0, r1
@ -810,7 +810,7 @@ _081AEA20:
str r6, [sp, 0x10]
adds r2, r7, 0
mov r3, r12
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_081AEA5E:
add sp, 0x18
pop {r4-r7}

12
asm/menu.s
View File

@ -35,7 +35,7 @@ AddTextPrinterWithCallbackForMessage: @ 8197A9C
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4,r5}
pop {r0}
@ -992,7 +992,7 @@ _0819829E:
movs r1, 0x1
movs r2, 0x4
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
mov r2, r9
cmp r2, 0
beq _081982C8
@ -4736,9 +4736,9 @@ box_print: @ 8199E64
bx r0
thumb_func_end box_print
thumb_func_start AddTextPrinterParametrized2
@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
AddTextPrinterParametrized2: @ 8199EEC
thumb_func_start AddTextPrinterParameterized2
@ void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
AddTextPrinterParameterized2: @ 8199EEC
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@ -4806,7 +4806,7 @@ AddTextPrinterParametrized2: @ 8199EEC
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end AddTextPrinterParametrized2
thumb_func_end AddTextPrinterParameterized2
thumb_func_start sub_8199F74
sub_8199F74: @ 8199F74

2
asm/menu_helpers.s
View File

@ -156,7 +156,7 @@ _08121EC0:
adds r1, r7, 0
adds r2, r4, 0
adds r3, r5, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
ldr r1, =gUnknown_0300117C
ldr r0, [sp, 0x34]
str r0, [r1]

2
asm/mystery_event_menu.s
View File

@ -655,7 +655,7 @@ sub_8178EC4: @ 8178EC4
movs r1, 0x1
adds r2, r6, 0
ldr r3, [sp, 0x18]
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x1C
pop {r3-r5}
mov r8, r3

4267
asm/naming_screen.s
View File

File diff suppressed because it is too large Load Diff

14
asm/new_menu_helpers.s
View File

@ -95,9 +95,9 @@ sub_8197224: @ 8197224
bx r1
thumb_func_end sub_8197224
thumb_func_start AddTextPrinterParametrized
@ u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
AddTextPrinterParametrized: @ 8197238
thumb_func_start AddTextPrinterParameterized
@ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
AddTextPrinterParameterized: @ 8197238
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -166,7 +166,7 @@ AddTextPrinterParametrized: @ 8197238
pop {r1}
bx r1
.pool
thumb_func_end AddTextPrinterParametrized
thumb_func_end AddTextPrinterParameterized
thumb_func_start AddTextPrinterForMessage
@ void AddTextPrinterForMessage(u8 allowSkippingDelayWithButtonPress)
@ -198,7 +198,7 @@ AddTextPrinterForMessage: @ 81972C4
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4,r5}
pop {r0}
@ -236,7 +236,7 @@ AddTextPrinterForMessage_2: @ 8197310
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4}
pop {r0}
@ -273,7 +273,7 @@ AddTextPrinterWithCustomSpeedForMessage: @ 819735C
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x1
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4,r5}
pop {r0}

2
asm/overworld.s
View File

@ -6698,7 +6698,7 @@ _08087C38:
lsls r1, 30
lsrs r1, 31
movs r0, 0
bl sub_808BD3C
bl GetRivalAvatarGraphicsIdByStateIdAndGender
_08087C44:
lsls r0, 24
lsrs r0, 24

8
asm/party_menu.s
View File

@ -4268,7 +4268,7 @@ _081B243E:
adds r0, r4, 0
movs r1, 0
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
@ -5946,7 +5946,7 @@ _081B328C:
str r1, [sp, 0x10]
movs r1, 0x1
mov r2, r9
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@ -6007,7 +6007,7 @@ sub_81B3300: @ 81B3300
movs r0, 0x6
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4}
pop {r0}
@ -10415,7 +10415,7 @@ party_menu_link_mon_icon_anim: @ 81B5A2C
ldr r0, [sp, 0x20]
str r0, [sp, 0x8]
adds r0, r5, 0
bl sub_80D2CC4
bl CreateMonIcon
strb r0, [r4, 0x9]
ldr r2, =gSprites
ldrb r0, [r4, 0x9]

2
asm/player_pc.s
View File

@ -2150,7 +2150,7 @@ _0816C030:
movs r1, 0x1
movs r2, 0
adds r3, r6, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_0816C050:
add sp, 0x14
pop {r4-r6}

8
asm/pokedex.s
View File

@ -3035,7 +3035,7 @@ sub_80BCE2C: @ 80BCE2C
str r4, [sp, 0xC]
str r2, [sp, 0x10]
mov r2, r8
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r3}
mov r8, r3
@ -6163,7 +6163,7 @@ sub_80BE8DC: @ 80BE8DC
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4,r5}
pop {r0}
@ -9974,7 +9974,7 @@ sub_80C0A88: @ 80C0A88
str r4, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4-r6}
pop {r0}
@ -11022,7 +11022,7 @@ sub_80C1270: @ 80C1270
movs r0, 0
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x18
pop {r4,r5}
pop {r0}

8
asm/pokemon_icon.s
View File

@ -5,9 +5,9 @@
.text
thumb_func_start sub_80D2CC4
@ int sub_80D2CC4(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
sub_80D2CC4: @ 80D2CC4
thumb_func_start CreateMonIcon
@ int CreateMonIcon(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
CreateMonIcon: @ 80D2CC4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@ -84,7 +84,7 @@ _080D2D2A:
pop {r1}
bx r1
.pool
thumb_func_end sub_80D2CC4
thumb_func_end CreateMonIcon
thumb_func_start sub_80D2D78
sub_80D2D78: @ 80D2D78

6
asm/pokemon_storage_system.s
View File

@ -233,7 +233,7 @@ _080C72AC:
movs r0, 0
movs r1, 0x1
movs r3, 0xFF
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@ -339,7 +339,7 @@ _080C7392:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _080C756A
.pool
_080C73D0:
@ -509,7 +509,7 @@ _080C7532:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
strh r4, [r5, 0x8]
b _080C756A
.pool

4
asm/pokemon_summary_screen.s
View File

@ -5362,7 +5362,7 @@ sub_81C6C3C: @ 81C6C3C
str r4, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r3}
mov r8, r3
@ -5408,7 +5408,7 @@ sub_81C6C94: @ 81C6C94
str r4, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x7
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r3}
mov r8, r3

4
asm/pokenav.s
View File

@ -21900,7 +21900,7 @@ _081D1D8C:
movs r1, 0x1
movs r2, 0x8
adds r3, r5, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_081D1DAC:
add sp, 0x34
pop {r4,r5}
@ -23765,7 +23765,7 @@ sub_81D2BF4: @ 81D2BF4
str r0, [sp, 0xC]
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r4}
pop {r0}

6
asm/script_menu.s
View File

@ -877,7 +877,7 @@ ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
add sp, 0x10
pop {r0}
bx r0
@ -1606,7 +1606,7 @@ _080E2B12:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
b _080E2B70
.pool
_080E2B40:
@ -1630,7 +1630,7 @@ _080E2B40:
movs r0, 0
movs r1, 0x1
movs r3, 0
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
_080E2B70:
add sp, 0x10
pop {r4}

4
asm/shop.s
View File

@ -839,7 +839,7 @@ _080E0176:
adds r0, r6, 0
movs r1, 0x7
adds r3, r7, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
_080E01AC:
add sp, 0x14
pop {r4-r7}
@ -1201,7 +1201,7 @@ BuyMenuPrint: @ 80E04A4
str r6, [sp, 0xC]
str r1, [sp, 0x10]
movs r1, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
add sp, 0x14
pop {r4-r6}
pop {r0}

4
asm/slot_machine.s
View File

@ -8934,7 +8934,7 @@ sub_812EB48: @ 812EB48
ldrb r3, [r1]
adds r1, r3, 0
adds r2, r3, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
ldrh r0, [r4, 0x38]
adds r0, 0x1
movs r1, 0x1
@ -8979,7 +8979,7 @@ sub_812EBCC: @ 812EBCC
movs r1, 0
movs r2, 0
movs r3, 0
bl sub_80B609C
bl MultiplyInvertedPaletteRGBComponents
movs r4, 0
_0812EBEA:
ldr r0, =gUnknown_0203AB34

2
asm/start_menu.s
View File

@ -1695,7 +1695,7 @@ _080A05AC:
movs r0, 0
movs r1, 0x1
movs r3, 0xFF
bl AddTextPrinterParametrized
bl AddTextPrinterParameterized
movs r0, 0
movs r1, 0x8
movs r2, 0xE

12
asm/trade.s
View File

@ -646,7 +646,7 @@ _080776E2:
str r1, [sp, 0x8]
adds r0, r5, 0
ldr r1, =sub_80D3014
bl sub_80D2CC4
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x28
@ -705,7 +705,7 @@ _08077756:
str r0, [sp, 0x8]
adds r0, r5, 0
ldr r1, =sub_80D3014
bl sub_80D2CC4
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x2E
@ -1264,7 +1264,7 @@ _08077CA8:
str r1, [sp, 0x8]
adds r0, r5, 0
ldr r1, =sub_80D3014
bl sub_80D2CC4
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x28
@ -1323,7 +1323,7 @@ _08077D1E:
str r0, [sp, 0x8]
adds r0, r5, 0
ldr r1, =sub_80D3014
bl sub_80D2CC4
bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x2E
@ -4609,7 +4609,7 @@ _080798BC:
movs r1, 0x1
movs r2, 0
movs r3, 0
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
adds r0, r5, 0
bl PutWindowTilemap
adds r0, r5, 0
@ -14296,7 +14296,7 @@ sub_807F1A8: @ 807F1A8
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
adds r0, r5, 0
movs r1, 0x3
bl CopyWindowToVram

4
asm/trainer_card.s
View File

@ -8258,7 +8258,7 @@ _080C6E08:
str r1, [sp, 0x10]
movs r1, 0x1
movs r3, 0x1
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
ldr r0, [sp, 0x4C]
mov r10, r4
cmp r0, 0x6
@ -8410,7 +8410,7 @@ sub_80C6EAC: @ 80C6EAC
movs r1, 0x1
movs r2, 0
movs r3, 0x2
bl AddTextPrinterParametrized2
bl AddTextPrinterParameterized2
lsrs r5, 1
adds r0, r7, 0
ldr r1, [sp, 0x24]

2
data/fldeff_cut.s
View File

@ -6,7 +6,7 @@
gUnknown_0857C608:: @ 857C608
.byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09,
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00
gUnknown_0857C648:: @ 857C648
.2byte 0

346
data/naming_screen.s
View File

@ -1,346 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_0858BBF8:: @ 858BBF8
.incbin "graphics/naming_screen/pc_icon/0.4bpp"
.align 2
gUnknown_0858BCB8:: @ 858BCB8
.incbin "graphics/naming_screen/pc_icon/1.4bpp"
.align 2
gUnknown_0858BD78:: @ 858BD78
.incbin "graphics/naming_screen/0.gbapal"
.incbin "graphics/naming_screen/1.gbapal"
.align 2
gUnknown_0858BDB8:: @ 858BDB8
.4byte gText_PkmnTransferredSomeonesPC
.4byte gText_PkmnTransferredLanettesPC
.4byte gText_PkmnBoxSomeonesPCFull
.4byte gText_PkmnBoxLanettesPCFull
gUnknown_0858BDC8:: @ 858BDC8
.string "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!$"
.align 2
gUnknown_0858BE00:: @ 858BE00
.4byte 0x000001e0, 0x000011d9, 0x000021ca, 0x000031ff
.align 2
gUnknown_0858BE10:: @ 858BE10
window_template 0x01, 0x03, 0x0a, 0x13, 0x08, 0x0a, 0x0030
window_template 0x02, 0x03, 0x0a, 0x13, 0x08, 0x0a, 0x00c8
window_template 0x03, 0x08, 0x06, 0x11, 0x02, 0x0a, 0x0030
window_template 0x03, 0x08, 0x04, 0x11, 0x02, 0x0a, 0x0052
window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0b, 0x0074
null_window_template
gUnknown_0858BE40:: @ 858BE40
.string "abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“”‘’ "
gUnknown_0858BEA0:: @ 858BEA0
.byte 0x08, 0x08, 0x06
gUnknown_0858BEA3:: @ 858BEA3
.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_0858BEBB:: @ 858BEBB
.byte 0x00, 0x02, 0x01
gUnknown_0858BEBE:: @ 858BEBE
.byte 0x01, 0x00, 0x02
gUnknown_0858BEC1:: @ 858BEC1
.byte 0x02, 0x01, 0x00
gUnknown_0858BEC4:: @ 858BEC4
.4byte sub_80E37B4
.4byte sub_80E37DC
.4byte sub_80E3870
.4byte sub_80E3904
gUnknown_0858BED4:: @ 858BED4
.2byte 0x0000, 0xfffc, 0xfffe, 0xffff
gUnknown_0858BEDC:: @ 858BEDC
.2byte 0x0002, 0x0003, 0x0002, 0x0001
gUnknown_0858BEE4:: @ 858BEE4
.byte 0x01, 0x02, 0x03, 0x00
gUnknown_0858BEE8:: @ 858BEE8
.4byte sub_80E40AC
.4byte sub_80E4100
.4byte sub_80E4104
.4byte sub_80E4178
gUnknown_0858BEF8:: @ 858BEF8
.2byte 0x0001, 0x0003, 0x0002
gUnknown_0858BEFE:: @ 858BEFE
.2byte 0x0004, 0x0006, 0x0005
gUnknown_0858BF04:: @ 858BF04
.4byte TaskDummy2
.4byte sub_80E4384
.4byte sub_80E43E0
.4byte sub_80E4420
.4byte sub_80E447C
gUnknown_0858BF18:: @ 858BF18
.4byte sub_80E450C
.4byte sub_80E4558
.4byte sub_80E4580
.4byte sub_80E45A4
gUnknown_0858BF28:: @ 858BF28
.4byte sub_80E468C
.4byte sub_80E4692
.4byte sub_80E46E8
gUnknown_0858BF34:: @ 858BF34
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00
gUnknown_0858BF3E:: @ 858BF3E
.byte 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0858BF48:: @ 858BF48
.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00
gUnknown_0858BF50:: @ 858BF50
.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.align 2
gUnknown_0858BF58:: @ 858BF58
.4byte sub_80E4894
.4byte sub_80E4894
.4byte sub_80E48E8
.4byte sub_80E48E8
.4byte sub_80E4894
.align 2
gUnknown_0858BF6C:: @ 858BF6C
.4byte TaskDummy3
.4byte sub_80E49BC
.align 2
gUnknown_0858BF74:: @ 858BF74
window_template 0x00, 0x09, 0x08, 0x00, 0x05, 0x04, 0x0000
gUnknown_0858BF7C:: @ 858BF7C
.4byte 0x0002010D
gUnknown_0858BF80:: @ 858BF80
.4byte 0x0002010E
gUnknown_0858BF84:: @ 858BF84
.4byte 0x0002010F
gUnknown_0858BF88:: @ 858BF88
.byte 0xee, 0xdd, 0xff, 0x00
gUnknown_0858BF8C:: @ 858BF8C
.4byte gUnknown_0858BF80
.4byte gUnknown_0858BF7C
.4byte gUnknown_0858BF84
gUnknown_0858BF98:: @ 858BF98
.4byte gUnknown_08DD4620
.4byte gUnknown_08DD46E0
.4byte gUnknown_08DD47A0
gUnknown_0858BFA4:: @ 858BFA4
.byte 0x0f, 0x01, 0x02
.align 2
gUnknown_0858BFA8:: @ 858BFA8
.byte 0x00, 0x07, 0x01, 0x00, 0x01, 0x23, 0x00, 0x00
.4byte gText_YourName
.align 2
gUnknown_0858BFB4:: @ 858BFB4
.byte 0x00, 0x08, 0x02, 0x00, 0x01, 0x13, 0x00, 0x00
.4byte gText_BoxName
.align 2
gUnknown_0858BFC0:: @ 858BFC0
.byte 0x00, 0x0a, 0x03, 0x01, 0x01, 0x23, 0x00, 0x00
.4byte gText_PkmnsNickname
.align 2
gUnknown_0858BFCC:: @ 858BFCC
.byte 0x01, 0x0f, 0x04, 0x00, 0x01, 0x0b, 0x00, 0x00
.4byte gText_TellHimTheWords
.align 2
gUnknown_0858BFD8:: @ 858BFD8
.4byte gUnknown_0858BFA8
.4byte gUnknown_0858BFB4
.4byte gUnknown_0858BFC0
.4byte gUnknown_0858BFC0
.4byte gUnknown_0858BFCC
.align 2
gOamData_858BFEC:: @ 858BFEC
.2byte 0x0000, 0x0000, 0x0000, 0x0000
.align 2
gOamData_858BFF4:: @ 858BFF4
.2byte 0x0000, 0x4000, 0x0000, 0x0000
.align 2
gOamData_858BFFC:: @ 858BFFC
.2byte 0x4000, 0x8000, 0x0000, 0x0000
.align 2
gUnknown_0858C004:: @ 858C004
.byte 0xec, 0xf0, 0x05, 0x40, 0x0c, 0xf0, 0x40, 0x40, 0xec, 0xf8, 0x55, 0x40, 0x0c, 0xf8, 0x90, 0x40, 0xec, 0x00, 0xa5, 0x40, 0x0c, 0x00, 0xe0, 0x40, 0xec, 0x08, 0xf5, 0x40, 0x0c, 0x08, 0x30, 0x41
.align 2
gUnknown_0858C024:: @ 858C024
.byte 0xf4, 0xfc, 0x01, 0x40, 0x04, 0xfc, 0x20, 0x40
.align 2
gUnknown_0858C02C:: @ 858C02C
.byte 0xec, 0xf4, 0x05, 0x40, 0x0c, 0xf4, 0x40, 0x40, 0xec, 0xfc, 0x55, 0x40, 0x0c, 0xfc, 0x90, 0x40, 0xec, 0x04, 0xa5, 0x40, 0x0c, 0x04, 0xe0, 0x40
.align 2
gUnknown_0858C044:: @ 858C044
.byte 0xf8, 0xf4, 0x01, 0xc0, 0xf8, 0xfc, 0x21, 0xc0, 0xf8, 0x04, 0x41, 0xc0
.align 2
gUnknown_0858C050:: @ 858C050
.byte 0x08, 0x00, 0x00, 0x00
.4byte gUnknown_0858C004
.align 2
gUnknown_0858C058:: @ 858C058
.4byte 0x02
.4byte gUnknown_0858C024
.4byte 0x02
.4byte gUnknown_0858C024
.4byte 0x02
.4byte gUnknown_0858C024
.align 2
gUnknown_0858C070:: @ 858C070
.4byte 0x06
.4byte gUnknown_0858C02C
.align 2
gUnknown_0858C078:: @ 858C078
.4byte 0x03
.4byte gUnknown_0858C044
.align 2
gUnknown_0858C080:: @ 858C080
obj_frame_tiles gUnknown_0858BBF8, 0x00c0
obj_frame_tiles gUnknown_0858BCB8, 0x00c0
.align 2
gSpriteAnim_858C090:: @ 858C090
.2byte 0x0000, 0x0001, 0xfffe, 0x0000
.align 2
gSpriteAnim_858C098:: @ 858C098
.2byte 0x0004, 0x0008, 0x0008, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858C0A4:: @ 858C0A4
.2byte 0x0000, 0x0002, 0x0001, 0x0002, 0xfffe, 0x0000
.align 2
gSpriteAnimTable_858C0B0:: @ 858C0B0
.4byte gSpriteAnim_858C090
.align 2
gSpriteAnimTable_858C0B4:: @ 858C0B4
.4byte gSpriteAnim_858C090
.4byte gSpriteAnim_858C098
.align 2
gSpriteAnimTable_858C0BC:: @ 858C0BC
.4byte gSpriteAnim_858C0A4
.align 2
gUnknown_0858C0C0:: @ 858C0C0
spr_template 0x0002, 0x0004, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E4084
.align 2
gUnknown_0858C0D8:: @ 858C0D8
spr_template 0x0003, 0x0001, gOamData_858BFFC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C0F0:: @ 858C0F0
spr_template 0x0004, 0x0004, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C108:: @ 858C108
spr_template 0x0000, 0x0006, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C120:: @ 858C120
spr_template 0x0001, 0x0007, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C138:: @ 858C138
spr_template 0x0007, 0x0005, gOamData_858BFF4, gSpriteAnimTable_858C0B4, NULL, gDummySpriteAffineAnimTable, sub_80E3B30
.align 2
gUnknown_0858C150:: @ 858C150
spr_template 0x000a, 0x0003, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E3C20
.align 2
gUnknown_0858C168:: @ 858C168
spr_template 0x000b, 0x0003, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E3C6C
.align 2
gUnknown_0858C180:: @ 858C180
spr_template 0xffff, 0x0000, gOamData_858BFEC, gSpriteAnimTable_858C0BC, gUnknown_0858C080, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C198:: @ 858C198
.4byte gUnknown_0862B88D
.4byte gUnknown_0862B8AE
.4byte gUnknown_0862B8CF
.4byte gUnknown_0862B8F0
.4byte gUnknown_0862B911
.4byte gUnknown_0862B932
.4byte gUnknown_0862B953
.4byte gUnknown_0862B974
.4byte gUnknown_0862B995
.4byte gUnknown_0862B9AE
.4byte gUnknown_0862B9C7
.4byte gUnknown_0862B9E0
.align 2
gUnknown_0858C1C8:: @ 858C1C8
obj_tiles gNamingScreenRWindow_Gfx+0x280, 0x01e0, 0x0000
obj_tiles gNamingScreenRWindow_Gfx+0x460, 0x01e0, 0x0001
obj_tiles gNamingScreenRWindow_Gfx, 0x0280, 0x0002
obj_tiles gNamingScreenKeyboardButton_Gfx+0x20, 0x0100, 0x0003
obj_tiles gNamingScreenROptions_Gfx, 0x0060, 0x0004
obj_tiles gNamingScreenROptions_Gfx+0xA0, 0x0060, 0x0005
obj_tiles gNamingScreenROptions_Gfx+0x140, 0x0060, 0x0006
obj_tiles gNamingScreenCursor_Gfx, 0x0080, 0x0007
obj_tiles gNamingScreenCursor_Gfx+0xA0, 0x0080, 0x0008
obj_tiles gNamingScreenCursor_Gfx+0x140, 0x0080, 0x0009
obj_tiles gNamingScreenRightPointingTriangleTiles, 0x0020, 0x000a
obj_tiles gNamingScreenUnderscoreTiles, 0x0020, 0x000b
null_obj_tiles
.align 2
gUnknown_0858C230:: @ 858C230
obj_pal gNamingScreenMenu_Pal, 0x0000
obj_pal gNamingScreenMenu_Pal+0x20, 0x0001
obj_pal gNamingScreenMenu_Pal+0x40, 0x0002
obj_pal gNamingScreenMenu_Pal+0x60, 0x0003
obj_pal gNamingScreenMenu_Pal+0x80, 0x0004
obj_pal gNamingScreenMenu_Pal+0xA0, 0x0005
obj_pal gNamingScreenMenu_Pal+0x80, 0x0006
obj_pal gNamingScreenMenu_Pal+0x80, 0x0007
null_obj_pal

36
data/link_strings.s → data/text_input_strings.s
View File

@ -3,55 +3,55 @@
.section .rodata
.align 2
.align 2
gUnknown_862B810:: @ 862B810
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
gUnknown_862B832:: @ 862B832
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
gUnknown_862B84B:: @ 862B84B
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
.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_862B86C:: @ 862B86C
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
.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_0862B88D:: @ 862B88D
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
gUnknown_0862B8AE:: @ 862B8AE
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
gUnknown_0862B8CF:: @ 862B8CF
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
gUnknown_0862B8F0:: @ 862B8F0
.string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
.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_0862B911:: @ 862B911
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
gUnknown_0862B932:: @ 862B932
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
gUnknown_0862B953:: @ 862B953
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
.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_0862B974:: @ 862B974
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
.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_0862B995:: @ 862B995
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
gUnknown_0862B9AE:: @ 862B9AE
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
gUnknown_0862B9C7:: @ 862B9C7
.string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
.string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
gUnknown_0862B9E0:: @ 862B9E0
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $"
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $"
gUnknown_0862B9F9:: @ 862B9F9
.string "ABCDE$"

BIN
graphics/intro/copyright.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 530 B

3
graphics_file_rules.mk
View File

@ -300,9 +300,6 @@ $(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png
graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
$(GFX) $< $@ -num_colors 224
graphics/intro/copyright.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 39
graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 63

1
include/field_effect.h
View File

@ -78,5 +78,6 @@ void FieldEffectStop(struct Sprite *sprite, u8 id);
u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
void sub_80B7FC8(void);
void FieldEffectActiveListRemove(u8 id);
void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
#endif //GUARD_FIELD_EFFECTS_H

1
include/field_player_avatar.h
View File

@ -34,5 +34,6 @@ void sub_808BCE8(void);
void sub_808D074(u8);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8, u8);
#endif //GUARD_FIELD_PLAYER_AVATAR_H

2
include/field_specials.h
View File

@ -2,5 +2,7 @@
#define GUARD_FIELD_SPECIALS_H
u8 GetLeadMonIndex(void);
u8 sub_813B260(void);
u16 get_unknown_box_id(void);
#endif // GUARD_FIELD_SPECIALS_H

21
include/gba/macro.h
View File

@ -122,6 +122,27 @@
#define DmaFillLarge32(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 32)
#define DmaClearLarge(dmaNum, dest, size, block, bit) \
{ \
void *_dest = dest; \
u32 _size = size; \
while (1) \
{ \
DmaFill##bit(dmaNum, 0, _dest, (block)); \
_dest += (block); \
_size -= (block); \
if (_size <= (block)) \
{ \
DmaFill##bit(dmaNum, 0, _dest, _size); \
break; \
} \
} \
}
#define DmaClearLarge16(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 16)
#define DmaClearLarge32(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 32)
#define DmaCopyDefvars(dmaNum, src, dest, size, bit) \
{ \
const void *_src = src; \

2
include/main.h
View File

@ -60,5 +60,7 @@ void SetSerialCallback(IntrCallback callback);
void InitFlashTimer(void);
void DoSoftReset(void);
void ClearPokemonCrySongs(void);
void StartTimer1(void);
void SeedRngAndSetTrainerId(void);
#endif // GUARD_MAIN_H

2
include/menu.h
View File

@ -35,7 +35,7 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs
s8 ProcessMenuInputNoWrap_(void);
void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void);
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds);
void sub_8197DF8(u8 windowId, bool8 copyToVram);

89
include/naming_screen.h
View File

@ -1,12 +1,89 @@
#ifndef GUARD_NAMING_SCREEN_H
#define GUARD_NAMING_SCREEN_H
#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
#include "main.h"
void DoNamingScreen(u8 caseId, u8* dst, u16 monSpecies, u8 monGender, u32 monPersonality, void (*callback)(void));
#define KBEVENT_NONE 0
#define KBEVENT_PRESSED_A 5
#define KBEVENT_PRESSED_B 6
#define KBEVENT_PRESSED_SELECT 8
#define KBEVENT_PRESSED_START 9
enum
{
NAMING_SCREEN_PLAYER,
NAMING_SCREEN_BOX,
NAMING_SCREEN_CAUGHT_MON,
NAMING_SCREEN_3,
NAMING_SCREEN_WALDA,
};
struct NamingScreenTemplate
{
u8 copyExistingString;
u8 maxChars;
u8 iconFunction;
u8 addGenderIcon;
u8 initialPage;
u8 unused;
const u8 *title;
};
struct NamingScreenData {
/*0x0*/ u8 tilemapBuffer1[0x800];
/*0x800*/ u8 tilemapBuffer2[0x800];
/*0x800*/ u8 tilemapBuffer3[0x800];
/*0x1800*/ u8 textBuffer[0x10];
/*0x1810*/ u8 tileBuffer[0x600];
/*0x1E10*/ u8 state;
/*0x1E11*/ u8 windows[5];
/*0x1E16*/ u16 inputCharBaseXPos;
/*0x1E18*/ u16 bg1vOffset;
/*0x1E1A*/ u16 bg2vOffset;
/*0x1E1C*/ u16 bg1Priority;
/*0x1E1E*/ u16 bg2Priority;
/*0x1E20*/ u8 bgToReveal;
/*0x1E21*/ u8 bgToHide;
/*0x1E22*/ u8 currentPage;
/*0x1E23*/ u8 cursorSpriteId;
/*0x1E24*/ u8 selectBtnFrameSpriteId;
/*0x1E25*/ u8 keyRepeatStartDelayCopy;
/*0x1E28*/ const struct NamingScreenTemplate *template;
/*0x1E2C*/ u8 templateNum;
/*0x1E30*/ u8 *destBuffer;
/*0x1E34*/ u16 monSpecies;
/*0x1E36*/ u16 monGender;
/*0x1E38*/ u32 monPersonality;
/*0x1E3C*/ MainCallback returnCallback;
};
enum
{
PAGE_UPPER,
PAGE_LOWER,
PAGE_OTHERS,
};
enum
{
MAIN_STATE_BEGIN_FADE_IN,
MAIN_STATE_WAIT_FADE_IN,
MAIN_STATE_HANDLE_INPUT,
MAIN_STATE_MOVE_TO_OK_BUTTON,
MAIN_STATE_START_PAGE_SWAP,
MAIN_STATE_WAIT_PAGE_SWAP,
MAIN_STATE_6,
MAIN_STATE_UPDATE_SENT_TO_PC_MESSAGE,
MAIN_STATE_BEGIN_FADE_OUT,
};
enum
{
INPUT_STATE_DISABLED,
INPUT_STATE_ENABLED,
INPUT_STATE_2,
};
void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 monSpecies, u16 monGender, u32 monPersonality, MainCallback returnCallback);
#endif // GUARD_NAMING_SCREEN_H

4
include/new_menu_helpers.h
View File

@ -4,11 +4,13 @@
#include "text.h"
#include "task.h"
void sub_81971D0(void);
void sub_8197200(void);
void sub_81973A4(void);
void sub_81973C4(u8, u8);
void sub_819746C(u8 windowId, bool8 copyToVram);
void sub_81973FC(u8, u8);
u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
void sub_8197434(u8 a0, u8 a1);
void SetStandardWindowBorderStyle(u8 a0, u8 a1);

2
include/pokemon_icon.h
View File

@ -5,9 +5,11 @@ const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo);
const u16 *GetValidMonIconPalettePtr(u16 speciesId);
u16 GetUnownLetterByPersonality(u32 personality);
u16 sub_80D2E84(u16 speciesId);
void sub_80D2F04(void);
void sub_80D2F68(u16 iconId);
u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5);
void sub_80D2FF0(u16 iconId);
void sub_80D2EF8(struct Sprite *sprite);
u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, int a7);
#endif // GUARD_POKEMON_ICON_H

3
include/strings.h
View File

@ -199,4 +199,7 @@ extern const u8 gText_Frame[];
extern const u8 gText_OptionMenuCancel[];
extern const u8 gText_ButtonMode[];
extern const u8 gText_MaleSymbol[];
extern const u8 gText_FemaleSymbol[];
#endif //GUARD_STRINGS_H

7
include/text.h
View File

@ -185,6 +185,13 @@ struct __attribute__((packed)) TextColor
u8 shadowColor;
};
struct AlignedTextColor // because sometimes it's necessary
{
u8 fgColor;
u8 bgColor;
u8 shadowColor;
};
extern u8 gStringVar1[];
extern u8 gStringVar2[];
extern u8 gStringVar3[];

6
ld_script.txt
View File

@ -147,7 +147,7 @@ SECTIONS {
asm/shop.o(.text);
src/berry.o(.text);
asm/script_menu.o(.text);
asm/naming_screen.o(.text);
src/naming_screen.o(.text);
src/money.o(.text);
asm/contest_effect.o(.text);
asm/record_mixing.o(.text);
@ -440,7 +440,7 @@ SECTIONS {
data/shop.o(.rodata);
src/berry.o(.rodata);
data/script_menu.o(.rodata);
data/naming_screen.o(.rodata);
src/naming_screen.o(.rodata);
src/money.o(.rodata);
data/contest_effect.o(.rodata);
data/record_mixing.o(.rodata);
@ -540,7 +540,7 @@ SECTIONS {
data/trainer_rematch.o(.rodata);
data/unk_transition.o(.rodata);
src/unk_transition.o(.rodata);
data/link_strings.o(.rodata);
data/text_input_strings.o(.rodata);
data/fonts.o(.rodata);
src/mystery_event_msg.o(.rodata);
data/mystery_event_msg.o(.rodata);

2
src/battle_interface.c
View File

@ -2576,7 +2576,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
color.bgColor = 1;
color.shadowColor = 3;
AddTextPrinterParametrized2(winId, 0, x, y, 0, 0, &color, -1, str);
AddTextPrinterParameterized2(winId, 0, x, y, 0, 0, &color, -1, str);
*windowId = winId;
return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA));

2
src/berry_blender.c
View File

@ -3602,7 +3602,7 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3
FillWindowPixelBuffer(windowId, txtColor.fgColor | (txtColor.fgColor << 4));
}
AddTextPrinterParametrized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string);
AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string);
}
static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed)

2
src/decoration.c
View File

@ -500,7 +500,7 @@ void sub_8126B80(u8 taskId)
void sub_8126C08(void)
{
FillWindowPixelBuffer(0, 0x11);
AddTextPrinterParametrized(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3);
AddTextPrinterParameterized(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3);
}
void SecretBasePC_Decorate(u8 taskId)

4
src/diploma.c
View File

@ -17,7 +17,7 @@ extern int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size,
extern bool8 free_temp_tile_data_buffers_if_possible(void);
extern void sub_80861E8(void); // rom4
extern bool16 sub_80C0944(void);
extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str);
extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str);
extern u16 gUnknown_0860F074[];
@ -215,5 +215,5 @@ static void PrintDiplomaText(u8 *text, u8 var1, u8 var2)
.shadowColor = 3,
};
AddTextPrinterParametrized2(0, 1, var1, var2, 0, 0, &color, -1, text);
AddTextPrinterParameterized2(0, 1, var1, var2, 0, 0, &color, -1, text);
}

2
src/egg_hatch.c
View File

@ -866,7 +866,7 @@ static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
sEggHatchData->textColor.fgColor = 0;
sEggHatchData->textColor.bgColor = 5;
sEggHatchData->textColor.shadowColor = 6;
AddTextPrinterParametrized2(windowId, 1, x, y, 0, 0, &sEggHatchData->textColor, speed, string);
AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &sEggHatchData->textColor, speed, string);
}
u8 GetEggStepsToSubtract(void)

6
src/hall_of_fame.c
View File

@ -539,7 +539,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
*lastSavedTeam = *sHofMonPtr;
sub_81973C4(0, 0);
AddTextPrinterParametrized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
AddTextPrinterParameterized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_Hof_TrySaveData;
}
@ -746,7 +746,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
HallOfFame_PrintPlayerInfo(1, 2);
sub_81973C4(0, 0);
AddTextPrinterParametrized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
AddTextPrinterParameterized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
}
@ -1115,7 +1115,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
{
sub_8198180(gText_UnkCtrlF800Exit, 8, 1);
sub_81973C4(0, 0);
AddTextPrinterParametrized(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
AddTextPrinterParameterized(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3);
gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
}

2177
src/naming_screen.c Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/pokeblock.c
View File

@ -583,7 +583,7 @@ static void HandleInitWindows(void)
static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
{
AddTextPrinterParametrized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string);
AddTextPrinterParameterized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string);
}
static void PutPokeblockInfoText(void)

2
src/pokeblock_feed.c
View File

@ -792,7 +792,7 @@ static void Task_HandleMonAtePokeblock(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2);
gTextFlags.flag_0 = 1;
AddTextPrinterParametrized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
gTasks[taskId].func = Task_WaitForAtePokeblockText;
}

4
src/pokemon_summary_screen.c
View File

@ -162,7 +162,7 @@ extern struct BattleMove gBattleMoves[];
extern u32 ChangeBgX(u8 bg, u32 value, u8 op);
extern void sub_8199C30(u8 a, u8 b, u8 c, u8 d, u8 e, u8 f);
extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
extern s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
extern s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
extern bool8 sub_81A6BF4();
@ -2557,7 +2557,7 @@ void sub_81C2554()
void sub_81C25A4(u8 a, u8 *b, u8 c, u8 d, u8 e, u8 f)
{
AddTextPrinterParametrized2(a, 1, c, d, 0, e, &gUnknown_0861CD2C[f], 0, b);
AddTextPrinterParameterized2(a, 1, c, d, 0, e, &gUnknown_0861CD2C[f], 0, b);
}
void sub_81C25E8()

2
src/save_failed_screen.c
View File

@ -173,7 +173,7 @@ static void SaveFailedScreenTextPrint(u8 *text, u8 var1, u8 var2)
color.fgColor = 0;
color.bgColor = 15;
color.shadowColor = 3;
AddTextPrinterParametrized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
AddTextPrinterParameterized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
}
void DoSaveFailedScreen(u8 saveType)

4
sym_ewram.txt
View File

@ -945,9 +945,7 @@ gUnknown_02039F8C: @ 2039F8C
gUnknown_02039F90: @ 2039F90
.space 0x4
gUnknown_02039F94: @ 2039F94
.space 0x4
.include "src/naming_screen.o"
.include "src/money.o"
.align 2