mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-09-28 16:54:29 +02:00
Clean up files and add entries to charmap
This commit is contained in:
Diegoisawesome
parent
731d6d59bc
commit
156fb472e1
|
|
@ -6481,7 +6481,7 @@ _0819218E:
|
|||
mov r0, r9
|
||||
cmp r0, 0
|
||||
bne _081921C4
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
b _081921FC
|
||||
.pool
|
||||
|
|
@ -9539,7 +9539,7 @@ _08193B84:
|
|||
ldr r0, [r4]
|
||||
bl Free
|
||||
str r6, [r4]
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
ldr r1, =gTasks
|
||||
lsls r0, r5, 2
|
||||
|
|
@ -11320,7 +11320,7 @@ _08194B24:
|
|||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _08194B3C
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
adds r0, r4, 0
|
||||
bl DestroyTask
|
||||
|
|
|
|||
|
|
@ -1321,7 +1321,7 @@ _0819AFB8:
|
|||
bl Free
|
||||
str r5, [r7]
|
||||
bl FreeAllWindowBuffers
|
||||
ldr r0, =sub_80861B0
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
bl SetMainCallback2
|
||||
adds r0, r6, 0
|
||||
bl DestroyTask
|
||||
|
|
@ -4491,7 +4491,7 @@ _0819CAA4:
|
|||
bl Free
|
||||
str r5, [r7]
|
||||
bl FreeAllWindowBuffers
|
||||
ldr r0, =sub_80861B0
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
bl SetMainCallback2
|
||||
adds r0, r6, 0
|
||||
bl DestroyTask
|
||||
|
|
|
|||
|
|
@ -3172,7 +3172,7 @@ _08163A3C:
|
|||
_08163A74:
|
||||
bl sub_816537C
|
||||
_08163A78:
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
|
|
|
|||
|
|
@ -2586,7 +2586,7 @@ sp02A_crash_sound: @ 80B39BC
|
|||
push {lr}
|
||||
ldr r0, =gSpecialVar_0x8006
|
||||
ldrb r0, [r0]
|
||||
ldr r1, =CB2_ReturnToFieldContinueScript
|
||||
ldr r1, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl sub_80C4E74
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
|
|||
|
|
@ -1825,7 +1825,7 @@ _080F6884:
|
|||
adds r0, r5, 0
|
||||
bl DestroyTask
|
||||
bl FreeAllWindowBuffers
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
bl sub_80F7E64
|
||||
_080F68A8:
|
||||
|
|
|
|||
|
|
@ -623,7 +623,7 @@ _0811A7C2:
|
|||
bl overworld_free_bg_tilemaps
|
||||
ldr r0, =gSpecialVar_0x8004
|
||||
ldrb r0, [r0]
|
||||
ldr r2, =sub_80861B0
|
||||
ldr r2, =CB2_ReturnToFieldContinueScript
|
||||
adds r1, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_811A20C
|
||||
|
|
@ -760,7 +760,7 @@ sub_811A8CC: @ 811A8CC
|
|||
ldr r1, [r0]
|
||||
ldr r0, =0x00003b6e
|
||||
adds r1, r0
|
||||
ldr r2, =sub_80861B0
|
||||
ldr r2, =CB2_ReturnToFieldContinueScript
|
||||
movs r0, 0xF
|
||||
movs r3, 0x3
|
||||
bl sub_811A20C
|
||||
|
|
@ -776,7 +776,7 @@ sub_811A8F0: @ 811A8F0
|
|||
ldr r1, [r0]
|
||||
ldr r0, =0x00003b5a
|
||||
adds r1, r0
|
||||
ldr r2, =sub_80861B0
|
||||
ldr r2, =CB2_ReturnToFieldContinueScript
|
||||
movs r0, 0x10
|
||||
movs r3, 0x3
|
||||
bl sub_811A20C
|
||||
|
|
@ -792,7 +792,7 @@ sub_811A914: @ 811A914
|
|||
ldr r1, [r0]
|
||||
ldr r0, =0x00003b6c
|
||||
adds r1, r0
|
||||
ldr r2, =sub_80861B0
|
||||
ldr r2, =CB2_ReturnToFieldContinueScript
|
||||
movs r0, 0x12
|
||||
movs r3, 0x3
|
||||
bl sub_811A20C
|
||||
|
|
@ -808,7 +808,7 @@ sub_811A938: @ 811A938
|
|||
ldr r1, [r0]
|
||||
ldr r0, =0x00003b5a
|
||||
adds r1, r0
|
||||
ldr r2, =sub_80861B0
|
||||
ldr r2, =CB2_ReturnToFieldContinueScript
|
||||
movs r0, 0x11
|
||||
movs r3, 0x3
|
||||
bl sub_811A20C
|
||||
|
|
@ -3691,7 +3691,7 @@ sub_811BDF0: @ 811BDF0
|
|||
adds r6, r0, 0
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r4, [r0]
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
ldr r0, =0x00003b70
|
||||
adds r5, r4, r0
|
||||
adds r0, r5, 0
|
||||
|
|
@ -3707,17 +3707,17 @@ sub_811BDF0: @ 811BDF0
|
|||
bl TVShowConvertInternationalString
|
||||
movs r0, 0
|
||||
mov r1, sp
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
b _0811BE3C
|
||||
.pool
|
||||
_0811BE34:
|
||||
ldr r1, =gText_Lady
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
_0811BE3C:
|
||||
ldr r1, =gText_F700sQuiz
|
||||
adds r0, r6, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
add sp, 0x20
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
|
|
|
|||
|
|
@ -1906,7 +1906,7 @@ _08138C7E:
|
|||
thumb_func_start CB2_FieldShowRegionMap
|
||||
CB2_FieldShowRegionMap: @ 8138C84
|
||||
push {lr}
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl sub_817018C
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
@ -7153,14 +7153,14 @@ sub_813B7D8: @ 813B7D8
|
|||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0813B7F8
|
||||
ldr r2, =CB2_ReturnToFieldContinueScript
|
||||
ldr r2, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl DoRayquazaScene
|
||||
b _0813B802
|
||||
.pool
|
||||
_0813B7F8:
|
||||
ldr r2, =CB2_ReturnToFieldContinueScript
|
||||
ldr r2, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl DoRayquazaScene
|
||||
|
|
|
|||
|
|
@ -16021,7 +16021,7 @@ sub_81B892C: @ 81B892C
|
|||
str r0, [sp]
|
||||
ldr r0, =sub_81B1370
|
||||
str r0, [sp, 0x4]
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
|
|
@ -16042,7 +16042,7 @@ sub_81B8958: @ 81B8958
|
|||
str r0, [sp]
|
||||
ldr r0, =sub_81B1370
|
||||
str r0, [sp, 0x4]
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
str r0, [sp, 0x8]
|
||||
movs r0, 0xB
|
||||
movs r1, 0
|
||||
|
|
|
|||
|
|
@ -6737,7 +6737,7 @@ sub_80CAC58: @ 80CAC58
|
|||
sub sp, 0xC
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
ldr r1, =gUnknown_0857276C
|
||||
lsls r0, r6, 3
|
||||
adds r0, r1
|
||||
|
|
@ -6774,7 +6774,7 @@ _080CACB8:
|
|||
adds r1, r2
|
||||
_080CACC0:
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
b _080CAD30
|
||||
.pool
|
||||
_080CACD0:
|
||||
|
|
@ -6817,7 +6817,7 @@ _080CAD16:
|
|||
ldr r0, =0x000021eb
|
||||
adds r1, r0
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
_080CAD30:
|
||||
ldr r5, =gUnknown_02039D08
|
||||
ldr r0, [r5]
|
||||
|
|
@ -6827,7 +6827,7 @@ _080CAD30:
|
|||
lsls r1, r6, 3
|
||||
adds r1, r2
|
||||
ldr r1, [r1]
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
movs r0, 0x1
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
|
|
|
|||
|
|
@ -212,17 +212,17 @@ _081C3FEC:
|
|||
movs r2, 0x1
|
||||
movs r3, 0x2
|
||||
bl ConvertIntToDecimalStringN
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
movs r0, 0
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r4, =gStringVar4
|
||||
ldr r1, =gUnknown_0861CE97
|
||||
adds r0, r4, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
movs r0, 0x1
|
||||
adds r1, r4, 0
|
||||
movs r2, 0x2C
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ sub_81C72BC: @ 81C72BC
|
|||
str r0, [r4]
|
||||
cmp r0, 0
|
||||
bne _081C72F0
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
b _081C7320
|
||||
.pool
|
||||
|
|
@ -351,7 +351,7 @@ _081C752C:
|
|||
bl sub_81C7334
|
||||
cmp r4, 0
|
||||
beq _081C755C
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
b _081C7562
|
||||
.pool
|
||||
|
|
@ -16941,17 +16941,17 @@ sub_81CF7F4: @ 81CF7F4
|
|||
mov r8, r0
|
||||
bl sub_81CF0F0
|
||||
adds r7, r0, 0
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
ldr r4, =gStringVar1
|
||||
movs r0, 0
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r0, 0xFF
|
||||
strb r0, [r4]
|
||||
ldr r5, =gStringVar2
|
||||
ldr r1, =gText_NumberF700
|
||||
adds r0, r5, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
mov r1, r8
|
||||
ldrb r0, [r1, 0x8]
|
||||
movs r1, 0x1
|
||||
|
|
@ -19854,14 +19854,14 @@ sub_81D0E84: @ 81D0E84
|
|||
movs r2, 0
|
||||
movs r3, 0x2
|
||||
bl ConvertIntToDecimalStringN
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
movs r0, 0
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r4, =gStringVar4
|
||||
ldr r1, =gText_RibbonsF700
|
||||
adds r0, r4, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
ldrb r0, [r5, 0xA]
|
||||
movs r1, 0x44
|
||||
bl FillWindowPixelBuffer
|
||||
|
|
|
|||
|
|
@ -10246,14 +10246,14 @@ _08017F8A:
|
|||
lsls r0, r4, 24
|
||||
lsrs r0, 24
|
||||
adds r1, r5, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
adds r5, 0x10
|
||||
adds r4, 0x1
|
||||
cmp r4, 0x3
|
||||
ble _08017F8A
|
||||
ldr r1, =gUnknown_082EE47C
|
||||
adds r0, r7, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
b _08017FB4
|
||||
.pool
|
||||
_08017FAC:
|
||||
|
|
@ -10618,7 +10618,7 @@ sub_8018220: @ 8018220
|
|||
ldr r0, =gTrainerCards
|
||||
adds r1, r0
|
||||
mov r8, r1
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
mov r6, r9
|
||||
adds r6, 0xC0
|
||||
bl sub_8068BB0
|
||||
|
|
@ -10632,11 +10632,11 @@ sub_8018220: @ 8018220
|
|||
bl StringCopy
|
||||
movs r0, 0
|
||||
adds r1, r6, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
mov r1, r8
|
||||
adds r1, 0x30
|
||||
movs r0, 0x1
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r4, 0xBA
|
||||
lsls r4, 1
|
||||
add r4, r9
|
||||
|
|
@ -10650,7 +10650,7 @@ sub_8018220: @ 8018220
|
|||
bl StringCopy
|
||||
movs r0, 0x2
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
mov r5, r9
|
||||
adds r5, 0xDE
|
||||
mov r0, r8
|
||||
|
|
@ -10661,7 +10661,7 @@ sub_8018220: @ 8018220
|
|||
bl ConvertIntToDecimalStringN
|
||||
movs r0, 0x3
|
||||
adds r1, r5, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r2, 0xED
|
||||
add r2, r9
|
||||
mov r10, r2
|
||||
|
|
@ -10681,16 +10681,16 @@ sub_8018220: @ 8018220
|
|||
bl ConvertIntToDecimalStringN
|
||||
movs r0, 0x4
|
||||
mov r1, r10
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r0, 0x5
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r4, 0xD2
|
||||
lsls r4, 1
|
||||
add r4, r9
|
||||
ldr r1, =gUnknown_082EFF64
|
||||
adds r0, r4, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
ldr r0, =gStringVar4
|
||||
adds r1, r4, 0
|
||||
bl StringCopy
|
||||
|
|
@ -10707,7 +10707,7 @@ _0801830C:
|
|||
bl ConvertIntToDecimalStringN
|
||||
movs r0, 0
|
||||
adds r1, r6, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
mov r2, r8
|
||||
ldrh r1, [r2, 0x16]
|
||||
cmp r1, r4
|
||||
|
|
@ -10722,7 +10722,7 @@ _08018328:
|
|||
bl ConvertIntToDecimalStringN
|
||||
movs r0, 0x2
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
mov r0, r8
|
||||
ldrh r1, [r0, 0x20]
|
||||
adds r0, r5, 0
|
||||
|
|
@ -10731,7 +10731,7 @@ _08018328:
|
|||
bl ConvertIntToDecimalStringN
|
||||
movs r0, 0x3
|
||||
adds r1, r5, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r7, 0
|
||||
movs r6, 0x80
|
||||
lsls r6, 19
|
||||
|
|
@ -10744,7 +10744,7 @@ _08018360:
|
|||
bl CopyEasyChatWord
|
||||
lsrs r0, r6, 24
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r2, 0x80
|
||||
lsls r2, 17
|
||||
adds r6, r2
|
||||
|
|
@ -10758,7 +10758,7 @@ _08018360:
|
|||
add r4, r9
|
||||
ldr r1, =gUnknown_082EFFA4
|
||||
adds r0, r4, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
ldr r5, =gStringVar4
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
|
|
@ -10768,7 +10768,7 @@ _08018360:
|
|||
bne _080183D0
|
||||
ldr r1, =gUnknown_082F0020
|
||||
adds r0, r4, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl StringAppend
|
||||
|
|
@ -10785,7 +10785,7 @@ _080183D0:
|
|||
adds r1, r0
|
||||
ldr r1, [r1]
|
||||
adds r0, r4, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl StringAppend
|
||||
|
|
@ -14898,7 +14898,7 @@ sub_801A43C: @ 801A43C
|
|||
bl LoadPalette
|
||||
movs r0, 0xF0
|
||||
bl sub_81978B0
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
movs r0, 0x20
|
||||
str r0, [sp]
|
||||
str r0, [sp, 0x4]
|
||||
|
|
@ -14941,7 +14941,7 @@ _0801A58C:
|
|||
ldr r0, =gUnknown_03000DAC
|
||||
ldr r0, [r0]
|
||||
bl Free
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
|
@ -24175,10 +24175,10 @@ _0801F020:
|
|||
ldrb r1, [r4, 0x8]
|
||||
cmp r0, r1
|
||||
beq _0801F0A8
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
movs r0, 0
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r1, =gText_F700JoinedChat
|
||||
b _0801F094
|
||||
.pool
|
||||
|
|
@ -24215,14 +24215,14 @@ _0801F07A:
|
|||
ldrb r5, [r5]
|
||||
cmp r0, r5
|
||||
beq _0801F0A8
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
movs r0, 0
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r1, =gText_F700LeftChat
|
||||
_0801F094:
|
||||
adds r0, r6, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
movs r0, 0x1
|
||||
b _0801F0AA
|
||||
.pool
|
||||
|
|
@ -25695,11 +25695,11 @@ sub_801FBF8: @ 801FBF8
|
|||
beq _0801FC38
|
||||
b _0801FC42
|
||||
_0801FC08:
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
bl sub_801F1D0
|
||||
adds r1, r0, 0
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r0, 0x5
|
||||
movs r1, 0
|
||||
bl sub_801FF18
|
||||
|
|
@ -25856,11 +25856,11 @@ sub_801FD30: @ 801FD30
|
|||
beq _0801FD74
|
||||
b _0801FD7E
|
||||
_0801FD40:
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
ldr r0, =gSaveBlock2Ptr
|
||||
ldr r1, [r0]
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
movs r0, 0x9
|
||||
movs r1, 0
|
||||
bl sub_801FF18
|
||||
|
|
@ -26164,7 +26164,7 @@ _0801FF98:
|
|||
adds r0, r1, 0
|
||||
adds r0, 0x22
|
||||
ldr r1, [r4]
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
ldr r0, [r5]
|
||||
adds r6, r0, 0
|
||||
adds r6, 0x22
|
||||
|
|
@ -29443,7 +29443,7 @@ _08021A92:
|
|||
lsls r4, 2
|
||||
str r4, [sp, 0x24]
|
||||
_08021A98:
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
ldr r0, [sp, 0x10]
|
||||
cmp r0, 0x1
|
||||
beq _08021B48
|
||||
|
|
@ -29702,10 +29702,10 @@ _08021CC8:
|
|||
ldr r0, [sp, 0xC]
|
||||
adds r1, r0, r1
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r0, =gStringVar4
|
||||
adds r1, r4, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
ldr r1, [sp, 0xC]
|
||||
movs r2, 0xDD
|
||||
lsls r2, 1
|
||||
|
|
@ -45753,7 +45753,7 @@ _08029DA0:
|
|||
movs r1, 0x1
|
||||
adds r2, r5, 0
|
||||
bl PrintTextOnWindow
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
bl sub_802762C
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
|
|
@ -45762,11 +45762,11 @@ _08029DA0:
|
|||
bl CopyItemName
|
||||
movs r0, 0
|
||||
adds r1, r5, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r7, =gStringVar4
|
||||
ldr r1, =gText_FirstPlacePrize
|
||||
adds r0, r7, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
ldr r0, [r4]
|
||||
add r0, r10
|
||||
ldrb r0, [r0]
|
||||
|
|
@ -45787,7 +45787,7 @@ _08029DA0:
|
|||
beq _08029EC8
|
||||
cmp r4, 0x3
|
||||
beq _08029EC8
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
bl sub_802762C
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
|
|
@ -45795,12 +45795,12 @@ _08029DA0:
|
|||
bl CopyItemName
|
||||
movs r0, 0
|
||||
adds r1, r5, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
cmp r4, 0x2
|
||||
bne _08029E9C
|
||||
ldr r1, =gText_CantHoldAnyMore
|
||||
adds r0, r7, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
b _08029EA8
|
||||
.pool
|
||||
_08029E9C:
|
||||
|
|
@ -45808,7 +45808,7 @@ _08029E9C:
|
|||
bne _08029EA8
|
||||
ldr r1, =gText_FilledStorageSpace
|
||||
adds r0, r7, 0
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
_08029EA8:
|
||||
ldr r0, =gUnknown_02022CF8
|
||||
ldr r0, [r0]
|
||||
|
|
@ -52968,19 +52968,19 @@ sub_802D7E8: @ 802D7E8
|
|||
movs r2, 0
|
||||
movs r3, 0x1
|
||||
bl ConvertIntToDecimalStringN
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
ldr r1, [r5]
|
||||
adds r1, 0x26
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r1, [r5]
|
||||
adds r1, 0x66
|
||||
movs r0, 0x1
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r0, [r5]
|
||||
adds r0, 0xA6
|
||||
ldr r1, =gText_AwesomeWonF701F700
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
movs r0, 0x4
|
||||
movs r1, 0x8
|
||||
movs r2, 0x16
|
||||
|
|
@ -53025,15 +53025,15 @@ sub_802D884: @ 802D884
|
|||
ldr r1, [r4]
|
||||
adds r1, 0x26
|
||||
bl CopyItemName
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
ldr r1, [r4]
|
||||
adds r1, 0x26
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r0, [r4]
|
||||
adds r0, 0xA6
|
||||
ldr r1, =gText_FilledStorageSpace2
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
movs r0, 0x4
|
||||
movs r1, 0x8
|
||||
movs r2, 0x16
|
||||
|
|
@ -53078,15 +53078,15 @@ sub_802D8FC: @ 802D8FC
|
|||
ldr r1, [r4]
|
||||
adds r1, 0x26
|
||||
bl CopyItemName
|
||||
bl UnkTextUtil_Reset
|
||||
bl DynamicPlaceholderTextUtil_Reset
|
||||
ldr r1, [r4]
|
||||
adds r1, 0x26
|
||||
movs r0, 0
|
||||
bl UnkTextUtil_SetPtrI
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
|
||||
ldr r0, [r4]
|
||||
adds r0, 0xA6
|
||||
ldr r1, =gText_CantHoldMore
|
||||
bl UnkTextUtil_StringExpandPlaceholders
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
|
||||
movs r0, 0x4
|
||||
movs r1, 0x9
|
||||
movs r2, 0x16
|
||||
|
|
|
|||
|
|
@ -390,7 +390,7 @@ _080F8AB6:
|
|||
thumb_func_start sub_80F8ACC
|
||||
sub_80F8ACC: @ 80F8ACC
|
||||
push {lr}
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
@ -1559,7 +1559,7 @@ _080F9478:
|
|||
movs r0, 0x1
|
||||
strh r0, [r1]
|
||||
_080F947E:
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
@ -1599,7 +1599,7 @@ _080F94D0:
|
|||
movs r0, 0x1
|
||||
strh r0, [r1]
|
||||
_080F94D6:
|
||||
ldr r0, =CB2_ReturnToFieldContinueScript
|
||||
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl SetMainCallback2
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
|
|
|||
89
charmap.txt
89
charmap.txt
|
|
@ -44,6 +44,7 @@ SUPER_ER = 2C
|
|||
'+' = 2E
|
||||
LV = 34
|
||||
'=' = 35
|
||||
';' = 36
|
||||
'¿' = 51
|
||||
'¡' = 52
|
||||
PK = 53
|
||||
|
|
@ -55,6 +56,7 @@ POKEBLOCK = 55 56 57 58 59
|
|||
')' = 5D
|
||||
'â' = 68
|
||||
'í' = 6F
|
||||
UNK_SPACER = 77
|
||||
UP_ARROW = 79
|
||||
DOWN_ARROW = 7A
|
||||
LEFT_ARROW = 7B
|
||||
|
|
@ -982,18 +984,83 @@ PH_NURSE_BLEND = 5F 02
|
|||
PH_NURSE_HELD = 60 02
|
||||
PH_NURSE_SOLO = 61 02
|
||||
|
||||
UNK_CTRL_F800 = F8 00
|
||||
UNK_CTRL_F801 = F8 01
|
||||
UNK_CTRL_F80A = F8 0A
|
||||
UNK_CTRL_F80C = F8 0C
|
||||
A_BUTTON = F8 00
|
||||
B_BUTTON = F8 01
|
||||
DPAD_UPDOWN = F8 0A
|
||||
DPAD_NONE = F8 0C
|
||||
|
||||
UNK_CTRL_F9 = F9
|
||||
UNK_CTRL_F904 = F9 04
|
||||
UNK_CTRL_F905 = F9 05
|
||||
UNK_CTRL_F907 = F9 07
|
||||
UNK_CTRL_F908 = F9 08
|
||||
UNK_CTRL_F9DD = F9 DD
|
||||
UNK_CTRL_F9F9 = F9 F9
|
||||
UP_ARROW_2 = F9 00
|
||||
DOWN_ARROW_2 = F9 01
|
||||
LEFT_ARROW_2 = F9 02
|
||||
RIGHT_ARROW_2 = F9 03
|
||||
PLUS = F9 04
|
||||
LV_2 = F9 05
|
||||
PP = F9 06
|
||||
ID = F9 07
|
||||
NO = F9 08
|
||||
UNDERSCORE = F9 09
|
||||
CIRCLE_1 = F9 0A
|
||||
CIRCLE_2 = F9 0B
|
||||
CIRCLE_3 = F9 0C
|
||||
CIRCLE_4 = F9 0D
|
||||
CIRCLE_5 = F9 0E
|
||||
CIRCLE_6 = F9 0F
|
||||
CIRCLE_7 = F9 10
|
||||
CIRCLE_8 = F9 11
|
||||
CIRCLE_9 = F9 12
|
||||
ROUND_LEFT_PAREN = F9 13
|
||||
ROUND_RIGHT_PAREN = F9 14
|
||||
CIRCLE_DOT = F9 15
|
||||
TRIANGLE = F9 16
|
||||
BIG_MULT_X = F9 17
|
||||
|
||||
EMOJI_UNDERSCORE = F9 D0
|
||||
EMOJI_PIPE = F9 D1
|
||||
EMOJI_HIGHBAR = F9 D2
|
||||
EMOJI_TILDE = F9 D3
|
||||
EMOJI_LEFT_PAREN = F9 D4
|
||||
EMOJI_RIGHT_PAREN = F9 D5
|
||||
EMOJI_UNION = F9 D6 @ ⊂
|
||||
EMOJI_GREATER_THAN = F9 D7
|
||||
EMOJI_LEFT_EYE = F9 D8
|
||||
EMOJI_RIGHT_EYE = F9 D9
|
||||
EMOJI_AT = F9 DA
|
||||
EMOJI_SEMICOLON = F9 DB
|
||||
EMOJI_PLUS = F9 DC
|
||||
EMOJI_MINUS = F9 DD
|
||||
EMOJI_EQUALS = F9 DE
|
||||
EMOJI_SPIRAL = F9 DF
|
||||
EMOJI_TONGUE = F9 E0
|
||||
EMOJI_TRIANGLE_OUTLINE = F9 E1
|
||||
EMOJI_ACUTE = F9 E2
|
||||
EMOJI_GRAVE = F9 E3
|
||||
EMOJI_CIRCLE = F9 E4
|
||||
EMOJI_TRIANGLE = F9 E5
|
||||
EMOJI_SQUARE = F9 E6
|
||||
EMOJI_HEART = F9 E7
|
||||
EMOJI_MOON = F9 E8
|
||||
EMOJI_NOTE = F9 E9
|
||||
EMOJI_BALL = F9 EA
|
||||
EMOJI_BOLT = F9 EB
|
||||
EMOJI_LEAF = F9 EC
|
||||
EMOJI_FIRE = F9 ED
|
||||
EMOJI_WATER = F9 EE
|
||||
EMOJI_LEFT_FIST = F9 EF
|
||||
EMOJI_RIGHT_FIST = F9 F0
|
||||
EMOJI_BIGWHEEL = F9 F1
|
||||
EMOJI_SMALLWHEEL = F9 F2
|
||||
EMOJI_SPHERE = F9 F3
|
||||
EMOJI_IRRITATED = F9 F4
|
||||
EMOJI_MISCHIEVOUS = F9 F5
|
||||
EMOJI_HAPPY = F9 F6
|
||||
EMOJI_ANGRY = F9 F7
|
||||
EMOJI_SURPRISED = F9 F8
|
||||
EMOJI_BIGSMILE = F9 F9
|
||||
EMOJI_EVIL = F9 FA
|
||||
EMOJI_TIRED = F9 FB
|
||||
EMOJI_NEUTRAL = F9 FC
|
||||
EMOJI_SHOCKED = F9 FD
|
||||
EMOJI_BIGANGER = F9 FE
|
||||
|
||||
'\l' = FA @ scroll up window text
|
||||
'\p' = FB @ new paragraph
|
||||
|
|
|
|||
|
|
@ -497,7 +497,7 @@ gUnknown_08610970:: @ 8610970
|
|||
.string "LAMONT$", 8
|
||||
.string "XAV$", 8
|
||||
.string "ORFEO$", 8
|
||||
.string "J{0xf3}RGEN$", 8 @accent?
|
||||
.string "JÜRGEN$", 8
|
||||
.string "JORGE$", 8
|
||||
.byte 0x90, 0xE5
|
||||
.2byte 0x19
|
||||
|
|
|
|||
|
|
@ -765,7 +765,7 @@ MtChimney_Text_22FFC0: @ 822FFC0
|
|||
.string "It makes no response whatsoever.$"
|
||||
|
||||
MtChimney_Text_22FFFA: @ 822FFFA
|
||||
.string "{0x7A} JAGGED PATH\n"
|
||||
.string "{DOWN_ARROW} JAGGED PATH\n"
|
||||
.string "LAVARIDGE TOWN AHEAD$"
|
||||
|
||||
MtChimney_Text_23001D: @ 823001D
|
||||
|
|
|
|||
|
|
@ -297,5 +297,5 @@ Route101_Text_1EC04A: @ 81EC04A
|
|||
|
||||
Route101_Text_1EC0C8: @ 81EC0C8
|
||||
.string "ROUTE 101\n"
|
||||
.string "{0x79} OLDALE TOWN$"
|
||||
.string "{UP_ARROW} OLDALE TOWN$"
|
||||
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ Route102_Text_1EC32E: @ 81EC32E
|
|||
|
||||
Route102_Text_1EC35B: @ 81EC35B
|
||||
.string "ROUTE 102\n"
|
||||
.string "{0x7C} OLDALE TOWN$"
|
||||
.string "{RIGHT_ARROW} OLDALE TOWN$"
|
||||
|
||||
Route102_Text_1EC373: @ 81EC373
|
||||
.string "ROUTE 102\n"
|
||||
.string "{0x7B} PETALBURG CITY$"
|
||||
.string "{LEFT_ARROW} PETALBURG CITY$"
|
||||
|
|
|
|||
|
|
@ -364,5 +364,5 @@ Route103_Text_1ECBB5: @ 81ECBB5
|
|||
|
||||
Route103_Text_1ECC1A: @ 81ECC1A
|
||||
.string "ROUTE 103\n"
|
||||
.string "{0x7A} OLDALE TOWN$"
|
||||
.string "{DOWN_ARROW} OLDALE TOWN$"
|
||||
|
||||
|
|
|
|||
|
|
@ -1115,11 +1115,11 @@ Route104_Text_1EDA8C: @ 81EDA8C
|
|||
|
||||
Route104_Text_1EDAA1: @ 81EDAA1
|
||||
.string "ROUTE 1O4\n"
|
||||
.string "{0x7C} PETALBURG CITY$"
|
||||
.string "{RIGHT_ARROW} PETALBURG CITY$"
|
||||
|
||||
Route104_Text_1EDABC: @ 81EDABC
|
||||
.string "ROUTE 1O4\n"
|
||||
.string "{0x79} RUSTBORO CITY$"
|
||||
.string "{UP_ARROW} RUSTBORO CITY$"
|
||||
|
||||
Route104_Text_1EDAD6: @ 81EDAD6
|
||||
.string "PRETTY PETAL FLOWER SHOP$"
|
||||
|
|
|
|||
|
|
@ -951,7 +951,7 @@ Route110_Text_1F0755: @ 81F0755
|
|||
|
||||
Route110_Text_1F0812: @ 81F0812
|
||||
.string "ROUTE 110\n"
|
||||
.string "{0x7A} SLATEPORT CITY$"
|
||||
.string "{DOWN_ARROW} SLATEPORT CITY$"
|
||||
|
||||
Route110_Text_1F082D: @ 81F082D
|
||||
.string "SEASIDE CYCLING ROAD$"
|
||||
|
|
@ -965,14 +965,14 @@ Route110_Text_1F0842: @ 81F0842
|
|||
|
||||
Route110_Text_1F08CD: @ 81F08CD
|
||||
.string "ROUTE 110\n"
|
||||
.string "{0x7B} ROUTE 103$"
|
||||
.string "{LEFT_ARROW} ROUTE 103$"
|
||||
|
||||
Route110_Text_1F08E3: @ 81F08E3
|
||||
.string "SEASIDE PARKING$"
|
||||
|
||||
Route110_Text_1F08F3: @ 81F08F3
|
||||
.string "ROUTE 110\n"
|
||||
.string "{0x79} MAUVILLE CITY$"
|
||||
.string "{UP_ARROW} MAUVILLE CITY$"
|
||||
|
||||
Route110_Text_1F090D: @ 81F090D
|
||||
.string "TRAINER TIPS\p"
|
||||
|
|
@ -987,7 +987,7 @@ Route110_Text_1F0992: @ 81F0992
|
|||
.string "by pressing SELECT.$"
|
||||
|
||||
Route110_Text_1F09DB: @ 81F09DB
|
||||
.string "“Three steps {0x7C} and two steps {0x79}\n"
|
||||
.string "“Three steps {RIGHT_ARROW} and two steps {UP_ARROW}\n"
|
||||
.string "to reach the wondrous TRICK HOUSE.”$"
|
||||
|
||||
Route110_Text_1F0A1E: @ 81F0A1E
|
||||
|
|
|
|||
|
|
@ -676,7 +676,7 @@ Route111_Text_1F186E: @ 81F186E
|
|||
|
||||
Route111_Text_1F18CE: @ 81F18CE
|
||||
.string "ROUTE 111\n"
|
||||
.string "{0x7A} MAUVILLE CITY$"
|
||||
.string "{DOWN_ARROW} MAUVILLE CITY$"
|
||||
|
||||
Route111_Text_1F18E8: @ 81F18E8
|
||||
.string "“Our family’s hearts beat as one!”\n"
|
||||
|
|
@ -684,11 +684,11 @@ Route111_Text_1F18E8: @ 81F18E8
|
|||
|
||||
Route111_Text_1F1921: @ 81F1921
|
||||
.string "ROUTE 111\n"
|
||||
.string "{0x7B} ROUTE 112$"
|
||||
.string "{LEFT_ARROW} ROUTE 112$"
|
||||
|
||||
Route111_Text_1F1937: @ 81F1937
|
||||
.string "ROUTE 111\n"
|
||||
.string "{0x7B} ROUTE 113$"
|
||||
.string "{LEFT_ARROW} ROUTE 113$"
|
||||
|
||||
Route111_Text_1F194D: @ 81F194D
|
||||
.string "OLD LADY’S REST STOP\n"
|
||||
|
|
@ -750,7 +750,7 @@ Route111_Text_1F1CCA: @ 81F1CCA
|
|||
.string "the bike shop in MAUVILLE.$"
|
||||
|
||||
Route111_Text_1F1D61: @ 81F1D61
|
||||
.string "{0x7C} TRAINER HILL ENTRANCE\p"
|
||||
.string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p"
|
||||
.string "“Scale the heights, you hot-blooded\n"
|
||||
.string "TRAINERS!”$"
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ Route112_Text_1F204E: @ 81F204E
|
|||
|
||||
Route112_Text_1F20C1: @ 81F20C1
|
||||
.string "MT. CHIMNEY CABLE CAR\n"
|
||||
.string "“A short walk {0x79} way!”$"
|
||||
.string "“A short walk {UP_ARROW} way!”$"
|
||||
|
||||
Route112_Text_1F20ED: @ 81F20ED
|
||||
.string "MT. CHIMNEY\p"
|
||||
|
|
@ -142,5 +142,5 @@ Route112_Text_1F20ED: @ 81F20ED
|
|||
|
||||
Route112_Text_1F2138: @ 81F2138
|
||||
.string "ROUTE 112\n"
|
||||
.string "{0x7B} LAVARIDGE TOWN$"
|
||||
.string "{LEFT_ARROW} LAVARIDGE TOWN$"
|
||||
|
||||
|
|
|
|||
|
|
@ -157,11 +157,11 @@ Route113_Text_1F23CA: @ 81F23CA
|
|||
|
||||
Route113_Text_1F2440: @ 81F2440
|
||||
.string "ROUTE 113\n"
|
||||
.string "{0x7C} ROUTE 111$"
|
||||
.string "{RIGHT_ARROW} ROUTE 111$"
|
||||
|
||||
Route113_Text_1F2456: @ 81F2456
|
||||
.string "ROUTE 113\n"
|
||||
.string "{0x7B} FALLARBOR TOWN$"
|
||||
.string "{LEFT_ARROW} FALLARBOR TOWN$"
|
||||
|
||||
Route113_Text_1F2471: @ 81F2471
|
||||
.string "TRAINER TIPS\p"
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ Route115_Text_1F2B55: @ 81F2B55
|
|||
|
||||
Route115_Text_1F2BC9: @ 81F2BC9
|
||||
.string "ROUTE 115\n"
|
||||
.string "{0x7A} RUSTBORO CITY$"
|
||||
.string "{DOWN_ARROW} RUSTBORO CITY$"
|
||||
|
||||
Route115_Text_1F2BE3: @ 81F2BE3
|
||||
.string "METEOR FALLS\n"
|
||||
|
|
|
|||
|
|
@ -482,7 +482,7 @@ Route116_Text_1F375E: @ 81F375E
|
|||
|
||||
Route116_Text_1F379D: @ 81F379D
|
||||
.string "ROUTE 116\n"
|
||||
.string "{0x7B} RUSTBORO CITY$"
|
||||
.string "{LEFT_ARROW} RUSTBORO CITY$"
|
||||
|
||||
Route116_Text_1F37B7: @ 81F37B7
|
||||
.string "RUSTURF TUNNEL\n"
|
||||
|
|
|
|||
|
|
@ -220,11 +220,11 @@ Route117_Text_1F3D41: @ 81F3D41
|
|||
|
||||
Route117_Text_1F3D58: @ 81F3D58
|
||||
.string "ROUTE 117\n"
|
||||
.string "{0x7B} VERDANTURF TOWN$"
|
||||
.string "{LEFT_ARROW} VERDANTURF TOWN$"
|
||||
|
||||
Route117_Text_1F3D74: @ 81F3D74
|
||||
.string "ROUTE 117\n"
|
||||
.string "{0x7C} MAUVILLE CITY$"
|
||||
.string "{RIGHT_ARROW} MAUVILLE CITY$"
|
||||
|
||||
Route117_Text_1F3D8E: @ 81F3D8E
|
||||
.string "POKéMON DAY CARE\n"
|
||||
|
|
|
|||
|
|
@ -310,9 +310,9 @@ Route118_Text_1F4367: @ 81F4367
|
|||
|
||||
Route118_Text_1F43F4: @ 81F43F4
|
||||
.string "ROUTE 118\n"
|
||||
.string "{0x7B} MAUVILLE CITY$"
|
||||
.string "{LEFT_ARROW} MAUVILLE CITY$"
|
||||
|
||||
Route118_Text_1F440E: @ 81F440E
|
||||
.string "ROUTE 118\n"
|
||||
.string "{0x79} ROUTE 119$"
|
||||
.string "{UP_ARROW} ROUTE 119$"
|
||||
|
||||
|
|
|
|||
|
|
@ -622,7 +622,7 @@ Route119_Text_1F52B9: @ 81F52B9
|
|||
|
||||
Route119_Text_1F530E: @ 81F530E
|
||||
.string "ROUTE 119\n"
|
||||
.string "{0x7C} FORTREE CITY$"
|
||||
.string "{RIGHT_ARROW} FORTREE CITY$"
|
||||
|
||||
Route119_Text_1F5327: @ 81F5327
|
||||
.string "WEATHER INSTITUTE$"
|
||||
|
|
|
|||
|
|
@ -459,8 +459,8 @@ Route119_Text_1F5D63: @ 81F5D63
|
|||
|
||||
Route120_Text_1F5DCB: @ 81F5DCB
|
||||
.string "ROUTE 120\n"
|
||||
.string "{0x7B} FORTREE CITY$"
|
||||
.string "{LEFT_ARROW} FORTREE CITY$"
|
||||
|
||||
Route120_Text_1F5DE4: @ 81F5DE4
|
||||
.string "{0x7C} ROUTE 121\n"
|
||||
.string "{0x7B} ROUTE 120$"
|
||||
.string "{RIGHT_ARROW} ROUTE 121\n"
|
||||
.string "{LEFT_ARROW} ROUTE 120$"
|
||||
|
|
|
|||
|
|
@ -201,11 +201,11 @@ Route123_Text_1F64CF: @ 81F64CF
|
|||
.string "POKéMON. I’m like a tree doctor.$"
|
||||
|
||||
Route123_Text_1F6511: @ 81F6511
|
||||
.string "{0x7C} ROUTE 123\n"
|
||||
.string "{0x7B} ROUTE 118$"
|
||||
.string "{RIGHT_ARROW} ROUTE 123\n"
|
||||
.string "{LEFT_ARROW} ROUTE 118$"
|
||||
|
||||
Route123_Text_1F6529: @ 81F6529
|
||||
.string "{0x79} MT. PYRE\n"
|
||||
.string "{UP_ARROW} MT. PYRE\n"
|
||||
.string "“Forbidden to the faint of heart.”$"
|
||||
|
||||
Route123_Text_1F6557: @ 81F6557
|
||||
|
|
|
|||
|
|
@ -339,11 +339,11 @@ Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8
|
|||
.string "Well, if you change your mind, come back.$"
|
||||
|
||||
Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217
|
||||
.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
|
||||
.string "{CLEAR_TO}{0x0f}RED SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}FIRE STONE{CLEAR_TO}{0xc8}\p"
|
||||
.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
|
||||
.string "{CLEAR_TO}{0x06}YELLOW SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x73}THUNDERSTONE{CLEAR_TO}{0xc8}\p"
|
||||
.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
|
||||
.string "{CLEAR_TO}{0x0c}BLUE SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x79}WATER STONE{CLEAR_TO}{0xc8}\p"
|
||||
.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
|
||||
.string "{CLEAR_TO}{0x08}GREEN SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}LEAF STONE$"
|
||||
.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
|
||||
.string "{CLEAR_TO 0x0f}RED SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}FIRE STONE{CLEAR_TO 0xc8}\p"
|
||||
.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
|
||||
.string "{CLEAR_TO 0x06}YELLOW SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x73}THUNDERSTONE{CLEAR_TO 0xc8}\p"
|
||||
.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
|
||||
.string "{CLEAR_TO 0x0c}BLUE SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x79}WATER STONE{CLEAR_TO 0xc8}\p"
|
||||
.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
|
||||
.string "{CLEAR_TO 0x08}GREEN SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}LEAF STONE$"
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ gUnknown_0861CE8E:: @ 861CE8E
|
|||
.string "{SPECIAL_F7 0x02}$"
|
||||
|
||||
gUnknown_0861CE97:: @ 861CE97
|
||||
.string "{UNK_CTRL_F9 0x06}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}$"
|
||||
.string "{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}$"
|
||||
|
||||
.align 2
|
||||
gOamData_861CEA0:: @ 861CEA0
|
||||
|
|
|
|||
|
|
@ -1813,7 +1813,7 @@ gUnknown_086235C8:: @ 86235C8
|
|||
.align 2
|
||||
|
||||
gUnknown_086235D4:: @ 86235D4
|
||||
.string "{0x77}$"
|
||||
.string "{UNK_SPACER}$"
|
||||
.align 2
|
||||
|
||||
gUnknown_086235D8:: @ 86235D8
|
||||
|
|
@ -1860,7 +1860,7 @@ gUnknown_086237E8:: @ 86237E8
|
|||
.align 2
|
||||
|
||||
gUnknown_086237F4:: @ 86237F4
|
||||
.string "{0x77}$"
|
||||
.string "{UNK_SPACER}$"
|
||||
.align 2
|
||||
|
||||
gUnknown_086237F8:: @ 86237F8
|
||||
|
|
@ -1942,7 +1942,7 @@ gUnknown_08624BD8:: @ 8624BD8
|
|||
.align 2
|
||||
|
||||
gUnknown_08624BE4:: @ 8624BE4
|
||||
.string "{0x77}$"
|
||||
.string "{UNK_SPACER}$"
|
||||
.align 2
|
||||
|
||||
gUnknown_08624BE8:: @ 8624BE8
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ gText_Colon:: @ 82ED8C8
|
|||
|
||||
.align 2
|
||||
gText_UnkCtrlCodeF907:: @ 82ED8CC
|
||||
.string "{UNK_CTRL_F907}$"
|
||||
.string "{ID}$"
|
||||
|
||||
.align 2
|
||||
gText_PleaseStartOver:: @ 82ED8D0
|
||||
|
|
@ -194,7 +194,7 @@ gUnknown_082EDB60:: @ 82EDB60
|
|||
|
||||
.align 2
|
||||
gUnknown_082EDBC4:: @ 82EDBC4
|
||||
.string "{UNK_CTRL_F801}CANCEL$"
|
||||
.string "{B_BUTTON}CANCEL$"
|
||||
|
||||
.align 2
|
||||
.string "ため\nさんかしゃ ぼしゅうちゅう です！$" @ "tame\nsankasha boshuuchuu desu!"
|
||||
|
|
@ -889,7 +889,7 @@ gUnknown_082EF7D0:: @ 82EF7D0
|
|||
|
||||
.align 2
|
||||
gUnknown_082EF7DC:: @ 82EF7DC
|
||||
.string "{UNK_CTRL_F80A}CHOOSE {UNK_CTRL_F800}JOIN {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{DPAD_UPDOWN}CHOOSE {A_BUTTON}JOIN {B_BUTTON}CANCEL$"
|
||||
|
||||
.align 2
|
||||
gUnknown_082EF7F8:: @ 82EF7F8
|
||||
|
|
|
|||
|
|
@ -1906,7 +1906,7 @@ MossdeepCity_GameCorner_1F_Text_278BF1: @ 8278BF1
|
|||
.string "Command DODRIO’s three heads to\n"
|
||||
.string "catch falling BERRIES.\p"
|
||||
.string "Press right, up, or left on the\n"
|
||||
.string "{0xF9}Ç Control Pad to move the heads.\p"
|
||||
.string "{PLUS} Control Pad to move the heads.\p"
|
||||
.string "To play this game, you must have\n"
|
||||
.string "a DODRIO.$"
|
||||
|
||||
|
|
|
|||
|
|
@ -140,27 +140,27 @@ gUnknown_085E852C:: @ 85E852C
|
|||
|
||||
.align 2
|
||||
gUnknown_085E8538:: @ 85E8538
|
||||
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK$"
|
||||
.string "{DPAD_UPDOWN}PICK {A_BUTTON}OK$"
|
||||
|
||||
.align 2
|
||||
gUnknown_085E8544:: @ 85E8544
|
||||
.string "{UNK_CTRL_F800}NEXT$"
|
||||
.string "{A_BUTTON}NEXT$"
|
||||
|
||||
.align 2
|
||||
gUnknown_085E854C:: @ 85E854C
|
||||
.string "{UNK_CTRL_F800}NEXT {UNK_CTRL_F801}BACK$"
|
||||
.string "{A_BUTTON}NEXT {B_BUTTON}BACK$"
|
||||
|
||||
.align 2
|
||||
gText_PickNextCancel:: @ 85E855C
|
||||
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}NEXT {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{DPAD_UPDOWN}PICK {A_BUTTON}NEXT {B_BUTTON}CANCEL$"
|
||||
|
||||
.align 2
|
||||
gText_PickCancel:: @ 85E8574
|
||||
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}{UNK_CTRL_F801}CANCEL$"
|
||||
.string "{DPAD_UPDOWN}PICK {A_BUTTON}{B_BUTTON}CANCEL$"
|
||||
|
||||
.align 2
|
||||
gText_UnkCtrlF800Exit:: @ 85E8588
|
||||
.string "{UNK_CTRL_F800}EXIT$"
|
||||
.string "{A_BUTTON}EXIT$"
|
||||
|
||||
gText_BirchBoy:: @ 85E858F
|
||||
.string "BOY$"
|
||||
|
|
@ -616,7 +616,7 @@ gText_LevelSymbol:: @ 85E8D4D
|
|||
.string "{LV}$"
|
||||
|
||||
gText_UnkCtrlF908Clear01:: @ 85E8D4F
|
||||
.string "{UNK_CTRL_F908}{CLEAR 0x01}$"
|
||||
.string "{NO}{CLEAR 0x01}$"
|
||||
|
||||
gUnknown_085E8D55:: @ 85E8D55
|
||||
.string "+$"
|
||||
|
|
@ -625,7 +625,7 @@ gUnknown_085E8D57:: @ 85E8D57
|
|||
.string "{RIGHT_ARROW}$"
|
||||
|
||||
gText_UnkCtrlF907F908:: @ 85E8D59
|
||||
.string "{UNK_CTRL_F907}{UNK_CTRL_F908}$"
|
||||
.string "{ID}{NO}$"
|
||||
|
||||
gText_Space:: @ 85E8D5E
|
||||
.string " $"
|
||||
|
|
@ -807,7 +807,7 @@ gPocketNamesStringsTable:: @ 85E91FC
|
|||
|
||||
.align 2
|
||||
gText_UnkF908Var1Clear7Var2:: @ 85E9210
|
||||
.string "{UNK_CTRL_F908}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}$"
|
||||
.string "{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}$"
|
||||
|
||||
gText_ClearTo11Var1Clear5Var2:: @ 85E921A
|
||||
.string "{CLEAR_TO 0x11}{STR_VAR_1}{CLEAR 0x05}{STR_VAR_2}$"
|
||||
|
|
@ -824,7 +824,7 @@ gText_Var1DotVar2:: @ 85E9233
|
|||
.include "data/text/berry_firmness_strings.inc"
|
||||
|
||||
gText_UnkF908Var1Var2:: @ 85E9263
|
||||
.string "{UNK_CTRL_F908}{STR_VAR_1} {STR_VAR_2}$"
|
||||
.string "{NO}{STR_VAR_1} {STR_VAR_2}$"
|
||||
|
||||
gText_BerryTag:: @ 85E926B
|
||||
.string "BERRY TAG$"
|
||||
|
|
@ -1453,28 +1453,28 @@ gText_HMMovesCantBeForgotten2:: @ 85EA4CB
|
|||
.string "HM moves can’t be\nforgotten now.$"
|
||||
|
||||
gText_XNatureMetAtYZ:: @ 85EA4EC
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
|
||||
|
||||
gText_XNatureHatchedAtYZ:: @ 85EA516
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
|
||||
|
||||
gText_XNatureObtainedInTrade:: @ 85EA544
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a trade.$"
|
||||
|
||||
gText_XNatureFatefulEncounter:: @ 85EA56A
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a fateful\nencounter at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a fateful\nencounter at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
|
||||
|
||||
gText_XNatureProbablyMetAt:: @ 85EA5A8
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nprobably met at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nprobably met at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$"
|
||||
|
||||
gText_XNature:: @ 85EA5DB
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature$"
|
||||
|
||||
gText_XNatureMetSomewhereAt:: @ 85EA5EB
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet somewhere at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet somewhere at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
|
||||
|
||||
gText_XNatureHatchedSomewhereAt:: @ 85EA617
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched somewhere at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
|
||||
.string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched somewhere at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$"
|
||||
|
||||
gText_OddEggFoundByCouple:: @ 85EA647
|
||||
.string "An odd POKéMON EGG found\nby the DAY CARE couple.$"
|
||||
|
|
@ -2815,37 +2815,37 @@ gUnknown_085EBED5:: @ 85EBED5
|
|||
.string "{CLEAR 0x80}$"
|
||||
|
||||
gUnknown_085EBED9:: @ 85EBED9
|
||||
.string "{UNK_CTRL_F800}ZOOM {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}ZOOM {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBEE9:: @ 85EBEE9
|
||||
.string "{UNK_CTRL_F800}FULL {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}FULL {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBEF9:: @ 85EBEF9
|
||||
.string "{UNK_CTRL_F800}CONDITION {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}CONDITION {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBF0E:: @ 85EBF0E
|
||||
.string "{UNK_CTRL_F800}MARKINGS {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}MARKINGS {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBF22:: @ 85EBF22
|
||||
.string "{UNK_CTRL_F800}SELECT MARK {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBF39:: @ 85EBF39
|
||||
.string "{UNK_CTRL_F800}MENU {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}MENU {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBF49:: @ 85EBF49
|
||||
.string "{UNK_CTRL_F800}OK {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}OK {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBF57:: @ 85EBF57
|
||||
.string "{UNK_CTRL_F801}CANCEL$"
|
||||
.string "{B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBF60:: @ 85EBF60
|
||||
.string "{UNK_CTRL_F800}RIBBONS {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}RIBBONS {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBF73:: @ 85EBF73
|
||||
.string "{UNK_CTRL_F800}CHECK {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{A_BUTTON}CHECK {B_BUTTON}CANCEL$"
|
||||
|
||||
gUnknown_085EBF84:: @ 85EBF84
|
||||
.string "{UNK_CTRL_F801}CANCEL$"
|
||||
.string "{B_BUTTON}CANCEL$"
|
||||
|
||||
gText_NatureSlash:: @ 85EBF8D
|
||||
.string "NATURE/$"
|
||||
|
|
@ -3738,7 +3738,7 @@ gText_Sorry:: @ 85ED434
|
|||
.string "SORRY$"
|
||||
|
||||
gText_YayUnkF9F9:: @ 85ED43A
|
||||
.string "YAY{UNK_CTRL_F9F9}$"
|
||||
.string "YAY{EMOJI_BIGSMILE}$"
|
||||
|
||||
gText_ThankYou:: @ 85ED440
|
||||
.string "THANK YOU$"
|
||||
|
|
@ -4049,7 +4049,7 @@ gText_BerryPickingResults:: @ 85EDD49
|
|||
.string "Announcing BERRY-PICKING results!$"
|
||||
|
||||
gText_10P30P50P50P:: @ 85EDD6B
|
||||
.string "{CLEAR_TO 0x03}10P{CLEAR_TO 0x2B}30P{CLEAR_TO 0x53}50P{CLEAR_TO 0x77}{UNK_CTRL_F9DD}50P$"
|
||||
.string "{CLEAR_TO 0x03}10P{CLEAR_TO 0x2B}30P{CLEAR_TO 0x53}50P{CLEAR_TO 0x77}{EMOJI_MINUS}50P$"
|
||||
|
||||
gText_AnnouncingRankings:: @ 85EDD86
|
||||
.string "Announcing rankings!$"
|
||||
|
|
@ -4154,14 +4154,14 @@ gJPText_MysteryGift:: @ 85EDFBF
|
|||
.string "ふしぎなもらいもの$" @ "fushiginamoraimono" ("Mystery Gift" in Japanese)
|
||||
|
||||
gJPText_DecideStop:: @ 85EDFC9
|
||||
.string "{UNK_CTRL_F800}けってい {UNK_CTRL_F801}やめる$" @ "{UNK_CTRL_F800}kettei {UNK_CTRL_F801}yameru" ("{UNK_CTRL_F800}decide {UNK_CTRL_F801}stop" in Japanese)
|
||||
.string "{A_BUTTON}けってい {B_BUTTON}やめる$" @ "{A_BUTTON}kettei {B_BUTTON}yameru" ("{A_BUTTON}decide {B_BUTTON}stop" in Japanese)
|
||||
|
||||
gUnknown_085EDFD6:: @ 85EDFD6
|
||||
.string "カードeリーダー{UNK_CTRL_F9 0x04} で\n"
|
||||
.string "カードeリーダー{PLUS} で\n"
|
||||
.string "ふしぎなもらいものを よみこみます$"
|
||||
|
||||
gUnknown_085EDFF5:: @ 85EDFF5
|
||||
.string "カードeリーダー{UNK_CTRL_F9 0x04}の メニューから\n"
|
||||
.string "カードeリーダー{PLUS}の メニューから\n"
|
||||
.string "‘つうしん’を えらび$"
|
||||
|
||||
gUnknown_085EE014:: @ 85EE014
|
||||
|
|
@ -4169,7 +4169,7 @@ gUnknown_085EE014:: @ 85EE014
|
|||
.string "を せんたく してください$"
|
||||
|
||||
gUnknown_085EE035:: @ 85EE035
|
||||
.string "カードeリーダー{UNK_CTRL_F9 0x04}の ‘つうしん’を\n"
|
||||
.string "カードeリーダー{PLUS}の ‘つうしん’を\n"
|
||||
.string "えらんで Aボタンを おしてください$"
|
||||
|
||||
gUnknown_085EE05C:: @ 85EE05C
|
||||
|
|
@ -4180,7 +4180,7 @@ gUnknown_085EE06B:: @ 85EE06B
|
|||
.string "ちゅうし しました$"
|
||||
|
||||
gUnknown_085EE080:: @ 85EE080
|
||||
.string "カードeリーダー{UNK_CTRL_F9 0x04}と\n"
|
||||
.string "カードeリーダー{PLUS}と\n"
|
||||
.string "つうしん できません$"
|
||||
|
||||
gUnknown_085EE097:: @ 85EE097
|
||||
|
|
@ -4195,7 +4195,7 @@ gUnknown_085EE0BF:: @ 85EE0BF
|
|||
.string "はじめから やりなおして ください$"
|
||||
|
||||
gUnknown_085EE0DC:: @ 85EE0DC
|
||||
.string "カードeリーダー{UNK_CTRL_F9 0x04} に\n"
|
||||
.string "カードeリーダー{PLUS} に\n"
|
||||
.string "カードを よみこませて ください$"
|
||||
|
||||
gUnknown_085EE0FA:: @ 85EE0FA
|
||||
|
|
@ -4631,7 +4631,7 @@ gUnknown_085EEA6B:: @ 85EEA6B
|
|||
.string "SP. DEF$"
|
||||
|
||||
gText_UnkCtrlF904:: @ 85EEA73
|
||||
.string "{UNK_CTRL_F904}$"
|
||||
.string "{PLUS}$"
|
||||
|
||||
gText_Dash:: @ 85EEA76
|
||||
.string "-$"
|
||||
|
|
@ -4658,7 +4658,7 @@ gText_TellHimTheWords:: @ 85EEAE2
|
|||
.string "Tell him the words.$"
|
||||
|
||||
gText_MoveOkBack:: @ 85EEAF6
|
||||
.string "{UNK_CTRL_F80C}MOVE {UNK_CTRL_F800}OK {UNK_CTRL_F801}BACK$"
|
||||
.string "{DPAD_NONE}MOVE {A_BUTTON}OK {B_BUTTON}BACK$"
|
||||
|
||||
gText_CallCantBeMadeHere:: @ 85EEB0B
|
||||
.string "A call can’t be made from here.$"
|
||||
|
|
@ -5080,11 +5080,11 @@ gText_MysteryGift:: @ 85EF654
|
|||
|
||||
.align 2
|
||||
gText_PickOKExit:: @ 85EF664
|
||||
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK {UNK_CTRL_F801}EXIT$"
|
||||
.string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}EXIT$"
|
||||
|
||||
.align 2
|
||||
gText_PickOKCancel:: @ 85EF678
|
||||
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK {UNK_CTRL_F801}CANCEL$"
|
||||
.string "{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL$"
|
||||
|
||||
gText_PlayersBattleResults:: @ 85EF68D
|
||||
.string "{PLAYER}’s BATTLE RESULTS$"
|
||||
|
|
|
|||
|
|
@ -116,31 +116,31 @@ gUnknown_0862BA6B:: @ 862BA6B
|
|||
.string "$$$$$$$$"
|
||||
|
||||
gUnknown_0862BA79:: @ 862BA79
|
||||
.string "{UNK_CTRL_F9 245}{UNK_CTRL_F9 246}{UNK_CTRL_F9 247}{UNK_CTRL_F9 248}{UNK_CTRL_F9 254}$"
|
||||
.string "{EMOJI_MISCHIEVOUS}{EMOJI_HAPPY}{EMOJI_ANGRY}{EMOJI_SURPRISED}{EMOJI_BIGANGER}$"
|
||||
|
||||
gUnknown_0862BA84:: @ 862BA84
|
||||
.string "{UNK_CTRL_F9 249}{UNK_CTRL_F9 250}{UNK_CTRL_F9 252}{UNK_CTRL_F9 251}{UNK_CTRL_F9 253}$"
|
||||
.string "{EMOJI_BIGSMILE}{EMOJI_EVIL}{EMOJI_NEUTRAL}{EMOJI_TIRED}{EMOJI_SHOCKED}$"
|
||||
|
||||
gUnknown_0862BA8F:: @ 862BA8F
|
||||
.string "{UNK_CTRL_F9 236}{UNK_CTRL_F9 237}{UNK_CTRL_F9 238}{UNK_CTRL_F9 235}{UNK_CTRL_F9 234}$"
|
||||
.string "{EMOJI_LEAF}{EMOJI_FIRE}{EMOJI_WATER}{EMOJI_BOLT}{EMOJI_BALL}$"
|
||||
|
||||
gUnknown_0862BA9A:: @ 862BA9A
|
||||
.string "♂♀{UNK_CTRL_F9 212}{UNK_CTRL_F9 213}{UNK_CTRL_F9 211}$"
|
||||
.string "♂♀{EMOJI_LEFT_PAREN}{EMOJI_RIGHT_PAREN}{EMOJI_TILDE}$"
|
||||
|
||||
gUnknown_0862BAA3:: @ 862BAA3
|
||||
.string "{UNK_CTRL_F9 216}{UNK_CTRL_F9 217}{UNK_CTRL_F9 242}{UNK_CTRL_F9 243}{UNK_CTRL_F9 244}$"
|
||||
.string "{EMOJI_LEFT_EYE}{EMOJI_RIGHT_EYE}{EMOJI_SMALLWHEEL}{EMOJI_SPHERE}{EMOJI_IRRITATED}$"
|
||||
|
||||
gUnknown_0862BAAE:: @ 862BAAE
|
||||
.string "{UNK_CTRL_F9 218}{UNK_CTRL_F9 241}{UNK_CTRL_F9 224}{UNK_CTRL_F9 226}{UNK_CTRL_F9 227}$"
|
||||
.string "{EMOJI_AT}{EMOJI_BIGWHEEL}{EMOJI_TONGUE}{EMOJI_ACUTE}{EMOJI_GRAVE}$"
|
||||
|
||||
gUnknown_0862BAB9:: @ 862BAB9
|
||||
.string "{UNK_CTRL_F9 240}{UNK_CTRL_F9 239}{UNK_CTRL_F9 225}{UNK_CTRL_F9 214}{UNK_CTRL_F9 215}$"
|
||||
.string "{EMOJI_RIGHT_FIST}{EMOJI_LEFT_FIST}{EMOJI_TRIANGLE_OUTLINE}{EMOJI_UNION}{EMOJI_GREATER_THAN}$"
|
||||
|
||||
gUnknown_0862BAC4:: @ 862BAC4
|
||||
.string "{UNK_CTRL_F9 228}{UNK_CTRL_F9 229}{UNK_CTRL_F9 230}{UNK_CTRL_F9 231}{UNK_CTRL_F9 232}$"
|
||||
.string "{EMOJI_CIRCLE}{EMOJI_TRIANGLE}{EMOJI_SQUARE}{EMOJI_HEART}{EMOJI_MOON}$"
|
||||
|
||||
gUnknown_0862BACF:: @ 862BACF
|
||||
.string "{UNK_CTRL_F9 233}{UNK_CTRL_F9 220}{UNK_CTRL_F9 221}{UNK_CTRL_F9 222}{UNK_CTRL_F9 209}$"
|
||||
.string "{EMOJI_NOTE}{EMOJI_PLUS}{EMOJI_MINUS}{EMOJI_EQUALS}{EMOJI_PIPE}$"
|
||||
|
||||
gUnknown_0862BADA:: @ 862BADA
|
||||
.string "{UNK_CTRL_F9 210}{UNK_CTRL_F9 208}ょ: $"
|
||||
.string "{EMOJI_HIGHBAR}{EMOJI_UNDERSCORE};: $"
|
||||
|
|
|
|||
9
include/dynamic_placeholder_text_util.h
Normal file
9
include/dynamic_placeholder_text_util.h
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
#ifndef GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H
|
||||
#define GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H
|
||||
|
||||
void DynamicPlaceholderTextUtil_Reset(void);
|
||||
void DynamicPlaceholderTextUtil_SetPlaceholderPtr(u8 idx, const u8 *ptr);
|
||||
u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src);
|
||||
const u8 *DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 idx);
|
||||
|
||||
#endif //GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H
|
||||
|
|
@ -126,8 +126,8 @@ void CB2_ReturnToFieldLocal(void);
|
|||
void CB2_ReturnToFieldLink(void);
|
||||
void c2_8056854(void);
|
||||
void CB2_ReturnToFieldWithOpenMenu(void);
|
||||
void sub_80861B0(void);
|
||||
void CB2_ReturnToFieldContinueScript(void);
|
||||
void CB2_ReturnToFieldContinueScriptPlayMapMusic(void);
|
||||
void sub_80861E8(void);
|
||||
void CB2_ContinueSavedGame(void);
|
||||
void sub_8086C2C(void);
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
#ifndef GUARD_UNK_TEXT_UTIL_H
|
||||
#define GUARD_UNK_TEXT_UTIL_H
|
||||
|
||||
void UnkTextUtil_Reset(void);
|
||||
void UnkTextUtil_SetPtrI(u8 idx, const u8 *ptr);
|
||||
u8 *UnkTextUtil_StringExpandPlaceholders(u8 *dest, const u8 *src);
|
||||
const u8 *UnkTextUtil_GetPtrI(u8 idx);
|
||||
|
||||
#endif //GUARD_UNK_TEXT_UTIL_H
|
||||
|
|
@ -242,7 +242,7 @@ SECTIONS {
|
|||
asm/battle_frontier_2.o(.text);
|
||||
src/item_menu.o(.text);
|
||||
src/list_menu.o(.text);
|
||||
src/unk_text_util.o(.text);
|
||||
src/dynamic_placeholder_text_util.o(.text);
|
||||
src/save_location.o(.text);
|
||||
src/item_icon.o(.text);
|
||||
asm/party_menu.o(.text);
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@ static void Task_ExitTrainerHillRecords(u8 taskId)
|
|||
{
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
Free(sTilemapBuffer);
|
||||
RemoveTrainerHillRecordsWindow(0);
|
||||
FreeAllWindowBuffers();
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@ void StartWallyTutorialBattle(void)
|
|||
{
|
||||
CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
|
||||
ScriptContext2_Enable();
|
||||
gMain.savedCallback = CB2_ReturnToFieldContinueScript;
|
||||
gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic;
|
||||
gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL;
|
||||
CreateBattleStartTask(B_TRANSITION_SLICE, 0);
|
||||
}
|
||||
|
|
@ -608,13 +608,13 @@ static void CB2_EndScriptedWildBattle(void)
|
|||
if (IsPlayerDefeated(gBattleOutcome) == TRUE)
|
||||
{
|
||||
if (InBattlePyramid())
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
else
|
||||
SetMainCallback2(CB2_WhiteOut);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -931,7 +931,7 @@ static void CB2_StartFirstBattle(void)
|
|||
static void CB2_EndFirstBattle(void)
|
||||
{
|
||||
Overworld_ClearSavedMusic();
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
}
|
||||
|
||||
static void sub_80B1218(void)
|
||||
|
|
@ -1307,18 +1307,18 @@ static void CB2_EndTrainerBattle(void)
|
|||
{
|
||||
if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
|
||||
{
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
}
|
||||
else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
|
||||
{
|
||||
if (InBattlePyramid() || sub_81D5C18())
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
else
|
||||
SetMainCallback2(CB2_WhiteOut);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
if (!InBattlePyramid() && !sub_81D5C18())
|
||||
{
|
||||
RegisterTrainerInMatchCall();
|
||||
|
|
@ -1331,7 +1331,7 @@ static void CB2_EndRematchBattle(void)
|
|||
{
|
||||
if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
|
||||
{
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
}
|
||||
else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
|
||||
{
|
||||
|
|
@ -1339,7 +1339,7 @@ static void CB2_EndRematchBattle(void)
|
|||
}
|
||||
else
|
||||
{
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
RegisterTrainerInMatchCall();
|
||||
SetBattledTrainersFlags();
|
||||
HandleRematchVarsOnBattleEnd();
|
||||
|
|
|
|||
|
|
@ -2689,7 +2689,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
|
|||
if (gReceivedRemoteLinkPlayers == 0)
|
||||
{
|
||||
FREE_AND_SET_NULL(sBerryBlenderData);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -2739,7 +2739,7 @@ static void CB2_HandlePlayerPlayAgainChoice(void)
|
|||
if (sBerryBlenderData->playAgainState == PLAY_AGAIN_OK)
|
||||
SetMainCallback2(DoBerryBlending);
|
||||
else
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
|
||||
FreeAllWindowBuffers();
|
||||
UnsetBgTilemapBuffer(2);
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ static void UpdatePerMinute(struct Time *localTime)
|
|||
static void ReturnFromStartWallClock(void)
|
||||
{
|
||||
InitTimeBasedEvents();
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
}
|
||||
|
||||
void StartWallClock(void)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#include "global.h"
|
||||
#include "text.h"
|
||||
#include "unk_text_util.h"
|
||||
#include "dynamic_placeholder_text_util.h"
|
||||
#include "string_util.h"
|
||||
|
||||
static EWRAM_DATA const u8 *sStringPointers[8] = {};
|
||||
|
||||
void UnkTextUtil_Reset(void)
|
||||
void DynamicPlaceholderTextUtil_Reset(void)
|
||||
{
|
||||
const u8 **ptr;
|
||||
u8 *fillval;
|
||||
|
|
@ -20,7 +20,7 @@ void UnkTextUtil_Reset(void)
|
|||
} while ((int)ptr2 >= (int)ptr);
|
||||
}
|
||||
|
||||
void UnkTextUtil_SetPtrI(u8 idx, const u8 *ptr)
|
||||
void DynamicPlaceholderTextUtil_SetPlaceholderPtr(u8 idx, const u8 *ptr)
|
||||
{
|
||||
if (idx < ARRAY_COUNT(sStringPointers))
|
||||
{
|
||||
|
|
@ -28,7 +28,7 @@ void UnkTextUtil_SetPtrI(u8 idx, const u8 *ptr)
|
|||
}
|
||||
}
|
||||
|
||||
u8 *UnkTextUtil_StringExpandPlaceholders(u8 *dest, const u8 *src)
|
||||
u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src)
|
||||
{
|
||||
while (*src != EOS)
|
||||
{
|
||||
|
|
@ -50,7 +50,7 @@ u8 *UnkTextUtil_StringExpandPlaceholders(u8 *dest, const u8 *src)
|
|||
return dest;
|
||||
}
|
||||
|
||||
const u8 *UnkTextUtil_GetPtrI(u8 idx)
|
||||
const u8 *DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 idx)
|
||||
{
|
||||
return sStringPointers[idx];
|
||||
}
|
||||
|
|
@ -301,7 +301,7 @@ void sub_81AABB0(void)
|
|||
|
||||
void CB2_ChooseBerry(void)
|
||||
{
|
||||
GoToBagMenu(4, 3, sub_80861B0);
|
||||
GoToBagMenu(4, 3, CB2_ReturnToFieldContinueScript);
|
||||
}
|
||||
|
||||
void sub_81AABF0(void(*callback)(void))
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ struct UnkIndicatorsStruct
|
|||
struct ScrollIndicatorPair
|
||||
{
|
||||
u8 field_0;
|
||||
u16 *currItemPtr;
|
||||
u16 *scrollOffset;
|
||||
u16 fullyUpThreshold;
|
||||
u16 fullyDownThreshold;
|
||||
u8 topSpriteId;
|
||||
|
|
@ -1064,7 +1064,7 @@ static u8 AddScrollIndicatorArrowObject(u8 arrowDir, u8 x, u8 y, u16 tileTag, u1
|
|||
#undef tFrequency
|
||||
#undef tSinePos
|
||||
|
||||
u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 *currItemPtr)
|
||||
u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 *scrollOffset)
|
||||
{
|
||||
struct CompressedSpriteSheet spriteSheet;
|
||||
struct SpritePalette spritePal;
|
||||
|
|
@ -1091,7 +1091,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
|
|||
data = (void*) gTasks[taskId].data;
|
||||
|
||||
data->field_0 = 0;
|
||||
data->currItemPtr = currItemPtr;
|
||||
data->scrollOffset = scrollOffset;
|
||||
data->fullyUpThreshold = arrowInfo->fullyUpThreshold;
|
||||
data->fullyDownThreshold = arrowInfo->fullyDownThreshold;
|
||||
data->tileTag = arrowInfo->tileTag;
|
||||
|
|
@ -1108,7 +1108,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
|
|||
return taskId;
|
||||
}
|
||||
|
||||
u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *currItemPtr)
|
||||
u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *scrollOffset)
|
||||
{
|
||||
if (arrowType == SCROLL_ARROW_UP || arrowType == SCROLL_ARROW_DOWN)
|
||||
{
|
||||
|
|
@ -1135,13 +1135,13 @@ u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 fi
|
|||
gTempScrollArrowTemplate.palTag = palTag;
|
||||
gTempScrollArrowTemplate.palNum = 0;
|
||||
|
||||
return AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, currItemPtr);
|
||||
return AddScrollIndicatorArrowPair(&gTempScrollArrowTemplate, scrollOffset);
|
||||
}
|
||||
|
||||
static void Task_ScrollIndicatorArrowPair(u8 taskId)
|
||||
{
|
||||
struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data;
|
||||
u16 currItem = (*data->currItemPtr);
|
||||
u16 currItem = (*data->scrollOffset);
|
||||
|
||||
if (currItem == data->fullyUpThreshold && currItem != 0xFFFF)
|
||||
gSprites[data->topSpriteId].invisible = TRUE;
|
||||
|
|
|
|||
|
|
@ -1688,14 +1688,14 @@ void CB2_ReturnToFieldWithOpenMenu(void)
|
|||
CB2_ReturnToField();
|
||||
}
|
||||
|
||||
void sub_80861B0(void)
|
||||
void CB2_ReturnToFieldContinueScript(void)
|
||||
{
|
||||
FieldClearVBlankHBlankCallbacks();
|
||||
gFieldCallback = sub_80AF188;
|
||||
CB2_ReturnToField();
|
||||
}
|
||||
|
||||
void CB2_ReturnToFieldContinueScript(void)
|
||||
void CB2_ReturnToFieldContinueScriptPlayMapMusic(void)
|
||||
{
|
||||
FieldClearVBlankHBlankCallbacks();
|
||||
gFieldCallback = sub_80AF168;
|
||||
|
|
|
|||
|
|
@ -812,7 +812,7 @@ const struct WindowTemplate sWindowTemplates_0855D2A8[] =
|
|||
DUMMY_WIN_TEMPLATE
|
||||
};
|
||||
|
||||
const u8 gUnknown_0855D2B8[] = _("{UNK_CTRL_F9 8}000");
|
||||
const u8 gUnknown_0855D2B8[] = _("{NO}000");
|
||||
const u8 gUnknown_0855D2BE[] = INCBIN_U8("graphics/pokedex/caught_ball.4bpp");
|
||||
const u8 sText_TenDashes[] = _("----------");
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include "sound.h"
|
||||
#include "constants/species.h"
|
||||
#include "sprite.h"
|
||||
#include "unk_text_util.h"
|
||||
#include "dynamic_placeholder_text_util.h"
|
||||
#include "string_util.h"
|
||||
#include "task.h"
|
||||
#include "text.h"
|
||||
|
|
@ -149,7 +149,7 @@ extern u8 gUnknown_0861CE97[];
|
|||
extern void sub_8199C30(u8 a, u8 b, u8 c, u8 d, u8 e, u8 f);
|
||||
extern bool8 sub_81A6BF4();
|
||||
extern bool8 sub_81B9E94();
|
||||
extern void UnkTextUtil_Reset();
|
||||
extern void DynamicPlaceholderTextUtil_Reset();
|
||||
extern void sub_8124610(u8 *a, u8 b);
|
||||
extern int GetPlayerIDAsU32();
|
||||
extern u8 GetCurrentPpToMaxPpState(u8 a, u8 b);
|
||||
|
|
@ -2908,12 +2908,12 @@ void sub_81C307C()
|
|||
{
|
||||
struct PokeSummary *sum = &gUnknown_0203CF1C->summary;
|
||||
u8 *text;
|
||||
UnkTextUtil_Reset();
|
||||
UnkTextUtil_SetPtrI(0, gUnknown_0861CE74);
|
||||
UnkTextUtil_SetPtrI(1, gUnknown_0861CE7B);
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_0861CE74);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_0861CE7B);
|
||||
sub_81C31C0();
|
||||
if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE || sub_81C3304() == TRUE)
|
||||
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gText_XNature);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_XNature);
|
||||
else
|
||||
{
|
||||
u8 *alloced1 = Alloc(32);
|
||||
|
|
@ -2922,7 +2922,7 @@ void sub_81C307C()
|
|||
if (sum->metLocation <= 0xD4)
|
||||
{
|
||||
sub_8124610(alloced2, sum->metLocation);
|
||||
UnkTextUtil_SetPtrI(4, alloced2);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, alloced2);
|
||||
}
|
||||
if (sub_81C3220() == 1)
|
||||
{
|
||||
|
|
@ -2937,7 +2937,7 @@ void sub_81C307C()
|
|||
text = (sum->metLocation > 0xD4) ? gText_XNatureObtainedInTrade : gText_XNatureProbablyMetAt;
|
||||
else
|
||||
text = gText_XNatureObtainedInTrade;
|
||||
UnkTextUtil_StringExpandPlaceholders(gStringVar4, text);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, text);
|
||||
Free(alloced1);
|
||||
Free(alloced2);
|
||||
}
|
||||
|
|
@ -2951,8 +2951,8 @@ void sub_81C3194()
|
|||
void sub_81C31C0()
|
||||
{
|
||||
struct UnkSummaryStruct *sumStruct = gUnknown_0203CF1C;
|
||||
UnkTextUtil_SetPtrI(2, gNatureNamePointers[sumStruct->summary.nature]);
|
||||
UnkTextUtil_SetPtrI(5, gText_EmptyString5);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNatureNamePointers[sumStruct->summary.nature]);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5);
|
||||
}
|
||||
|
||||
void sub_81C31F0(u8 *a)
|
||||
|
|
@ -2961,7 +2961,7 @@ void sub_81C31F0(u8 *a)
|
|||
if (level == 0)
|
||||
level = EGG_HATCH_LEVEL;
|
||||
ConvertIntToDecimalStringN(a, level, 0, 3);
|
||||
UnkTextUtil_SetPtrI(3, a);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, a);
|
||||
}
|
||||
|
||||
u8 sub_81C3220()
|
||||
|
|
@ -3216,12 +3216,12 @@ void sub_81C3710()
|
|||
ConvertIntToDecimalStringN(alloced2, gUnknown_0203CF1C->summary.maxHP, 1, 3);
|
||||
ConvertIntToDecimalStringN(alloced3, gUnknown_0203CF1C->summary.atk, 1, 7);
|
||||
ConvertIntToDecimalStringN(alloced4, gUnknown_0203CF1C->summary.def, 1, 7);
|
||||
UnkTextUtil_Reset();
|
||||
UnkTextUtil_SetPtrI(0, alloced1);
|
||||
UnkTextUtil_SetPtrI(1, alloced2);
|
||||
UnkTextUtil_SetPtrI(2, alloced3);
|
||||
UnkTextUtil_SetPtrI(3, alloced4);
|
||||
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE82);
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, alloced1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, alloced2);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, alloced3);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, alloced4);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE82);
|
||||
Free(alloced1);
|
||||
Free(alloced2);
|
||||
Free(alloced3);
|
||||
|
|
@ -3238,11 +3238,11 @@ void sub_81C3808()
|
|||
ConvertIntToDecimalStringN(gStringVar1, gUnknown_0203CF1C->summary.spatk, 1, 3);
|
||||
ConvertIntToDecimalStringN(gStringVar2, gUnknown_0203CF1C->summary.spdef, 1, 3);
|
||||
ConvertIntToDecimalStringN(gStringVar3, gUnknown_0203CF1C->summary.speed, 1, 3);
|
||||
UnkTextUtil_Reset();
|
||||
UnkTextUtil_SetPtrI(0, gStringVar1);
|
||||
UnkTextUtil_SetPtrI(1, gStringVar2);
|
||||
UnkTextUtil_SetPtrI(2, gStringVar3);
|
||||
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE8E);
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar3);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE8E);
|
||||
}
|
||||
|
||||
void sub_81C3890()
|
||||
|
|
@ -3351,10 +3351,10 @@ void sub_81C3B08(u8 a)
|
|||
sub_81C25A4(r8, gMoveNames[move], 0, (a<<4) + 1, 0, 1);
|
||||
ConvertIntToDecimalStringN(gStringVar1, r10->summary.pp[a], 1, 2);
|
||||
ConvertIntToDecimalStringN(gStringVar2, r6, 1, 2);
|
||||
UnkTextUtil_Reset();
|
||||
UnkTextUtil_SetPtrI(0, gStringVar1);
|
||||
UnkTextUtil_SetPtrI(1, gStringVar2);
|
||||
UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE97);
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar2);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gUnknown_0861CE97);
|
||||
text = gStringVar4;
|
||||
r5 = GetCurrentPpToMaxPpState(r10->summary.pp[a], r6) + 9;
|
||||
offset = GetStringRightAlignXOffset(1, text, 0x2C);
|
||||
|
|
@ -3446,17 +3446,17 @@ void sub_81C3B08(u8 a)
|
|||
movs r2, 0x1\n\
|
||||
movs r3, 0x2\n\
|
||||
bl ConvertIntToDecimalStringN\n\
|
||||
bl UnkTextUtil_Reset\n\
|
||||
bl DynamicPlaceholderTextUtil_Reset\n\
|
||||
movs r0, 0\n\
|
||||
mov r1, r8\n\
|
||||
bl UnkTextUtil_SetPtrI\n\
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr\n\
|
||||
movs r0, 0x1\n\
|
||||
adds r1, r4, 0\n\
|
||||
bl UnkTextUtil_SetPtrI\n\
|
||||
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr\n\
|
||||
ldr r4, =gStringVar4\n\
|
||||
ldr r1, =gUnknown_0861CE97\n\
|
||||
adds r0, r4, 0\n\
|
||||
bl UnkTextUtil_StringExpandPlaceholders\n\
|
||||
bl DynamicPlaceholderTextUtil_ExpandPlaceholders\n\
|
||||
adds r7, r4, 0\n\
|
||||
ldrb r0, [r5]\n\
|
||||
adds r1, r6, 0\n\
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ extern void IncrementGameStat(u8 index);
|
|||
extern void ScriptContext1_SetupScript(u8*);
|
||||
extern void ScriptContext2_RunNewScript(u8*);
|
||||
extern void CB2_ReturnToField(void);
|
||||
extern void CB2_ReturnToFieldContinueScript(void);
|
||||
extern void CB2_ReturnToFieldContinueScriptPlayMapMusic(void);
|
||||
extern void CB2_LoadMap(void);
|
||||
extern void sub_80AF6F0(void);
|
||||
extern void ScriptContext1_Stop(void);
|
||||
|
|
@ -125,7 +125,7 @@ void CB2_EndSafariBattle(void)
|
|||
{
|
||||
ScriptContext1_SetupScript(EventScript_2A4B9B);
|
||||
ScriptContext1_Stop();
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScript);
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1909,7 +1909,7 @@ bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx)
|
|||
{
|
||||
u8 slotMachineIndex = VarGet(ScriptReadHalfword(ctx));
|
||||
|
||||
PlaySlotMachine(slotMachineIndex, CB2_ReturnToFieldContinueScript);
|
||||
PlaySlotMachine(slotMachineIndex, CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
ScriptContext1_Stop();
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
extern u8 GetKeypadIconWidth(u8 keypadIconId);
|
||||
extern u16 Font6Func(struct TextPrinter *textPrinter);
|
||||
extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
|
||||
extern u8* UnkTextUtil_GetPtrI(u8 a1);
|
||||
extern u8* DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 a1);
|
||||
extern int sub_8197964();
|
||||
|
||||
EWRAM_DATA struct TextPrinter gTempTextPrinter = {0};
|
||||
|
|
@ -3227,7 +3227,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
|
|||
}
|
||||
case 0xF7:
|
||||
if (bufferPointer == NULL)
|
||||
bufferPointer = UnkTextUtil_GetPtrI(*++str);
|
||||
bufferPointer = DynamicPlaceholderTextUtil_GetPlaceholderPtr(*++str);
|
||||
while (*bufferPointer != 0xFF)
|
||||
{
|
||||
glyphWidth = func(*bufferPointer++, isJapanese);
|
||||
|
|
|
|||
4
src/tv.c
4
src/tv.c
|
|
@ -3454,7 +3454,7 @@ void ChangePokemonNickname(void)
|
|||
void ChangePokemonNickname_CB(void)
|
||||
{
|
||||
SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar2);
|
||||
CB2_ReturnToFieldContinueScript();
|
||||
CB2_ReturnToFieldContinueScriptPlayMapMusic();
|
||||
}
|
||||
|
||||
void ChangeBoxPokemonNickname(void)
|
||||
|
|
@ -3470,7 +3470,7 @@ void ChangeBoxPokemonNickname(void)
|
|||
void ChangeBoxPokemonNickname_CB(void)
|
||||
{
|
||||
SetBoxMonNickFromAnyBox(gSpecialVar_MonBoxId, gSpecialVar_MonBoxPos, gStringVar2);
|
||||
CB2_ReturnToFieldContinueScript();
|
||||
CB2_ReturnToFieldContinueScriptPlayMapMusic();
|
||||
}
|
||||
|
||||
void TV_CopyNicknameToStringVar1AndEnsureTerminated(void)
|
||||
|
|
|
|||
|
|
@ -814,7 +814,7 @@ gUnknown_0203CE54: @ 203CE54
|
|||
|
||||
.include "src/item_menu.o"
|
||||
.include "src/list_menu.o"
|
||||
.include "src/unk_text_util.o"
|
||||
.include "src/dynamic_placeholder_text_util.o"
|
||||
.include "src/item_icon.o"
|
||||
|
||||
gUnknown_0203CEC4: @ 203CEC4
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user