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

Documentation of oak_speech

Browse Source
This commit is contained in:
PikalaxALT
2019-04-11 18:26:02 -04:00
parent c5e238b8c1
commit 915694e8a7
73 changed files with 839 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+1 -1
View File
@@ -253,7 +253,7 @@ sub_800F380: @ 800F380
cmp r0, 0 cmp r0, 0
beq _0800F3EA beq _0800F3EA
movs r0, 0x70 movs r0, 0x70
bl sub_80F77CC bl Menu_LoadStdPalAt
movs r0, 0 movs r0, 0
movs r1, 0x30 movs r1, 0x30
movs r2, 0x70 movs r2, 0x70
asm/battle_2.s
+4 -4
View File
@@ -45,11 +45,11 @@ _0800FDD8:
cmp r1, 0 cmp r1, 0
beq _0800FDFE beq _0800FDFE
movs r0, 0x19 movs r0, 0x19
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0800FE1C b _0800FE1C
_0800FDFE: _0800FDFE:
movs r0, 0x18 movs r0, 0x18
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0800FE1C b _0800FE1C
_0800FE06: _0800FE06:
movs r0, 0x80 movs r0, 0x80
@@ -57,11 +57,11 @@ _0800FE06:
cmp r1, 0 cmp r1, 0
beq _0800FE16 beq _0800FE16
movs r0, 0x1A movs r0, 0x1A
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0800FE1C b _0800FE1C
_0800FE16: _0800FE16:
movs r0, 0x17 movs r0, 0x17
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_0800FE1C: _0800FE1C:
pop {r4} pop {r4}
pop {r0} pop {r0}
asm/battle_message.s
+1 -1
View File
@@ -2863,7 +2863,7 @@ _080D894A:
movs r3, 0x1 movs r3, 0x1
b _080D8960 b _080D8960
_080D8958: _080D8958:
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
_080D8960: _080D8960:
asm/berry_pouch.s
+2 -2
View File
@@ -1974,7 +1974,7 @@ _0813DC86:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0x6 movs r0, 0x6
bl sub_813EA08 bl sub_813EA08
adds r4, r0, 0 adds r4, r0, 0
@@ -3642,7 +3642,7 @@ sub_813EB20: @ 813EB20
bl AddWindow bl AddWindow
strb r0, [r4, 0x5] strb r0, [r4, 0x5]
_0813EB44: _0813EB44:
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrb r1, [r4, 0x5] ldrb r1, [r4, 0x5]
asm/buy_menu_helpers.s
+1 -1
View File
@@ -141,7 +141,7 @@ sub_813F75C: @ 813F75C
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r4, [sp] str r4, [sp]
asm/cable_club.s
+1 -1
View File
@@ -91,7 +91,7 @@ sub_80807E8: @ 80807E8
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80F6F9C bl ClearStdWindowAndFrame
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
asm/credits.s
+2 -2
View File
@@ -241,7 +241,7 @@ _080F3B5E:
bl sub_80F3A74 bl sub_80F3A74
bl sub_80F3AA4 bl sub_80F3AA4
movs r0, 0xF0 movs r0, 0xF0
bl sub_80F77CC bl Menu_LoadStdPalAt
ldr r0, _080F3BC8 @ =gPlttBufferUnfaded ldr r0, _080F3BC8 @ =gPlttBufferUnfaded
movs r2, 0xFF movs r2, 0xFF
lsls r2, 1 lsls r2, 1
@@ -325,7 +325,7 @@ _080F3C64:
bl sub_80F3AA4 bl sub_80F3AA4
bl sub_80F3AC4 bl sub_80F3AC4
movs r0, 0xF0 movs r0, 0xF0
bl sub_80F77CC bl Menu_LoadStdPalAt
ldr r0, _080F3C8C @ =gPlttBufferUnfaded ldr r0, _080F3C8C @ =gPlttBufferUnfaded
movs r2, 0xFF movs r2, 0xFF
lsls r2, 1 lsls r2, 1
asm/daycare.s
+3 -3
View File
@@ -3011,7 +3011,7 @@ _08046A46:
bl sub_810713C bl sub_810713C
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
bl RemoveWindow bl RemoveWindow
adds r0, r5, 0 adds r0, r5, 0
@@ -3035,7 +3035,7 @@ _08046A7C:
bl sub_810713C bl sub_810713C
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
bl RemoveWindow bl RemoveWindow
adds r0, r5, 0 adds r0, r5, 0
@@ -3060,7 +3060,7 @@ ShowDaycareLevelMenu: @ 8046AB8
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
mov r1, sp mov r1, sp
ldr r0, _08046B1C @ =gUnknown_825F814 ldr r0, _08046B1C @ =gUnknown_825F814
ldm r0!, {r2,r3,r5} ldm r0!, {r2,r3,r5}
asm/field_effect.s
+2 -2
View File
@@ -2542,7 +2542,7 @@ sub_8084708: @ 8084708
movs r0, 0x8 movs r0, 0x8
bl SetPlayerAvatarTransitionFlags bl SetPlayerAvatarTransitionFlags
movs r0, 0x16 movs r0, 0x16
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_08084760: _08084760:
ldr r0, _08084780 @ =sub_8084484 ldr r0, _08084780 @ =sub_8084484
bl FindTaskIdByFunc bl FindTaskIdByFunc
@@ -7213,7 +7213,7 @@ sub_8086B30: @ 8086B30
lsrs r0, 24 lsrs r0, 24
bl DestroyTask bl DestroyTask
movs r0, 0x16 movs r0, 0x16
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_08086B96: _08086B96:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
asm/field_message_box.s
+3 -3
View File
@@ -83,7 +83,7 @@ _080693D4:
_080693DA: _080693DA:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6EE4 bl DrawDialogueFrame
_080693E2: _080693E2:
ldrh r0, [r5, 0x8] ldrh r0, [r5, 0x8]
adds r0, 0x1 adds r0, 0x1
@@ -250,7 +250,7 @@ HideFieldMessageBox: @ 80694F4
bl task_del_textbox bl task_del_textbox
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
ldr r1, _0806950C @ =gUnknown_203709C ldr r1, _0806950C @ =gUnknown_203709C
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
@@ -293,7 +293,7 @@ sub_8069538: @ 8069538
bl task_del_textbox bl task_del_textbox
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F1C bl DrawStdWindowFrame
ldr r1, _08069550 @ =gUnknown_203709C ldr r1, _08069550 @ =gUnknown_203709C
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
asm/field_player_avatar.s
+2 -2
View File
@@ -4769,7 +4769,7 @@ _0805D748:
strh r6, [r0, 0x26] strh r6, [r0, 0x26]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
ldrh r0, [r5, 0xA] ldrh r0, [r5, 0xA]
adds r0, 0x1 adds r0, 0x1
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -5043,7 +5043,7 @@ sub_805D980: @ 805D980
bl UnfreezeMapObjects bl UnfreezeMapObjects
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
ldr r0, _0805D9C0 @ =sub_805D304 ldr r0, _0805D9C0 @ =sub_805D304
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
asm/field_screen_effect.s
+1 -1
View File
@@ -869,7 +869,7 @@ _0807F4A8:
adds r7, r0, r1 adds r7, r0, r1
strh r5, [r7, 0xA] strh r5, [r7, 0xA]
movs r0, 0xF0 movs r0, 0xF0
bl sub_80F77CC bl Menu_LoadStdPalAt
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
asm/field_specials.s
+2 -2
View File
@@ -3078,7 +3078,7 @@ _080CBD7C: .4byte gTasks
sub_80CBD80: @ 80CBD80 sub_80CBD80: @ 80CBD80
push {lr} push {lr}
movs r0, 0x16 movs r0, 0x16
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
movs r0, 0x8 movs r0, 0x8
bl SetPlayerAvatarTransitionFlags bl SetPlayerAvatarTransitionFlags
pop {r0} pop {r0}
@@ -5542,7 +5542,7 @@ sub_80CD098: @ 80CD098
str r3, [sp] str r3, [sp]
movs r0, 0 movs r0, 0
movs r3, 0 movs r3, 0
bl sub_8006300 bl CreateTextCursorSpriteForOakSpeech
ldr r1, _080CD0DC @ =gUnknown_2039A1B ldr r1, _080CD0DC @ =gUnknown_2039A1B
strb r0, [r1] strb r0, [r1]
b _080CD0E8 b _080CD0E8
asm/hall_of_fame.s
+16 -16
View File
@@ -508,7 +508,7 @@ _080F21B2:
bl memcpy bl memcpy
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r2, _080F2214 @ =gUnknown_8419F54 ldr r2, _080F2214 @ =gUnknown_8419F54
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
@@ -723,7 +723,7 @@ _080F22F2:
strh r0, [r1] strh r0, [r1]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
adds r4, r5 adds r4, r5
ldr r0, _080F239C @ =sub_80F23A0 ldr r0, _080F239C @ =sub_80F23A0
str r0, [r4] str r0, [r4]
@@ -1265,7 +1265,7 @@ _080F27AC:
bl sub_80F33DC bl sub_80F33DC
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r2, _080F27FC @ =gUnknown_84160C8 ldr r2, _080F27FC @ =gUnknown_84160C8
str r5, [sp] str r5, [sp]
movs r0, 0x2 movs r0, 0x2
@@ -1607,7 +1607,7 @@ sub_80F2AA4: @ 80F2AA4
movs r1, 0x1E movs r1, 0x1E
movs r2, 0 movs r2, 0
movs r3, 0xC movs r3, 0xC
bl sub_810F558 bl CreateWindow_SnapRight_StdPal
movs r0, 0x3 movs r0, 0x3
bl Save_LoadGameData bl Save_LoadGameData
lsls r0, 24 lsls r0, 24
@@ -1888,13 +1888,13 @@ _080F2CB4:
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0 cmp r0, 0
bgt _080F2D24 bgt _080F2D24
ldr r1, _080F2D20 @ =gUnknown_8415D78 ldr r1, _080F2D20 @ =gText_UPDOWNPick_ABUTTONBBUTTONCancel
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_810F650 bl Menu_PrintHelpSystemUIHeader
b _080F2D34 b _080F2D34
.align 2, 0 .align 2, 0
_080F2D08: .4byte 0xffff0000 _080F2D08: .4byte 0xffff0000
@@ -1903,15 +1903,15 @@ _080F2D10: .4byte gStringVar1
_080F2D14: .4byte gTasks _080F2D14: .4byte gTasks
_080F2D18: .4byte gStringVar4 _080F2D18: .4byte gStringVar4
_080F2D1C: .4byte gUnknown_84160B4 _080F2D1C: .4byte gUnknown_84160B4
_080F2D20: .4byte gUnknown_8415D78 _080F2D20: .4byte gText_UPDOWNPick_ABUTTONBBUTTONCancel
_080F2D24: _080F2D24:
ldr r1, _080F2D54 @ =gUnknown_8415D60 ldr r1, _080F2D54 @ =gText_UPDOWNPick_ABUTTONNext_BBUTTONBack
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_810F650 bl Menu_PrintHelpSystemUIHeader
_080F2D34: _080F2D34:
ldr r0, _080F2D58 @ =gTasks ldr r0, _080F2D58 @ =gTasks
ldr r1, [sp, 0x14] ldr r1, [sp, 0x14]
@@ -1929,7 +1929,7 @@ _080F2D34:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F2D54: .4byte gUnknown_8415D60 _080F2D54: .4byte gText_UPDOWNPick_ABUTTONNext_BBUTTONBack
_080F2D58: .4byte gTasks _080F2D58: .4byte gTasks
_080F2D5C: .4byte Task_HofPC_PrintMonInfo _080F2D5C: .4byte Task_HofPC_PrintMonInfo
thumb_func_end sub_80F2B6C thumb_func_end sub_80F2B6C
@@ -2339,13 +2339,13 @@ sub_80F30A4: @ 80F30A4
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, _080F30FC @ =gUnknown_8415D8C ldr r0, _080F30FC @ =gText_ABUTTONExit
movs r1, 0x8 movs r1, 0x8
movs r2, 0x1 movs r2, 0x1
bl sub_810F5E8 bl PrintTextOnRightSnappedWindow
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r2, _080F3100 @ =gUnknown_8416090 ldr r2, _080F3100 @ =gUnknown_8416090
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
@@ -2374,7 +2374,7 @@ sub_80F30A4: @ 80F30A4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F30FC: .4byte gUnknown_8415D8C _080F30FC: .4byte gText_ABUTTONExit
_080F3100: .4byte gUnknown_8416090 _080F3100: .4byte gUnknown_8416090
_080F3104: .4byte gTasks _080F3104: .4byte gTasks
_080F3108: .4byte Task_HofPC_ExitOnButtonPress _080F3108: .4byte Task_HofPC_ExitOnButtonPress
@@ -3223,8 +3223,8 @@ _080F37C8:
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
b _080F3854 b _080F3854
_080F381E: _080F381E:
bl sub_80F6C6C bl InitStandardTextBoxWindows
bl sub_80F6C98 bl ResetBg0
b _080F3854 b _080F3854
_080F3828: _080F3828:
movs r1, 0x82 movs r1, 0x82
asm/help_system_812B1E0.s
+12 -12
View File
@@ -16,8 +16,8 @@ sub_812B1E0: @ 812B1E0
_0812B1EC: .4byte gUnknown_203B0EC _0812B1EC: .4byte gUnknown_203B0EC
thumb_func_end sub_812B1E0 thumb_func_end sub_812B1E0
thumb_func_start sub_812B1F0 thumb_func_start HelpSystem_SetSomeVariable2
sub_812B1F0: @ 812B1F0 HelpSystem_SetSomeVariable2: @ 812B1F0
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
@@ -44,7 +44,7 @@ _0812B218:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0812B21C: .4byte gUnknown_203B0EC _0812B21C: .4byte gUnknown_203B0EC
thumb_func_end sub_812B1F0 thumb_func_end HelpSystem_SetSomeVariable2
thumb_func_start sub_812B220 thumb_func_start sub_812B220
sub_812B220: @ 812B220 sub_812B220: @ 812B220
@@ -240,7 +240,7 @@ sub_812B35C: @ 812B35C
cmp r0, 0 cmp r0, 0
beq _0812B376 beq _0812B376
movs r0, 0x16 movs r0, 0x16
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0812B406 b _0812B406
_0812B376: _0812B376:
bl sub_812B2C4 bl sub_812B2C4
@@ -248,7 +248,7 @@ _0812B376:
cmp r0, 0 cmp r0, 0
beq _0812B388 beq _0812B388
movs r0, 0x15 movs r0, 0x15
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0812B406 b _0812B406
_0812B388: _0812B388:
ldr r0, _0812B3B0 @ =gMapHeader ldr r0, _0812B3B0 @ =gMapHeader
@@ -268,7 +268,7 @@ _0812B388:
bne _0812B3B8 bne _0812B3B8
_0812B3A8: _0812B3A8:
movs r0, 0xE movs r0, 0xE
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0812B406 b _0812B406
.align 2, 0 .align 2, 0
_0812B3B0: .4byte gMapHeader _0812B3B0: .4byte gMapHeader
@@ -279,36 +279,36 @@ _0812B3B8:
cmp r1, r0 cmp r1, r0
bne _0812B3C8 bne _0812B3C8
movs r0, 0xF movs r0, 0xF
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0812B406 b _0812B406
_0812B3C8: _0812B3C8:
bl IsCurMapPokeCenter bl IsCurMapPokeCenter
cmp r0, 0x1 cmp r0, 0x1
bne _0812B3D8 bne _0812B3D8
movs r0, 0x10 movs r0, 0x10
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0812B406 b _0812B406
_0812B3D8: _0812B3D8:
bl sub_812B25C bl sub_812B25C
cmp r0, 0x1 cmp r0, 0x1
bne _0812B3E8 bne _0812B3E8
movs r0, 0x11 movs r0, 0x11
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0812B406 b _0812B406
_0812B3E8: _0812B3E8:
bl sub_812B26C bl sub_812B26C
cmp r0, 0x1 cmp r0, 0x1
bne _0812B3F8 bne _0812B3F8
movs r0, 0x12 movs r0, 0x12
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0812B406 b _0812B406
_0812B3F8: _0812B3F8:
movs r0, 0x13 movs r0, 0x13
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0812B406 b _0812B406
_0812B400: _0812B400:
movs r0, 0x14 movs r0, 0x14
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_0812B406: _0812B406:
pop {r0} pop {r0}
bx r0 bx r0
asm/intro.s
+6 -6
View File
@@ -898,7 +898,7 @@ _080ECCF6:
movs r1, 0x10 movs r1, 0x10
movs r2, 0x10 movs r2, 0x10
movs r3, 0 movs r3, 0
bl OakSpeech_StartBlendTask bl StartBlendTask
b _080ECD36 b _080ECD36
.align 2, 0 .align 2, 0
_080ECD14: .4byte 0x00003f44 _080ECD14: .4byte 0x00003f44
@@ -907,7 +907,7 @@ _080ECD18:
bl ShowBg bl ShowBg
b _080ECD36 b _080ECD36
_080ECD20: _080ECD20:
bl OakSpeech_IsBlendTaskActive bl IsBlendTaskActive
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0 cmp r5, 0
@@ -980,7 +980,7 @@ _080ECD9C:
movs r1, 0x10 movs r1, 0x10
movs r2, 0x10 movs r2, 0x10
movs r3, 0 movs r3, 0
bl OakSpeech_StartBlendTask bl StartBlendTask
strh r4, [r6, 0x8] strh r4, [r6, 0x8]
strh r5, [r6, 0xA] strh r5, [r6, 0xA]
strh r4, [r6, 0x12] strh r4, [r6, 0x12]
@@ -992,7 +992,7 @@ _080ECDC4:
str r0, [r6, 0x14] str r0, [r6, 0x14]
b _080ECE70 b _080ECE70
_080ECDCC: _080ECDCC:
bl OakSpeech_IsBlendTaskActive bl IsBlendTaskActive
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080ECE96 bne _080ECE96
@@ -1051,10 +1051,10 @@ _080ECE26:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x10 movs r3, 0x10
bl OakSpeech_StartBlendTask bl StartBlendTask
b _080ECE70 b _080ECE70
_080ECE52: _080ECE52:
bl OakSpeech_IsBlendTaskActive bl IsBlendTaskActive
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080ECE96 bne _080ECE96
asm/item_menu.s
+4 -4
View File
@@ -400,13 +400,13 @@ _081080DE:
cmp r0, 0x3 cmp r0, 0x3
bne _081080F4 bne _081080F4
movs r0, 0x1D movs r0, 0x1D
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _081080FA b _081080FA
.align 2, 0 .align 2, 0
_081080F0: .4byte gUnknown_203ACFC _081080F0: .4byte gUnknown_203ACFC
_081080F4: _081080F4:
movs r0, 0x9 movs r0, 0x9
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_081080FA: _081080FA:
ldr r2, _08108114 @ =gPaletteFade ldr r2, _08108114 @ =gPaletteFade
ldrb r1, [r2, 0x8] ldrb r1, [r2, 0x8]
@@ -2177,7 +2177,7 @@ sub_8108E70: @ 8108E70
strh r0, [r4, 0x14] strh r0, [r4, 0x14]
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrb r1, [r4, 0x14] ldrb r1, [r4, 0x14]
@@ -3715,7 +3715,7 @@ _08109AD4:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0x6 movs r0, 0x6
movs r1, 0 movs r1, 0
bl sub_810B9DC bl sub_810B9DC
asm/item_pc.s
+3 -3
View File
@@ -257,7 +257,7 @@ _0810D608:
b _0810D674 b _0810D674
_0810D60E: _0810D60E:
movs r0, 0x1D movs r0, 0x1D
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0810D674 b _0810D674
_0810D616: _0810D616:
ldr r0, _0810D62C @ =gUnknown_203ADCC ldr r0, _0810D62C @ =gUnknown_203ADCC
@@ -1880,7 +1880,7 @@ sub_810E274: @ 810E274
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
ldrh r0, [r6, 0x2] ldrh r0, [r6, 0x2]
bl sub_810DD68 bl sub_810DD68
lsls r0, 16 lsls r0, 16
@@ -2884,7 +2884,7 @@ sub_810EB30: @ 810EB30
adds r6, r2, 0 adds r6, r2, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r2, 0xEB movs r2, 0xEB
asm/item_use.s
+1 -1
View File
@@ -203,7 +203,7 @@ sub_80A112C: @ 80A112C
lsrs r4, 24 lsrs r4, 24
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
bl sub_80696C0 bl sub_80696C0
asm/itemfinder.s
+2 -2
View File
@@ -81,7 +81,7 @@ sub_813ED18: @ 813ED18
lsrs r4, 24 lsrs r4, 24
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
bl sub_80696C0 bl sub_80696C0
bl ScriptContext2_Disable bl ScriptContext2_Disable
adds r0, r4, 0 adds r0, r4, 0
@@ -970,7 +970,7 @@ sub_813F380: @ 813F380
bl sub_813F3FC bl sub_813F3FC
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
bl sub_80696C0 bl sub_80696C0
bl ScriptContext2_Disable bl ScriptContext2_Disable
adds r0, r4, 0 adds r0, r4, 0
asm/learn_move.s
+1 -1
View File
@@ -296,7 +296,7 @@ sub_80E48C0: @ 80E48C0
ldr r4, _080E48F0 @ =gStringVar4 ldr r4, _080E48F0 @ =gStringVar4
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [sp] str r0, [sp]
asm/link_rfu_3.s
+18 -18
View File
@@ -401,7 +401,7 @@ _08115B5C:
bl CopyWindowToVram bl CopyWindowToVram
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
ldr r0, _08115C58 @ =gUnknown_3005E70 ldr r0, _08115C58 @ =gUnknown_3005E70
adds r2, r0, 0 adds r2, r0, 0
ldr r1, _08115C5C @ =gUnknown_8456D34 ldr r1, _08115C5C @ =gUnknown_8456D34
@@ -417,7 +417,7 @@ _08115B5C:
strb r0, [r5, 0x12] strb r0, [r5, 0x12]
ldrb r0, [r5, 0x11] ldrb r0, [r5, 0x11]
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
ldrb r0, [r5, 0x11] ldrb r0, [r5, 0x11]
bl PutWindowTilemap bl PutWindowTilemap
ldrb r0, [r5, 0x11] ldrb r0, [r5, 0x11]
@@ -1135,7 +1135,7 @@ sub_81161E4: @ 81161E4
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4, 0x11] ldrb r0, [r4, 0x11]
movs r1, 0 movs r1, 0
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r4, 0x12] ldrb r0, [r4, 0x12]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
@@ -1144,7 +1144,7 @@ sub_81161E4: @ 81161E4
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4, 0xF] ldrb r0, [r4, 0xF]
movs r1, 0 movs r1, 0
bl sub_80F6F9C bl ClearStdWindowAndFrame
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r4, 0x11] ldrb r0, [r4, 0x11]
@@ -1919,7 +1919,7 @@ _08116838:
bl CopyWindowToVram bl CopyWindowToVram
ldrb r0, [r6, 0xB] ldrb r0, [r6, 0xB]
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
ldr r0, _081168FC @ =gUnknown_3005E70 ldr r0, _081168FC @ =gUnknown_3005E70
adds r2, r0, 0 adds r2, r0, 0
ldr r1, _08116900 @ =gUnknown_8456DDC ldr r1, _08116900 @ =gUnknown_8456DDC
@@ -1935,7 +1935,7 @@ _08116838:
strb r0, [r6, 0xE] strb r0, [r6, 0xE]
ldrb r0, [r6, 0xD] ldrb r0, [r6, 0xD]
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
ldrb r0, [r6, 0xD] ldrb r0, [r6, 0xD]
bl PutWindowTilemap bl PutWindowTilemap
ldrb r0, [r6, 0xD] ldrb r0, [r6, 0xD]
@@ -2318,7 +2318,7 @@ _08116C10:
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r6, 0xD] ldrb r0, [r6, 0xD]
movs r1, 0 movs r1, 0
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r6, 0xE] ldrb r0, [r6, 0xE]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
@@ -2327,7 +2327,7 @@ _08116C10:
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r6, 0xB] ldrb r0, [r6, 0xB]
movs r1, 0 movs r1, 0
bl sub_80F6F9C bl ClearStdWindowAndFrame
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r6, 0xD] ldrb r0, [r6, 0xD]
@@ -8485,7 +8485,7 @@ sub_811A0B4: @ 811A0B4
bl sub_80F6E9C bl sub_80F6E9C
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r0, _0811A0DC @ =gStringVar4 ldr r0, _0811A0DC @ =gStringVar4
adds r1, r4, 0 adds r1, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
@@ -8531,7 +8531,7 @@ _0811A10A:
bl sub_80F6E9C bl sub_80F6E9C
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r0, _0811A12C @ =gStringVar4 ldr r0, _0811A12C @ =gStringVar4
adds r1, r5, 0 adds r1, r5, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
@@ -8624,7 +8624,7 @@ sub_811A1AC: @ 811A1AC
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xFF movs r1, 0xFF
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@@ -8659,7 +8659,7 @@ sub_811A1FC: @ 811A1FC
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
adds r0, r4, 0 adds r0, r4, 0
bl RemoveWindow bl RemoveWindow
pop {r4} pop {r4}
@@ -8688,7 +8688,7 @@ _0811A234:
strb r0, [r5] strb r0, [r5]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
ldr r0, _0811A270 @ =gUnknown_3005E70 ldr r0, _0811A270 @ =gUnknown_3005E70
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [sp, 0x1C] ldr r1, [sp, 0x1C]
@@ -8729,7 +8729,7 @@ _0811A274:
bl sub_810713C bl sub_810713C
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r5] ldrb r0, [r5]
bl RemoveWindow bl RemoveWindow
movs r0, 0 movs r0, 0
@@ -8750,7 +8750,7 @@ _0811A2B0:
bl sub_810713C bl sub_810713C
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r5] ldrb r0, [r5]
bl RemoveWindow bl RemoveWindow
strb r4, [r7] strb r4, [r7]
@@ -8794,7 +8794,7 @@ _0811A308:
strb r0, [r4] strb r0, [r4]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
ldr r0, _0811A354 @ =gUnknown_3005E70 ldr r0, _0811A354 @ =gUnknown_3005E70
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [sp, 0x20] ldr r1, [sp, 0x20]
@@ -8845,7 +8845,7 @@ _0811A37E:
bl sub_810713C bl sub_810713C
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r4] ldrb r0, [r4]
bl RemoveWindow bl RemoveWindow
ldrb r0, [r7] ldrb r0, [r7]
@@ -8870,7 +8870,7 @@ _0811A3AC:
bl sub_810713C bl sub_810713C
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r4] ldrb r0, [r4]
bl RemoveWindow bl RemoveWindow
ldrb r0, [r7] ldrb r0, [r7]
asm/list_menu.s
+1 -1
View File
@@ -126,7 +126,7 @@ _08106FA8:
bgt _08106FBA bgt _08106FBA
ldrb r0, [r5, 0x5] ldrb r0, [r5, 0x5]
movs r1, 0 movs r1, 0
bl sub_80F6F9C bl ClearStdWindowAndFrame
_08106FBA: _08106FBA:
ldr r0, _08106FC8 @ =gUnknown_203ACF4 ldr r0, _08106FC8 @ =gUnknown_203ACF4
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
asm/mail.s
+2 -2
View File
@@ -209,13 +209,13 @@ _080BED8C:
cmp r0, 0 cmp r0, 0
bne _080BEDB4 bne _080BEDB4
movs r0, 0x22 movs r0, 0x22
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080BF0F4 b _080BF0F4
.align 2, 0 .align 2, 0
_080BEDB0: .4byte gUnknown_203AAC4 _080BEDB0: .4byte gUnknown_203AAC4
_080BEDB4: _080BEDB4:
movs r0, 0x1E movs r0, 0x1E
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080BF0F4 b _080BF0F4
_080BEDBC: _080BEDBC:
add r1, sp, 0x8 add r1, sp, 0x8
asm/main_menu.s
+1 -1
View File
@@ -983,7 +983,7 @@ _0800CB2E:
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
adds r0, r6, 0 adds r0, r6, 0
bl DestroyTask bl DestroyTask
bl sub_812EB2C bl StartNewGameScene
b _0800CB84 b _0800CB84
.align 2, 0 .align 2, 0
_0800CB44: .4byte gUnknown_2031DE0 _0800CB44: .4byte gUnknown_2031DE0
asm/menu.s
+14 -14
View File
@@ -933,8 +933,8 @@ sub_810F510: @ 810F510
bx r0 bx r0
thumb_func_end sub_810F510 thumb_func_end sub_810F510
thumb_func_start sub_810F558 thumb_func_start CreateWindow_SnapRight_StdPal
sub_810F558: @ 810F558 CreateWindow_SnapRight_StdPal: @ 810F558
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1005,10 +1005,10 @@ _0810F5C4:
bx r1 bx r1
.align 2, 0 .align 2, 0
_0810F5E4: .4byte gUnknown_203ADF4 _0810F5E4: .4byte gUnknown_203ADF4
thumb_func_end sub_810F558 thumb_func_end CreateWindow_SnapRight_StdPal
thumb_func_start sub_810F5E8 thumb_func_start PrintTextOnRightSnappedWindow
sub_810F5E8: @ 810F5E8 PrintTextOnRightSnappedWindow: @ 810F5E8
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0xC sub sp, 0xC
adds r5, r0, 0 adds r5, r0, 0
@@ -1055,10 +1055,10 @@ _0810F63E:
.align 2, 0 .align 2, 0
_0810F648: .4byte gUnknown_203ADF4 _0810F648: .4byte gUnknown_203ADF4
_0810F64C: .4byte gUnknown_8456618 _0810F64C: .4byte gUnknown_8456618
thumb_func_end sub_810F5E8 thumb_func_end PrintTextOnRightSnappedWindow
thumb_func_start sub_810F650 thumb_func_start Menu_PrintHelpSystemUIHeader
sub_810F650: @ 810F650 Menu_PrintHelpSystemUIHeader: @ 810F650
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1145,7 +1145,7 @@ _0810F6F6:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_810F650 thumb_func_end Menu_PrintHelpSystemUIHeader
thumb_func_start sub_810F704 thumb_func_start sub_810F704
sub_810F704: @ 810F704 sub_810F704: @ 810F704
@@ -1264,8 +1264,8 @@ _0810F7BE:
_0810F7D4: .4byte gUnknown_203ADE4 _0810F7D4: .4byte gUnknown_203ADE4
thumb_func_end sub_810F774 thumb_func_end sub_810F774
thumb_func_start sub_810F7D8 thumb_func_start ProgramAndPlaceMenuCursorOnWindow
sub_810F7D8: @ 810F7D8 ProgramAndPlaceMenuCursorOnWindow: @ 810F7D8
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x10 sub sp, 0x10
ldr r4, [sp, 0x20] ldr r4, [sp, 0x20]
@@ -1297,7 +1297,7 @@ sub_810F7D8: @ 810F7D8
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_810F7D8 thumb_func_end ProgramAndPlaceMenuCursorOnWindow
thumb_func_start sub_810F818 thumb_func_start sub_810F818
sub_810F818: @ 810F818 sub_810F818: @ 810F818
@@ -1336,7 +1336,7 @@ sub_810F818: @ 810F818
adds r1, r6, 0 adds r1, r6, 0
ldr r2, [sp, 0xC] ldr r2, [sp, 0xC]
ldr r3, [sp, 0x10] ldr r3, [sp, 0x10]
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
add sp, 0x14 add sp, 0x14
@@ -2410,7 +2410,7 @@ sub_810FF60: @ 810FF60
adds r1, r6, 0 adds r1, r6, 0
mov r2, r8 mov r2, r8
mov r3, r9 mov r3, r9
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
add sp, 0x1C add sp, 0x1C
pop {r3-r5} pop {r3-r5}
mov r8, r3 mov r8, r3
asm/naming_screen.s
+5 -5
View File
@@ -401,8 +401,8 @@ _0809DBD6:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl ChangeBgY bl ChangeBgY
bl sub_80F6C6C bl InitStandardTextBoxWindows
bl sub_80F6C98 bl ResetBg0
_0809DCA4: _0809DCA4:
lsls r0, r4, 3 lsls r0, r4, 3
ldr r1, _0809DD50 @ =gUnknown_83E22A0 ldr r1, _0809DD50 @ =gUnknown_83E22A0
@@ -493,7 +493,7 @@ sub_809DD60: @ 809DD60
bl SetMainCallback2 bl SetMainCallback2
bl sub_812B234 bl sub_812B234
movs r0, 0x3 movs r0, 0x3
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -959,13 +959,13 @@ _0809E156:
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r2, _0809E1D0 @ =gTextFlags ldr r2, _0809E1D0 @ =gTextFlags
ldrb r0, [r2] ldrb r0, [r2]
movs r1, 0x1 movs r1, 0x1
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
bl sub_80F78A8 bl GetTextSpeedSetting
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
asm/new_menu_helpers.s
+29 -29
View File
@@ -672,8 +672,8 @@ sub_80F6C14: @ 80F6C14
bx r0 bx r0
thumb_func_end sub_80F6C14 thumb_func_end sub_80F6C14
thumb_func_start sub_80F6C6C thumb_func_start InitStandardTextBoxWindows
sub_80F6C6C: @ 80F6C6C InitStandardTextBoxWindows: @ 80F6C6C
push {lr} push {lr}
ldr r0, _080F6C84 @ =gUnknown_841F42C ldr r0, _080F6C84 @ =gUnknown_841F42C
bl InitWindows bl InitWindows
@@ -686,7 +686,7 @@ sub_80F6C6C: @ 80F6C6C
.align 2, 0 .align 2, 0
_080F6C84: .4byte gUnknown_841F42C _080F6C84: .4byte gUnknown_841F42C
_080F6C88: .4byte gUnknown_203ABE0 _080F6C88: .4byte gUnknown_203ABE0
thumb_func_end sub_80F6C6C thumb_func_end InitStandardTextBoxWindows
thumb_func_start sub_80F6C8C thumb_func_start sub_80F6C8C
sub_80F6C8C: @ 80F6C8C sub_80F6C8C: @ 80F6C8C
@@ -696,8 +696,8 @@ sub_80F6C8C: @ 80F6C8C
bx r0 bx r0
thumb_func_end sub_80F6C8C thumb_func_end sub_80F6C8C
thumb_func_start sub_80F6C98 thumb_func_start ResetBg0
sub_80F6C98: @ 80F6C98 ResetBg0: @ 80F6C98
push {lr} push {lr}
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
@@ -711,7 +711,7 @@ sub_80F6C98: @ 80F6C98
bl sub_80F6E9C bl sub_80F6E9C
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80F6C98 thumb_func_end ResetBg0
thumb_func_start sub_80F6CBC thumb_func_start sub_80F6CBC
sub_80F6CBC: @ 80F6CBC sub_80F6CBC: @ 80F6CBC
@@ -819,7 +819,7 @@ sub_80F6D5C: @ 80F6D5C
lsrs r0, 24 lsrs r0, 24
cmp r0, 0 cmp r0, 0
bne _080F6DB0 bne _080F6DB0
bl sub_80F78A8 bl GetTextSpeedSetting
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@@ -840,7 +840,7 @@ _080F6DAC: .4byte gStringVar4
_080F6DB0: _080F6DB0:
cmp r0, 0x1 cmp r0, 0x1
bne _080F6DDC bne _080F6DDC
bl sub_80F78A8 bl GetTextSpeedSetting
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@@ -858,7 +858,7 @@ _080F6DB0:
.align 2, 0 .align 2, 0
_080F6DD8: .4byte gStringVar4 _080F6DD8: .4byte gStringVar4
_080F6DDC: _080F6DDC:
bl sub_80F78A8 bl GetTextSpeedSetting
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@@ -896,7 +896,7 @@ sub_80F6E08: @ 80F6E08
ands r1, r2 ands r1, r2
orrs r1, r0 orrs r1, r0
strb r1, [r3] strb r1, [r3]
bl sub_80F78A8 bl GetTextSpeedSetting
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@@ -995,8 +995,8 @@ _080F6ED4:
bx r0 bx r0
thumb_func_end sub_80F6E9C thumb_func_end sub_80F6E9C
thumb_func_start sub_80F6EE4 thumb_func_start DrawDialogueFrame
sub_80F6EE4: @ 80F6EE4 DrawDialogueFrame: @ 80F6EE4
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1022,10 +1022,10 @@ _080F6F12:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F6F18: .4byte sub_80F7124 _080F6F18: .4byte sub_80F7124
thumb_func_end sub_80F6EE4 thumb_func_end DrawDialogueFrame
thumb_func_start sub_80F6F1C thumb_func_start DrawStdWindowFrame
sub_80F6F1C: @ 80F6F1C DrawStdWindowFrame: @ 80F6F1C
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1051,10 +1051,10 @@ _080F6F4A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F6F50: .4byte sub_80F6FD4 _080F6F50: .4byte sub_80F6FD4
thumb_func_end sub_80F6F1C thumb_func_end DrawStdWindowFrame
thumb_func_start sub_80F6F54 thumb_func_start ClearDialogWindowAndFrame
sub_80F6F54: @ 80F6F54 ClearDialogWindowAndFrame: @ 80F6F54
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1087,10 +1087,10 @@ _080F6F8E:
.align 2, 0 .align 2, 0
_080F6F94: .4byte sub_80F76CC _080F6F94: .4byte sub_80F76CC
_080F6F98: .4byte gUnknown_203ADFA _080F6F98: .4byte gUnknown_203ADFA
thumb_func_end sub_80F6F54 thumb_func_end ClearDialogWindowAndFrame
thumb_func_start sub_80F6F9C thumb_func_start ClearStdWindowAndFrame
sub_80F6F9C: @ 80F6F9C ClearStdWindowAndFrame: @ 80F6F9C
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 24 lsls r0, 24
@@ -1116,7 +1116,7 @@ _080F6FCA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F6FD0: .4byte sub_80F7684 _080F6FD0: .4byte sub_80F7684
thumb_func_end sub_80F6F9C thumb_func_end ClearStdWindowAndFrame
thumb_func_start sub_80F6FD4 thumb_func_start sub_80F6FD4
sub_80F6FD4: @ 80F6FD4 sub_80F6FD4: @ 80F6FD4
@@ -2059,8 +2059,8 @@ sub_80F77B8: @ 80F77B8
_080F77C8: .4byte gUnknown_841F408 _080F77C8: .4byte gUnknown_841F408
thumb_func_end sub_80F77B8 thumb_func_end sub_80F77B8
thumb_func_start sub_80F77CC thumb_func_start Menu_LoadStdPalAt
sub_80F77CC: @ 80F77CC Menu_LoadStdPalAt: @ 80F77CC
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
@@ -2072,7 +2072,7 @@ sub_80F77CC: @ 80F77CC
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F77E0: .4byte gUnknown_841F408 _080F77E0: .4byte gUnknown_841F408
thumb_func_end sub_80F77CC thumb_func_end Menu_LoadStdPalAt
thumb_func_start sub_80F77E4 thumb_func_start sub_80F77E4
sub_80F77E4: @ 80F77E4 sub_80F77E4: @ 80F77E4
@@ -2116,7 +2116,7 @@ DisplayItemMessageOnField: @ 80F7808
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl sub_80F6E9C bl sub_80F6E9C
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r2, 0x80 movs r2, 0x80
@@ -2187,8 +2187,8 @@ sub_80F7880: @ 80F7880
_080F78A4: .4byte gUnknown_841F43C _080F78A4: .4byte gUnknown_841F43C
thumb_func_end sub_80F7880 thumb_func_end sub_80F7880
thumb_func_start sub_80F78A8 thumb_func_start GetTextSpeedSetting
sub_80F78A8: @ 80F78A8 GetTextSpeedSetting: @ 80F78A8
push {lr} push {lr}
ldr r3, _080F78D8 @ =gSaveBlock2Ptr ldr r3, _080F78D8 @ =gSaveBlock2Ptr
ldr r2, [r3] ldr r2, [r3]
@@ -2216,7 +2216,7 @@ _080F78C4:
.align 2, 0 .align 2, 0
_080F78D8: .4byte gSaveBlock2Ptr _080F78D8: .4byte gSaveBlock2Ptr
_080F78DC: .4byte gUnknown_841F428 _080F78DC: .4byte gUnknown_841F428
thumb_func_end sub_80F78A8 thumb_func_end GetTextSpeedSetting
thumb_func_start sub_80F78E0 thumb_func_start sub_80F78E0
sub_80F78E0: @ 80F78E0 sub_80F78E0: @ 80F78E0
asm/option_menu.s
+1 -1
View File
@@ -93,7 +93,7 @@ _080883FA:
cmp r3, 0x5 cmp r3, 0x5
bls _080883E6 bls _080883E6
movs r0, 0xD movs r0, 0xD
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
ldr r0, _0808842C @ =sub_8088454 ldr r0, _0808842C @ =sub_8088454
bl SetMainCallback2 bl SetMainCallback2
pop {r4-r6} pop {r4-r6}
asm/overworld.s
+4 -4
View File
@@ -3117,8 +3117,8 @@ sub_80562B0: @ 80562B0
ldr r1, [r5] ldr r1, [r5]
movs r0, 0x3 movs r0, 0x3
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_80F6C6C bl InitStandardTextBoxWindows
bl sub_80F6C98 bl ResetBg0
bl sub_8069348 bl sub_8069348
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
@@ -3181,8 +3181,8 @@ sub_8056354: @ 8056354
ldr r1, [r5] ldr r1, [r5]
movs r0, 0x3 movs r0, 0x3
bl SetBgTilemapBuffer bl SetBgTilemapBuffer
bl sub_80F6C6C bl InitStandardTextBoxWindows
bl sub_80F6C98 bl ResetBg0
bl sub_8069348 bl sub_8069348
pop {r3} pop {r3}
mov r8, r3 mov r8, r3
asm/party_menu.s
+4 -4
View File
@@ -420,7 +420,7 @@ _0811ED96:
_0811EDA8: .4byte gUnknown_203B09C _0811EDA8: .4byte gUnknown_203B09C
_0811EDAC: _0811EDAC:
movs r0, 0x5 movs r0, 0x5
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _0811EDFC b _0811EDFC
_0811EDB4: _0811EDB4:
ldr r4, _0811EDCC @ =gUnknown_203B09C ldr r4, _0811EDCC @ =gUnknown_203B09C
@@ -6888,7 +6888,7 @@ sub_8121FC0: @ 8121FC0
movs r1, 0x1 movs r1, 0x1
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
bl sub_80F78A8 bl GetTextSpeedSetting
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@@ -6990,7 +6990,7 @@ sub_8122084: @ 8122084
movs r1, 0x1 movs r1, 0x1
orrs r0, r1 orrs r0, r1
strb r0, [r2] strb r0, [r2]
bl sub_80F78A8 bl GetTextSpeedSetting
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@@ -13684,7 +13684,7 @@ _08125680:
mov r1, r8 mov r1, r8
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0x2 movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10 add sp, 0x10
asm/player_pc.s
+16 -16
View File
@@ -187,7 +187,7 @@ _080EB77E:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080EB814 @ =gTasks ldr r1, _080EB814 @ =gTasks
@@ -361,11 +361,11 @@ _080EB940:
cmp r0, 0 cmp r0, 0
bne _080EB95C bne _080EB95C
movs r0, 0x22 movs r0, 0x22
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080EB962 b _080EB962
_080EB95C: _080EB95C:
movs r0, 0x1E movs r0, 0x1E
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_080EB962: _080EB962:
ldr r0, _080EB990 @ =gUnknown_203AAC4 ldr r0, _080EB990 @ =gUnknown_203AAC4
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
@@ -376,7 +376,7 @@ _080EB962:
bne _080EB99C bne _080EB99C
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6F54 bl ClearDialogWindowAndFrame
adds r0, r5, 0 adds r0, r5, 0
bl sub_80EBEB0 bl sub_80EBEB0
ldr r0, _080EB994 @ =gTasks ldr r0, _080EB994 @ =gTasks
@@ -449,14 +449,14 @@ sub_80EB9E8: @ 80EB9E8
cmp r0, 0 cmp r0, 0
bne _080EBA18 bne _080EBA18
movs r0, 0x21 movs r0, 0x21
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080EBA1E b _080EBA1E
.align 2, 0 .align 2, 0
_080EBA10: .4byte gTasks+0x8 _080EBA10: .4byte gTasks+0x8
_080EBA14: .4byte gUnknown_203AAC4 _080EBA14: .4byte gUnknown_203AAC4
_080EBA18: _080EBA18:
movs r0, 0x1D movs r0, 0x1D
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_080EBA1E: _080EBA1E:
ldr r0, _080EBA80 @ =gUnknown_8402258 ldr r0, _080EBA80 @ =gUnknown_8402258
bl AddWindow bl AddWindow
@@ -488,7 +488,7 @@ _080EBA1E:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080EBA88 @ =gUnknown_84021DC ldr r1, _080EBA88 @ =gUnknown_84021DC
@@ -513,7 +513,7 @@ sub_80EBA8C: @ 80EBA8C
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0
@@ -702,7 +702,7 @@ sub_80EBC0C: @ 80EBC0C
bl sub_80F6E9C bl sub_80F6E9C
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r0, _080EBC34 @ =sub_80EBBDC ldr r0, _080EBC34 @ =sub_80EBBDC
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
@@ -777,7 +777,7 @@ sub_80EBCAC: @ 80EBCAC
bl sub_80F6E9C bl sub_80F6E9C
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r0, _080EBCD4 @ =sub_80EBBDC ldr r0, _080EBCD4 @ =sub_80EBBDC
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
@@ -1341,7 +1341,7 @@ sub_80EC0D8: @ 80EC0D8
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080EC154 @ =gTasks ldr r1, _080EC154 @ =gTasks
@@ -1503,13 +1503,13 @@ sub_80EC260: @ 80EC260
cmp r0, 0 cmp r0, 0
bne _080EC278 bne _080EC278
movs r0, 0x22 movs r0, 0x22
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080EC27E b _080EC27E
.align 2, 0 .align 2, 0
_080EC274: .4byte gUnknown_203AAC4 _080EC274: .4byte gUnknown_203AAC4
_080EC278: _080EC278:
movs r0, 0x1E movs r0, 0x1E
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_080EC27E: _080EC27E:
bl sub_80F6E9C bl sub_80F6E9C
ldr r0, _080EC2A8 @ =sub_80EC230 ldr r0, _080EC2A8 @ =sub_80EC230
@@ -1773,13 +1773,13 @@ sub_80EC474: @ 80EC474
cmp r0, 0 cmp r0, 0
bne _080EC48C bne _080EC48C
movs r0, 0x22 movs r0, 0x22
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080EC492 b _080EC492
.align 2, 0 .align 2, 0
_080EC488: .4byte gUnknown_203AAC4 _080EC488: .4byte gUnknown_203AAC4
_080EC48C: _080EC48C:
movs r0, 0x1E movs r0, 0x1E
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_080EC492: _080EC492:
ldr r0, _080EC4E8 @ =sub_80EC230 ldr r0, _080EC4E8 @ =sub_80EC230
movs r1, 0 movs r1, 0
@@ -1871,7 +1871,7 @@ sub_80EC53C: @ 80EC53C
lsrs r4, 24 lsrs r4, 24
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6F54 bl ClearDialogWindowAndFrame
adds r0, r4, 0 adds r0, r4, 0
bl sub_80EBEB0 bl sub_80EBEB0
movs r0, 0 movs r0, 0
asm/pokedex_screen.s
+1 -1
View File
@@ -309,7 +309,7 @@ sub_810275C: @ 810275C
ldr r0, _08102794 @ =sub_81024D4 ldr r0, _08102794 @ =sub_81024D4
bl SetMainCallback2 bl SetMainCallback2
movs r0, 0x4 movs r0, 0x4
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
asm/pokemon_3.s
+3 -3
View File
@@ -785,8 +785,8 @@ _08044AE8: .4byte gUnknown_825E05C
_08044AEC: .4byte gUnknown_82349BC _08044AEC: .4byte gUnknown_82349BC
thumb_func_end sub_8044A40 thumb_func_end sub_8044A40
thumb_func_start sub_8044AF0 thumb_func_start SetUpMonSpriteManagerMaybe
sub_8044AF0: @ 8044AF0 SetUpMonSpriteManagerMaybe: @ 8044AF0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1124,7 +1124,7 @@ _08044D70:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08044D7C: .4byte gUnknown_20244F4 _08044D7C: .4byte gUnknown_20244F4
thumb_func_end sub_8044AF0 thumb_func_end SetUpMonSpriteManagerMaybe
thumb_func_start sub_8044D80 thumb_func_start sub_8044D80
sub_8044D80: @ 8044D80 sub_8044D80: @ 8044D80
asm/pokemon_special_anim.s
+1 -1
View File
@@ -1727,7 +1727,7 @@ sub_811D2EC: @ 811D2EC
lsrs r7, r0, 16 lsrs r7, r0, 16
movs r0, 0 movs r0, 0
mov r8, r0 mov r8, r0
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r9, r0 mov r9, r0
asm/pokemon_storage_system.s
+9 -9
View File
@@ -1412,7 +1412,7 @@ _0808C3CC:
.4byte _0808C680 .4byte _0808C680
_0808C3E0: _0808C3E0:
movs r0, 0x1C movs r0, 0x1C
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
ldrb r0, [r5, 0xA] ldrb r0, [r5, 0xA]
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x26 adds r1, 0x26
@@ -1420,7 +1420,7 @@ _0808C3E0:
bl sub_80F6E9C bl sub_80F6E9C
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
movs r0, 0 movs r0, 0
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
@@ -1557,12 +1557,12 @@ _0808C508: .4byte gUnknown_83CDA20
_0808C50C: _0808C50C:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrh r0, [r5, 0x26] ldrh r0, [r5, 0x26]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl EnableBothScriptContexts bl EnableBothScriptContexts
adds r0, r4, 0 adds r0, r4, 0
@@ -1833,7 +1833,7 @@ sub_808C72C: @ 808C72C
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
movs r0, 0x2 movs r0, 0x2
movs r1, 0 movs r1, 0
bl GetMenuCursorDimensionByFont bl GetMenuCursorDimensionByFont
@@ -1861,7 +1861,7 @@ sub_808C72C: @ 808C72C
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
mov r0, r10 mov r0, r10
strh r5, [r0] strh r5, [r0]
add sp, 0xC add sp, 0xC
@@ -2716,7 +2716,7 @@ _0808CE18:
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x4] strb r0, [r1, 0x4]
movs r0, 0x1C movs r0, 0x1C
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
bl StorageGetCurrentBox bl StorageGetCurrentBox
ldr r1, _0808CE58 @ =gUnknown_20397B8 ldr r1, _0808CE58 @ =gUnknown_20397B8
strb r0, [r1] strb r0, [r1]
@@ -2767,7 +2767,7 @@ _0808CE8C:
ldr r1, [r4] ldr r1, [r4]
strb r0, [r1, 0x4] strb r0, [r1, 0x4]
movs r0, 0x1C movs r0, 0x1C
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
ldr r0, _0808CEC4 @ =c2_Box ldr r0, _0808CEC4 @ =c2_Box
bl SetMainCallback2 bl SetMainCallback2
_0808CEB6: _0808CEB6:
@@ -18961,7 +18961,7 @@ sub_8094E88: @ 8094E88
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
ldr r0, [r5] ldr r0, [r5]
asm/pokemon_summary_screen.s
+4 -4
View File
@@ -107,7 +107,7 @@ _081345D0:
beq _08134604 beq _08134604
_081345D4: _081345D4:
movs r0, 0x6 movs r0, 0x6
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
ldr r2, _081345F8 @ =gUnknown_203B140 ldr r2, _081345F8 @ =gUnknown_203B140
ldr r0, [r2] ldr r0, [r2]
ldr r3, _081345FC @ =0x00003214 ldr r3, _081345FC @ =0x00003214
@@ -128,7 +128,7 @@ _081345FC: .4byte 0x00003214
_08134600: .4byte 0x00003234 _08134600: .4byte 0x00003234
_08134604: _08134604:
movs r0, 0x6 movs r0, 0x6
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
ldr r0, [r4] ldr r0, [r4]
ldr r3, _08134628 @ =0x00003214 ldr r3, _08134628 @ =0x00003214
adds r0, r3 adds r0, r3
@@ -149,7 +149,7 @@ _0813462C: .4byte 0x0000321c
_08134630: .4byte 0x00003234 _08134630: .4byte 0x00003234
_08134634: _08134634:
movs r0, 0x8 movs r0, 0x8
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
ldr r0, [r4] ldr r0, [r4]
ldr r3, _08134710 @ =0x00003214 ldr r3, _08134710 @ =0x00003214
adds r0, r3 adds r0, r3
@@ -7608,7 +7608,7 @@ _0813846C:
_08138470: _08138470:
movs r0, 0x7 movs r0, 0x7
_08138472: _08138472:
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_08138476: _08138476:
pop {r0} pop {r0}
bx r0 bx r0
asm/reshow_battle_screen.s
+4 -4
View File
@@ -45,7 +45,7 @@ sub_8077764: @ 8077764
cmp r1, 0 cmp r1, 0
beq _080777BC beq _080777BC
movs r0, 0x19 movs r0, 0x19
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080777DA b _080777DA
.align 2, 0 .align 2, 0
_080777B0: .4byte gPaletteFade _080777B0: .4byte gPaletteFade
@@ -53,7 +53,7 @@ _080777B4: .4byte gBattleScripting
_080777B8: .4byte gBattleTypeFlags _080777B8: .4byte gBattleTypeFlags
_080777BC: _080777BC:
movs r0, 0x18 movs r0, 0x18
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080777DA b _080777DA
_080777C4: _080777C4:
movs r0, 0x80 movs r0, 0x80
@@ -61,11 +61,11 @@ _080777C4:
cmp r1, 0 cmp r1, 0
beq _080777D4 beq _080777D4
movs r0, 0x1A movs r0, 0x1A
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
b _080777DA b _080777DA
_080777D4: _080777D4:
movs r0, 0x17 movs r0, 0x17
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
_080777DA: _080777DA:
ldr r0, _080777E4 @ =sub_80777E8 ldr r0, _080777E4 @ =sub_80777E8
bl SetMainCallback2 bl SetMainCallback2
asm/script_menu.s
+3 -3
View File
@@ -301,7 +301,7 @@ _0809CB7A:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
ldr r0, [sp, 0x18] ldr r0, [sp, 0x18]
adds r1, r7, 0 adds r1, r7, 0
adds r2, r5, 0 adds r2, r5, 0
@@ -1138,7 +1138,7 @@ _0809D1FA:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0 movs r0, 0
mov r1, r9 mov r1, r9
adds r2, r6, 0 adds r2, r6, 0
@@ -1946,7 +1946,7 @@ _0809D844:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0 movs r0, 0
mov r1, r9 mov r1, r9
adds r2, r7, 0 adds r2, r7, 0
asm/shop.s
+1 -1
View File
@@ -74,7 +74,7 @@ _0809AAF8:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
ldrb r0, [r4] ldrb r0, [r4]
bl PutWindowTilemap bl PutWindowTilemap
ldrb r0, [r4] ldrb r0, [r4]
asm/start_menu.s
+9 -9
View File
@@ -158,7 +158,7 @@ sub_806EE7C: @ 806EE7C
bl PutWindowTilemap bl PutWindowTilemap
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
ldr r0, _0806EEFC @ =gStringVar1 ldr r0, _0806EEFC @ =gStringVar1
ldr r1, _0806EF00 @ =gUnknown_2039996 ldr r1, _0806EF00 @ =gUnknown_2039996
ldrh r1, [r1] ldrh r1, [r1]
@@ -390,7 +390,7 @@ _0806F06C:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
bl sub_80F6F1C bl DrawStdWindowFrame
ldr r1, _0806F08C @ =gUnknown_20370FF ldr r1, _0806F08C @ =gUnknown_20370FF
b _0806F0B8 b _0806F0B8
.align 2, 0 .align 2, 0
@@ -438,7 +438,7 @@ _0806F0C4:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
strb r0, [r4] strb r0, [r4]
bl sub_80BF708 bl sub_80BF708
lsls r0, 24 lsls r0, 24
@@ -1049,7 +1049,7 @@ sub_806F5A4: @ 806F5A4
push {lr} push {lr}
bl sub_812B234 bl sub_812B234
movs r0, 0xC movs r0, 0xC
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
bl sub_806F624 bl sub_806F624
ldr r1, _0806F5C0 @ =gUnknown_20370F0 ldr r1, _0806F5C0 @ =gUnknown_20370F0
ldr r0, _0806F5C4 @ =sub_806F5C8 ldr r0, _0806F5C4 @ =sub_806F5C8
@@ -1156,7 +1156,7 @@ sub_806F67C: @ 806F67C
push {lr} push {lr}
bl sub_812B234 bl sub_812B234
movs r0, 0xC movs r0, 0xC
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
bl sub_806F624 bl sub_806F624
ldr r0, _0806F698 @ =task50_save_game ldr r0, _0806F698 @ =task50_save_game
movs r1, 0x50 movs r1, 0x50
@@ -1239,7 +1239,7 @@ sub_806F71C: @ 806F71C
push {lr} push {lr}
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_806F71C thumb_func_end sub_806F71C
@@ -1328,7 +1328,7 @@ sub_806F7A8: @ 806F7A8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
bl sub_80F6F9C bl ClearStdWindowAndFrame
bl remove_start_menu_window_maybe bl remove_start_menu_window_maybe
movs r0, 0 movs r0, 0
bl sub_8112EDC bl sub_8112EDC
@@ -2178,7 +2178,7 @@ sub_806FE84: @ 806FE84
ldr r4, _0806FE9C @ =gUnknown_2037104 ldr r4, _0806FE9C @ =gUnknown_2037104
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_80F6F9C bl ClearStdWindowAndFrame
ldrb r0, [r4] ldrb r0, [r4]
bl RemoveWindow bl RemoveWindow
pop {r4} pop {r4}
@@ -2197,7 +2197,7 @@ sub_806FEA0: @ 806FEA0
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F9C bl ClearStdWindowAndFrame
bl remove_start_menu_window_maybe bl remove_start_menu_window_maybe
bl sub_80696C0 bl sub_80696C0
bl ScriptContext2_Disable bl ScriptContext2_Disable
asm/teachy_tv.s
+1 -1
View File
@@ -774,7 +774,7 @@ sub_815B1DC: @ 815B1DC
negs r0, r0 negs r0, r0
ands r0, r1 ands r0, r1
strb r0, [r2] strb r0, [r2]
bl sub_80F78A8 bl GetTextSpeedSetting
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
asm/title_screen.s
+1 -1
View File
@@ -809,7 +809,7 @@ sub_8078FC4: @ 8078FC4
b _08079094 b _08079094
_08078FD6: _08078FD6:
movs r0, 0x1 movs r0, 0x1
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
ldr r0, _0807902C @ =sub_807941C ldr r0, _0807902C @ =sub_807941C
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
asm/tm_case.s
+2 -2
View File
@@ -1586,7 +1586,7 @@ _08132468:
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0x80 movs r0, 0x80
lsls r0, 1 lsls r0, 1
bl Alloc bl Alloc
@@ -3291,7 +3291,7 @@ sub_813337C: @ 813337C
lsrs r5, 24 lsrs r5, 24
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl sub_80F78A8 bl GetTextSpeedSetting
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r4, [sp] str r4, [sp]
asm/trade.s
+1 -1
View File
@@ -3390,7 +3390,7 @@ _0804E208:
movs r1, 0x3 movs r1, 0x3
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0x1 movs r0, 0x1
bl PutWindowTilemap bl PutWindowTilemap
movs r0, 0x1 movs r0, 0x1
asm/trainer_card.s
+4 -4
View File
@@ -291,7 +291,7 @@ _0808924A:
cmp r0, 0 cmp r0, 0
beq _08089280 beq _08089280
movs r0, 0xB movs r0, 0xB
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
bl sub_808B1D4 bl sub_808B1D4
movs r0, 0xF2 movs r0, 0xF2
bl PlaySE bl PlaySE
@@ -387,7 +387,7 @@ _0808931C: .4byte gMain
_08089320: .4byte gReceivedRemoteLinkPlayers _08089320: .4byte gReceivedRemoteLinkPlayers
_08089324: _08089324:
movs r0, 0xA movs r0, 0xA
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
bl sub_808B1D4 bl sub_808B1D4
ldr r0, _08089340 @ =gUnknown_20397A4 ldr r0, _08089340 @ =gUnknown_20397A4
ldr r1, [r0] ldr r1, [r0]
@@ -431,7 +431,7 @@ _0808937A:
bl sub_800AAC0 bl sub_800AAC0
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r2, _080893B0 @ =gUnknown_8419D89 ldr r2, _080893B0 @ =gUnknown_8419D89
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
@@ -1647,7 +1647,7 @@ sub_8089D8C: @ 8089D8C
ldr r0, _08089DA0 @ =sub_8089070 ldr r0, _08089DA0 @ =sub_8089070
bl SetMainCallback2 bl SetMainCallback2
movs r0, 0xA movs r0, 0xA
bl sub_812B1F0 bl HelpSystem_SetSomeVariable2
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
asm/union_room_chat.s
+2 -2
View File
@@ -4299,7 +4299,7 @@ sub_812A424: @ 812A424
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
_0812A4F0: _0812A4F0:
add sp, 0x14 add sp, 0x14
pop {r3} pop {r3}
@@ -5000,7 +5000,7 @@ sub_812AA10: @ 812AA10
movs r1, 0x2 movs r1, 0x2
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_810F7D8 bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0x3 movs r0, 0x3
bl PutWindowTilemap bl PutWindowTilemap
add sp, 0xC add sp, 0xC
asm/unk_814BB4C.s
+7 -7
View File
@@ -201,7 +201,7 @@ _0814BC98:
_0814BCA2: _0814BCA2:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
ldrb r1, [r5, 0x1] ldrb r1, [r5, 0x1]
movs r0, 0x2 movs r0, 0x2
mov r8, r0 mov r8, r0
@@ -287,7 +287,7 @@ _0814BD48:
beq _0814BD5A beq _0814BD5A
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
_0814BD5A: _0814BD5A:
ldrb r0, [r7, 0xE] ldrb r0, [r7, 0xE]
movs r1, 0x1 movs r1, 0x1
@@ -597,7 +597,7 @@ _0814BFA0: .4byte gUnknown_83DFC9C
_0814BFA4: _0814BFA4:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
movs r0, 0xA movs r0, 0xA
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
@@ -2855,7 +2855,7 @@ _0814D106:
beq _0814D17E beq _0814D17E
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r2, _0814D148 @ =gUnknown_8419F54 ldr r2, _0814D148 @ =gUnknown_8419F54
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
@@ -2979,7 +2979,7 @@ _0814D204:
_0814D206: _0814D206:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
movs r4, 0 movs r4, 0
str r4, [sp] str r4, [sp]
adds r0, r6, 0 adds r0, r6, 0
@@ -3159,7 +3159,7 @@ _0814D34A:
_0814D356: _0814D356:
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80F6F54 bl ClearDialogWindowAndFrame
adds r0, r5, 0 adds r0, r5, 0
bl sub_814DA04 bl sub_814DA04
movs r0, 0x1 movs r0, 0x1
@@ -3217,7 +3217,7 @@ _0814D3BA:
_0814D3C0: _0814D3C0:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
ldrh r1, [r5, 0x14] ldrh r1, [r5, 0x14]
cmp r1, 0x3 cmp r1, 0x3
bne _0814D3F0 bne _0814D3F0
asm/unk_814D5C8.s
+2 -2
View File
@@ -186,8 +186,8 @@ _0814D768:
beq _0814D774 beq _0814D774
b _0814D87E b _0814D87E
_0814D774: _0814D774:
bl sub_80F6C6C bl InitStandardTextBoxWindows
bl sub_80F6C98 bl ResetBg0
adds r0, r5, 0 adds r0, r5, 0
bl sub_814EB38 bl sub_814EB38
adds r0, r5, 0 adds r0, r5, 0
asm/unk_81507FC.s
+3 -3
View File
@@ -10657,7 +10657,7 @@ _08155A9C:
_08155AA6: _08155AA6:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_80F6EE4 bl DrawDialogueFrame
ldr r2, _08155ACC @ =gUnknown_8419F54 ldr r2, _08155ACC @ =gUnknown_8419F54
str r4, [sp] str r4, [sp]
movs r0, 0x2 movs r0, 0x2
@@ -11276,8 +11276,8 @@ _08155EC6:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl ChangeBgY bl ChangeBgY
bl sub_80F6C6C bl InitStandardTextBoxWindows
bl sub_80F6C98 bl ResetBg0
movs r1, 0x82 movs r1, 0x82
lsls r1, 5 lsls r1, 5
movs r0, 0 movs r0, 0
asm/wireless_communication_status_screen.s
+1 -1
View File
@@ -130,7 +130,7 @@ sub_814F1E4: @ 814F1E4
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
movs r0, 0xF0 movs r0, 0xF0
bl sub_80F77CC bl Menu_LoadStdPalAt
bl UnkTextUtil_Reset bl UnkTextUtil_Reset
movs r0, 0x20 movs r0, 0x20
str r0, [sp] str r0, [sp]
data/data_835B488.s
+4 -4
View File
@@ -740,19 +740,19 @@ sFanfares:: @ 83AC990
gUnknown_83AC9D0:: @ 83AC9D0 gUnknown_83AC9D0:: @ 83AC9D0
.incbin "baserom.gba", 0x3AC9D0, 0x8 .incbin "baserom.gba", 0x3AC9D0, 0x8
gUnknown_83AC9D8:: gOamData_83AC9D8::
.incbin "baserom.gba", 0x3AC9D8, 0x10 .incbin "baserom.gba", 0x3AC9D8, 0x10
gUnknown_83AC9E8:: gOamData_83AC9E8::
.incbin "baserom.gba", 0x3AC9E8, 0x10 .incbin "baserom.gba", 0x3AC9E8, 0x10
gUnknown_83AC9F8:: gOamData_83AC9F8::
.incbin "baserom.gba", 0x3AC9F8, 0x8 .incbin "baserom.gba", 0x3AC9F8, 0x8
gUnknown_83ACA00:: gUnknown_83ACA00::
.incbin "baserom.gba", 0x3ACA00, 0xF8 .incbin "baserom.gba", 0x3ACA00, 0xF8
gUnknown_83ACAF8:: gOamData_83ACAF8::
.incbin "baserom.gba", 0x3ACAF8, 0x110 .incbin "baserom.gba", 0x3ACAF8, 0x110
gUnknown_83ACC08:: @ 83ACC08 gUnknown_83ACC08:: @ 83ACC08
data/data_83FECCC.s
+15 -13
View File
@@ -586,7 +586,7 @@ gUnknown_8415C64:: @ 8415C64
gUnknown_8415CE8:: @ 8415CE8 gUnknown_8415CE8:: @ 8415CE8
.incbin "baserom.gba", 0x415CE8, 0x44 .incbin "baserom.gba", 0x415CE8, 0x44
gUnknown_8415D2C:: @ 8415D2C gText_Controls:: @ 8415D2C
.string "CONTROLS$" .string "CONTROLS$"
.align 2 .align 2
@@ -594,28 +594,30 @@ gUnknown_8415D38:: @ 8415D2C
.string "{KEYGFX_DPAD_UP_DOWN}えらぶ {KEYGFX_A_BUTTON}けってい$" .string "{KEYGFX_DPAD_UP_DOWN}えらぶ {KEYGFX_A_BUTTON}けってい$"
.align 2 .align 2
gUnknown_8415D48:: @ 8415D48 gText_ABUTTONNext:: @ 8415D48
.string "{KEYGFX_A_BUTTON}NEXT$" .string "{KEYGFX_A_BUTTON}NEXT$"
.align 2 .align 2
gUnknown_8415D50:: @ 8415D50 gText_ABUTTONNext_BBUTTONBack:: @ 8415D50
.string "{KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}BACK$" .string "{KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}BACK$"
.align 2 .align 2
gUnknown_8415D60:: @ 8415D60 gText_UPDOWNPick_ABUTTONNext_BBUTTONBack:: @ 8415D60
.incbin "baserom.gba", 0x415D60, 0x18 .string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}CANCEL$"
gUnknown_8415D78:: @ 8415D78 .align 2
.incbin "baserom.gba", 0x415D78, 0x14 gText_UPDOWNPick_ABUTTONBBUTTONCancel:: @ 8415D78
.string "{KEYGFX_DPAD_UP_DOWN}PICK {KEYGFX_A_BUTTON}{KEYGFX_B_BUTTON}CANCEL$"
gUnknown_8415D8C:: @ 8415D8C .align 2
.incbin "baserom.gba", 0x415D8C, 0x7 gText_ABUTTONExit:: @ 8415D8C
.string "{KEYGFX_A_BUTTON}EXIT$"
gUnknown_8415D93:: @ 8415D93 gText_Boy:: @ 8415D93
.incbin "baserom.gba", 0x415D93, 0x4 .string "BOY$"
gUnknown_8415D97:: @ 8415D97 gText_Girl:: @ 8415D97
.incbin "baserom.gba", 0x415D97, 0x5 .string "GIRL$"
gUnknown_8415D9C:: @ 8415D9C gUnknown_8415D9C:: @ 8415D9C
.incbin "baserom.gba", 0x415D9C, 0x1C .incbin "baserom.gba", 0x415D9C, 0x1C
data/event_scripts.s
+65 -65
View File
@@ -428,167 +428,167 @@ gUnknown_81C5647:: @ 81C5647
gUnknown_81C566A:: @ 81C566A gUnknown_81C566A:: @ 81C566A
.incbin "baserom.gba", 0x1C566A, 0xE5 .incbin "baserom.gba", 0x1C566A, 0xE5
gUnknown_81C574F:: @ 81C574F gOtherText_NewName:: @ 81C574F
.string "NEW NAME$" .string "NEW NAME$"
gUnknown_81C5758:: @ 81C5758 gNameChoice_Green:: @ 81C5758
.string "GREEN$" .string "GREEN$"
gUnknown_81C575E:: @ 81C575E gNameChoice_Red:: @ 81C575E
.string "RED$" .string "RED$"
gUnknown_81C5762:: @ 81C5762 gNameChoice_Leaf:: @ 81C5762
.string "LEAF$" .string "LEAF$"
gUnknown_81C5767:: @ 81C5767 gNameChoice_Fire:: @ 81C5767
.string "FIRE$" .string "FIRE$"
gUnknown_81C576C:: @ 81C576C gNameChoice_Gary:: @ 81C576C
.string "GARY$" .string "GARY$"
gUnknown_81C5771:: @ 81C5771 gNameChoice_Kaz:: @ 81C5771
.string "KAZ$" .string "KAZ$"
gUnknown_81C5775:: @ 81C5775 gNameChoice_Toru:: @ 81C5775
.string "TORU$" .string "TORU$"
gUnknown_81C577A:: @ 81C577A gNameChoice_Ash:: @ 81C577A
.string "ASH$" .string "ASH$"
gUnknown_81C577E:: @ 81C577E gNameChoice_Kene:: @ 81C577E
.string "KENE$" .string "KENE$"
gUnknown_81C5783:: @ 81C5783 gNameChoice_Geki:: @ 81C5783
.string "GEKI$" .string "GEKI$"
gUnknown_81C5788:: @ 81C5788 gNameChoice_Jak:: @ 81C5788
.string "JAK$" .string "JAK$"
gUnknown_81C578C:: @ 81C578C gNameChoice_Janne:: @ 81C578C
.string "JANNE$" .string "JANNE$"
gUnknown_81C5792:: @ 81C5792 gNameChoice_Jonn:: @ 81C5792
.string "JONN$" .string "JONN$"
gUnknown_81C5797:: @ 81C5797 gNameChoice_Kamon:: @ 81C5797
.string "KAMON$" .string "KAMON$"
gUnknown_81C579D:: @ 81C579D gNameChoice_Karl:: @ 81C579D
.string "KARL$" .string "KARL$"
gUnknown_81C57A2:: @ 81C57A2 gNameChoice_Taylor:: @ 81C57A2
.string "TAYLOR$" .string "TAYLOR$"
gUnknown_81C57A9:: @ 81C57A9 gNameChoice_Oscar:: @ 81C57A9
.string "OSCAR$" .string "OSCAR$"
gUnknown_81C57AF:: @ 81C57AF gNameChoice_Hiro:: @ 81C57AF
.string "HIRO$" .string "HIRO$"
gUnknown_81C57B4:: @ 81C57B4 gNameChoice_Max:: @ 81C57B4
.string "MAX$" .string "MAX$"
gUnknown_81C57B8:: @ 81C57B8 gNameChoice_Jon:: @ 81C57B8
.string "JON$" .string "JON$"
gUnknown_81C57BC:: @ 81C57BC gNameChoice_Ralph:: @ 81C57BC
.string "RALPH$" .string "RALPH$"
gUnknown_81C57C2:: @ 81C57C2 gNameChoice_Kay:: @ 81C57C2
.string "KAY$" .string "KAY$"
gUnknown_81C57C6:: @ 81C57C6 gNameChoice_Tosh:: @ 81C57C6
.string "TOSH$" .string "TOSH$"
gUnknown_81C57CB:: @ 81C57CB gNameChoice_Roak:: @ 81C57CB
.string "ROAK$" .string "ROAK$"
gUnknown_81C57D0:: @ 81C57D0 gNameChoice_Omi:: @ 81C57D0
.string "OMI$" .string "OMI$"
gUnknown_81C57D4:: @ 81C57D4 gNameChoice_Jodi:: @ 81C57D4
.string "JODI$" .string "JODI$"
gUnknown_81C57D9:: @ 81C57D9 gNameChoice_Amanda:: @ 81C57D9
.string "AMANDA$" .string "AMANDA$"
gUnknown_81C57E0:: @ 81C57E0 gNameChoice_Hillary:: @ 81C57E0
.string "HILLARY$" .string "HILLARY$"
gUnknown_81C57E8:: @ 81C57E8 gNameChoice_Makey:: @ 81C57E8
.string "MAKEY$" .string "MAKEY$"
gUnknown_81C57EE:: @ 81C57EE gNameChoice_Michi:: @ 81C57EE
.string "MICHI$" .string "MICHI$"
gUnknown_81C57F4:: @ 81C57F4 gNameChoice_Paula:: @ 81C57F4
.string "PAULA$" .string "PAULA$"
gUnknown_81C57FA:: @ 81C57FA gNameChoice_June:: @ 81C57FA
.string "JUNE$" .string "JUNE$"
gUnknown_81C57FF:: @ 81C57FF gNameChoice_Cassie:: @ 81C57FF
.string "CASSIE$" .string "CASSIE$"
gUnknown_81C5806:: @ 81C5806 gNameChoice_Rey:: @ 81C5806
.string "REY$" .string "REY$"
gUnknown_81C580A:: @ 81C580A gNameChoice_Seda:: @ 81C580A
.string "SEDA$" .string "SEDA$"
gUnknown_81C580F:: @ 81C580F gNameChoice_Kiko:: @ 81C580F
.string "KIKO$" .string "KIKO$"
gUnknown_81C5814:: @ 81C5814 gNameChoice_Mina:: @ 81C5814
.string "MINA$" .string "MINA$"
gUnknown_81C5819:: @ 81C5819 gNameChoice_Norie:: @ 81C5819
.string "NORIE$" .string "NORIE$"
gUnknown_81C581F:: @ 81C581F gNameChoice_Sai:: @ 81C581F
.string "SAI$" .string "SAI$"
gUnknown_81C5823:: @ 81C5823 gNameChoice_Momo:: @ 81C5823
.string "MOMO$" .string "MOMO$"
gUnknown_81C5828:: @ 81C5828 gNameChoice_Suzi:: @ 81C5828
.string "SUZI$" .string "SUZI$"
gUnknown_81C582D:: @ 81C582D gNewGame_HelpDocs1:: @ 81C582D
.string "The various buttons will be explained in\n" .string "The various buttons will be explained in\n"
.string "the order of their importance.$" .string "the order of their importance.$"
gUnknown_81C5875:: @ 81C5875 gNewGame_HelpDocs2:: @ 81C5875
.string "Moves the main character.\n" .string "Moves the main character.\n"
.string "Also used to choose various data\n" .string "Also used to choose various data\n"
.string "headings.$" .string "headings.$"
gUnknown_81C58BA:: @ 81C58BA gNewGame_HelpDocs3:: @ 81C58BA
.string "Used to confirm a choice, check\n" .string "Used to confirm a choice, check\n"
.string "things, chat, and scroll text.$" .string "things, chat, and scroll text.$"
gUnknown_81C58F9:: @ 81C58F9 gNewGame_HelpDocs4:: @ 81C58F9
.string "Used to exit, cancel a choice,\n" .string "Used to exit, cancel a choice,\n"
.string "and cancel a mode.$" .string "and cancel a mode.$"
gUnknown_81C592B:: @ 81C592B gNewGame_HelpDocs5:: @ 81C592B
.string "Press this button to open the\n" .string "Press this button to open the\n"
.string "MENU.$" .string "MENU.$"
gUnknown_81C594F:: @ 81C594F gNewGame_HelpDocs6:: @ 81C594F
.string "Used to shift items and to use\n" .string "Used to shift items and to use\n"
.string "a registered item.$" .string "a registered item.$"
gUnknown_81C5981:: @ 81C5981 gNewGame_HelpDocs7:: @ 81C5981
.string "If you need help playing the\n" .string "If you need help playing the\n"
.string "game, or on how to do things,\n" .string "game, or on how to do things,\n"
.string "press the L or R Button.$" .string "press the L or R Button.$"
gUnknown_81C59D5:: @ 81C59D5 gOakText_AskPlayerGender:: @ 81C59D5
.string "Now tell me. Are you a boy?\n" .string "Now tell me. Are you a boy?\n"
.string "Or are you a girl?$" .string "Or are you a girl?$"
gUnknown_81C5A04:: gNewGameAdventureIntro1::
.string "In the world which you are about to\n" .string "In the world which you are about to\n"
.string "enter, you will embark on a grand\n" .string "enter, you will embark on a grand\n"
.string "adventure with you as the hero.\n" .string "adventure with you as the hero.\n"
@@ -598,7 +598,7 @@ gUnknown_81C5A04::
.string "or caves. Gather information and\n" .string "or caves. Gather information and\n"
.string "hints from every source.$" .string "hints from every source.$"
gUnknown_81C5AEB:: gNewGameAdventureIntro2::
.string "New paths will open to you by helping\n" .string "New paths will open to you by helping\n"
.string "people in need, overcoming challenges,\n" .string "people in need, overcoming challenges,\n"
.string "and solving mysteries.\n" .string "and solving mysteries.\n"
@@ -607,7 +607,7 @@ gUnknown_81C5AEB::
.string "others and attacked by wild creatures.\n" .string "others and attacked by wild creatures.\n"
.string "Be brave and keep pushing on.$" .string "Be brave and keep pushing on.$"
gUnknown_81C5BB9:: gNewGameAdventureIntro3::
.string "Through your adventure, we hope\n" .string "Through your adventure, we hope\n"
.string "that you will interact with all sorts\n" .string "that you will interact with all sorts\n"
.string "of people and achieve personal growth.\n" .string "of people and achieve personal growth.\n"
@@ -616,49 +616,49 @@ gUnknown_81C5BB9::
.string "Press the A Button, and let your\n" .string "Press the A Button, and let your\n"
.string "adventure begin!$" .string "adventure begin!$"
gUnknown_81C5C78:: @ 81C5C78 gOakText_WelcomeToTheWorld:: @ 81C5C78
.string "Hello, there!\n" .string "Hello, there!\n"
.string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n" .string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n"
.string "as the POKéMON PROFESSOR.\p$" .string "as the POKéMON PROFESSOR.\p$"
gUnknown_81C5D06:: @ 81C5D06 gOakText_WorldInhabited1:: @ 81C5D06
.string "This world…$" .string "This world…$"
gUnknown_81C5D12:: @ 81C5D12 gOakText_WorldInhabited2:: @ 81C5D12
.string "…is inhabited far and wide by\n" .string "…is inhabited far and wide by\n"
.string "creatures called POKéMON.\p$" .string "creatures called POKéMON.\p$"
gUnknown_81C5D4B:: @ 81C5D4B gOakText_PetsBattlingStudy:: @ 81C5D4B
.string "For some people, POKéMON are pets.\n" .string "For some people, POKéMON are pets.\n"
.string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$" .string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$"
gUnknown_81C5DBD:: @ 81C5DBD gOakText_TellMeALittleAboutYourself:: @ 81C5DBD
.string "But first, tell me a little about\n" .string "But first, tell me a little about\n"
.string "yourself.\p$" .string "yourself.\p$"
gUnknown_81C5DEA:: @ 81C5DEA gOakText_AskPlayerName:: @ 81C5DEA
.string "Let’s begin with your name.\n" .string "Let’s begin with your name.\n"
.string "What is it?\p$" .string "What is it?\p$"
gUnknown_81C5E13:: @ 81C5E13 gOakText_FinalizePlayerName:: @ 81C5E13
.string "Right…\n" .string "Right…\n"
.string "So your name is {PLAYER}.$" .string "So your name is {PLAYER}.$"
gUnknown_81C5E2E:: @ 81C5E2E gOakText_IntroduceRival:: @ 81C5E2E
.string "This is my grandson.\pHe’s been your rival since you both\n" .string "This is my grandson.\pHe’s been your rival since you both\n"
.string "were babies.\p…Erm, what was his name now?$" .string "were babies.\p…Erm, what was his name now?$"
gUnknown_81C5E91:: @ 81C5E91 gOakText_AskRivalName:: @ 81C5E91
.string "Your rival’s name, what was it now?$" .string "Your rival’s name, what was it now?$"
gUnknown_81C5EB5:: @ 81C5EB5 gOakText_ConfirmRivalName:: @ 81C5EB5
.string "…Er, was it {RIVAL}?$" .string "…Er, was it {RIVAL}?$"
gUnknown_81C5EC5:: @ 81C5EC5 gOakText_RememberRivalName:: @ 81C5EC5
.string "That’s right! I remember now!\n" .string "That’s right! I remember now!\n"
.string "His name is {RIVAL}!\p$" .string "His name is {RIVAL}!\p$"
gUnknown_81C5EF4:: @ 81C5EF4 gOakText_LegendAboutToUnfold:: @ 81C5EF4
.string "{PLAYER}!\pYour very own POKéMON legend is\n" .string "{PLAYER}!\pYour very own POKéMON legend is\n"
.string "about to unfold!\pA world of dreams and adventures\n" .string "about to unfold!\pA world of dreams and adventures\n"
.string "with POKéMON awaits! Let’s go!$" .string "with POKéMON awaits! Let’s go!$"
data/oak_speech/unk_8462A10.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 341 B

data/oak_speech/unk_8462B74.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 350 B

After

Width:  |  Height:  |  Size: 414 B

data/oak_speech/unk_8462D34.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 297 B

data/oak_speech/unk_8462E18.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 B

After

Width:  |  Height:  |  Size: 187 B

include/event_scripts.h
+66 -66
View File
@@ -705,71 +705,71 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[]; extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[]; extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
extern const u8 gUnknown_81C574F[]; extern const u8 gOtherText_NewName[];
extern const u8 gUnknown_81C5758[]; extern const u8 gNameChoice_Green[];
extern const u8 gUnknown_81C575E[]; extern const u8 gNameChoice_Red[];
extern const u8 gUnknown_81C575E[]; extern const u8 gNameChoice_Red[];
extern const u8 gUnknown_81C5767[]; extern const u8 gNameChoice_Fire[];
extern const u8 gUnknown_81C5767[]; extern const u8 gNameChoice_Fire[];
extern const u8 gUnknown_81C576C[]; extern const u8 gNameChoice_Gary[];
extern const u8 gUnknown_81C5771[]; extern const u8 gNameChoice_Kaz[];
extern const u8 gUnknown_81C5775[]; extern const u8 gNameChoice_Toru[];
extern const u8 gUnknown_81C577A[]; extern const u8 gNameChoice_Ash[];
extern const u8 gUnknown_81C577E[]; extern const u8 gNameChoice_Kene[];
extern const u8 gUnknown_81C5783[]; extern const u8 gNameChoice_Geki[];
extern const u8 gUnknown_81C5788[]; extern const u8 gNameChoice_Jak[];
extern const u8 gUnknown_81C578C[]; extern const u8 gNameChoice_Janne[];
extern const u8 gUnknown_81C5792[]; extern const u8 gNameChoice_Jonn[];
extern const u8 gUnknown_81C5797[]; extern const u8 gNameChoice_Kamon[];
extern const u8 gUnknown_81C579D[]; extern const u8 gNameChoice_Karl[];
extern const u8 gUnknown_81C57A2[]; extern const u8 gNameChoice_Taylor[];
extern const u8 gUnknown_81C57A9[]; extern const u8 gNameChoice_Oscar[];
extern const u8 gUnknown_81C57AF[]; extern const u8 gNameChoice_Hiro[];
extern const u8 gUnknown_81C57B4[]; extern const u8 gNameChoice_Max[];
extern const u8 gUnknown_81C57B8[]; extern const u8 gNameChoice_Jon[];
extern const u8 gUnknown_81C57BC[]; extern const u8 gNameChoice_Ralph[];
extern const u8 gUnknown_81C57C2[]; extern const u8 gNameChoice_Kay[];
extern const u8 gUnknown_81C57C6[]; extern const u8 gNameChoice_Tosh[];
extern const u8 gUnknown_81C57CB[]; extern const u8 gNameChoice_Roak[];
extern const u8 gUnknown_81C57D0[]; extern const u8 gNameChoice_Omi[];
extern const u8 gUnknown_81C57D4[]; extern const u8 gNameChoice_Jodi[];
extern const u8 gUnknown_81C57D9[]; extern const u8 gNameChoice_Amanda[];
extern const u8 gUnknown_81C57E0[]; extern const u8 gNameChoice_Hillary[];
extern const u8 gUnknown_81C57E8[]; extern const u8 gNameChoice_Makey[];
extern const u8 gUnknown_81C57EE[]; extern const u8 gNameChoice_Michi[];
extern const u8 gUnknown_81C57F4[]; extern const u8 gNameChoice_Paula[];
extern const u8 gUnknown_81C57FA[]; extern const u8 gNameChoice_June[];
extern const u8 gUnknown_81C57FF[]; extern const u8 gNameChoice_Cassie[];
extern const u8 gUnknown_81C5806[]; extern const u8 gNameChoice_Rey[];
extern const u8 gUnknown_81C580A[]; extern const u8 gNameChoice_Seda[];
extern const u8 gUnknown_81C580F[]; extern const u8 gNameChoice_Kiko[];
extern const u8 gUnknown_81C5814[]; extern const u8 gNameChoice_Mina[];
extern const u8 gUnknown_81C5819[]; extern const u8 gNameChoice_Norie[];
extern const u8 gUnknown_81C581F[]; extern const u8 gNameChoice_Sai[];
extern const u8 gUnknown_81C5823[]; extern const u8 gNameChoice_Momo[];
extern const u8 gUnknown_81C5828[]; extern const u8 gNameChoice_Suzi[];
extern const u8 gUnknown_81C582D[]; extern const u8 gNewGame_HelpDocs1[];
extern const u8 gUnknown_81C5875[]; extern const u8 gNewGame_HelpDocs2[];
extern const u8 gUnknown_81C58BA[]; extern const u8 gNewGame_HelpDocs3[];
extern const u8 gUnknown_81C58F9[]; extern const u8 gNewGame_HelpDocs4[];
extern const u8 gUnknown_81C592B[]; extern const u8 gNewGame_HelpDocs5[];
extern const u8 gUnknown_81C594F[]; extern const u8 gNewGame_HelpDocs6[];
extern const u8 gUnknown_81C5981[]; extern const u8 gNewGame_HelpDocs7[];
extern const u8 gUnknown_81C59D5[]; extern const u8 gOakText_AskPlayerGender[];
extern const u8 gUnknown_81C5A04[]; extern const u8 gNewGameAdventureIntro1[];
extern const u8 gUnknown_81C5AEB[]; extern const u8 gNewGameAdventureIntro2[];
extern const u8 gUnknown_81C5BB9[]; extern const u8 gNewGameAdventureIntro3[];
extern const u8 gUnknown_81C5C78[]; extern const u8 gOakText_WelcomeToTheWorld[];
extern const u8 gUnknown_81C5D06[]; extern const u8 gOakText_WorldInhabited1[];
extern const u8 gUnknown_81C5D12[]; extern const u8 gOakText_WorldInhabited2[];
extern const u8 gUnknown_81C5D4B[]; extern const u8 gOakText_PetsBattlingStudy[];
extern const u8 gUnknown_81C5DBD[]; extern const u8 gOakText_TellMeALittleAboutYourself[];
extern const u8 gUnknown_81C5DEA[]; extern const u8 gOakText_AskPlayerName[];
extern const u8 gUnknown_81C5E13[]; extern const u8 gOakText_FinalizePlayerName[];
extern const u8 gUnknown_81C5E2E[]; extern const u8 gOakText_IntroduceRival[];
extern const u8 gUnknown_81C5E91[]; extern const u8 gOakText_AskRivalName[];
extern const u8 gUnknown_81C5EB5[]; extern const u8 gOakText_ConfirmRivalName[];
extern const u8 gUnknown_81C5EC5[]; extern const u8 gOakText_RememberRivalName[];
extern const u8 gUnknown_81C5EF4[]; extern const u8 gOakText_LegendAboutToUnfold[];
#endif //GUARD_EVENT_SCRIPTS_H #endif //GUARD_EVENT_SCRIPTS_H
include/help_system.h
+1 -1
View File
@@ -6,6 +6,6 @@
extern bool8 gUnknown_3005ECC; extern bool8 gUnknown_3005ECC;
void sub_812B484(void); void sub_812B484(void);
void sub_812B1F0(u8); void HelpSystem_SetSomeVariable2(u8);
#endif //GUARD_HELP_SYSTEM_H #endif //GUARD_HELP_SYSTEM_H
include/menu.h
+7 -4
View File
@@ -38,12 +38,15 @@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSp
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
void sub_810F4D8(u8 windowId, bool32 someBool); void sub_810F4D8(u8 windowId, bool32 someBool);
void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void sub_810F558(u8, u8, u8, u8, u16); void CreateWindow_SnapRight_StdPal(u8, u8, u8, u8, u16);
void sub_810F650(const u8 *, const u8 *, u8, u32, u8); void Menu_PrintHelpSystemUIHeader(const u8 *, const u8 *, u8, u32, u8);
void sub_810F5E8(const u8 *, u32, u8); void PrintTextOnRightSnappedWindow(const u8 *, u32, u8);
void sub_810F71C(void); void sub_810F71C(void);
void sub_810F740(void); void sub_810F740(void);
void sub_810F7D8(u8, u8, u8, u8, u8, u8, u8); u8 ProgramAndPlaceMenuCursorOnWindow(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPosition);
void sub_810FF60(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8); void sub_810FF60(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8);
void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority);
bool8 IsBlendTaskActive(void);
#endif // GUARD_MENU_H #endif // GUARD_MENU_H
include/new_menu_helpers.h
+7 -7
View File
@@ -15,18 +15,18 @@ void sub_8197434(u8 a0, u8 a1);
void SetStandardWindowBorderStyle(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1);
void sub_8197930(void); void sub_8197930(void);
u8 GetPlayerTextSpeed(void); u8 GetPlayerTextSpeed(void);
void sub_80F6F54(u8, u8); void ClearDialogWindowAndFrame(u8, u8);
u8 sub_80F78A8(void); u8 GetTextSpeedSetting(void);
void sub_80F6E9C(void); void sub_80F6E9C(void);
void sub_80F6EE4(u8 windowId, bool8 transfer); void DrawDialogueFrame(u8 windowId, bool8 transfer);
void sub_80F7974(const u8 *); void sub_80F7974(const u8 *);
u8 GetStartMenuWindowId(void); u8 GetStartMenuWindowId(void);
void sub_80F7998(void); void sub_80F7998(void);
void sub_80F69E8(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void sub_80F69E8(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void sub_80F6F1C(u8 windowId, bool8 copyNow); void DrawStdWindowFrame(u8 windowId, bool8 copyNow);
void sub_80F6C6C(void); void InitStandardTextBoxWindows(void);
void sub_80F6C98(void); void ResetBg0(void);
void sub_80F77CC(u16); void Menu_LoadStdPalAt(u16);
void * malloc_and_decompress(const void * src, u32 * size); void * malloc_and_decompress(const void * src, u32 * size);
u16 sub_80F796C(void); u16 sub_80F796C(void);
include/oak_speech.h
+1 -2
View File
@@ -1,7 +1,6 @@
#ifndef GUARD_OAK_SPEECH_H #ifndef GUARD_OAK_SPEECH_H
#define GUARD_OAK_SPEECH_H #define GUARD_OAK_SPEECH_H
void OakSpeech_StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority); void StartNewGameScene(void);
bool8 OakSpeech_IsBlendTaskActive(void);
#endif //GUARD_OAK_SPEECH_H #endif //GUARD_OAK_SPEECH_H
include/pokemon_3.h
+1 -1
View File
@@ -5,7 +5,7 @@
const u8* GetTrainerClassNameFromId(u16 trainerId); const u8* GetTrainerClassNameFromId(u16 trainerId);
const u8* GetTrainerNameFromId(u16 trainerId); const u8* GetTrainerNameFromId(u16 trainerId);
void sub_8044AF0(u8, u8); void * SetUpMonSpriteManagerMaybe(u8, u8);
void sub_8044D80(void); void sub_8044D80(void);
void * sub_8044E00(u8 buffId); void * sub_8044E00(u8 buffId);
include/text.h
+1 -1
View File
@@ -250,7 +250,7 @@ s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese); s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese); s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese);
void sub_80062B0(struct Sprite *sprite); void sub_80062B0(struct Sprite *sprite);
u8 sub_8006300(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority); u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority);
void sub_8006398(u8 spriteId); void sub_8006398(u8 spriteId);
#endif // GUARD_TEXT_H #endif // GUARD_TEXT_H
src/fame_checker.c
+3 -3
View File
@@ -779,7 +779,7 @@ static void GetPickModeText(void)
if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE) if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE)
offset = NUM_FAMECHECKER_PERSONS; offset = NUM_FAMECHECKER_PERSONS;
StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + offset]); StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + offset]);
AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
} }
} }
@@ -790,7 +790,7 @@ static void PrintSelectedNameInBrightGreen(u8 taskId)
u16 cursorPos = FameCheckerGetCursorY(); u16 cursorPos = FameCheckerGetCursorY();
FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20); FillWindowPixelRect(FCWINDOWID_MSGBOX, 0x11, 0, 0, 0xd0, 0x20);
StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]); StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]);
AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, sub_80F78A8(), NULL, 2, 1, 3); AddTextPrinterParametrized(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
} }
@@ -803,7 +803,7 @@ static void WipeMsgBoxAndTransfer(void)
static void Setup_DrawMsgAndListBoxes(void) static void Setup_DrawMsgAndListBoxes(void)
{ {
sub_80F6E9C(); sub_80F6E9C();
sub_80F6EE4(FCWINDOWID_MSGBOX, TRUE); DrawDialogueFrame(FCWINDOWID_MSGBOX, TRUE);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_LIST); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_LIST);
} }
src/menu2.c
+2 -2
View File
@@ -768,7 +768,7 @@ void sub_819A080(void * a0, void * a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u
#define tEvWhich data[6] #define tEvWhich data[6]
#define tEvStepCount data[8] #define tEvStepCount data[8]
void OakSpeech_StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority) void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority)
{ {
u8 taskId = CreateTask(Task_SmoothBlendLayers, priority); u8 taskId = CreateTask(Task_SmoothBlendLayers, priority);
gTasks[taskId].tEvA = eva_start << 8; gTasks[taskId].tEvA = eva_start << 8;
@@ -781,7 +781,7 @@ void OakSpeech_StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end
SetGpuReg(REG_OFFSET_BLDALPHA, (evb_start << 8) | eva_start); SetGpuReg(REG_OFFSET_BLDALPHA, (evb_start << 8) | eva_start);
} }
bool8 OakSpeech_IsBlendTaskActive(void) bool8 IsBlendTaskActive(void)
{ {
return FuncIsActiveTask(Task_SmoothBlendLayers); return FuncIsActiveTask(Task_SmoothBlendLayers);
} }
src/mevent_8145654.c
+2 -2
View File
@@ -58,7 +58,7 @@ void sub_8145D18(u8 whichWindow);
void sub_8146060(void); void sub_8146060(void);
void sub_81461D8(void); void sub_81461D8(void);
extern const struct OamData gUnknown_83AC9F8; extern const struct OamData gOamData_83AC9F8;
const struct TextColor gUnknown_8467068[] = { const struct TextColor gUnknown_8467068[] = {
{0, 2, 3}, {0, 2, 3},
@@ -113,7 +113,7 @@ const struct SpritePalette gUnknown_8467F60[] = {
{gUnknown_8467ED4, 0x8000} {gUnknown_8467ED4, 0x8000}
}; };
const struct SpriteTemplate gUnknown_8467FA0 = { const struct SpriteTemplate gUnknown_8467FA0 = {
0x8000, 0x8000, &gUnknown_83AC9F8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy 0x8000, 0x8000, &gOamData_83AC9F8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
}; };
const struct UnkStruct_8467FB8 gUnknown_8467FB8[8] = { const struct UnkStruct_8467FB8 gUnknown_8467FB8[8] = {
{1, 0, 0, 0, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C}, {1, 0, 0, 0, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C},
src/oak_speech.c
+436 -439
View File
File diff suppressed because it is too large Load Diff
src/scrcmd.c
+1 -1
View File
@@ -1567,7 +1567,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
ptr = (u8 *)ctx->data[0]; ptr = (u8 *)ctx->data[0];
sub_80F6E9C(); sub_80F6E9C();
sub_80F6EE4(0, 1); DrawDialogueFrame(0, 1);
AddTextPrinterParameterized(0, 6, ptr, 0, 1, 0, NULL); AddTextPrinterParameterized(0, 6, ptr, 0, 1, 0, NULL);
return FALSE; return FALSE;
} }
src/text.c
+1 -1
View File
@@ -1791,7 +1791,7 @@ void sub_80062B0(struct Sprite *sprite)
} }
} }
u8 sub_8006300(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority) u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority)
{ {
u8 spriteId; u8 spriteId;
LoadSpriteSheet(&gUnknown_81EA68C[sheetId & 1]); LoadSpriteSheet(&gUnknown_81EA68C[sheetId & 1]);
src/trainer_tower.c
+1 -1
View File
@@ -1336,7 +1336,7 @@ void sub_815E720(void)
sub_815EC0C(); sub_815EC0C();
windowId = AddWindow(gUnknown_847A218); windowId = AddWindow(gUnknown_847A218);
sub_80F6E9C(); sub_80F6E9C();
sub_80F6F1C(windowId, FALSE); DrawStdWindowFrame(windowId, FALSE);
AddTextPrinterParameterized(windowId, 2, gUnknown_83FE982, 0x4A, 0, 0xFF, NULL); AddTextPrinterParameterized(windowId, 2, gUnknown_83FE982, 0x4A, 0, 0xFF, NULL);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
src/vs_seeker.c
+1 -1
View File
@@ -663,7 +663,7 @@ static void Task_VsSeeker_3(u8 taskId)
{ {
if (sVsSeeker->responseCode == 2) if (sVsSeeker->responseCode == 2)
StartAllRespondantIdleMovements(); StartAllRespondantIdleMovements();
sub_80F6F54(0, 1); ClearDialogWindowAndFrame(0, 1);
sub_80696C0(); sub_80696C0();
ScriptContext2_Disable(); ScriptContext2_Disable();
DestroyTask(taskId); DestroyTask(taskId);